From 8df39e13e839f7fd51a150b1cd664fdb788554b1 Mon Sep 17 00:00:00 2001
From: Chris Hogan <chrishog@microsoft.com>
Date: Thu, 14 May 2020 15:03:55 -0700
Subject: [PATCH 1/4] Update RCTCxxBridge.mm

---
 .../React/CxxBridge/RCTCxxBridge.mm           | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/android-patches/patches-droid-office-grouped/OfficeRNHost/React/CxxBridge/RCTCxxBridge.mm b/android-patches/patches-droid-office-grouped/OfficeRNHost/React/CxxBridge/RCTCxxBridge.mm
index 27800d7121bd0a..a38b4d84477734 100644
--- a/android-patches/patches-droid-office-grouped/OfficeRNHost/React/CxxBridge/RCTCxxBridge.mm
+++ b/android-patches/patches-droid-office-grouped/OfficeRNHost/React/CxxBridge/RCTCxxBridge.mm
@@ -1,10 +1,10 @@
---- "e:\\github\\fb-react-native-forpatch-base\\React\\CxxBridge\\RCTCxxBridge.mm"	2020-01-30 13:55:48.476581100 -0800
-+++ "e:\\github\\ms-react-native-forpatch\\React\\CxxBridge\\RCTCxxBridge.mm"	2020-02-14 10:59:16.805390300 -0800
-@@ -596,6 +596,7 @@
-     // This is async, but any calls into JS are blocked by the m_syncReady CV in Instance
-   _reactInstance->initializeBridge(
-       std::make_unique<RCTInstanceCallback>(self),
-+      nullptr, // Use default executor delegate
-       executorFactory,
-       _jsMessageThread,
-       [self _buildModuleRegistryUnlocked]);
+--- "e:\\github\\fb-react-native-forpatch-base\\React\\CxxBridge\\RCTCxxBridge.mm"	2020-01-30 13:55:48.476581100 -0800
++++ "e:\\github\\ms-react-native-forpatch\\React\\CxxBridge\\RCTCxxBridge.mm"	2020-02-14 10:59:16.805390300 -0800
+@@ -596,6 +596,7 @@
+     // This is async, but any calls into JS are blocked by the m_syncReady CV in Instance
+   _reactInstance->initializeBridge(
+       std::make_unique<RCTInstanceCallback>(self),
++      nullptr, // Use default executor delegate
+       executorFactory,
+       _jsMessageThread,
+       [self _buildModuleRegistryUnlocked]);

From c3866a04ec44fb79683ea5ed887e43031bc6e578 Mon Sep 17 00:00:00 2001
From: Chris Hogan <chrishog@microsoft.com>
Date: Wed, 3 Feb 2021 23:13:14 -0800
Subject: [PATCH 2/4] escape, enter support, align more tightly with win

---
 Libraries/Components/Button.js                |  4 +-
 .../Touchable/TouchableNativeFeedback.js      |  4 +-
 .../Components/Touchable/TouchableOpacity.js  |  4 +-
 Libraries/Components/View/ViewPropTypes.js    |  4 +-
 Libraries/Pressability/Pressability.js        |  4 +-
 Libraries/Types/CoreEventTypes.js             | 14 ++---
 RNTester/Podfile.lock                         | 56 ++++++++---------
 .../KeyboardEventsExample.js                  |  6 +-
 React/Views/RCTView.m                         | 61 +++++++++++++------
 React/Views/RCTViewKeyboardEvent.h            | 32 +++++-----
 React/Views/RCTViewKeyboardEvent.m            | 44 ++++++-------
 11 files changed, 127 insertions(+), 106 deletions(-)

