react-native 0.0.0-201c10733 → 0.0.0-268efb102

package/React/Base/RCTModuleData.h

@@ -15,6 +15,8 @@
 @class RCTBridge;
 @class RCTModuleRegistry;
 @class RCTViewRegistry;
+@class RCTBundleManager;
+@class RCTCallableJSModules;
 
 typedef id<RCTBridgeModule> (^RCTBridgeModuleProvider)(void);
 
@@ -23,18 +25,24 @@ typedef id<RCTBridgeModule> (^RCTBridgeModuleProvider)(void);
 - (instancetype)initWithModuleClass:(Class)moduleClass
                              bridge:(RCTBridge *)bridge
                      moduleRegistry:(RCTModuleRegistry *)moduleRegistry
-            viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED;
+            viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
+                      bundleManager:(RCTBundleManager *)bundleManager
+                  callableJSModules:(RCTCallableJSModules *)callableJSModules;
 
 - (instancetype)initWithModuleClass:(Class)moduleClass
                      moduleProvider:(RCTBridgeModuleProvider)moduleProvider
                              bridge:(RCTBridge *)bridge
                      moduleRegistry:(RCTModuleRegistry *)moduleRegistry
-            viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED NS_DESIGNATED_INITIALIZER;
+            viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
+                      bundleManager:(RCTBundleManager *)bundleManager
+                  callableJSModules:(RCTCallableJSModules *)callableJSModules NS_DESIGNATED_INITIALIZER;
 
 - (instancetype)initWithModuleInstance:(id<RCTBridgeModule>)instance
                                 bridge:(RCTBridge *)bridge
                         moduleRegistry:(RCTModuleRegistry *)moduleRegistry
-               viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED NS_DESIGNATED_INITIALIZER;
+               viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
+                         bundleManager:(RCTBundleManager *)bundleManager
+                     callableJSModules:(RCTCallableJSModules *)callableJSModules NS_DESIGNATED_INITIALIZER;
 
 /**
  * Calls `constantsToExport` on the module and stores the result. Note that

package/React/Base/RCTModuleData.mm

@@ -15,6 +15,7 @@
 
 #import "RCTBridge+Private.h"
 #import "RCTBridge.h"
+#import "RCTInitializing.h"
 #import "RCTLog.h"
 #import "RCTModuleMethod.h"
 #import "RCTProfile.h"
@@ -50,6 +51,9 @@ BOOL RCTIsMainQueueExecutionOfConstantsToExportDisabled()
   BOOL _setupComplete;
   RCTModuleRegistry *_moduleRegistry;
   RCTViewRegistry *_viewRegistry_DEPRECATED;
+  RCTBundleManager *_bundleManager;
+  RCTCallableJSModules *_callableJSModules;
+  BOOL _isInitialized;
 }
 
 @synthesize methods = _methods;
@@ -103,6 +107,8 @@ BOOL RCTIsMainQueueExecutionOfConstantsToExportDisabled()
                              bridge:(RCTBridge *)bridge
                      moduleRegistry:(RCTModuleRegistry *)moduleRegistry
             viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
+                      bundleManager:(RCTBundleManager *)bundleManager
+                  callableJSModules:(RCTCallableJSModules *)callableJSModules
 {
   return [self initWithModuleClass:moduleClass
                     moduleProvider:^id<RCTBridgeModule> {
@@ -110,7 +116,9 @@ BOOL RCTIsMainQueueExecutionOfConstantsToExportDisabled()
                     }
                             bridge:bridge
                     moduleRegistry:moduleRegistry
-           viewRegistry_DEPRECATED:viewRegistry_DEPRECATED];
+           viewRegistry_DEPRECATED:viewRegistry_DEPRECATED
+                     bundleManager:bundleManager
+                 callableJSModules:callableJSModules];
 }
 
 - (instancetype)initWithModuleClass:(Class)moduleClass
@@ -118,6 +126,8 @@ BOOL RCTIsMainQueueExecutionOfConstantsToExportDisabled()
                              bridge:(RCTBridge *)bridge
                      moduleRegistry:(RCTModuleRegistry *)moduleRegistry
             viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
+                      bundleManager:(RCTBundleManager *)bundleManager
+                  callableJSModules:(RCTCallableJSModules *)callableJSModules
 {
   if (self = [super init]) {
     _bridge = bridge;
@@ -125,6 +135,8 @@ BOOL RCTIsMainQueueExecutionOfConstantsToExportDisabled()
     _moduleProvider = [moduleProvider copy];
     _moduleRegistry = moduleRegistry;
     _viewRegistry_DEPRECATED = viewRegistry_DEPRECATED;
+    _bundleManager = bundleManager;
+    _callableJSModules = callableJSModules;
     [self setUp];
   }
   return self;
@@ -134,6 +146,8 @@ BOOL RCTIsMainQueueExecutionOfConstantsToExportDisabled()
                                 bridge:(RCTBridge *)bridge
                         moduleRegistry:(RCTModuleRegistry *)moduleRegistry
                viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
+                         bundleManager:(RCTBundleManager *)bundleManager
+                     callableJSModules:(RCTCallableJSModules *)callableJSModules
 {
   if (self = [super init]) {
     _bridge = bridge;
@@ -141,6 +155,8 @@ BOOL RCTIsMainQueueExecutionOfConstantsToExportDisabled()
     _moduleClass = [instance class];
     _moduleRegistry = moduleRegistry;
     _viewRegistry_DEPRECATED = viewRegistry_DEPRECATED;
+    _bundleManager = bundleManager;
+    _callableJSModules = callableJSModules;
     [self setUp];
   }
   return self;
@@ -203,9 +219,15 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init);
       [self setBridgeForInstance];
       [self setModuleRegistryForInstance];
       [self setViewRegistryForInstance];
+      [self setBundleManagerForInstance];
+      [self setCallableJSModulesForInstance];
     }
 
     [self setUpMethodQueue];
+
+    if (shouldSetup) {
+      [self _initializeModule];
+    }
   }
   RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
 
@@ -284,6 +306,49 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init);
   }
 }
 
+- (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)]) {
+    _isInitialized = YES;
+    [(id<RCTInitializing>)_instance initialize];
+  }
+}
+
 - (void)finishSetupForInstance
 {
   if (!_setupComplete && _instance) {

package/React/Base/RCTMultipartStreamReader.m

@@ -7,8 +7,6 @@
 
 #import "RCTMultipartStreamReader.h"
 
-#import <QuartzCore/CAAnimation.h>
-
 #define CRLF @"\r\n"
 
 @implementation RCTMultipartStreamReader {

package/React/Base/RCTRootView.h

@@ -8,6 +8,8 @@
 #import <UIKit/UIKit.h>
 
 #import <React/RCTBridge.h>
+#import <React/RCTBridgeModule.h>
+#import <React/RCTEventDispatcherProtocol.h>
 
 @protocol RCTRootViewDelegate;
 
@@ -50,9 +52,18 @@ extern
 /**
  * - Designated initializer -
  */
