macOS Delta

packages/react-native/Libraries/AddressSanitizerCrash/AddressSanitizerCrash.js

@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @flow strict-local
+ */
+
+import NativeAddressSanitizerCrash from './NativeAddressSanitizerCrash';
+
+module.exports = NativeAddressSanitizerCrash;

packages/react-native/Libraries/AddressSanitizerCrash/NativeAddressSanitizerCrash.js

@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import type {TurboModule} from '../TurboModule/RCTExport';
+
+import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
+
+export interface Spec extends TurboModule {}
+
+export default (TurboModuleRegistry.get<Spec>(
+  'RCTAddressSanitizerCrash',
+): ?Spec);

packages/react-native/Libraries/Alert/Alert.js

@@ -26,11 +26,22 @@ export type Buttons = Array<{
   style?: AlertButtonStyle,
   ...
 }>;
+// [macOS
+export type DefaultInputsArray = Array<{
+  default?: string,
+  placeholder?: string,
+  style?: AlertButtonStyle,
+}>;
+// macOS]
 
 type Options = {
   cancelable?: ?boolean,
   userInterfaceStyle?: 'unspecified' | 'light' | 'dark',
   onDismiss?: ?() => void,
+  // [macOS
+  modal?: ?boolean,
+  critical?: ?boolean,
+  // macOS]
   ...
 };
 
@@ -56,6 +67,18 @@ class Alert {
         undefined,
         options,
       );
+      // [macOS
+    } else if (Platform.OS === 'macos') {
+      Alert.promptMacOS(
+        title,
+        message,
+        buttons,
+        'default',
+        undefined,
+        options?.modal,
+        options?.critical,
+      );
+      // macOS]
     } else if (Platform.OS === 'android') {
       const NativeDialogManagerAndroid =
         require('../NativeModules/specs/NativeDialogManagerAndroid').default;
@@ -167,8 +190,103 @@ class Alert {
           cb && cb(value);
         },
       );
+      // [macOS
+    } else if (Platform.OS === 'macos') {
+      const defaultInputs = [{default: defaultValue}];
+      Alert.promptMacOS(title, message, callbackOrButtons, type, defaultInputs);
+    }
+    // macOS]
+  }
+
+  // [macOS
+  /**
+   * Create and display a prompt to enter some text.
+   * @static
+   * @method promptMacOS
+   * @param title The dialog's title.
+   * @param message An optional message that appears above the text
+   *    input.
+   * @param callbackOrButtons This optional argument should
+   *    be either a single-argument function or an array of buttons. If passed
+   *    a function, it will be called with the prompt's value when the user
+   *    taps 'OK'.
+   *
+   *    If passed an array of button configurations, each button should include
+   *    a `text` key, as well as optional `onPress` key (see
+   *    example).
+   * @param type This configures the text input. One of 'plain-text',
+   *    'secure-text' or 'login-password'.
+   * @param defaultInputs This optional argument should be an array of couple
+   *    default value - placeholder for the input fields.
+   * @param modal The alert can be optionally run as an app-modal dialog, instead
+   *    of the default presentation as a sheet.
+   * @param critical This optional argument should be used when it's needed to
+   *    warn the user about severe consequences of an impending event
+   *    (such as deleting a file).
+   *
+   * @example <caption>Example with custom buttons</caption>
+   *
+   * AlertMacOS.promptMacOS(
+   *   'Enter password',
+   *   'Enter your password to claim your $1.5B in lottery winnings',
+   *   [
+   *     {text: 'Cancel', onPress: () => console.log('Cancel Pressed'), style: 'cancel'},
+   *     {text: 'OK', onPress: password => console.log('OK Pressed, password: ' + password)},
+   *   ],
+   *   'secure-text'
+   * );
+   *
+   * @example <caption>Example with the default button and a custom callback</caption>
+   *
+   * AlertMacOS.prompt(
+   *   'Update username',
+   *   null,
+   *   text => console.log("Your username is "+text),
+   *   null,
+   *   'default'
+   * );
+   */
+  static promptMacOS(
+    title: ?string,
+    message?: ?string,
+    callbackOrButtons?: ?((text: string) => void) | Buttons,
+    type?: ?AlertType = 'plain-text',
+    defaultInputs?: DefaultInputsArray,
+    modal?: ?boolean,
+    critical?: ?boolean,
+  ): void {
+    let callbacks: Array<?any> = [];
+    const buttons = [];
+    if (typeof callbackOrButtons === 'function') {
+      callbacks = [callbackOrButtons];
+    } else if (callbackOrButtons instanceof Array) {
+      callbackOrButtons.forEach((btn, index) => {
+        callbacks[index] = btn.onPress;
+        if (btn.text || index < (callbackOrButtons || []).length - 1) {
+          const btnDef: {[number]: string} = {};
+          btnDef[index] = btn.text || '';
+          buttons.push(btnDef);
+        }
+      });
     }
+
+    RCTAlertManager.alertWithArgs(
+      {
+        title: title || undefined,
+        message: message || undefined,
+        buttons,
+        type: type || undefined,
+        defaultInputs,
+        modal: modal || undefined,
+        critical: critical || undefined,
+      },
+      (id, value) => {
+        const cb = callbacks[id];
+        cb && cb(value);
+      },
+    );
   }
