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
5787fc3a
Unverified
Commit
5787fc3a
authored
Mar 15, 2019
by
Mouad Debbar
Committed by
GitHub
Mar 15, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix text selection when user is dragging in the opposite direction (#29395)
parent
28290f90
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
74 additions
and
2 deletions
+74
-2
editable.dart
packages/flutter/lib/src/rendering/editable.dart
+10
-2
text_field_test.dart
packages/flutter/test/material/text_field_test.dart
+32
-0
editable_test.dart
packages/flutter/test/rendering/editable_test.dart
+32
-0
No files found.
packages/flutter/lib/src/rendering/editable.dart
View file @
5787fc3a
...
...
@@ -1377,10 +1377,18 @@ class RenderEditable extends RenderBox {
final
TextPosition
toPosition
=
to
==
null
?
null
:
_textPainter
.
getPositionForOffset
(
globalToLocal
(
to
-
_paintOffset
));
int
baseOffset
=
fromPosition
.
offset
;
int
extentOffset
=
fromPosition
.
offset
;
if
(
toPosition
!=
null
)
{
baseOffset
=
math
.
min
(
fromPosition
.
offset
,
toPosition
.
offset
);
extentOffset
=
math
.
max
(
fromPosition
.
offset
,
toPosition
.
offset
);
}
onSelectionChanged
(
TextSelection
(
baseOffset:
fromPosition
.
o
ffset
,
extentOffset:
toPosition
?.
offset
??
fromPosition
.
o
ffset
,
baseOffset:
baseO
ffset
,
extentOffset:
extentO
ffset
,
affinity:
fromPosition
.
affinity
,
),
this
,
...
...
packages/flutter/test/material/text_field_test.dart
View file @
5787fc3a
...
...
@@ -645,6 +645,38 @@ void main() {
expect
(
controller
.
selection
.
extentOffset
,
testValue
.
indexOf
(
'g'
));
});
testWidgets
(
'Dragging in opposite direction also works'
,
(
WidgetTester
tester
)
async
{
final
TextEditingController
controller
=
TextEditingController
();
await
tester
.
pumpWidget
(
MaterialApp
(
home:
Material
(
child:
TextField
(
dragStartBehavior:
DragStartBehavior
.
down
,
controller:
controller
,
),
),
),
);
const
String
testValue
=
'abc def ghi'
;
await
tester
.
enterText
(
find
.
byType
(
TextField
),
testValue
);
await
skipPastScrollingAnimation
(
tester
);
final
Offset
ePos
=
textOffsetToPosition
(
tester
,
testValue
.
indexOf
(
'e'
));
final
Offset
gPos
=
textOffsetToPosition
(
tester
,
testValue
.
indexOf
(
'g'
));
final
TestGesture
gesture
=
await
tester
.
startGesture
(
gPos
,
kind:
PointerDeviceKind
.
mouse
);
await
tester
.
pump
();
await
gesture
.
moveTo
(
ePos
);
await
tester
.
pump
();
await
gesture
.
up
();
await
tester
.
pumpAndSettle
();
expect
(
controller
.
selection
.
baseOffset
,
testValue
.
indexOf
(
'e'
));
expect
(
controller
.
selection
.
extentOffset
,
testValue
.
indexOf
(
'g'
));
});
testWidgets
(
'Slow mouse dragging also selects text'
,
(
WidgetTester
tester
)
async
{
final
TextEditingController
controller
=
TextEditingController
();
...
...
packages/flutter/test/rendering/editable_test.dart
View file @
5787fc3a
...
...
@@ -335,4 +335,36 @@ void main() {
expect
(
currentSelection
.
baseOffset
,
5
);
expect
(
currentSelection
.
extentOffset
,
9
);
});
test
(
'selects correct place when offsets are flipped'
,
()
{
final
TextSelectionDelegate
delegate
=
FakeEditableTextState
();
final
ViewportOffset
viewportOffset
=
ViewportOffset
.
zero
();
TextSelection
currentSelection
;
final
RenderEditable
editable
=
RenderEditable
(
backgroundCursorColor:
Colors
.
grey
,
selectionColor:
Colors
.
black
,
textDirection:
TextDirection
.
ltr
,
cursorColor:
Colors
.
red
,
offset:
viewportOffset
,
textSelectionDelegate:
delegate
,
onSelectionChanged:
(
TextSelection
selection
,
RenderEditable
renderObject
,
SelectionChangedCause
cause
)
{
currentSelection
=
selection
;
},
text:
const
TextSpan
(
text:
'abc def ghi'
,
style:
TextStyle
(
height:
1.0
,
fontSize:
10.0
,
fontFamily:
'Ahem'
,
),
),
);
layout
(
editable
);
editable
.
selectPositionAt
(
from:
const
Offset
(
30
,
2
),
to:
const
Offset
(
10
,
2
),
cause:
SelectionChangedCause
.
drag
);
pumpFrame
();
expect
(
currentSelection
.
isCollapsed
,
isFalse
);
expect
(
currentSelection
.
baseOffset
,
1
);
expect
(
currentSelection
.
extentOffset
,
3
);
});
}
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