firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a potentially missing TextSelectionOverlay dispose (#79988)

Browse Source
This commit is contained in:
Justin McCandless 2021-04-09 14:44:02 -07:00 committed by GitHub
parent c5fdb82de1
commit 1075b2a1c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 66 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/flutter/lib/src/widgets/editable_text.dart
View File

@ -2139,7 +2139,7 @@ class EditableTextState extends State<EditableText> with AutomaticKeepAliveClien
// EditableWidget, not just changes triggered by user gestures.
requestKeyboard();
if (widget.selectionControls == null) {
_selectionOverlay?.hide();
_selectionOverlay?.dispose();
_selectionOverlay = null;
} else {
if (_selectionOverlay == null) {

65
packages/flutter/test/widgets/editable_text_test.dart
View File

@ -7367,6 +7367,71 @@ void main() {
expect(controller.selection.baseOffset, 1);
}
});
testWidgets('the toolbar is disposed when selection changes and there is no selectionControls', (WidgetTester tester) async {
late StateSetter setState;
bool enableInteractiveSelection = true;
await tester.pumpWidget(
MaterialApp(
home: Scaffold(
body: Center(
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setter) {
setState = setter;
return EditableText(
focusNode: focusNode,
style: Typography.material2018(platform: TargetPlatform.android).black.subtitle1!,
cursorColor: Colors.blue,
backgroundCursorColor: Colors.grey,
selectionControls: enableInteractiveSelection ? materialTextSelectionControls : null,
controller: controller,
enableInteractiveSelection: enableInteractiveSelection,
);
},
),
),
),
),
);
final EditableTextState state =
tester.state<EditableTextState>(find.byType(EditableText));
// Can't show the toolbar when there's no focus.
expect(state.showToolbar(), false);
await tester.pumpAndSettle();
expect(find.text('Paste'), findsNothing);
// Can show the toolbar when focused even though there's no text.
state.renderEditable.selectWordsInRange(
from: Offset.zero,
cause: SelectionChangedCause.tap,
);
await tester.pump();
expect(state.showToolbar(), isTrue);
await tester.pumpAndSettle();
expect(find.text('Paste'), findsOneWidget);
// Find the FadeTransition in the toolbar and expect that it has not been
// disposed.
final FadeTransition fadeTransition = find.byType(FadeTransition).evaluate()
.map((Element element) => element.widget as FadeTransition)
.firstWhere((FadeTransition fadeTransition) {
return fadeTransition.child is CompositedTransformFollower;
});
expect(fadeTransition.toString(), isNot(contains('DISPOSED')));
// Turn off interactive selection and change the text, which triggers the
// toolbar to be disposed.
setState(() {
enableInteractiveSelection = false;
});
await tester.pump();
await tester.enterText(find.byType(EditableText), 'abc');
await tester.pump();
expect(fadeTransition.toString(), contains('DISPOSED'));
}, skip: kIsWeb);
}
class UnsettableController extends TextEditingController {