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

Toggle toolbar exception fix (#34055)

Browse Source 
Stop a text editing error from happening
This commit is contained in:
Justin McCandless 2019-06-10 08:06:24 -07:00 committed by GitHub
parent 1157e67491
commit ce4f15cd69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/flutter/lib/src/material/text_field.dart
View File

@ -749,7 +749,7 @@ class _TextFieldState extends State<TextField> with AutomaticKeepAliveClientMixi
cause: SelectionChangedCause.forcePress,
);
if (_shouldShowSelectionToolbar) {
_editableTextKey.currentState.toggleToolbar();
_editableTextKey.currentState.showToolbar();
}
}
}
@ -819,7 +819,7 @@ class _TextFieldState extends State<TextField> with AutomaticKeepAliveClientMixi
void _handleSingleLongTapEnd(LongPressEndDetails details) {
if (widget.selectionEnabled) {
if (_shouldShowSelectionToolbar)
_editableTextKey.currentState.toggleToolbar();
_editableTextKey.currentState.showToolbar();
}
}
@ -827,7 +827,7 @@ class _TextFieldState extends State<TextField> with AutomaticKeepAliveClientMixi
if (widget.selectionEnabled) {
_renderEditable.selectWord(cause: SelectionChangedCause.doubleTap);
if (_shouldShowSelectionToolbar) {
_editableText.toggleToolbar();
_editableText.showToolbar();
}
}
}

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

@ -1482,11 +1482,12 @@ class EditableTextState extends State<EditableText> with AutomaticKeepAliveClien
/// Shows the selection toolbar at the location of the current cursor.
///
/// Returns `false` if a toolbar couldn't be shown such as when no text
/// selection currently exists.
/// Returns `false` if a toolbar couldn't be shown, such as when the toolbar
/// is already shown, or when no text selection currently exists.
bool showToolbar() {
if (_selectionOverlay == null)
if (_selectionOverlay == null || _selectionOverlay.toolbarIsVisible) {
return false;
}
_selectionOverlay.showToolbar();
return true;

12
packages/flutter/test/material/text_field_test.dart
View File

@ -5221,7 +5221,7 @@ void main() {
);
testWidgets(
'double double tap toggles selection menu',
'double double tap just shows the selection menu',
(WidgetTester tester) async {
final TextEditingController controller = TextEditingController(
text: '',
@ -5245,17 +5245,17 @@ void main() {
await tester.pump();
expect(find.text('PASTE'), findsOneWidget);
// Double tap again hides the selection menu.
// Double tap again keeps the selection menu visible.
await tester.tapAt(textOffsetToPosition(tester, 0));
await tester.pump(const Duration(milliseconds: 50));
await tester.tapAt(textOffsetToPosition(tester, 0));
await tester.pump();
expect(find.text('PASTE'), findsNWidgets(0));
expect(find.text('PASTE'), findsOneWidget);
},
);
testWidgets(
'double long press toggles selection menu',
'double long press just shows the selection menu',
(WidgetTester tester) async {
final TextEditingController controller = TextEditingController(
text: '',
@ -5277,10 +5277,10 @@ void main() {
await tester.pump();
expect(find.text('PASTE'), findsOneWidget);
// Double tap again hides the selection menu.
// Long press again keeps the selection menu visible.
await tester.longPressAt(textOffsetToPosition(tester, 0));
await tester.pump();
expect(find.text('PASTE'), findsNWidgets(0));
expect(find.text('PASTE'), findsOneWidget);
},
);