+- (instancetype)initWithFrame:(CGRect)frame
+                       bridge:(RCTBridge *)bridge
+                   moduleName:(NSString *)moduleName
+            initialProperties:(nullable NSDictionary *)initialProperties NS_DESIGNATED_INITIALIZER;
+
+/**
+ * - Convenience initializer -
+ * The frame will default to CGRectZero.
+ */
 - (instancetype)initWithBridge:(RCTBridge *)bridge
                     moduleName:(NSString *)moduleName
-             initialProperties:(nullable NSDictionary *)initialProperties NS_DESIGNATED_INITIALIZER;
+             initialProperties:(nullable NSDictionary *)initialProperties;
 
 /**
  * - Convenience initializer -
@@ -66,6 +77,19 @@ extern
                 initialProperties:(nullable NSDictionary *)initialProperties
                     launchOptions:(nullable NSDictionary *)launchOptions;
 
+/**
+ * This API allows RCTRootView users to know if the root view is backed by the bridge.
+ */
+@property (nonatomic, readonly) BOOL hasBridge;
+
+/**
+ * This API allows users of RCTRootView to access other NativeModules, without
+ * directly accessing the bridge.
+ */
+@property (nonatomic, strong, readonly) RCTModuleRegistry *moduleRegistry;
+
+@property (nonatomic, strong, readonly) id<RCTEventDispatcherProtocol> eventDispatcher;
+
 /**
  * The name of the JavaScript module to execute within the
  * specified scriptURL (required). Setting this will not have

package/React/Base/RCTRootView.m

@@ -44,9 +44,10 @@ NSString *const RCTContentDidAppearNotification = @"RCTContentDidAppearNotificat
   CGSize _intrinsicContentSize;
 }
 
-- (instancetype)initWithBridge:(RCTBridge *)bridge
-                    moduleName:(NSString *)moduleName
-             initialProperties:(NSDictionary *)initialProperties
+- (instancetype)initWithFrame:(CGRect)frame
+                       bridge:(RCTBridge *)bridge
+                   moduleName:(NSString *)moduleName
+            initialProperties:(NSDictionary *)initialProperties
 {
   RCTAssertMainQueue();
   RCTAssert(bridge, @"A bridge instance is required to create an RCTRootView");
@@ -57,7 +58,7 @@ NSString *const RCTContentDidAppearNotification = @"RCTContentDidAppearNotificat
     [bridge.performanceLogger markStartForTag:RCTPLTTI];
   }
 
-  if (self = [super initWithFrame:CGRectZero]) {
+  if (self = [super initWithFrame:frame]) {
     self.backgroundColor = [UIColor whiteColor];
 
     _bridge = bridge;
@@ -95,6 +96,13 @@ NSString *const RCTContentDidAppearNotification = @"RCTContentDidAppearNotificat
   return self;
 }
 
+- (instancetype)initWithBridge:(RCTBridge *)bridge
+                    moduleName:(NSString *)moduleName
+             initialProperties:(NSDictionary *)initialProperties
+{
+  return [self initWithFrame:CGRectZero bridge:bridge moduleName:moduleName initialProperties:initialProperties];
+}
+
 - (instancetype)initWithBundleURL:(NSURL *)bundleURL
                        moduleName:(NSString *)moduleName
                 initialProperties:(NSDictionary *)initialProperties
@@ -108,6 +116,21 @@ NSString *const RCTContentDidAppearNotification = @"RCTContentDidAppearNotificat
 RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame : (CGRect)frame)
 RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
 
+- (BOOL)hasBridge
+{
+  return _bridge != nil;
+}
+
+- (RCTModuleRegistry *)moduleRegistry
+{
+  return _bridge.moduleRegistry;
+}
+
+- (id<RCTEventDispatcherProtocol>)eventDispatcher
+{
+  return [self.moduleRegistry moduleForName:"EventDispatcher"];
+}
+
 #pragma mark - passThroughTouches
 
 - (BOOL)passThroughTouches

package/React/Base/RCTTouchHandler.m

@@ -166,6 +166,9 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithTarget : (id)target action : (SEL)act
   // have a value of `1.0 / nativeTouch.maximumPossibleForce`)?
   if (RCTForceTouchAvailable()) {
     reactTouch[@"force"] = @(RCTZeroIfNaN(nativeTouch.force / nativeTouch.maximumPossibleForce));
+  } else if (nativeTouch.type == UITouchTypePencil) {
+    reactTouch[@"force"] = @(RCTZeroIfNaN(nativeTouch.force / nativeTouch.maximumPossibleForce));
+    reactTouch[@"altitudeAngle"] = @(RCTZeroIfNaN(nativeTouch.altitudeAngle));
   }
 }
 

package/React/Base/RCTUtils.h

@@ -40,6 +40,9 @@ RCT_EXTERN void RCTExecuteOnMainQueue(dispatch_block_t block);
 // Please do not use this unless you know what you're doing.
 RCT_EXTERN void RCTUnsafeExecuteOnMainQueueSync(dispatch_block_t block);
 
+// Get screen scale, can be only used on main
+RCT_EXTERN void RCTComputeScreenScale(void);
+
 // Get screen metrics in a thread-safe way
 RCT_EXTERN CGFloat RCTScreenScale(void);
 RCT_EXTERN CGFloat RCTFontSizeMultiplier(void);

package/React/Base/RCTUtils.m

@@ -296,16 +296,23 @@ static void RCTUnsafeExecuteOnMainQueueOnceSync(dispatch_once_t *onceToken, disp
   }
 }
 
-CGFloat RCTScreenScale()
+static dispatch_once_t onceTokenScreenScale;
+static CGFloat screenScale;
+
+void RCTComputeScreenScale()
 {
-  static dispatch_once_t onceToken;
-  static CGFloat scale;
+  dispatch_once(&onceTokenScreenScale, ^{
+    screenScale = [UIScreen mainScreen].scale;
+  });
+}
 
-  RCTUnsafeExecuteOnMainQueueOnceSync(&onceToken, ^{
-    scale = [UIScreen mainScreen].scale;
+CGFloat RCTScreenScale()
+{
+  RCTUnsafeExecuteOnMainQueueOnceSync(&onceTokenScreenScale, ^{
+    screenScale = [UIScreen mainScreen].scale;
   });
 
-  return scale;
+  return screenScale;
 }
 
 CGFloat RCTFontSizeMultiplier()
@@ -334,7 +341,7 @@ CGFloat RCTFontSizeMultiplier()
 
 CGSize RCTScreenSize()
 {
-  // FIXME: this caches the bounds at app start, whatever those were, and then
+  // FIXME: this caches whatever the bounds were when it was first called, and then
   // doesn't update when the device is rotated. We need to find another thread-
   // safe way to get the screen size.
 

package/React/Base/RCTVersion.m

@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(0),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"201c10733",
+                  RCTVersionPrerelease: @"268efb102",
                   };
   });
   return __rnVersion;

package/React/Base/Surface/RCTSurfaceStage.h

@@ -23,17 +23,12 @@ typedef NS_OPTIONS(NSInteger, RCTSurfaceStage) {
   RCTSurfaceStageSurfaceDidStop = 1 << 7, // Surface stopped
 
   // Most of the previously existed stages make no sense in the new architecture;
-  // now Surface exposes only three simple stages:
-  //
-  // Surface object was constructed and still valid.
-  RCTSurfaceStageInitialized = RCTSurfaceStageSurfaceDidInitialize,
-  // Surface was started.
-  RCTSurfaceStageStarted = 1 << 8,
-  // All off-main-thread work is done; we are ready to mount the UI.
-  RCTSurfaceStagePrepared = RCTSurfaceStageBridgeDidLoad | RCTSurfaceStageModuleDidLoad | RCTSurfaceStageSurfaceDidRun |
-      RCTSurfaceStageSurfaceDidInitialRendering | RCTSurfaceStageSurfaceDidInitialLayout,
-  // All main-thread work is done, the UI was mounted.
-  RCTSurfaceStageMounted = RCTSurfaceStageSurfaceDidInitialMounting,
+  // now Surface exposes only two simple stages:
+  RCTSurfaceStagePreparing = RCTSurfaceStageSurfaceDidInitialize | RCTSurfaceStageBridgeDidLoad |
+      RCTSurfaceStageModuleDidLoad,
+  RCTSurfaceStageRunning = RCTSurfaceStagePreparing | RCTSurfaceStageSurfaceDidRun |
+      RCTSurfaceStageSurfaceDidInitialRendering | RCTSurfaceStageSurfaceDidInitialLayout |
+      RCTSurfaceStageSurfaceDidInitialMounting,
 };
 
 /**

package/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.h

@@ -7,6 +7,7 @@
 
 #import <UIKit/UIKit.h>
 
+#import <React/RCTBridgeModule.h>
 #import <React/RCTRootView.h>
 
 #import "RCTSurfaceHostingView.h"
@@ -26,6 +27,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, copy, readonly) NSString *moduleName;
 @property (nonatomic, strong, readonly) RCTBridge *bridge;
+@property (nonatomic, readonly) BOOL hasBridge;
+@property (nonatomic, strong, readonly) RCTModuleRegistry *moduleRegistry;
+@property (nonatomic, strong, readonly) id<RCTEventDispatcherProtocol> eventDispatcher;
 @property (nonatomic, copy, readwrite) NSDictionary *appProperties;
 @property (nonatomic, assign) RCTRootViewSizeFlexibility sizeFlexibility;
 @property (nonatomic, weak) id<RCTRootViewDelegate> delegate;
@@ -35,6 +39,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) BOOL passThroughTouches;
 @property (nonatomic, assign) NSTimeInterval loadingViewFadeDelay;
 @property (nonatomic, assign) NSTimeInterval loadingViewFadeDuration;
+@property (nonatomic, assign) CGSize minimumSize;
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge
                     moduleName:(NSString *)moduleName
@@ -45,6 +50,13 @@ NS_ASSUME_NONNULL_BEGIN
                 initialProperties:(NSDictionary *)initialProperties
                     launchOptions:(NSDictionary *)launchOptions;
 
+/**
+ * Bridgeless mode initializer
+ */
+- (instancetype)initWithSurface:(id<RCTSurfaceProtocol>)surface
+                sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode
+                 moduleRegistry:(RCTModuleRegistry *)moduleRegistry;
+
 - (void)cancelTouches;
 
 @end

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

