react-native-tvos 0.76.6-0 → 0.77.0-0

package/React/Base/RCTBridgeProxy.mm

@@ -41,6 +41,8 @@ using namespace facebook;
   void *_runtime;
 }
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wobjc-designated-initializers"
 - (instancetype)initWithViewRegistry:(RCTViewRegistry *)viewRegistry
                       moduleRegistry:(RCTModuleRegistry *)moduleRegistry
                        bundleManager:(RCTBundleManager *)bundleManager
@@ -61,8 +63,10 @@ using namespace facebook;
     _runtime = runtime;
     _launchOptions = [launchOptions copy];
   }
+
   return self;
 }
+#pragma clang diagnostic pop
 
 - (void)dispatchBlock:(dispatch_block_t)block queue:(dispatch_queue_t)queue
 {
@@ -414,6 +418,10 @@ using namespace facebook;
   RCTViewRegistry *_viewRegistry;
   NSMutableDictionary<NSNumber *, UIView *> *_legacyViewRegistry;
 }
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wobjc-designated-initializers"
+
 - (instancetype)initWithViewRegistry:(RCTViewRegistry *)viewRegistry
 {
   self = [super self];
@@ -424,6 +432,8 @@ using namespace facebook;
   return self;
 }
 
+#pragma clang diagnostic pop
+
 /**
  * RCTViewRegistry
  */

package/React/Base/RCTCallInvoker.mm

@@ -11,6 +11,11 @@
   std::shared_ptr<facebook::react::CallInvoker> _callInvoker;
 }
 
+- (instancetype)init
+{
+  return [self initWithCallInvoker:nullptr];
+}
+
 - (instancetype)initWithCallInvoker:(std::shared_ptr<facebook::react::CallInvoker>)callInvoker
 {
   if (self = [super init]) {

package/React/Base/RCTConstants.h

@@ -14,6 +14,8 @@ RCT_EXTERN NSString *const RCTUserInterfaceStyleDidChangeNotificationTraitCollec
 
 RCT_EXTERN NSString *const RCTWindowFrameDidChangeNotification;
 
+RCT_EXTERN NSString *const RCTNotifyEventDispatcherObserversOfEvent_DEPRECATED;
+
 /**
  * This notification fires when the bridge initializes.
  */
@@ -48,15 +50,3 @@ RCT_EXTERN NSString *const RCTDidInitializeModuleNotification;
  */
 RCT_EXTERN BOOL RCTGetDispatchW3CPointerEvents(void);
 RCT_EXTERN void RCTSetDispatchW3CPointerEvents(BOOL value);
-
-/*
- * Memory Pressure Unloading Level
- */
-RCT_EXTERN int RCTGetMemoryPressureUnloadLevel(void);
-RCT_EXTERN void RCTSetMemoryPressureUnloadLevel(int value);
-
-/*
- * Use native view configs in bridgeless mode
- */
-RCT_EXTERN BOOL RCTGetUseNativeViewConfigsInBridgelessMode(void);
-RCT_EXTERN void RCTSetUseNativeViewConfigsInBridgelessMode(BOOL value);

package/React/Base/RCTConstants.m

@@ -21,6 +21,9 @@ NSString *const RCTJavaScriptWillStartLoadingNotification = @"RCTJavaScriptWillS
 
 NSString *const RCTDidInitializeModuleNotification = @"RCTDidInitializeModuleNotification";
 
+NSString *const RCTNotifyEventDispatcherObserversOfEvent_DEPRECATED =
+    @"RCTNotifyEventDispatcherObserversOfEvent_DEPRECATED";
+
 /*
  * W3C Pointer Events
  */
@@ -35,34 +38,3 @@ void RCTSetDispatchW3CPointerEvents(BOOL value)
 {
   RCTDispatchW3CPointerEvents = value;
 }
-
-/*
- * Memory Pressure Unloading Level for experimentation only.
- * Default is 15, which is TRIM_MEMORY_RUNNING_CRITICAL.
- */
-static int RCTMemoryPressureUnloadLevel = 15;
-
-int RCTGetMemoryPressureUnloadLevel(void)
-{
-  return RCTMemoryPressureUnloadLevel;
-}
-
-void RCTSetMemoryPressureUnloadLevel(int value)
-{
-  RCTMemoryPressureUnloadLevel = value;
-}
-
-/*
- * Use native view configs in bridgeless mode
- */
-static BOOL RCTUseNativeViewConfigsInBridgelessMode = NO;
-
-BOOL RCTGetUseNativeViewConfigsInBridgelessMode(void)
-{
-  return RCTUseNativeViewConfigsInBridgelessMode;
-}
-
-void RCTSetUseNativeViewConfigsInBridgelessMode(BOOL value)
-{
-  RCTUseNativeViewConfigsInBridgelessMode = value;
-}

package/React/Base/RCTConvert.mm

@@ -307,6 +307,7 @@ RCT_ENUM_CONVERTER(
       @"tail" : @(NSLineBreakByTruncatingTail),
       @"middle" : @(NSLineBreakByTruncatingMiddle),
       @"wordWrapping" : @(NSLineBreakByWordWrapping),
+      @"char" : @(NSLineBreakByCharWrapping),
     }),
     NSLineBreakByTruncatingTail,
     integerValue)
