react-native-tvos 0.87.1-0 → 0.88.0-0rc2

package/React/Base/RCTUtils.mm

@@ -13,6 +13,7 @@
 #import <objc/runtime.h>
 #import <zlib.h>
 #import <atomic>
+#import <vector>
 
 #import <UIKit/UIKit.h>
 
@@ -389,7 +390,11 @@ CGSize RCTScreenSize(void)
 
   if (CGSizeEqualToSize(size, CGSizeZero)) {
     RCTUnsafeExecuteOnMainQueueSync(^{
-      CGSize screenSize = [UIScreen mainScreen].bounds.size;
+      UIScreen *screen = RCTKeyWindow().screen;
+      if (screen == nil) {
+        screen = UIScreen.screens.firstObject;
+      }
+      CGSize screenSize = screen.bounds.size;
       size = CGSizeMake(MIN(screenSize.width, screenSize.height), MAX(screenSize.width, screenSize.height));
       cachedSize.store(size, std::memory_order_relaxed);
     });
@@ -641,13 +646,59 @@ UIWindow *__nullable RCTKeyWindow(void)
     // Calling keyWindow on a UIScene which is not a UIWindowScene can cause a crash
     UIWindowScene *windowScene = (UIWindowScene *)sceneToUse;
     if (@available(iOS 15.0, tvOS 15.0, *)) {
-      return windowScene.keyWindow;
+      UIWindow *keyWindow = windowScene.keyWindow;
+      if (keyWindow != nil) {
+        return keyWindow;
+      }
+    }
+    UIWindow *window = nil;
+    for (window in windowScene.windows) {
+      if (window.isKeyWindow) {
+        return window;
+      }
     }
   }
 
+  // Fallback for apps still on the legacy UIApplicationDelegate lifecycle (no
+  // SceneDelegate / no UIApplicationSceneManifest, or scene migration disabled).
+  // Their key window is created and owned by the app delegate and is not attached
+  // to a foreground UIWindowScene, so the scene-based lookup above finds nothing.
+  // This diff moved several call sites from `delegate.window` to RCTKeyWindow(),
+  // so without this fallback RCTKeyWindow() returns nil for those apps and RN's
+  // window/screen/dimension resolution (RCTViewportSize, RCTDeviceInfo,
+  // RCTPresentedViewController, …) breaks — the RN UI never renders.
+  //
+  // Gate this on the legacy lifecycle: scene-based apps (UIApplicationSceneManifest
+  // present) own their window through a UIWindowScene, and the app delegate's
+  // `window` there is nil or a stale/secondary window. Falling back to it for a
+  // scene app returns the wrong window instead of the correct `nil`, regressing
+  // scene-based hosts (e.g. RNTester's SceneDelegate scheme). Keep the fallback
+  // strictly for the legacy path.
+  if (!RCTIsSceneDelegateApp()) {
+    return RCTSharedApplication().delegate.window;
+  }
+
   return nil;
 }
 
+BOOL RCTIsSceneDelegateApp(void)
+{
+  if (@available(iOS 13.0, *)) {
+    NSDictionary *sceneManifest = [[NSBundle mainBundle] infoDictionary][@"UIApplicationSceneManifest"];
+
+    if (sceneManifest != nil) {
+      NSDictionary *sceneConfigurations = sceneManifest[@"UISceneConfigurations"];
+      if (sceneConfigurations != nil && sceneConfigurations.count > 0) {
+        return YES;
+      }
+    }
+
+    return NO;
+  }
+
+  return NO;
+}
+
 #if !TARGET_OS_TV
 UIStatusBarManager *__nullable RCTUIStatusBarManager(void)
 {
@@ -890,7 +941,8 @@ NSString *__nullable RCTHomePathForURL(NSURL *__nullable URL)
 static BOOL RCTIsImageAssetsPath(NSString *path)
 {
   NSString *extension = [path pathExtension];
-  return [extension isEqualToString:@"png"] || [extension isEqualToString:@"jpg"];
+  return
+      [extension isEqualToString:@"png"] || [extension isEqualToString:@"jpg"] || [extension isEqualToString:@"jpeg"];
 }
 
 BOOL RCTIsBundleAssetURL(NSURL *__nullable imageURL)
@@ -943,6 +995,115 @@ static NSBundle *bundleForPath(NSString *key)
   return bundleCache[key];
 }
 