@@ -10,6 +10,7 @@
 #import <objc/runtime.h>
 
 #import "RCTAssert.h"
+#import "RCTBridge+Private.h"
 #import "RCTBridge.h"
 #import "RCTLog.h"
 #import "RCTPerformanceLogger.h"
@@ -48,7 +49,9 @@ static RCTRootViewSizeFlexibility convertToRootViewSizeFlexibility(RCTSurfaceSiz
   }
 }
 
-@implementation RCTSurfaceHostingProxyRootView
+@implementation RCTSurfaceHostingProxyRootView {
+  RCTModuleRegistry *_moduleRegistry;
+}
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge
                     moduleName:(NSString *)moduleName
@@ -61,6 +64,7 @@ static RCTRootViewSizeFlexibility convertToRootViewSizeFlexibility(RCTSurfaceSiz
   RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"-[RCTSurfaceHostingProxyRootView init]", nil);
 
   _bridge = bridge;
+  _minimumSize = CGSizeZero;
 
   if (!bridge.isLoading) {
     [bridge.performanceLogger markStartForTag:RCTPLTTI];
@@ -74,7 +78,7 @@ static RCTRootViewSizeFlexibility convertToRootViewSizeFlexibility(RCTSurfaceSiz
                                                        initialProperties:initialProperties];
   [surface start];
   if (self = [super initWithSurface:surface sizeMeasureMode:sizeMeasureMode]) {
-    self.backgroundColor = [UIColor whiteColor];
+    // Nothing specific to do.
   }
 
   RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
@@ -92,6 +96,37 @@ static RCTRootViewSizeFlexibility convertToRootViewSizeFlexibility(RCTSurfaceSiz
   return [self initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
 }
 
+- (instancetype)initWithSurface:(id<RCTSurfaceProtocol>)surface
+                sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode
+                 moduleRegistry:(RCTModuleRegistry *)moduleRegistry
+{
+  if (self = [super initWithSurface:surface sizeMeasureMode:sizeMeasureMode]) {
+    _moduleRegistry = moduleRegistry;
+  }
+
+  return self;
+}
+
+- (BOOL)hasBridge
+{
+  return _bridge != nil;
+}
+
+- (RCTModuleRegistry *)moduleRegistry
+{
+  // In bridgeless mode, RCTSurfaceHostingProxyRootView is created with an RCTModuleRegistry
+  if (_moduleRegistry) {
+    return _moduleRegistry;
+  }
+
+  return _bridge.moduleRegistry;
+}
+
+- (id<RCTEventDispatcherProtocol>)eventDispatcher
+{
+  return [self.moduleRegistry moduleForName:"EventDispatcher"];
+}
+
 RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame : (CGRect)frame)
 RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
 
@@ -172,6 +207,15 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
   return _reactViewController ?: [super reactViewController];
 }
 
