Inject KeyboardConverter + add tests

Author: bleroux

lib/web_ui/lib/src/engine/embedder.dart

@@ -323,8 +323,8 @@ class FlutterViewEmbedder {
       _sceneHostElement!.style.opacity = '0.3';
     }
 
-    PointerBinding.initInstance(glassPaneElement);
     KeyboardBinding.initInstance();
+    PointerBinding.initInstance(glassPaneElement, KeyboardBinding.instance!.converter);
 
     if (domWindow.visualViewport == null && isWebKit) {
       // Older Safari versions sometimes give us bogus innerWidth/innerHeight

lib/web_ui/lib/src/engine/keyboard_binding.dart

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'package:meta/meta.dart';
 import 'package:ui/ui.dart' as ui;
 
 import '../engine.dart'  show registerHotRestartListener;
@@ -116,6 +117,7 @@ class KeyboardBinding {
     }
   }
 
+  KeyboardConverter get converter => _converter;
   late final KeyboardConverter _converter;
   final Map<String, DomEventListener> _listeners = <String, DomEventListener>{};
 
@@ -162,104 +164,6 @@ class KeyboardBinding {
     _converter = KeyboardConverter(_onKeyData, onMacOs: operatingSystem == OperatingSystem.macOs);
   }
 
-  // Synthesize modifier keys up or down events only when the known pressing states are different.
-  void synthesizeModifiersIfNeeded(
-    bool altPressed,
-    bool controlPressed,
-    bool metaPressed,
-    bool shiftPressed,
-    num eventTimestamp,
-  ) {
-    _synthesizeModifierIfNeeded(
-      _kPhysicalAltLeft,
-      _kPhysicalAltRight,
-      _kLogicalAltLeft,
-      _kLogicalAltRight,
-      altPressed ? ui.KeyEventType.down : ui.KeyEventType.up,
-      eventTimestamp,
-    );
-    _synthesizeModifierIfNeeded(
-      _kPhysicalControlLeft,
-      _kPhysicalControlRight,
-      _kLogicalControlLeft,
-      _kLogicalControlRight,
-      controlPressed ? ui.KeyEventType.down : ui.KeyEventType.up,
-      eventTimestamp,
-    );
-    _synthesizeModifierIfNeeded(
-      _kPhysicalMetaLeft,
-      _kPhysicalMetaRight,
-      _kLogicalMetaLeft,
-      _kLogicalMetaRight,
-      metaPressed ? ui.KeyEventType.down : ui.KeyEventType.up,
-      eventTimestamp,
-    );
-    _synthesizeModifierIfNeeded(
-      _kPhysicalShiftLeft,
-      _kPhysicalShiftRight,
-      _kLogicalShiftLeft,
-      _kLogicalShiftRight,
-      shiftPressed ? ui.KeyEventType.down : ui.KeyEventType.up,
-      eventTimestamp,
-    );
-  }
-
-  void _synthesizeModifierIfNeeded(
-    int physicalLeft,
-    int physicalRight,
-    int logicalLeft,
-    int logicalRight,
-    ui.KeyEventType type,
-    num domTimestamp,
-  ) {
-    final bool leftPressed = _converter._pressingRecords.containsKey(physicalLeft);
-    final bool rightPressed = _converter._pressingRecords.containsKey(physicalRight);
-    final bool alreadyPressed = leftPressed || rightPressed;
-    final bool synthesizeDown = type == ui.KeyEventType.down && !alreadyPressed;
-    final bool synthesizeUp = type == ui.KeyEventType.up && alreadyPressed;
-
-    // Synthesize a down event only for the left key if right and left are not pressed
-    if (synthesizeDown) {
-      _synthesizeKeyDownEvent(domTimestamp, physicalLeft, logicalLeft);
-    }
-
-    // Synthesize an up event for left key if pressed
-    if (synthesizeUp && leftPressed) {
-      _synthesizeKeyUpEvent(domTimestamp, physicalLeft, logicalLeft);
-    }
-
-    // Synthesize an up event for right key if pressed
-    if (synthesizeUp && rightPressed) {
-      _synthesizeKeyUpEvent(domTimestamp, physicalRight, logicalRight);
-    }
-  }
-
-  void _synthesizeKeyDownEvent(num domTimestamp, int physical, int logical) {
-    _converter.performDispatchKeyData(ui.KeyData(
-      timeStamp: _eventTimeStampToDuration(domTimestamp),
-      type: ui.KeyEventType.down,
-      physical: physical,
-      logical: logical,
-      character: null,
-      synthesized: true,
-    ));
-    // Update pressing state
-    _converter._pressingRecords[physical] = logical;
-  }
-
-  void _synthesizeKeyUpEvent(num domTimestamp, int physical, int logical) {
-    _converter.performDispatchKeyData(ui.KeyData(
-      timeStamp: _eventTimeStampToDuration(domTimestamp),
-      type: ui.KeyEventType.up,
-      physical: physical,
-      logical: logical,
-      character: null,
-      synthesized: true,
-    ));
-    // Update pressing states
-    _converter._pressingRecords.remove(physical);
-  }
-
   void _reset() {
     _clearListeners();
     _converter.dispose();
@@ -667,4 +571,107 @@ class KeyboardConverter {
       _dispatchKeyData = null;
     }
   }
