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
715fcaac
Unverified
Commit
715fcaac
authored
May 19, 2022
by
Justin McCandless
Committed by
GitHub
May 19, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Can't drag the cursor with the mouse (#103002)
parent
8afaf7b5
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
254 additions
and
12 deletions
+254
-12
text_selection.dart
packages/flutter/lib/src/widgets/text_selection.dart
+21
-5
text_field_test.dart
packages/flutter/test/cupertino/text_field_test.dart
+2
-2
text_field_test.dart
packages/flutter/test/material/text_field_test.dart
+1
-1
editable_text_test.dart
packages/flutter/test/widgets/editable_text_test.dart
+1
-1
selectable_text_test.dart
packages/flutter/test/widgets/selectable_text_test.dart
+1
-1
text_selection_test.dart
packages/flutter/test/widgets/text_selection_test.dart
+228
-2
No files found.
packages/flutter/lib/src/widgets/text_selection.dart
View file @
715fcaac
...
...
@@ -1208,12 +1208,28 @@ class _SelectionHandleOverlayState extends State<_SelectionHandleOverlay> with S
alignment:
Alignment
.
topLeft
,
width:
interactiveRect
.
width
,
height:
interactiveRect
.
height
,
child:
GestureDetector
(
child:
Raw
GestureDetector
(
behavior:
HitTestBehavior
.
translucent
,
dragStartBehavior:
widget
.
dragStartBehavior
,
onPanStart:
widget
.
onSelectionHandleDragStart
,
onPanUpdate:
widget
.
onSelectionHandleDragUpdate
,
onPanEnd:
widget
.
onSelectionHandleDragEnd
,
gestures:
<
Type
,
GestureRecognizerFactory
>{
PanGestureRecognizer:
GestureRecognizerFactoryWithHandlers
<
PanGestureRecognizer
>(
()
=>
PanGestureRecognizer
(
debugOwner:
this
,
// Mouse events select the text and do not drag the cursor.
supportedDevices:
<
PointerDeviceKind
>{
PointerDeviceKind
.
touch
,
PointerDeviceKind
.
stylus
,
PointerDeviceKind
.
unknown
,
},
),
(
PanGestureRecognizer
instance
)
{
instance
..
dragStartBehavior
=
widget
.
dragStartBehavior
..
onStart
=
widget
.
onSelectionHandleDragStart
..
onUpdate
=
widget
.
onSelectionHandleDragUpdate
..
onEnd
=
widget
.
onSelectionHandleDragEnd
;
},
),
},
child:
Padding
(
padding:
EdgeInsets
.
only
(
left:
padding
.
left
,
...
...
packages/flutter/test/cupertino/text_field_test.dart
View file @
715fcaac
...
...
@@ -2897,7 +2897,7 @@ void main() {
// The selection doesn't move beyond the left handle. There's always at
// least 1 char selected.
expect
(
controller
.
selection
.
extentOffset
,
5
);
},
variant:
const
TargetPlatformVariant
(<
TargetPlatform
>{
TargetPlatform
.
iOS
,
TargetPlatform
.
macOS
}));
},
variant:
const
TargetPlatformVariant
(<
TargetPlatform
>{
TargetPlatform
.
iOS
,
TargetPlatform
.
macOS
}));
testWidgets
(
'Can select text by dragging with a mouse'
,
(
WidgetTester
tester
)
async
{
final
TextEditingController
controller
=
TextEditingController
();
...
...
@@ -3571,7 +3571,7 @@ void main() {
expect
(
left
.
opacity
.
value
,
equals
(
1.0
));
expect
(
right
.
opacity
.
value
,
equals
(
1.0
));
},
variant:
const
TargetPlatformVariant
(<
TargetPlatform
>{
TargetPlatform
.
iOS
,
TargetPlatform
.
macOS
}));
},
variant:
const
TargetPlatformVariant
(<
TargetPlatform
>{
TargetPlatform
.
iOS
,
TargetPlatform
.
macOS
}));
testWidgets
(
'when CupertinoTextField would be blocked by keyboard, it is shown with enough space for the selection handle'
,
(
WidgetTester
tester
)
async
{
final
ScrollController
scrollController
=
ScrollController
();
...
...
packages/flutter/test/material/text_field_test.dart
View file @
715fcaac
...
...
@@ -9400,7 +9400,7 @@ void main() {
expect
(
left
.
opacity
.
value
,
equals
(
1.0
));
expect
(
right
.
opacity
.
value
,
equals
(
1.0
));
},
variant:
const
TargetPlatformVariant
(<
TargetPlatform
>{
TargetPlatform
.
iOS
,
TargetPlatform
.
macOS
}));
},
variant:
const
TargetPlatformVariant
(<
TargetPlatform
>{
TargetPlatform
.
iOS
,
TargetPlatform
.
macOS
}));
testWidgets
(
'iPad Scribble selection change shows selection handles'
,
(
WidgetTester
tester
)
async
{
const
String
testText
=
'lorem ipsum'
;
...
...
packages/flutter/test/widgets/editable_text_test.dart
View file @
715fcaac
...
...
@@ -7825,7 +7825,7 @@ void main() {
// On web, we don't show the Flutter toolbar and instead rely on the browser
// toolbar. Until we change that, this test should remain skipped.
skip:
kIsWeb
,
// [intended]
variant:
const
TargetPlatformVariant
(<
TargetPlatform
>{
TargetPlatform
.
iOS
,
TargetPlatform
.
macOS
})
variant:
const
TargetPlatformVariant
(<
TargetPlatform
>{
TargetPlatform
.
iOS
,
TargetPlatform
.
macOS
})
);
testWidgets
(
"scrolling doesn't bounce"
,
(
WidgetTester
tester
)
async
{
...
...
packages/flutter/test/widgets/selectable_text_test.dart
View file @
715fcaac
...
...
@@ -4279,7 +4279,7 @@ void main() {
expect
(
left
.
opacity
.
value
,
equals
(
1.0
));
expect
(
right
.
opacity
.
value
,
equals
(
1.0
));
},
variant:
const
TargetPlatformVariant
(<
TargetPlatform
>{
TargetPlatform
.
iOS
,
TargetPlatform
.
macOS
}));
},
variant:
const
TargetPlatformVariant
(<
TargetPlatform
>{
TargetPlatform
.
iOS
,
TargetPlatform
.
macOS
}));
testWidgets
(
'Long press shows handles and toolbar'
,
(
WidgetTester
tester
)
async
{
await
tester
.
pumpWidget
(
...
...
packages/flutter/test/widgets/text_selection_test.dart
View file @
715fcaac
...
...
@@ -10,6 +10,7 @@ import 'package:flutter/services.dart';
import
'package:flutter_test/flutter_test.dart'
;
import
'clipboard_utils.dart'
;
import
'editable_text_utils.dart'
;
void
main
(
)
{
late
int
tapCount
;
...
...
@@ -628,7 +629,7 @@ void main() {
});
testWidgets
(
'Mouse drag does not show handles nor toolbar'
,
(
WidgetTester
tester
)
async
{
// Regressi
ng
test for https://github.com/flutter/flutter/issues/69001
// Regressi
on
test for https://github.com/flutter/flutter/issues/69001
await
tester
.
pumpWidget
(
const
MaterialApp
(
home:
Scaffold
(
...
...
@@ -652,6 +653,231 @@ void main() {
expect
(
editableText
.
selectionOverlay
!.
toolbarIsVisible
,
isFalse
);
});
testWidgets
(
'Mouse drag selects and cannot drag cursor'
,
(
WidgetTester
tester
)
async
{
// Regression test for https://github.com/flutter/flutter/issues/102928
final
TextEditingController
controller
=
TextEditingController
(
text:
'I love flutter!'
,
);
final
GlobalKey
<
EditableTextState
>
editableTextKey
=
GlobalKey
<
EditableTextState
>();
final
FakeTextSelectionGestureDetectorBuilderDelegate
delegate
=
FakeTextSelectionGestureDetectorBuilderDelegate
(
editableTextKey:
editableTextKey
,
forcePressEnabled:
false
,
selectionEnabled:
true
,
);
final
TextSelectionGestureDetectorBuilder
provider
=
TextSelectionGestureDetectorBuilder
(
delegate:
delegate
);
await
tester
.
pumpWidget
(
MaterialApp
(
home:
provider
.
buildGestureDetector
(
behavior:
HitTestBehavior
.
translucent
,
child:
EditableText
(
key:
editableTextKey
,
controller:
controller
,
focusNode:
FocusNode
(),
backgroundCursorColor:
Colors
.
white
,
cursorColor:
Colors
.
white
,
style:
const
TextStyle
(),
selectionControls:
materialTextSelectionControls
,
),
),
),
);
expect
(
controller
.
selection
.
isCollapsed
,
isTrue
);
expect
(
controller
.
selection
.
baseOffset
,
-
1
);
final
Offset
position
=
textOffsetToPosition
(
tester
,
4
);
await
tester
.
tapAt
(
position
);
await
tester
.
pump
();
expect
(
controller
.
selection
.
isCollapsed
,
isTrue
);
expect
(
controller
.
selection
.
baseOffset
,
4
);
final
TestGesture
gesture
=
await
tester
.
startGesture
(
position
,
kind:
PointerDeviceKind
.
mouse
);
addTearDown
(
gesture
.
removePointer
);
await
tester
.
pump
();
await
gesture
.
moveTo
(
textOffsetToPosition
(
tester
,
7
));
await
tester
.
pump
();
await
gesture
.
moveTo
(
textOffsetToPosition
(
tester
,
10
));
await
tester
.
pump
();
await
gesture
.
up
();
await
tester
.
pumpAndSettle
();
expect
(
controller
.
selection
.
isCollapsed
,
isFalse
);
expect
(
controller
.
selection
.
baseOffset
,
4
);
expect
(
controller
.
selection
.
extentOffset
,
10
);
});
testWidgets
(
'Touch drag moves the cursor'
,
(
WidgetTester
tester
)
async
{
// Regression test for https://github.com/flutter/flutter/issues/102928
final
TextEditingController
controller
=
TextEditingController
(
text:
'I love flutter!'
,
);
final
GlobalKey
<
EditableTextState
>
editableTextKey
=
GlobalKey
<
EditableTextState
>();
final
FakeTextSelectionGestureDetectorBuilderDelegate
delegate
=
FakeTextSelectionGestureDetectorBuilderDelegate
(
editableTextKey:
editableTextKey
,
forcePressEnabled:
false
,
selectionEnabled:
true
,
);
final
TextSelectionGestureDetectorBuilder
provider
=
TextSelectionGestureDetectorBuilder
(
delegate:
delegate
);
await
tester
.
pumpWidget
(
MaterialApp
(
home:
provider
.
buildGestureDetector
(
behavior:
HitTestBehavior
.
translucent
,
child:
EditableText
(
key:
editableTextKey
,
controller:
controller
,
focusNode:
FocusNode
(),
backgroundCursorColor:
Colors
.
white
,
cursorColor:
Colors
.
white
,
style:
const
TextStyle
(),
selectionControls:
materialTextSelectionControls
,
),
),
),
);
expect
(
controller
.
selection
.
isCollapsed
,
isTrue
);
expect
(
controller
.
selection
.
baseOffset
,
-
1
);
final
Offset
position
=
textOffsetToPosition
(
tester
,
4
);
await
tester
.
tapAt
(
position
);
await
tester
.
pump
();
expect
(
controller
.
selection
.
isCollapsed
,
isTrue
);
expect
(
controller
.
selection
.
baseOffset
,
4
);
final
TestGesture
gesture
=
await
tester
.
startGesture
(
position
);
addTearDown
(
gesture
.
removePointer
);
await
tester
.
pump
();
await
gesture
.
moveTo
(
textOffsetToPosition
(
tester
,
7
));
await
tester
.
pump
();
await
gesture
.
moveTo
(
textOffsetToPosition
(
tester
,
10
));
await
tester
.
pump
();
await
gesture
.
up
();
await
tester
.
pumpAndSettle
();
expect
(
controller
.
selection
.
isCollapsed
,
isTrue
);
expect
(
controller
.
selection
.
baseOffset
,
10
);
});
testWidgets
(
'Stylus drag moves the cursor'
,
(
WidgetTester
tester
)
async
{
// Regression test for https://github.com/flutter/flutter/issues/102928
final
TextEditingController
controller
=
TextEditingController
(
text:
'I love flutter!'
,
);
final
GlobalKey
<
EditableTextState
>
editableTextKey
=
GlobalKey
<
EditableTextState
>();
final
FakeTextSelectionGestureDetectorBuilderDelegate
delegate
=
FakeTextSelectionGestureDetectorBuilderDelegate
(
editableTextKey:
editableTextKey
,
forcePressEnabled:
false
,
selectionEnabled:
true
,
);
final
TextSelectionGestureDetectorBuilder
provider
=
TextSelectionGestureDetectorBuilder
(
delegate:
delegate
);
await
tester
.
pumpWidget
(
MaterialApp
(
home:
provider
.
buildGestureDetector
(
behavior:
HitTestBehavior
.
translucent
,
child:
EditableText
(
key:
editableTextKey
,
controller:
controller
,
focusNode:
FocusNode
(),
backgroundCursorColor:
Colors
.
white
,
cursorColor:
Colors
.
white
,
style:
const
TextStyle
(),
selectionControls:
materialTextSelectionControls
,
),
),
),
);
expect
(
controller
.
selection
.
isCollapsed
,
isTrue
);
expect
(
controller
.
selection
.
baseOffset
,
-
1
);
final
Offset
position
=
textOffsetToPosition
(
tester
,
4
);
await
tester
.
tapAt
(
position
);
await
tester
.
pump
();
expect
(
controller
.
selection
.
isCollapsed
,
isTrue
);
expect
(
controller
.
selection
.
baseOffset
,
4
);
final
TestGesture
gesture
=
await
tester
.
startGesture
(
position
,
kind:
PointerDeviceKind
.
stylus
);
addTearDown
(
gesture
.
removePointer
);
await
tester
.
pump
();
await
gesture
.
moveTo
(
textOffsetToPosition
(
tester
,
7
));
await
tester
.
pump
();
await
gesture
.
moveTo
(
textOffsetToPosition
(
tester
,
10
));
await
tester
.
pump
();
await
gesture
.
up
();
await
tester
.
pumpAndSettle
();
expect
(
controller
.
selection
.
isCollapsed
,
isTrue
);
expect
(
controller
.
selection
.
baseOffset
,
10
);
});
testWidgets
(
'Drag of unknown type moves the cursor'
,
(
WidgetTester
tester
)
async
{
// Regression test for https://github.com/flutter/flutter/issues/102928
final
TextEditingController
controller
=
TextEditingController
(
text:
'I love flutter!'
,
);
final
GlobalKey
<
EditableTextState
>
editableTextKey
=
GlobalKey
<
EditableTextState
>();
final
FakeTextSelectionGestureDetectorBuilderDelegate
delegate
=
FakeTextSelectionGestureDetectorBuilderDelegate
(
editableTextKey:
editableTextKey
,
forcePressEnabled:
false
,
selectionEnabled:
true
,
);
final
TextSelectionGestureDetectorBuilder
provider
=
TextSelectionGestureDetectorBuilder
(
delegate:
delegate
);
await
tester
.
pumpWidget
(
MaterialApp
(
home:
provider
.
buildGestureDetector
(
behavior:
HitTestBehavior
.
translucent
,
child:
EditableText
(
key:
editableTextKey
,
controller:
controller
,
focusNode:
FocusNode
(),
backgroundCursorColor:
Colors
.
white
,
cursorColor:
Colors
.
white
,
style:
const
TextStyle
(),
selectionControls:
materialTextSelectionControls
,
),
),
),
);
expect
(
controller
.
selection
.
isCollapsed
,
isTrue
);
expect
(
controller
.
selection
.
baseOffset
,
-
1
);
final
Offset
position
=
textOffsetToPosition
(
tester
,
4
);
await
tester
.
tapAt
(
position
);
await
tester
.
pump
();
expect
(
controller
.
selection
.
isCollapsed
,
isTrue
);
expect
(
controller
.
selection
.
baseOffset
,
4
);
final
TestGesture
gesture
=
await
tester
.
startGesture
(
position
,
kind:
PointerDeviceKind
.
unknown
);
addTearDown
(
gesture
.
removePointer
);
await
tester
.
pump
();
await
gesture
.
moveTo
(
textOffsetToPosition
(
tester
,
7
));
await
tester
.
pump
();
await
gesture
.
moveTo
(
textOffsetToPosition
(
tester
,
10
));
await
tester
.
pump
();
await
gesture
.
up
();
await
tester
.
pumpAndSettle
();
expect
(
controller
.
selection
.
isCollapsed
,
isTrue
);
expect
(
controller
.
selection
.
baseOffset
,
10
);
});
testWidgets
(
'test TextSelectionGestureDetectorBuilder drag with RenderEditable viewport offset change'
,
(
WidgetTester
tester
)
async
{
await
pumpTextSelectionGestureDetectorBuilder
(
tester
);
final
FakeRenderEditable
renderEditable
=
tester
.
renderObject
(
find
.
byType
(
FakeEditable
));
...
...
@@ -767,7 +993,7 @@ void main() {
of:
find
.
byType
(
CompositedTransformFollower
),
matching:
find
.
descendant
(
of:
find
.
byType
(
FadeTransition
),
matching:
find
.
byType
(
GestureDetector
),
matching:
find
.
byType
(
Raw
GestureDetector
),
),
);
...
...
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