+- (void)setMinimumSize:(CGSize)minimumSize
+{
+  if (!CGSizeEqualToSize(minimumSize, CGSizeZero)) {
+    // TODO (T93859532): Investigate implementation for this.
+    RCTLogError(@"RCTSurfaceHostingProxyRootView does not support changing the deprecated minimumSize");
+  }
+  _minimumSize = CGSizeZero;
+}
+
 #pragma mark unsupported
 
 - (void)cancelTouches

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

@@ -60,6 +60,9 @@ RCT_NOT_IMPLEMENTED(-(nullable instancetype)initWithCoder : (NSCoder *)coder)
     _surface.delegate = self;
     _stage = surface.stage;
     [self _updateViews];
+
+    // For backward compatibility with RCTRootView, set a color here instead of transparent (OS default).
+    self.backgroundColor = [UIColor whiteColor];
   }
 
   return self;

package/React/CoreModules/BUCK

@@ -14,6 +14,7 @@ rn_apple_library(
         ],
     ),
     exported_headers = glob(["**/*.h"]),
+    autoglob = False,
     compiler_flags = [
         "-Wno-error=unguarded-availability-new",
         "-Wno-unknown-warning-option",
@@ -128,9 +129,9 @@ rn_apple_library(
     reexport_all_header_dependencies = True,
     visibility = ["PUBLIC"],
     exported_deps = [
-        "//xplat/js:RCTLinkingApple",
-        "//xplat/js:RCTPushNotificationApple",
+        "//xplat/js/react-native-github:FBReactNativeSpecApple",
+        "//xplat/js/react-native-github:RCTLinkingApple",
+        "//xplat/js/react-native-github:RCTPushNotificationApple",
         "//xplat/js/react-native-github:ReactInternalApple",
-        "//xplat/js/react-native-github/Libraries:FBReactNativeSpecApple",
     ],
 )

package/React/CoreModules/CoreModulesPlugins.mm

@@ -17,7 +17,8 @@
 #import <unordered_map>
 
 Class RCTCoreModulesClassProvider(const char *name) {
-  static std::unordered_map<std::string, Class (*)(void)> sCoreModuleClassMap = {
+  // Intentionally leak to avoid crashing after static destructors are run.
+  static const auto sCoreModuleClassMap = new const std::unordered_map<std::string, Class (*)(void)>{
     {"AccessibilityManager", RCTAccessibilityManagerCls},
     {"Appearance", RCTAppearanceCls},
     {"DeviceInfo", RCTDeviceInfoCls},
@@ -45,8 +46,8 @@ Class RCTCoreModulesClassProvider(const char *name) {
     {"EventDispatcher", RCTEventDispatcherCls},
   };
 
-  auto p = sCoreModuleClassMap.find(name);
-  if (p != sCoreModuleClassMap.end()) {
+  auto p = sCoreModuleClassMap->find(name);
+  if (p != sCoreModuleClassMap->end()) {
     auto classFunc = p->second;
     return classFunc();
   }

package/React/CoreModules/RCTAccessibilityManager.mm

@@ -82,7 +82,7 @@ RCT_EXPORT_MODULE()
 
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(voiceVoiceOverStatusDidChange:)
-                                                 name:UIAccessibilityVoiceOverStatusChanged
+                                                 name:UIAccessibilityVoiceOverStatusDidChangeNotification
                                                object:nil];
 
     self.contentSizeCategory = RCTSharedApplication().preferredContentSizeCategory;

package/React/CoreModules/RCTActionSheetManager.mm

@@ -94,6 +94,8 @@ RCT_EXPORT_METHOD(showActionSheetWithOptions
   UIViewController *controller = RCTPresentedViewController();
   NSNumber *anchor = [RCTConvert NSNumber:options.anchor() ? @(*options.anchor()) : nil];
   UIColor *tintColor = [RCTConvert UIColor:options.tintColor() ? @(*options.tintColor()) : nil];
+  UIColor *cancelButtonTintColor =
+      [RCTConvert UIColor:options.cancelButtonTintColor() ? @(*options.cancelButtonTintColor()) : nil];
 
   if (controller == nil) {
     RCTLogError(
@@ -105,6 +107,7 @@ RCT_EXPORT_METHOD(showActionSheetWithOptions
           @"destructiveButtonIndices" : destructiveButtonIndices,
           @"anchor" : anchor,
           @"tintColor" : tintColor,
+          @"cancelButtonTintColor" : cancelButtonTintColor,
           @"disabledButtonIndices" : disabledButtonIndices,
         });
     return;
@@ -122,20 +125,26 @@ RCT_EXPORT_METHOD(showActionSheetWithOptions
                                                                     preferredStyle:UIAlertControllerStyleActionSheet];
 
   NSInteger index = 0;
+  bool isCancelButtonIndex = false;
   for (NSString *option in buttons) {
     UIAlertActionStyle style = UIAlertActionStyleDefault;
     if ([destructiveButtonIndices containsObject:@(index)]) {
       style = UIAlertActionStyleDestructive;
     } else if (index == cancelButtonIndex) {
       style = UIAlertActionStyleCancel;
+      isCancelButtonIndex = true;
     }
 
     NSInteger localIndex = index;
-    [alertController addAction:[UIAlertAction actionWithTitle:option
-                                                        style:style
-                                                      handler:^(__unused UIAlertAction *action) {
-                                                        callback(@[ @(localIndex) ]);
-                                                      }]];
+    UIAlertAction *actionButton = [UIAlertAction actionWithTitle:option
+                                                           style:style
+                                                         handler:^(__unused UIAlertAction *action) {
+                                                           callback(@[ @(localIndex) ]);
+                                                         }];
+    if (isCancelButtonIndex) {
+      [actionButton setValue:cancelButtonTintColor forKey:@"titleTextColor"];
+    }
+    [alertController addAction:actionButton];
 
     index++;
   }

package/React/CoreModules/RCTAsyncLocalStorage.mm

@@ -306,7 +306,11 @@ RCT_EXPORT_MODULE()
   if (errorOut) {
     return errorOut;
   }
+  if (![entry[1] isKindOfClass:[NSString class]]) {
+    return RCTMakeAndLogError(@"Invalid value for entry - must be a string. Got entry: ", entry, nil);
+  }
   NSString *value = entry[1];
+
   NSString *filePath = [self _filePathForKey:key];
   NSError *error;
   if (value.length <= RCTInlineValueThreshold) {