react-native-tvos 0.78.0-0rc4 → 0.79.0-0

package/React/Base/UIKitProxies/RCTTraitCollectionProxy.h

@@ -0,0 +1,26 @@
+/*
+ * 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 <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RCTTraitCollectionProxy : NSObject
+
++ (instancetype)sharedInstance;
+
+/*
+ * Property to access the current trait collection.
+ * Thread safe.
+ */
+@property (nonatomic, readonly) UITraitCollection *currentTraitCollection;
+
+- (void)startObservingTraitCollection;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/React/Base/UIKitProxies/RCTTraitCollectionProxy.mm

@@ -0,0 +1,80 @@
+/*
+ * 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 "RCTTraitCollectionProxy.h"
+#import <React/RCTUtils.h>
+#import <mutex>
+
+#import <React/RCTConstants.h>
+
+@implementation RCTTraitCollectionProxy {
+  BOOL _isObserving;
+  std::mutex _mutex;
+  UITraitCollection *_currentTraitCollection;
+}
+
++ (instancetype)sharedInstance
+{
+  static RCTTraitCollectionProxy *sharedInstance = nil;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    sharedInstance = [RCTTraitCollectionProxy new];
+  });
+  return sharedInstance;
+}
+
+- (instancetype)init
+{
+  self = [super init];
+  if (self) {
+    _isObserving = NO;
+    _currentTraitCollection = [RCTKeyWindow().traitCollection copy];
+  }
+  return self;
+}
+
+- (void)startObservingTraitCollection
+{
+  RCTAssertMainQueue();
+  std::lock_guard<std::mutex> lock(_mutex);
+  if (!_isObserving) {
+    _isObserving = YES;
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(_appearanceDidChange:)
+                                                 name:RCTUserInterfaceStyleDidChangeNotification
+                                               object:nil];
+  }
+}
+
+- (UITraitCollection *)currentTraitCollection
+{
+  {
+    std::lock_guard<std::mutex> lock(_mutex);
+    if (_isObserving) {
+      return _currentTraitCollection;
+    }
+  }
+
+  // Fallback in case [RCTTraitCollectionProxy startObservingTraitCollection] was not called.
+  __block UITraitCollection *traitCollection = nil;
+  RCTUnsafeExecuteOnMainQueueSync(^{
+    traitCollection = [RCTKeyWindow().traitCollection copy];
+  });
+  return traitCollection;
+}
+
+- (void)_appearanceDidChange:(NSNotification *)notification
+{
+  std::lock_guard<std::mutex> lock(_mutex);
+
+  NSDictionary *userInfo = [notification userInfo];
+  if (userInfo) {
+    _currentTraitCollection = userInfo[RCTUserInterfaceStyleDidChangeNotificationTraitCollectionKey];
+  }
+}
+
+@end

package/React/Base/UIKitProxies/RCTWindowSafeAreaProxy.h

@@ -0,0 +1,26 @@
+/*
+ * 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 <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RCTWindowSafeAreaProxy : NSObject
+
++ (instancetype)sharedInstance;
+
+/*
+ * Property to access the current safe area insets of the window, read-only.
+ * Thread safe.
+ */
+@property (nonatomic, readonly) UIEdgeInsets currentSafeAreaInsets;
+
+- (void)startObservingSafeArea;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/React/Base/UIKitProxies/RCTWindowSafeAreaProxy.mm