diff --git a/Libraries/Components/Button.js b/Libraries/Components/Button.js
index f7c8abadef1ec4..f66ec6df62ace0 100644
--- a/Libraries/Components/Button.js
+++ b/Libraries/Components/Button.js
@@ -145,13 +145,13 @@ type ButtonProps = $ReadOnly<{|
 
   /*
    * Array of keys to receive key down events for
-   * For arrow keys, add "leftArrow", "rightArrow", "upArrow", "downArrow",
+   * For arrow keys, add "ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown",
    */
   validKeysDown?: ?Array<string>,
 
   /*
    * Array of keys to receive key up events for
-   * For arrow keys, add "leftArrow", "rightArrow", "upArrow", "downArrow",
+   * For arrow keys, add "ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown",
    */
   validKeysUp?: ?Array<string>,
   // ]TODO(OSS Candidate ISS#2710739)
diff --git a/Libraries/Components/Touchable/TouchableNativeFeedback.js b/Libraries/Components/Touchable/TouchableNativeFeedback.js
index fe7c878f6835b6..c8514296721c89 100644
--- a/Libraries/Components/Touchable/TouchableNativeFeedback.js
+++ b/Libraries/Components/Touchable/TouchableNativeFeedback.js
@@ -84,13 +84,13 @@ type Props = $ReadOnly<{|
 
   /*
    * Array of keys to receive key down events for
-   * For arrow keys, add "leftArrow", "rightArrow", "upArrow", "downArrow",
+   * For arrow keys, add "ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown",
    */
   validKeysDown?: ?Array<string>,
 
   /*
    * Array of keys to receive key up events for
-   * For arrow keys, add "leftArrow", "rightArrow", "upArrow", "downArrow",
+   * For arrow keys, add "ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown",
    */
   validKeysUp?: ?Array<string>,
 
diff --git a/Libraries/Components/Touchable/TouchableOpacity.js b/Libraries/Components/Touchable/TouchableOpacity.js
index c85586dca856d9..f1441f27fa75e9 100644
--- a/Libraries/Components/Touchable/TouchableOpacity.js
+++ b/Libraries/Components/Touchable/TouchableOpacity.js
@@ -42,13 +42,13 @@ type Props = $ReadOnly<{|
   hostRef: React.Ref<typeof Animated.View>,
   /*
    * Array of keys to receive key down events for
-   * For arrow keys, add "leftArrow", "rightArrow", "upArrow", "downArrow",
+   * For arrow keys, add "ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown",
    */
   validKeysDown?: ?Array<string>,
 
   /*
    * Array of keys to receive key up events for
-   * For arrow keys, add "leftArrow", "rightArrow", "upArrow", "downArrow",
+   * For arrow keys, add "ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown",
    */
   validKeysUp?: ?Array<string>,
 |}>;
diff --git a/Libraries/Components/View/ViewPropTypes.js b/Libraries/Components/View/ViewPropTypes.js
index 8b23249c3d1827..5e30ba46c19de2 100644
--- a/Libraries/Components/View/ViewPropTypes.js
+++ b/Libraries/Components/View/ViewPropTypes.js
@@ -606,13 +606,13 @@ export type ViewProps = $ReadOnly<{|
 
   /*
    * Array of keys to receive key down events for
-   * For arrow keys, add "leftArrow", "rightArrow", "upArrow", "downArrow",
+   * For arrow keys, add "ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown",
    */
   validKeysDown?: ?array<string>,
 
   /*
    * Array of keys to receive key up events for
-   * For arrow keys, add "leftArrow", "rightArrow", "upArrow", "downArrow",
+   * For arrow keys, add "ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown",
    */
   validKeysUp?: ?array<string>,
 
diff --git a/Libraries/Pressability/Pressability.js b/Libraries/Pressability/Pressability.js
index a5640fd20dbee8..ad1259af343380 100644
--- a/Libraries/Pressability/Pressability.js
+++ b/Libraries/Pressability/Pressability.js
@@ -106,13 +106,13 @@ export type PressabilityConfig = $ReadOnly<{|
 
   /*
    * Array of keys to receive key down events for
-   * For arrow keys, add "leftArrow", "rightArrow", "upArrow", "downArrow",
+   * For arrow keys, add "ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown",
    */
   validKeysDown?: ?Array<string>,
 
   /*
    * Array of keys to receive key up events for
-   * For arrow keys, add "leftArrow", "rightArrow", "upArrow", "downArrow",
+   * For arrow keys, add "ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown",
    */
   validKeysUp?: ?Array<string>,
 
diff --git a/Libraries/Types/CoreEventTypes.js b/Libraries/Types/CoreEventTypes.js
index 11c1b7100a5d3c..05dda3beb1157b 100644
--- a/Libraries/Types/CoreEventTypes.js
+++ b/Libraries/Types/CoreEventTypes.js
@@ -157,17 +157,17 @@ export type KeyEvent = SyntheticEvent<
     // Modifier keys
     capsLockKey: boolean,
     shiftKey: boolean,
-    controlKey: boolean,
-    optionKey: boolean,
-    commandKey: boolean,
+    ctrlKey: boolean,
+    altKey: boolean,
+    metaKey: boolean,
     numericPadKey: boolean,
     helpKey: boolean,
     functionKey: boolean,
     // Key options
-    leftArrowKey: boolean,
-    rightArrowKey: boolean,
-    upArrowKey: boolean,
-    downArrowKey: boolean,
+    ArrowLeft: boolean,
+    ArrowRight: boolean,
+    ArrowUp: boolean,
+    ArrowDown: boolean,
     key: string,
   |}>,
 >;
diff --git a/RNTester/Podfile.lock b/RNTester/Podfile.lock
index 5cea5f4e0e0cc5..4cd323c95fe898 100644
--- a/RNTester/Podfile.lock
+++ b/RNTester/Podfile.lock
@@ -519,8 +519,8 @@ SPEC CHECKSUMS:
   CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845
   CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
   DoubleConversion: 56a44bcfd14ab2ff66f5a146b2e875eb4b69b19b
-  FBLazyVector: b3ff0841fe404f6d35d321bdd7e2971a101ba057
-  FBReactNativeSpec: 4e08b13d0b49f20e96adf7e77ca546142ec2aafd
+  FBLazyVector: 7052b1143402396d305bca87b93912a92ab9f658
+  FBReactNativeSpec: 9cc71ea1f039e0b4e1aa78d2cafe7f8004431121
   Flipper: be611d4b742d8c87fbae2ca5f44603a02539e365
   Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
   Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3
@@ -533,34 +533,34 @@ SPEC CHECKSUMS:
   libevent: ee9265726a1fc599dea382964fa304378affaa5f
   OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355
   RCT-Folly: 1347093ffe75e152d846f7e45a3ef901b60021aa
-  RCTRequired: 5b6e3555bf3e4de31f5f9eec6765cb1e1c3f8588
-  RCTTypeSafety: 433a5f0c42cffe0dce22d296be466b85134df89a
-  React: 76089aa2c64e9b8e68d800212aa8aeb29cfe6261
-  React-ART: 222b1fab73ae6557fc5d574674edcc3188efb18d
-  React-callinvoker: ff08dfe52b3a0dc610a79a03e0f6c3e3f10e125c
-  React-Core: 81b5173e8855498a15a78e42aba1b699221f9b3e
-  React-CoreModules: 8ab2d55539bde7272ff41a15648c240577756647
-  React-cxxreact: 698bc21b02495b901d09fb6925fb7e6520de0238
-  React-jsi: a709fa4ff7117075b50ae4616a0866ae9bf6d0d5
-  React-jsiexecutor: 3ff187bf23493fec692716a6641dc4a6fc5841ca
-  React-jsinspector: 551b5d3465e34674a0f77f9928bd400618ac0e61
-  React-RCTActionSheet: 9ca162527c21bcff421a35e0e2673e0f5b9816dc
-  React-RCTAnimation: 649bca7ad18ce605f8c83cad39e24460133c2c7e
-  React-RCTBlob: ef322dcc9ff4e0432779c7c0bd0b1e538e454ef0
-  React-RCTImage: aecac3315930fd44fe728eca2fd2239e7248f27d
-  React-RCTLinking: 4e894cb3edcac66b38b62728de5848023e044dc7
-  React-RCTNetwork: 5aff7081f53f84c066e2fab498c663a3c874862b
-  React-RCTPushNotification: 9f7935165abe702411d378e3a4ce4576421328ce
-  React-RCTSettings: f12d385d733dc01db6b61b416dfb0a1876f15527
-  React-RCTTest: 26f1ccd3a6de79722aadeb3abacbdcf245cf9ed6
-  React-RCTText: 711cd763e14ff8718466a3b492c169b94ddc37ae
-  React-RCTVibration: 3b52dde3beeab10ca475e61a8016d38290019901
+  RCTRequired: 21cb0123c813b395aba4436e18786eed8e9964d7
+  RCTTypeSafety: 8dd1d97bbdeebd72eff9caec60baab7a60da19c7
+  React: 9bdea7aab7b16e6006a13793757bb847164e50a0
+  React-ART: fc6a2121a18ee07757e74f3ad08af8515c84a5ca
+  React-callinvoker: ec8eb81378a5afd25a4b33540b6f6613b69e322c
+  React-Core: 577132c3964b6bfc135a8a26d7cff6deb2d095d7
+  React-CoreModules: d86c18192d9a3309d2d6ed2f51b615a85ec4e2ff
+  React-cxxreact: 8f11dbbc3981c4e1a75c563f67a923e0b9acef00
+  React-jsi: fad59c093331f8ac8a1a4831599a277a5e709ed1
+  React-jsiexecutor: fe2fe79101b11650d45b5b2b437f0d2d74a917a2
+  React-jsinspector: f66631a327b51f5b9888bf94f1766868796c34d3
+  React-RCTActionSheet: 1693829d61a2aab77629e443ee87168eaddd8a93
+  React-RCTAnimation: 3d6995b7346b0ce380d9d1b1548fa6402e174875
+  React-RCTBlob: a4ab9a02b6fe3e2177a1052eeebcbd68f7b08c10
+  React-RCTImage: 6b311e583ac6865eb575c3617b8490fced70f340
+  React-RCTLinking: 10ddfb7da728c5ae9b7a3aed9fa6c72255c265c0
+  React-RCTNetwork: 60625519957d31ff17d452a62ed9e5685df719b4
+  React-RCTPushNotification: e8089d7a5bcf1d63d5fed9db5b7a2ae5ff172774
+  React-RCTSettings: 01080c727da6621d5506db3f23b5a8329c116e0c
+  React-RCTTest: eda8121aa1bf93b77182d00a361ecaa5e42e080e
+  React-RCTText: b6c32e44c1a966351ac67d60b1c2a6e3eb6e7949
+  React-RCTVibration: 4514a04385da9a3f68eafeba1592abb0d2a94c5a
   React-TurboModuleCxx-RNW: 4da8eb44b10ab3c5bbab9fcb0a8ae415c20ea3c9
-  React-TurboModuleCxx-WinRTPort: c7886867a28587fa55b5cc97f08a7e2acd30d842
-  ReactCommon: 9ff853e68f82140864b99aa9094369d36c8d7b21
-  Yoga: 620d1137a9da2515a80f96371b5485a9388d575f
+  React-TurboModuleCxx-WinRTPort: 342d6ea717f0792f21e82baef8d69bb79ae07bd8
+  ReactCommon: 0102192eca32ab4ff3860aadfb2e576421fd060b
+  Yoga: 66378e7fe59400a26aa74fbd7d7329ea36314318
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
 PODFILE CHECKSUM: 18ca7d3b0e7db79041574a8bb6200b9e1c2d5359
 
-COCOAPODS: 1.9.1
\ No newline at end of file
+COCOAPODS: 1.9.1
diff --git a/RNTester/js/examples/KeyboardEventsExample/KeyboardEventsExample.js b/RNTester/js/examples/KeyboardEventsExample/KeyboardEventsExample.js
index ec726a3dcbc0e0..b1bfd64182a1ce 100644
--- a/RNTester/js/examples/KeyboardEventsExample/KeyboardEventsExample.js
+++ b/RNTester/js/examples/KeyboardEventsExample/KeyboardEventsExample.js
@@ -54,13 +54,13 @@ class KeyEventExample extends React.Component<{}, State> {
             <View
               acceptsKeyboardFocus={true}
               enableFocusRing={true}
-              validKeysDown={['a', 'b', 'x', 'rightArrow']}
+              validKeysDown={['a', 'ArrowDown']}
               onKeyDown={this.onKeyDownEvent}
-              validKeysUp={['c', 'd', 'leftArrow']}
+              validKeysUp={['c', 'd']}
               onKeyUp={this.onKeyUpEvent}>
               <Button
                 title={'Test button'}
-                validKeysDown={['g', 'h', 'i', 'x']}
+                validKeysDown={['g', 'Esc', 'Enter', 'ArrowLeft']}
                 onKeyDown={this.onKeyDownEvent}
                 validKeysUp={['j', 'k', 'l']}
                 onKeyUp={this.onKeyUpEvent}
diff --git a/React/Views/RCTView.m b/React/Views/RCTView.m
index a6623a5f4e3c06..b576b187022f09 100644
--- a/React/Views/RCTView.m
+++ b/React/Views/RCTView.m
@@ -1601,10 +1601,10 @@ - (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
 #pragma mark - Keyboard Events
 
 #if TARGET_OS_OSX
-const NSString *leftArrowPressKey = @"leftArrow";
-const NSString *rightArrowPressKey = @"rightArrow";
-const NSString *upArrowPressKey = @"upArrow";
-const NSString *downArrowPressKey = @"downArrow";
+const NSString *leftArrowPressKey = @"ArrowLeft";
+const NSString *rightArrowPressKey = @"ArrowRight";
+const NSString *upArrowPressKey = @"ArrowUp";
+const NSString *downArrowPressKey = @"ArrowDown";
 
 - (RCTViewKeyboardEvent*)keyboardEvent:(NSEvent*)event downPress:(BOOL)downPress {
   // modifiers
@@ -1621,6 +1621,7 @@ - (RCTViewKeyboardEvent*)keyboardEvent:(NSEvent*)event downPress:(BOOL)downPress
   BOOL rightArrowKey = NO;
   BOOL upArrowKey = NO;
   BOOL downArrowKey = NO;
+  BOOL escapeKeyPressed = NO;
   NSString *key = event.charactersIgnoringModifiers;
   unichar const code = [key characterAtIndex:0];
 
@@ -1634,6 +1635,11 @@ - (RCTViewKeyboardEvent*)keyboardEvent:(NSEvent*)event downPress:(BOOL)downPress
   } else if (code == NSDownArrowFunctionKey) {
     downArrowKey = YES;
   }
+  
+  // detect Escape key presses via the key code
+  if (event.keyCode == 53) {
+    escapeKeyPressed = YES;
+  }
 
   // detect modifier flags
   if (event.modifierFlags & NSEventModifierFlagCapsLock) {
@@ -1657,13 +1663,14 @@ - (RCTViewKeyboardEvent*)keyboardEvent:(NSEvent*)event downPress:(BOOL)downPress
   RCTViewKeyboardEvent *keyboardEvent = nil;
   // only post events for keys we care about
   if (downPress) {
-    if ([self keyIsValid:key left:leftArrowKey right:rightArrowKey up:upArrowKey down:downArrowKey validKeys:[self validKeysDown]]) {
+    NSString *keyToReturn = [self keyIsValid:key left:leftArrowKey right:rightArrowKey up:upArrowKey down:downArrowKey escapeKey:escapeKeyPressed validKeys:[self validKeysDown]];
+    if (keyToReturn != nil) {
       keyboardEvent = [RCTViewKeyboardEvent keyDownEventWithReactTag:self.reactTag
                                                          capsLockKey:capsLockKey
                                                             shiftKey:shiftKey
-                                                          controlKey:controlKey
-                                                           optionKey:optionKey
-                                                          commandKey:commandKey
+                                                             ctrlKey:controlKey
+                                                              altKey:optionKey
+                                                             metaKey:commandKey
                                                        numericPadKey:numericPadKey
                                                              helpKey:helpKey
                                                          functionKey:functionKey
@@ -1671,16 +1678,17 @@ - (RCTViewKeyboardEvent*)keyboardEvent:(NSEvent*)event downPress:(BOOL)downPress
                                                        rightArrowKey:rightArrowKey
                                                           upArrowKey:upArrowKey
                                                         downArrowKey:downArrowKey
-                                                                 key:key];
+                                                                 key:keyToReturn];
     }
   } else {
-    if ([self keyIsValid:key left:leftArrowKey right:rightArrowKey up:upArrowKey down:downArrowKey validKeys:[self validKeysUp]]) {
+    NSString *keyToReturn = [self keyIsValid:key left:leftArrowKey right:rightArrowKey up:upArrowKey down:downArrowKey escapeKey:escapeKeyPressed validKeys:[self validKeysUp]];
+    if (keyToReturn != nil) {
       keyboardEvent = [RCTViewKeyboardEvent keyUpEventWithReactTag:self.reactTag
                                                        capsLockKey:capsLockKey
                                                           shiftKey:shiftKey
-                                                        controlKey:controlKey
-                                                         optionKey:optionKey
-                                                        commandKey:commandKey
+                                                           ctrlKey:controlKey
+                                                            altKey:optionKey
+                                                           metaKey:commandKey
                                                      numericPadKey:numericPadKey
                                                            helpKey:helpKey
                                                        functionKey:functionKey
@@ -1688,21 +1696,34 @@ - (RCTViewKeyboardEvent*)keyboardEvent:(NSEvent*)event downPress:(BOOL)downPress
                                                      rightArrowKey:rightArrowKey
                                                         upArrowKey:upArrowKey
                                                       downArrowKey:downArrowKey
-                                                               key:key];
+                                                               key:keyToReturn];
     }
   }
   return keyboardEvent;
 }
 
 // check if the user typed key matches a key we need to send an event for
-- (BOOL)keyIsValid:(NSString*)key left:(BOOL)leftArrowPressed right:(BOOL)rightArrowPressed up:(BOOL)UpArrowPressed down:(BOOL)downArrowPressed validKeys:(NSArray<NSString*>*)validKeys {
-  BOOL keyIsValid = NO;
-  
-  if ([validKeys containsObject:key] || ([validKeys containsObject:leftArrowPressKey] && leftArrowPressed) || ([validKeys containsObject:rightArrowPressKey] && rightArrowPressed) || ([validKeys containsObject:upArrowPressKey] && UpArrowPressed) || ([validKeys containsObject:downArrowPressKey] && downArrowPressed)) {
-    keyIsValid = YES;
+// translate key codes over to JS compatible keys
+- (NSString*)keyIsValid:(NSString*)key left:(BOOL)leftArrowPressed right:(BOOL)rightArrowPressed up:(BOOL)upArrowPressed down:(BOOL)downArrowPressed escapeKey:(BOOL)escapeKeyPressed validKeys:(NSArray<NSString*>*)validKeys {
+  NSString *keyToReturn = key;
+
+  // Allow the flexibility of defining special keys in multiple ways
+  BOOL enterKeyValidityCheck = [key isEqualToString:@"\r"] && ([validKeys containsObject:@"Enter"] || [validKeys containsObject:@"\r"]);
+  BOOL escapeKeyValidityCheck = escapeKeyPressed && ([validKeys containsObject:@"Esc"] || [validKeys containsObject:@"Escape"]); // escape has to be checked via a key code so we can't just use the key itself here
+  BOOL leftArrowValidityCheck = [validKeys containsObject:leftArrowPressKey] && leftArrowPressed;
+  BOOL rightArrowValidityCheck = [validKeys containsObject:rightArrowPressKey] && rightArrowPressed;
+  BOOL upArrowValidityCheck = [validKeys containsObject:upArrowPressKey] && upArrowPressed;
+  BOOL downArrowValidityCheck = [validKeys containsObject:downArrowPressKey] && downArrowPressed;
+
+  if (escapeKeyValidityCheck) {
+    keyToReturn = @"Esc";
+  } else if (enterKeyValidityCheck) {
+    keyToReturn = @"Enter";
+  } else if (![validKeys containsObject:key] && !leftArrowValidityCheck && !rightArrowValidityCheck && !upArrowValidityCheck && !downArrowValidityCheck) {
+    keyToReturn = nil;
   }
   
-  return keyIsValid;
+  return keyToReturn;
 }
 
 - (void)keyDown:(NSEvent *)event {
diff --git a/React/Views/RCTViewKeyboardEvent.h b/React/Views/RCTViewKeyboardEvent.h
index 666b8d17d77f05..0a91c72683c0d9 100644
--- a/React/Views/RCTViewKeyboardEvent.h
+++ b/React/Views/RCTViewKeyboardEvent.h
@@ -9,25 +9,25 @@
 @interface RCTViewKeyboardEvent : RCTComponentEvent
 + (instancetype)keyDownEventWithReactTag:(NSNumber *)reactTag
                              capsLockKey:(BOOL)capsLockKey
-                                shiftKey:(BOOL)shiftKey
-                              controlKey:(BOOL)controlKey
-                               optionKey:(BOOL)optionKey
-                              commandKey:(BOOL)commandKey
-                           numericPadKey:(BOOL)numericPadKey
-                                 helpKey:(BOOL)helpKey
-                             functionKey:(BOOL)functionKey
-                            leftArrowKey:(BOOL)leftArrowKey
-                           rightArrowKey:(BOOL)rightArrowKey
-                              upArrowKey:(BOOL)upArrowKey
-                            downArrowKey:(BOOL)downArrowKey
-                                     key:(NSString*)key;
+                             shiftKey:(BOOL)shiftKey
+                              ctrlKey:(BOOL)controlKey
+                               altKey:(BOOL)optionKey
+                              metaKey:(BOOL)commandKey
+                        numericPadKey:(BOOL)numericPadKey
+                              helpKey:(BOOL)helpKey
+                          functionKey:(BOOL)functionKey
+                         leftArrowKey:(BOOL)leftArrowKey
+                        rightArrowKey:(BOOL)rightArrowKey
+                           upArrowKey:(BOOL)upArrowKey
+                         downArrowKey:(BOOL)downArrowKey
+                                  key:(NSString *)key;
 
 + (instancetype)keyUpEventWithReactTag:(NSNumber *)reactTag
                            capsLockKey:(BOOL)capsLockKey
                               shiftKey:(BOOL)shiftKey
-                            controlKey:(BOOL)controlKey
-                             optionKey:(BOOL)optionKey
-                            commandKey:(BOOL)commandKey
+                               ctrlKey:(BOOL)controlKey
+                                altKey:(BOOL)optionKey
+                               metaKey:(BOOL)commandKey
                          numericPadKey:(BOOL)numericPadKey
                                helpKey:(BOOL)helpKey
                            functionKey:(BOOL)functionKey
@@ -35,5 +35,5 @@
                          rightArrowKey:(BOOL)rightArrowKey
                             upArrowKey:(BOOL)upArrowKey
                           downArrowKey:(BOOL)downArrowKey
-                                   key:(NSString*)key;
+                                   key:(NSString *)key;
 @end
diff --git a/React/Views/RCTViewKeyboardEvent.m b/React/Views/RCTViewKeyboardEvent.m
index a2cc359d5d66bb..e1f44054170698 100644
--- a/React/Views/RCTViewKeyboardEvent.m
+++ b/React/Views/RCTViewKeyboardEvent.m
@@ -9,13 +9,13 @@
 #import <React/RCTAssert.h>
 
 @implementation RCTViewKeyboardEvent
-
+// Keyboard mappings are aligned cross-platform as much as possible as per this doc https://github.com/microsoft/react-native-windows/blob/master/vnext/proposals/active/keyboard-reconcile-desktop.md
 + (instancetype)keyDownEventWithReactTag:(NSNumber *)reactTag
                              capsLockKey:(BOOL)capsLockKey
                                 shiftKey:(BOOL)shiftKey
-                              controlKey:(BOOL)controlKey
-                               optionKey:(BOOL)optionKey
-                              commandKey:(BOOL)commandKey
+                                 ctrlKey:(BOOL)controlKey
+                                  altKey:(BOOL)optionKey
+                                 metaKey:(BOOL)commandKey
                            numericPadKey:(BOOL)numericPadKey
                                  helpKey:(BOOL)helpKey
                              functionKey:(BOOL)functionKey
@@ -28,16 +28,16 @@ + (instancetype)keyDownEventWithReactTag:(NSNumber *)reactTag
                                                   viewTag:reactTag
                                                      body:@{ @"capsLockKey" : @(capsLockKey),
                                                                 @"shiftKey" : @(shiftKey),
-                                                              @"controlKey" : @(controlKey),
-                                                               @"optionKey" : @(optionKey),
-                                                              @"commandKey" : @(commandKey),
+                                                                 @"ctrlKey" : @(controlKey),
+                                                                  @"altKey" : @(optionKey),
+                                                                 @"metaKey" : @(commandKey),
                                                            @"numericPadKey" : @(numericPadKey),
                                                                  @"helpKey" : @(helpKey),
                                                              @"functionKey" : @(functionKey),
-                                                            @"leftArrowKey" : @(leftArrowKey),
-                                                           @"rightArrowKey" : @(rightArrowKey),
-                                                              @"upArrowKey" : @(upArrowKey),
-                                                            @"downArrowKey" : @(downArrowKey),
+                                                               @"ArrowLeft" : @(leftArrowKey),
+                                                              @"ArrowRight" : @(rightArrowKey),
+                                                                 @"ArrowUp" : @(upArrowKey),
+                                                               @"ArrowDown" : @(downArrowKey),
                                                                      @"key" : key }];
   return event;
 }
@@ -45,9 +45,9 @@ + (instancetype)keyDownEventWithReactTag:(NSNumber *)reactTag
 +(instancetype)keyUpEventWithReactTag:(NSNumber *)reactTag
                           capsLockKey:(BOOL)capsLockKey
                              shiftKey:(BOOL)shiftKey
-                           controlKey:(BOOL)controlKey
-                            optionKey:(BOOL)optionKey
-                           commandKey:(BOOL)commandKey
+                              ctrlKey:(BOOL)controlKey
+                               altKey:(BOOL)optionKey
+                              metaKey:(BOOL)commandKey
                         numericPadKey:(BOOL)numericPadKey
                               helpKey:(BOOL)helpKey
                           functionKey:(BOOL)functionKey
@@ -55,21 +55,21 @@ +(instancetype)keyUpEventWithReactTag:(NSNumber *)reactTag
                         rightArrowKey:(BOOL)rightArrowKey
                            upArrowKey:(BOOL)upArrowKey
                          downArrowKey:(BOOL)downArrowKey
-                                  key:(NSString *)key {
+                                   key:(NSString *)key {
   RCTViewKeyboardEvent *event = [[self alloc] initWithName:@"keyUp"
                                                   viewTag:reactTag
                                                      body:@{ @"capsLockKey" : @(capsLockKey),
                                                                 @"shiftKey" : @(shiftKey),
-                                                              @"controlKey" : @(controlKey),
-                                                               @"optionKey" : @(optionKey),
-                                                              @"commandKey" : @(commandKey),
+                                                                 @"ctrlKey" : @(controlKey),
+                                                                  @"altKey" : @(optionKey),
+                                                                 @"metaKey" : @(commandKey),
                                                            @"numericPadKey" : @(numericPadKey),
                                                                  @"helpKey" : @(helpKey),
                                                              @"functionKey" : @(functionKey),
-                                                            @"leftArrowKey" : @(leftArrowKey),
-                                                           @"rightArrowKey" : @(rightArrowKey),
-                                                              @"upArrowKey" : @(upArrowKey),
-                                                            @"downArrowKey" : @(downArrowKey),
+                                                               @"ArrowLeft" : @(leftArrowKey),
+                                                              @"ArrowRight" : @(rightArrowKey),
+                                                                 @"ArrowUp" : @(upArrowKey),
+                                                               @"ArrowDown" : @(downArrowKey),
                                                                      @"key" : key }];
   return event;
 }

From 9060f4711f6d6e467d69f8bf4c56e2acb5dcd71b Mon Sep 17 00:00:00 2001
From: Chris Hogan <chrishog@microsoft.com>
Date: Wed, 3 Feb 2021 23:36:29 -0800
Subject: [PATCH 3/4] Update tests

---
 RNTester/Podfile.lock                         | 54 +++++++++----------
 .../KeyboardEventsExample.js                  |  3 +-
 2 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/RNTester/Podfile.lock b/RNTester/Podfile.lock
index 4cd323c95fe898..c3f8871b41c19e 100644
--- a/RNTester/Podfile.lock
+++ b/RNTester/Podfile.lock
@@ -519,8 +519,8 @@ SPEC CHECKSUMS:
   CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845
   CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
   DoubleConversion: 56a44bcfd14ab2ff66f5a146b2e875eb4b69b19b
-  FBLazyVector: 7052b1143402396d305bca87b93912a92ab9f658
-  FBReactNativeSpec: 9cc71ea1f039e0b4e1aa78d2cafe7f8004431121
+  FBLazyVector: 394d73499e60a4638db48878432220272f20b321
+  FBReactNativeSpec: c2c65df95d7f46d8147b56b4f5b786af59920ff1
   Flipper: be611d4b742d8c87fbae2ca5f44603a02539e365
   Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
   Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3
@@ -533,32 +533,32 @@ SPEC CHECKSUMS:
   libevent: ee9265726a1fc599dea382964fa304378affaa5f
   OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355
   RCT-Folly: 1347093ffe75e152d846f7e45a3ef901b60021aa
-  RCTRequired: 21cb0123c813b395aba4436e18786eed8e9964d7
-  RCTTypeSafety: 8dd1d97bbdeebd72eff9caec60baab7a60da19c7
-  React: 9bdea7aab7b16e6006a13793757bb847164e50a0
-  React-ART: fc6a2121a18ee07757e74f3ad08af8515c84a5ca
-  React-callinvoker: ec8eb81378a5afd25a4b33540b6f6613b69e322c
-  React-Core: 577132c3964b6bfc135a8a26d7cff6deb2d095d7
-  React-CoreModules: d86c18192d9a3309d2d6ed2f51b615a85ec4e2ff
-  React-cxxreact: 8f11dbbc3981c4e1a75c563f67a923e0b9acef00
-  React-jsi: fad59c093331f8ac8a1a4831599a277a5e709ed1
-  React-jsiexecutor: fe2fe79101b11650d45b5b2b437f0d2d74a917a2
-  React-jsinspector: f66631a327b51f5b9888bf94f1766868796c34d3
-  React-RCTActionSheet: 1693829d61a2aab77629e443ee87168eaddd8a93
-  React-RCTAnimation: 3d6995b7346b0ce380d9d1b1548fa6402e174875
-  React-RCTBlob: a4ab9a02b6fe3e2177a1052eeebcbd68f7b08c10
-  React-RCTImage: 6b311e583ac6865eb575c3617b8490fced70f340
-  React-RCTLinking: 10ddfb7da728c5ae9b7a3aed9fa6c72255c265c0
-  React-RCTNetwork: 60625519957d31ff17d452a62ed9e5685df719b4
-  React-RCTPushNotification: e8089d7a5bcf1d63d5fed9db5b7a2ae5ff172774
-  React-RCTSettings: 01080c727da6621d5506db3f23b5a8329c116e0c
-  React-RCTTest: eda8121aa1bf93b77182d00a361ecaa5e42e080e
-  React-RCTText: b6c32e44c1a966351ac67d60b1c2a6e3eb6e7949
-  React-RCTVibration: 4514a04385da9a3f68eafeba1592abb0d2a94c5a
+  RCTRequired: b46f07a38c14739dc651fd59098cc5e46d78964b
+  RCTTypeSafety: 60c6d797e793d00f8cd27583826709aa3efa89a4
+  React: 9a6760733fb33cb9a5113ff886e9d21533891822
+  React-ART: bf1c89c72e76a3dfe3a437e3dc332b5251d64cce
+  React-callinvoker: 45221340b8ec10ba7f944819736f7c30a5f77633
+  React-Core: f1c21fe8fe5d3bc94fe79ec8c80e0086a59940fc
+  React-CoreModules: a4780ce18a75b640e41f3e5f499a4a4b38c7a445
+  React-cxxreact: d7debc152a1e062d9a20933ca626036c7f0cf6c3
+  React-jsi: a3f5ce9f56946ce6a452a90c5a0a202829b9f741
+  React-jsiexecutor: 0a7b77cf8f5d1232a9a3f6e3c7b91959035bbcdd
+  React-jsinspector: 025439cfad6dceb8210b760a50899390be68c9c9
+  React-RCTActionSheet: 934a09a1139c163e2f694abec4956f329f5e8429
+  React-RCTAnimation: b6ebb381e9d9db2c2dd006bdc5007f6e9491fbda
+  React-RCTBlob: 4270cb3df8142a89a4d6f3e499704ecc0beb3349
+  React-RCTImage: c76b090c6b04bd8281f634cecf8a90e8f3a4b570
+  React-RCTLinking: 8bc0e9ee3290fae15fd4db3cf8acadd193d6d7c8
+  React-RCTNetwork: 247ce88c8b3bbf50a7a00d0bd92f7afa6a896d51
+  React-RCTPushNotification: 1bf5f93712f55fa56ed0d901ab62d30fe1db70aa
+  React-RCTSettings: 3252eb15cb41614254f89de229efb79b6e6d0b71
+  React-RCTTest: 7b5f3df6ebbcc2c2ac55f100250bad9266e42a69
+  React-RCTText: 4c2c9672d5e3ae544e51c7a27033900664a5e1d4
+  React-RCTVibration: 754c2a4a57ce7aaa222725506768b0f4e8e6fc48
   React-TurboModuleCxx-RNW: 4da8eb44b10ab3c5bbab9fcb0a8ae415c20ea3c9
-  React-TurboModuleCxx-WinRTPort: 342d6ea717f0792f21e82baef8d69bb79ae07bd8
-  ReactCommon: 0102192eca32ab4ff3860aadfb2e576421fd060b
-  Yoga: 66378e7fe59400a26aa74fbd7d7329ea36314318
+  React-TurboModuleCxx-WinRTPort: 54da56961e7dac160cfa49f769b23abf18110070
+  ReactCommon: 5c82ec1351ec13a32c676a978dec3aa029979219
+  Yoga: d9c4c2032bbcc8026448090743e1c4e8ee525012
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
 PODFILE CHECKSUM: 18ca7d3b0e7db79041574a8bb6200b9e1c2d5359
diff --git a/RNTester/js/examples/KeyboardEventsExample/KeyboardEventsExample.js b/RNTester/js/examples/KeyboardEventsExample/KeyboardEventsExample.js
index b1bfd64182a1ce..f194e13df2d1af 100644
--- a/RNTester/js/examples/KeyboardEventsExample/KeyboardEventsExample.js
+++ b/RNTester/js/examples/KeyboardEventsExample/KeyboardEventsExample.js
@@ -54,13 +54,12 @@ class KeyEventExample extends React.Component<{}, State> {
             <View
               acceptsKeyboardFocus={true}
               enableFocusRing={true}
-              validKeysDown={['a', 'ArrowDown']}
+              validKeysDown={['g', 'Esc', 'Enter', 'ArrowLeft']}
               onKeyDown={this.onKeyDownEvent}
               validKeysUp={['c', 'd']}
               onKeyUp={this.onKeyUpEvent}>
               <Button
                 title={'Test button'}
-                validKeysDown={['g', 'Esc', 'Enter', 'ArrowLeft']}
                 onKeyDown={this.onKeyDownEvent}
                 validKeysUp={['j', 'k', 'l']}
                 onKeyUp={this.onKeyUpEvent}

From d315305bc619a4e92886484625f89c371fc23cba Mon Sep 17 00:00:00 2001
From: Chris Hogan <chrishog@microsoft.com>
Date: Thu, 4 Feb 2021 10:23:00 -0800
Subject: [PATCH 4/4] improve arrow js compatibility

---
 React/Views/RCTView.m | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/React/Views/RCTView.m b/React/Views/RCTView.m
index b576b187022f09..d66129f55d0286 100644
--- a/React/Views/RCTView.m
+++ b/React/Views/RCTView.m
@@ -1601,10 +1601,10 @@ - (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
 #pragma mark - Keyboard Events
 
 #if TARGET_OS_OSX
-const NSString *leftArrowPressKey = @"ArrowLeft";
-const NSString *rightArrowPressKey = @"ArrowRight";
-const NSString *upArrowPressKey = @"ArrowUp";
-const NSString *downArrowPressKey = @"ArrowDown";
+NSString* const leftArrowPressKey = @"ArrowLeft";
+NSString* const rightArrowPressKey = @"ArrowRight";
+NSString* const upArrowPressKey = @"ArrowUp";
+NSString* const downArrowPressKey = @"ArrowDown";
 
 - (RCTViewKeyboardEvent*)keyboardEvent:(NSEvent*)event downPress:(BOOL)downPress {
   // modifiers
@@ -1719,7 +1719,15 @@ - (NSString*)keyIsValid:(NSString*)key left:(BOOL)leftArrowPressed right:(BOOL)r
     keyToReturn = @"Esc";
   } else if (enterKeyValidityCheck) {
     keyToReturn = @"Enter";
-  } else if (![validKeys containsObject:key] && !leftArrowValidityCheck && !rightArrowValidityCheck && !upArrowValidityCheck && !downArrowValidityCheck) {
+  } else if (leftArrowValidityCheck) {
+    keyToReturn = leftArrowPressKey;
+  } else if (rightArrowValidityCheck) {
+    keyToReturn = rightArrowPressKey;
+  } else if (upArrowValidityCheck) {
+    keyToReturn = upArrowPressKey;
+  } else if (downArrowValidityCheck) {
+    keyToReturn = downArrowPressKey;
+  } else if (![validKeys containsObject:key]) {
     keyToReturn = nil;
   }