Merge branch 'main' of git://github.com/microsoft/react-native-macos into remove-postinstall

Author: Saadnajmi

.ado/apple-integration.yml

@@ -4,17 +4,15 @@ variables:
 trigger:
   branches:
     include:
-    # GH #948: Disable Integration on main, as we are not currently stable
-    # - main
+      - main
       - '*-stable'
   paths:
     exclude:
       - '*.md'
 pr:
   branches:
     include:
-    # GH #948: Disable Integration on main, as we are not currently stable
-    # - main
+      - main
       - '*-stable'
   paths:
     exclude:
@@ -83,6 +81,7 @@ jobs:
         displayName: Bundle JavaScript
         workingDirectory: react-native-test-app/example
       - bash: |
+          rm macos/Podfile.lock
           pod install --project-directory=macos
         displayName: Install Pods
         workingDirectory: react-native-test-app/example

Libraries/Components/Pressable/Pressable.js

@@ -27,6 +27,11 @@ import type {
   LayoutEvent,
   MouseEvent,
   PressEvent,
+  // [TODO(macOS GH#774)
+  FocusEvent,
+  BlurEvent,
+  KeyEvent,
+  // ]TODO(macOS GH#774)
 } from '../../Types/CoreEventTypes';
 import type {DraggedTypesType} from '../View/DraggedType'; // TODO(macOS GH#774)
 import View from '../View/View';