@@ -773,11 +774,13 @@ static NSDictionary<NSString *, NSDictionary *> *RCTSemanticColorsMap(void)
         // iOS 13.0
         RCTFallbackARGB : @(0xFFa2845e)
       },
+      @"systemCyanColor" : @{},
       @"systemGreenColor" : @{},
       @"systemIndigoColor" : @{
         // iOS 13.0
         RCTFallbackARGB : @(0xFF5856d6)
       },
+      @"systemMintColor" : @{},
       @"systemOrangeColor" : @{},
       @"systemPinkColor" : @{},
       @"systemPurpleColor" : @{},

package/React/Base/RCTKeyCommands.m

@@ -128,13 +128,11 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
     isKeyDown = [event _isKeyDown];
   }
 
-  BOOL hasFirstResponder = NO;
   if (isKeyDown && modifiedInput.length > 0) {
     UIResponder *firstResponder = nil;
     for (UIWindow *window in [self allWindows]) {
       firstResponder = [window valueForKey:@"firstResponder"];
       if (firstResponder) {
-        hasFirstResponder = YES;
         break;
       }
     }

package/React/Base/RCTModuleData.h

@@ -34,7 +34,7 @@ typedef id<RCTBridgeModule> (^RCTBridgeModuleProvider)(void);
                      moduleRegistry:(RCTModuleRegistry *)moduleRegistry
             viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
                       bundleManager:(RCTBundleManager *)bundleManager
-                  callableJSModules:(RCTCallableJSModules *)callableJSModules;
+                  callableJSModules:(RCTCallableJSModules *)callableJSModules NS_DESIGNATED_INITIALIZER;
 
 - (instancetype)initWithModuleInstance:(id<RCTBridgeModule>)instance
                                 bridge:(RCTBridge *)bridge
@@ -104,12 +104,6 @@ typedef id<RCTBridgeModule> (^RCTBridgeModuleProvider)(void);
  */
 @property (nonatomic, assign, readonly) BOOL implementsBatchDidComplete;
 
-/**
- * Whether the receiver has a valid `instance` which implements
- * -partialBatchDidFlush.
- */
-@property (nonatomic, assign, readonly) BOOL implementsPartialBatchDidFlush;
-
 @property (nonatomic, weak, readwrite) id<RCTModuleDataCallInvokerProvider> callInvokerProvider;
 
 @end

package/React/Base/RCTModuleData.mm

@@ -53,10 +53,22 @@ int32_t getUniqueId()
 @synthesize instance = _instance;
 @synthesize methodQueue = _methodQueue;
 
-- (void)setUp
+- (void)_setUpWithBridge:(RCTBridge *)bridge
+             moduleRegistry:(RCTModuleRegistry *)moduleRegistry
+    viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
+              bundleManager:(RCTBundleManager *)bundleManager
+          callableJSModules:(RCTCallableJSModules *)callableJSModules
 {
+  // start with the ivars
+  {
+    _bridge = bridge;
+    _moduleRegistry = moduleRegistry;
+    _viewRegistry_DEPRECATED = viewRegistry_DEPRECATED;
+    _bundleManager = bundleManager;
+    _callableJSModules = callableJSModules;
+  }
+
   _implementsBatchDidComplete = [_moduleClass instancesRespondToSelector:@selector(batchDidComplete)];
-  _implementsPartialBatchDidFlush = [_moduleClass instancesRespondToSelector:@selector(partialBatchDidFlush)];
 
   // If a module overrides `constantsToExport` and doesn't implement `requiresMainQueueSetup`, then we must assume
   // that it must be called on the main thread, because it may need to access UIKit.
@@ -87,35 +99,17 @@ int32_t getUniqueId()
             viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
                       bundleManager:(RCTBundleManager *)bundleManager
                   callableJSModules:(RCTCallableJSModules *)callableJSModules
-{
-  return [self _initWithModuleClass:moduleClass
-                     moduleProvider:^id<RCTBridgeModule> {
-                       return [moduleClass new];
-                     }
-                             bridge:bridge
-                     moduleRegistry:moduleRegistry
-            viewRegistry_DEPRECATED:viewRegistry_DEPRECATED
-                      bundleManager:bundleManager
-                  callableJSModules:callableJSModules];
-}
-
-- (instancetype)_initWithModuleClass:(Class)moduleClass
-                      moduleProvider:(RCTBridgeModuleProvider)moduleProvider
-                              bridge:(RCTBridge *)bridge
-                      moduleRegistry:(RCTModuleRegistry *)moduleRegistry
-             viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
-                       bundleManager:(RCTBundleManager *)bundleManager
-                   callableJSModules:(RCTCallableJSModules *)callableJSModules
 {
   if (self = [super init]) {
-    _bridge = bridge;
     _moduleClass = moduleClass;
-    _moduleProvider = [moduleProvider copy];
-    _moduleRegistry = moduleRegistry;
-    _viewRegistry_DEPRECATED = viewRegistry_DEPRECATED;
-    _bundleManager = bundleManager;
-    _callableJSModules = callableJSModules;
-    [self setUp];
+    _moduleProvider = [^id<RCTBridgeModule> {
+      return [moduleClass new];
+    } copy];
+    [self _setUpWithBridge:bridge
+                 moduleRegistry:moduleRegistry
+        viewRegistry_DEPRECATED:viewRegistry_DEPRECATED
+                  bundleManager:bundleManager
+              callableJSModules:callableJSModules];
   }
   return self;
 }
@@ -128,14 +122,13 @@ int32_t getUniqueId()
                      callableJSModules:(RCTCallableJSModules *)callableJSModules
 {
   if (self = [super init]) {
-    _bridge = bridge;
     _instance = instance;
     _moduleClass = [instance class];
-    _moduleRegistry = moduleRegistry;
-    _viewRegistry_DEPRECATED = viewRegistry_DEPRECATED;
-    _bundleManager = bundleManager;
-    _callableJSModules = callableJSModules;
-    [self setUp];
+    [self _setUpWithBridge:bridge
+                 moduleRegistry:moduleRegistry
+        viewRegistry_DEPRECATED:viewRegistry_DEPRECATED
+                  bundleManager:bundleManager
+              callableJSModules:callableJSModules];
   }
   return self;
 }

package/React/Base/RCTModuleMethod.mm

@@ -273,7 +273,7 @@ RCT_EXTERN_C_END
 
   for (NSUInteger i = 2; i < numberOfArguments; i++) {
     const char *objcType = [methodSignature getArgumentTypeAtIndex:i];
-    BOOL isNullableType = NO;
+    [[maybe_unused]] BOOL isNullableType = NO;
     RCTMethodArgument *argument = arguments[i - 2];
     NSString *typeName = argument.type;
     SEL selector = selectorForType(typeName);

package/React/Base/RCTTouchEvent.m

@@ -59,7 +59,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
       newEvent);
 
   BOOL newEventIsMoreRecent = NO;
-  BOOL oldEventIsMoreRecent = NO;
+  __unused BOOL oldEventIsMoreRecent = NO;
   NSInteger count = _reactTouches.count;
   for (int i = 0; i < count; i++) {
     NSDictionary *touch = _reactTouches[i];

package/React/Base/RCTUtils.h

@@ -114,7 +114,7 @@ RCT_EXTERN NSError *RCTErrorWithMessage(NSString *message);
 RCT_EXTERN NSError *RCTErrorWithNSException(NSException *exception);
 
 // Convert nil values to NSNull, and vice-versa
-#define RCTNullIfNil(value) ((value) ?: (id)kCFNull)
+#define RCTNullIfNil(value) ((value) ? (value) : (id)kCFNull)
 #define RCTNilIfNull(value)                           \
   ({                                                  \
     __typeof__(value) t = (value);                    \

package/React/Base/RCTUtils.m

@@ -239,7 +239,10 @@ NSString *RCTMD5Hash(NSString *string)
 {
   const char *str = string.UTF8String;
   unsigned char result[CC_MD5_DIGEST_LENGTH];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
   CC_MD5(str, (CC_LONG)strlen(str), result);
+#pragma clang diagnostic pop
 
   return [NSString stringWithFormat:@"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
                                     result[0],
@@ -296,8 +299,8 @@ void RCTUnsafeExecuteOnMainQueueSync(dispatch_block_t block)
 
 static void RCTUnsafeExecuteOnMainQueueOnceSync(dispatch_once_t *onceToken, dispatch_block_t block)
 {
-  // The solution was borrowed from a post by Ben Alpert:
-  // https://benalpert.com/2014/04/02/dispatch-once-initialization-on-the-main-thread.html
+  // The solution was borrowed from a post by Sophie Alpert:
+  // https://sophiebits.com/2014/04/02/dispatch-once-initialization-on-the-main-thread
   // See also: https://www.mikeash.com/pyblog/friday-qa-2014-06-06-secrets-of-dispatch_once.html
   if (RCTIsMainQueue()) {
     dispatch_once(onceToken, block);
@@ -584,18 +587,14 @@ UIWindow *__nullable RCTKeyWindow(void)
   }
 
   UIScene *sceneToUse = foregroundActiveScene ? foregroundActiveScene : foregroundInactiveScene;
-  UIWindowScene *windowScene = (UIWindowScene *)sceneToUse;
 
-  if (@available(iOS 15.0, *)) {
+  if ([sceneToUse respondsToSelector:@selector(keyWindow)]) {
+    // We have apps internally that might use UIScenes which are not window scenes.
+    // Calling keyWindow on a UIScene which is not a UIWindowScene can cause a crash
+    UIWindowScene *windowScene = (UIWindowScene *)sceneToUse;
     return windowScene.keyWindow;
   }
 
-  for (UIWindow *window in windowScene.windows) {
-    if (window.isKeyWindow) {
-      return window;
-    }
-  }
-
   return nil;
 }
 

package/React/Base/RCTVersion.m

@@ -22,8 +22,8 @@ NSDictionary* RCTGetReactNativeVersion(void)
   dispatch_once(&onceToken, ^(void){
     __rnVersion = @{
                   RCTVersionMajor: @(0),
-                  RCTVersionMinor: @(76),
-                  RCTVersionPatch: @(6),
+                  RCTVersionMinor: @(77),
+                  RCTVersionPatch: @(0),
                   RCTVersionPrerelease: @"0",
                   };
   });

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

@@ -48,6 +48,13 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy, nullable) NSArray<id<UIFocusEnvironment>> *reactPreferredFocusEnvironments;
 #endif
 
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+- (instancetype)initWithFrame:(CGRect)frame NS_UNAVAILABLE;
+- (instancetype)initWithCoder:(NSCoder *)aDecoder NS_UNAVAILABLE;
+- (instancetype)initWithSurface:(id<RCTSurfaceProtocol>)surface
+                sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode NS_UNAVAILABLE;
+
 - (instancetype)initWithSurface:(id<RCTSurfaceProtocol>)surface NS_DESIGNATED_INITIALIZER;
 
 - (void)cancelTouches;

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

@@ -53,11 +53,8 @@ static RCTRootViewSizeFlexibility convertToRootViewSizeFlexibility(RCTSurfaceSiz
 
 - (instancetype)initWithSurface:(id<RCTSurfaceProtocol>)surface
 {
-  if (self = [super initWithSurface:surface
-                    sizeMeasureMode:RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightExact]) {
-    [surface start];
-  }
-  return self;
+  return [super initWithSurface:surface
+                sizeMeasureMode:RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightExact];
 }
 
 RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame : (CGRect)frame)

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

@@ -60,7 +60,7 @@ NS_ASSUME_NONNULL_BEGIN
  * When set to `YES`, the activity indicator is not automatically hidden when the Surface stage changes.
  * In this scenario, users should invoke `hideActivityIndicator` to remove it.
  *
- * @param disabled: if `YES`, the auto-hide is disabled. Otherwise the loading view will be hidden automatically
+ * @param disabled if `YES`, the auto-hide is disabled. Otherwise the loading view will be hidden automatically
  */
 - (void)disableActivityIndicatorAutoHide:(BOOL)disabled;
 @end

package/React/CoreModules/PlatformStubs/RCTStatusBarManager.mm

@@ -0,0 +1,57 @@
+/*
+ * 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 "RCTStatusBarManager.h"
+#import "CoreModulesPlugins.h"
+
+#import <FBReactNativeSpec/FBReactNativeSpec.h>
+
+@interface RCTStatusBarManager () <NativeStatusBarManagerIOSSpec>
+@end
+
+@implementation RCTStatusBarManager
+
+RCT_EXPORT_MODULE()
+
+RCT_EXPORT_METHOD(getHeight : (RCTResponseSenderBlock)callback) {}
+
+RCT_EXPORT_METHOD(setStyle : (NSString *)style animated : (BOOL)animated) {}
+
+RCT_EXPORT_METHOD(setHidden : (BOOL)hidden withAnimation : (NSString *)withAnimation) {}
+
+RCT_EXPORT_METHOD(setNetworkActivityIndicatorVisible : (BOOL)visible) {}
+
+- (facebook::react::ModuleConstants<JS::NativeStatusBarManagerIOS::Constants>)getConstants
+{
+  __block facebook::react::ModuleConstants<JS::NativeStatusBarManagerIOS::Constants> constants;
+  RCTUnsafeExecuteOnMainQueueSync(^{
+    constants = facebook::react::typedConstants<JS::NativeStatusBarManagerIOS::Constants>({
+        .HEIGHT = 0,
+        .DEFAULT_BACKGROUND_COLOR = std::nullopt,
+    });
+  });
+
+  return constants;
+}
+
+- (facebook::react::ModuleConstants<JS::NativeStatusBarManagerIOS::Constants>)constantsToExport
+{
+  return (facebook::react::ModuleConstants<JS::NativeStatusBarManagerIOS::Constants>)[self getConstants];
+}
+
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+  return std::make_shared<facebook::react::NativeStatusBarManagerIOSSpecJSI>(params);
+}
+
+@end
+
+Class RCTStatusBarManagerCls(void)
+{
+  return RCTStatusBarManager.class;
+}

package/React/CoreModules/RCTAccessibilityManager.h

@@ -24,6 +24,7 @@ extern NSString *const RCTAccessibilityManagerDidUpdateMultiplierNotification; /
 @property (nonatomic, assign) BOOL isGrayscaleEnabled;
 @property (nonatomic, assign) BOOL isInvertColorsEnabled;
 @property (nonatomic, assign) BOOL isReduceMotionEnabled;
+@property (nonatomic, assign) BOOL isDarkerSystemColorsEnabled;
 @property (nonatomic, assign) BOOL prefersCrossFadeTransitions;
 @property (nonatomic, assign) BOOL isReduceTransparencyEnabled;
 @property (nonatomic, assign) BOOL isVoiceOverEnabled;

package/React/CoreModules/RCTAccessibilityManager.mm

@@ -76,6 +76,11 @@ RCT_EXPORT_MODULE()
                                                  name:UIAccessibilityReduceMotionStatusDidChangeNotification
                                                object:nil];
 
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(darkerSystemColorsDidChange:)
+                                                 name:UIAccessibilityDarkerSystemColorsStatusDidChangeNotification
+                                               object:nil];
+
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(reduceTransparencyStatusDidChange:)
                                                  name:UIAccessibilityReduceTransparencyStatusDidChangeNotification
@@ -91,6 +96,7 @@ RCT_EXPORT_MODULE()
     _isGrayscaleEnabled = UIAccessibilityIsGrayscaleEnabled();
     _isInvertColorsEnabled = UIAccessibilityIsInvertColorsEnabled();
     _isReduceMotionEnabled = UIAccessibilityIsReduceMotionEnabled();
+    _isDarkerSystemColorsEnabled = UIAccessibilityDarkerSystemColorsEnabled();
     _isReduceTransparencyEnabled = UIAccessibilityIsReduceTransparencyEnabled();
     _isVoiceOverEnabled = UIAccessibilityIsVoiceOverRunning();
   }
@@ -169,6 +175,20 @@ RCT_EXPORT_MODULE()
   }
 }
 
+- (void)darkerSystemColorsDidChange:(__unused NSNotification *)notification
+{
+  BOOL newDarkerSystemColorsEnabled = UIAccessibilityDarkerSystemColorsEnabled();
+  if (_isDarkerSystemColorsEnabled != newDarkerSystemColorsEnabled) {
+    _isDarkerSystemColorsEnabled = newDarkerSystemColorsEnabled;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+    [[_moduleRegistry moduleForName:"EventDispatcher"] sendDeviceEventWithName:@"darkerSystemColorsChanged"
+                                                                          body:@(_isDarkerSystemColorsEnabled)];
+
+#pragma clang diagnostic pop
+  }
+}
+
 - (void)reduceTransparencyStatusDidChange:(__unused NSNotification *)notification
 {
   BOOL newReduceTransparencyEnabled = UIAccessibilityIsReduceTransparencyEnabled();
@@ -354,6 +374,13 @@ RCT_EXPORT_METHOD(getCurrentReduceMotionState
   onSuccess(@[ @(_isReduceMotionEnabled) ]);
 }
 
+RCT_EXPORT_METHOD(getCurrentDarkerSystemColorsState
+                  : (RCTResponseSenderBlock)onSuccess onError
+                  : (__unused RCTResponseSenderBlock)onError)
+{
+  onSuccess(@[ @(_isDarkerSystemColorsEnabled) ]);
+}
+
 RCT_EXPORT_METHOD(getCurrentPrefersCrossFadeTransitionsState
                   : (RCTResponseSenderBlock)onSuccess onError
                   : (__unused RCTResponseSenderBlock)onError)

package/React/CoreModules/RCTActionSheetManager.mm

@@ -103,6 +103,8 @@ RCT_EXPORT_METHOD(showActionSheetWithOptions
   UIColor *tintColor = [RCTConvert UIColor:options.tintColor() ? @(*options.tintColor()) : nil];
   UIColor *cancelButtonTintColor =
       [RCTConvert UIColor:options.cancelButtonTintColor() ? @(*options.cancelButtonTintColor()) : nil];
+  UIColor *disabledButtonTintColor =
+      [RCTConvert UIColor:options.disabledButtonTintColor() ? @(*options.disabledButtonTintColor()) : nil];
   NSString *userInterfaceStyle = [RCTConvert NSString:options.userInterfaceStyle()];
 
   dispatch_async(dispatch_get_main_queue(), ^{
@@ -111,15 +113,16 @@ RCT_EXPORT_METHOD(showActionSheetWithOptions
     if (controller == nil) {
       RCTLogError(
           @"Tried to display action sheet but there is no application window. options: %@", @{
-            @"title" : title,
-            @"message" : message,
+            @"title" : title ?: @"(null)",
+            @"message" : message ?: @"(null)",
             @"options" : buttons,
             @"cancelButtonIndex" : @(cancelButtonIndex),
             @"destructiveButtonIndices" : destructiveButtonIndices,
-            @"anchor" : anchor,
-            @"tintColor" : tintColor,
-            @"cancelButtonTintColor" : cancelButtonTintColor,
-            @"disabledButtonIndices" : disabledButtonIndices,
+            @"anchor" : anchor ?: @"(null)",
+            @"tintColor" : tintColor ?: @"(null)",
+            @"cancelButtonTintColor" : cancelButtonTintColor ?: @"(null)",
+            @"disabledButtonTintColor" : disabledButtonTintColor ?: @"(null)",
+            @"disabledButtonIndices" : disabledButtonIndices ?: @"(null)",
           });
       return;
     }
@@ -171,7 +174,11 @@ RCT_EXPORT_METHOD(showActionSheetWithOptions
     if (disabledButtonIndices) {
       for (NSNumber *disabledButtonIndex in disabledButtonIndices) {
         if ([disabledButtonIndex integerValue] < buttons.count) {
-          [alertController.actions[[disabledButtonIndex integerValue]] setEnabled:false];
+          UIAlertAction *action = alertController.actions[[disabledButtonIndex integerValue]];
+          [action setEnabled:false];
+          if (disabledButtonTintColor) {
+            [action setValue:disabledButtonTintColor forKey:@"titleTextColor"];
+          }
         } else {
           RCTLogError(
               @"Index %@ from `disabledButtonIndices` is out of bounds. Maximum index value is %@.",

package/React/CoreModules/RCTAppearance.h

@@ -14,7 +14,7 @@
 RCT_EXTERN void RCTEnableAppearancePreference(BOOL enabled);
 RCT_EXTERN void RCTOverrideAppearancePreference(NSString *const);
 RCT_EXTERN void RCTUseKeyWindowForSystemStyle(BOOL useMainScreen);
-RCT_EXTERN NSString *RCTCurrentOverrideAppearancePreference();
+RCT_EXTERN NSString *RCTCurrentOverrideAppearancePreference(void);
 RCT_EXTERN NSString *RCTColorSchemePreference(UITraitCollection *traitCollection);
 
 @interface RCTAppearance : RCTEventEmitter <RCTBridgeModule>

package/React/CoreModules/RCTAppearance.mm

@@ -120,7 +120,10 @@ RCT_EXPORT_MODULE(Appearance)
 RCT_EXPORT_METHOD(setColorScheme : (NSString *)style)
 {
   UIUserInterfaceStyle userInterfaceStyle = [RCTConvert UIUserInterfaceStyle:style];
-  NSArray<__kindof UIWindow *> *windows = RCTSharedApplication().windows;
+  NSMutableArray<UIWindow *> *windows = [NSMutableArray new];
+  for (UIWindowScene *scene in RCTSharedApplication().connectedScenes) {
+    [windows addObjectsFromArray:scene.windows];
+  }
 
   for (UIWindow *window in windows) {
     window.overrideUserInterfaceStyle = userInterfaceStyle;
@@ -130,7 +133,10 @@ RCT_EXPORT_METHOD(setColorScheme : (NSString *)style)
 RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSString *, getColorScheme)
 {
   if (!sIsAppearancePreferenceSet) {
-    UITraitCollection *traitCollection = RCTKeyWindow().traitCollection;
+    __block UITraitCollection *traitCollection = nil;
+    RCTUnsafeExecuteOnMainQueueSync(^{
+      traitCollection = RCTKeyWindow().traitCollection;
+    });
     _currentColorScheme = RCTColorSchemePreference(traitCollection);
   }
   return _currentColorScheme;