Migrate to KeyEvent from RawKeyEvent (Flutter team contribution) (sup…

…erlistapp#1593)
dxvid-pts · Feb 11, 2024 · 086f338 · 086f338
1 parent 6ab48a9
commit 086f338
Show file tree

Hide file tree

Showing 26 changed files with 2,130 additions and 719 deletions.
diff --git a/...r/example/lib/demos/flutter_features/textinputclient/barebones_ios_text_input_client.dart b/...r/example/lib/demos/flutter_features/textinputclient/barebones_ios_text_input_client.dart
@@ -4,7 +4,7 @@ import 'package:super_text_layout/super_text_layout.dart';
 
 /// Demo that displays a very limited iOS text field, constructed from
 /// the ground up, using [TextInput] for user interaction instead
-/// of a [RawKeyboardListener] or similar.
+/// of a [KeyboardListener] or similar.
 class BarebonesIosTextInputClientDemo extends StatefulWidget {
   @override
   State<BarebonesIosTextInputClientDemo> createState() => _BarebonesIosTextInputClientDemoState();

diff --git a/super_editor/example/lib/demos/flutter_features/textinputclient/basic_text_input_client.dart b/super_editor/example/lib/demos/flutter_features/textinputclient/basic_text_input_client.dart
@@ -4,7 +4,7 @@ import 'package:super_text_layout/super_text_layout.dart';
 
 /// Demo that displays a very limited text field, constructed from
 /// the ground up, and using [TextInput] for user interaction instead
-/// of a [RawKeyboardListener] or similar.
+/// of a [KeyboardListener] or similar.
 class BasicTextInputClientDemo extends StatefulWidget {
   @override
   State<BasicTextInputClientDemo> createState() => _BasicTextInputClientDemoState();

diff --git a/super_editor/lib/src/default_editor/blockquote.dart b/super_editor/lib/src/default_editor/blockquote.dart
@@ -245,13 +245,13 @@ class ConvertBlockquoteToParagraphCommand implements EditCommand {
 
 ExecutionInstruction insertNewlineInBlockquote({
   required SuperEditorContext editContext,
-  required RawKeyEvent keyEvent,
+  required KeyEvent keyEvent,
 }) {
   if (keyEvent.logicalKey != LogicalKeyboardKey.enter) {
     return ExecutionInstruction.continueExecution;
   }
 
-  if (!keyEvent.isShiftPressed) {
+  if (!HardwareKeyboard.instance.isShiftPressed) {
     return ExecutionInstruction.continueExecution;
   }
 
@@ -277,7 +277,7 @@ ExecutionInstruction insertNewlineInBlockquote({
 
 ExecutionInstruction splitBlockquoteWhenEnterPressed({
   required SuperEditorContext editContext,
-  required RawKeyEvent keyEvent,
+  required KeyEvent keyEvent,
 }) {
   if (keyEvent.logicalKey != LogicalKeyboardKey.enter) {
     return ExecutionInstruction.continueExecution;

diff --git a/super_editor/lib/src/default_editor/document_gestures_mouse.dart b/super_editor/lib/src/default_editor/document_gestures_mouse.dart
@@ -164,9 +164,9 @@ class _DocumentMouseInteractorState extends State<DocumentMouseInteractor> with
   }
 
   bool get _isShiftPressed =>
-      (RawKeyboard.instance.keysPressed.contains(LogicalKeyboardKey.shiftLeft) ||
-          RawKeyboard.instance.keysPressed.contains(LogicalKeyboardKey.shiftRight) ||
-          RawKeyboard.instance.keysPressed.contains(LogicalKeyboardKey.shift)) &&
+      (HardwareKeyboard.instance.logicalKeysPressed.contains(LogicalKeyboardKey.shiftLeft) ||
+          HardwareKeyboard.instance.logicalKeysPressed.contains(LogicalKeyboardKey.shiftRight) ||
+          HardwareKeyboard.instance.logicalKeysPressed.contains(LogicalKeyboardKey.shift)) &&
       // TODO: this condition doesn't belong here. Move it to where it applies
       _currentSelection != null;