+static BOOL RCTUseAssetCatalog(void)
+{
+  static BOOL useAssetCatalog = NO;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    useAssetCatalog = [[[NSBundle mainBundle] objectForInfoDictionaryKey:@"RCTUseAssetCatalog"] boolValue];
+  });
+  return useAssetCatalog;
+}
+
+// The bundle react-native-xcode.sh compiles packager image assets into
+// (RNAssets.bundle, an actool-compiled asset catalog inside the app).
+static NSBundle *__nullable RCTAssetCatalogBundle(void)
+{
+  static NSBundle *bundle;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    NSURL *bundleURL = [[NSBundle mainBundle] URLForResource:@"RNAssets" withExtension:@"bundle"];
+    if (bundleURL != nil) {
+      bundle = [NSBundle bundleWithURL:bundleURL];
+    }
+  });
+  return bundle;
+}
+
+NSString *__nullable RCTAssetCatalogNameForURL(NSURL *__nullable URL)
+{
+  // The "assets/" prefix the packager uses for all image assets. The CLI strips
+  // it from the identifiers it names the imagesets with.
+  constexpr NSUInteger assetsPrefixLength = sizeof("assets/") - 1;
+
+  NSString *path = RCTBundlePathForURL(URL);
+  // Packager assets always live under "assets/". Anything else (sub-bundles,
+  // CodePush/OTA assets outside the main bundle) is not in the catalog.
+  if (path == nil || ![path hasPrefix:@"assets/"]) {
+    return nil;
+  }
+
+  // Other packager assets (gif, webp, ...) are copied as plain files and must
+  // use the regular loader.
+  if (!RCTIsImageAssetsPath(path)) {
+    return nil;
+  }
+
+  // File system paths come back decomposed (NFD); restore the precomposed form
+  // the packager saw on disk so non-ASCII characters filter out the same way
+  // they do in the CLI's identifier.
+  path = path.precomposedStringWithCanonicalMapping;
+
+  const NSUInteger length = path.length;
+  unichar stackBuffer[256];
+  std::vector<unichar> heapBuffer;
+  unichar *chars = stackBuffer;
+  if (length > 256) {
+    heapBuffer.resize(length);
+    chars = heapBuffer.data();
+  }
+  [path getCharacters:chars range:NSMakeRange(0, length)];
+
+  // Strip the file extension (guaranteed present by RCTIsImageAssetsPath) and
+  // an optional "@<scale>x" suffix (integer or fractional, e.g. "@2x",
+  // "@1.5x"). The catalog stores a single imageset per image and resolves the
+  // scale by name at runtime, see
+  // https://developer.apple.com/documentation/xcode/managing-assets-with-asset-catalogs
+  NSUInteger end = length - 1;
+  while (end > assetsPrefixLength && chars[end] != '.') {
+    end--;
+  }
+  if (end > assetsPrefixLength && chars[end - 1] == 'x') {
+    // Walk back over "@<digits>(.<digits>)?" ending at the "x".
+    NSUInteger cursor = end - 1;
+    while (cursor > assetsPrefixLength && chars[cursor - 1] >= '0' && chars[cursor - 1] <= '9') {
+      cursor--;
+    }
+    if (cursor < end - 1) {
+      if (chars[cursor - 1] == '@') {
+        end = cursor - 1;
+      } else if (chars[cursor - 1] == '.') {
+        NSUInteger integerPart = cursor - 1;
+        while (integerPart > assetsPrefixLength && chars[integerPart - 1] >= '0' && chars[integerPart - 1] <= '9') {
+          integerPart--;
+        }
+        if (integerPart < cursor - 1 && chars[integerPart - 1] == '@') {
+          end = integerPart - 1;
+        }
+      }
+    }
+  }
+
+  // Build the identifier in place in a single pass: skip the "assets/" prefix,
+  // lowercase, encode the folder structure with "_" and drop anything that is
+  // not a valid identifier character, producing the same identifier as
+  // getResourceIdentifier in the CLI, which names the imagesets.
+  NSUInteger resultLength = 0;
+  for (NSUInteger i = assetsPrefixLength; i < end; i++) {
+    unichar c = chars[i];
+    if (c == '/') {
+      chars[resultLength++] = '_';
+    } else if ((c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || c == '_') {
+      chars[resultLength++] = c;
+    } else if (c >= 'A' && c <= 'Z') {
+      chars[resultLength++] = c + ('a' - 'A');
+    }
+  }
+
+  NSString *name = [NSString stringWithCharacters:chars length:resultLength];
+  return name;
+}
+
 UIImage *__nullable RCTImageFromLocalBundleAssetURL(NSURL *imageURL)
 {
   if (![imageURL.scheme isEqualToString:@"file"]) {
@@ -959,6 +1120,35 @@ UIImage *__nullable RCTImageFromLocalBundleAssetURL(NSURL *imageURL)
 
 UIImage *__nullable RCTImageFromLocalAssetURL(NSURL *imageURL)
 {
+  if (RCTUseAssetCatalog()) {
+    NSString *catalogName = RCTAssetCatalogNameForURL(imageURL);
+    if (catalogName != nil) {
+      // The app opted into the asset catalog and this is a packager asset, so it
+      // was compiled into RNAssets.bundle at build time. Trust the catalog and
+      // return directly, keeping the common path a single lookup with no
+      // filesystem fallback. Non-catalog assets (nil name) fall through below.
+      NSBundle *assetCatalogBundle = RCTAssetCatalogBundle();
+      if (assetCatalogBundle == nil) {
+        // Passing a nil bundle to imageNamed:inBundle: would silently search the
+        // main bundle instead, potentially resolving an unrelated app image.
+        RCTLogError(
+            @"RCTUseAssetCatalog is enabled but RNAssets.bundle was not found in the app. Image assets must be "
+             "bundled by react-native-xcode.sh, which compiles them into the app at build time. (loading %@)",
+            imageURL);
+        return nil;
+      }
+      UIImage *image = [UIImage imageNamed:catalogName inBundle:assetCatalogBundle compatibleWithTraitCollection:nil];
+      if (image == nil) {
+        RCTLogError(
+            @"Image \"%@\" (%@) was not found in the asset catalog. RCTUseAssetCatalog is enabled, "
+             "so image assets must be compiled into the app's RNAssets.bundle at build time.",
+            catalogName,
+            imageURL);
+      }
+      return image;
+    }
+  }
+
   NSString *imageName = RCTBundlePathForURL(imageURL);
 
   NSBundle *bundle = nil;

package/React/Base/RCTVersion.m

@@ -22,9 +22,9 @@ NSDictionary* RCTGetReactNativeVersion(void)
   dispatch_once(&onceToken, ^(void){
     __rnVersion = @{
                   RCTVersionMajor: @(0),
-                  RCTVersionMinor: @(87),
-                  RCTVersionPatch: @(1),
-                  RCTVersionPrerelease: @"0",
+                  RCTVersionMinor: @(88),
+                  RCTVersionPatch: @(0),
+                  RCTVersionPrerelease: @"0rc2",
                   };
   });
   return __rnVersion;

package/React/CoreModules/CoreModulesPlugins.h

@@ -49,7 +49,9 @@ Class RCTPlatformCls(void) __attribute__((used));
 Class RCTRedBoxCls(void) __attribute__((used));
 Class RCTSourceCodeCls(void) __attribute__((used));
 Class RCTStatusBarManagerCls(void) __attribute__((used));
+#ifndef RCT_REMOVE_LEGACY_ARCH
 Class RCTTimingCls(void) __attribute__((used));
+#endif
 Class RCTTVNavigationEventEmitterCls(void) __attribute__((used));
 Class RCTWebSocketModuleCls(void) __attribute__((used));
 Class RCTBlobManagerCls(void) __attribute__((used));

package/React/CoreModules/CoreModulesPlugins.mm

@@ -102,10 +102,6 @@ Class RCTCoreModulesClassProvider(const char *name)
     return RCTStatusBarManagerCls();
   }
 
-  if (name == "Timing"sv) {
-    return RCTTimingCls();
-  }
-
   if (name == "WebSocketModule"sv) {
     return RCTWebSocketModuleCls();
   }

package/React/CoreModules/PlatformStubs/RCTStatusBarManager.mm

@@ -17,11 +17,17 @@
 
 RCT_EXPORT_MODULE()
 
-RCT_EXPORT_METHOD(getHeight : (RCTResponseSenderBlock)callback) {}
+- (void)getHeight:(RCTResponseSenderBlock)callback
+{
+}
 
-RCT_EXPORT_METHOD(setStyle : (NSString *)style animated : (BOOL)animated) {}
+- (void)setStyle:(NSString *)style animated:(BOOL)animated
+{
+}
 
-RCT_EXPORT_METHOD(setHidden : (BOOL)hidden withAnimation : (NSString *)withAnimation) {}
+- (void)setHidden:(BOOL)hidden withAnimation:(NSString *)withAnimation
+{
+}
 
 - (facebook::react::ModuleConstants<JS::NativeStatusBarManagerIOS::Constants>)getConstants
 {

package/React/CoreModules/RCTAccessibilityManager.mm

@@ -274,9 +274,8 @@ RCT_EXPORT_MODULE()
   return _multipliers;
 }
 
-RCT_EXPORT_METHOD(
-    setAccessibilityContentSizeMultipliers : (
-        JS::NativeAccessibilityManager::SpecSetAccessibilityContentSizeMultipliersJSMultipliers &)JSMultipliers)
+- (void)setAccessibilityContentSizeMultipliers:
+    (JS::NativeAccessibilityManager::SpecSetAccessibilityContentSizeMultipliersJSMultipliers &)JSMultipliers
 {
   NSMutableDictionary<NSString *, NSNumber *> *multipliers = [NSMutableDictionary new];
   setMultipliers(multipliers, UIContentSizeCategoryExtraSmall, JSMultipliers.extraSmall());
@@ -308,7 +307,7 @@ static void setMultipliers(
   }
 }
 
-RCT_EXPORT_METHOD(setAccessibilityFocus : (double)reactTag)
+- (void)setAccessibilityFocus:(double)reactTag
 {
   dispatch_async(dispatch_get_main_queue(), ^{
     UIView *view = [self.viewRegistry_DEPRECATED viewForReactTag:@(reactTag)];
@@ -316,14 +315,16 @@ RCT_EXPORT_METHOD(setAccessibilityFocus : (double)reactTag)
   });
 }
 
-RCT_EXPORT_METHOD(announceForAccessibility : (NSString *)announcement)
+- (void)announceForAccessibility:(NSString *)announcement
 {
   UIAccessibilityPostNotification(UIAccessibilityAnnouncementNotification, announcement);
 }
 
-RCT_EXPORT_METHOD(
-    announceForAccessibilityWithOptions : (NSString *)announcement options : (
-        JS::NativeAccessibilityManager::SpecAnnounceForAccessibilityWithOptionsOptions &)options)
+- (void)
+    announceForAccessibilityWithOptions:(NSString *)announcement
+                                options:
+                                    (JS::NativeAccessibilityManager::SpecAnnounceForAccessibilityWithOptionsOptions &)
+                                        options
 {
   NSMutableDictionary<NSString *, id> *attrsDictionary = [NSMutableDictionary new];
   if (options.queue()) {
@@ -356,47 +357,41 @@ RCT_EXPORT_METHOD(
   }
 }
 
-RCT_EXPORT_METHOD(getMultiplier : (RCTResponseSenderBlock)callback)
+- (void)getMultiplier:(RCTResponseSenderBlock)callback
 {
   if (callback) {
     callback(@[ @(self.multiplier) ]);
   }
 }
 
-RCT_EXPORT_METHOD(
-    getCurrentBoldTextState : (RCTResponseSenderBlock)onSuccess onError : (__unused RCTResponseSenderBlock)onError)
+- (void)getCurrentBoldTextState:(RCTResponseSenderBlock)onSuccess onError:(__unused RCTResponseSenderBlock)onError
 {
   onSuccess(@[ @(_isBoldTextEnabled) ]);
 }
 
-RCT_EXPORT_METHOD(
-    getCurrentGrayscaleState : (RCTResponseSenderBlock)onSuccess onError : (__unused RCTResponseSenderBlock)onError)
+- (void)getCurrentGrayscaleState:(RCTResponseSenderBlock)onSuccess onError:(__unused RCTResponseSenderBlock)onError
 {
   onSuccess(@[ @(_isGrayscaleEnabled) ]);
 }
 
-RCT_EXPORT_METHOD(
-    getCurrentInvertColorsState : (RCTResponseSenderBlock)onSuccess onError : (__unused RCTResponseSenderBlock)onError)
+- (void)getCurrentInvertColorsState:(RCTResponseSenderBlock)onSuccess onError:(__unused RCTResponseSenderBlock)onError
 {
   onSuccess(@[ @(_isInvertColorsEnabled) ]);
 }
 
-RCT_EXPORT_METHOD(
-    getCurrentReduceMotionState : (RCTResponseSenderBlock)onSuccess onError : (__unused RCTResponseSenderBlock)onError)
+- (void)getCurrentReduceMotionState:(RCTResponseSenderBlock)onSuccess onError:(__unused RCTResponseSenderBlock)onError
 {
   onSuccess(@[ @(_isReduceMotionEnabled) ]);
 }
 
-RCT_EXPORT_METHOD(
-    getCurrentDarkerSystemColorsState : (RCTResponseSenderBlock)onSuccess onError : (__unused RCTResponseSenderBlock)
-        onError)
+- (void)getCurrentDarkerSystemColorsState:(RCTResponseSenderBlock)onSuccess
+                                  onError:(__unused RCTResponseSenderBlock)onError
 {
   onSuccess(@[ @(_isDarkerSystemColorsEnabled) ]);
 }
 
-RCT_EXPORT_METHOD(
-    getCurrentPrefersCrossFadeTransitionsState : (RCTResponseSenderBlock)
-        onSuccess onError : (__unused RCTResponseSenderBlock)onError)
+- (void)getCurrentPrefersCrossFadeTransitionsState:(RCTResponseSenderBlock)onSuccess
+                                           onError:(__unused RCTResponseSenderBlock)onError
 {
   if (@available(iOS 14.0, *)) {
     onSuccess(@[ @(UIAccessibilityPrefersCrossFadeTransitions()) ]);
@@ -405,15 +400,13 @@ RCT_EXPORT_METHOD(
   }
 }
 
-RCT_EXPORT_METHOD(
-    getCurrentReduceTransparencyState : (RCTResponseSenderBlock)onSuccess onError : (__unused RCTResponseSenderBlock)
-        onError)
+- (void)getCurrentReduceTransparencyState:(RCTResponseSenderBlock)onSuccess
+                                  onError:(__unused RCTResponseSenderBlock)onError
 {
   onSuccess(@[ @(_isReduceTransparencyEnabled) ]);
 }
 
-RCT_EXPORT_METHOD(
-    getCurrentVoiceOverState : (RCTResponseSenderBlock)onSuccess onError : (__unused RCTResponseSenderBlock)onError)
+- (void)getCurrentVoiceOverState:(RCTResponseSenderBlock)onSuccess onError:(__unused RCTResponseSenderBlock)onError
 {
   onSuccess(@[ @(_isVoiceOverEnabled) ]);
 }

package/React/CoreModules/RCTActionSheetManager.mm

@@ -82,9 +82,8 @@ RCT_EXPORT_MODULE()
   [parentViewController presentViewController:alertController animated:YES completion:nil];
 }
 
-RCT_EXPORT_METHOD(
-    showActionSheetWithOptions : (JS::NativeActionSheetManager::SpecShowActionSheetWithOptionsOptions &)
-        options callback : (RCTResponseSenderBlock)callback)
+- (void)showActionSheetWithOptions:(JS::NativeActionSheetManager::SpecShowActionSheetWithOptionsOptions &)options
+                          callback:(RCTResponseSenderBlock)callback
 {
   if (RCTRunningInAppExtension()) {
     RCTLogError(@"Unable to show action sheet from app extension");
@@ -225,7 +224,7 @@ RCT_EXPORT_METHOD(
   });
 }
 
-RCT_EXPORT_METHOD(dismissActionSheet)
+- (void)dismissActionSheet
 {
   if (_alertControllers.count == 0) {
     RCTLogWarn(@"Unable to dismiss action sheet");
@@ -238,10 +237,10 @@ RCT_EXPORT_METHOD(dismissActionSheet)
   });
 }
 
-RCT_EXPORT_METHOD(
-    showShareActionSheetWithOptions : (JS::NativeActionSheetManager::SpecShowShareActionSheetWithOptionsOptions &)
-        options failureCallback : (RCTResponseSenderBlock)failureCallback successCallback : (RCTResponseSenderBlock)
-            successCallback)
+- (void)showShareActionSheetWithOptions:
+            (JS::NativeActionSheetManager::SpecShowShareActionSheetWithOptionsOptions &)options
+                        failureCallback:(RCTResponseSenderBlock)failureCallback
+                        successCallback:(RCTResponseSenderBlock)successCallback
 {
   if (RCTRunningInAppExtension()) {
     RCTLogError(@"Unable to show action sheet from app extension");

package/React/CoreModules/RCTAlertManager.mm

@@ -65,7 +65,7 @@ RCT_EXPORT_MODULE()
  * The key from the `buttons` dictionary is passed back in the callback on click.
  * Buttons are displayed in the order they are specified.
  */
-RCT_EXPORT_METHOD(alertWithArgs : (JS::NativeAlertManager::Args &)args callback : (RCTResponseSenderBlock)callback)
+- (void)alertWithArgs:(JS::NativeAlertManager::Args &)args callback:(RCTResponseSenderBlock)callback
 {
   NSString *title = [RCTConvert NSString:args.title()];
   NSString *message = [RCTConvert NSString:args.message()];

package/React/CoreModules/RCTAppState.mm

@@ -135,7 +135,7 @@ RCT_EXPORT_MODULE()
 /**
  * Get the current background/foreground state of the app
  */
-RCT_EXPORT_METHOD(getCurrentAppState : (RCTResponseSenderBlock)callback error : (__unused RCTResponseSenderBlock)error)
+- (void)getCurrentAppState:(RCTResponseSenderBlock)callback error:(__unused RCTResponseSenderBlock)error
 {
   callback(@[ @{@"app_state" : RCTCurrentAppState()} ]);
 }

package/React/CoreModules/RCTAppearance.mm

@@ -109,11 +109,14 @@ RCT_EXPORT_MODULE(Appearance)
   return std::make_shared<NativeAppearanceSpecJSI>(params);
 }
 
-RCT_EXPORT_METHOD(setColorScheme : (NSString *)style)
+- (void)setColorScheme:(NSString *)style
 {
   UIUserInterfaceStyle userInterfaceStyle = [RCTConvert UIUserInterfaceStyle:style];
   NSMutableArray<UIWindow *> *windows = [NSMutableArray new];
   for (UIWindowScene *scene in RCTSharedApplication().connectedScenes) {
+    if (![scene respondsToSelector:@selector(windows)]) {
+      continue;
+    }
     [windows addObjectsFromArray:scene.windows];
   }
 

package/React/CoreModules/RCTClipboard.mm

@@ -26,7 +26,7 @@ RCT_EXPORT_MODULE()
   return dispatch_get_main_queue();
 }
 
-RCT_EXPORT_METHOD(setString : (NSString *)content)
+- (void)setString:(NSString *)content
 {
 #if !TARGET_OS_TV
   UIPasteboard *clipboard = [UIPasteboard generalPasteboard];
@@ -34,7 +34,7 @@ RCT_EXPORT_METHOD(setString : (NSString *)content)
 #endif
 }
 
-RCT_EXPORT_METHOD(getString : (RCTPromiseResolveBlock)resolve reject : (__unused RCTPromiseRejectBlock)reject)
+- (void)getString:(RCTPromiseResolveBlock)resolve reject:(__unused RCTPromiseRejectBlock)reject
 {
 #if !TARGET_OS_TV
   UIPasteboard *clipboard = [UIPasteboard generalPasteboard];

package/React/CoreModules/RCTDevLoadingView.mm

@@ -203,6 +203,7 @@ RCT_EXPORT_MODULE()
 #if TARGET_OS_TV
       self->_window.windowLevel = UIWindowLevelNormal + 1;
 #else
+      self->_window.frame = self->_window.windowScene.coordinateSpace.bounds;
       self->_window.windowLevel = UIWindowLevelStatusBar + 1;
 #endif
       self->_window.rootViewController = [UIViewController new];
@@ -242,20 +243,20 @@ RCT_EXPORT_MODULE()
     [NSLayoutConstraint activateConstraints:constraints];
 
     [self->_window layoutIfNeeded];
-    self->_window.frame = CGRectMake(0, 0, mainWindow.frame.size.width, self->_container.frame.size.height);
   });
 }
 
-RCT_EXPORT_METHOD(
-    showMessage : (NSString *)message withColor : (NSNumber *__nonnull)color withBackgroundColor : (NSNumber *__nonnull)
-        backgroundColor withDismissButton : (NSNumber *)dismissButton)
+- (void)showMessage:(NSString *)message
+              withColor:(NSNumber *__nonnull)color
+    withBackgroundColor:(NSNumber *__nonnull)backgroundColor
+      withDismissButton:(NSNumber *)dismissButton
 {
   [self showMessage:message
                 color:[RCTConvert UIColor:color]
       backgroundColor:[RCTConvert UIColor:backgroundColor]
         dismissButton:[dismissButton boolValue]];
 }
-RCT_EXPORT_METHOD(hide)
+- (void)hide
 {
   if (!RCTDevLoadingViewGetEnabled()) {
     return;
@@ -269,15 +270,15 @@ RCT_EXPORT_METHOD(hide)
     const NSTimeInterval MIN_PRESENTED_TIME = 0.6;
     NSTimeInterval presentedTime = [[NSDate date] timeIntervalSinceDate:self->_showDate];
     NSTimeInterval delay = MAX(0, MIN_PRESENTED_TIME - presentedTime);
-    CGRect windowFrame = self->_window.frame;
+    CGFloat height = self->_container.bounds.size.height;
     [UIView animateWithDuration:0.25
         delay:delay
         options:0
         animations:^{
-          self->_window.frame = CGRectOffset(windowFrame, 0, -windowFrame.size.height);
+          self->_container.transform = CGAffineTransformMakeTranslation(0, -height);
         }
         completion:^(__unused BOOL finished) {
-          self->_window.frame = windowFrame;
+          self->_container.transform = CGAffineTransformIdentity;
           self->_window.hidden = YES;
           self->_window = nil;
           self->_container = nil;

package/React/CoreModules/RCTDevMenu.mm

@@ -430,7 +430,7 @@ RCT_EXPORT_MODULE()
   return items;
 }
 
-RCT_EXPORT_METHOD(show)
+- (void)show
 {
   if ((_actionSheet != nullptr) || RCTRunningInAppExtension() || !_devMenuEnabled) {
     return;
@@ -495,13 +495,13 @@ RCT_EXPORT_METHOD(show)
   return ((RCTDevSettings *)[_moduleRegistry moduleForName:"DevSettings"]).isShakeToShowDevMenuEnabled;
 }
 
-RCT_EXPORT_METHOD(reload)
+- (void)reload
 {
   WARN_DEPRECATED_DEV_MENU_EXPORT();
   RCTTriggerReloadCommandListeners(@"Unknown from JS");
 }
 
-RCT_EXPORT_METHOD(setProfilingEnabled : (BOOL)enabled)
+- (void)setProfilingEnabled:(BOOL)enabled
 {
   WARN_DEPRECATED_DEV_MENU_EXPORT();
   ((RCTDevSettings *)[_moduleRegistry moduleForName:"DevSettings"]).isProfilingEnabled = enabled;
@@ -512,7 +512,7 @@ RCT_EXPORT_METHOD(setProfilingEnabled : (BOOL)enabled)
   return ((RCTDevSettings *)[_moduleRegistry moduleForName:"DevSettings"]).isProfilingEnabled;
 }
 
-RCT_EXPORT_METHOD(setHotLoadingEnabled : (BOOL)enabled)
+- (void)setHotLoadingEnabled:(BOOL)enabled
 {
   WARN_DEPRECATED_DEV_MENU_EXPORT();
   ((RCTDevSettings *)[_moduleRegistry moduleForName:"DevSettings"]).isHotLoadingEnabled = enabled;