@@ -0,0 +1,70 @@
+/*
+ * 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 "RCTWindowSafeAreaProxy.h"
+#import <React/RCTAssert.h>
+#import <React/RCTUtils.h>
+#import <mutex>
+
+#import <React/RCTConstants.h>
+
+@implementation RCTWindowSafeAreaProxy {
+  BOOL _isObserving;
+  std::mutex _mutex;
+  UIEdgeInsets _currentSafeAreaInsets;
+}
+
++ (instancetype)sharedInstance
+{
+  static RCTWindowSafeAreaProxy *sharedInstance = nil;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    sharedInstance = [RCTWindowSafeAreaProxy new];
+  });
+  return sharedInstance;
+}
+
+- (void)startObservingSafeArea
+{
+  RCTAssertMainQueue();
+  std::lock_guard<std::mutex> lock(_mutex);
+  if (!_isObserving) {
+    _isObserving = YES;
+    _currentSafeAreaInsets = RCTKeyWindow().safeAreaInsets;
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(_interfaceFrameDidChange)
+                                                 name:RCTUserInterfaceStyleDidChangeNotification
+                                               object:nil];
+  }
+}
+
+- (UIEdgeInsets)currentSafeAreaInsets
+{
+  {
+    std::lock_guard<std::mutex> lock(_mutex);
+    if (_isObserving) {
+      return _currentSafeAreaInsets;
+    }
+  }
+
+  // Fallback in case [startObservingSafeArea startObservingSafeArea] was not called.
+  __block UIEdgeInsets insets;
+#if !TARGET_OS_MACCATALYST
+  RCTUnsafeExecuteOnMainQueueSync(^{
+    insets = [UIApplication sharedApplication].delegate.window.safeAreaInsets;
+  });
+#endif
+  return insets;
+}
+
+- (void)_interfaceFrameDidChange
+{
+  std::lock_guard<std::mutex> lock(_mutex);
+  _currentSafeAreaInsets = RCTKeyWindow().safeAreaInsets;
+}
+
+@end

package/React/CoreModules/CoreModulesPlugins.h

@@ -51,7 +51,6 @@ Class RCTSourceCodeCls(void) __attribute__((used));
 Class RCTStatusBarManagerCls(void) __attribute__((used));
 Class RCTTimingCls(void) __attribute__((used));
 Class RCTTVNavigationEventEmitterCls(void) __attribute__((used));
-Class RCTWebSocketExecutorCls(void) __attribute__((used));
 Class RCTWebSocketModuleCls(void) __attribute__((used));
 Class RCTBlobManagerCls(void) __attribute__((used));
 

package/React/CoreModules/CoreModulesPlugins.mm

@@ -43,7 +43,6 @@ Class RCTCoreModulesClassProvider(const char *name) {
     {"StatusBarManager", RCTStatusBarManagerCls},
     {"Timing", RCTTimingCls},
     {"TVNavigationEventEmitter", RCTTVNavigationEventEmitterCls},
-    {"WebSocketExecutor", RCTWebSocketExecutorCls},
     {"WebSocketModule", RCTWebSocketModuleCls},
     {"BlobModule", RCTBlobManagerCls},
   };

package/React/CoreModules/RCTAccessibilityManager.mm

@@ -12,6 +12,7 @@
 #import <React/RCTBridge.h>
 #import <React/RCTConvert.h>
 #import <React/RCTEventDispatcherProtocol.h>
+#import <React/RCTInitialAccessibilityValuesProxy.h>
 #import <React/RCTLog.h>
 #import <React/RCTUIManager.h>
 
@@ -37,7 +38,7 @@ RCT_EXPORT_MODULE()
 
 + (BOOL)requiresMainQueueSetup
 {
-  return YES;
+  return NO;
 }
 
 - (instancetype)init
@@ -91,14 +92,15 @@ RCT_EXPORT_MODULE()
                                                  name:UIAccessibilityVoiceOverStatusDidChangeNotification
                                                object:nil];
 
-    self.contentSizeCategory = RCTSharedApplication().preferredContentSizeCategory;
-    _isBoldTextEnabled = UIAccessibilityIsBoldTextEnabled();
-    _isGrayscaleEnabled = UIAccessibilityIsGrayscaleEnabled();
-    _isInvertColorsEnabled = UIAccessibilityIsInvertColorsEnabled();
-    _isReduceMotionEnabled = UIAccessibilityIsReduceMotionEnabled();
-    _isDarkerSystemColorsEnabled = UIAccessibilityDarkerSystemColorsEnabled();
-    _isReduceTransparencyEnabled = UIAccessibilityIsReduceTransparencyEnabled();
-    _isVoiceOverEnabled = UIAccessibilityIsVoiceOverRunning();
+    RCTInitialAccessibilityValuesProxy *initialValuesProxy = [RCTInitialAccessibilityValuesProxy sharedInstance];
+    self.contentSizeCategory = initialValuesProxy.preferredContentSizeCategory;
+    _isBoldTextEnabled = initialValuesProxy.isBoldTextEnabled;
+    _isGrayscaleEnabled = initialValuesProxy.isGrayscaleEnabled;
+    _isInvertColorsEnabled = initialValuesProxy.isInvertColorsEnabled;
+    _isReduceMotionEnabled = initialValuesProxy.isReduceMotionEnabled;
+    _isDarkerSystemColorsEnabled = initialValuesProxy.isDarkerSystemColorsEnabled;
+    _isReduceTransparencyEnabled = initialValuesProxy.isReduceTransparencyEnabled;
+    _isVoiceOverEnabled = initialValuesProxy.isVoiceOverEnabled;
   }
   return self;
 }

package/React/CoreModules/RCTAppearance.mm

@@ -10,7 +10,7 @@
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
 #import <React/RCTConstants.h>
 #import <React/RCTEventEmitter.h>
-#import <React/RCTUtils.h>
+#import <React/RCTTraitCollectionProxy.h>
 
 #import "CoreModulesPlugins.h"
 
@@ -90,7 +90,7 @@ NSString *RCTColorSchemePreference(UITraitCollection *traitCollection)
 - (instancetype)init
 {
   if ((self = [super init])) {
-    UITraitCollection *traitCollection = RCTKeyWindow().traitCollection;
+    UITraitCollection *traitCollection = [RCTTraitCollectionProxy sharedInstance].currentTraitCollection;
     _currentColorScheme = RCTColorSchemePreference(traitCollection);
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(appearanceChanged:)
@@ -104,7 +104,7 @@ RCT_EXPORT_MODULE(Appearance)
 
 + (BOOL)requiresMainQueueSetup
 {
-  return YES;
+  return NO;
 }
 
 - (dispatch_queue_t)methodQueue
@@ -133,10 +133,7 @@ RCT_EXPORT_METHOD(setColorScheme : (NSString *)style)
 RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSString *, getColorScheme)
 {
   if (!sIsAppearancePreferenceSet) {
-    __block UITraitCollection *traitCollection = nil;
-    RCTUnsafeExecuteOnMainQueueSync(^{
-      traitCollection = RCTKeyWindow().traitCollection;
-    });
+    UITraitCollection *traitCollection = [RCTTraitCollectionProxy sharedInstance].currentTraitCollection;
     _currentColorScheme = RCTColorSchemePreference(traitCollection);
   }
   return _currentColorScheme;

package/React/CoreModules/RCTDevMenu.mm

@@ -152,14 +152,6 @@ RCT_EXPORT_MODULE()
                                    [(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
 }
 
@@ -456,12 +448,6 @@ RCT_EXPORT_METHOD(reload)
   RCTTriggerReloadCommandListeners(@"Unknown from JS");
 }
 
-RCT_EXPORT_METHOD(debugRemotely : (BOOL)enableDebug)
-{
-  WARN_DEPRECATED_DEV_MENU_EXPORT();
-  ((RCTDevSettings *)[_moduleRegistry moduleForName:"DevSettings"]).isDebuggingRemotely = enableDebug;
-}
-
 RCT_EXPORT_METHOD(setProfilingEnabled : (BOOL)enabled)
 {
   WARN_DEPRECATED_DEV_MENU_EXPORT();
@@ -526,10 +512,6 @@ RCT_EXPORT_METHOD(setHotLoadingEnabled : (BOOL)enabled)
 {
 }
 
-- (void)debugRemotely:(BOOL)enableDebug
-{
-}
-
 - (BOOL)isActionSheetShown
 {
   return NO;

package/React/CoreModules/RCTDevSettings.h

@@ -47,14 +47,8 @@
 - (instancetype)initWithDataSource:(id<RCTDevSettingsDataSource>)dataSource;
 
 @property (nonatomic, readonly) BOOL isHotLoadingAvailable;
-@property (nonatomic, readonly) BOOL isRemoteDebuggingAvailable;
 @property (nonatomic, readonly) BOOL isDeviceDebuggingAvailable;
 
-/**
- * Whether the bridge is connected to a remote JS executor.
- */
-@property (nonatomic, assign) BOOL isDebuggingRemotely;
-
 /*
  * Whether shaking will show RCTDevMenu. The menu is enabled by default if RCT_DEV=1, but
  * you may wish to disable it so that you can provide your own shake handler.

package/React/CoreModules/RCTDevSettings.mm

@@ -27,7 +27,6 @@
 static NSString *const kRCTDevSettingProfilingEnabled = @"profilingEnabled";
 static NSString *const kRCTDevSettingHotLoadingEnabled = @"hotLoadingEnabled";
 static NSString *const kRCTDevSettingIsInspectorShown = @"showInspector";
-static NSString *const kRCTDevSettingIsDebuggingRemotely = @"isDebuggingRemotely";
 static NSString *const kRCTDevSettingExecutorOverrideClass = @"executor-override";
 static NSString *const kRCTDevSettingShakeToShowDevMenu = @"shakeToShow";
 static NSString *const kRCTDevSettingIsPerfMonitorShown = @"RCTPerfMonitorKey";
@@ -124,9 +123,6 @@ static std::atomic<int> numInitializedModules{0};
 
 @interface RCTDevSettings () <RCTBridgeModule, RCTInvalidating, NativeDevSettingsSpec, RCTDevSettingsInspectable> {
   BOOL _isJSLoaded;
-#if RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
-  RCTHandlerToken _bridgeExecutorOverrideToken;
-#endif
 }
 
 @property (nonatomic, strong) Class executorClass;
@@ -183,18 +179,6 @@ RCT_EXPORT_MODULE()
 - (void)initialize
 {
 #if RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
-  if ([self _isBridgeMode]) {
-    RCTBridge *__weak weakBridge = self.bridge;
-    _bridgeExecutorOverrideToken = [[RCTPackagerConnection sharedPackagerConnection]
-        addNotificationHandler:^(id params) {
-          if (params != (id)kCFNull && [params[@"debug"] boolValue]) {
-            weakBridge.executorClass = objc_lookUpClass("RCTWebSocketExecutor");
-          }
-        }
-                         queue:dispatch_get_main_queue()
-                     forMethod:@"reload"];
-  }
-
   if (numInitializedModules++ == 0) {
     reloadToken = [[RCTPackagerConnection sharedPackagerConnection]
         addNotificationHandler:^(id params) {
@@ -255,10 +239,6 @@ RCT_EXPORT_MODULE()
 {
   [super invalidate];
 #if RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
-  if ([self _isBridgeMode]) {
-    [[RCTPackagerConnection sharedPackagerConnection] removeHandler:_bridgeExecutorOverrideToken];
-  }
-
   if (--numInitializedModules == 0) {
     [[RCTPackagerConnection sharedPackagerConnection] removeHandler:reloadToken];
 #if RCT_DEV_MENU
@@ -296,15 +276,6 @@ RCT_EXPORT_MODULE()
 #endif // RCT_ENABLE_INSPECTOR
 }
 
-- (BOOL)isRemoteDebuggingAvailable
-{
-  if (RCTTurboModuleEnabled()) {
-    return NO;
-  }
-  Class jsDebuggingExecutorClass = objc_lookUpClass("RCTWebSocketExecutor");
-  return (jsDebuggingExecutorClass != nil);
-}
-
 - (BOOL)isHotLoadingAvailable
 {
   if (self.bundleManager.bundleURL) {
@@ -338,30 +309,6 @@ RCT_EXPORT_METHOD(setIsShakeToShowDevMenuEnabled : (BOOL)enabled)
   return [[self settingForKey:kRCTDevSettingShakeToShowDevMenu] boolValue];
 }
 
-RCT_EXPORT_METHOD(setIsDebuggingRemotely : (BOOL)enabled)
-{
-  [self _updateSettingWithValue:@(enabled) forKey:kRCTDevSettingIsDebuggingRemotely];
-  [self _remoteDebugSettingDidChange];
-}
-
-- (BOOL)isDebuggingRemotely
-{
-  return [[self settingForKey:kRCTDevSettingIsDebuggingRemotely] boolValue];
-}
-
-- (void)_remoteDebugSettingDidChange
-{
-  // This value is passed as a command-line argument, so fall back to reading from NSUserDefaults directly
-  NSString *executorOverride = [[NSUserDefaults standardUserDefaults] stringForKey:kRCTDevSettingExecutorOverrideClass];
-  Class executorOverrideClass = executorOverride ? NSClassFromString(executorOverride) : nil;
-  if (executorOverrideClass) {
-    self.executorClass = executorOverrideClass;
-  } else {
-    BOOL enabled = self.isRemoteDebuggingAvailable && self.isDebuggingRemotely;
-    self.executorClass = enabled ? objc_getClass("RCTWebSocketExecutor") : nil;
-  }
-}
-
 RCT_EXPORT_METHOD(setProfilingEnabled : (BOOL)enabled)
 {
   [self _updateSettingWithValue:@(enabled) forKey:kRCTDevSettingProfilingEnabled];
@@ -460,7 +407,7 @@ RCT_EXPORT_METHOD(addMenuItem : (NSString *)title)
     // support for custom executors in the dev menu. But right now this is
     // needed to prevent overriding a custom executor with the default if a
     // custom executor has been set directly on the bridge
-    if (executorClass == Nil && self.bridge.executorClass != objc_lookUpClass("RCTWebSocketExecutor")) {
+    if (executorClass == Nil) {
       return;
     }
 
@@ -518,7 +465,6 @@ RCT_EXPORT_METHOD(openDebugger)
  */
 - (void)_synchronizeAllSettings
 {
-  [self _remoteDebugSettingDidChange];
   [self _profilingSettingDidChange];
 }
 
