react-native-tvos 0.75.4-0 → 0.76.0-0

package/README.md

@@ -2,7 +2,7 @@
 
 Apple TV and Android TV support for React Native are maintained here and in the corresponding `react-native-tvos` NPM package, and not in the [core repo](https://github.com/facebook/react-native/).  This is a full fork of the main repository, with only the changes needed to support Apple TV and Android TV.
 
-Releases of `react-native-tvos` will be based on a public release of `react-native`; e.g. the 0.75.2-0 release of this package will be derived from the 0.75.0 release of `react-native`. All releases of this repo will follow the 0.xx.x-y format, where x digits are from a specific RN core release, and y represents the additional versioning from this repo.
+Releases of `react-native-tvos` will be based on a public release of `react-native`; e.g. the 0.76.0-0 release of this package will be derived from the 0.76.0 release of `react-native`. All releases of this repo will follow the 0.xx.x-y format, where x digits are from a specific RN core release, and y represents the additional versioning from this repo.
 
 Releases will be published on npmjs.org and you may find the latest release version here: https://www.npmjs.com/package/react-native-tvos?activeTab=versions or use the tag `@latest`
 
@@ -23,20 +23,29 @@ This README covers only TV-specific features. For more general documentation and
 
 ### Hermes JS support
 
-As of the 0.71 release, Hermes is fully working on both Apple TV and Android TV, and is enabled by default.
+- As of the 0.71 release, Hermes is fully working on both Apple TV and Android TV, and is enabled by default.
 
 ### React Native new architecture (Fabric) support
 
-- _Apple TV_: Modify your app's Podfile to set the `:fabric_enabled` value to `true` in both iOS and tvOS targets. After that, run `pod install` to pick up the additional pods needed for the new architecture. Components that have not been reimplemented in the new architecture will show up as an "unimplemented component".
-- _Android TV_: To enable Fabric, modify `android/gradle.properties` in your app and set `newArchEnabled=true`, then rebuild your app.
+React Native TV 0.76 enables the New Architecture by default. You can read more about it in this blog post from the RN core team: [The New Architecture Is Here](https://reactnative.dev/blog/2024/10/23/the-new-architecture-is-here)
 
-As of the 0.74 release, bridgeless is the default when Fabric is enabled. If you need to use Fabric without bridgeless on Apple TV, you can override the default by adding the method below in `AppDelegate.mm`:
+If, for any reason, the New Architecture is not behaving properly in your application, there is always the option to opt-out from it until you are ready to turn it on again.
 
-```objc
-- (BOOL)bridgelessEnabled
-{
-  return false;
-}
+To opt-out from the New Architecture:
+
+- _Expo apps_: RN 0.76 will be supported in SDK 52. See the [SDK 52 beta release notes](https://expo.dev/changelog/2024/10-24-sdk-52-beta) for more information on new arch support in Expo.
+
+- _Apple TV_: You can reinstall the dependencies by running the command:
+
+```sh
+RCT_NEW_ARCH_ENABLED=0 bundle exec pod install
+```
+
+- _Android TV_: On Android, modify the android/gradle.properties file and turn off the newArchEnabled flag, then do a clean rebuild:
+
+```diff
+-newArchEnabled=true
++newArchEnabled=false
 ```
 
 ### Typescript
@@ -51,17 +60,19 @@ The RNTester app supports Apple TV and Android TV.  In this repo, `RNTester/Podf
 
 Minimum operating system versions:
 
-- Apple TV: tvOS 13.4
+- Apple TV:
+  - tvOS 13.4 (for the 0.74 and 0.75 releases)
+  - tvOS 15.1 (for the 0.76 release)
 - Android TV:
-  - API level 21 (for the 0.73 releases)
-  - API level 23 (for the 0.74 release)
+  - API level 23 (for the 0.74 and 0.75 releases)
+  - API level 24 (for the 0.76 release)
 
 ## Build changes
 
-- _Native layer for Apple TV_: React Native Xcode projects all now have Apple TV build targets, with names ending in the string '-tvOS'.  Changes in the React Native podspecs in 0.73 now require that your application `Podfile` only have one target. This repo supports either an iOS target or a tvOS target, but both targets should not be active at the same time. The new app template now has the iOS target commented out.
+- _Native layer for Apple TV_: Changes in the React Native podspecs (in 0.73 and later) require that your application `Podfile` only have one target. This repo supports either an iOS target or a tvOS target.
 - _Maven artifacts for Android TV_: In 0.71 and later releases, the React Native Android prebuilt archives are published to Maven instead of being included in the NPM. We are following the same model, except that the Maven artifacts will be in group `io.github.react-native-tvos` instead of `com.facebook.react`. The `@react-native/gradle-plugin` module has been upgraded so that the Android dependencies will be detected correctly during build.
 
-## _(New)_ TV project creation in React Native 0.75 and later
+## TV project creation in React Native 0.75 and later
 
 > _Warning:_ Make sure you do not globally install `react-native` or `react-native-tvos`. If you have done this the wrong way, you may get error messages like `ld: library not found for -lPods-TestApp-tvOS`.
 
@@ -81,7 +92,7 @@ As of React Native 0.75.x, the template that used to reside in the `react-native
 
 > _Note:_ The new TV template will only build apps for Apple TV and Android TV. Multiple platform targets are no longer supported in React Native app Podfiles.
 
-To create a new project:
+To create a new project for RNTV 0.76:
 
 ```sh
 # 
@@ -115,7 +126,7 @@ $ npx @react-native-community/cli@latest init TVTest --template @react-native-tv
                ######                ######               
                                                           
 
-              Welcome to React Native 0.75.2!                
+              Welcome to React Native 0.76!                
                  Learn once, write anywhere               
 
 ✔ Downloading template
@@ -135,8 +146,6 @@ npx react-native run-ios --simulator "Apple TV"
 npx react-native run:android --device tv_api_31
 ```
 
-See [this document](https://docs.expo.dev/bare/using-expo-cli/) for more details on Expo CLI functionality. (Note that many of these features require that Expo SDK modules be built into your app. Expo SDK support requires a different project configuration as described below.)
-
 ## How to support TV specific file extensions
 
 The template contains an [example Metro configuration](./packages/react-native/template/metro.config.js) that allows Metro to resolve application source files with TV-specific code, indicated by specific file extensions (e.g. `*.ios.tv.tsx`, `*.android.tv.tsx`, `*.tv.tsx`). The config will work the same way with the other standard source file extensions (`.js`, etc.), as documented in [Metro docs](https://metrobundler.dev/docs/configuration/#sourceexts)
@@ -169,13 +178,18 @@ var running_on_apple_tv = Platform.isTVOS;
 
 - _Access to touchable controls_:  The `Touchable` mixin has code added to detect focus changes and use existing methods to style the components properly and initiate the proper actions when the view is selected using the TV remote, so `TouchableWithoutFeedback`, `TouchableHighlight` and `TouchableOpacity` will "just work" on both Apple TV and Android TV. In particular:
 
-  - `onFocus` will be executed when the touchable view goes into focus
-  - `onBlur` will be executed when the touchable view goes out of focus
-  - `onPress` will be executed when the touchable view is actually selected by pressing the "select" button on the TV remote (center button on Apple TV remote, or center button on Android TV DPad).
-  - `onLongPress` will be executed twice if the "select" button is held down for a length of time. The two events passed into `onLongPress()` will have different values for their `eventKeyAction` property, 0 for key down (start) and 1 for key up (end).
+  - `onFocus()` will be executed when the touchable view goes into focus
+  - `onBlur()` will be executed when the touchable view goes out of focus
+  - `onPress()` will be executed when the touchable view is actually selected by pressing the "select" button on the TV remote (center button on Apple TV remote, or center button on Android TV DPad).
+  - `onLongPress()` will be executed twice if the "select" button is held down for a length of time. The two events passed into `onLongPress()` will have different values for their `eventKeyAction` property, 0 for key down (start) and 1 for key up (end).
 
 - _Pressable controls_: The `Pressable` API works with TV.  Additional `onFocus` and `onBlur` props are provided to allow you to customize behavior when a Pressable enters or leaves focus. Similar to the `pressed` state that is true while a user is pressing the component on a touchscreen, the `focused` state will be true when it is focused on TV.  `PressableExample` in RNTester has been modified appropriately. The `onPress()` and `onLongPress()` methods work the same way as with `Touchable` components.
 
+- _Tailwind styles for Pressable controls_: For the 0.76 release, the `Pressable` component also generates the `onPressIn()` and `onPressOut()` events needed to support the [`active:` pseudo class for Tailwind styles](https://www.nativewind.dev/v4/core-concepts/states#hover-focus-and-active-).
+  - For `onPress()` events (the "select" button on the remote is pressed once), `onPressIn()` is generated, then `onPressOut()` is generated a short time later.
+  - For `onLongPress()` events (the "select" button on the remote is held down for a length of time), `onPressIn()` is generated once the press down is detected, and `onPressOut()` is generated when the button is released.
+  - The `focus:` pseudo class is also supported via the `onFocus()` and `onBlur()` events.
+
 - _TV remote/keyboard input_: Application code that needs to implement custom handling of TV remote events can create an instance of `TVEventHandler` and listen for these events.  For a more convenient API, we provide `useTVEventHandler`.
 
 ```javascript
@@ -244,8 +258,6 @@ class Game2048 extends React.Component {
   }
 ```
 
-- _Flipper_: We do not support Flipper.
-
 - _LogBox_: The LogBox error/warning display (which replaced YellowBox in 0.63) is working as expected on TV platforms, after a few adjustments to make the controls accessible to the focus engine.
 
 - _Dev Menu support_: On the Apple TV simulator, cmd-D will bring up the developer menu, just like on iOS. To bring it up on a real Apple TV device, make a long press on the play/pause button on the remote. (Please do not shake the Apple TV device, that will not work :) ). Android TV dev menu behavior is the same as on Android phone.
@@ -259,7 +271,7 @@ class Game2048 extends React.Component {
   - `enableTVPanGesture`/`disableTVPanGesture`: Methods to enable and disable detection of finger touches that pan across the touch surface of the Siri remote. See `TVEventHandlerExample` in the `RNTester` app for a demo.
   - `enableGestureHandlersCancelTouches`/`disableGestureHandlersCancelTouches`: Methods to turn on and turn off cancellation of touches by the gesture handlers in `RCTTVRemoteHandler` (see #366). Cancellation of touches is turned on (enabled) by default in 0.69 and earlier releases.
 
-- Accessibility: We have an additional `accessibilityFocus` [accessibility action](https://reactnative.dev/docs/accessibility#accessibility-actions) on Android that you can use for detecting focus changes on every *accessible* element (like a regular `Text`) when `TalkBack` is enabled.
+- _Accessibility_: We have an additional `accessibilityFocus` [accessibility action](https://reactnative.dev/docs/accessibility#accessibility-actions) on Android that you can use for detecting focus changes on every *accessible* element (like a regular `Text`) when `TalkBack` is enabled.
 
 - _TVFocusGuideView_: This component provides support for Apple's `UIFocusGuide` API and is implemented in the same way for Android TV, to help ensure that focusable controls can be navigated to, even if they are not directly in line with other controls.  An example is provided in `RNTester` that shows two different ways of using this component.
 

package/React/Base/RCTBridge.mm

@@ -20,6 +20,8 @@
 #import <jsinspector-modern/ReactCdp.h>
 #import <optional>
 #import "RCTDevLoadingViewProtocol.h"
+#import "RCTInspectorNetworkHelper.h"
+#import "RCTInspectorUtils.h"
 #import "RCTJSThread.h"
 #import "RCTLog.h"
 #import "RCTModuleData.h"
@@ -181,14 +183,23 @@ void RCTUIManagerSetDispatchAccessibilityManagerInitOntoMain(BOOL enabled)
 class RCTBridgeHostTargetDelegate : public facebook::react::jsinspector_modern::HostTargetDelegate {
  public:
   RCTBridgeHostTargetDelegate(RCTBridge *bridge)
-      : bridge_(bridge), pauseOverlayController_([[RCTPausedInDebuggerOverlayController alloc] init])
+      : bridge_(bridge),
+        pauseOverlayController_([[RCTPausedInDebuggerOverlayController alloc] init]),
+        networkHelper_([[RCTInspectorNetworkHelper alloc] init])
   {
   }
 
   facebook::react::jsinspector_modern::HostTargetMetadata getMetadata() override
   {
+    auto metadata = [RCTInspectorUtils getHostMetadata];
+
     return {
+        .appDisplayName = [metadata.appDisplayName UTF8String],
+        .appIdentifier = [metadata.appIdentifier UTF8String],
+        .deviceName = [metadata.deviceName UTF8String],
         .integrationName = "iOS Bridge (RCTBridge)",
+        .platform = [metadata.platform UTF8String],
+        .reactNativeVersion = [metadata.reactNativeVersion UTF8String],
     };
   }
 
@@ -221,9 +232,16 @@ class RCTBridgeHostTargetDelegate : public facebook::react::jsinspector_modern::
     }
   }
 
+  void loadNetworkResource(const RCTInspectorLoadNetworkResourceRequest &params, RCTInspectorNetworkExecutor executor)
+      override
+  {
+    [networkHelper_ loadNetworkResourceWithParams:params executor:executor];
+  }
+
  private:
   __weak RCTBridge *bridge_;
   RCTPausedInDebuggerOverlayController *pauseOverlayController_;
+  RCTInspectorNetworkHelper *networkHelper_;
 };
 
 @interface RCTBridge () <RCTReloadListener>
@@ -454,7 +472,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
         });
     __weak RCTBridge *weakSelf = self;
     _inspectorPageId = facebook::react::jsinspector_modern::getInspectorInstance().addPage(
-        "React Native Bridge (Experimental)",
+        "React Native Bridge",
         /* vm */ "",
         [weakSelf](std::unique_ptr<facebook::react::jsinspector_modern::IRemoteConnection> remote)
             -> std::unique_ptr<facebook::react::jsinspector_modern::ILocalConnection> {

package/React/Base/RCTBundleURLProvider.h

@@ -126,6 +126,7 @@ NS_ASSUME_NONNULL_BEGIN
  * - modulesOnly: When true, will only send module definitions without polyfills and without the require-runtime.
  * - runModule: When true, will run the main module after defining all modules. This is used in the main bundle but not
  *     in split bundles.
+ * - additionalOptions: A dictionary of name-value pairs of additional options to pass to the packager.
  */
 + (NSURL *__nullable)jsBundleURLForBundleRoot:(NSString *)bundleRoot
                                  packagerHost:(NSString *)packagerHost
@@ -133,6 +134,13 @@ NS_ASSUME_NONNULL_BEGIN
                            enableMinification:(BOOL)enableMinification
                               inlineSourceMap:(BOOL)inlineSourceMap;
 
++ (NSURL *__nullable)jsBundleURLForBundleRoot:(NSString *)bundleRoot
+                                 packagerHost:(NSString *)packagerHost
+                                    enableDev:(BOOL)enableDev
+                           enableMinification:(BOOL)enableMinification
+                              inlineSourceMap:(BOOL)inlineSourceMap
+                            additionalOptions:(NSDictionary<NSString *, NSString *> *__nullable)additionalOptions;
+
 + (NSURL *__nullable)jsBundleURLForBundleRoot:(NSString *)bundleRoot
                                  packagerHost:(NSString *)packagerHost
                                packagerScheme:(NSString *__nullable)scheme
@@ -141,6 +149,17 @@ NS_ASSUME_NONNULL_BEGIN
                               inlineSourceMap:(BOOL)inlineSourceMap
                                   modulesOnly:(BOOL)modulesOnly
                                     runModule:(BOOL)runModule;
+
++ (NSURL *__nullable)jsBundleURLForBundleRoot:(NSString *)bundleRoot
+                                 packagerHost:(NSString *)packagerHost
+                               packagerScheme:(NSString *__nullable)scheme
+                                    enableDev:(BOOL)enableDev
+                           enableMinification:(BOOL)enableMinification
+                              inlineSourceMap:(BOOL)inlineSourceMap
+                                  modulesOnly:(BOOL)modulesOnly
+                                    runModule:(BOOL)runModule
+                            additionalOptions:(NSDictionary<NSString *, NSString *> *__nullable)additionalOptions;
+
 /**
  * Given a hostname for the packager and a resource path (including "/"), return the URL to the resource.
  * In general, please use the instance method to decide if the packager is running and fallback to the pre-packaged

package/React/Base/RCTBundleURLProvider.mm

@@ -260,7 +260,26 @@ static NSURL *serverRootWithHostPort(NSString *hostPort, NSString *scheme)
                      enableMinification:enableMinification
                         inlineSourceMap:inlineSourceMap
                             modulesOnly:NO
-                              runModule:YES];
+                              runModule:YES
+                      additionalOptions:nil];
+}
+
++ (NSURL *__nullable)jsBundleURLForBundleRoot:(NSString *)bundleRoot
+                                 packagerHost:(NSString *)packagerHost
+                                    enableDev:(BOOL)enableDev
+                           enableMinification:(BOOL)enableMinification
+                              inlineSourceMap:(BOOL)inlineSourceMap
+                            additionalOptions:(NSDictionary<NSString *, NSString *> *__nullable)additionalOptions
+{
+  return [self jsBundleURLForBundleRoot:bundleRoot
+                           packagerHost:packagerHost
+                         packagerScheme:nil
+                              enableDev:enableDev
+                     enableMinification:enableMinification
+                        inlineSourceMap:inlineSourceMap
+                            modulesOnly:NO
+                              runModule:YES
+                      additionalOptions:additionalOptions];
 }
 
 + (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot
@@ -271,10 +290,31 @@ static NSURL *serverRootWithHostPort(NSString *hostPort, NSString *scheme)
                     inlineSourceMap:(BOOL)inlineSourceMap
                         modulesOnly:(BOOL)modulesOnly
                           runModule:(BOOL)runModule
+{
+  return [self jsBundleURLForBundleRoot:bundleRoot
+                           packagerHost:packagerHost
+                         packagerScheme:nil
+                              enableDev:enableDev
+                     enableMinification:enableMinification
+                        inlineSourceMap:inlineSourceMap
+                            modulesOnly:modulesOnly
+                              runModule:runModule
+                      additionalOptions:nil];
+}
+
++ (NSURL *__nullable)jsBundleURLForBundleRoot:(NSString *)bundleRoot
+                                 packagerHost:(NSString *)packagerHost
+                               packagerScheme:(NSString *__nullable)scheme
+                                    enableDev:(BOOL)enableDev
+                           enableMinification:(BOOL)enableMinification
+                              inlineSourceMap:(BOOL)inlineSourceMap
+                                  modulesOnly:(BOOL)modulesOnly
+                                    runModule:(BOOL)runModule
+                            additionalOptions:(NSDictionary<NSString *, NSString *> *__nullable)additionalOptions
 {
   NSString *path = [NSString stringWithFormat:@"/%@.bundle", bundleRoot];
   BOOL lazy = enableDev;
-  NSArray<NSURLQueryItem *> *queryItems = @[
+  NSMutableArray<NSURLQueryItem *> *queryItems = [[NSMutableArray alloc] initWithArray:@[
     [[NSURLQueryItem alloc] initWithName:@"platform" value:RCTPlatformName],
     [[NSURLQueryItem alloc] initWithName:@"dev" value:enableDev ? @"true" : @"false"],
     [[NSURLQueryItem alloc] initWithName:@"lazy" value:lazy ? @"true" : @"false"],
@@ -282,19 +322,33 @@ static NSURL *serverRootWithHostPort(NSString *hostPort, NSString *scheme)
     [[NSURLQueryItem alloc] initWithName:@"inlineSourceMap" value:inlineSourceMap ? @"true" : @"false"],
     [[NSURLQueryItem alloc] initWithName:@"modulesOnly" value:modulesOnly ? @"true" : @"false"],
     [[NSURLQueryItem alloc] initWithName:@"runModule" value:runModule ? @"true" : @"false"],
-  ];
+  ]];
   auto &inspectorFlags = facebook::react::jsinspector_modern::InspectorFlags::getInstance();
   if (inspectorFlags.getFuseboxEnabled()) {
-    queryItems = [queryItems arrayByAddingObject:[[NSURLQueryItem alloc] initWithName:@"excludeSource" value:@"true"]];
-    queryItems = [queryItems arrayByAddingObject:[[NSURLQueryItem alloc] initWithName:@"sourcePaths"
-                                                                                value:@"url-server"]];
+    [queryItems addObject:[[NSURLQueryItem alloc] initWithName:@"excludeSource" value:@"true"]];
+    [queryItems addObject:[[NSURLQueryItem alloc] initWithName:@"sourcePaths" value:@"url-server"]];
   }
 
   NSString *bundleID = [[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString *)kCFBundleIdentifierKey];
   if (bundleID) {
-    queryItems = [queryItems arrayByAddingObject:[[NSURLQueryItem alloc] initWithName:@"app" value:bundleID]];
+    [queryItems addObject:[[NSURLQueryItem alloc] initWithName:@"app" value:bundleID]];
+  }
+
+  if (additionalOptions) {
+    for (NSString *key in additionalOptions) {
+      NSString *value = [additionalOptions objectForKey:key];
+      if (!value) {
+        NSLog(@"RCTBundleURLProvider: Ignoring the additional option: '%@' due to nil value.", key);
+        continue;
+      }
+      [queryItems addObject:[[NSURLQueryItem alloc] initWithName:key value:value]];
+    }
   }
-  return [[self class] resourceURLForResourcePath:path packagerHost:packagerHost scheme:scheme queryItems:queryItems];
+
+  return [[self class] resourceURLForResourcePath:path
+                                     packagerHost:packagerHost
+                                           scheme:scheme
+                                       queryItems:[queryItems copy]];
 }
 
 + (NSURL *)resourceURLForResourcePath:(NSString *)path

package/React/Base/RCTConvert.h

@@ -94,9 +94,6 @@ typedef NSURL RCTFileURL;
 #endif
 
 + (UIViewContentMode)UIViewContentMode:(id)json;
-#if !TARGET_OS_TV
-+ (UIBarStyle)UIBarStyle:(id)json __deprecated;
-#endif
 
 + (RCTCursor)RCTCursor:(id)json;
 

package/React/Base/RCTConvert.mm

@@ -564,19 +564,6 @@ RCT_ENUM_CONVERTER(
     UIViewContentModeScaleAspectFill,
     integerValue)
 
-#if !TARGET_OS_TV
-RCT_ENUM_CONVERTER(
-    UIBarStyle,
-    (@{
-      @"default" : @(UIBarStyleDefault),
-      @"black" : @(UIBarStyleBlack),
-      @"blackOpaque" : @(UIBarStyleBlackOpaque),
-      @"blackTranslucent" : @(UIBarStyleBlackTranslucent),
-    }),
-    UIBarStyleDefault,
-    integerValue)
-#endif
-
 RCT_ENUM_CONVERTER(
     RCTCursor,
     (@{

package/React/Base/RCTKeyCommands.m

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

package/React/Base/RCTVersion.m

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

package/React/CoreModules/RCTAppearance.mm

@@ -70,8 +70,13 @@ NSString *RCTColorSchemePreference(UITraitCollection *traitCollection)
     return appearances[@(traitCollection.userInterfaceStyle)];
   }
 
+  if (!traitCollection) {
+    traitCollection = [UITraitCollection currentTraitCollection];
+  }
+
   UIUserInterfaceStyle systemStyle = sUseKeyWindowForSystemStyle ? RCTKeyWindow().traitCollection.userInterfaceStyle
                                                                  : traitCollection.userInterfaceStyle;
+
   return appearances[@(systemStyle)] ?: RCTAppearanceColorSchemeLight;
 }
 

package/React/CoreModules/RCTDevLoadingView.mm

@@ -119,8 +119,13 @@ RCT_EXPORT_MODULE()
       CGFloat windowWidth = window.bounds.size.width;
 
       self->_window = [[UIWindow alloc] initWithWindowScene:window.windowScene];
+#if TARGET_OS_MACCATALYST
+      self->_window.frame = CGRectMake(0, window.safeAreaInsets.top, windowWidth, 20);
+      self->_label = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, windowWidth, 20)];
+#else
       self->_window.frame = CGRectMake(0, 0, windowWidth, window.safeAreaInsets.top + 10);
       self->_label = [[UILabel alloc] initWithFrame:CGRectMake(0, window.safeAreaInsets.top - 10, windowWidth, 20)];
+#endif
       [self->_window addSubview:self->_label];
 
 #if TARGET_OS_TV

package/React/CoreModules/RCTDevMenu.mm

@@ -272,7 +272,7 @@ RCT_EXPORT_MODULE()
       BOOL isDisconnected = RCTInspectorDevServerHelper.isPackagerDisconnected;
       NSString *title = isDisconnected
           ? [NSString stringWithFormat:@"Connect to %@ to debug JavaScript", RCT_PACKAGER_NAME]
-          : @"Open Debugger";
+          : @"Open DevTools";
       RCTDevMenuItem *item = [RCTDevMenuItem
           buttonItemWithTitle:title
                       handler:^{

package/React/CoreModules/RCTDeviceInfo.mm

@@ -27,8 +27,8 @@ using namespace facebook::react;
 @implementation RCTDeviceInfo {
 #if !TARGET_OS_TV
   UIInterfaceOrientation _currentInterfaceOrientation;
-  NSDictionary *_currentInterfaceDimensions;
 #endif
+  NSDictionary *_currentInterfaceDimensions;
   BOOL _isFullscreen;
   BOOL _invalidated;
 }
@@ -54,11 +54,9 @@ RCT_EXPORT_MODULE()
                                                name:RCTAccessibilityManagerDidUpdateMultiplierNotification
                                              object:[_moduleRegistry moduleForName:"AccessibilityManager"]];
 
-#if !TARGET_OS_TV
-  _currentInterfaceOrientation = [RCTSharedApplication() statusBarOrientation];
-
   _currentInterfaceDimensions = [self _exportedDimensions];
 
+#if !TARGET_OS_TV
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(interfaceOrientationDidChange)
                                                name:UIApplicationDidBecomeActiveNotification
@@ -73,10 +71,17 @@ RCT_EXPORT_MODULE()
                                            selector:@selector(interfaceFrameDidChange)
                                                name:RCTWindowFrameDidChangeNotification
                                              object:nil];
+#endif
+
+#if TARGET_OS_IOS
+
+  _currentInterfaceOrientation = RCTKeyWindow().windowScene.interfaceOrientation;
+
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(interfaceFrameDidChange)
                                                name:UIDeviceOrientationDidChangeNotification
                                              object:nil];
+#endif
 
   // TODO T175901725 - Registering the RCTDeviceInfo module to the notification is a short-term fix to unblock 0.73
   // The actual behavior should be that the module is properly registered in the TurboModule/Bridge infrastructure
@@ -87,8 +92,6 @@ RCT_EXPORT_MODULE()
                                            selector:@selector(invalidate)
                                                name:RCTBridgeWillInvalidateModulesNotification
                                              object:nil];
-
-#endif
 }
 
 - (void)invalidate
@@ -114,7 +117,7 @@ RCT_EXPORT_MODULE()
 
   [[NSNotificationCenter defaultCenter] removeObserver:self name:RCTBridgeWillInvalidateModulesNotification object:nil];
 
-#if !TARGET_OS_TV
+#if TARGET_OS_IOS
   [[NSNotificationCenter defaultCenter] removeObserver:self name:UIDeviceOrientationDidChangeNotification object:nil];
 #endif
 }
@@ -124,12 +127,14 @@ static BOOL RCTIsIPhoneNotched()
   static BOOL isIPhoneNotched = NO;
   static dispatch_once_t onceToken;
 
+#if TARGET_OS_IOS
   dispatch_once(&onceToken, ^{
     RCTAssertMainQueue();
 
     // 20pt is the top safeArea value in non-notched devices
     isIPhoneNotched = RCTSharedApplication().keyWindow.safeAreaInsets.top > 20;
   });
+#endif
 
   return isIPhoneNotched;
 }
@@ -215,8 +220,9 @@ static NSDictionary *RCTExportedDimensions(CGFloat fontScale)
 
 - (void)_interfaceOrientationDidChange
 {
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
   UIApplication *application = RCTSharedApplication();
-  UIInterfaceOrientation nextOrientation = [application statusBarOrientation];
+  UIInterfaceOrientation nextOrientation = RCTKeyWindow().windowScene.interfaceOrientation;
 
   BOOL isRunningInFullScreen =
       CGRectEqualToRect(application.delegate.window.frame, application.delegate.window.screen.bounds);
@@ -244,6 +250,7 @@ static NSDictionary *RCTExportedDimensions(CGFloat fontScale)
     _isFullscreen = isRunningInFullScreen;
 #pragma clang diagnostic pop
   }
+#endif
 }
 
 - (void)interfaceFrameDidChange

package/React/CoreModules/RCTPerfMonitor.mm

@@ -171,23 +171,15 @@ RCT_EXPORT_MODULE()
 - (UIView *)container
 {
   if (!_container) {
-#if TARGET_OS_TV
-    int statusBarHeight = 0;
-#else
-    CGSize statusBarSize = RCTSharedApplication().statusBarFrame.size;
-    CGFloat statusBarHeight = statusBarSize.height;
-#endif
-    _container = [[UIView alloc] initWithFrame:CGRectMake(10, statusBarHeight, 180, RCTPerfMonitorBarHeight)];
+    UIEdgeInsets safeInsets = RCTKeyWindow().safeAreaInsets;
+
+    _container =
+        [[UIView alloc] initWithFrame:CGRectMake(safeInsets.left, safeInsets.top, 180, RCTPerfMonitorBarHeight)];
     _container.layer.borderWidth = 2;
     _container.layer.borderColor = [UIColor lightGrayColor].CGColor;
     [_container addGestureRecognizer:self.gestureRecognizer];
     [_container addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tap)]];
 
-    _container.backgroundColor = [UIColor whiteColor];
-
-#if !TARGET_OS_TV
-    _container.backgroundColor = [UIColor systemBackgroundColor];
-#endif
   }
 
   return _container;
@@ -455,7 +447,9 @@ RCT_EXPORT_MODULE()
 {
   [self loadPerformanceLoggerData];
   if (CGRectIsEmpty(_storedMonitorFrame)) {
-    _storedMonitorFrame = CGRectMake(0, 20, self.container.window.frame.size.width, RCTPerfMonitorExpandHeight);
+    UIEdgeInsets safeInsets = RCTKeyWindow().safeAreaInsets;
+    _storedMonitorFrame =
+        CGRectMake(safeInsets.left, safeInsets.top, self.container.window.frame.size.width, RCTPerfMonitorExpandHeight);
     [self.container addSubview:self.metrics];
   } else {
     [_metrics reloadData];

package/React/CoreModules/RCTRedBox.mm

@@ -221,7 +221,11 @@
 
 - (NSInteger)bottomSafeViewHeight
 {
+#if TARGET_OS_MACCATALYST
+  return 0;
+#else
   return RCTSharedApplication().delegate.window.safeAreaInsets.bottom;
+#endif
 }
 
 RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)

package/React/CoreModules/RCTStatusBarManager.mm

@@ -143,7 +143,7 @@ RCT_EXPORT_METHOD(getHeight : (RCTResponseSenderBlock)callback)
 RCT_EXPORT_METHOD(getHeight : (RCTResponseSenderBlock)callback)
 {
   callback(@[ @{
-    @"height" : @(RCTSharedApplication().statusBarFrame.size.height),
+    @"height" : @(RCTUIStatusBarManager().statusBarFrame.size.height),
   } ]);
 }
 
@@ -182,7 +182,11 @@ RCT_EXPORT_METHOD(setHidden : (BOOL)hidden withAnimation : (NSString *)withAnima
 RCT_EXPORT_METHOD(setNetworkActivityIndicatorVisible : (BOOL)visible)
 {
   dispatch_async(dispatch_get_main_queue(), ^{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+    // This is no longer supported in iOS 13 and later. We will remove this method in a future release.
     RCTSharedApplication().networkActivityIndicatorVisible = visible;
+#pragma clang diagnostic pop
   });
 }
 

package/React/CoreModules/React-CoreModules.podspec

@@ -19,7 +19,9 @@ end
 folly_config = get_folly_config()
 folly_compiler_flags = folly_config[:compiler_flags]
 folly_version = folly_config[:version]
-socket_rocket_version = '0.7.0'
+
+socket_rocket_config = get_socket_rocket_config()
+socket_rocket_version = socket_rocket_config[:version] 
 
 header_search_paths = [
   "\"$(PODS_ROOT)/boost\"",

package/React/CxxBridge/NSDataBigString.mm

@@ -9,33 +9,10 @@
 
 namespace facebook::react {
 
-static NSData *ensureNullTerminated(NSData *source)
-{
-  if (!source || source.length == 0) {
-    return nil;
-  }
-
-  NSUInteger sourceLength = source.length;
-  unsigned char lastByte;
-  [source getBytes:&lastByte range:NSMakeRange(sourceLength - 1, 1)];
-
-  // TODO: bundles from the packager should always include a NULL byte
-  // or we should we relax this requirement and only read as much from the
-  // buffer as length indicates
-  if (lastByte == '\0') {
-    return source;
-  } else {
-    NSMutableData *data = [source mutableCopy];
-    unsigned char nullByte = '\0';
-    [data appendBytes:&nullByte length:1];
-    return data;
-  }
-}
-
 NSDataBigString::NSDataBigString(NSData *data)
 {
-  m_data = ensureNullTerminated(data);
-  m_length = MAX([m_data length], 1) - 1;
+  m_data = data;
+  m_length = [m_data length];
 }
 
 } // namespace facebook::react