From 0c1d7d2eb29c21f9a35fedd11a40962058685191 Mon Sep 17 00:00:00 2001
From: Benson Luk <97480502+b-luk@users.noreply.github.com>
Date: Tue, 11 Jan 2022 17:20:56 +0000
Subject: [PATCH] Add 'keyCode' field to eventData map created from html
 keyboard events.

---
 lib/web_ui/lib/src/engine/keyboard.dart |  2 ++
 lib/web_ui/test/keyboard_test.dart      | 19 +++++++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/lib/web_ui/lib/src/engine/keyboard.dart b/lib/web_ui/lib/src/engine/keyboard.dart
index 895172d5d7e28..0b55c8463a5f0 100644
--- a/lib/web_ui/lib/src/engine/keyboard.dart
+++ b/lib/web_ui/lib/src/engine/keyboard.dart
@@ -130,6 +130,7 @@ class Keyboard {
       'key': keyboardEvent.key,
       'location': keyboardEvent.location,
       'metaState': _lastMetaState,
+      'keyCode': keyboardEvent.keyCode,
     };
 
     EnginePlatformDispatcher.instance.invokeOnPlatformMessage('flutter/keyevent',
@@ -154,6 +155,7 @@ class Keyboard {
       'key': event.key,
       'location': event.location,
       'metaState': _lastMetaState,
+      'keyCode': event.keyCode,
     };
 
     EnginePlatformDispatcher.instance.invokeOnPlatformMessage('flutter/keyevent',
diff --git a/lib/web_ui/test/keyboard_test.dart b/lib/web_ui/test/keyboard_test.dart
index 3da3fb8d8685c..0d23bb9a871c1 100644
--- a/lib/web_ui/test/keyboard_test.dart
+++ b/lib/web_ui/test/keyboard_test.dart
@@ -53,7 +53,7 @@ void testMain() {
 
       html.KeyboardEvent event;
 
-      event = dispatchKeyboardEvent('keyup', key: 'SomeKey', code: 'SomeCode');
+      event = dispatchKeyboardEvent('keyup', key: 'SomeKey', code: 'SomeCode', keyCode: 1);
 
       expect(event.defaultPrevented, isFalse);
       expect(channelReceived, 'flutter/keyevent');
@@ -64,6 +64,7 @@ void testMain() {
         'location': 0,
         'key': 'SomeKey',
         'metaState': 0x0,
+        'keyCode': 1,
       });
 
       Keyboard.instance!.dispose();
@@ -85,7 +86,7 @@ void testMain() {
       html.KeyboardEvent event;
 
       event =
-          dispatchKeyboardEvent('keydown', key: 'SomeKey', code: 'SomeCode');
+          dispatchKeyboardEvent('keydown', key: 'SomeKey', code: 'SomeCode', keyCode: 1);
 
       expect(channelReceived, 'flutter/keyevent');
       expect(dataReceived, <String, dynamic>{
@@ -95,6 +96,7 @@ void testMain() {
         'key': 'SomeKey',
         'location': 0,
         'metaState': 0x0,
+        'keyCode': 1,
       });
       expect(event.defaultPrevented, isFalse);
 
@@ -129,6 +131,7 @@ void testMain() {
         'location': 0,
         //          ctrl
         'metaState': 0x4,
+        'keyCode': 0,
       });
 
       event = dispatchKeyboardEvent(
@@ -148,6 +151,7 @@ void testMain() {
         'location': 0,
         //          shift  alt   meta
         'metaState': 0x1 | 0x2 | 0x8,
+        'keyCode': 0,
       });
 
       Keyboard.instance!.dispose();
@@ -197,6 +201,7 @@ void testMain() {
         'key': 'SomeKey',
         'location': 0,
         'metaState': 0,
+        'keyCode': 0,
       };
       expect(messages, <Map<String, dynamic>>[
         expectedMessage,
@@ -394,6 +399,7 @@ void testMain() {
             'location': 1,
             //           meta
             'metaState': 0x8,
+            'keyCode': 0,
           },
           <String, dynamic>{
             'type': 'keydown',
@@ -403,6 +409,7 @@ void testMain() {
             'location': 1,
             //           alt   meta
             'metaState': 0x2 | 0x8,
+            'keyCode': 0,
           },
           <String, dynamic>{
             'type': 'keydown',
@@ -412,6 +419,7 @@ void testMain() {
             'location': 0,
             //           alt   meta
             'metaState': 0x2 | 0x8,
+            'keyCode': 0,
           },
           <String, dynamic>{
             'type': 'keyup',
@@ -421,6 +429,7 @@ void testMain() {
             'location': 1,
             //           alt
             'metaState': 0x2,
+            'keyCode': 0,
           },
           <String, dynamic>{
             'type': 'keyup',
@@ -429,6 +438,7 @@ void testMain() {
             'code': 'AltLeft',
             'location': 1,
             'metaState': 0x0,
+            'keyCode': 0,
           },
         ]);
         messages.clear();
@@ -446,6 +456,7 @@ void testMain() {
             'code': 'KeyI',
             'location': 0,
             'metaState': 0x0,
+            'keyCode': 0,
           }
         ]);
 
@@ -526,6 +537,7 @@ void testMain() {
             'code': 'KeyI',
             'location': 0,
             'metaState': 0x0,
+            'keyCode': 0,
           });
         }
         messages.clear();
@@ -621,6 +633,7 @@ void testMain() {
           'location': 0,
           //           alt
           'metaState': 0x2,
+          'keyCode': 0,
         }
       ]);
 
@@ -654,6 +667,7 @@ html.KeyboardEvent dispatchKeyboardEvent(
   bool isAltPressed = false,
   bool isControlPressed = false,
   bool isMetaPressed = false,
+  int keyCode = 0,
 }) {
   target ??= html.window;
 
@@ -670,6 +684,7 @@ html.KeyboardEvent dispatchKeyboardEvent(
       'altKey': isAltPressed,
       'ctrlKey': isControlPressed,
       'metaKey': isMetaPressed,
+      'keyCode': keyCode,
       'bubbles': true,
       'cancelable': true,
     }