react-native 0.68.1 → 0.69.0-rc.0

package/React/CoreModules/RCTDevMenu.mm

@@ -123,35 +123,64 @@ RCT_EXPORT_MODULE()
                                                object:nil];
     _extraMenuItems = [NSMutableArray new];
 
+    [self registerHotkeys];
+  }
+  return self;
+}
+
+- (void)registerHotkeys
+{
 #if TARGET_OS_SIMULATOR || TARGET_OS_MACCATALYST
-    RCTKeyCommands *commands = [RCTKeyCommands sharedInstance];
-    __weak __typeof(self) weakSelf = self;
-
-    // Toggle debug menu
-    [commands registerKeyCommandWithInput:@"d"
-                            modifierFlags:UIKeyModifierCommand
-                                   action:^(__unused UIKeyCommand *command) {
-                                     [weakSelf toggle];
-                                   }];
+  RCTKeyCommands *commands = [RCTKeyCommands sharedInstance];
+  __weak __typeof(self) weakSelf = self;
+
+  // Toggle debug menu
+  [commands registerKeyCommandWithInput:@"d"
+                          modifierFlags:UIKeyModifierCommand
+                                 action:^(__unused UIKeyCommand *command) {
+                                   [weakSelf toggle];
+                                 }];
+
+  // Toggle element inspector
+  [commands registerKeyCommandWithInput:@"i"
+                          modifierFlags:UIKeyModifierCommand
+                                 action:^(__unused UIKeyCommand *command) {
+                                   [(RCTDevSettings *)[weakSelf.moduleRegistry moduleForName:"DevSettings"]
+                                       toggleElementInspector];
+                                 }];
+
+  // Reload in normal mode
+  [commands registerKeyCommandWithInput:@"n"
+                          modifierFlags:UIKeyModifierCommand
+                                 action:^(__unused UIKeyCommand *command) {
+                                   [(RCTDevSettings *)[weakSelf.moduleRegistry moduleForName:"DevSettings"]
+                                       setIsDebuggingRemotely:NO];
+                                 }];
+#endif
+}
 
-    // Toggle element inspector
-    [commands registerKeyCommandWithInput:@"i"
-                            modifierFlags:UIKeyModifierCommand
-                                   action:^(__unused UIKeyCommand *command) {
-                                     [(RCTDevSettings *)[weakSelf.moduleRegistry moduleForName:"DevSettings"]
-                                         toggleElementInspector];
-                                   }];
+- (void)unregisterHotkeys
+{
+#if TARGET_OS_SIMULATOR || TARGET_OS_MACCATALYST
+  RCTKeyCommands *commands = [RCTKeyCommands sharedInstance];
 
-    // Reload in normal mode
-    [commands registerKeyCommandWithInput:@"n"
-                            modifierFlags:UIKeyModifierCommand
-                                   action:^(__unused UIKeyCommand *command) {
-                                     [(RCTDevSettings *)[weakSelf.moduleRegistry moduleForName:"DevSettings"]
-                                         setIsDebuggingRemotely:NO];
-                                   }];
+  [commands unregisterKeyCommandWithInput:@"d" modifierFlags:UIKeyModifierCommand];
+  [commands unregisterKeyCommandWithInput:@"i" modifierFlags:UIKeyModifierCommand];
+  [commands unregisterKeyCommandWithInput:@"n" modifierFlags:UIKeyModifierCommand];
+#endif
+}
+
+- (BOOL)isHotkeysRegistered
+{
+#if TARGET_OS_SIMULATOR || TARGET_OS_MACCATALYST
+  RCTKeyCommands *commands = [RCTKeyCommands sharedInstance];
+
+  return [commands isKeyCommandRegisteredForInput:@"d" modifierFlags:UIKeyModifierCommand] &&
+      [commands isKeyCommandRegisteredForInput:@"i" modifierFlags:UIKeyModifierCommand] &&
+      [commands isKeyCommandRegisteredForInput:@"n" modifierFlags:UIKeyModifierCommand];
+#else
+  return NO;
 #endif
-  }
-  return self;
 }
 
 - (dispatch_queue_t)methodQueue