+  // macOS]
 }
 
 module.exports = Alert;

packages/react-native/Libraries/Alert/NativeAlertManager.js

@@ -23,6 +23,11 @@ export type Args = {|
   preferredButtonKey?: string,
   keyboardType?: string,
   userInterfaceStyle?: string,
+  // [macOS
+  defaultInputs?: Array<Object>,
+  modal?: ?boolean,
+  critical?: ?boolean,
+  // macOS]
 |};
 
 export interface Spec extends TurboModule {

packages/react-native/Libraries/Alert/RCTAlertManager.macos.js

@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @flow strict-local
+ */
+
+// [macOS]
+
+/* $FlowFixMe allow macOS to share iOS file */
+const alertWithArgs = require('./RCTAlertManager.ios');
+
+module.exports = alertWithArgs;

packages/react-native/Libraries/Animated/AnimatedMock.js

@@ -98,7 +98,13 @@ const spring = function (
   return {
     ...emptyAnimation,
     start: mockAnimationStart((callback?: ?EndCallback): void => {
-      anyValue.setValue(config.toValue);
+      // [macOS setValue can't handle AnimatedNodes
+      if (config.toValue instanceof AnimatedNode) {
+        anyValue.setValue(config.toValue.__getValue());
+      } else {
+        // macOS]
+        anyValue.setValue(config.toValue);
+      }
       callback?.({finished: true});
     }),
   };

packages/react-native/Libraries/Animated/NativeAnimatedHelper.js

@@ -600,7 +600,9 @@ export default {
       nativeEventEmitter = new NativeEventEmitter(
         // T88715063: NativeEventEmitter only used this parameter on iOS. Now it uses it on all platforms, so this code was modified automatically to preserve its behavior
         // If you want to use the native module on other platforms, please remove this condition and test its behavior
-        Platform.OS !== 'ios' ? null : NativeAnimatedModule,
+        Platform.OS !== 'ios' && Platform.OS !== 'macos' // [macOS] Also use this parameter on macOS
+          ? null
+          : NativeAnimatedModule,
       );
     }
     return nativeEventEmitter;

packages/react-native/Libraries/AppDelegate/RCTAppDelegate.h

@@ -6,7 +6,7 @@
  */
 
 #import <React/RCTBridgeDelegate.h>
-#import <UIKit/UIKit.h>
+#import <React/RCTUIKit.h> // [macOS]
 
 @class RCTBridge;
 @protocol RCTBridgeDelegate;
@@ -51,10 +51,13 @@
                                                          (const facebook::react::ObjCTurboModule::InitParams &)params
  *   - (id<RCTTurboModule>)getModuleInstanceFromClass:(Class)moduleClass
  */
+#if !TARGET_OS_OSX // [macOS]
 @interface RCTAppDelegate : UIResponder <UIApplicationDelegate, UISceneDelegate, RCTBridgeDelegate>
-
+#else // [macOS
+@interface RCTAppDelegate : NSResponder <NSApplicationDelegate, RCTBridgeDelegate>
+#endif // macOS]
 /// The window object, used to render the UViewControllers
-@property (nonatomic, strong) UIWindow *window;
+@property (nonatomic, strong) RCTPlatformWindow *window; // [macOS]
 @property (nonatomic, strong) RCTBridge *bridge;
 @property (nonatomic, strong) NSString *moduleName;
 @property (nonatomic, strong) NSDictionary *initialProps;
@@ -83,9 +86,9 @@
  *
  * @returns: a UIView properly configured with a bridge for React Native.
  */
-- (UIView *)createRootViewWithBridge:(RCTBridge *)bridge
-                          moduleName:(NSString *)moduleName
-                           initProps:(NSDictionary *)initProps;
+- (RCTPlatformView *)createRootViewWithBridge:(RCTBridge *)bridge // [macOS]
+                                   moduleName:(NSString *)moduleName
+                                    initProps:(NSDictionary *)initProps;
 
 /**
  * It creates the RootViewController.
@@ -104,7 +107,7 @@
  *
  * @return: void
  */
-- (void)setRootView:(UIView *)rootView toRootViewController:(UIViewController *)rootViewController;
+- (void)setRootView:(RCTPlatformView *)rootView toRootViewController:(UIViewController *)rootViewController; // [macOS]
 
 /// This method controls whether the App will use RuntimeScheduler. Only applicable in the legacy architecture.
 ///

packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm

@@ -76,8 +76,15 @@ - (instancetype)init
 }
 #endif
 
+#if !TARGET_OS_OSX // [macOS]
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
+#else // [macOS
+- (void)applicationDidFinishLaunching:(NSNotification *)notification
+{
+    NSApplication *application = [notification object];
+    NSDictionary *launchOptions = [notification userInfo];
+#endif // macOS]
   BOOL enableTM = NO;
   BOOL enableBridgeless = NO;
 #if RCT_NEW_ARCH_ENABLED
@@ -87,7 +94,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
   RCTAppSetupPrepareApp(application, enableTM);
 
-  UIView *rootView;
+  RCTPlatformView *rootView; // [macOS]
 
   if (enableBridgeless) {
 #if RCT_NEW_ARCH_ENABLED
@@ -125,6 +132,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     NSDictionary *initProps = [self prepareInitialProps];
     rootView = [self createRootViewWithBridge:self.bridge moduleName:self.moduleName initProps:initProps];
   }
+#if !TARGET_OS_OSX // [macOS]
   self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
   UIViewController *rootViewController = [self createRootViewController];
   [self setRootView:rootView toRootViewController:rootViewController];
@@ -133,6 +141,21 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   [self.window makeKeyAndVisible];
 
   return YES;
+#else // [macOS
+  NSRect frame = NSMakeRect(0,0,1024,768);
+  self.window = [[NSWindow alloc] initWithContentRect:NSZeroRect
+											styleMask:NSWindowStyleMaskTitled | NSWindowStyleMaskResizable | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable
+											  backing:NSBackingStoreBuffered
+												defer:NO];
+  self.window.title = self.moduleName;
+  self.window.autorecalculatesKeyViewLoop = YES;
+  NSViewController *rootViewController = [NSViewController new];
+  rootViewController.view = rootView;
+  rootView.frame = frame;
+  self.window.contentViewController = rootViewController;
+  [self.window makeKeyAndOrderFront:self];
+  [self.window center];
+#endif // macOS]
 }
 
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
@@ -160,27 +183,38 @@ - (RCTBridge *)createBridgeWithDelegate:(id<RCTBridgeDelegate>)delegate launchOp
   return [[RCTBridge alloc] initWithDelegate:delegate launchOptions:launchOptions];
 }
 
