From 7c72866a21a909392a162d37ae2994a08702cc8a Mon Sep 17 00:00:00 2001
From: Rui Figueira <rui.figueira@gmail.com>
Date: Mon, 17 Jul 2023 19:12:15 +0100
Subject: [PATCH] fix: some shift keys were missing

---
 packages/playwright-core/src/server/input.ts  |  2 +-
 .../src/server/keyboards/index.ts             | 15 +-----
 .../src/server/keyboards/layouts/00000401.ts  |  6 +--
 .../src/server/keyboards/layouts/00000423.ts  |  2 +-
 .../src/server/keyboards/layouts/00000429.ts  |  2 +-
 .../src/server/keyboards/layouts/00000439.ts  | 12 ++---
 .../src/server/keyboards/layouts/00000445.ts  | 14 ++---
 .../src/server/keyboards/layouts/00000446.ts  |  8 +--
 .../src/server/keyboards/layouts/00000447.ts  | 12 ++---
 .../src/server/keyboards/layouts/00000448.ts  | 12 ++---
 .../src/server/keyboards/layouts/0000044A.ts  | 14 ++---
 .../src/server/keyboards/layouts/0000044B.ts  | 14 ++---
 .../src/server/keyboards/layouts/0000044C.ts  |  4 +-
 .../src/server/keyboards/layouts/0000044D.ts  | 12 ++---
 .../src/server/keyboards/layouts/0000044E.ts  | 16 +++---
 .../src/server/keyboards/layouts/00000453.ts  | 10 ++--
 .../src/server/keyboards/layouts/00000454.ts  | 16 +++---
 .../src/server/keyboards/layouts/0000045B.ts  |  6 +--
 .../src/server/keyboards/layouts/0000045C.ts  |  6 +--
 .../src/server/keyboards/layouts/00000461.ts  | 54 +++++++++----------
 .../src/server/keyboards/layouts/00000485.ts  |  4 +-
 .../src/server/keyboards/layouts/00000492.ts  |  2 +-
 .../src/server/keyboards/layouts/0000085D.ts  | 20 +++----
 .../src/server/keyboards/layouts/00001009.ts  |  6 +--
 .../src/server/keyboards/layouts/0000105F.ts  | 14 ++---
 .../src/server/keyboards/layouts/0001042F.ts  |  2 +-
 .../src/server/keyboards/layouts/00010439.ts  | 14 ++---
 .../src/server/keyboards/layouts/00010480.ts  |  2 +-
 .../src/server/keyboards/layouts/00011809.ts  |  2 +-
 .../src/server/keyboards/layouts/00020401.ts  |  8 +--
 .../src/server/keyboards/layouts/0002042B.ts  |  2 +-
 .../src/server/keyboards/layouts/00020445.ts  | 14 ++---
 .../src/server/keyboards/layouts/00020449.ts  | 10 ++--
 .../src/server/keyboards/layouts/00050429.ts  |  6 +--
 .../src/server/keyboards/layouts/00110C00.ts  |  8 +--
 .../src/server/keyboards/types.ts             |  4 +-
 tests/page/page-keyboard-layouts.spec.ts      |  2 +-
 utils/generate_keyboard_layouts.js            | 44 ++++++---------
 38 files changed, 187 insertions(+), 214 deletions(-)

diff --git a/packages/playwright-core/src/server/input.ts b/packages/playwright-core/src/server/input.ts
index 9a4c21b9b066d..8362d7d97041d 100644
--- a/packages/playwright-core/src/server/input.ts
+++ b/packages/playwright-core/src/server/input.ts
@@ -290,7 +290,7 @@ function _buildLayoutClosure(layout: KeyboardLayout): Map<string, KeyDescription
       text: definition.text || '',
       location: definition.location || 0,
     };
-    if (definition.key.length === 1)
+    if (definition.key?.length === 1)
       description.text = description.key;
 
     // Generate shifted definition.
diff --git a/packages/playwright-core/src/server/keyboards/index.ts b/packages/playwright-core/src/server/keyboards/index.ts
index cc98028b78fb0..87b8d112a249b 100644
--- a/packages/playwright-core/src/server/keyboards/index.ts
+++ b/packages/playwright-core/src/server/keyboards/index.ts
@@ -19,20 +19,7 @@
 // This file is generated by generate_keyboard_layouts.js, do not edit manually.
 
 import defaultKeyboardLayoutObject from './layouts/00000409';
-
-export type KeyDefinition = {
-  key: string;
-  keyCode: number;
-  keyCodeWithoutLocation?: number;
-  shiftKey?: string;
-  shiftKeyCode?: number;
-  text?: string;
-  location?: number;
-};
-
-export type KeyboardLayout = { [s: string]: KeyDefinition; };
-
-export type KeyboardLayoutMap = Record<string, KeyboardLayout>;
+import type { KeyboardLayout } from './types';
 
 export type * from './types';
 export const defaultKlid = '00000409';
