Compile

lib/web_ui/lib/src/engine.dart

@@ -109,7 +109,6 @@ export 'engine/js_interop/js_loader.dart';
 export 'engine/js_interop/js_promise.dart';
 export 'engine/key_map.g.dart';
 export 'engine/keyboard_binding.dart';
-export 'engine/keyboard_layout_detector.dart';
 export 'engine/mouse_cursor.dart';
 export 'engine/navigation/history.dart';
 export 'engine/navigation/js_url_strategy.dart';

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

@@ -324,7 +324,7 @@ class FlutterViewEmbedder {
     }
 
     KeyboardBinding.initInstance();
-    PointerBinding.initInstance(glassPaneElement, KeyboardBinding.instance!.converter);
+    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

@@ -4,12 +4,12 @@
 
 import 'package:meta/meta.dart';
 import 'package:ui/ui.dart' as ui;
+import 'package:web_keyboard_layouts/web_keyboard_layouts.dart' as keyboard_layouts;
 
 import '../engine.dart'  show registerHotRestartListener;
 import 'browser_detection.dart';
 import 'dom.dart';
 import 'key_map.g.dart';
-import 'keyboard_layout_detector.dart';
 import 'platform_dispatcher.dart';
 import 'safe_browser_api.dart';
 import 'semantics.dart';