@@ -481,6 +510,20 @@ RCT_EXPORT_METHOD(setHotLoadingEnabled : (BOOL)enabled)
   return ((RCTDevSettings *)[_moduleRegistry moduleForName:"DevSettings"]).isHotLoadingEnabled;
 }
 
+- (void)setHotkeysEnabled:(BOOL)enabled
+{
+  if (enabled) {
+    [self registerHotkeys];
+  } else {
+    [self unregisterHotkeys];
+  }
+}
+
+- (BOOL)hotkeysEnabled
+{
+  return [self isHotkeysRegistered];
+}
+
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params
 {

package/React/CoreModules/RCTDeviceInfo.mm

@@ -28,6 +28,7 @@ using namespace facebook::react;
   NSDictionary *_currentInterfaceDimensions;
 }
 
+@synthesize bridge = _bridge;
 @synthesize moduleRegistry = _moduleRegistry;
 
 RCT_EXPORT_MODULE()
@@ -56,7 +57,7 @@ RCT_EXPORT_MODULE()
                                                name:UIApplicationDidChangeStatusBarOrientationNotification
                                              object:nil];
 
-  _currentInterfaceDimensions = RCTExportedDimensions(_moduleRegistry);
+  _currentInterfaceDimensions = RCTExportedDimensions(_moduleRegistry, _bridge);
 
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(interfaceFrameDidChange)
@@ -95,15 +96,16 @@ static BOOL RCTIsIPhoneX()
   return isIPhoneX;
 }
 