+
+  // Synthesize modifier keys up or down events only when the known pressing states are different.
+  void synthesizeModifiersIfNeeded(
+    bool altPressed,
+    bool controlPressed,
+    bool metaPressed,
+    bool shiftPressed,
+    num eventTimestamp,
+  ) {
+    _synthesizeModifierIfNeeded(
+      _kPhysicalAltLeft,
+      _kPhysicalAltRight,
+      _kLogicalAltLeft,
+      _kLogicalAltRight,
+      altPressed ? ui.KeyEventType.down : ui.KeyEventType.up,
+      eventTimestamp,
+    );
+    _synthesizeModifierIfNeeded(
+      _kPhysicalControlLeft,
+      _kPhysicalControlRight,
+      _kLogicalControlLeft,
+      _kLogicalControlRight,
+      controlPressed ? ui.KeyEventType.down : ui.KeyEventType.up,
+      eventTimestamp,
+    );
+    _synthesizeModifierIfNeeded(
+      _kPhysicalMetaLeft,
+      _kPhysicalMetaRight,
+      _kLogicalMetaLeft,
+      _kLogicalMetaRight,
+      metaPressed ? ui.KeyEventType.down : ui.KeyEventType.up,
+      eventTimestamp,
+    );
+    _synthesizeModifierIfNeeded(
+      _kPhysicalShiftLeft,
+      _kPhysicalShiftRight,
+      _kLogicalShiftLeft,
+      _kLogicalShiftRight,
+      shiftPressed ? ui.KeyEventType.down : ui.KeyEventType.up,
+      eventTimestamp,
+    );
+  }
+
+  void _synthesizeModifierIfNeeded(
+    int physicalLeft,
+    int physicalRight,
+    int logicalLeft,
+    int logicalRight,
+    ui.KeyEventType type,
+    num domTimestamp,
+  ) {
+    final bool leftPressed = _pressingRecords.containsKey(physicalLeft);
+    final bool rightPressed = _pressingRecords.containsKey(physicalRight);
+    final bool alreadyPressed = leftPressed || rightPressed;
+    final bool synthesizeDown = type == ui.KeyEventType.down && !alreadyPressed;
+    final bool synthesizeUp = type == ui.KeyEventType.up && alreadyPressed;
+
+    // Synthesize a down event only for the left key if right and left are not pressed
+    if (synthesizeDown) {
+      _synthesizeKeyDownEvent(domTimestamp, physicalLeft, logicalLeft);
+    }
+
+    // Synthesize an up event for left key if pressed
+    if (synthesizeUp && leftPressed) {
+      _synthesizeKeyUpEvent(domTimestamp, physicalLeft, logicalLeft);
+    }
+
+    // Synthesize an up event for right key if pressed
+    if (synthesizeUp && rightPressed) {
+      _synthesizeKeyUpEvent(domTimestamp, physicalRight, logicalRight);
+    }
+  }
+
+  void _synthesizeKeyDownEvent(num domTimestamp, int physical, int logical) {
+    performDispatchKeyData(ui.KeyData(
+      timeStamp: _eventTimeStampToDuration(domTimestamp),
+      type: ui.KeyEventType.down,
+      physical: physical,
+      logical: logical,
+      character: null,
+      synthesized: true,
+    ));
+    // Update pressing state
+    _pressingRecords[physical] = logical;
+  }
+
+  void _synthesizeKeyUpEvent(num domTimestamp, int physical, int logical) {
+    performDispatchKeyData(ui.KeyData(
+      timeStamp: _eventTimeStampToDuration(domTimestamp),
+      type: ui.KeyEventType.up,
+      physical: physical,
+      logical: logical,
+      character: null,
+      synthesized: true,
+    ));
+    // Update pressing states
+    _pressingRecords.remove(physical);
+  }
+
+  @visibleForTesting
+  bool debugKeyIsPressed(int physical) {
+    return _pressingRecords.containsKey(physical);
+  }
 }

lib/web_ui/lib/src/engine/pointer_binding.dart

