From fd785097eefe3dd86e5a569c75b7cf00637d54b0 Mon Sep 17 00:00:00 2001
From: Tetsuaki Hamano <tetsuaki.hamano@gmail.com>
Date: Thu, 9 Feb 2023 14:30:00 +0900
Subject: [PATCH] Distraction free mode: Fix keyboard shortcut not working on
 Windows

---
 packages/keycodes/src/index.js | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/packages/keycodes/src/index.js b/packages/keycodes/src/index.js
index 2aa1cb70fa3f3c..ec495df1e9ce7d 100644
--- a/packages/keycodes/src/index.js
+++ b/packages/keycodes/src/index.js
@@ -390,6 +390,14 @@ export const isKeyboardEvent = mapValues(
 		) => {
 			const mods = getModifiers( _isApple );
 			const eventMods = getEventModifiers( event );
+			/** @type {Record<string,string>} */
+			const replacementWithShiftKeyMap = {
+				Comma: ',',
+				Backslash: '\\',
+				// Windows returns `\` for both IntlRo and IntlYen.
+				IntlRo: '\\',
+				IntlYen: '\\',
+			};
 
 			const modsDiff = mods.filter(
 				( mod ) => ! eventMods.includes( mod )
@@ -412,16 +420,18 @@ export const isKeyboardEvent = mapValues(
 				key = String.fromCharCode( event.keyCode ).toLowerCase();
 			}
 
-			// Replace some characters to match the key indicated
-			// by the shortcut on Windows.
-			if ( ! _isApple() ) {
-				if (
-					event.shiftKey &&
-					character.length === 1 &&
-					event.code === 'Comma'
-				) {
-					key = ',';
-				}
+			// `event.key` returns the value of the key pressed, taking into the state of
+			// modifier keys such as `Shift`. If the shift key is pressed, a different
+			// value may be returned depending on the keyboard layout. It is necessary to
+			// convert to the physical key value that don't take into account keyboard
+			// layout or modifier key state. For now, this process is limited to Windows only.
+			if (
+				! _isApple() &&
+				event.shiftKey &&
+				character.length === 1 &&
+				replacementWithShiftKeyMap[ event.code ]
+			) {
+				key = replacementWithShiftKeyMap[ event.code ];
 			}
 
 			// For backwards compatibility.