@@ -578,10 +524,6 @@ RCT_EXPORT_METHOD(openDebugger)
 {
   return NO;
 }
-- (BOOL)isRemoteDebuggingAvailable
-{
-  return NO;
-}
 + (BOOL)requiresMainQueueSetup
 {
   return NO;
@@ -602,9 +544,6 @@ RCT_EXPORT_METHOD(openDebugger)
 - (void)setHotLoadingEnabled:(BOOL)isHotLoadingEnabled
 {
 }
-- (void)setIsDebuggingRemotely:(BOOL)isDebuggingRemotelyEnabled
-{
-}
 - (void)setProfilingEnabled:(BOOL)isProfilingEnabled
 {
 }

package/React/CoreModules/RCTDeviceInfo.mm

@@ -14,8 +14,10 @@
 #import <React/RCTEventDispatcherProtocol.h>
 #import <React/RCTInitializing.h>
 #import <React/RCTInvalidating.h>
-#import <React/RCTUIUtils.h>
+#import <React/RCTKeyWindowValuesProxy.h>
 #import <React/RCTUtils.h>
+#import <React/RCTWindowSafeAreaProxy.h>
+#import <atomic>
 
 #import "CoreModulesPlugins.h"
 
@@ -30,16 +32,24 @@ using namespace facebook::react;
 #endif
   NSDictionary *_currentInterfaceDimensions;
   BOOL _isFullscreen;
-  BOOL _invalidated;
+  std::atomic<BOOL> _invalidated;
 }
 
 @synthesize moduleRegistry = _moduleRegistry;
 
 RCT_EXPORT_MODULE()
 