@@ -74,7 +74,7 @@ class SafariPointerEventWorkaround {
 }
 
 class PointerBinding {
-  PointerBinding(this.glassPaneElement)
+  PointerBinding(this.glassPaneElement, this._keyboardConverter)
     : _pointerDataConverter = PointerDataConverter(),
       _detector = const PointerSupportDetector() {
     if (isIosSafari) {
@@ -87,9 +87,9 @@ class PointerBinding {
   static PointerBinding? get instance => _instance;
   static PointerBinding? _instance;
 
-  static void initInstance(DomElement glassPaneElement) {
+  static void initInstance(DomElement glassPaneElement, KeyboardConverter keyboardConverter) {
     if (_instance == null) {
-      _instance = PointerBinding(glassPaneElement);
+      _instance = PointerBinding(glassPaneElement, keyboardConverter);
       assert(() {
         registerHotRestartListener(_instance!.dispose);
         return true;
@@ -108,6 +108,7 @@ class PointerBinding {
 
   PointerSupportDetector _detector;
   final PointerDataConverter _pointerDataConverter;
+  KeyboardConverter _keyboardConverter;
   late _BaseAdapter _adapter;
 
   /// Should be used in tests to define custom detection of pointer support.
@@ -138,15 +139,23 @@ class PointerBinding {
     }
   }
 
+  @visibleForTesting
+  void debugOverrideKeyboardConverter(KeyboardConverter keyboardConverter) {
+    _keyboardConverter = keyboardConverter;
+    _adapter.clearListeners();
+    _adapter = _createAdapter();
+    _pointerDataConverter.clearPointerState();
+  }
+
   _BaseAdapter _createAdapter() {
     if (_detector.hasPointerEvents) {
-      return _PointerAdapter(_onPointerData, glassPaneElement, _pointerDataConverter);
+      return _PointerAdapter(_onPointerData, glassPaneElement, _pointerDataConverter, _keyboardConverter);
     }
     if (_detector.hasTouchEvents) {
-      return _TouchAdapter(_onPointerData, glassPaneElement, _pointerDataConverter);
+      return _TouchAdapter(_onPointerData, glassPaneElement, _pointerDataConverter, _keyboardConverter);
     }
     if (_detector.hasMouseEvents) {
-      return _MouseAdapter(_onPointerData, glassPaneElement, _pointerDataConverter);
+      return _MouseAdapter(_onPointerData, glassPaneElement, _pointerDataConverter, _keyboardConverter);
     }
     throw UnsupportedError('This browser does not support pointer, touch, or mouse events.');
   }
@@ -240,14 +249,20 @@ class _Listener {
 
 /// Common functionality that's shared among adapters.
 abstract class _BaseAdapter {
-  _BaseAdapter(this._callback, this.glassPaneElement, this._pointerDataConverter) {
+  _BaseAdapter(
+    this._callback,
+    this.glassPaneElement,
+    this._pointerDataConverter,
+    this._keyboardConverter,
+  ) {
     setup();
   }
 
   final List<_Listener> _listeners = <_Listener>[];
   final DomElement glassPaneElement;
   final _PointerDataCallback _callback;
   final PointerDataConverter _pointerDataConverter;
+  final KeyboardConverter _keyboardConverter;
 
   /// Each subclass is expected to override this method to attach its own event
   /// listeners and convert events into pointer events.
@@ -571,7 +586,8 @@ class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
   _PointerAdapter(
     super.callback,
     super.glassPaneElement,
-    super.pointerDataConverter
+    super.pointerDataConverter,
+    super.keyboardConverter,
   );
 
   final Map<int, _ButtonSanitizer> _sanitizers = <int, _ButtonSanitizer>{};
@@ -615,7 +631,7 @@ class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
   }
 
   void _checkModifiersState(DomPointerEvent event) {
-    KeyboardBinding.instance!.synthesizeModifiersIfNeeded(
+    _keyboardConverter.synthesizeModifiersIfNeeded(
       event.getModifierState('Alt'),
       event.getModifierState('Control'),
       event.getModifierState('Meta'),
@@ -782,7 +798,8 @@ class _TouchAdapter extends _BaseAdapter {
   _TouchAdapter(
     super.callback,
     super.glassPaneElement,
-    super.pointerDataConverter
+    super.pointerDataConverter,
+    super.keyboardConverter,
   );
 
   final Set<int> _pressedTouches = <int>{};
@@ -801,7 +818,7 @@ class _TouchAdapter extends _BaseAdapter {
   }
 
   void _checkModifiersState(DomTouchEvent event) {
-    KeyboardBinding.instance!.synthesizeModifiersIfNeeded(
+    _keyboardConverter.synthesizeModifiersIfNeeded(
       event.altKey,
       event.ctrlKey,
       event.metaKey,
@@ -938,7 +955,8 @@ class _MouseAdapter extends _BaseAdapter with _WheelEventListenerMixin {
   _MouseAdapter(
     super.callback,
     super.glassPaneElement,
-    super.pointerDataConverter
+    super.pointerDataConverter,
+    super.keyboardConverter,
   );
 
   final _ButtonSanitizer _sanitizer = _ButtonSanitizer();
@@ -960,7 +978,7 @@ class _MouseAdapter extends _BaseAdapter with _WheelEventListenerMixin {
   }
 
   void _checkModifiersState(DomMouseEvent event) {
-    KeyboardBinding.instance!.synthesizeModifiersIfNeeded(
+    _keyboardConverter.synthesizeModifiersIfNeeded(
       event.getModifierState('Alt'),
       event.getModifierState('Control'),
       event.getModifierState('Meta'),