diff --git a/packages/playwright-core/src/server/keyboards/layouts/00000401.ts b/packages/playwright-core/src/server/keyboards/layouts/00000401.ts
index fd3d3680cea24..8e334ec331f1c 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/00000401.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/00000401.ts
@@ -54,7 +54,7 @@ const keyboardLayout: KeyboardLayout = {
   KeyW: { key: 'ص', keyCode: 87, shiftKey: 'ً' },
   KeyE: { key: 'ث', keyCode: 69, shiftKey: 'ُ' },
   KeyR: { key: 'ق', keyCode: 82, shiftKey: 'ٌ' },
-  KeyT: { key: 'ف', keyCode: 84 },
+  KeyT: { key: 'ف', keyCode: 84, shiftKey: 'ل' },
   KeyY: { key: 'غ', keyCode: 89, shiftKey: 'إ' },
   KeyU: { key: 'ع', keyCode: 85, shiftKey: '‘' },
   KeyI: { key: 'ه', keyCode: 73, shiftKey: '÷' },
@@ -68,7 +68,7 @@ const keyboardLayout: KeyboardLayout = {
   KeyS: { key: 'س', keyCode: 83, shiftKey: 'ٍ' },
   KeyD: { key: 'ي', keyCode: 68, shiftKey: ']' },
   KeyF: { key: 'ب', keyCode: 70, shiftKey: '[' },
-  KeyG: { key: 'ل', keyCode: 71 },
+  KeyG: { key: 'ل', keyCode: 71, shiftKey: 'ل' },
   KeyH: { key: 'ا', keyCode: 72, shiftKey: 'أ' },
   KeyJ: { key: 'ت', keyCode: 74, shiftKey: 'ـ' },
   KeyK: { key: 'ن', keyCode: 75, shiftKey: '،' },
@@ -82,7 +82,7 @@ const keyboardLayout: KeyboardLayout = {
   KeyX: { key: 'ء', keyCode: 88, shiftKey: 'ْ' },
   KeyC: { key: 'ؤ', keyCode: 67, shiftKey: '}' },
   KeyV: { key: 'ر', keyCode: 86, shiftKey: '{' },
-  KeyB: { key: 'KeyB', keyCode: 66 },
+  KeyB: { key: 'ل', keyCode: 66, shiftKey: 'ل' },
   KeyN: { key: 'ى', keyCode: 78, shiftKey: 'آ' },
   KeyM: { key: 'ة', keyCode: 77, shiftKey: '’' },
   Comma: { key: 'و', keyCode: 188, shiftKey: ',' },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/00000423.ts b/packages/playwright-core/src/server/keyboards/layouts/00000423.ts
index ddf0a47e27116..76e1c94b4f168 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/00000423.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/00000423.ts
@@ -61,7 +61,7 @@ const keyboardLayout: KeyboardLayout = {
   KeyO: { key: 'ў', keyCode: 79, shiftKey: 'Ў' },
   KeyP: { key: 'з', keyCode: 80, shiftKey: 'З' },
   BracketLeft: { key: 'х', keyCode: 219, shiftKey: 'Х' },
-  BracketRight: { key: '\'', keyCode: 221 },
+  BracketRight: { key: '\'', keyCode: 221, shiftKey: '\'' },
   Enter: { key: 'Enter', keyCode: 13, text: '\r' },
   CapsLock: { key: 'CapsLock', keyCode: 20 },
   KeyA: { key: 'ф', keyCode: 65, shiftKey: 'Ф' },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/00000429.ts b/packages/playwright-core/src/server/keyboards/layouts/00000429.ts
index 9d10ebfc89e95..5dfb548f65371 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/00000429.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/00000429.ts
@@ -53,7 +53,7 @@ const keyboardLayout: KeyboardLayout = {
   KeyQ: { key: 'ض', keyCode: 81, shiftKey: 'ً' },
   KeyW: { key: 'ص', keyCode: 87, shiftKey: 'ٌ' },
   KeyE: { key: 'ث', keyCode: 69, shiftKey: 'ٍ' },
-  KeyR: { key: 'ق', keyCode: 82 },
+  KeyR: { key: 'ق', keyCode: 82, shiftKey: 'ر' },
   KeyT: { key: 'ف', keyCode: 84, shiftKey: '،' },
   KeyY: { key: 'غ', keyCode: 89, shiftKey: '؛' },
   KeyU: { key: 'ع', keyCode: 85, shiftKey: ',' },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/00000439.ts b/packages/playwright-core/src/server/keyboards/layouts/00000439.ts
index 59429d1d3ffd0..129a606d8a888 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/00000439.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/00000439.ts
@@ -38,12 +38,12 @@ const keyboardLayout: KeyboardLayout = {
   Backquote: { key: 'ॊ', keyCode: 192, shiftKey: 'ऒ' },
   Digit1: { key: '1', keyCode: 49, shiftKey: 'ऍ' },
   Digit2: { key: '2', keyCode: 50, shiftKey: 'ॅ' },
-  Digit3: { key: '3', keyCode: 51 },
-  Digit4: { key: '4', keyCode: 52 },
-  Digit5: { key: '5', keyCode: 53 },
-  Digit6: { key: '6', keyCode: 54 },
-  Digit7: { key: '7', keyCode: 55 },
-  Digit8: { key: '8', keyCode: 56 },
+  Digit3: { key: '3', keyCode: 51, shiftKey: '्' },
+  Digit4: { key: '4', keyCode: 52, shiftKey: 'र' },
+  Digit5: { key: '5', keyCode: 53, shiftKey: 'ज' },
+  Digit6: { key: '6', keyCode: 54, shiftKey: 'त' },
+  Digit7: { key: '7', keyCode: 55, shiftKey: 'क' },
+  Digit8: { key: '8', keyCode: 56, shiftKey: 'श' },
   Digit9: { key: '9', keyCode: 57, shiftKey: '(' },
   Digit0: { key: '0', keyCode: 48, shiftKey: ')' },
   Minus: { key: '-', keyCode: 189, shiftKey: 'ः' },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/00000445.ts b/packages/playwright-core/src/server/keyboards/layouts/00000445.ts
index 784a3a2230520..49a18bed1d556 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/00000445.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/00000445.ts
@@ -35,14 +35,14 @@ const keyboardLayout: KeyboardLayout = {
   F10: { key: 'F10', keyCode: 121 },
   F11: { key: 'F11', keyCode: 122 },
   F12: { key: 'F12', keyCode: 123 },
-  Digit1: { key: '1', keyCode: 49 },
+  Digit1: { key: '1', keyCode: 49, shiftKey: 'অ' },
   Digit2: { key: '2', keyCode: 50 },
-  Digit3: { key: '3', keyCode: 51 },
-  Digit4: { key: '4', keyCode: 52 },
-  Digit5: { key: '5', keyCode: 53 },
-  Digit6: { key: '6', keyCode: 54 },
-  Digit7: { key: '7', keyCode: 55 },
-  Digit8: { key: '8', keyCode: 56 },
+  Digit3: { key: '3', keyCode: 51, shiftKey: '্' },
+  Digit4: { key: '4', keyCode: 52, shiftKey: 'র' },
+  Digit5: { key: '5', keyCode: 53, shiftKey: 'জ' },
+  Digit6: { key: '6', keyCode: 54, shiftKey: 'ত' },
+  Digit7: { key: '7', keyCode: 55, shiftKey: 'ক' },
+  Digit8: { key: '8', keyCode: 56, shiftKey: 'শ' },
   Digit9: { key: '9', keyCode: 57, shiftKey: '(' },
   Digit0: { key: '0', keyCode: 48, shiftKey: ')' },
   Minus: { key: '-', keyCode: 189, shiftKey: 'ঃ' },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/00000446.ts b/packages/playwright-core/src/server/keyboards/layouts/00000446.ts
index 4c1fe201a47a3..f2e6724c43e60 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/00000446.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/00000446.ts
@@ -35,10 +35,10 @@ const keyboardLayout: KeyboardLayout = {
   F10: { key: 'F10', keyCode: 121 },
   F11: { key: 'F11', keyCode: 122 },
   F12: { key: 'F12', keyCode: 123 },
-  Backquote: { key: 'Backquote', keyCode: 192 },
-  Digit1: { key: '1', keyCode: 49 },
-  Digit2: { key: '2', keyCode: 50 },
-  Digit3: { key: '3', keyCode: 51 },
+  Backquote: { keyCode: 192, shiftKey: '੍' },
+  Digit1: { key: '1', keyCode: 49, shiftKey: '੍' },
+  Digit2: { key: '2', keyCode: 50, shiftKey: '੍' },
+  Digit3: { key: '3', keyCode: 51, shiftKey: '੍' },
   Digit4: { key: '4', keyCode: 52, shiftKey: 'ੱ' },
   Digit5: { key: '5', keyCode: 53 },
   Digit6: { key: '6', keyCode: 54 },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/00000447.ts b/packages/playwright-core/src/server/keyboards/layouts/00000447.ts
index 7ff75358a9bc4..d3388aa37e6fd 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/00000447.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/00000447.ts
@@ -37,12 +37,12 @@ const keyboardLayout: KeyboardLayout = {
   F12: { key: 'F12', keyCode: 123 },
   Digit1: { key: '1', keyCode: 49, shiftKey: 'ઍ' },
   Digit2: { key: '2', keyCode: 50, shiftKey: 'ૅ' },
-  Digit3: { key: '3', keyCode: 51 },
-  Digit4: { key: '4', keyCode: 52 },
-  Digit5: { key: '5', keyCode: 53 },
-  Digit6: { key: '6', keyCode: 54 },
-  Digit7: { key: '7', keyCode: 55 },
-  Digit8: { key: '8', keyCode: 56 },
+  Digit3: { key: '3', keyCode: 51, shiftKey: '્' },
+  Digit4: { key: '4', keyCode: 52, shiftKey: 'ર' },
+  Digit5: { key: '5', keyCode: 53, shiftKey: 'જ' },
+  Digit6: { key: '6', keyCode: 54, shiftKey: 'ત' },
+  Digit7: { key: '7', keyCode: 55, shiftKey: 'ક' },
+  Digit8: { key: '8', keyCode: 56, shiftKey: 'શ' },
   Digit9: { key: '9', keyCode: 57, shiftKey: '(' },
   Digit0: { key: '0', keyCode: 48, shiftKey: ')' },
   Minus: { key: '-', keyCode: 189, shiftKey: 'ઃ' },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/00000448.ts b/packages/playwright-core/src/server/keyboards/layouts/00000448.ts
index b5498f0fe0b57..28824ff4d3b05 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/00000448.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/00000448.ts
@@ -37,12 +37,12 @@ const keyboardLayout: KeyboardLayout = {
   F12: { key: 'F12', keyCode: 123 },
   Digit1: { key: '1', keyCode: 49 },
   Digit2: { key: '2', keyCode: 50 },
-  Digit3: { key: '3', keyCode: 51 },
-  Digit4: { key: '4', keyCode: 52 },
-  Digit5: { key: '5', keyCode: 53 },
-  Digit6: { key: '6', keyCode: 54 },
-  Digit7: { key: '7', keyCode: 55 },
-  Digit8: { key: '8', keyCode: 56 },
+  Digit3: { key: '3', keyCode: 51, shiftKey: '୍' },
+  Digit4: { key: '4', keyCode: 52, shiftKey: 'ର' },
+  Digit5: { key: '5', keyCode: 53, shiftKey: 'ଜ' },
+  Digit6: { key: '6', keyCode: 54, shiftKey: 'ତ' },
+  Digit7: { key: '7', keyCode: 55, shiftKey: 'କ' },
+  Digit8: { key: '8', keyCode: 56, shiftKey: 'ଶ' },
   Digit9: { key: '9', keyCode: 57, shiftKey: '(' },
   Digit0: { key: '0', keyCode: 48, shiftKey: ')' },
   Minus: { key: '-', keyCode: 189, shiftKey: 'ଃ' },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/0000044A.ts b/packages/playwright-core/src/server/keyboards/layouts/0000044A.ts
index f06367639892c..61266ead25bd0 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/0000044A.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/0000044A.ts
@@ -38,12 +38,12 @@ const keyboardLayout: KeyboardLayout = {
   Backquote: { key: 'ొ', keyCode: 192, shiftKey: 'ఒ' },
   Digit1: { key: '1', keyCode: 49 },
   Digit2: { key: '2', keyCode: 50 },
-  Digit3: { key: '3', keyCode: 51 },
+  Digit3: { key: '3', keyCode: 51, shiftKey: '్' },
   Digit4: { key: '4', keyCode: 52 },
-  Digit5: { key: '5', keyCode: 53 },
-  Digit6: { key: '6', keyCode: 54 },
-  Digit7: { key: '7', keyCode: 55 },
-  Digit8: { key: '8', keyCode: 56 },
+  Digit5: { key: '5', keyCode: 53, shiftKey: 'జ' },
+  Digit6: { key: '6', keyCode: 54, shiftKey: 'త' },
+  Digit7: { key: '7', keyCode: 55, shiftKey: 'క' },
+  Digit8: { key: '8', keyCode: 56, shiftKey: 'శ' },
   Digit9: { key: '9', keyCode: 57, shiftKey: '(' },
   Digit0: { key: '0', keyCode: 48, shiftKey: ')' },
   Minus: { key: '-', keyCode: 189, shiftKey: 'ః' },
@@ -61,7 +61,7 @@ const keyboardLayout: KeyboardLayout = {
   KeyO: { key: 'ద', keyCode: 79, shiftKey: 'ధ' },
   KeyP: { key: 'జ', keyCode: 80, shiftKey: 'ఝ' },
   BracketLeft: { key: 'డ', keyCode: 219, shiftKey: 'ఢ' },
-  BracketRight: { key: 'BracketRight', keyCode: 221, shiftKey: 'ఞ' },
+  BracketRight: { keyCode: 221, shiftKey: 'ఞ' },
   Enter: { key: 'Enter', keyCode: 13, text: '\r' },
   CapsLock: { key: 'CapsLock', keyCode: 20 },
   KeyA: { key: 'ో', keyCode: 65, shiftKey: 'ఓ' },
@@ -79,7 +79,7 @@ const keyboardLayout: KeyboardLayout = {
   KeyZ: { key: 'ె', keyCode: 90, shiftKey: 'ఎ' },
   KeyX: { key: 'ం', keyCode: 88, shiftKey: 'ఁ' },
   KeyC: { key: 'మ', keyCode: 67, shiftKey: 'ణ' },
-  KeyV: { key: 'న', keyCode: 86 },
+  KeyV: { key: 'న', keyCode: 86, shiftKey: 'న' },
   KeyB: { key: 'వ', keyCode: 66 },
   KeyN: { key: 'ల', keyCode: 78, shiftKey: 'ళ' },
   KeyM: { key: 'స', keyCode: 77, shiftKey: 'శ' },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/0000044B.ts b/packages/playwright-core/src/server/keyboards/layouts/0000044B.ts
index 0072f1f6b3a48..e11ff76f4a5d3 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/0000044B.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/0000044B.ts
@@ -38,12 +38,12 @@ const keyboardLayout: KeyboardLayout = {
   Backquote: { key: 'ೊ', keyCode: 192, shiftKey: 'ಒ' },
   Digit1: { key: '1', keyCode: 49 },
   Digit2: { key: '2', keyCode: 50 },
-  Digit3: { key: '3', keyCode: 51 },
-  Digit4: { key: '4', keyCode: 52 },
-  Digit5: { key: '5', keyCode: 53 },
-  Digit6: { key: '6', keyCode: 54 },
-  Digit7: { key: '7', keyCode: 55 },
-  Digit8: { key: '8', keyCode: 56 },
+  Digit3: { key: '3', keyCode: 51, shiftKey: '್' },
+  Digit4: { key: '4', keyCode: 52, shiftKey: 'ರ' },
+  Digit5: { key: '5', keyCode: 53, shiftKey: 'ಜ' },
+  Digit6: { key: '6', keyCode: 54, shiftKey: 'ತ' },
+  Digit7: { key: '7', keyCode: 55, shiftKey: 'ಕ' },
+  Digit8: { key: '8', keyCode: 56, shiftKey: 'ಶ' },
   Digit9: { key: '9', keyCode: 57, shiftKey: '(' },
   Digit0: { key: '0', keyCode: 48, shiftKey: ')' },
   Minus: { key: '-', keyCode: 189, shiftKey: 'ಃ' },
@@ -61,7 +61,7 @@ const keyboardLayout: KeyboardLayout = {
   KeyO: { key: 'ದ', keyCode: 79, shiftKey: 'ಧ' },
   KeyP: { key: 'ಜ', keyCode: 80, shiftKey: 'ಝ' },
   BracketLeft: { key: 'ಡ', keyCode: 219, shiftKey: 'ಢ' },
-  BracketRight: { key: 'BracketRight', keyCode: 221, shiftKey: 'ಞ' },
+  BracketRight: { keyCode: 221, shiftKey: 'ಞ' },
   Enter: { key: 'Enter', keyCode: 13, text: '\r' },
   CapsLock: { key: 'CapsLock', keyCode: 20 },
   KeyA: { key: 'ೋ', keyCode: 65, shiftKey: 'ಓ' },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/0000044C.ts b/packages/playwright-core/src/server/keyboards/layouts/0000044C.ts
index 0925b895f84f6..aa10d8b5ffadd 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/0000044C.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/0000044C.ts
@@ -38,11 +38,11 @@ const keyboardLayout: KeyboardLayout = {
   Backquote: { key: 'ൊ', keyCode: 192, shiftKey: 'ഒ' },
   Digit1: { key: '1', keyCode: 49 },
   Digit2: { key: '2', keyCode: 50 },
-  Digit3: { key: '3', keyCode: 51 },
+  Digit3: { key: '3', keyCode: 51, shiftKey: '്' },
   Digit4: { key: '4', keyCode: 52 },
   Digit5: { key: '5', keyCode: 53 },
   Digit6: { key: '6', keyCode: 54, shiftKey: 'ൿ' },
-  Digit7: { key: '7', keyCode: 55 },
+  Digit7: { key: '7', keyCode: 55, shiftKey: 'ക' },
   Digit8: { key: '8', keyCode: 56, shiftKey: 'ൾ' },
   Digit9: { key: '9', keyCode: 57, shiftKey: '(' },
   Digit0: { key: '0', keyCode: 48, shiftKey: ')' },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/0000044D.ts b/packages/playwright-core/src/server/keyboards/layouts/0000044D.ts
index 9b9e791684cc6..05c14a0dd31b5 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/0000044D.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/0000044D.ts
@@ -38,12 +38,12 @@ const keyboardLayout: KeyboardLayout = {
   Backquote: { key: '॥', keyCode: 192 },
   Digit1: { key: '১', keyCode: 49, shiftKey: '!' },
   Digit2: { key: '২', keyCode: 50, shiftKey: '@' },
-  Digit3: { key: '৩', keyCode: 51 },
-  Digit4: { key: '৪', keyCode: 52 },
-  Digit5: { key: '৫', keyCode: 53 },
-  Digit6: { key: '৬', keyCode: 54 },
-  Digit7: { key: '৭', keyCode: 55 },
-  Digit8: { key: '৮', keyCode: 56 },
+  Digit3: { key: '৩', keyCode: 51, shiftKey: '্' },
+  Digit4: { key: '৪', keyCode: 52, shiftKey: 'ৰ' },
+  Digit5: { key: '৫', keyCode: 53, shiftKey: 'জ' },
+  Digit6: { key: '৬', keyCode: 54, shiftKey: 'ত' },
+  Digit7: { key: '৭', keyCode: 55, shiftKey: 'ক' },
+  Digit8: { key: '৮', keyCode: 56, shiftKey: 'শ' },
   Digit9: { key: '৯', keyCode: 57, shiftKey: '(' },
   Digit0: { key: '০', keyCode: 48, shiftKey: ')' },
   Minus: { key: '-', keyCode: 189, shiftKey: 'ঃ' },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/0000044E.ts b/packages/playwright-core/src/server/keyboards/layouts/0000044E.ts
index ec992dd31b12e..f8e639ee6f720 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/0000044E.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/0000044E.ts
@@ -35,15 +35,15 @@ const keyboardLayout: KeyboardLayout = {
   F10: { key: 'F10', keyCode: 121 },
   F11: { key: 'F11', keyCode: 122 },
   F12: { key: 'F12', keyCode: 123 },
-  Backquote: { key: 'Backquote', keyCode: 192 },
+  Backquote: { keyCode: 192 },
   Digit1: { key: '१', keyCode: 49, shiftKey: 'ऍ' },
   Digit2: { key: '२', keyCode: 50, shiftKey: 'ॅ' },
-  Digit3: { key: '३', keyCode: 51 },
-  Digit4: { key: '४', keyCode: 52 },
-  Digit5: { key: '५', keyCode: 53 },
-  Digit6: { key: '६', keyCode: 54 },
-  Digit7: { key: '७', keyCode: 55 },
-  Digit8: { key: '८', keyCode: 56 },
+  Digit3: { key: '३', keyCode: 51, shiftKey: '्' },
+  Digit4: { key: '४', keyCode: 52, shiftKey: 'र' },
+  Digit5: { key: '५', keyCode: 53, shiftKey: 'ज' },
+  Digit6: { key: '६', keyCode: 54, shiftKey: 'त' },
+  Digit7: { key: '७', keyCode: 55, shiftKey: 'क' },
+  Digit8: { key: '८', keyCode: 56, shiftKey: 'श' },
   Digit9: { key: '९', keyCode: 57, shiftKey: '(' },
   Digit0: { key: '०', keyCode: 48, shiftKey: ')' },
   Minus: { key: '-', keyCode: 189, shiftKey: 'ः' },
@@ -78,7 +78,7 @@ const keyboardLayout: KeyboardLayout = {
   Backslash: { key: 'ॉ', keyCode: 220, shiftKey: 'ऑ' },
   ShiftLeft: { key: 'Shift', keyCode: 160, keyCodeWithoutLocation: 16, location: 1 },
   IntlBackslash: { key: 'ॉ', keyCode: 226, shiftKey: 'ऑ' },
-  KeyZ: { key: 'KeyZ', keyCode: 90 },
+  KeyZ: { keyCode: 90 },
   KeyX: { key: 'ं', keyCode: 88, shiftKey: 'ँ' },
   KeyC: { key: 'म', keyCode: 67, shiftKey: 'ण' },
   KeyV: { key: 'न', keyCode: 86 },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/00000453.ts b/packages/playwright-core/src/server/keyboards/layouts/00000453.ts
index e7f3bf8a094bb..9a89046d20642 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/00000453.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/00000453.ts
@@ -60,17 +60,17 @@ const keyboardLayout: KeyboardLayout = {
   KeyI: { key: 'ិ', keyCode: 73, shiftKey: 'ី' },
   KeyO: { key: 'ោ', keyCode: 79, shiftKey: 'ៅ' },
   KeyP: { key: 'ផ', keyCode: 80, shiftKey: 'ភ' },
-  BracketLeft: { key: 'ើ', keyCode: 219 },
+  BracketLeft: { key: 'ើ', keyCode: 219, shiftKey: 'ោ' },
   BracketRight: { key: 'ឿ', keyCode: 221, shiftKey: 'ៀ' },
   Enter: { key: 'Enter', keyCode: 13, text: '\r' },
   CapsLock: { key: 'CapsLock', keyCode: 20 },
   KeyA: { key: 'ា', keyCode: 65, shiftKey: 'ៃ' },
-  KeyS: { key: 'ស', keyCode: 83 },
+  KeyS: { key: 'ស', keyCode: 83, shiftKey: 'ា' },
   KeyD: { key: 'ដ', keyCode: 68, shiftKey: 'ឌ' },
   KeyF: { key: 'ថ', keyCode: 70, shiftKey: 'ធ' },
-  KeyG: { key: 'ង', keyCode: 71 },
+  KeyG: { key: 'ង', keyCode: 71, shiftKey: 'ុ' },
   KeyH: { key: 'ហ', keyCode: 72, shiftKey: 'ះ' },
-  KeyJ: { key: 'ញ', keyCode: 74 },
+  KeyJ: { key: 'ញ', keyCode: 74, shiftKey: 'ុ' },
   KeyK: { key: 'ក', keyCode: 75, shiftKey: 'គ' },
   KeyL: { key: 'ល', keyCode: 76, shiftKey: 'ឡ' },
   Semicolon: { key: 'ៈ', keyCode: 186, shiftKey: '៖' },
@@ -80,7 +80,7 @@ const keyboardLayout: KeyboardLayout = {
   KeyZ: { key: 'ឋ', keyCode: 90, shiftKey: 'ឍ' },
   KeyX: { key: 'ខ', keyCode: 88, shiftKey: 'ឃ' },
   KeyC: { key: 'ច', keyCode: 67, shiftKey: 'ជ' },
-  KeyV: { key: 'វ', keyCode: 86 },
+  KeyV: { key: 'វ', keyCode: 86, shiftKey: 'េ' },
   KeyB: { key: 'ប', keyCode: 66, shiftKey: 'ព' },
   KeyN: { key: 'ន', keyCode: 78, shiftKey: 'ណ' },
   KeyM: { key: 'ម', keyCode: 77, shiftKey: 'ំ' },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/00000454.ts b/packages/playwright-core/src/server/keyboards/layouts/00000454.ts
index 7ab55c9def518..921a0127c34b7 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/00000454.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/00000454.ts
@@ -47,24 +47,24 @@ const keyboardLayout: KeyboardLayout = {
   Digit9: { key: 'ຈ', keyCode: 57, shiftKey: '7' },
   Digit0: { key: 'ຂ', keyCode: 48, shiftKey: '8' },
   Minus: { key: 'ຊ', keyCode: 189, shiftKey: '9' },
-  Equal: { key: 'ໍ', keyCode: 187 },
+  Equal: { key: 'ໍ', keyCode: 187, shiftKey: 'ໍ' },
   Backspace: { key: 'Backspace', keyCode: 8 },
   Tab: { key: 'Tab', keyCode: 9 },
-  KeyQ: { key: 'ົ', keyCode: 81 },
+  KeyQ: { key: 'ົ', keyCode: 81, shiftKey: 'ົ' },
   KeyW: { key: 'ໄ', keyCode: 87, shiftKey: '0' },
   KeyE: { key: 'ຳ', keyCode: 69, shiftKey: '*' },
   KeyR: { key: 'ພ', keyCode: 82, shiftKey: '_' },
   KeyT: { key: 'ະ', keyCode: 84, shiftKey: '+' },
-  KeyY: { key: 'ິ', keyCode: 89 },
-  KeyU: { key: 'ີ', keyCode: 85 },
+  KeyY: { key: 'ິ', keyCode: 89, shiftKey: 'ິ' },
+  KeyU: { key: 'ີ', keyCode: 85, shiftKey: 'ີ' },
   KeyI: { key: 'ຮ', keyCode: 73, shiftKey: 'ຣ' },
   KeyO: { key: 'ນ', keyCode: 79, shiftKey: 'ໜ' },
   KeyP: { key: 'ຍ', keyCode: 80, shiftKey: 'ຽ' },
   BracketLeft: { key: 'ບ', keyCode: 219, shiftKey: '-' },
-  BracketRight: { key: 'ລ', keyCode: 221 },
+  BracketRight: { key: 'ລ', keyCode: 221, shiftKey: 'ຫ' },
   Enter: { key: 'Enter', keyCode: 13, text: '\r' },
   CapsLock: { key: 'CapsLock', keyCode: 20 },
-  KeyA: { key: 'ັ', keyCode: 65 },
+  KeyA: { key: 'ັ', keyCode: 65, shiftKey: 'ັ' },
   KeyS: { key: 'ຫ', keyCode: 83, shiftKey: ';' },
   KeyD: { key: 'ກ', keyCode: 68, shiftKey: '.' },
   KeyF: { key: 'ດ', keyCode: 70, shiftKey: ',' },
@@ -81,8 +81,8 @@ const keyboardLayout: KeyboardLayout = {
   KeyX: { key: 'ປ', keyCode: 88, shiftKey: '(' },
   KeyC: { key: 'ແ', keyCode: 67, shiftKey: 'ຯ' },
   KeyV: { key: 'ອ', keyCode: 86, shiftKey: 'x' },
-  KeyB: { key: 'ຶ', keyCode: 66 },
-  KeyN: { key: 'ື', keyCode: 78 },
+  KeyB: { key: 'ຶ', keyCode: 66, shiftKey: 'ຶ' },
+  KeyN: { key: 'ື', keyCode: 78, shiftKey: 'ື' },
   KeyM: { key: 'ທ', keyCode: 77, shiftKey: 'ໆ' },
   Comma: { key: 'ມ', keyCode: 188, shiftKey: 'ໝ' },
   Period: { key: 'ໃ', keyCode: 190, shiftKey: '$' },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/0000045B.ts b/packages/playwright-core/src/server/keyboards/layouts/0000045B.ts
index ecc62152fe72f..01d6c3d785738 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/0000045B.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/0000045B.ts
@@ -35,7 +35,7 @@ const keyboardLayout: KeyboardLayout = {
   F10: { key: 'F10', keyCode: 121 },
   F11: { key: 'F11', keyCode: 122 },
   F12: { key: 'F12', keyCode: 123 },
-  Backquote: { key: 'Backquote', keyCode: 192 },
+  Backquote: { key: '්', keyCode: 192, shiftKey: 'ර' },
   Digit1: { key: '1', keyCode: 49, shiftKey: '!' },
   Digit2: { key: '2', keyCode: 50, shiftKey: '@' },
   Digit3: { key: '3', keyCode: 51, shiftKey: '$' },
@@ -69,8 +69,8 @@ const keyboardLayout: KeyboardLayout = {
   KeyD: { key: 'ා', keyCode: 68, shiftKey: 'ෘ' },
   KeyF: { key: 'ෙ', keyCode: 70, shiftKey: 'ෆ' },
   KeyG: { key: 'ට', keyCode: 71, shiftKey: 'ඨ' },
-  KeyH: { key: 'ය', keyCode: 72 },
-  KeyJ: { key: 'ව', keyCode: 74 },
+  KeyH: { key: 'ය', keyCode: 72, shiftKey: '්' },
+  KeyJ: { key: 'ව', keyCode: 74, shiftKey: 'ළ' },
   KeyK: { key: 'න', keyCode: 75, shiftKey: 'ණ' },
   KeyL: { key: 'ක', keyCode: 76, shiftKey: 'ඛ' },
   Semicolon: { key: 'ත', keyCode: 186, shiftKey: 'ථ' },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/0000045C.ts b/packages/playwright-core/src/server/keyboards/layouts/0000045C.ts
index 57696b5ae0772..93ea09b21c264 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/0000045C.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/0000045C.ts
@@ -36,9 +36,9 @@ const keyboardLayout: KeyboardLayout = {
   F11: { key: 'F11', keyCode: 122 },
   F12: { key: 'F12', keyCode: 123 },
   Backquote: { key: '`', keyCode: 222, shiftKey: 'Ꮚ' },
-  Digit1: { key: 'Digit1', keyCode: 49, shiftKey: 'Ꮁ' },
-  Digit2: { key: 'Digit2', keyCode: 50, shiftKey: 'Ꮗ' },
-  Digit3: { key: 'Digit3', keyCode: 51, shiftKey: 'Ꮷ' },
+  Digit1: { key: 'Ꮳ', keyCode: 49, shiftKey: 'Ꮁ' },
+  Digit2: { key: 'Ꭳ', keyCode: 50, shiftKey: 'Ꮗ' },
+  Digit3: { key: 'Ꮹ', keyCode: 51, shiftKey: 'Ꮷ' },
   Digit4: { key: 'Ꮩ', keyCode: 52, shiftKey: 'Ꮀ' },
   Digit5: { key: 'Ꮶ', keyCode: 53, shiftKey: 'Ꮉ' },
   Digit6: { key: 'Ꮬ', keyCode: 54, shiftKey: 'Ꮭ' },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/00000461.ts b/packages/playwright-core/src/server/keyboards/layouts/00000461.ts
index a62d61d12aad2..11552d8edbcfb 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/00000461.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/00000461.ts
@@ -35,8 +35,8 @@ const keyboardLayout: KeyboardLayout = {
   F10: { key: 'F10', keyCode: 121 },
   F11: { key: 'F11', keyCode: 122 },
   F12: { key: 'F12', keyCode: 123 },
-  Backquote: { key: 'ञ', keyCode: 192 },
-  Digit1: { key: 'Digit1', keyCode: 49, shiftKey: '१' },
+  Backquote: { key: 'ञ', keyCode: 192, shiftKey: 'ञ' },
+  Digit1: { key: 'ज', keyCode: 49, shiftKey: '१' },
   Digit2: { key: 'घ', keyCode: 50, shiftKey: '२' },
   Digit3: { key: 'ङ', keyCode: 51, shiftKey: '३' },
   Digit4: { key: 'झ', keyCode: 52, shiftKey: '४' },
@@ -50,43 +50,43 @@ const keyboardLayout: KeyboardLayout = {
   Equal: { key: '.', keyCode: 187, shiftKey: 'ं' },
   Backspace: { key: 'Backspace', keyCode: 8 },
   Tab: { key: 'Tab', keyCode: 9 },
-  KeyQ: { key: 'KeyQ', keyCode: 81, shiftKey: 'ो' },
-  KeyW: { key: 'ध', keyCode: 87 },
-  KeyE: { key: 'भ', keyCode: 69 },
-  KeyR: { key: 'च', keyCode: 82 },
-  KeyT: { key: 'त', keyCode: 84 },
-  KeyY: { key: 'थ', keyCode: 89 },
-  KeyU: { key: 'ग', keyCode: 85 },
-  KeyI: { key: 'ष', keyCode: 73 },
+  KeyQ: { key: 'त', keyCode: 81, shiftKey: 'ो' },
+  KeyW: { key: 'ध', keyCode: 87, shiftKey: 'ध' },
+  KeyE: { key: 'भ', keyCode: 69, shiftKey: 'भ' },
+  KeyR: { key: 'च', keyCode: 82, shiftKey: 'च' },
+  KeyT: { key: 'त', keyCode: 84, shiftKey: 'त' },
+  KeyY: { key: 'थ', keyCode: 89, shiftKey: 'थ' },
+  KeyU: { key: 'ग', keyCode: 85, shiftKey: 'ग' },
+  KeyI: { key: 'ष', keyCode: 73, shiftKey: 'क' },
   KeyO: { key: 'य', keyCode: 79, shiftKey: 'इ' },
   KeyP: { key: 'उ', keyCode: 80, shiftKey: 'ए' },
-  BracketLeft: { key: 'ृ', keyCode: 219 },
+  BracketLeft: { key: 'ृ', keyCode: 219, shiftKey: 'र' },
   BracketRight: { key: 'े', keyCode: 221, shiftKey: 'ै' },
   Enter: { key: 'Enter', keyCode: 13, text: '\r' },
   CapsLock: { key: 'CapsLock', keyCode: 20 },
-  KeyA: { key: 'ब', keyCode: 65 },
-  KeyS: { key: 'क', keyCode: 83 },
-  KeyD: { key: 'म', keyCode: 68 },
+  KeyA: { key: 'ब', keyCode: 65, shiftKey: 'ब' },
+  KeyS: { key: 'क', keyCode: 83, shiftKey: 'क' },
+  KeyD: { key: 'म', keyCode: 68, shiftKey: 'म' },
   KeyF: { key: 'ा', keyCode: 70, shiftKey: 'ँ' },
-  KeyG: { key: 'न', keyCode: 71 },
-  KeyH: { key: 'ज', keyCode: 72 },
-  KeyJ: { key: 'व', keyCode: 74 },
-  KeyK: { key: 'प', keyCode: 75 },
+  KeyG: { key: 'न', keyCode: 71, shiftKey: 'न' },
+  KeyH: { key: 'ज', keyCode: 72, shiftKey: 'ज' },
+  KeyJ: { key: 'व', keyCode: 74, shiftKey: 'व' },
+  KeyK: { key: 'प', keyCode: 75, shiftKey: 'प' },
   KeyL: { key: 'ि', keyCode: 76, shiftKey: 'ी' },
-  Semicolon: { key: 'स', keyCode: 186 },
+  Semicolon: { key: 'स', keyCode: 186, shiftKey: 'स' },
   Quote: { key: 'ु', keyCode: 222, shiftKey: 'ू' },
-  Backslash: { key: 'Backslash', keyCode: 220, shiftKey: '्' },
+  Backslash: { key: '्', keyCode: 220, shiftKey: '्' },
   ShiftLeft: { key: 'Shift', keyCode: 160, keyCodeWithoutLocation: 16, location: 1 },
-  KeyZ: { key: 'श', keyCode: 90 },
-  KeyX: { key: 'ह', keyCode: 88 },
+  KeyZ: { key: 'श', keyCode: 90, shiftKey: 'श' },
+  KeyX: { key: 'ह', keyCode: 88, shiftKey: 'ह' },
   KeyC: { key: 'अ', keyCode: 67, shiftKey: 'ऋ' },
-  KeyV: { key: 'ख', keyCode: 86 },
-  KeyB: { key: 'द', keyCode: 66 },
-  KeyN: { key: 'ल', keyCode: 78 },
+  KeyV: { key: 'ख', keyCode: 86, shiftKey: 'ख' },
+  KeyB: { key: 'द', keyCode: 66, shiftKey: 'द' },
+  KeyN: { key: 'ल', keyCode: 78, shiftKey: 'ल' },
   KeyM: { key: 'फ', keyCode: 77, shiftKey: 'ः' },
   Comma: { key: ',', keyCode: 188, shiftKey: '?' },
-  Period: { key: '।', keyCode: 190 },
-  Slash: { key: 'र', keyCode: 191 },
+  Period: { key: '।', keyCode: 190, shiftKey: 'श' },
+  Slash: { key: 'र', keyCode: 191, shiftKey: 'र' },
   ShiftRight: { key: 'Shift', keyCode: 161, keyCodeWithoutLocation: 16, location: 2 },
   ControlLeft: { key: 'Control', keyCode: 162, keyCodeWithoutLocation: 17, location: 1 },
   MetaLeft: { key: 'Meta', keyCode: 91, location: 1 },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/00000485.ts b/packages/playwright-core/src/server/keyboards/layouts/00000485.ts
index 7c9e512fb3ebe..f7b7ae47348d5 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/00000485.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/00000485.ts
@@ -37,8 +37,8 @@ const keyboardLayout: KeyboardLayout = {
   F12: { key: 'F12', keyCode: 123 },
   Backquote: { key: '"', keyCode: 192, shiftKey: '№' },
   Digit1: { key: '!', keyCode: 49, shiftKey: '?' },
-  Digit2: { key: 'Digit2', keyCode: 50 },
-  Digit3: { key: 'Digit3', keyCode: 51 },
+  Digit2: { key: 'н', keyCode: 50, shiftKey: 'Н' },
+  Digit3: { key: 'д', keyCode: 51, shiftKey: 'Д' },
   Digit4: { key: 'ҥ', keyCode: 52, shiftKey: 'Ҥ' },
   Digit5: { key: 'ҕ', keyCode: 53, shiftKey: 'Ҕ' },
   Digit6: { key: 'ө', keyCode: 54, shiftKey: 'Ө' },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/00000492.ts b/packages/playwright-core/src/server/keyboards/layouts/00000492.ts
index 4898d817e4d2a..6d7ca120a2c67 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/00000492.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/00000492.ts
@@ -51,7 +51,7 @@ const keyboardLayout: KeyboardLayout = {
   Backspace: { key: 'Backspace', keyCode: 8 },
   Tab: { key: 'Tab', keyCode: 9 },
   KeyQ: { key: 'ق', keyCode: 81, shiftKey: '`' },
-  KeyW: { key: 'و', keyCode: 87 },
+  KeyW: { key: 'و', keyCode: 87, shiftKey: 'و' },
   KeyE: { key: 'ە', keyCode: 69, shiftKey: 'ي' },
   KeyR: { key: 'ر', keyCode: 82, shiftKey: 'ڕ' },
   KeyT: { key: 'ت', keyCode: 84, shiftKey: 'ط' },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/0000085D.ts b/packages/playwright-core/src/server/keyboards/layouts/0000085D.ts
index b5537fb5d016f..a1fb168d03f3d 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/0000085D.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/0000085D.ts
@@ -36,16 +36,16 @@ const keyboardLayout: KeyboardLayout = {
   F11: { key: 'F11', keyCode: 122 },
   F12: { key: 'F12', keyCode: 123 },
   Backquote: { key: '`', keyCode: 223, shiftKey: '~' },
-  Digit1: { key: '1', keyCode: 49 },
-  Digit2: { key: '2', keyCode: 50 },
-  Digit3: { key: '3', keyCode: 51 },
-  Digit4: { key: '4', keyCode: 52 },
-  Digit5: { key: '5', keyCode: 53 },
-  Digit6: { key: '6', keyCode: 54 },
-  Digit7: { key: '7', keyCode: 55 },
-  Digit8: { key: '8', keyCode: 56 },
-  Digit9: { key: '9', keyCode: 57 },
-  Digit0: { key: '0', keyCode: 48 },
+  Digit1: { key: '1', keyCode: 49, shiftKey: '1' },
+  Digit2: { key: '2', keyCode: 50, shiftKey: '2' },
+  Digit3: { key: '3', keyCode: 51, shiftKey: '3' },
+  Digit4: { key: '4', keyCode: 52, shiftKey: '4' },
+  Digit5: { key: '5', keyCode: 53, shiftKey: '5' },
+  Digit6: { key: '6', keyCode: 54, shiftKey: '6' },
+  Digit7: { key: '7', keyCode: 55, shiftKey: '7' },
+  Digit8: { key: '8', keyCode: 56, shiftKey: '8' },
+  Digit9: { key: '9', keyCode: 57, shiftKey: '9' },
+  Digit0: { key: '0', keyCode: 48, shiftKey: '0' },
   Minus: { key: '-', keyCode: 189, shiftKey: '_' },
   Equal: { key: '=', keyCode: 187, shiftKey: '+' },
   Backspace: { key: 'Backspace', keyCode: 8 },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/00001009.ts b/packages/playwright-core/src/server/keyboards/layouts/00001009.ts
index 8a0efecd48b20..8cb396d88daa7 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/00001009.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/00001009.ts
@@ -60,7 +60,7 @@ const keyboardLayout: KeyboardLayout = {
   KeyI: { key: 'i', keyCode: 73, shiftKey: 'I' },
   KeyO: { key: 'o', keyCode: 79, shiftKey: 'O' },
   KeyP: { key: 'p', keyCode: 80, shiftKey: 'P' },
-  BracketLeft: { key: '^', keyCode: 219 },
+  BracketLeft: { key: '^', keyCode: 219, shiftKey: '^' },
   BracketRight: { key: '¸', keyCode: 221, shiftKey: '¨' },
   Enter: { key: 'Enter', keyCode: 13, text: '\r' },
   CapsLock: { key: 'CapsLock', keyCode: 20 },
@@ -74,7 +74,7 @@ const keyboardLayout: KeyboardLayout = {
   KeyK: { key: 'k', keyCode: 75, shiftKey: 'K' },
   KeyL: { key: 'l', keyCode: 76, shiftKey: 'L' },
   Semicolon: { key: ';', keyCode: 186, shiftKey: ':' },
-  Quote: { key: '`', keyCode: 192 },
+  Quote: { key: '`', keyCode: 192, shiftKey: '`' },
   Backslash: { key: '<', keyCode: 220, shiftKey: '>' },
   ShiftLeft: { key: 'Shift', keyCode: 160, keyCodeWithoutLocation: 16, location: 1 },
   IntlBackslash: { key: '«', keyCode: 226, shiftKey: '»' },
@@ -86,7 +86,7 @@ const keyboardLayout: KeyboardLayout = {
   KeyN: { key: 'n', keyCode: 78, shiftKey: 'N' },
   KeyM: { key: 'm', keyCode: 77, shiftKey: 'M' },
   Comma: { key: ',', keyCode: 188, shiftKey: '\'' },
-  Period: { key: '.', keyCode: 190 },
+  Period: { key: '.', keyCode: 190, shiftKey: '.' },
   Slash: { key: 'é', keyCode: 191, shiftKey: 'É' },
   ShiftRight: { key: 'Shift', keyCode: 161, keyCodeWithoutLocation: 16, location: 2 },
   ControlLeft: { key: 'Control', keyCode: 162, keyCodeWithoutLocation: 17, location: 1 },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/0000105F.ts b/packages/playwright-core/src/server/keyboards/layouts/0000105F.ts
index f7b201e98645c..550975348c0e8 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/0000105F.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/0000105F.ts
@@ -37,15 +37,15 @@ const keyboardLayout: KeyboardLayout = {
   F12: { key: 'F12', keyCode: 123 },
   Backquote: { key: '²', keyCode: 192 },
   Digit1: { key: '&', keyCode: 49, shiftKey: '1' },
-  Digit2: { key: 'Digit2', keyCode: 50, shiftKey: '2' },
+  Digit2: { keyCode: 50, shiftKey: '2' },
   Digit3: { key: '"', keyCode: 51, shiftKey: '3' },
   Digit4: { key: '\'', keyCode: 52, shiftKey: '4' },
   Digit5: { key: '(', keyCode: 53, shiftKey: '5' },
   Digit6: { key: '-', keyCode: 54, shiftKey: '6' },
-  Digit7: { key: 'Digit7', keyCode: 55, shiftKey: '7' },
+  Digit7: { keyCode: 55, shiftKey: '7' },
   Digit8: { key: '_', keyCode: 56, shiftKey: '8' },
-  Digit9: { key: 'Digit9', keyCode: 57, shiftKey: '9' },
-  Digit0: { key: 'Digit0', keyCode: 48, shiftKey: '0' },
+  Digit9: { keyCode: 57, shiftKey: '9' },
+  Digit0: { keyCode: 48, shiftKey: '0' },
   Minus: { key: ')', keyCode: 189, shiftKey: '°' },
   Equal: { key: '=', keyCode: 187, shiftKey: '+' },
   Backspace: { key: 'Backspace', keyCode: 8 },
@@ -68,13 +68,13 @@ const keyboardLayout: KeyboardLayout = {
   KeyS: { key: 'ⵙ', keyCode: 83, shiftKey: 'ⵚ' },
   KeyD: { key: 'ⴷ', keyCode: 68, shiftKey: 'ⴹ' },
   KeyF: { key: 'ⴼ', keyCode: 70 },
-  KeyG: { key: 'ⴳ', keyCode: 71 },
+  KeyG: { key: 'ⴳ', keyCode: 71, shiftKey: 'ⴳ' },
   KeyH: { key: 'ⵀ', keyCode: 72 },
   KeyJ: { key: 'ⵊ', keyCode: 74 },
-  KeyK: { key: 'ⴽ', keyCode: 75 },
+  KeyK: { key: 'ⴽ', keyCode: 75, shiftKey: 'ⴽ' },
   KeyL: { key: 'ⵍ', keyCode: 76 },
   Semicolon: { key: 'ⵎ', keyCode: 186 },
-  Quote: { key: 'Quote', keyCode: 222, shiftKey: '%' },
+  Quote: { keyCode: 222, shiftKey: '%' },
   Backslash: { key: '*', keyCode: 220, shiftKey: 'µ' },
   ShiftLeft: { key: 'Shift', keyCode: 160, keyCodeWithoutLocation: 16, location: 1 },
   IntlBackslash: { key: '<', keyCode: 226, shiftKey: '>' },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/0001042F.ts b/packages/playwright-core/src/server/keyboards/layouts/0001042F.ts
index 8b657ed8c8e6c..905db70efebde 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/0001042F.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/0001042F.ts
@@ -46,7 +46,7 @@ const keyboardLayout: KeyboardLayout = {
   Digit8: { key: '8', keyCode: 56, shiftKey: '*' },
   Digit9: { key: '9', keyCode: 57, shiftKey: '(' },
   Digit0: { key: '0', keyCode: 48, shiftKey: ')' },
-  Minus: { key: '-', keyCode: 191 },
+  Minus: { key: '-', keyCode: 191, shiftKey: '-' },
   Equal: { key: '=', keyCode: 187, shiftKey: '+' },
   Backspace: { key: 'Backspace', keyCode: 8 },
   Tab: { key: 'Tab', keyCode: 9 },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/00010439.ts b/packages/playwright-core/src/server/keyboards/layouts/00010439.ts
index 3faf3c06b678f..c1b502eec6ba0 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/00010439.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/00010439.ts
@@ -35,15 +35,15 @@ const keyboardLayout: KeyboardLayout = {
   F10: { key: 'F10', keyCode: 121 },
   F11: { key: 'F11', keyCode: 122 },
   F12: { key: 'F12', keyCode: 123 },
-  Backquote: { key: 'Backquote', keyCode: 192 },
+  Backquote: { keyCode: 192 },
   Digit1: { key: '1', keyCode: 49, shiftKey: 'ऍ' },
   Digit2: { key: '2', keyCode: 50, shiftKey: 'ॅ' },
-  Digit3: { key: '3', keyCode: 51 },
-  Digit4: { key: '4', keyCode: 52 },
-  Digit5: { key: '5', keyCode: 53 },
-  Digit6: { key: '6', keyCode: 54 },
-  Digit7: { key: '7', keyCode: 55 },
-  Digit8: { key: '8', keyCode: 56 },
+  Digit3: { key: '3', keyCode: 51, shiftKey: '्' },
+  Digit4: { key: '4', keyCode: 52, shiftKey: 'र' },
+  Digit5: { key: '5', keyCode: 53, shiftKey: 'ज' },
+  Digit6: { key: '6', keyCode: 54, shiftKey: 'त' },
+  Digit7: { key: '7', keyCode: 55, shiftKey: 'क' },
+  Digit8: { key: '8', keyCode: 56, shiftKey: 'श' },
   Digit9: { key: '9', keyCode: 57, shiftKey: '(' },
   Digit0: { key: '0', keyCode: 48, shiftKey: ')' },
   Minus: { key: '-', keyCode: 189, shiftKey: 'ः' },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/00010480.ts b/packages/playwright-core/src/server/keyboards/layouts/00010480.ts
index 2cbcc1d75ac38..5f787f8f6e667 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/00010480.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/00010480.ts
@@ -72,7 +72,7 @@ const keyboardLayout: KeyboardLayout = {
   KeyH: { key: 'ى', keyCode: 72, shiftKey: 'خ' },
   KeyJ: { key: 'ق', keyCode: 74, shiftKey: 'ج' },
   KeyK: { key: 'ك', keyCode: 75, shiftKey: 'ۆ' },
-  KeyL: { key: 'ل', keyCode: 76 },
+  KeyL: { key: 'ل', keyCode: 76, shiftKey: 'ل' },
   Semicolon: { key: '؛', keyCode: 186, shiftKey: ':' },
   Quote: { key: '\'', keyCode: 222, shiftKey: '"' },
   Backslash: { key: '\\', keyCode: 220, shiftKey: '|' },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/00011809.ts b/packages/playwright-core/src/server/keyboards/layouts/00011809.ts
index 5a65cfdd9fe83..5027dd63f6fbe 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/00011809.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/00011809.ts
@@ -35,7 +35,7 @@ const keyboardLayout: KeyboardLayout = {
   F10: { key: 'F10', keyCode: 121 },
   F11: { key: 'F11', keyCode: 122 },
   F12: { key: 'F12', keyCode: 123 },
-  Backquote: { key: '`', keyCode: 223 },
+  Backquote: { key: '`', keyCode: 223, shiftKey: '`' },
   Digit1: { key: '1', keyCode: 49, shiftKey: '!' },
   Digit2: { key: '2', keyCode: 50, shiftKey: '"' },
   Digit3: { key: '3', keyCode: 51, shiftKey: '£' },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/00020401.ts b/packages/playwright-core/src/server/keyboards/layouts/00020401.ts
index 56de23b339b5f..d1f6189937636 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/00020401.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/00020401.ts
@@ -54,7 +54,7 @@ const keyboardLayout: KeyboardLayout = {
   KeyW: { key: 'ص', keyCode: 87, shiftKey: 'ً' },
   KeyE: { key: 'ث', keyCode: 69, shiftKey: 'ُ' },
   KeyR: { key: 'ق', keyCode: 82, shiftKey: 'ٌ' },
-  KeyT: { key: 'ف', keyCode: 84 },
+  KeyT: { key: 'ف', keyCode: 84, shiftKey: 'ل' },
   KeyY: { key: 'غ', keyCode: 89, shiftKey: 'إ' },
   KeyU: { key: 'ع', keyCode: 85, shiftKey: '‘' },
   KeyI: { key: 'ه', keyCode: 73, shiftKey: '÷' },
@@ -65,10 +65,10 @@ const keyboardLayout: KeyboardLayout = {
   Enter: { key: 'Enter', keyCode: 13, text: '\r' },
   CapsLock: { key: 'CapsLock', keyCode: 20 },
   KeyA: { key: 'ش', keyCode: 65, shiftKey: '\\' },
-  KeyS: { key: 'س', keyCode: 83 },
+  KeyS: { key: 'س', keyCode: 83, shiftKey: '\u0000' },
   KeyD: { key: 'ي', keyCode: 68, shiftKey: ']' },
   KeyF: { key: 'ب', keyCode: 70, shiftKey: '[' },
-  KeyG: { key: 'ل', keyCode: 71 },
+  KeyG: { key: 'ل', keyCode: 71, shiftKey: 'ل' },
   KeyH: { key: 'ا', keyCode: 72, shiftKey: 'أ' },
   KeyJ: { key: 'ت', keyCode: 74, shiftKey: 'ـ' },
   KeyK: { key: 'ن', keyCode: 75, shiftKey: '،' },
@@ -82,7 +82,7 @@ const keyboardLayout: KeyboardLayout = {
   KeyX: { key: 'ء', keyCode: 88, shiftKey: 'ْ' },
   KeyC: { key: 'ؤ', keyCode: 67, shiftKey: 'ِ' },
   KeyV: { key: 'ر', keyCode: 86, shiftKey: 'ٍ' },
-  KeyB: { key: 'KeyB', keyCode: 66 },
+  KeyB: { key: 'ل', keyCode: 66, shiftKey: 'ل' },
   KeyN: { key: 'ى', keyCode: 78, shiftKey: 'آ' },
   KeyM: { key: 'ة', keyCode: 77, shiftKey: '’' },
   Comma: { key: 'و', keyCode: 188, shiftKey: ',' },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/0002042B.ts b/packages/playwright-core/src/server/keyboards/layouts/0002042B.ts
index d2890a95a4235..83e573b251332 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/0002042B.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/0002042B.ts
@@ -42,7 +42,7 @@ const keyboardLayout: KeyboardLayout = {
   Digit4: { key: 'ձ', keyCode: 52, shiftKey: 'Ձ' },
   Digit5: { key: 'ջ', keyCode: 53, shiftKey: 'Ջ' },
   Digit6: { key: 'ւ', keyCode: 54, shiftKey: 'Ւ' },
-  Digit7: { key: 'և', keyCode: 55 },
+  Digit7: { key: 'և', keyCode: 55, shiftKey: 'և' },
   Digit8: { key: 'ր', keyCode: 56, shiftKey: 'Ր' },
   Digit9: { key: 'չ', keyCode: 57, shiftKey: 'Չ' },
   Digit0: { key: 'ճ', keyCode: 48, shiftKey: 'Ճ' },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/00020445.ts b/packages/playwright-core/src/server/keyboards/layouts/00020445.ts
index 0f80fc2076f8a..61fabc8d522d0 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/00020445.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/00020445.ts
@@ -35,15 +35,15 @@ const keyboardLayout: KeyboardLayout = {
   F10: { key: 'F10', keyCode: 121 },
   F11: { key: 'F11', keyCode: 122 },
   F12: { key: 'F12', keyCode: 123 },
-  Backquote: { key: '॥', keyCode: 192 },
+  Backquote: { key: '॥', keyCode: 192, shiftKey: 'অ' },
   Digit1: { key: '১', keyCode: 49, shiftKey: '!' },
   Digit2: { key: '২', keyCode: 50, shiftKey: '@' },
-  Digit3: { key: '৩', keyCode: 51 },
-  Digit4: { key: '৪', keyCode: 52 },
-  Digit5: { key: '৫', keyCode: 53 },
-  Digit6: { key: '৬', keyCode: 54 },
-  Digit7: { key: '৭', keyCode: 55 },
-  Digit8: { key: '৮', keyCode: 56 },
+  Digit3: { key: '৩', keyCode: 51, shiftKey: '্' },
+  Digit4: { key: '৪', keyCode: 52, shiftKey: 'র' },
+  Digit5: { key: '৫', keyCode: 53, shiftKey: 'জ' },
+  Digit6: { key: '৬', keyCode: 54, shiftKey: 'ত' },
+  Digit7: { key: '৭', keyCode: 55, shiftKey: 'ক' },
+  Digit8: { key: '৮', keyCode: 56, shiftKey: 'শ' },
   Digit9: { key: '৯', keyCode: 57, shiftKey: '(' },
   Digit0: { key: '০', keyCode: 48, shiftKey: ')' },
   Minus: { key: '-', keyCode: 189, shiftKey: 'ঃ' },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/00020449.ts b/packages/playwright-core/src/server/keyboards/layouts/00020449.ts
index 6ef8e30012e01..c15f83ecda1a2 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/00020449.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/00020449.ts
@@ -54,8 +54,8 @@ const keyboardLayout: KeyboardLayout = {
   KeyW: { key: 'ஈ', keyCode: 87, shiftKey: 'ஷ' },
   KeyE: { key: 'ஊ', keyCode: 69, shiftKey: 'ஜ' },
   KeyR: { key: 'ஐ', keyCode: 82, shiftKey: 'ஹ' },
-  KeyT: { key: 'ஏ', keyCode: 84 },
-  KeyY: { key: 'ள', keyCode: 89 },
+  KeyT: { key: 'ஏ', keyCode: 84, shiftKey: 'க' },
+  KeyY: { key: 'ள', keyCode: 89, shiftKey: 'ஶ' },
   KeyU: { key: 'ற', keyCode: 85, shiftKey: 'ஶ' },
   KeyI: { key: 'ன', keyCode: 73 },
   KeyO: { key: 'ட', keyCode: 79, shiftKey: '[' },
@@ -68,9 +68,9 @@ const keyboardLayout: KeyboardLayout = {
   KeyS: { key: 'இ', keyCode: 83, shiftKey: '௺' },
   KeyD: { key: 'உ', keyCode: 68, shiftKey: '௸' },
   KeyF: { key: '்', keyCode: 70, shiftKey: 'ஃ' },
-  KeyG: { key: 'எ', keyCode: 71 },
-  KeyH: { key: 'க', keyCode: 72 },
-  KeyJ: { key: 'ப', keyCode: 74 },
+  KeyG: { key: 'எ', keyCode: 71, shiftKey: 'எ' },
+  KeyH: { key: 'க', keyCode: 72, shiftKey: 'க' },
+  KeyJ: { key: 'ப', keyCode: 74, shiftKey: 'ப' },
   KeyK: { key: 'ம', keyCode: 75, shiftKey: '"' },
   KeyL: { key: 'த', keyCode: 76, shiftKey: ':' },
   Semicolon: { key: 'ந', keyCode: 186, shiftKey: ';' },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/00050429.ts b/packages/playwright-core/src/server/keyboards/layouts/00050429.ts
index 8bebf3993268f..f895d2fa82b3a 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/00050429.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/00050429.ts
@@ -35,11 +35,11 @@ const keyboardLayout: KeyboardLayout = {
   F10: { key: 'F10', keyCode: 121 },
   F11: { key: 'F11', keyCode: 122 },
   F12: { key: 'F12', keyCode: 123 },
-  Backquote: { key: '‍', keyCode: 192 },
+  Backquote: { key: '‍', keyCode: 192, shiftKey: '‍' },
   Digit1: { key: '۱', keyCode: 49, shiftKey: '!' },
   Digit2: { key: '۲', keyCode: 50, shiftKey: '٬' },
   Digit3: { key: '۳', keyCode: 51, shiftKey: '٫' },
-  Digit4: { key: '۴', keyCode: 52 },
+  Digit4: { key: '۴', keyCode: 52, shiftKey: 'ر' },
   Digit5: { key: '۵', keyCode: 53, shiftKey: '٪' },
   Digit6: { key: '۶', keyCode: 54, shiftKey: '×' },
   Digit7: { key: '۷', keyCode: 55, shiftKey: '،' },
@@ -79,7 +79,7 @@ const keyboardLayout: KeyboardLayout = {
   ShiftLeft: { key: 'Shift', keyCode: 160, keyCodeWithoutLocation: 16, location: 1 },
   IntlBackslash: { key: '\\', keyCode: 226, shiftKey: '|' },
   KeyZ: { key: 'ظ', keyCode: 90, shiftKey: 'ك' },
-  KeyX: { key: 'ط', keyCode: 88 },
+  KeyX: { key: 'ط', keyCode: 88, shiftKey: 'ط' },
   KeyC: { key: 'ز', keyCode: 67, shiftKey: 'ژ' },
   KeyV: { key: 'ر', keyCode: 86, shiftKey: 'ٰ' },
   KeyB: { key: 'ذ', keyCode: 66, shiftKey: '‌' },
diff --git a/packages/playwright-core/src/server/keyboards/layouts/00110C00.ts b/packages/playwright-core/src/server/keyboards/layouts/00110C00.ts
index bfbc318c79521..37e8937abd36e 100644
--- a/packages/playwright-core/src/server/keyboards/layouts/00110C00.ts
+++ b/packages/playwright-core/src/server/keyboards/layouts/00110C00.ts
@@ -50,15 +50,15 @@ const keyboardLayout: KeyboardLayout = {
   Equal: { key: '‌', keyCode: 187 },
   Backspace: { key: 'Backspace', keyCode: 8 },
   Tab: { key: 'Tab', keyCode: 9 },
-  KeyQ: { key: 'KeyQ', keyCode: 81, shiftKey: 'ꦼ' },
-  KeyW: { key: 'ꦮ', keyCode: 87 },
+  KeyQ: { key: 'ꦄ', keyCode: 81, shiftKey: 'ꦼ' },
+  KeyW: { key: 'ꦮ', keyCode: 87, shiftKey: '꧀' },
   KeyE: { key: 'ꦌ', keyCode: 69, shiftKey: 'ꦺ' },
   KeyR: { key: 'ꦫ', keyCode: 82, shiftKey: 'ꦿ' },
   KeyT: { key: 'ꦠ', keyCode: 84, shiftKey: 'ꦡ' },
   KeyY: { key: 'ꦪ', keyCode: 89, shiftKey: 'ꦾ' },
   KeyU: { key: 'ꦈ', keyCode: 85, shiftKey: 'ꦸ' },
   KeyI: { key: 'ꦆ', keyCode: 73, shiftKey: 'ꦶ' },
-  KeyO: { key: 'ꦎ', keyCode: 79 },
+  KeyO: { key: 'ꦎ', keyCode: 79, shiftKey: 'ꦺ' },
   KeyP: { key: 'ꦥ', keyCode: 80, shiftKey: 'ꦦ' },
   BracketLeft: { key: '[', keyCode: 219, shiftKey: '꧁' },
   BracketRight: { key: ']', keyCode: 221, shiftKey: '꧂' },
@@ -72,7 +72,7 @@ const keyboardLayout: KeyboardLayout = {
   KeyH: { key: 'ꦲ', keyCode: 72, shiftKey: 'ꦃ' },
   KeyJ: { key: 'ꦗ', keyCode: 74, shiftKey: 'ꦘ' },
   KeyK: { key: 'ꦏ', keyCode: 75, shiftKey: 'ꦑ' },
-  KeyL: { key: 'ꦭ', keyCode: 76 },
+  KeyL: { key: 'ꦭ', keyCode: 76, shiftKey: '꧀' },
   Semicolon: { key: 'ꦛ', keyCode: 186, shiftKey: 'ꦜ' },
   Quote: { key: 'ꦝ', keyCode: 222, shiftKey: 'ꦞ' },
   Backslash: { key: '\\', keyCode: 220, shiftKey: '|' },
diff --git a/packages/playwright-core/src/server/keyboards/types.ts b/packages/playwright-core/src/server/keyboards/types.ts
index 92d7c6b550499..62cd0e015501c 100644
--- a/packages/playwright-core/src/server/keyboards/types.ts
+++ b/packages/playwright-core/src/server/keyboards/types.ts
@@ -15,8 +15,8 @@
  */
 
 export type KeyDefinition = {
-  key: string;
-  keyCode: number;
+  key?: string;
+  keyCode?: number;
   keyCodeWithoutLocation?: number;
   shiftKey?: string;
   shiftKeyCode?: number;
diff --git a/tests/page/page-keyboard-layouts.spec.ts b/tests/page/page-keyboard-layouts.spec.ts
index 873f8cdb46eea..50176742b2aaf 100644
--- a/tests/page/page-keyboard-layouts.spec.ts
+++ b/tests/page/page-keyboard-layouts.spec.ts
@@ -353,7 +353,7 @@ for (const [locale, { key, keyCode }] of Object.entries(testData)) {
     toImpl(page).keyboard._testKeyboardLayout(locale);
     await page.goto(server.PREFIX + '/input/keyboard.html');
 
-    await page.keyboard.press(key);
+    await page.keyboard.press('KeyA');
     const charCode = key.charCodeAt(0);
     expect(await page.evaluate('getResult()')).toBe(
         [`Keydown: ${key} KeyA ${keyCode} []`,
diff --git a/utils/generate_keyboard_layouts.js b/utils/generate_keyboard_layouts.js
index e119df2d3215c..a93ae94e5767a 100644
--- a/utils/generate_keyboard_layouts.js
+++ b/utils/generate_keyboard_layouts.js
@@ -18,7 +18,7 @@
 // @ts-check
 
 /**
- * @typedef { import("../packages/playwright-core/src/server/keyboards").KeyDefinition } KeyDefinition
+ * @typedef { import("../packages/playwright-core/src/server/keyboards/types").KeyDefinition } KeyDefinition
  * @typedef { import("playwright").Locator } Locator
  * @typedef { import("playwright").Page } Page
  */
@@ -173,22 +173,6 @@ const copyrightHeader = `
 // This file is generated by ${path.basename(__filename).split(path.sep).join(path.posix.sep)}, do not edit manually.
 `;
 
-const typeDefs = `
-export type KeyDefinition = {
-  key: string;
-  keyCode: number;
-  keyCodeWithoutLocation?: number;
-  shiftKey?: string;
-  shiftKeyCode?: number;
-  text?: string;
-  location?: number;
-};
-
-export type KeyboardLayout = { [s: string]: KeyDefinition; };
-
-export type KeyboardLayoutMap = Record<string, KeyboardLayout>;
-`;
-
 /**
  * @type { Object.<string,KeyDefinition | string> }
  *
@@ -224,10 +208,10 @@ const keyboardLayoutGenerator = {
   'Digit0': '.kr2 > div:nth-child(11) > .kc',
   'Minus': '.kr2 > div:nth-child(12) > .kc',
   'Equal': '.kr2 > div:nth-child(13) > .kc',
-  'Backspace': '.kr2 > div:nth-child(14) > .kc',
+  'Backspace': { 'keyCode': 8, 'key': 'Backspace' },
 
   // First row
-  'Tab': '.kr3 > div:nth-child(1) > .kc',
+  'Tab': { 'keyCode': 9, 'key': 'Tab' },
   'KeyQ': '.kr3 > div:nth-child(2) > .kc',
   'KeyW': '.kr3 > div:nth-child(3) > .kc',
   'KeyE': '.kr3 > div:nth-child(4) > .kc',
@@ -240,7 +224,7 @@ const keyboardLayoutGenerator = {
   'KeyP': '.kr3 > div:nth-child(11) > .kc',
   'BracketLeft': '.kr3 > div:nth-child(12) > .kc',
   'BracketRight': '.kr3 > div:nth-child(13) > .kc',
-  'Enter': '.kr3 > div:nth-child(14) > .kc',
+  'Enter': { 'keyCode': 13, 'key': 'Enter', 'text': '\r' },
 
   // Second row
   'CapsLock': { 'keyCode': 20, 'key': 'CapsLock' },
@@ -331,18 +315,19 @@ async function process(keyname, keyLocator, virtualKeyCode) {
   const title = await keyLocator.locator('[title]').getAttribute('title');
   assert(title);
 
-  const [, key] = /^(.?) U\+[0-9A-F]{4}/.exec(title) ?? [];
-  const [, shiftKey] = /SHIFT: (.) U\+[0-9A-F]{4}/.exec(title) ?? [];
+  const [, hexCode] = /^(?:\:|[^\:]*?) U\+([0-9A-F]{4})/.exec(title) ?? [];
+  const [, shiftHexCode] = /SHIFT: .*? U\+([0-9A-F]{4})/.exec(title) ?? [];
+
+  const key = hexCode ? String.fromCharCode(parseInt(hexCode, 16)) : undefined;
+  const shiftKey = shiftHexCode ? String.fromCharCode(parseInt(shiftHexCode, 16)) : undefined;
 
   let location;
 
   return {
     keyCode: virtualKeyCode,
-    shiftKey: shiftKey === key ? undefined : shiftKey,
-    key: key || keyname,
+    key,
+    shiftKey: keyname === 'Space' && shiftKey === key ? undefined : shiftKey,
     location,
-    // for ENTER key
-    text: virtualKeyCode === 13 ? '\r' : undefined,
   };
 }
 
@@ -412,8 +397,8 @@ function stringifyKeyDefinition(def) {
   };
   /** @type {string[]} */
   const propStrs = [];
-  propStrs.push(`key: '${escaped.key}'`);
-  propStrs.push(`keyCode: ${escaped.keyCode}`);
+  if (escaped.key !== undefined) propStrs.push(`key: '${escaped.key}'`);
+  if (escaped.keyCode !== undefined) propStrs.push(`keyCode: ${escaped.keyCode}`);
   if (escaped.keyCodeWithoutLocation !== undefined) propStrs.push(`keyCodeWithoutLocation: ${escaped.keyCodeWithoutLocation}`);
   if (escaped.shiftKey !== undefined) propStrs.push(`shiftKey: '${escaped.shiftKey}'`);
   if (escaped.shiftKeyCode !== undefined) propStrs.push(`shiftKeyCode: ${escaped.shiftKeyCode}`);
@@ -454,7 +439,8 @@ const keyboardsDir = path.resolve(__dirname, '../packages/playwright-core/src/se
   const index = [
     copyrightHeader,
     `import defaultKeyboardLayoutObject from './layouts/${defaultKlid}';`,
-    typeDefs,
+    `import type { KeyboardLayout } from './types';`,
+    ``,
     `export type * from './types';`,
     `export const defaultKlid = '${defaultKlid}';`,
     `export const defaultKeyboardLayout: KeyboardLayout = defaultKeyboardLayoutObject;`,