+- (instancetype)init
+{
+  if (self = [super init]) {
+    [[RCTKeyWindowValuesProxy sharedInstance] startObservingWindowSizeIfNecessary];
+  }
+  return self;
+}
+
 + (BOOL)requiresMainQueueSetup
 {
-  return YES;
+  return NO;
 }
 
 - (dispatch_queue_t)methodQueue
@@ -67,10 +77,6 @@ RCT_EXPORT_MODULE()
                                                name:RCTUserInterfaceStyleDidChangeNotification
                                              object:nil];
 
-  [[NSNotificationCenter defaultCenter] addObserver:self
-                                           selector:@selector(interfaceFrameDidChange)
-                                               name:RCTWindowFrameDidChangeNotification
-                                             object:nil];
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(interfaceFrameDidChange)
                                                name:UIApplicationDidBecomeActiveNotification
@@ -79,7 +85,7 @@ RCT_EXPORT_MODULE()
 
 #if TARGET_OS_IOS
 
-  _currentInterfaceOrientation = RCTKeyWindow().windowScene.interfaceOrientation;
+  _currentInterfaceOrientation = [RCTKeyWindowValuesProxy sharedInstance].currentInterfaceOrientation;
 
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(interfaceFrameDidChange)
@@ -100,10 +106,9 @@ RCT_EXPORT_MODULE()
 
 - (void)invalidate
 {
-  if (_invalidated) {
+  if (_invalidated.exchange(YES)) {
     return;
   }
-  _invalidated = YES;
   [self _cleanupObservers];
 }
 
@@ -117,8 +122,6 @@ RCT_EXPORT_MODULE()
 
   [[NSNotificationCenter defaultCenter] removeObserver:self name:RCTUserInterfaceStyleDidChangeNotification object:nil];
 
-  [[NSNotificationCenter defaultCenter] removeObserver:self name:RCTWindowFrameDidChangeNotification object:nil];
-
   [[NSNotificationCenter defaultCenter] removeObserver:self name:RCTBridgeWillInvalidateModulesNotification object:nil];
 
 #if TARGET_OS_IOS
@@ -129,17 +132,12 @@ RCT_EXPORT_MODULE()
 static BOOL RCTIsIPhoneNotched()
 {
   static BOOL isIPhoneNotched = NO;
-  static dispatch_once_t onceToken;
 
 #if TARGET_OS_IOS
+  static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
-    RCTAssertMainQueue();
-
     // 20pt is the top safeArea value in non-notched devices
-    UIWindow *keyWindow = RCTKeyWindow();
-    if (keyWindow) {
-      isIPhoneNotched = keyWindow.safeAreaInsets.top > 20;
-    }
+    isIPhoneNotched = [RCTWindowSafeAreaProxy sharedInstance].currentSafeAreaInsets.top > 20;
   });
 #endif
 
