Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
f878bda1
Unverified
Commit
f878bda1
authored
Aug 11, 2022
by
Casey Hillers
Committed by
GitHub
Aug 11, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Change ClipboardStatusNofifier parameter in buildToolbar to V… (#109388)
parent
fbca1927
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
49 additions
and
29 deletions
+49
-29
desktop_text_selection.dart
...ges/flutter/lib/src/cupertino/desktop_text_selection.dart
+3
-3
text_selection.dart
packages/flutter/lib/src/cupertino/text_selection.dart
+3
-3
desktop_text_selection.dart
...ages/flutter/lib/src/material/desktop_text_selection.dart
+3
-3
text_selection.dart
packages/flutter/lib/src/material/text_selection.dart
+2
-3
text_selection.dart
packages/flutter/lib/src/widgets/text_selection.dart
+23
-6
text_field_test.dart
packages/flutter/test/cupertino/text_field_test.dart
+1
-1
text_selection_toolbar_test.dart
...s/flutter/test/cupertino/text_selection_toolbar_test.dart
+1
-1
text_selection_toolbar_test.dart
...es/flutter/test/material/text_selection_toolbar_test.dart
+1
-1
editable_text_test.dart
packages/flutter/test/widgets/editable_text_test.dart
+10
-6
text_selection_test.dart
packages/flutter/test/widgets/text_selection_test.dart
+2
-2
No files found.
packages/flutter/lib/src/cupertino/desktop_text_selection.dart
View file @
f878bda1
...
...
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import
'package:flutter/foundation.dart'
show
ValueListenable
,
clampDouble
;
import
'package:flutter/foundation.dart'
show
clampDouble
;
import
'package:flutter/gestures.dart'
;
import
'package:flutter/widgets.dart'
;
...
...
@@ -51,7 +51,7 @@ class CupertinoDesktopTextSelectionControls extends TextSelectionControls {
Offset
selectionMidpoint
,
List
<
TextSelectionPoint
>
endpoints
,
TextSelectionDelegate
delegate
,
ValueListenable
<
ClipboardStatus
>
?
clipboardStatus
,
ClipboardStatusNotifier
?
clipboardStatus
,
Offset
?
lastSecondaryTapDownPosition
,
)
{
return
_CupertinoDesktopTextSelectionControlsToolbar
(
...
...
@@ -106,7 +106,7 @@ class _CupertinoDesktopTextSelectionControlsToolbar extends StatefulWidget {
required
this
.
lastSecondaryTapDownPosition
,
});
final
ValueListenable
<
ClipboardStatus
>
?
clipboardStatus
;
final
ClipboardStatusNotifier
?
clipboardStatus
;
final
List
<
TextSelectionPoint
>
endpoints
;
final
Rect
globalEditableRegion
;
final
VoidCallback
?
handleCopy
;
...
...
packages/flutter/lib/src/cupertino/text_selection.dart
View file @
f878bda1
...
...
@@ -4,7 +4,7 @@
import
'dart:math'
as
math
;
import
'package:flutter/foundation.dart'
show
ValueListenable
,
clampDouble
;
import
'package:flutter/foundation.dart'
show
clampDouble
;
import
'package:flutter/widgets.dart'
;
import
'localizations.dart'
;
...
...
@@ -36,7 +36,7 @@ class _CupertinoTextSelectionControlsToolbar extends StatefulWidget {
required
this
.
textLineHeight
,
});
final
ValueListenable
<
ClipboardStatus
>
?
clipboardStatus
;
final
ClipboardStatusNotifier
?
clipboardStatus
;
final
List
<
TextSelectionPoint
>
endpoints
;
final
Rect
globalEditableRegion
;
final
VoidCallback
?
handleCopy
;
...
...
@@ -213,7 +213,7 @@ class CupertinoTextSelectionControls extends TextSelectionControls {
Offset
selectionMidpoint
,
List
<
TextSelectionPoint
>
endpoints
,
TextSelectionDelegate
delegate
,
ValueListenable
<
ClipboardStatus
>
?
clipboardStatus
,
ClipboardStatusNotifier
?
clipboardStatus
,
Offset
?
lastSecondaryTapDownPosition
,
)
{
return
_CupertinoTextSelectionControlsToolbar
(
...
...
packages/flutter/lib/src/material/desktop_text_selection.dart
View file @
f878bda1
...
...
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import
'package:flutter/foundation.dart'
show
ValueListenable
,
clampDouble
;
import
'package:flutter/foundation.dart'
show
clampDouble
;
import
'package:flutter/services.dart'
;
import
'package:flutter/widgets.dart'
;
...
...
@@ -38,7 +38,7 @@ class DesktopTextSelectionControls extends TextSelectionControls {
Offset
selectionMidpoint
,
List
<
TextSelectionPoint
>
endpoints
,
TextSelectionDelegate
delegate
,
ValueListenable
<
ClipboardStatus
>
?
clipboardStatus
,
ClipboardStatusNotifier
?
clipboardStatus
,
Offset
?
lastSecondaryTapDownPosition
,
)
{
return
_DesktopTextSelectionControlsToolbar
(
...
...
@@ -103,7 +103,7 @@ class _DesktopTextSelectionControlsToolbar extends StatefulWidget {
required
this
.
lastSecondaryTapDownPosition
,
});
final
ValueListenable
<
ClipboardStatus
>
?
clipboardStatus
;
final
ClipboardStatusNotifier
?
clipboardStatus
;
final
List
<
TextSelectionPoint
>
endpoints
;
final
Rect
globalEditableRegion
;
final
VoidCallback
?
handleCopy
;
...
...
packages/flutter/lib/src/material/text_selection.dart
View file @
f878bda1
...
...
@@ -4,7 +4,6 @@
import
'dart:math'
as
math
;
import
'package:flutter/foundation.dart'
;
import
'package:flutter/widgets.dart'
;
import
'debug.dart'
;
...
...
@@ -38,7 +37,7 @@ class MaterialTextSelectionControls extends TextSelectionControls {
Offset
selectionMidpoint
,
List
<
TextSelectionPoint
>
endpoints
,
TextSelectionDelegate
delegate
,
ValueListenable
<
ClipboardStatus
>
?
clipboardStatus
,
ClipboardStatusNotifier
?
clipboardStatus
,
Offset
?
lastSecondaryTapDownPosition
,
)
{
return
_TextSelectionControlsToolbar
(
...
...
@@ -145,7 +144,7 @@ class _TextSelectionControlsToolbar extends StatefulWidget {
required
this
.
textLineHeight
,
});
final
ValueListenable
<
ClipboardStatus
>
?
clipboardStatus
;
final
ClipboardStatusNotifier
?
clipboardStatus
;
final
TextSelectionDelegate
delegate
;
final
List
<
TextSelectionPoint
>
endpoints
;
final
Rect
globalEditableRegion
;
...
...
packages/flutter/lib/src/widgets/text_selection.dart
View file @
f878bda1
...
...
@@ -119,7 +119,9 @@ abstract class TextSelectionControls {
Offset
selectionMidpoint
,
List
<
TextSelectionPoint
>
endpoints
,
TextSelectionDelegate
delegate
,
ValueListenable
<
ClipboardStatus
>?
clipboardStatus
,
// TODO(chunhtai): Change to ValueListenable<ClipboardStatus>? once
// mirgration is done. https://github.com/flutter/flutter/issues/99360
ClipboardStatusNotifier
?
clipboardStatus
,
Offset
?
lastSecondaryTapDownPosition
,
);
...
...
@@ -176,7 +178,9 @@ abstract class TextSelectionControls {
///
/// This is called by subclasses when their cut affordance is activated by
/// the user.
void
handleCut
(
TextSelectionDelegate
delegate
)
{
// TODO(chunhtai): remove optional parameter once migration is done.
// https://github.com/flutter/flutter/issues/99360
void
handleCut
(
TextSelectionDelegate
delegate
,
[
ClipboardStatusNotifier
?
clipboardStatus
])
{
delegate
.
cutSelection
(
SelectionChangedCause
.
toolbar
);
}
...
...
@@ -184,7 +188,9 @@ abstract class TextSelectionControls {
///
/// This is called by subclasses when their copy affordance is activated by
/// the user.
void
handleCopy
(
TextSelectionDelegate
delegate
)
{
// TODO(chunhtai): remove optional parameter once migration is done.
// https://github.com/flutter/flutter/issues/99360
void
handleCopy
(
TextSelectionDelegate
delegate
,
[
ClipboardStatusNotifier
?
clipboardStatus
])
{
delegate
.
copySelection
(
SelectionChangedCause
.
toolbar
);
}
...
...
@@ -2472,8 +2478,18 @@ class ClipboardStatusNotifier extends ValueNotifier<ClipboardStatus> with Widget
ClipboardStatus
value
=
ClipboardStatus
.
unknown
,
})
:
super
(
value
);
bool
_disposed
=
false
;
// TODO(chunhtai): remove this getter once migration is done.
// https://github.com/flutter/flutter/issues/99360
/// True if this instance has been disposed.
bool
get
disposed
=>
_disposed
;
/// Check the [Clipboard] and update [value] if needed.
Future
<
void
>
update
()
async
{
if
(
_disposed
)
{
return
;
}
final
bool
hasStrings
;
try
{
hasStrings
=
await
Clipboard
.
hasStrings
();
...
...
@@ -2486,7 +2502,7 @@ class ClipboardStatusNotifier extends ValueNotifier<ClipboardStatus> with Widget
));
// In the case of an error from the Clipboard API, set the value to
// unknown so that it will try to update again later.
if
(
value
==
ClipboardStatus
.
unknown
)
{
if
(
_disposed
||
value
==
ClipboardStatus
.
unknown
)
{
return
;
}
value
=
ClipboardStatus
.
unknown
;
...
...
@@ -2497,7 +2513,7 @@ class ClipboardStatusNotifier extends ValueNotifier<ClipboardStatus> with Widget
?
ClipboardStatus
.
pasteable
:
ClipboardStatus
.
notPasteable
;
if
(
nextStatus
==
value
)
{
if
(
_disposed
||
nextStatus
==
value
)
{
return
;
}
value
=
nextStatus
;
...
...
@@ -2517,7 +2533,7 @@ class ClipboardStatusNotifier extends ValueNotifier<ClipboardStatus> with Widget
@override
void
removeListener
(
VoidCallback
listener
)
{
super
.
removeListener
(
listener
);
if
(!
hasListeners
)
{
if
(!
_disposed
&&
!
hasListeners
)
{
WidgetsBinding
.
instance
.
removeObserver
(
this
);
}
}
...
...
@@ -2538,6 +2554,7 @@ class ClipboardStatusNotifier extends ValueNotifier<ClipboardStatus> with Widget
@override
void
dispose
()
{
WidgetsBinding
.
instance
.
removeObserver
(
this
);
_disposed
=
true
;
super
.
dispose
();
}
}
...
...
packages/flutter/test/cupertino/text_field_test.dart
View file @
f878bda1
...
...
@@ -44,7 +44,7 @@ class MockTextSelectionControls extends TextSelectionControls {
Offset
position
,
List
<
TextSelectionPoint
>
endpoints
,
TextSelectionDelegate
delegate
,
ValueListenable
<
ClipboardStatus
>
?
clipboardStatus
,
ClipboardStatusNotifier
?
clipboardStatus
,
Offset
?
lastSecondaryTapDownPosition
,
)
{
throw
UnimplementedError
();
...
...
packages/flutter/test/cupertino/text_selection_toolbar_test.dart
View file @
f878bda1
...
...
@@ -23,7 +23,7 @@ class _CustomCupertinoTextSelectionControls extends CupertinoTextSelectionContro
Offset
selectionMidpoint
,
List
<
TextSelectionPoint
>
endpoints
,
TextSelectionDelegate
delegate
,
ValueListenable
<
ClipboardStatus
>
?
clipboardStatus
,
ClipboardStatusNotifier
?
clipboardStatus
,
Offset
?
lastSecondaryTapDownPosition
,
)
{
final
MediaQueryData
mediaQuery
=
MediaQuery
.
of
(
context
);
...
...
packages/flutter/test/material/text_selection_toolbar_test.dart
View file @
f878bda1
...
...
@@ -21,7 +21,7 @@ class _CustomMaterialTextSelectionControls extends MaterialTextSelectionControls
Offset
selectionMidpoint
,
List
<
TextSelectionPoint
>
endpoints
,
TextSelectionDelegate
delegate
,
ValueListenable
<
ClipboardStatus
>
?
clipboardStatus
,
ClipboardStatusNotifier
?
clipboardStatus
,
Offset
?
lastSecondaryTapDownPosition
,
)
{
final
TextSelectionPoint
startTextSelectionPoint
=
endpoints
[
0
];
...
...
packages/flutter/test/widgets/editable_text_test.dart
View file @
f878bda1
...
...
@@ -12734,7 +12734,7 @@ class MockTextSelectionControls extends Fake implements TextSelectionControls {
Offset
position
,
List
<
TextSelectionPoint
>
endpoints
,
TextSelectionDelegate
delegate
,
ValueListenable
<
ClipboardStatus
>
?
clipboardStatus
,
ClipboardStatusNotifier
?
clipboardStatus
,
Offset
?
lastSecondaryTapDownPosition
,
)
{
return
const
SizedBox
();
...
...
@@ -12763,8 +12763,10 @@ class MockTextSelectionControls extends Fake implements TextSelectionControls {
int
pasteCount
=
0
;
int
copyCount
=
0
;
// TODO(chunhtai): remove optional parameter once migration is done.
// https://github.com/flutter/flutter/issues/99360
@override
void
handleCopy
(
TextSelectionDelegate
delegate
)
{
void
handleCopy
(
TextSelectionDelegate
delegate
,
[
ClipboardStatusNotifier
?
clipboardStatus
]
)
{
copyCount
+=
1
;
}
...
...
@@ -12773,8 +12775,10 @@ class MockTextSelectionControls extends Fake implements TextSelectionControls {
pasteCount
+=
1
;
}
// TODO(chunhtai): remove optional parameter once migration is done.
// https://github.com/flutter/flutter/issues/99360
@override
void
handleCut
(
TextSelectionDelegate
delegate
)
{
void
handleCut
(
TextSelectionDelegate
delegate
,
[
ClipboardStatusNotifier
?
clipboardStatus
]
)
{
cutCount
+=
1
;
}
...
...
@@ -12815,7 +12819,7 @@ class _CustomTextSelectionControls extends TextSelectionControls {
Offset
position
,
List
<
TextSelectionPoint
>
endpoints
,
TextSelectionDelegate
delegate
,
ValueListenable
<
ClipboardStatus
>
?
clipboardStatus
,
ClipboardStatusNotifier
?
clipboardStatus
,
Offset
?
lastSecondaryTapDownPosition
,
)
{
final
Offset
selectionMidpoint
=
position
;
...
...
@@ -12871,9 +12875,9 @@ class _CustomTextSelectionControls extends TextSelectionControls {
}
@override
void
handleCut
(
TextSelectionDelegate
delegate
)
{
void
handleCut
(
TextSelectionDelegate
delegate
,
[
ClipboardStatusNotifier
?
clipboardStatus
]
)
{
onCut
?.
call
();
return
super
.
handleCut
(
delegate
);
return
super
.
handleCut
(
delegate
,
clipboardStatus
);
}
}
...
...
packages/flutter/test/widgets/text_selection_test.dart
View file @
f878bda1
...
...
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import
'package:flutter/foundation.dart'
show
ValueListenable
,
defaultTargetPlatform
;
import
'package:flutter/foundation.dart'
show
defaultTargetPlatform
;
import
'package:flutter/gestures.dart'
show
PointerDeviceKind
,
kSecondaryButton
;
import
'package:flutter/material.dart'
;
import
'package:flutter/rendering.dart'
;
...
...
@@ -1456,7 +1456,7 @@ class TextSelectionControlsSpy extends TextSelectionControls {
Offset
position
,
List
<
TextSelectionPoint
>
endpoints
,
TextSelectionDelegate
delegate
,
ValueListenable
<
ClipboardStatus
>
?
clipboardStatus
,
ClipboardStatusNotifier
?
clipboardStatus
,
Offset
?
lastSecondaryTapDownPosition
,
)
{
return
Text
(
'dummy'
,
key:
toolBarKey
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment