From 6a337a76dda033098decc14fe0f8d0c497ad8ee1 Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Fri, 28 Feb 2020 14:28:34 -0800 Subject: [PATCH] Revert "Fix handling backspace on macos with text selection (#49760)" (#51577) This reverts commit 9375377fa99e8faae8a573e9fe92b8712d33e82d. Fixes #51511 --- .../flutter/lib/src/rendering/editable.dart | 9 +--- .../test/widgets/editable_text_test.dart | 45 ------------------- 2 files changed, 2 insertions(+), 52 deletions(-) diff --git a/packages/flutter/lib/src/rendering/editable.dart b/packages/flutter/lib/src/rendering/editable.dart index 7f9176b95f..190886eefd 100644 --- a/packages/flutter/lib/src/rendering/editable.dart +++ b/packages/flutter/lib/src/rendering/editable.dart @@ -437,17 +437,12 @@ class RenderEditable extends RenderBox with RelayoutWhenSystemFontsChangeMixin { LogicalKeyboardKey.arrowDown, }; - static final Set _deleteKeys = { - LogicalKeyboardKey.delete, - LogicalKeyboardKey.backspace, - }; - static final Set _shortcutKeys = { LogicalKeyboardKey.keyA, LogicalKeyboardKey.keyC, LogicalKeyboardKey.keyV, LogicalKeyboardKey.keyX, - ..._deleteKeys, + LogicalKeyboardKey.delete, }; static final Set _nonModifierKeys = { @@ -502,7 +497,7 @@ class RenderEditable extends RenderBox with RelayoutWhenSystemFontsChangeMixin { // _handleShortcuts depends on being started in the same stack invocation // as the _handleKeyEvent method _handleShortcuts(key); - } else if (_deleteKeys.contains(key)) { + } else if (key == LogicalKeyboardKey.delete) { _handleDelete(); } } diff --git a/packages/flutter/test/widgets/editable_text_test.dart b/packages/flutter/test/widgets/editable_text_test.dart index 66628a3ffe..43e1271032 100644 --- a/packages/flutter/test/widgets/editable_text_test.dart +++ b/packages/flutter/test/widgets/editable_text_test.dart @@ -3741,51 +3741,6 @@ void main() { reason: 'on $platform', ); expect(controller.text, isEmpty, reason: 'on $platform'); - - /// Paste and Select All - await sendKeys( - tester, - [ - LogicalKeyboardKey.keyV, - LogicalKeyboardKey.keyA, - ], - shortcutModifier: true, - platform: platform, - ); - - expect( - selection, - equals( - const TextSelection( - baseOffset: 0, - extentOffset: testText.length, - affinity: TextAffinity.downstream, - ), - ), - reason: 'on $platform', - ); - expect(controller.text, equals(testText), reason: 'on $platform'); - - // Backspace - await sendKeys( - tester, - [ - LogicalKeyboardKey.delete, - ], - platform: platform, - ); - expect( - selection, - equals( - const TextSelection( - baseOffset: 0, - extentOffset: 72, - affinity: TextAffinity.downstream, - ), - ), - reason: 'on $platform', - ); - expect(controller.text, isEmpty, reason: 'on $platform'); } testWidgets('keyboard text selection works as expected on linux', (WidgetTester tester) async {