[web] PointerBinding per view

mdebbar · mdebbar · commit 252b4dfe0240 · 2023-11-20T17:52:56.000-05:00
diff --git a/lib/web_ui/lib/src/engine/embedder.dart b/lib/web_ui/lib/src/engine/embedder.dart
@@ -8,9 +8,7 @@ import '../engine.dart' show buildMode, renderer;
 import 'browser_detection.dart';
 import 'configuration.dart';
 import 'dom.dart';
-import 'keyboard_binding.dart';
 import 'platform_dispatcher.dart';
-import 'pointer_binding.dart';
 import 'text_editing/text_editing.dart';
 import 'view_embedder/style_manager.dart';
 import 'window.dart';
@@ -65,16 +63,6 @@ class FlutterViewEmbedder {
       },
     );
 
-    renderer.reset(this);
-
-    // TODO(mdebbar): Move these to `engine/initialization.dart`.
-
-    KeyboardBinding.initInstance();
-    PointerBinding.initInstance(
-      _flutterViewElement,
-      KeyboardBinding.instance!.converter,
-    );
-
     window.onResize.listen(_metricsDidChange);
   }
 
diff --git a/lib/web_ui/lib/src/engine/initialization.dart b/lib/web_ui/lib/src/engine/initialization.dart
@@ -218,8 +218,13 @@ Future<void> initializeEngineUi() async {
   _initializationState = DebugEngineInitializationState.initializingUi;
 
   RawKeyboard.initialize(onMacOs: operatingSystem == OperatingSystem.macOs);
-  ensureImplicitViewInitialized(hostElement: configuration.hostElement);
-  ensureFlutterViewEmbedderInitialized();
+  final EngineFlutterWindow implicitView =
+      ensureImplicitViewInitialized(hostElement: configuration.hostElement);
+  final FlutterViewEmbedder embedder = ensureFlutterViewEmbedderInitialized();
+  renderer.reset(embedder);
+
+  KeyboardBinding.initInstance();
+  PointerBinding.initInstance(implicitView, KeyboardBinding.instance!.converter);
   _initializationState = DebugEngineInitializationState.initialized;
 }
 