@@ -148,21 +146,24 @@ static BOOL RCTIsIPhoneNotched()
 
 static NSDictionary *RCTExportedDimensions(CGFloat fontScale)
 {
-  RCTAssertMainQueue();
-  RCTDimensions dimensions = RCTGetDimensions(fontScale);
-  __typeof(dimensions.window) window = dimensions.window;
+  UIScreen *mainScreen = UIScreen.mainScreen;
+  CGSize screenSize = mainScreen.bounds.size;
+
+  // We fallback to screen size if a key window is not found.
+  CGSize windowSize = [RCTKeyWindowValuesProxy sharedInstance].windowSize;
+
   NSDictionary<NSString *, NSNumber *> *dimsWindow = @{
-    @"width" : @(window.width),
-    @"height" : @(window.height),
-    @"scale" : @(window.scale),
-    @"fontScale" : @(window.fontScale)
+    @"width" : @(windowSize.width),
+    @"height" : @(windowSize.height),
+    @"scale" : @(mainScreen.scale),
+    @"fontScale" : @(fontScale)
   };
-  __typeof(dimensions.screen) screen = dimensions.screen;
+
   NSDictionary<NSString *, NSNumber *> *dimsScreen = @{
-    @"width" : @(screen.width),
-    @"height" : @(screen.height),
-    @"scale" : @(screen.scale),
-    @"fontScale" : @(screen.fontScale)
+    @"width" : @(screenSize.width),
+    @"height" : @(screenSize.height),
+    @"scale" : @(mainScreen.scale),
+    @"fontScale" : @(fontScale)
   };
   return @{@"window" : dimsWindow, @"screen" : dimsScreen};
 }
