react-native 0.68.2 → 0.69.0-rc.2

package/React/Base/RCTBridge.m

@@ -55,13 +55,11 @@ NSArray<Class> *RCTGetModuleClasses(void)
 /**
  * Register the given class as a bridge module. All modules must be registered
  * prior to the first bridge initialization.
+ * TODO: (T115656171) Refactor RCTRegisterModule out of Bridge.m since it doesn't use the Bridge.
  */
 void RCTRegisterModule(Class);
 void RCTRegisterModule(Class moduleClass)
 {
-  RCTWarnNotAllowedForNewArchitecture(
-      @"RCTRegisterModule()", [NSString stringWithFormat:@"'%@' was registered unexpectedly", moduleClass]);
-
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
     RCTModuleClasses = [NSMutableArray new];
@@ -222,7 +220,7 @@ static RCTBridge *RCTCurrentBridgeInstance = nil;
                    launchOptions:(NSDictionary *)launchOptions
 {
   if (self = [super init]) {
-    RCTEnforceNotAllowedForNewArchitecture(self, nil);
+    RCTEnforceNewArchitectureValidation(RCTNotAllowedInBridgeless, self, nil);
     _delegate = delegate;
     _bundleURL = bundleURL;
     _moduleProvider = block;

package/React/Base/RCTBridgeModule.h

@@ -437,6 +437,8 @@ typedef NSURL * (^RCTBridgelessBundleURLGetter)(void);
 
 typedef UIView * (^RCTBridgelessComponentViewProvider)(NSNumber *);
 
+typedef void (^RCTViewRegistryUIBlock)(RCTViewRegistry *viewRegistry);
+
 /**
  * A class that allows NativeModules to query for views, given React Tags.
  */
@@ -445,6 +447,7 @@ typedef UIView * (^RCTBridgelessComponentViewProvider)(NSNumber *);
 - (void)setBridgelessComponentViewProvider:(RCTBridgelessComponentViewProvider)bridgelessComponentViewProvider;
 
 - (UIView *)viewForReactTag:(NSNumber *)reactTag;
+- (void)addUIBlock:(RCTViewRegistryUIBlock)block;
 @end
 
 typedef void (^RCTBridgelessJSModuleMethodInvoker)(

package/React/Base/RCTBridgeModuleDecorator.h

@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+#import "RCTBridgeModule.h"
+
+@class RCTBundleManager;
+@class RCTCallableJSModules;
+@class RCTModuleRegistry;
+@class RCTViewRegistry;
+
+/**
+ RCTBridgeModuleDecorator contains instances that can be intialized with @synthesize
+ in RCTBridgeModules. For the Fabric interop layer.
+
+ In Bridgeless, @synthesize ivars are passed from RCTBridgeModuleDecorator.
+ In Bridge, @synthesize ivars are passed from RCTModuleData.
+ */
+@interface RCTBridgeModuleDecorator : NSObject
+@property (nonatomic, strong, readonly) RCTViewRegistry *viewRegistry_DEPRECATED;
+@property (nonatomic, strong, readonly) RCTModuleRegistry *moduleRegistry;
+@property (nonatomic, strong, readonly) RCTBundleManager *bundleManager;
+@property (nonatomic, strong, readonly) RCTCallableJSModules *callableJSModules;
+
+- (instancetype)initWithViewRegistry:(RCTViewRegistry *)viewRegistry
+                      moduleRegistry:(RCTModuleRegistry *)moduleRegistry
+                       bundleManager:(RCTBundleManager *)bundleManager
+                   callableJSModules:(RCTCallableJSModules *)callableJSModules;
+
+- (void)attachInteropAPIsToModule:(id<RCTBridgeModule>)bridgeModule;
+
+@end

package/React/Base/RCTBridgeModuleDecorator.m

@@ -0,0 +1,73 @@
+/*
+ * 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.
+ */
+
+#include "RCTBridgeModuleDecorator.h"
+
+@implementation RCTBridgeModuleDecorator
+
+- (instancetype)initWithViewRegistry:(RCTViewRegistry *)viewRegistry
+                      moduleRegistry:(RCTModuleRegistry *)moduleRegistry
+                       bundleManager:(RCTBundleManager *)bundleManager
+                   callableJSModules:(RCTCallableJSModules *)callableJSModules
+{
+  if (self = [super init]) {
+    _viewRegistry_DEPRECATED = viewRegistry;
+    _moduleRegistry = moduleRegistry;
+    _bundleManager = bundleManager;
+    _callableJSModules = callableJSModules;
+  }
+  return self;
+}
+
+- (void)attachInteropAPIsToModule:(id<RCTBridgeModule>)bridgeModule
+{
+  /**
+   * Attach the RCTViewRegistry to this TurboModule, which allows this TurboModule
+   * To query a React component's UIView, given its reactTag.
+   *
+   * Usage: In the TurboModule @implementation, include:
+   *   `@synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED`
+   */
+  if ([bridgeModule respondsToSelector:@selector(setViewRegistry_DEPRECATED:)]) {
+    bridgeModule.viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED;
+  }
+
+  /**
+   * Attach the RCTBundleManager to this TurboModule, which allows this TurboModule to
+   * read from/write to the app's bundle URL.
+   *
+   * Usage: In the TurboModule @implementation, include:
+   *   `@synthesize bundleManager = _bundleManager`
+   */
+  if ([bridgeModule respondsToSelector:@selector(setBundleManager:)]) {
+    bridgeModule.bundleManager = _bundleManager;
+  }
+
+  /**
+   * Attach the RCTCallableJSModules to this TurboModule, which allows this TurboModule
+   * to call JS Module methods.
+   *
+   * Usage: In the TurboModule @implementation, include:
+   *   `@synthesize callableJSModules = _callableJSModules`
+   */
+  if ([bridgeModule respondsToSelector:@selector(setCallableJSModules:)]) {
+    bridgeModule.callableJSModules = _callableJSModules;
+  }
+
+  /**
+   * Attach the RCTModuleRegistry to this TurboModule, which allows this TurboModule
+   * to require other TurboModules/NativeModules.
+   *
+   * Usage: In the TurboModule @implementation, include:
+   *   `@synthesize moduleRegistry = _moduleRegistry`
+   */
+  if ([bridgeModule respondsToSelector:@selector(setModuleRegistry:)]) {
+    bridgeModule.moduleRegistry = _moduleRegistry;
+  }
+}
+
+@end

package/React/Base/RCTConstants.h

@@ -15,3 +15,21 @@ RCT_EXTERN NSString *const RCTUserInterfaceStyleDidChangeNotificationTraitCollec
  */
 RCT_EXTERN BOOL RCTExperimentGetPreemptiveViewAllocationDisabled(void);
 RCT_EXTERN void RCTExperimentSetPreemptiveViewAllocationDisabled(BOOL value);
+
+/*
+ * W3C Pointer Events
+ */
+RCT_EXTERN BOOL RCTGetDispatchW3CPointerEvents(void);
+RCT_EXTERN void RCTSetDispatchW3CPointerEvents(BOOL value);
+
+/*
+ * Memory Pressure Unloading
+ */
+RCT_EXTERN BOOL RCTGetDisableBridgeMemoryPressureUnload(void);
+RCT_EXTERN void RCTSetDisableBridgeMemoryPressureUnload(BOOL value);
+
+/*
+ * Memory Pressure Unloading Level
+ */
+RCT_EXTERN BOOL RCTGetMemoryPressureUnloadLevel(void);
+RCT_EXTERN void RCTSetMemoryPressureUnloadLevel(int value);

package/React/Base/RCTConstants.m

@@ -24,3 +24,49 @@ void RCTExperimentSetPreemptiveViewAllocationDisabled(BOOL value)
 {
   RCTExperimentPreemptiveViewAllocationDisabled = value;
 }
+
+/*
+ * W3C Pointer Events
+ */
+static BOOL RCTDispatchW3CPointerEvents = NO;
+
+BOOL RCTGetDispatchW3CPointerEvents()
+{
+  return RCTDispatchW3CPointerEvents;
+}
+
+void RCTSetDispatchW3CPointerEvents(BOOL value)
+{
+  RCTDispatchW3CPointerEvents = value;
+}
+
+/*
+ * Memory Pressure Unloading
+ */
+static BOOL RCTDisableBridgeMemoryPressureUnload = NO;
+
+BOOL RCTGetDisableBridgeMemoryPressureUnload()
+{
+  return RCTDisableBridgeMemoryPressureUnload;
+}
+
+void RCTSetDisableBridgeMemoryPressureUnload(BOOL value)
+{
+  RCTDisableBridgeMemoryPressureUnload = value;
+}
+
+/*
+ * Memory Pressure Unloading Level for experimentation only.
+ * Default is 15, which is TRIM_MEMORY_RUNNING_CRITICAL.
+ */
+static int RCTMemoryPressureUnloadLevel = 15;
+
+BOOL RCTGetMemoryPressureUnloadLevel()
+{
+  return RCTMemoryPressureUnloadLevel;
+}
+
+void RCTSetMemoryPressureUnloadLevel(int value)
+{
+  RCTMemoryPressureUnloadLevel = value;
+}

package/React/Base/RCTJavaScriptLoader.h

@@ -11,10 +11,7 @@
 
 extern NSString *const RCTJavaScriptLoaderErrorDomain;
 
-extern const UInt32 RCT_BYTECODE_ALIGNMENT;
-
-UInt32 RCTReadUInt32LE(NSData *script, UInt32 offset);
-bool RCTIsBytecodeBundle(NSData *script);
+extern const uint32_t RCT_BYTECODE_ALIGNMENT;
 
 NS_ENUM(NSInteger){
     RCTJavaScriptLoaderErrorNoScriptURL = 1,

package/React/Base/RCTJavaScriptLoader.mm

@@ -19,19 +19,7 @@
 
 NSString *const RCTJavaScriptLoaderErrorDomain = @"RCTJavaScriptLoaderErrorDomain";
 
-const UInt32 RCT_BYTECODE_ALIGNMENT = 4;
-UInt32 RCTReadUInt32LE(NSData *script, UInt32 offset)
-{
-  return [script length] < offset + 4 ? 0 : CFSwapInt32LittleToHost(*(((uint32_t *)[script bytes]) + offset / 4));
-}
-
-bool RCTIsBytecodeBundle(NSData *script)
-{
-  static const UInt32 BYTECODE_BUNDLE_MAGIC_NUMBER = 0xffe7c3c3;
-  return (
-      [script length] > 8 && RCTReadUInt32LE(script, 0) == BYTECODE_BUNDLE_MAGIC_NUMBER &&
-      RCTReadUInt32LE(script, 4) > 0);
-}
+const uint32_t RCT_BYTECODE_ALIGNMENT = 4;
 
 @interface RCTSource () {
  @public
@@ -47,12 +35,18 @@ bool RCTIsBytecodeBundle(NSData *script)
 
 static RCTSource *RCTSourceCreate(NSURL *url, NSData *data, int64_t length) NS_RETURNS_RETAINED
 {
+  using facebook::react::ScriptTag;
+  facebook::react::BundleHeader header;
+  [data getBytes:&header length:sizeof(header)];
+
   RCTSource *source = [RCTSource new];
   source->_url = url;
   // Multipart responses may give us an unaligned view into the buffer. This ensures memory is aligned.
-  source->_data = (RCTIsBytecodeBundle(data) && ((long)[data bytes] % RCT_BYTECODE_ALIGNMENT))
-      ? [[NSData alloc] initWithData:data]
-      : data;
+  if (parseTypeFromHeader(header) == ScriptTag::MetroHBCBundle && ((long)[data bytes] % RCT_BYTECODE_ALIGNMENT)) {
+    source->_data = [[NSData alloc] initWithData:data];
+  } else {
+    source->_data = data;
+  }
   source->_length = length;
   source->_filesChangedCount = RCTSourceFilesChangedCountNotBuiltByBundler;
   return source;
@@ -177,7 +171,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
 
   facebook::react::ScriptTag tag = facebook::react::parseTypeFromHeader(header);
   switch (tag) {
-    case facebook::react::ScriptTag::HBCBundle:
+    case facebook::react::ScriptTag::MetroHBCBundle:
     case facebook::react::ScriptTag::RAMBundle:
       break;
 

package/React/Base/RCTLog.h

@@ -11,6 +11,9 @@
 #import <React/RCTDefines.h>
 #import <React/RCTUtils.h>
 
+@class RCTModuleRegistry;
+@class RCTCallableJSModules;
+
 #ifndef RCTLOG_ENABLED
 #define RCTLOG_ENABLED 1
 #endif
@@ -121,6 +124,20 @@ RCT_EXTERN void RCTPerformBlockWithLogFunction(void (^block)(void), RCTLogFuncti
  */
 RCT_EXTERN void RCTPerformBlockWithLogPrefix(void (^block)(void), NSString *prefix);
 
+/**
+ * These methods allows static methods in RCTLog to call NativeModules and TurboModules.
+ * TODO(T112035275) After Bridgeless mixed mode is removed, we can merge these methods
+ */
+RCT_EXTERN void RCTLogSetBridgeModuleRegistry(RCTModuleRegistry *moduleRegistry);
+RCT_EXTERN void RCTLogSetBridgelessModuleRegistry(RCTModuleRegistry *moduleRegistry);
+
+/**
+ * This methods allows static methods in RCTLog to call JS methods.
+ * TODO(T112035275) After Bridgeless mixed mode is removed, we can merge these methods
+ */
+RCT_EXTERN void RCTLogSetBridgeCallableJSModules(RCTCallableJSModules *callableJSModules);
+RCT_EXTERN void RCTLogSetBridgelessCallableJSModules(RCTCallableJSModules *callableJSModules);
+
 /**
  * Private logging function - ignore this.
  */

package/React/Base/RCTLog.mm

@@ -35,6 +35,12 @@ static const RCTLogLevel RCTDefaultLogThreshold = (RCTLogLevel)(RCTLogLevelInfo
 static RCTLogFunction RCTCurrentLogFunction;
 static RCTLogLevel RCTCurrentLogThreshold = RCTDefaultLogThreshold;
 
+static __weak RCTModuleRegistry *RCTLogBridgeModuleRegistry;
+static __weak RCTModuleRegistry *RCTLogBridgelessModuleRegistry;
+
+static __weak RCTCallableJSModules *RCTLogBridgeCallableJSModules;
+static __weak RCTCallableJSModules *RCTLogBridgelessCallableJSModules;
+
 RCTLogLevel RCTGetLogThreshold()
 {
   return RCTCurrentLogThreshold;
@@ -45,6 +51,26 @@ void RCTSetLogThreshold(RCTLogLevel threshold)
   RCTCurrentLogThreshold = threshold;
 }
 
+void RCTLogSetBridgeModuleRegistry(RCTModuleRegistry *moduleRegistry)
+{
+  RCTLogBridgeModuleRegistry = moduleRegistry;
+}
+
+void RCTLogSetBridgelessModuleRegistry(RCTModuleRegistry *moduleRegistry)
+{
+  RCTLogBridgelessModuleRegistry = moduleRegistry;
+}
+
+void RCTLogSetBridgeCallableJSModules(RCTCallableJSModules *callableJSModules)
+{
+  RCTLogBridgeCallableJSModules = callableJSModules;
+}
+
+void RCTLogSetBridgelessCallableJSModules(RCTCallableJSModules *callableJSModules)
+{
+  RCTLogBridgelessCallableJSModules = callableJSModules;
+}
+
 static os_log_type_t RCTLogTypeForLogLevel(RCTLogLevel logLevel)
 {
   if (logLevel < RCTLogLevelInfo) {
@@ -274,7 +300,8 @@ void _RCTLogNativeInternal(RCTLogLevel level, const char *fileName, int lineNumb
       dispatch_async(dispatch_get_main_queue(), ^{
         // red box is thread safe, but by deferring to main queue we avoid a startup
         // race condition that causes the module to be accessed before it has loaded
-        id redbox = [[RCTBridge currentBridge] moduleForName:@"RedBox" lazilyLoadIfNecessary:YES];
+        RCTModuleRegistry *moduleRegistry = RCTLogBridgeModuleRegistry ?: RCTLogBridgelessModuleRegistry;
+        id redbox = [moduleRegistry moduleForName:"RedBox" lazilyLoadIfNecessary:YES];
         if (redbox) {
           void (*showErrorMessage)(id, SEL, NSString *, NSMutableArray<NSDictionary *> *) =
               (__typeof__(showErrorMessage))objc_msgSend;
@@ -290,7 +317,9 @@ void _RCTLogNativeInternal(RCTLogLevel level, const char *fileName, int lineNumb
 #if RCT_DEBUG
     if (!RCTRunningInTestEnvironment()) {
       // Log to JS executor
-      [[RCTBridge currentBridge] logMessage:message level:level ? @(RCTLogLevels[level]) : @"info"];
+      NSString *levelString = level ? @(RCTLogLevels[level]) : @"info";
+      RCTCallableJSModules *callableModule = RCTLogBridgeCallableJSModules ?: RCTLogBridgelessCallableJSModules;
+      [callableModule invokeModule:@"RCTLog" method:@"logIfNoNativeHook" withArgs:@[ levelString, message ]];
     }
 #endif
   }

package/React/Base/RCTModuleData.mm

@@ -15,6 +15,7 @@
 
 #import "RCTBridge+Private.h"
 #import "RCTBridge.h"
+#import "RCTBridgeModuleDecorator.h"
 #import "RCTInitializing.h"
 #import "RCTLog.h"
 #import "RCTModuleMethod.h"
@@ -217,10 +218,13 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init);
       // initialization requires it (View Managers get their queue by calling
       // self.bridge.uiManager.methodQueue)
       [self setBridgeForInstance];
-      [self setModuleRegistryForInstance];
-      [self setViewRegistryForInstance];
-      [self setBundleManagerForInstance];
-      [self setCallableJSModulesForInstance];
+
+      RCTBridgeModuleDecorator *moduleDecorator =
+          [[RCTBridgeModuleDecorator alloc] initWithViewRegistry:_viewRegistry_DEPRECATED
+                                                  moduleRegistry:_moduleRegistry
+                                                   bundleManager:_bundleManager
+                                               callableJSModules:_callableJSModules];
+      [moduleDecorator attachInteropAPIsToModule:_instance];
     }
 
     [self setUpMethodQueue];
@@ -271,76 +275,6 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init);
   }
 }
 
-- (void)setModuleRegistryForInstance
-{
-  if ([_instance respondsToSelector:@selector(moduleRegistry)] && _instance.moduleRegistry != _moduleRegistry) {
-    RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"[RCTModuleData setModuleRegistryForInstance]", nil);
-    @try {
-      [(id)_instance setValue:_moduleRegistry forKey:@"moduleRegistry"];
-    } @catch (NSException *exception) {
-      RCTLogError(
-          @"%@ has no setter or ivar for its module registry, which is not "
-           "permitted. You must either @synthesize the moduleRegistry property, "
-           "or provide your own setter method.",
-          self.name);
-    }
-    RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
-  }
-}
-
-- (void)setViewRegistryForInstance
-{
-  if ([_instance respondsToSelector:@selector(viewRegistry_DEPRECATED)] &&
-      _instance.viewRegistry_DEPRECATED != _viewRegistry_DEPRECATED) {
-    RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"[RCTModuleData setViewRegistryForInstance]", nil);
-    @try {
-      [(id)_instance setValue:_viewRegistry_DEPRECATED forKey:@"viewRegistry_DEPRECATED"];
-    } @catch (NSException *exception) {
-      RCTLogError(
-          @"%@ has no setter or ivar for its module registry, which is not "
-           "permitted. You must either @synthesize the viewRegistry_DEPRECATED property, "
-           "or provide your own setter method.",
-          self.name);
-    }
-    RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
-  }
-}
-
-- (void)setBundleManagerForInstance
-{
-  if ([_instance respondsToSelector:@selector(bundleManager)] && _instance.bundleManager != _bundleManager) {
-    RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"[RCTModuleData setBundleManagerForInstance]", nil);
-    @try {
-      [(id)_instance setValue:_bundleManager forKey:@"bundleManager"];
-    } @catch (NSException *exception) {
-      RCTLogError(
-          @"%@ has no setter or ivar for its module registry, which is not "
-           "permitted. You must either @synthesize the bundleManager property, "
-           "or provide your own setter method.",
-          self.name);
-    }
-    RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
-  }
-}
-
-- (void)setCallableJSModulesForInstance
-{
-  if ([_instance respondsToSelector:@selector(callableJSModules)] &&
-      _instance.callableJSModules != _callableJSModules) {
-    RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"[RCTModuleData setCallableJSModulesForInstance]", nil);
-    @try {
-      [(id)_instance setValue:_callableJSModules forKey:@"callableJSModules"];
-    } @catch (NSException *exception) {
-      RCTLogError(
-          @"%@ has no setter or ivar for its module registry, which is not "
-           "permitted. You must either @synthesize the callableJSModules property, "
-           "or provide your own setter method.",
-          self.name);
-    }
-    RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
-  }
-}
-
 - (void)_initializeModule
 {
   if (!_isInitialized && [_instance respondsToSelector:@selector(initialize)]) {

package/React/Base/RCTVersion.m

@@ -22,9 +22,9 @@ NSDictionary* RCTGetReactNativeVersion(void)
   dispatch_once(&onceToken, ^(void){
     __rnVersion = @{
                   RCTVersionMajor: @(0),
-                  RCTVersionMinor: @(68),
-                  RCTVersionPatch: @(2),
-                  RCTVersionPrerelease: [NSNull null],
+                  RCTVersionMinor: @(69),
+                  RCTVersionPatch: @(0),
+                  RCTVersionPrerelease: @"rc.2",
                   };
   });
   return __rnVersion;

package/React/Base/RCTViewRegistry.m

@@ -42,4 +42,28 @@
   return view;
 }
 
+- (void)addUIBlock:(RCTViewRegistryUIBlock)block
+{
+  if (!block) {
+    return;
+  }
+
+  __weak __typeof(self) weakSelf = self;
+  if (_bridge) {
+    [_bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+      __typeof(self) strongSelf = weakSelf;
+      if (strongSelf) {
+        block(strongSelf);
+      }
+    }];
+  } else {
+    RCTExecuteOnMainQueue(^{
+      __typeof(self) strongSelf = weakSelf;
+      if (strongSelf) {
+        block(strongSelf);
+      }
+    });
+  }
+}
+
 @end

package/React/Base/Surface/RCTSurface.mm

@@ -64,6 +64,7 @@
                     moduleName:(NSString *)moduleName
              initialProperties:(NSDictionary *)initialProperties
 {
+  RCTErrorNewArchitectureValidation(RCTNotAllowedInAppWideFabric, @"RCTSurface", nil);
   RCTAssert(bridge.valid, @"Valid bridge is required to instantiate `RCTSurface`.");
 
   if (self = [super init]) {
@@ -481,7 +482,7 @@
           @"Only waiting for `RCTSurfaceStageSurfaceDidInitialRendering`, `RCTSurfaceStageSurfaceDidInitialLayout` and `RCTSurfaceStageSurfaceDidInitialMounting` stages are supported.");
   }
 
-  BOOL timeoutOccurred = dispatch_semaphore_wait(semaphore, dispatch_time(DISPATCH_TIME_NOW, timeout * NSEC_PER_SEC));
+  auto timeoutOccurred = dispatch_semaphore_wait(semaphore, dispatch_time(DISPATCH_TIME_NOW, timeout * NSEC_PER_SEC));
 
   // Atomic equivalent of `_waitingForMountingStageOnMainQueue = NO;`.
   atomic_fetch_and(&_waitingForMountingStageOnMainQueue, 0);

package/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm

@@ -6,7 +6,6 @@
  */
 
 #import "RCTSurfaceHostingView.h"
-
 #import "RCTConstants.h"
 #import "RCTDefines.h"
 #import "RCTSurface.h"

package/React/CoreModules/BUCK

@@ -38,6 +38,7 @@ rn_apple_library(
     labels = [
         "depslint_never_remove",  # Some old NativeModule still relies on +load unfortunately.
         "disable_plugins_only_validation",
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
         "supermodule:xplat/default/public.react_native.infra",
     ],
     link_whole = True,

package/React/CoreModules/RCTAccessibilityManager.mm

@@ -281,9 +281,9 @@ RCT_EXPORT_METHOD(setAccessibilityContentSizeMultipliers
 static void setMultipliers(
     NSMutableDictionary<NSString *, NSNumber *> *multipliers,
     NSString *key,
-    folly::Optional<double> optionalDouble)
+    std::optional<double> optionalDouble)
 {
-  if (optionalDouble.hasValue()) {
+  if (optionalDouble.has_value()) {
     multipliers[key] = @(optionalDouble.value());
   }
 }

package/React/CoreModules/RCTActionSheetManager.mm

@@ -21,12 +21,25 @@
 using namespace facebook::react;
 
 @interface RCTActionSheetManager () <UIActionSheetDelegate, NativeActionSheetManagerSpec>
+
+@property (nonatomic, strong) NSMutableArray<UIAlertController *> *alertControllers;
+
 @end
 
-@implementation RCTActionSheetManager {
-  // Use NSMapTable, as UIAlertViews do not implement <NSCopying>
-  // which is required for NSDictionary keys
-  NSMapTable *_callbacks;
+@implementation RCTActionSheetManager
+
+- (instancetype)init
+{
+  self = [super init];
+  if (self) {
+    _alertControllers = [NSMutableArray new];
+  }
+  return self;
+}
+
++ (BOOL)requiresMainQueueSetup
+{
+  return NO;
 }
 
 RCT_EXPORT_MODULE()
@@ -64,10 +77,6 @@ RCT_EXPORT_METHOD(showActionSheetWithOptions
     return;
   }
 
-  if (!_callbacks) {
-    _callbacks = [NSMapTable strongToStrongObjectsMapTable];
-  }
-
   NSString *title = options.title();
   NSString *message = options.message();
   NSArray<NSString *> *buttons = RCTConvertOptionalVecToArray(options.options(), ^id(NSString *element) {
@@ -126,6 +135,10 @@ RCT_EXPORT_METHOD(showActionSheetWithOptions
 
   NSInteger index = 0;
   bool isCancelButtonIndex = false;
+  // The handler for a button might get called more than once when tapping outside
+  // the action sheet on iPad. RCTResponseSenderBlock can only be called once so
+  // keep track of callback invocation here.
+  __block bool callbackInvoked = false;
   for (NSString *option in buttons) {
     UIAlertActionStyle style = UIAlertActionStyleDefault;
     if ([destructiveButtonIndices containsObject:@(index)]) {
@@ -139,7 +152,11 @@ RCT_EXPORT_METHOD(showActionSheetWithOptions
     UIAlertAction *actionButton = [UIAlertAction actionWithTitle:option
                                                            style:style
                                                          handler:^(__unused UIAlertAction *action) {
-                                                           callback(@[ @(localIndex) ]);
+                                                           if (!callbackInvoked) {
+                                                             callbackInvoked = true;
+                                                             [self->_alertControllers removeObject:alertController];
+                                                             callback(@[ @(localIndex) ]);
+                                                           }
                                                          }];
     if (isCancelButtonIndex) {
       [actionButton setValue:cancelButtonTintColor forKey:@"titleTextColor"];
@@ -179,9 +196,21 @@ RCT_EXPORT_METHOD(showActionSheetWithOptions
   }
 #endif
 
+  [_alertControllers addObject:alertController];
   [self presentViewController:alertController onParentViewController:controller anchorViewTag:anchorViewTag];
 }
 
+RCT_EXPORT_METHOD(dismissActionSheet)
+{
+  if (_alertControllers.count == 0) {
+    RCTLogWarn(@"Unable to dismiss action sheet");
+  }
+
+  id _alertController = [_alertControllers lastObject];
+  [_alertController dismissViewControllerAnimated:YES completion:nil];
+  [_alertControllers removeLastObject];
+}
+
 RCT_EXPORT_METHOD(showShareActionSheetWithOptions
                   : (JS::NativeActionSheetManager::SpecShowShareActionSheetWithOptionsOptions &)options failureCallback
                   : (RCTResponseSenderBlock)failureCallback successCallback

package/React/CoreModules/RCTDevMenu.h

@@ -39,6 +39,11 @@ RCT_EXTERN NSString *const RCTShowDevMenuNotification;
  */
 @property (nonatomic, assign) BOOL hotLoadingEnabled DEPRECATED_ATTRIBUTE;
 
+/**
+ * Whether the hotkeys that toggles the developer menu is enabled.
+ */
+@property (nonatomic, assign) BOOL hotkeysEnabled;
+
 /**
  * Presented items in development menu
  */