-- (UIView *)createRootViewWithBridge:(RCTBridge *)bridge
+- (RCTPlatformView *)createRootViewWithBridge:(RCTBridge *)bridge // [macOS]
                           moduleName:(NSString *)moduleName
                            initProps:(NSDictionary *)initProps
 {
   BOOL enableFabric = NO;
 #if RCT_NEW_ARCH_ENABLED
   enableFabric = self.fabricEnabled;
 #endif
-  UIView *rootView = RCTAppSetupDefaultRootView(bridge, moduleName, initProps, enableFabric);
+  RCTPlatformView *rootView = RCTAppSetupDefaultRootView(bridge, moduleName, initProps, enableFabric); // [macOS]
 
+#if !TARGET_OS_OSX // [macOS]
   rootView.backgroundColor = [UIColor systemBackgroundColor];
+#else // [macOS
+  rootView.layer.backgroundColor = [[NSColor windowBackgroundColor] CGColor];
+#endif // macOS]
 
   return rootView;
 }
 
+#if !TARGET_OS_OSX // [macOS]
 - (UIViewController *)createRootViewController
 {
   return [UIViewController new];
 }
+#else // [macOS
+- (NSViewController *)createRootViewController
+{
+  return [NSViewController new];
+}
+#endif // macOS]
 
-- (void)setRootView:(UIView *)rootView toRootViewController:(UIViewController *)rootViewController
+- (void)setRootView:(RCTPlatformView *)rootView toRootViewController:(UIViewController *)rootViewController // [macOS]
 {
   rootViewController.view = rootView;
 }
@@ -191,13 +225,15 @@ - (BOOL)runtimeSchedulerEnabled
 }
 
 #pragma mark - UISceneDelegate
+#if !TARGET_OS_OSX // [macOS]
 - (void)windowScene:(UIWindowScene *)windowScene
     didUpdateCoordinateSpace:(id<UICoordinateSpace>)previousCoordinateSpace
         interfaceOrientation:(UIInterfaceOrientation)previousInterfaceOrientation
              traitCollection:(UITraitCollection *)previousTraitCollection API_AVAILABLE(ios(13.0))
 {
   [[NSNotificationCenter defaultCenter] postNotificationName:RCTRootViewFrameDidChangeNotification object:self];
 }
+#endif // [macOS]
 
 #pragma mark - RCTCxxBridgeDelegate
 - (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:(RCTBridge *)bridge