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
5e2f8631
Unverified
Commit
5e2f8631
authored
Apr 26, 2021
by
creativecreatorormaybenot
Committed by
GitHub
Apr 26, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Hit Tests in RenderEditable when Scrolled (#81040)
parent
cd956c17
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
134 additions
and
1 deletion
+134
-1
editable.dart
packages/flutter/lib/src/rendering/editable.dart
+2
-1
editable_test.dart
packages/flutter/test/rendering/editable_test.dart
+132
-0
No files found.
packages/flutter/lib/src/rendering/editable.dart
View file @
5e2f8631
...
@@ -3188,7 +3188,8 @@ class RenderEditable extends RenderBox with RelayoutWhenSystemFontsChangeMixin {
...
@@ -3188,7 +3188,8 @@ class RenderEditable extends RenderBox with RelayoutWhenSystemFontsChangeMixin {
@override
@override
@protected
@protected
bool
hitTestChildren
(
BoxHitTestResult
result
,
{
required
Offset
position
})
{
bool
hitTestChildren
(
BoxHitTestResult
result
,
{
required
Offset
position
})
{
final
TextPosition
textPosition
=
_textPainter
.
getPositionForOffset
(
position
);
final
Offset
effectivePosition
=
position
-
_paintOffset
;
final
TextPosition
textPosition
=
_textPainter
.
getPositionForOffset
(
effectivePosition
);
final
InlineSpan
?
span
=
_textPainter
.
text
!.
getSpanForPosition
(
textPosition
);
final
InlineSpan
?
span
=
_textPainter
.
text
!.
getSpanForPosition
(
textPosition
);
if
(
span
!=
null
&&
span
is
HitTestTarget
)
{
if
(
span
!=
null
&&
span
is
HitTestTarget
)
{
result
.
add
(
HitTestEntry
(
span
as
HitTestTarget
));
result
.
add
(
HitTestEntry
(
span
as
HitTestTarget
));
...
...
packages/flutter/test/rendering/editable_test.dart
View file @
5e2f8631
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
import
'dart:io'
show
Platform
;
import
'dart:io'
show
Platform
;
import
'package:flutter/foundation.dart'
;
import
'package:flutter/foundation.dart'
;
import
'package:flutter/gestures.dart'
;
import
'package:flutter/material.dart'
;
import
'package:flutter/material.dart'
;
import
'package:flutter/rendering.dart'
;
import
'package:flutter/rendering.dart'
;
import
'package:flutter/services.dart'
;
import
'package:flutter/services.dart'
;
...
@@ -3330,6 +3331,137 @@ void main() {
...
@@ -3330,6 +3331,137 @@ void main() {
..
paragraph
(),
..
paragraph
(),
);
);
});
});
group
(
'hit testing'
,
()
{
test
(
'hits correct TextSpan when not scrolled'
,
()
{
final
TextSelectionDelegate
delegate
=
FakeEditableTextState
();
final
RenderEditable
editable
=
RenderEditable
(
text:
const
TextSpan
(
style:
TextStyle
(
height:
1.0
,
fontSize:
10.0
,
fontFamily:
'Ahem'
),
children:
<
InlineSpan
>[
TextSpan
(
text:
'A'
),
TextSpan
(
text:
'B'
),
],
),
startHandleLayerLink:
LayerLink
(),
endHandleLayerLink:
LayerLink
(),
textDirection:
TextDirection
.
ltr
,
offset:
ViewportOffset
.
fixed
(
0.0
),
textSelectionDelegate:
delegate
,
selection:
const
TextSelection
.
collapsed
(
offset:
0
,
),
);
layout
(
editable
,
constraints:
BoxConstraints
.
loose
(
const
Size
(
500.0
,
500.0
)));
// Prepare for painting after layout.
pumpFrame
(
phase:
EnginePhase
.
compositingBits
);
BoxHitTestResult
result
=
BoxHitTestResult
();
editable
.
hitTest
(
result
,
position:
Offset
.
zero
);
// We expect two hit test entries in the path because the RenderEditable
// will add itself as well.
expect
(
result
.
path
,
hasLength
(
2
));
HitTestTarget
target
=
result
.
path
.
first
.
target
;
expect
(
target
,
isA
<
TextSpan
>());
expect
((
target
as
TextSpan
).
text
,
'A'
);
// Only testing the RenderEditable entry here once, not anymore below.
expect
(
result
.
path
.
last
.
target
,
isA
<
RenderEditable
>());
result
=
BoxHitTestResult
();
editable
.
hitTest
(
result
,
position:
const
Offset
(
15.0
,
0.0
));
expect
(
result
.
path
,
hasLength
(
2
));
target
=
result
.
path
.
first
.
target
;
expect
(
target
,
isA
<
TextSpan
>());
expect
((
target
as
TextSpan
).
text
,
'B'
);
});
test
(
'hits correct TextSpan when scrolled vertically'
,
()
{
final
TextSelectionDelegate
delegate
=
FakeEditableTextState
();
final
RenderEditable
editable
=
RenderEditable
(
text:
const
TextSpan
(
style:
TextStyle
(
height:
1.0
,
fontSize:
10.0
,
fontFamily:
'Ahem'
),
children:
<
InlineSpan
>[
TextSpan
(
text:
'A'
),
TextSpan
(
text:
'B
\n
'
),
TextSpan
(
text:
'C'
),
],
),
startHandleLayerLink:
LayerLink
(),
endHandleLayerLink:
LayerLink
(),
textDirection:
TextDirection
.
ltr
,
// Given maxLines of null and an offset of 5, the editable will be
// scrolled vertically by 5 pixels.
maxLines:
null
,
offset:
ViewportOffset
.
fixed
(
5.0
),
textSelectionDelegate:
delegate
,
selection:
const
TextSelection
.
collapsed
(
offset:
0
,
),
);
layout
(
editable
,
constraints:
BoxConstraints
.
loose
(
const
Size
(
500.0
,
500.0
)));
// Prepare for painting after layout.
pumpFrame
(
phase:
EnginePhase
.
compositingBits
);
BoxHitTestResult
result
=
BoxHitTestResult
();
editable
.
hitTest
(
result
,
position:
Offset
.
zero
);
expect
(
result
.
path
,
hasLength
(
2
));
HitTestTarget
target
=
result
.
path
.
first
.
target
;
expect
(
target
,
isA
<
TextSpan
>());
expect
((
target
as
TextSpan
).
text
,
'A'
);
result
=
BoxHitTestResult
();
editable
.
hitTest
(
result
,
position:
const
Offset
(
15.0
,
0.0
));
expect
(
result
.
path
,
hasLength
(
2
));
target
=
result
.
path
.
first
.
target
;
expect
(
target
,
isA
<
TextSpan
>());
expect
((
target
as
TextSpan
).
text
,
'B
\n
'
);
result
=
BoxHitTestResult
();
// When we hit at y=6 and are scrolled by -5 vertically, we expect "C"
// to be hit because the font size is 10.
editable
.
hitTest
(
result
,
position:
const
Offset
(
0.0
,
6.0
));
expect
(
result
.
path
,
hasLength
(
2
));
target
=
result
.
path
.
first
.
target
;
expect
(
target
,
isA
<
TextSpan
>());
expect
((
target
as
TextSpan
).
text
,
'C'
);
});
test
(
'hits correct TextSpan when scrolled horizontally'
,
()
{
final
TextSelectionDelegate
delegate
=
FakeEditableTextState
();
final
RenderEditable
editable
=
RenderEditable
(
text:
const
TextSpan
(
style:
TextStyle
(
height:
1.0
,
fontSize:
10.0
,
fontFamily:
'Ahem'
),
children:
<
InlineSpan
>[
TextSpan
(
text:
'A'
),
TextSpan
(
text:
'B'
),
],
),
startHandleLayerLink:
LayerLink
(),
endHandleLayerLink:
LayerLink
(),
textDirection:
TextDirection
.
ltr
,
// Given maxLines of 1 and an offset of 5, the editable will be
// scrolled by 5 pixels to the left.
maxLines:
1
,
offset:
ViewportOffset
.
fixed
(
5.0
),
textSelectionDelegate:
delegate
,
selection:
const
TextSelection
.
collapsed
(
offset:
0
,
),
);
layout
(
editable
,
constraints:
BoxConstraints
.
loose
(
const
Size
(
500.0
,
500.0
)));
// Prepare for painting after layout.
pumpFrame
(
phase:
EnginePhase
.
compositingBits
);
final
BoxHitTestResult
result
=
BoxHitTestResult
();
// At x=6, we should hit "B" as we are scrolled to the left by 6
// pixels.
editable
.
hitTest
(
result
,
position:
const
Offset
(
6.0
,
0
));
expect
(
result
.
path
,
hasLength
(
2
));
final
HitTestTarget
target
=
result
.
path
.
first
.
target
;
expect
(
target
,
isA
<
TextSpan
>());
expect
((
target
as
TextSpan
).
text
,
'B'
);
});
});
});
});
}
}
...
...
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