@@ -185,20 +186,14 @@ static NSDictionary *RCTExportedDimensions(CGFloat fontScale)
 
 - (NSDictionary<NSString *, id> *)getConstants
 {
-  __block NSDictionary<NSString *, id> *constants;
-  __weak __typeof(self) weakSelf = self;
-  RCTUnsafeExecuteOnMainQueueSync(^{
-    constants = @{
-      @"Dimensions" : [weakSelf _exportedDimensions],
-      // Note:
-      // This prop is deprecated and will be removed in a future release.
-      // Please use this only for a quick and temporary solution.
-      // Use <SafeAreaView> instead.
-      @"isIPhoneX_deprecated" : @(RCTIsIPhoneNotched()),
-    };
-  });
-
-  return constants;
+  return @{
+    @"Dimensions" : [self _exportedDimensions],
+    // Note:
+    // This prop is deprecated and will be removed in a future release.
+    // Please use this only for a quick and temporary solution.
+    // Use <SafeAreaView> instead.
+    @"isIPhoneX_deprecated" : @(RCTIsIPhoneNotched()),
+  };
 }
 
 - (void)didReceiveNewContentSizeMultiplier
@@ -218,21 +213,12 @@ static NSDictionary *RCTExportedDimensions(CGFloat fontScale)
 #if !TARGET_OS_TV
 
 - (void)interfaceOrientationDidChange
-{
-  __weak __typeof(self) weakSelf = self;
-  RCTExecuteOnMainQueue(^{
-    [weakSelf _interfaceOrientationDidChange];
-  });
-}
-
-- (void)_interfaceOrientationDidChange
 {
 #if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
-  UIApplication *application = RCTSharedApplication();
-  UIInterfaceOrientation nextOrientation = RCTKeyWindow().windowScene.interfaceOrientation;
+  UIWindow *keyWindow = RCTKeyWindow();
+  UIInterfaceOrientation nextOrientation = keyWindow.windowScene.interfaceOrientation;
 
-  BOOL isRunningInFullScreen =
-      CGRectEqualToRect(application.delegate.window.frame, application.delegate.window.screen.bounds);
+  BOOL isRunningInFullScreen = CGRectEqualToRect(keyWindow.frame, keyWindow.screen.bounds);
   // We are catching here two situations for multitasking view:
   // a) The app is in Split View and the container gets resized -> !isRunningInFullScreen
   // b) The app changes to/from fullscreen example: App runs in slide over mode and goes into fullscreen->

package/React/CoreModules/RCTEventDispatcher.mm

@@ -107,6 +107,7 @@ RCT_EXPORT_MODULE()
           break;
         case '\n':
           key = @"Enter";
+          break;
         default:
           break;
       }