Skip to content

Commit 8a815c1

Browse files
chunhtaichunhtai
authored
Remove unecessary reference to ClipboardStatusNotifier (#125255)
fixes flutter/flutter#99360
1 parent baafa19 commit 8a815c1

File tree

10 files changed

+26
-40
lines changed

10 files changed

+26
-40
lines changed

‎packages/flutter/lib/src/cupertino/desktop_text_selection.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'package:flutter/foundation.dart' show clampDouble;
5+
import 'package:flutter/foundation.dart' show ValueListenable, clampDouble;
66
import 'package:flutter/widgets.dart';
77

88
import 'desktop_text_selection_toolbar.dart';
@@ -40,7 +40,7 @@ class CupertinoDesktopTextSelectionControls extends TextSelectionControls {
4040
Offset selectionMidpoint,
4141
List<TextSelectionPoint> endpoints,
4242
TextSelectionDelegate delegate,
43-
ClipboardStatusNotifier? clipboardStatus,
43+
ValueListenable<ClipboardStatus>? clipboardStatus,
4444
Offset? lastSecondaryTapDownPosition,
4545
) {
4646
return _CupertinoDesktopTextSelectionControlsToolbar(
@@ -107,7 +107,7 @@ class _CupertinoDesktopTextSelectionControlsToolbar extends StatefulWidget {
107107
required this.lastSecondaryTapDownPosition,
108108
});
109109

110-
final ClipboardStatusNotifier? clipboardStatus;
110+
final ValueListenable<ClipboardStatus>? clipboardStatus;
111111
final List<TextSelectionPoint> endpoints;
112112
final Rect globalEditableRegion;
113113
final VoidCallback? handleCopy;

‎packages/flutter/lib/src/cupertino/text_selection.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import 'dart:math' as math;
66

7-
import 'package:flutter/foundation.dart' show clampDouble;
7+
import 'package:flutter/foundation.dart' show ValueListenable, clampDouble;
88
import 'package:flutter/widgets.dart';
99

1010
import 'localizations.dart';
@@ -92,7 +92,7 @@ class CupertinoTextSelectionControls extends TextSelectionControls {
9292
Offset selectionMidpoint,
9393
List<TextSelectionPoint> endpoints,
9494
TextSelectionDelegate delegate,
95-
ValueNotifier<ClipboardStatus>? clipboardStatus,
95+
ValueListenable<ClipboardStatus>? clipboardStatus,
9696
Offset? lastSecondaryTapDownPosition,
9797
) {
9898
return _CupertinoTextSelectionControlsToolbar(
@@ -209,7 +209,7 @@ class _CupertinoTextSelectionControlsToolbar extends StatefulWidget {
209209
required this.textLineHeight,
210210
});
211211

212-
final ValueNotifier<ClipboardStatus>? clipboardStatus;
212+
final ValueListenable<ClipboardStatus>? clipboardStatus;
213213
final List<TextSelectionPoint> endpoints;
214214
final Rect globalEditableRegion;
215215
final VoidCallback? handleCopy;

‎packages/flutter/lib/src/material/desktop_text_selection.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'package:flutter/foundation.dart' show clampDouble;
5+
import 'package:flutter/foundation.dart' show ValueListenable, clampDouble;
66
import 'package:flutter/widgets.dart';
77

88
import 'debug.dart';
@@ -41,7 +41,7 @@ class DesktopTextSelectionControls extends TextSelectionControls {
4141
Offset selectionMidpoint,
4242
List<TextSelectionPoint> endpoints,
4343
TextSelectionDelegate delegate,
44-
ClipboardStatusNotifier? clipboardStatus,
44+
ValueListenable<ClipboardStatus>? clipboardStatus,
4545
Offset? lastSecondaryTapDownPosition,
4646
) {
4747
return _DesktopTextSelectionControlsToolbar(
@@ -123,7 +123,7 @@ class _DesktopTextSelectionControlsToolbar extends StatefulWidget {
123123
required this.lastSecondaryTapDownPosition,
124124
});
125125

126-
final ClipboardStatusNotifier? clipboardStatus;
126+
final ValueListenable<ClipboardStatus>? clipboardStatus;
127127
final List<TextSelectionPoint> endpoints;
128128
final Rect globalEditableRegion;
129129
final VoidCallback? handleCopy;

‎packages/flutter/lib/src/material/text_selection.dart‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import 'dart:math' as math;
66

7+
import 'package:flutter/foundation.dart';
78
import 'package:flutter/widgets.dart';
89

910
import 'debug.dart';
@@ -52,7 +53,7 @@ class MaterialTextSelectionControls extends TextSelectionControls {
5253
Offset selectionMidpoint,
5354
List<TextSelectionPoint> endpoints,
5455
TextSelectionDelegate delegate,
55-
ClipboardStatusNotifier? clipboardStatus,
56+
ValueListenable<ClipboardStatus>? clipboardStatus,
5657
Offset? lastSecondaryTapDownPosition,
5758
) {
5859
return _TextSelectionControlsToolbar(
@@ -163,7 +164,7 @@ class _TextSelectionControlsToolbar extends StatefulWidget {
163164
required this.textLineHeight,
164165
});
165166

166-
final ClipboardStatusNotifier? clipboardStatus;
167+
final ValueListenable<ClipboardStatus>? clipboardStatus;
167168
final TextSelectionDelegate delegate;
168169
final List<TextSelectionPoint> endpoints;
169170
final Rect globalEditableRegion;

‎packages/flutter/lib/src/widgets/text_selection.dart‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,7 @@ abstract class TextSelectionControls {
125125
Offset selectionMidpoint,
126126
List<TextSelectionPoint> endpoints,
127127
TextSelectionDelegate delegate,
128-
// TODO(chunhtai): Change to ValueListenable<ClipboardStatus>? once
129-
// migration is done. https://github.com/flutter/flutter/issues/99360
130-
ClipboardStatusNotifier? clipboardStatus,
128+
ValueListenable<ClipboardStatus>? clipboardStatus,
131129
Offset? lastSecondaryTapDownPosition,
132130
);
133131

@@ -200,27 +198,23 @@ abstract class TextSelectionControls {
200198
///
201199
/// This is called by subclasses when their cut affordance is activated by
202200
/// the user.
203-
// TODO(chunhtai): remove optional parameter once migration is done.
204-
// https://github.com/flutter/flutter/issues/99360
205201
@Deprecated(
206202
'Use `contextMenuBuilder` instead. '
207203
'This feature was deprecated after v3.3.0-0.5.pre.',
208204
)
209-
void handleCut(TextSelectionDelegate delegate, [ClipboardStatusNotifier? clipboardStatus]) {
205+
void handleCut(TextSelectionDelegate delegate) {
210206
delegate.cutSelection(SelectionChangedCause.toolbar);
211207
}
212208

213209
/// Call [TextSelectionDelegate.copySelection] to copy current selection.
214210
///
215211
/// This is called by subclasses when their copy affordance is activated by
216212
/// the user.
217-
// TODO(chunhtai): remove optional parameter once migration is done.
218-
// https://github.com/flutter/flutter/issues/99360
219213
@Deprecated(
220214
'Use `contextMenuBuilder` instead. '
221215
'This feature was deprecated after v3.3.0-0.5.pre.',
222216
)
223-
void handleCopy(TextSelectionDelegate delegate, [ClipboardStatusNotifier? clipboardStatus]) {
217+
void handleCopy(TextSelectionDelegate delegate) {
224218
delegate.copySelection(SelectionChangedCause.toolbar);
225219
}
226220

@@ -3236,10 +3230,6 @@ class ClipboardStatusNotifier extends ValueNotifier<ClipboardStatus> with Widget
32363230
}) : super(value);
32373231

32383232
bool _disposed = false;
3239-
// TODO(chunhtai): remove this getter once migration is done.
3240-
// https://github.com/flutter/flutter/issues/99360
3241-
/// True if this instance has been disposed.
3242-
bool get disposed => _disposed;
32433233

32443234
/// Check the [Clipboard] and update [value] if needed.
32453235
Future<void> update() async {
@@ -3265,7 +3255,6 @@ class ClipboardStatusNotifier extends ValueNotifier<ClipboardStatus> with Widget
32653255
value = ClipboardStatus.unknown;
32663256
return;
32673257
}
3268-
32693258
final ClipboardStatus nextStatus = hasStrings
32703259
? ClipboardStatus.pasteable
32713260
: ClipboardStatus.notPasteable;
@@ -3349,7 +3338,7 @@ mixin TextSelectionHandleControls on TextSelectionControls {
33493338
Offset selectionMidpoint,
33503339
List<TextSelectionPoint> endpoints,
33513340
TextSelectionDelegate delegate,
3352-
ValueNotifier<ClipboardStatus>? clipboardStatus,
3341+
ValueListenable<ClipboardStatus>? clipboardStatus,
33533342
Offset? lastSecondaryTapDownPosition,
33543343
) => const SizedBox.shrink();
33553344

‎packages/flutter/test/cupertino/text_field_test.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class MockTextSelectionControls extends TextSelectionControls {
4040
Offset position,
4141
List<TextSelectionPoint> endpoints,
4242
TextSelectionDelegate delegate,
43-
ClipboardStatusNotifier? clipboardStatus,
43+
ValueListenable<ClipboardStatus>? clipboardStatus,
4444
Offset? lastSecondaryTapDownPosition,
4545
) {
4646
throw UnimplementedError();

‎packages/flutter/test/cupertino/text_selection_toolbar_test.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class _CustomCupertinoTextSelectionControls extends CupertinoTextSelectionContro
2323
Offset selectionMidpoint,
2424
List<TextSelectionPoint> endpoints,
2525
TextSelectionDelegate delegate,
26-
ValueNotifier<ClipboardStatus>? clipboardStatus,
26+
ValueListenable<ClipboardStatus>? clipboardStatus,
2727
Offset? lastSecondaryTapDownPosition,
2828
) {
2929
final EdgeInsets mediaQueryPadding = MediaQuery.paddingOf(context);

‎packages/flutter/test/material/text_selection_toolbar_test.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class _CustomMaterialTextSelectionControls extends MaterialTextSelectionControls
2020
Offset selectionMidpoint,
2121
List<TextSelectionPoint> endpoints,
2222
TextSelectionDelegate delegate,
23-
ClipboardStatusNotifier? clipboardStatus,
23+
ValueListenable<ClipboardStatus>? clipboardStatus,
2424
Offset? lastSecondaryTapDownPosition,
2525
) {
2626
final TextSelectionPoint startTextSelectionPoint = endpoints[0];

‎packages/flutter/test/widgets/editable_text_test.dart‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15978,7 +15978,7 @@ class MockTextSelectionControls extends Fake implements TextSelectionControls {
1597815978
Offset position,
1597915979
List<TextSelectionPoint> endpoints,
1598015980
TextSelectionDelegate delegate,
15981-
ClipboardStatusNotifier? clipboardStatus,
15981+
ValueListenable<ClipboardStatus>? clipboardStatus,
1598215982
Offset? lastSecondaryTapDownPosition,
1598315983
) {
1598415984
return const SizedBox();
@@ -16007,10 +16007,8 @@ class MockTextSelectionControls extends Fake implements TextSelectionControls {
1600716007
int pasteCount = 0;
1600816008
int copyCount = 0;
1600916009

16010-
// TODO(chunhtai): remove optional parameter once migration is done.
16011-
// https://github.com/flutter/flutter/issues/99360
1601216010
@override
16013-
void handleCopy(TextSelectionDelegate delegate, [ClipboardStatusNotifier? clipboardStatus]) {
16011+
void handleCopy(TextSelectionDelegate delegate) {
1601416012
copyCount += 1;
1601516013
}
1601616014

@@ -16019,10 +16017,8 @@ class MockTextSelectionControls extends Fake implements TextSelectionControls {
1601916017
pasteCount += 1;
1602016018
}
1602116019

16022-
// TODO(chunhtai): remove optional parameter once migration is done.
16023-
// https://github.com/flutter/flutter/issues/99360
1602416020
@override
16025-
void handleCut(TextSelectionDelegate delegate, [ClipboardStatusNotifier? clipboardStatus]) {
16021+
void handleCut(TextSelectionDelegate delegate) {
1602616022
cutCount += 1;
1602716023
}
1602816024

@@ -16062,7 +16058,7 @@ class _CustomTextSelectionControls extends TextSelectionControls {
1606216058
Offset position,
1606316059
List<TextSelectionPoint> endpoints,
1606416060
TextSelectionDelegate delegate,
16065-
ClipboardStatusNotifier? clipboardStatus,
16061+
ValueListenable<ClipboardStatus>? clipboardStatus,
1606616062
Offset? lastSecondaryTapDownPosition,
1606716063
) {
1606816064
final Offset selectionMidpoint = position;
@@ -16120,7 +16116,7 @@ class _CustomTextSelectionControls extends TextSelectionControls {
1612016116
@override
1612116117
void handleCut(TextSelectionDelegate delegate, [ClipboardStatusNotifier? clipboardStatus]) {
1612216118
onCut?.call();
16123-
return super.handleCut(delegate, clipboardStatus);
16119+
return super.handleCut(delegate);
1612416120
}
1612516121
}
1612616122

‎packages/flutter/test/widgets/text_selection_test.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'package:flutter/foundation.dart' show defaultTargetPlatform;
5+
import 'package:flutter/foundation.dart' show ValueListenable, defaultTargetPlatform;
66
import 'package:flutter/gestures.dart' show PointerDeviceKind, kSecondaryButton;
77
import 'package:flutter/material.dart';
88
import 'package:flutter/rendering.dart';
@@ -1836,7 +1836,7 @@ class TextSelectionControlsSpy extends TextSelectionControls {
18361836
Offset position,
18371837
List<TextSelectionPoint> endpoints,
18381838
TextSelectionDelegate delegate,
1839-
ClipboardStatusNotifier? clipboardStatus,
1839+
ValueListenable<ClipboardStatus>? clipboardStatus,
18401840
Offset? lastSecondaryTapDownPosition,
18411841
) {
18421842
return Text('dummy', key: toolBarKey);

0 commit comments

Comments
 (0)