-static NSDictionary *RCTExportedDimensions(RCTModuleRegistry *moduleRegistry)
+static NSDictionary *RCTExportedDimensions(RCTModuleRegistry *moduleRegistry, RCTBridge *bridge)
 {
   RCTAssertMainQueue();
   RCTDimensions dimensions;
   if (moduleRegistry) {
-    dimensions = RCTGetDimensions(
-        ((RCTAccessibilityManager *)[moduleRegistry moduleForName:"AccessibilityManager"]).multiplier ?: 1.0);
+    RCTAccessibilityManager *accessibilityManager =
+        (RCTAccessibilityManager *)[moduleRegistry moduleForName:"AccessibilityManager"];
+    dimensions = RCTGetDimensions(accessibilityManager ? accessibilityManager.multiplier : 1.0);
   } else {
-    RCTAssert(false, @"ModuleRegistry must be set to properly init dimensions.");
+    RCTAssert(false, @"ModuleRegistry must be set to properly init dimensions. Bridge exists: %d", bridge != nil);
   }
   __typeof(dimensions.window) window = dimensions.window;
   NSDictionary<NSString *, NSNumber *> *dimsWindow = @{
@@ -131,9 +133,10 @@ static NSDictionary *RCTExportedDimensions(RCTModuleRegistry *moduleRegistry)
 {
   __block NSDictionary<NSString *, id> *constants;
   RCTModuleRegistry *moduleRegistry = _moduleRegistry;
+  RCTBridge *bridge = _bridge;
   RCTUnsafeExecuteOnMainQueueSync(^{
     constants = @{
-      @"Dimensions" : RCTExportedDimensions(moduleRegistry),
+      @"Dimensions" : RCTExportedDimensions(moduleRegistry, bridge),
       // Note:
       // This prop is deprecated and will be removed in a future release.
       // Please use this only for a quick and temporary solution.
@@ -148,12 +151,14 @@ static NSDictionary *RCTExportedDimensions(RCTModuleRegistry *moduleRegistry)
 - (void)didReceiveNewContentSizeMultiplier
 {
   RCTModuleRegistry *moduleRegistry = _moduleRegistry;
+  RCTBridge *bridge = _bridge;
   RCTExecuteOnMainQueue(^{
   // Report the event across the bridge.
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [[moduleRegistry moduleForName:"EventDispatcher"] sendDeviceEventWithName:@"didUpdateDimensions"
-                                                                         body:RCTExportedDimensions(moduleRegistry)];
+    [[moduleRegistry moduleForName:"EventDispatcher"]
+        sendDeviceEventWithName:@"didUpdateDimensions"
+                           body:RCTExportedDimensions(moduleRegistry, bridge)];
 #pragma clang diagnostic pop
   });
 }
@@ -177,8 +182,9 @@ static NSDictionary *RCTExportedDimensions(RCTModuleRegistry *moduleRegistry)
        !UIInterfaceOrientationIsLandscape(nextOrientation))) {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [[_moduleRegistry moduleForName:"EventDispatcher"] sendDeviceEventWithName:@"didUpdateDimensions"
-                                                                          body:RCTExportedDimensions(_moduleRegistry)];
+    [[_moduleRegistry moduleForName:"EventDispatcher"]
+        sendDeviceEventWithName:@"didUpdateDimensions"
+                           body:RCTExportedDimensions(_moduleRegistry, _bridge)];
 #pragma clang diagnostic pop
   }
 
@@ -195,7 +201,7 @@ static NSDictionary *RCTExportedDimensions(RCTModuleRegistry *moduleRegistry)
 
 - (void)_interfaceFrameDidChange
 {
-  NSDictionary *nextInterfaceDimensions = RCTExportedDimensions(_moduleRegistry);
+  NSDictionary *nextInterfaceDimensions = RCTExportedDimensions(_moduleRegistry, _bridge);
 
   if (!([nextInterfaceDimensions isEqual:_currentInterfaceDimensions])) {
 #pragma clang diagnostic push

package/React/CoreModules/RCTEventDispatcher.mm

@@ -37,7 +37,7 @@ static uint16_t RCTUniqueCoalescingKeyGenerator = 0;
   NSMutableArray<NSNumber *> *_eventQueue;
   BOOL _eventsDispatchScheduled;
   NSHashTable<id<RCTEventDispatcherObserver>> *_observers;
-  NSLock *_observersLock;
+  NSRecursiveLock *_observersLock;
 }
 
 @synthesize bridge = _bridge;
@@ -53,7 +53,7 @@ RCT_EXPORT_MODULE()
   _eventQueueLock = [NSLock new];
   _eventsDispatchScheduled = NO;
   _observers = [NSHashTable weakObjectsHashTable];
-  _observersLock = [NSLock new];
+  _observersLock = [NSRecursiveLock new];
 }
 
 - (void)sendViewEventWithName:(NSString *)name reactTag:(NSNumber *)reactTag

package/React/CoreModules/RCTExceptionsManager.h

@@ -6,7 +6,6 @@
  */
 
 #import <Foundation/Foundation.h>
-
 #import <React/RCTBridgeModule.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -15,10 +14,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)handleSoftJSExceptionWithMessage:(nullable NSString *)message
                                    stack:(nullable NSArray *)stack
-                             exceptionId:(NSNumber *)exceptionId;
+                             exceptionId:(NSNumber *)exceptionId
+                         extraDataAsJSON:(nullable NSString *)extraDataAsJSON;
 - (void)handleFatalJSExceptionWithMessage:(nullable NSString *)message
                                     stack:(nullable NSArray *)stack
-                              exceptionId:(NSNumber *)exceptionId;
+                              exceptionId:(NSNumber *)exceptionId
+                          extraDataAsJSON:(nullable NSString *)extraDataAsJSON;
 
 @optional
 - (void)updateJSExceptionWithMessage:(nullable NSString *)message
@@ -37,6 +38,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)reportFatalException:(nullable NSString *)message
                        stack:(nullable NSArray<NSDictionary *> *)stack
                  exceptionId:(double)exceptionId;
+- (void)reportEarlyJsException:(NSString *)errorMap;
 
 @property (nonatomic, weak) id<RCTExceptionsManagerDelegate> delegate;
 

package/React/CoreModules/RCTExceptionsManager.mm

@@ -35,7 +35,10 @@ RCT_EXPORT_MODULE()
   return self;
 }
 
-- (void)reportSoft:(NSString *)message stack:(NSArray<NSDictionary *> *)stack exceptionId:(double)exceptionId
+- (void)reportSoft:(NSString *)message
+              stack:(NSArray<NSDictionary *> *)stack
+        exceptionId:(double)exceptionId
+    extraDataAsJSON:(nullable NSString *)extraDataAsJSON
 {
   RCTRedBox *redbox = [_moduleRegistry moduleForName:"RedBox"];
   [redbox showErrorMessage:message withStack:stack errorCookie:(int)exceptionId];
@@ -43,11 +46,15 @@ RCT_EXPORT_MODULE()
   if (_delegate) {
     [_delegate handleSoftJSExceptionWithMessage:message
                                           stack:stack
-                                    exceptionId:[NSNumber numberWithDouble:exceptionId]];
+                                    exceptionId:[NSNumber numberWithDouble:exceptionId]
+                                extraDataAsJSON:extraDataAsJSON];
   }
 }
 
-- (void)reportFatal:(NSString *)message stack:(NSArray<NSDictionary *> *)stack exceptionId:(double)exceptionId
+- (void)reportFatal:(NSString *)message
+              stack:(NSArray<NSDictionary *> *)stack
+        exceptionId:(double)exceptionId
+    extraDataAsJSON:(nullable NSString *)extraDataAsJSON
 {
   RCTRedBox *redbox = [_moduleRegistry moduleForName:"RedBox"];
   [redbox showErrorMessage:message withStack:stack errorCookie:(int)exceptionId];
@@ -55,7 +62,8 @@ RCT_EXPORT_MODULE()
   if (_delegate) {
     [_delegate handleFatalJSExceptionWithMessage:message
                                            stack:stack
-                                     exceptionId:[NSNumber numberWithDouble:exceptionId]];
+                                     exceptionId:[NSNumber numberWithDouble:exceptionId]
+                                 extraDataAsJSON:extraDataAsJSON];
   }
 
   static NSUInteger reloadRetries = 0;
@@ -64,7 +72,8 @@ RCT_EXPORT_MODULE()
     RCTTriggerReloadCommandListeners(@"JS Crash Reload");
   } else if (!RCT_DEV) {
     NSString *description = [@"Unhandled JS Exception: " stringByAppendingString:message];
-    NSDictionary *errorInfo = @{NSLocalizedDescriptionKey : description, RCTJSStackTraceKey : stack};
+    NSDictionary *errorInfo =
+        @{NSLocalizedDescriptionKey : description, RCTJSStackTraceKey : stack, RCTJSExtraDataKey : extraDataAsJSON};
     RCTFatal([NSError errorWithDomain:RCTErrorDomain code:0 userInfo:errorInfo]);
   }
 }