@@ -101,11 +101,17 @@ Duration _eventTimeStampToDuration(num milliseconds) {
 
 class KeyboardBinding {
   KeyboardBinding._() {
-    _setup();
+    _addEventListener('keydown', allowInterop((DomEvent domEvent) {
+      final FlutterHtmlKeyboardEvent event = FlutterHtmlKeyboardEvent(domEvent as DomKeyboardEvent);
+      return _converter.handleEvent(event);
+    }));
+    _addEventListener('keyup', allowInterop((DomEvent event) {
+      return _converter.handleEvent(FlutterHtmlKeyboardEvent(event as DomKeyboardEvent));
+    }));
   }
 
   /// The singleton instance of this object.
-  static KeyboardBinding? get instance => _instance;
+  static KeyboardBinding get instance => _instance!;
   static KeyboardBinding? _instance;
 
   static void initInstance() {
@@ -118,9 +124,23 @@ class KeyboardBinding {
     }
   }
 
-  final KeyboardLayoutDetector layoutDetector = KeyboardLayoutDetector();
+  static void debugClearInstance() {
+    _instance = null;
+  }
+
+  /// The platform as used in the initialization.
+  ///
+  /// By default it is derived from [operatingSystem].
+  @protected
+  OperatingSystem get localPlatform {
+    return operatingSystem;
+  }
+
   KeyboardConverter get converter => _converter;
-  late final KeyboardConverter _converter;
+  late final KeyboardConverter _converter = KeyboardConverter(
+    _onKeyData,
+    localPlatform,
+  );
   final Map<String, DomEventListener> _listeners = <String, DomEventListener>{};
 
   void _addEventListener(String eventName, DomEventListener handler) {
@@ -156,18 +176,6 @@ class KeyboardBinding {
     return result!;
   }
 
-  void _setup() {
-    _addEventListener('keydown', allowInterop((DomEvent event) {
-      layoutDetector.update(event as DomKeyboardEvent);
-      print('${event.code} 0x${layoutDetector.getKey(event.code ?? '')?.toRadixString(16)}');
-      return _converter.handleEvent(FlutterHtmlKeyboardEvent(event));
-    }));
-    _addEventListener('keyup', allowInterop((DomEvent event) {
-      return _converter.handleEvent(FlutterHtmlKeyboardEvent(event as DomKeyboardEvent));
-    }));
-    _converter = KeyboardConverter(_onKeyData, onMacOs: operatingSystem == OperatingSystem.macOs);
-  }
-
   void _reset() {
     _clearListeners();
     _converter.dispose();
@@ -214,10 +222,30 @@ class FlutterHtmlKeyboardEvent {
 // [dispatchKeyData] as given in the constructor. Some key data might be
 // dispatched asynchronously.
 class KeyboardConverter {
-  KeyboardConverter(this.performDispatchKeyData, {this.onMacOs = false});
+  KeyboardConverter(this.performDispatchKeyData, OperatingSystem platform)
+    : onMacOs = platform == OperatingSystem.macOs,
+      _mapping = _mappingFromPlatform(platform);
 
   final DispatchKeyData performDispatchKeyData;
+  // Whether the current platform is macOS, which affects how certain key events
+  // are comprehended.
   final bool onMacOs;
+  // A huge map that maps certain key event properties to logical keys.
+  //
+  // It is a map of KeyboardEvent.code -> KeyboardEvent.key -> logical_key.
+  final Map<String, Map<String, int>> _mapping;
+
+  static Map<String, Map<String, int>> _mappingFromPlatform(OperatingSystem platform) {
+    switch (platform) {
+      case OperatingSystem.iOs:
+      case OperatingSystem.macOs:
+        return keyboard_layouts.kDarwinMapping;
+      case OperatingSystem.windows:
+        return keyboard_layouts.kWinMapping;
+      default:
+        return keyboard_layouts.kLinuxMapping;
+    }
+  }
 
   // The `performDispatchKeyData` wrapped with tracking logic.
   //

third_party/web_keyboard_layouts/lib/web_keyboard_layouts.dart

@@ -3,27 +3,5 @@
 
 library web_keyboard_layouts;
 
-part 'key_mappings.g.dart';
-
-const int _kUseKeyCode = 1;
-
-class LayoutMapping {
-  LayoutMapping.win() : _mapping = kWinMapping;
-  LayoutMapping.linux() : _mapping = kLinuxMapping;
-  LayoutMapping.darwin() : _mapping = kDarwinMapping;
-
-  int? getLogicalKey(String eventCode, String eventKey, String eventKeyCode) {
-    final int? result = _mapping[eventCode]?[eventKey];
-    if (result == _kUseKeyCode) {
-      return getLetterCode(eventKeyCode.toUpperCase());
-    }
-    return result;
-  }
-
-  final Map<String, Map<String, int>> _mapping;
-
-  static int? getLetterCode(String letter) {
-    assert (letter.length == 1);
-    return letter.codeUnitAt(0);
-  }
-}
+export 'web_keyboard_layouts/key_mappings.g.dart';
+export 'web_keyboard_layouts/types.dart';

third_party/web_keyboard_layouts/lib/key_mappings.g.dart → third_party/web_keyboard_layouts/lib/web_keyboard_layouts/key_mappings.g.dart

@@ -13,8 +13,6 @@
 //
 // See flutter/engine:flutter/tools/gen_web_keyboard_layouts/README.md for more information.
 
-part of web_keyboard_layouts;
-
 final Map<String, Map<String, int>> kWinMapping = <String, Map<String, int>>{
   'Backquote': <String, int>{
     '0': 0x30,

third_party/web_keyboard_layouts/lib/web_keyboard_layouts/types.dart

@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+const int _kUseKeyCode = 1;
+
+class LayoutMapping {
+  LayoutMapping.win() : _mapping = kWinMapping;
+  LayoutMapping.linux() : _mapping = kLinuxMapping;
+  LayoutMapping.darwin() : _mapping = kDarwinMapping;
+
+  int? getLogicalKey(String eventCode, String eventKey, String eventKeyCode) {
+    final int? result = _mapping[eventCode]?[eventKey];
+    if (result == _kUseKeyCode) {
+      return getLetterCode(eventKeyCode.toUpperCase());
+    }
+    return result;
+  }
+
+  final Map<String, Map<String, int>> _mapping;
+
+  static int? getLetterCode(String letter) {
+    assert (letter.length == 1);
+    return letter.codeUnitAt(0);
+  }
+}