diff --git a/lib/web_ui/lib/src/engine/keyboard_binding.dart b/lib/web_ui/lib/src/engine/keyboard_binding.dart
@@ -258,6 +258,7 @@ class KeyboardConverter {
   bool _disposed = false;
   void dispose() {
     _disposed = true;
+    clearPressedKeys();
   }
 
   // On macOS, CapsLock behaves differently in that, a keydown event occurs when
@@ -699,4 +700,8 @@ class KeyboardConverter {
   bool keyIsPressed(int physical) {
     return _pressingRecords.containsKey(physical);
   }
+
+  void clearPressedKeys() {
+    _pressingRecords.clear();
+  }
 }
diff --git a/lib/web_ui/lib/src/engine/pointer_binding.dart b/lib/web_ui/lib/src/engine/pointer_binding.dart
@@ -18,6 +18,7 @@ import 'pointer_binding/event_position_helper.dart';
 import 'pointer_converter.dart';
 import 'safe_browser_api.dart';
 import 'semantics.dart';
+import 'window.dart';
 
 /// Set this flag to true to log all the browser events.
 const bool _debugLogPointerEvents = false;
@@ -73,21 +74,31 @@ int convertButtonToButtons(int button) {
 /// Wrapping the Safari iOS workaround that adds a dummy event listener
 /// More info about the issue and workaround: https://github.com/flutter/flutter/issues/70858
 class SafariPointerEventWorkaround {
-  static SafariPointerEventWorkaround instance = SafariPointerEventWorkaround();
+  DomEventListener? _listener;
 
   void workAroundMissingPointerEvents() {
-    domDocument.addEventListener('touchstart', createDomEventListener((DomEvent event) {}));
+    _listener = createDomEventListener((_) {});
+    domDocument.addEventListener('touchstart', _listener);
+  }
+
+  void dispose() {
+    if (_listener != null) {
+      domDocument.removeEventListener('touchstart', _listener);
+    }
   }
 }
 
 class PointerBinding {
   PointerBinding(
-    this.flutterViewElement,
-    this._keyboardConverter, [
-    this._detector = const PointerSupportDetector(),
-  ]) : _pointerDataConverter = PointerDataConverter() {
+    this.view,
+    this._keyboardConverter, {
+    PointerSupportDetector detector = const PointerSupportDetector(),
+    SafariPointerEventWorkaround? safariWorkaround,
+  })  : _pointerDataConverter = PointerDataConverter(),
+        _detector = detector {
     if (isIosSafari) {
-      SafariPointerEventWorkaround.instance.workAroundMissingPointerEvents();
+      _safariWorkaround = safariWorkaround ?? SafariPointerEventWorkaround();
+      _safariWorkaround!.workAroundMissingPointerEvents();
     }
     _adapter = _createAdapter();
   }
@@ -96,9 +107,9 @@ class PointerBinding {
   static PointerBinding? get instance => _instance;
   static PointerBinding? _instance;
 
-  static void initInstance(DomElement flutterViewElement, KeyboardConverter keyboardConverter) {
+  static void initInstance(EngineFlutterView view, KeyboardConverter keyboardConverter) {
     if (_instance == null) {
-      _instance = PointerBinding(flutterViewElement, keyboardConverter);
+      _instance = PointerBinding(view, keyboardConverter);
       assert(() {
         registerHotRestartListener(_instance!.dispose);
         return true;
@@ -108,37 +119,28 @@ class PointerBinding {
 
   final ClickDebouncer clickDebouncer = ClickDebouncer();
 
+  SafariPointerEventWorkaround? _safariWorkaround;
+
   /// Performs necessary clean up for PointerBinding including removing event listeners
   /// and clearing the existing pointer state
   void dispose() {
-    _adapter.clearListeners();
+    _adapter.dispose();
     _pointerDataConverter.clearPointerState();
+    _safariWorkaround?.dispose();
     clickDebouncer.reset();
   }
 
-  final DomElement flutterViewElement;
+  final EngineFlutterView view;
+  DomElement get rootElement => view.dom.rootElement;
 
   final PointerSupportDetector _detector;
   final PointerDataConverter _pointerDataConverter;
-  KeyboardConverter _keyboardConverter;
+  final KeyboardConverter _keyboardConverter;
   late _BaseAdapter _adapter;
 
-  @visibleForTesting
-  void debugReset() {
-    _adapter.clearListeners();
-    _adapter = _createAdapter();
-    _pointerDataConverter.clearPointerState();
-  }
-
-  @visibleForTesting
-  void debugOverrideKeyboardConverter(KeyboardConverter keyboardConverter) {
-    _keyboardConverter = keyboardConverter;
-    debugReset();
-  }
-
   _BaseAdapter _createAdapter() {
     if (_detector.hasPointerEvents) {
-      return _PointerAdapter(clickDebouncer.onPointerData, flutterViewElement, _pointerDataConverter, _keyboardConverter);
+      return _PointerAdapter(clickDebouncer.onPointerData, view, _pointerDataConverter, _keyboardConverter);
     }
     throw UnsupportedError(
       'This browser does not support pointer events which '
@@ -470,27 +472,29 @@ class _Listener {
 abstract class _BaseAdapter {
   _BaseAdapter(
     this._callback,
-    this.flutterViewElement,
+    this._view,
     this._pointerDataConverter,
     this._keyboardConverter,
   ) {
     setup();
   }
 
   final List<_Listener> _listeners = <_Listener>[];
-  final DomElement flutterViewElement;
+  final EngineFlutterView _view;
   final _PointerDataCallback _callback;
   final PointerDataConverter _pointerDataConverter;
   final KeyboardConverter _keyboardConverter;
   DomWheelEvent? _lastWheelEvent;
   bool _lastWheelEventWasTrackpad = false;
 
+  DomElement get _rootElement => _view.dom.rootElement;
+
   /// Each subclass is expected to override this method to attach its own event
   /// listeners and convert events into pointer events.
   void setup();
 
-  /// Remove all active event listeners.
-  void clearListeners() {
+  /// Cleans up all event listeners attached by this adapter.
+  void dispose() {
     for (final _Listener listener in _listeners) {
       listener.unregister();
     }
@@ -499,7 +503,7 @@ abstract class _BaseAdapter {
 
   /// Adds a listener for the given [eventName] to [target].
   ///
-  /// Generally speaking, down and leave events should use [flutterViewElement]
+  /// Generally speaking, down and leave events should use [_rootElement]
   /// as the [target], while move and up events should use [domWindow]
   /// instead, because the browser doesn't fire the latter two for DOM elements
   /// when the pointer is outside the window.
@@ -512,7 +516,7 @@ abstract class _BaseAdapter {
       if (_debugLogPointerEvents) {
         if (domInstanceOfString(event, 'PointerEvent')) {
           final DomPointerEvent pointerEvent = event as DomPointerEvent;
-          final ui.Offset offset = computeEventOffsetToTarget(event, flutterViewElement);
+          final ui.Offset offset = computeEventOffsetToTarget(event, _view);
           print('${pointerEvent.type}    '
               '${offset.dx.toStringAsFixed(1)},'
               '${offset.dy.toStringAsFixed(1)}');
@@ -636,25 +640,25 @@ mixin _WheelEventListenerMixin on _BaseAdapter {
         deltaX *= _defaultScrollLineHeight!;
         deltaY *= _defaultScrollLineHeight!;
       case domDeltaPage:
-        deltaX *= ui.window.physicalSize.width;
-        deltaY *= ui.window.physicalSize.height;
+        deltaX *= _view.physicalSize.width;
+        deltaY *= _view.physicalSize.height;
       case domDeltaPixel:
         if (operatingSystem == OperatingSystem.macOs && (isSafari || isFirefox)) {
           // Safari and Firefox seem to report delta in logical pixels while
           // Chrome uses physical pixels.
-          deltaX *= ui.window.devicePixelRatio;
-          deltaY *= ui.window.devicePixelRatio;
+          deltaX *= _view.devicePixelRatio;
+          deltaY *= _view.devicePixelRatio;
         }
       default:
         break;
     }
 
     final List<ui.PointerData> data = <ui.PointerData>[];
-    final ui.Offset offset = computeEventOffsetToTarget(event, flutterViewElement);
+    final ui.Offset offset = computeEventOffsetToTarget(event, _view);
     bool ignoreCtrlKey = false;
     if (operatingSystem == OperatingSystem.macOs) {
-      ignoreCtrlKey = (KeyboardBinding.instance?.converter.keyIsPressed(kPhysicalControlLeft) ?? false) ||
-                      (KeyboardBinding.instance?.converter.keyIsPressed(kPhysicalControlRight) ?? false);
+      ignoreCtrlKey = (_keyboardConverter.keyIsPressed(kPhysicalControlLeft)) ||
+                      (_keyboardConverter.keyIsPressed(kPhysicalControlRight));
     }
     if (event.ctrlKey && !ignoreCtrlKey) {
       _pointerDataConverter.convert(
@@ -664,8 +668,8 @@ mixin _WheelEventListenerMixin on _BaseAdapter {
         kind: kind,
         signalKind: ui.PointerSignalKind.scale,
         device: deviceId,
-        physicalX: offset.dx * ui.window.devicePixelRatio,
-        physicalY: offset.dy * ui.window.devicePixelRatio,
+        physicalX: offset.dx * _view.devicePixelRatio,
+        physicalY: offset.dy * _view.devicePixelRatio,
         buttons: event.buttons!.toInt(),
         pressure: 1.0,
         pressureMax: 1.0,
@@ -679,8 +683,8 @@ mixin _WheelEventListenerMixin on _BaseAdapter {
         kind: kind,
         signalKind: ui.PointerSignalKind.scroll,
         device: deviceId,
-        physicalX: offset.dx * ui.window.devicePixelRatio,
-        physicalY: offset.dy * ui.window.devicePixelRatio,
+        physicalX: offset.dx * _view.devicePixelRatio,
+        physicalY: offset.dy * _view.devicePixelRatio,
         buttons: event.buttons!.toInt(),
         pressure: 1.0,
         pressureMax: 1.0,
@@ -696,7 +700,7 @@ mixin _WheelEventListenerMixin on _BaseAdapter {
   void _addWheelEventListener(DartDomEventListener handler) {
     _listeners.add(_Listener.register(
       event: 'wheel',
-      target: flutterViewElement,
+      target: _rootElement,
       handler: handler,
       passive: false,
     ));
@@ -886,7 +890,7 @@ typedef _PointerEventListener = dynamic Function(DomPointerEvent event);
 class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
   _PointerAdapter(
     super.callback,
-    super.flutterViewElement,
+    super.view,
     super.pointerDataConverter,
     super.keyboardConverter,
   );
@@ -942,7 +946,7 @@ class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
 
   @override
   void setup() {
-    _addPointerEventListener(flutterViewElement, 'pointerdown', (DomPointerEvent event) {
+    _addPointerEventListener(_rootElement, 'pointerdown', (DomPointerEvent event) {
       final int device = _getPointerId(event);
       final List<ui.PointerData> pointerData = <ui.PointerData>[];
       final _ButtonSanitizer sanitizer = _ensureSanitizer(device);
@@ -977,7 +981,7 @@ class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
       _callback(event, pointerData);
     });
 
-    _addPointerEventListener(flutterViewElement, 'pointerleave', (DomPointerEvent event) {
+    _addPointerEventListener(_rootElement, 'pointerleave', (DomPointerEvent event) {
       final int device = _getPointerId(event);
       final _ButtonSanitizer sanitizer = _ensureSanitizer(device);
       final List<ui.PointerData> pointerData = <ui.PointerData>[];
@@ -1006,7 +1010,7 @@ class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
 
     // A browser fires cancel event if it concludes the pointer will no longer
     // be able to generate events (example: device is deactivated)
-    _addPointerEventListener(flutterViewElement, 'pointercancel', (DomPointerEvent event) {
+    _addPointerEventListener(_rootElement, 'pointercancel', (DomPointerEvent event) {
       final int device = _getPointerId(event);
       if (_hasSanitizer(device)) {
         final List<ui.PointerData> pointerData = <ui.PointerData>[];
@@ -1033,16 +1037,16 @@ class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
     final double tilt = _computeHighestTilt(event);
     final Duration timeStamp = _BaseAdapter._eventTimeStampToDuration(event.timeStamp!);
     final num? pressure = event.pressure;
-    final ui.Offset offset = computeEventOffsetToTarget(event, flutterViewElement);
+    final ui.Offset offset = computeEventOffsetToTarget(event, _view);
     _pointerDataConverter.convert(
       data,
       change: details.change,
       timeStamp: timeStamp,
       kind: kind,
       signalKind: ui.PointerSignalKind.none,
       device: _getPointerId(event),
-      physicalX: offset.dx * ui.window.devicePixelRatio,
-      physicalY: offset.dy * ui.window.devicePixelRatio,
+      physicalX: offset.dx * _view.devicePixelRatio,
+      physicalY: offset.dy * _view.devicePixelRatio,
       buttons: details.buttons,
       pressure:  pressure == null ? 0.0 : pressure.toDouble(),
       pressureMax: 1.0,
diff --git a/lib/web_ui/lib/src/engine/pointer_binding/event_position_helper.dart b/lib/web_ui/lib/src/engine/pointer_binding/event_position_helper.dart
@@ -7,10 +7,10 @@ import 'dart:typed_data';
 import 'package:ui/ui.dart' as ui show Offset;
 
 import '../dom.dart';
-import '../platform_dispatcher.dart';
 import '../semantics.dart' show EngineSemanticsOwner;
 import '../text_editing/text_editing.dart';
 import '../vector_math.dart';
+import '../window.dart';
 
 /// Returns an [ui.Offset] of the position of [event], relative to the position of [actualTarget].
 ///
@@ -23,17 +23,15 @@ import '../vector_math.dart';
 ///
 /// It also takes into account semantics being enabled to fix the case where
 /// offsetX, offsetY == 0 (TalkBack events).
-ui.Offset computeEventOffsetToTarget(DomMouseEvent event, DomElement actualTarget) {
+ui.Offset computeEventOffsetToTarget(DomMouseEvent event, EngineFlutterView view) {
+  final DomElement actualTarget = view.dom.rootElement;
   // On a TalkBack event
   if (EngineSemanticsOwner.instance.semanticsEnabled && event.offsetX == 0 && event.offsetY == 0) {
     return _computeOffsetForTalkbackEvent(event, actualTarget);
   }
 
   // On one of our text-editing nodes
-  // TODO(mdebbar): There could be multiple views with multiple text editing hosts.
-  //                https://github.com/flutter/flutter/issues/137344
-  final DomElement textEditingHost = EnginePlatformDispatcher.instance.implicitView!.dom.textEditingHost;
-  final bool isInput = textEditingHost.contains(event.target! as DomNode);
+  final bool isInput = view.dom.textEditingHost.contains(event.target! as DomNode);
   if (isInput) {
     final EditableTextGeometry? inputGeometry = textEditing.strategy.geometry;
     if (inputGeometry != null) {
diff --git a/lib/web_ui/test/engine/pointer_binding_test.dart b/lib/web_ui/test/engine/pointer_binding_test.dart

Original file line number	Diff line number	Diff line change
`@@ -258,6 +258,7 @@ class KeyboardConverter {`
`258`	`258`	`bool _disposed = false;`
`259`	`259`	`void dispose() {`
`260`	`260`	`_disposed = true;`
	`261`	`+ clearPressedKeys();`
`261`	`262`	`}`
`262`	`263`
`263`	`264`	`// On macOS, CapsLock behaves differently in that, a keydown event occurs when`
`@@ -699,4 +700,8 @@ class KeyboardConverter {`
`699`	`700`	`bool keyIsPressed(int physical) {`
`700`	`701`	`return _pressingRecords.containsKey(physical);`
`701`	`702`	`}`
	`703`	`+`
	`704`	`+ void clearPressedKeys() {`
	`705`	`+ _pressingRecords.clear();`
	`706`	`+ }`
`702`	`707`	`}`