@@ -134,6 +139,40 @@ type Props = $ReadOnly<{|
    */
   onPressOut?: ?(event: PressEvent) => mixed,
 
+  // [TODO(macOS GH#774)
+  /**
+   * Called after the element is focused.
+   */
+  onFocus?: ?(event: FocusEvent) => mixed,
+
+  /**
+   * Called after the element loses focus.
+   */
+  onBlur?: ?(event: BlurEvent) => mixed,
+
+  /**
+   * Called after a key down event is detected.
+   */
+  onKeyDown?: ?(event: KeyEvent) => mixed,
+
+  /**
+   * Called after a key up event is detected.
+   */
+  onKeyUp?: ?(event: KeyEvent) => mixed,
+
+  /**
+   * Array of keys to receive key down events for
+   * For arrow keys, add "ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown",
+   */
+  validKeysDown?: ?Array<string>,
+
+  /**
+   * Array of keys to receive key up events for
+   * For arrow keys, add "ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown",
+   */
+  validKeysUp?: ?Array<string>,
+  // ]TODO(macOS GH#774)
+
   /**
    * Either view styles or a function that receives a boolean reflecting whether
    * the component is currently pressed and returns view styles.
@@ -200,6 +239,12 @@ function Pressable(props: Props, forwardedRef): React.Node {
     onPress,
     onPressIn,
     onPressOut,
+    // [TODO(macOS GH#774)
+    onFocus,
+    onBlur,
+    onKeyDown,
+    onKeyUp,
+    // ]TODO(macOS GH#774)
     pressRetentionOffset,
     style,
     testOnly_pressed,
@@ -266,6 +311,12 @@ function Pressable(props: Props, forwardedRef): React.Node {
           onPressOut(event);
         }
       },
+      // [TODO(macOS GH#774)
+      onFocus,
+      onBlur,
+      onKeyDown,
+      onKeyUp,
+      // ]TODO(macOS GH#774)
     }),
     [
       android_disableSound,
@@ -282,6 +333,12 @@ function Pressable(props: Props, forwardedRef): React.Node {
       onPress,
       onPressIn,
       onPressOut,
+      // [TODO(macOS GH#774)
+      onFocus,
+      onBlur,
+      onKeyDown,
+      onKeyUp,
+      // ]TODO(macOS GH#774)
       pressRetentionOffset,
       setPressed,
       unstable_pressDelay,

Libraries/Pressability/Pressability.js

@@ -466,21 +466,6 @@ export default class Pressability {
       },
     };
 
-    const keyEventHandlers = {
-      onKeyDown: (event: KeyEvent): void => {
-        const {onKeyDown} = this._config;
-        if (onKeyDown != null) {
-          onKeyDown(event);
-        }
-      },
-      onKeyUp: (event: KeyEvent): void => {
-        const {onKeyUp} = this._config;
-        if (onKeyUp != null) {
-          onKeyUp(event);
-        }
-      },
-    };
-
     const responderEventHandlers = {
       onStartShouldSetResponder: (): boolean => {
         const {disabled} = this._config;
@@ -636,11 +621,28 @@ export default class Pressability {
             },
           };
 
+    // [TODO(macOS GH#774)
+    const keyboardEventHandlers = {
+      onKeyDown: (event: KeyEvent): void => {
+        const {onKeyDown} = this._config;
+        if (onKeyDown != null) {
+          onKeyDown(event);
+        }
+      },
+      onKeyUp: (event: KeyEvent): void => {
+        const {onKeyUp} = this._config;
+        if (onKeyUp != null) {
+          onKeyUp(event);
+        }
+      },
+    };
+    // ]TODO(macOS GH#774)
+
     return {
       ...focusEventHandlers,
       ...responderEventHandlers,
       ...mouseEventHandlers,
-      ...keyEventHandlers,
+      ...keyboardEventHandlers, // [TODO(macOS GH#774)]
     };
   }
 

Libraries/Text/TextNativeComponent.js

@@ -42,6 +42,7 @@ export const NativeText: HostComponent<NativeTextProps> = (createReactNativeComp
       onInlineViewLayout: true,
       dataDetectorType: true,
       android_hyphenationFrequency: true,
+      tooltip: true, // [TODO(macOS GH#774)]
     },
     directEventTypes: {
       topTextLayout: {

React/Views/RCTView.m

@@ -1393,19 +1393,6 @@ - (BOOL)acceptsFirstResponder
   return ([self focusable] && [NSApp isFullKeyboardAccessEnabled]) || [super acceptsFirstResponder];
 }
 
-- (BOOL)performKeyEquivalent:(NSEvent *)theEvent
-{
-  if (self.onClick != nil &&
-      [self focusable] &&
-      [[self window] firstResponder] == self) {
-    if ([[theEvent characters] isEqualToString:@" "] || [[theEvent characters] isEqualToString:@"\r"]) {
-      self.onClick(nil);
-      return YES;
-    }
-  }
-  return [super performKeyEquivalent:theEvent];
-}
-
 - (void)updateTrackingAreas
 {
   if (_trackingArea) {

packages/rn-tester/Podfile.lock

@@ -538,12 +538,12 @@ EXTERNAL SOURCES:
     :path: "../../ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  boost: af377b4e3b1e398af5372741cfac107a2ae7e331
-  boost-for-react-native: d5ad1140010aa8cb622323a781ecbeab4425d19a
+  boost: 613e39eac4239cc72b15421247b5ab05361266a2
+  boost-for-react-native: 8f7c9ecfe357664c072ffbe2432569667cbf1f1b
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
-  DoubleConversion: 8dfb8e6a364e688caa15f66896caee7845035144
-  FBLazyVector: ecacdf60242a748ec88abf375fa537a477ce7cce
-  FBReactNativeSpec: c24354727fa9ae1be804a71ee8ab825a1d7e4d5a
+  DoubleConversion: ed15e075aa758ac0e4c1f8b830bd4e4d40d669e8
+  FBLazyVector: 94e8d07547a0c1ea3a3b3f380a26d015b80018c1
+  FBReactNativeSpec: 261385871fd227f3b85571fa8c4f54867ffa17f2
   Flipper: 30e8eeeed6abdc98edaf32af0cda2f198be4b733
   Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
   Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c
@@ -554,40 +554,40 @@ SPEC CHECKSUMS:
   Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
   FlipperKit: d8d346844eca5d9120c17d441a2f38596e8ed2b9
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 1ef03a8a5f8e1978691d927bb31c0935ceb005f8
+  glog: 42c4bf47024808486e90b25ea9e5ac3959047641
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
-  RCT-Folly: 1870fc2f6c34038cae3556a1af98f979f2ce63d9
-  RCTRequired: 6f74fd96b062938e33bfb9f532715278591f81af
-  RCTTypeSafety: e81fb08d37c83fe3436a444932a592bd79cc8c2b
-  React: c7f87233b4b3b94fb27ffc4656d820a84d4750b0
-  React-callinvoker: 2188feda5c50e0e1bb4095a0d58e7379e90f35d0
-  React-Core: 1963b1b00bfe0b7bea4189570cc7879e99f0b77b
-  React-CoreModules: 76a95db816a348df5f7a81e8e30e7ec588a50458
-  React-cxxreact: c6fc2fbeed038a7d930e9de52dfa5b515124232d
-  React-jsi: 52cf528fe8423cb62ce736ab63ad0b26f1cff96e
-  React-jsiexecutor: 59763a1806b0d51d7b6909de4748055ddee2aac5
-  React-jsinspector: 3289457acc8f5ddd8b6532cc52b5148abe4c3850
-  React-logger: 72dba72411d323584bb9b201b67963a00f5b6cdb
-  React-perflogger: aa748460926457aa289b9729832b94072e955f8e
-  React-RCTActionSheet: 2e67249f09c734e0b15f651c68a4ae9138ef52ba
-  React-RCTAnimation: 2142e57698ad0b3cfa80fe0b7d3ea3fb3d384fe9
-  React-RCTBlob: 1fba774b7c9cdf07b3bf248b46c75d5bbfe7fdde
-  React-RCTImage: a41f786fed42dd712af8addf67498a3e202b448b
-  React-RCTLinking: 9e2688e00d538e7d99d69fb7de91265f69d721f1
-  React-RCTNetwork: aa51591e8575c96cc161471ba07dcceb81f94558
-  React-RCTPushNotification: 03d2e955289511231da75ace7d08d2e00d27397b
-  React-RCTSettings: 3d97a65258ef5d8adae59d94b98b268c49069edf
-  React-RCTTest: b12caca2d64c764e1c9b271f26a46134da011e86
-  React-RCTText: c03196bf49ab84a0ac26723c15d7c8feabf26470
-  React-RCTVibration: fc9b3c4789dfbae38b4970ee2f9ddedc38078280
-  React-runtimeexecutor: 5acb34ce3f3cb453db416a4691c637545d464bf7
-  React-TurboModuleCxx-RNW: 84be9c2264b05327ba1133dcf1c8e67a4c238a57
-  React-TurboModuleCxx-WinRTPort: 365cf72f8bb5e27f81113097cd263a0824d7df7e
-  ReactCommon: 71bfd2766343c173f1180466328b36fad23556fa
-  Yoga: ff04bdfd8d4c638a484657a809d89a7c56c87e5e
+  RCT-Folly: 5c589d0de10e841479ad79352fae591dc0e9533a
+  RCTRequired: 7e003851595a3883e2326b3c7a2633a10365859c
+  RCTTypeSafety: a4a36ce7733c51e79f9d2b9e633e3341c8832ed8
+  React: 015423b3d3ec0926d1b72e7abab73f9d791d8129
+  React-callinvoker: c1a30fcc5e4889f4aeb93e118666740c57b167f8
+  React-Core: e7102d7ab9d1d6002d877b001055e4c055cd781c
+  React-CoreModules: 36725cb8a9341d7c54a99c4d9fb18c2c4caf5919
+  React-cxxreact: 964de8735c9f3a1458d59d361c1f444e7906b451
+  React-jsi: 10c7ff0c757ec72ffe0eb0c8e340a60ee89ae5e9
+  React-jsiexecutor: 862f89646e412c7391ef9dd582d5633c7d71cdd2
+  React-jsinspector: 4e946ea8cbac20e985e424d1987fc8a0facc6f6d
+  React-logger: 7d21716ac087dea8339883390805b5b4f8234d30
+  React-perflogger: 6f8630f7462bad0e3b4d8b0628b3f01aaba4bcd4
+  React-RCTActionSheet: fad246587ca30007784baeb79e48db2350e43d36
+  React-RCTAnimation: f8909fef3cc338208a91f73f7e1c7fb70ce4061c
+  React-RCTBlob: 2542aa7bbdfb59541690f537bf0fb83b6c36dc08
+  React-RCTImage: 6032f09e63e8b2a2c2c05b02e8cc721ea5ebcda2
+  React-RCTLinking: 23b465ef446538956a11762b8614fc5bbb689085
+  React-RCTNetwork: fb3ccb9ff976a1cbf1d9e8dd035a188e45f0ec1d
+  React-RCTPushNotification: 7d57b5f7680509d3e70121ba9b675a5cec4ddf0e
+  React-RCTSettings: 369d93e991ddb10bd6ed49410b860485017d6e76
+  React-RCTTest: c79cfff7f622459180b6ce5b3cef303ddc118713
+  React-RCTText: 268743ffce26a948a96e1eb2b9fcbd0f0c2857ab
+  React-RCTVibration: 9f85d8f2724f43ab0a1ba26294969427c7e33dcf
+  React-runtimeexecutor: 38cffec648dad50ecdff565421088f233f3b9dfe
+  React-TurboModuleCxx-RNW: f2e32cbfced49190a61d66c993a8975de79a158a
+  React-TurboModuleCxx-WinRTPort: e2343fde0ddc6555514fcce2efa368d3328ea947
+  ReactCommon: 0fc3ccbfe74eac6e8603406887a3a86ac37f9373
+  Yoga: 711b614df68f9280a788f60c9a4c39b8a2e46319
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
-PODFILE CHECKSUM: 0d4a59b8a9a45fb5448c60c0bc782f1313a9b0a0
+PODFILE CHECKSUM: a09d2f5789dd254e2ffc7291c405c0784adf420d
 
 COCOAPODS: 1.11.2

packages/rn-tester/js/examples/Pressable/PressableExample.js

@@ -98,8 +98,12 @@ function PressableFeedbackEvents() {
           testID="pressable_feedback_events_button"
           accessibilityLabel="pressable feedback events"
           accessibilityRole="button"
-          onHoverIn={() => appendEvent('hoverIn')} // [TODO(macOS GH#774)
-          onHoverOut={() => appendEvent('hoverOut')} // ]TODO(macOS GH#774)
+          // [TODO(macOS GH#774)
+          onHoverIn={() => appendEvent('hoverIn')}
+          onHoverOut={() => appendEvent('hoverOut')}
+          onFocus={() => appendEvent('focus')}
+          onBlur={() => appendEvent('blur')}
+          // ]TODO(macOS GH#774)
           onPress={() => appendEvent('press')}
           onPressIn={() => appendEvent('pressIn')}
           onPressOut={() => appendEvent('pressOut')}