@@ -74,7 +83,7 @@ RCT_EXPORT_METHOD(reportSoftException
                   : (NSArray<NSDictionary *> *)stack exceptionId
                   : (double)exceptionId)
 {
-  [self reportSoft:message stack:stack exceptionId:exceptionId];
+  [self reportSoft:message stack:stack exceptionId:exceptionId extraDataAsJSON:nil];
 }
 
 RCT_EXPORT_METHOD(reportFatalException
@@ -82,7 +91,7 @@ RCT_EXPORT_METHOD(reportFatalException
                   : (NSArray<NSDictionary *> *)stack exceptionId
                   : (double)exceptionId)
 {
-  [self reportFatal:message stack:stack exceptionId:exceptionId];
+  [self reportFatal:message stack:stack exceptionId:exceptionId extraDataAsJSON:nil];
 }
 
 RCT_EXPORT_METHOD(updateExceptionMessage
@@ -117,24 +126,47 @@ RCT_EXPORT_METHOD(reportException : (JS::NativeExceptionsManager::ExceptionData
   NSMutableArray<NSDictionary *> *stackArray = [NSMutableArray<NSDictionary *> new];
   for (auto frame : data.stack()) {
     NSMutableDictionary *frameDict = [NSMutableDictionary new];
-    if (frame.column().hasValue()) {
+    if (frame.column().has_value()) {
       frameDict[@"column"] = @(frame.column().value());
     }
     frameDict[@"file"] = frame.file();
-    if (frame.lineNumber().hasValue()) {
+    if (frame.lineNumber().has_value()) {
       frameDict[@"lineNumber"] = @(frame.lineNumber().value());
     }
     frameDict[@"methodName"] = frame.methodName();
-    if (frame.collapse().hasValue()) {
+    if (frame.collapse().has_value()) {
       frameDict[@"collapse"] = @(frame.collapse().value());
     }
     [stackArray addObject:frameDict];
   }
 
+  NSDictionary *extraData = (NSDictionary *)data.extraData();
+  NSString *extraDataAsJSON = RCTJSONStringify(extraData, NULL);
+
   if (data.isFatal()) {
-    [self reportFatal:message stack:stackArray exceptionId:exceptionId];
+    [self reportFatal:message stack:stackArray exceptionId:exceptionId extraDataAsJSON:extraDataAsJSON];
+  } else {
+    [self reportSoft:message stack:stackArray exceptionId:exceptionId extraDataAsJSON:extraDataAsJSON];
+  }
+}
+
+- (void)reportEarlyJsException:(NSString *)errorStr
+{
+  NSData *jsonData = [errorStr dataUsingEncoding:NSUTF8StringEncoding];
+  NSError *jsonError;
+  NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:jsonData
+                                                       options:NSJSONWritingPrettyPrinted
+                                                         error:&jsonError];
+
+  NSString *message = [dict objectForKey:@"message"];
+  double exceptionId = [[dict objectForKey:@"id"] doubleValue];
+  NSArray *stack = [dict objectForKey:@"stack"];
+  BOOL isFatal = [[dict objectForKey:@"isFatal"] boolValue];
+
+  if (isFatal) {
+    [self reportFatalException:message stack:stack exceptionId:exceptionId];
   } else {
-    [self reportSoft:message stack:stackArray exceptionId:exceptionId];
+    [self reportSoftException:message stack:stack exceptionId:exceptionId];
   }
 }
 

package/React/CoreModules/RCTFPSGraph.m

@@ -89,7 +89,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
   if (_prevTime == -1) {
     _prevTime = timestamp;
   } else if (timestamp - _prevTime >= 1) {
-    _FPS = round(_frameCount / (timestamp - _prevTime));
+    _FPS = round((double)_frameCount / (timestamp - _prevTime));
     _minFPS = MIN(_minFPS, _FPS);
     _maxFPS = MAX(_maxFPS, _FPS);
 
@@ -101,12 +101,12 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
     for (NSUInteger i = 0; i < _length - 1; i++) {
       _frames[i] = _frames[i + 1];
     }
-    _frames[_length - 1] = _FPS / scale;
+    _frames[_length - 1] = (double)_FPS / scale;
 
     CGMutablePathRef path = CGPathCreateMutable();
     CGPathMoveToPoint(path, NULL, 0, (CGFloat)_height);
     for (NSUInteger i = 0; i < _length; i++) {
-      CGPathAddLineToPoint(path, NULL, (CGFloat)i, _height - _frames[i]);
+      CGPathAddLineToPoint(path, NULL, (CGFloat)i, (double)_height - _frames[i]);
     }
     CGPathAddLineToPoint(path, NULL, (CGFloat)_length - 1, (CGFloat)_height);
 

package/React/CoreModules/RCTLogBox.mm

@@ -13,7 +13,6 @@
 #import <React/RCTLog.h>
 #import <React/RCTRedBoxSetEnabled.h>
 #import <React/RCTSurface.h>
-
 #import "CoreModulesPlugins.h"
 
 #if RCT_DEV_MENU
@@ -23,6 +22,7 @@
 
 @implementation RCTLogBox {
   RCTLogBoxView *_view;
+  __weak id<RCTSurfacePresenterStub> _bridgelessSurfacePresenter;
 }
 
 @synthesize bridge = _bridge;
@@ -34,6 +34,11 @@ RCT_EXPORT_MODULE()
   return YES;
 }
 
+- (void)setSurfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter
+{
+  _bridgelessSurfacePresenter = surfacePresenter;
+}
+
 RCT_EXPORT_METHOD(show)
 {
   if (RCTRedBoxGetEnabled()) {
@@ -49,16 +54,19 @@ RCT_EXPORT_METHOD(show)
         return;
       }
 
-      if (strongSelf->_bridge) {
-        if (strongSelf->_bridge.valid) {
-          strongSelf->_view = [[RCTLogBoxView alloc] initWithFrame:[UIScreen mainScreen].bounds
-                                                            bridge:strongSelf->_bridge];
-          [strongSelf->_view show];
+      if (strongSelf->_bridgelessSurfacePresenter) {
+        strongSelf->_view = [[RCTLogBoxView alloc] initWithWindow:RCTKeyWindow()
+                                                 surfacePresenter:strongSelf->_bridgelessSurfacePresenter];
+      } else if (strongSelf->_bridge && strongSelf->_bridge.valid) {
+        if (strongSelf->_bridge.surfacePresenter) {
+          strongSelf->_view = [[RCTLogBoxView alloc] initWithWindow:RCTKeyWindow()
+                                                   surfacePresenter:strongSelf->_bridge.surfacePresenter];
+        } else {
+          strongSelf->_view = [[RCTLogBoxView alloc] initWithWindow:RCTKeyWindow() bridge:strongSelf->_bridge];
         }
-      } else {
-        NSDictionary *userInfo = [NSDictionary dictionaryWithObjectsAndKeys:strongSelf, @"logbox", nil];
-        [[NSNotificationCenter defaultCenter] postNotificationName:@"CreateLogBoxSurface" object:nil userInfo:userInfo];
       }
+
+      [strongSelf->_view show];
     });
   }
 }

package/React/CoreModules/RCTLogBoxView.h

@@ -6,6 +6,7 @@
  */
 
 #import <React/RCTBridge.h>
+#import <React/RCTSurfacePresenterStub.h>
 #import <React/RCTSurfaceView.h>
 #import <UIKit/UIKit.h>
 
@@ -15,7 +16,8 @@
 
 - (void)createRootViewController:(UIView *)view;
 
-- (instancetype)initWithFrame:(CGRect)frame bridge:(RCTBridge *)bridge;
+- (instancetype)initWithWindow:(UIWindow *)window bridge:(RCTBridge *)bridge;
+- (instancetype)initWithWindow:(UIWindow *)window surfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter;
 
 - (void)show;
 

package/React/CoreModules/RCTLogBoxView.mm

@@ -9,6 +9,7 @@
 
 #import <React/RCTLog.h>
 #import <React/RCTSurface.h>
+#import <React/RCTSurfaceHostingView.h>
 
 @implementation RCTLogBoxView {
   RCTSurface *_surface;
@@ -32,26 +33,54 @@
   self.rootViewController = _rootViewController;
 }
 
-- (instancetype)initWithFrame:(CGRect)frame bridge:(RCTBridge *)bridge
+- (instancetype)initWithWindow:(UIWindow *)window bridge:(RCTBridge *)bridge
 {
-  if ((self = [super initWithFrame:frame])) {
-    self.windowLevel = UIWindowLevelStatusBar - 1;
-    self.backgroundColor = [UIColor clearColor];
+  RCTErrorNewArchitectureValidation(RCTNotAllowedInAppWideFabric, @"RCTLogBoxView", nil);
 
-    _surface = [[RCTSurface alloc] initWithBridge:bridge moduleName:@"LogBox" initialProperties:@{}];
+  if (@available(iOS 13.0, *)) {
+    self = [super initWithWindowScene:window.windowScene];
+  } else {
+    self = [super initWithFrame:window.frame];
+  }
 
-    [_surface start];
-    [_surface setSize:frame.size];
+  self.windowLevel = UIWindowLevelStatusBar - 1;
+  self.backgroundColor = [UIColor clearColor];
 
-    if (![_surface synchronouslyWaitForStage:RCTSurfaceStageSurfaceDidInitialMounting timeout:1]) {
-      RCTLogInfo(@"Failed to mount LogBox within 1s");
-    }
+  _surface = [[RCTSurface alloc] initWithBridge:bridge moduleName:@"LogBox" initialProperties:@{}];
+  [_surface start];
 
-    [self createRootViewController:(UIView *)_surface.view];
+  if (![_surface synchronouslyWaitForStage:RCTSurfaceStageSurfaceDidInitialMounting timeout:1]) {
+    RCTLogInfo(@"Failed to mount LogBox within 1s");
   }
+  [self createRootViewController:(UIView *)_surface.view];
+
   return self;
 }
 
+- (instancetype)initWithWindow:(UIWindow *)window surfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter
+{
+  if (@available(iOS 13.0, *)) {
+    self = [super initWithWindowScene:window.windowScene];
+  } else {
+    self = [super initWithFrame:window.frame];
+  }
+
+  id<RCTSurfaceProtocol> surface = [surfacePresenter createFabricSurfaceForModuleName:@"LogBox" initialProperties:@{}];
+  [surface start];
+  RCTSurfaceHostingView *rootView = [[RCTSurfaceHostingView alloc]
+      initWithSurface:surface
+      sizeMeasureMode:RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightExact];
+  [self createRootViewController:rootView];
+
+  return self;
+}
+
+- (void)layoutSubviews
+{
+  [super layoutSubviews];
+  [_surface setSize:self.frame.size];
+}
+
 - (void)dealloc
 {
   [RCTSharedApplication().delegate.window makeKeyWindow];

package/React/CoreModules/RCTPlatform.mm

@@ -15,6 +15,8 @@
 
 #import "CoreModulesPlugins.h"
 
+#import <folly/Optional.h>
+
 using namespace facebook::react;
 
 static NSString *interfaceIdiom(UIUserInterfaceIdiom idiom)

package/React/CoreModules/RCTRedBox.mm

@@ -97,7 +97,7 @@
     const CGFloat buttonHeight = 60;
 
     CGRect detailsFrame = rootView.bounds;
-    detailsFrame.size.height -= buttonHeight + [self bottomSafeViewHeight];
+    detailsFrame.size.height -= buttonHeight + (double)[self bottomSafeViewHeight];
 
     _stackTraceTableView = [[UITableView alloc] initWithFrame:detailsFrame style:UITableViewStylePlain];
     _stackTraceTableView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
@@ -155,7 +155,7 @@
                     accessibilityIdentifier:@""
                                    selector:nil
                                       block:customButtonHandlers[i]];
-      button.frame = CGRectMake(buttonWidth * (4 + i), bottomButtonHeight, buttonWidth, buttonHeight);
+      button.frame = CGRectMake(buttonWidth * (double)(4 + i), bottomButtonHeight, buttonWidth, buttonHeight);
       [rootView addSubview:button];
     }
 

package/React/CoreModules/RCTStatusBarManager.mm

@@ -181,7 +181,7 @@ RCT_EXPORT_METHOD(setNetworkActivityIndicatorVisible : (BOOL)visible)
   RCTUnsafeExecuteOnMainQueueSync(^{
     constants = facebook::react::typedConstants<JS::NativeStatusBarManagerIOS::Constants>({
         .HEIGHT = RCTSharedApplication().statusBarFrame.size.height,
-        .DEFAULT_BACKGROUND_COLOR = folly::none,
+        .DEFAULT_BACKGROUND_COLOR = std::nullopt,
     });
   });
 

package/React/CoreModules/React-CoreModules.podspec

@@ -26,14 +26,14 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "11.0" }
+  s.platforms              = { :ios => "12.4" }
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
   s.source_files           = "**/*.{c,m,mm,cpp}"
   s.header_dir             = "CoreModules"
   s.pod_target_xcconfig    = {
                                "USE_HEADERMAP" => "YES",
-                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
+                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
                                "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/React/CoreModules\" \"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\""
                              }