github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update SelectableRegion test for M3 (#129627)

Browse Source 
## Description

This PR  fixes one selectable region test failure when switching to M3.
The failure is somewhat tricky because it is related to the M3 typography (line height set to 1.43).

## Related Issue

fixes https://github.com/flutter/flutter/issues/129626

## Tests

Updates 1 test.
This commit is contained in:
Bruno Leroux 2023-08-30 15:25:35 +02:00 committed by GitHub
parent 56ea352cc0
commit 1fe24956ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/flutter/lib/src/widgets/selectable_region.dart
View File

@ -2052,15 +2052,15 @@ abstract class MultiSelectableSelectionContainerDelegate extends SelectionContai
if (globalRect.contains(event.globalPosition)) { if (globalRect.contains(event.globalPosition)) {
final SelectionGeometry existingGeometry = selectables[index].value; final SelectionGeometry existingGeometry = selectables[index].value;
lastSelectionResult = dispatchSelectionEventToChild(selectables[index], event); lastSelectionResult = dispatchSelectionEventToChild(selectables[index], event);
if (index == selectables.length - 1 && lastSelectionResult == SelectionResult.next) {
return SelectionResult.next;
}
if (lastSelectionResult == SelectionResult.next) { if (lastSelectionResult == SelectionResult.next) {
continue; continue;
} }
if (index == 0 && lastSelectionResult == SelectionResult.previous) { if (index == 0 && lastSelectionResult == SelectionResult.previous) {
return SelectionResult.previous; return SelectionResult.previous;
} }
if (index == selectables.length - 1 && lastSelectionResult == SelectionResult.next) {
return SelectionResult.next;
}
if (selectables[index].value != existingGeometry) { if (selectables[index].value != existingGeometry) {
// Geometry has changed as a result of select word, need to clear the // Geometry has changed as a result of select word, need to clear the
// selection of other selectables to keep selection in sync. // selection of other selectables to keep selection in sync.

8
packages/flutter/test/widgets/selectable_region_test.dart
View File

@ -1570,7 +1570,6 @@ void main() {
final UniqueKey outerText = UniqueKey(); final UniqueKey outerText = UniqueKey();
await tester.pumpWidget( await tester.pumpWidget(
MaterialApp( MaterialApp(
theme: ThemeData(useMaterial3: false),
home: SelectableRegion( home: SelectableRegion(
focusNode: FocusNode(), focusNode: FocusNode(),
selectionControls: materialTextSelectionControls, selectionControls: materialTextSelectionControls,
@ -1595,8 +1594,13 @@ void main() {
), ),
); );
final RenderParagraph paragraph = tester.renderObject<RenderParagraph>(find.descendant(of: find.byKey(outerText), matching: find.byType(RichText)).first); final RenderParagraph paragraph = tester.renderObject<RenderParagraph>(find.descendant(of: find.byKey(outerText), matching: find.byType(RichText)).first);
// Adjust `textOffsetToPosition` result because it returns the wrong vertical position (wrong line).
// TODO(bleroux): Remove when https://github.com/flutter/flutter/issues/133637 is fixed.
final Offset gestureOffset = textOffsetToPosition(paragraph, 125).translate(0, 10);
// Right click to select word at position. // Right click to select word at position.
final TestGesture gesture = await tester.startGesture(textOffsetToPosition(paragraph, 125), kind: PointerDeviceKind.mouse, buttons: kSecondaryMouseButton); final TestGesture gesture = await tester.startGesture(gestureOffset, kind: PointerDeviceKind.mouse, buttons: kSecondaryMouseButton);
addTearDown(gesture.removePointer); addTearDown(gesture.removePointer);
await tester.pump(); await tester.pump();
await gesture.up(); await gesture.up();