react-native-tvos 0.74.3-0 → 0.75.2-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.74.0-0 release of this package will be derived from the 0.74.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.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 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`
 
@@ -27,12 +27,10 @@ As of the 0.71 release, Hermes is fully working on both Apple TV and Android TV,
 
 ### 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. Some components (TVTextScrollView, TabBarIOS) have not been reimplemented in the new architecture so they will show up as an "unimplemented component".
+- _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.
 
-As of the 0.74 release, bridgeless is the default when Fabric is enabled.
-
-Known issue: The `TVFocusGuide` `autofocus` API has problems on Apple TV when bridgeless 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`:
+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`:
 
 ```objc
 - (BOOL)bridgelessEnabled
@@ -63,43 +61,83 @@ Minimum operating system versions:
 - _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.
 - _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)_ Project creation using the Expo CLI
+## _(New)_ TV project creation in React Native 0.75 and later
 
-> _Pitfall:_ 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`.
+> _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`.
 
 We strongly recommend [Yarn](https://classic.yarnpkg.com/en/docs/install) as the package manager.
-You should install `yarn` globally, as it should be used instead of `npm` for working in React Native projects.
 
-To create a new project, use `yarn create react-native-app` as shown below. (This will install the Expo tool `create-react-native-app` for you if it is not already present.)
+### Using the Expo SDK with TV apps
+
+As of React Native version 0.75.x, the core team [recommends Expo for new projects](https://reactnative.dev/docs/environment-setup).
+
+See the [Building Expo apps for TV](https://docs.expo.dev/guides/building-for-tv/) guide from Expo for details on how to set up a new Expo project, including supported Expo modules and limitations.
+
+Using Expo's [continuous native generation (CNG)](https://docs.expo.dev/workflow/continuous-native-generation/) model, projects created this way can be used to build either mobile or TV apps, taking advantage of the full support for both mobile and TV platforms in this repo.
+
+### Project creation using the React Native Community CLI
+
+As of React Native 0.75.x, the template that used to reside in the `react-native` core package has been moved to a [new community repo](https://github.com/react-native-community/template) and will be maintained there. To support developers that wish to continue using the community CLI, we have created a [new TV template repository](https://github.com/react-native-tvos/template-tv) and will maintain a TV port of this template.
 
-New projects created this way will automatically have properly configured iPhone and Apple TV targets created in their XCode projects, and will have the Android manifest correctly configured for both Android phone and Android TV.  New projects are set up to use the Expo CLI; the Expo dependency and `react-native.config.js` are included in the new app template.
+> _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:
 
 ```sh
-# Init an app called 'TestApp', note that you must not be in a node module (directory with node_modules sub-directory) for this to work
-yarn create react-native-app TestApp --template https://github.com/react-native-tvos/react-native-template-typescript-tv/tree/tv-release-0.73.0 --template-path template
-cd TestApp
+# 
+# Init an app called 'TVTest', note that you must not be in a node module (directory with node_modules sub-directory) for this to work
+$ npx @react-native-community/cli@latest init TVTest --template @react-native-tvos/template-tv
+                                                          
+               ######                ######               
+             ###     ####        ####     ###             
+            ##          ###    ###          ##            
+            ##             ####             ##            
+            ##             ####             ##            
+            ##           ##    ##           ##            
+            ##         ###      ###         ##            
+             ##  ########################  ##             
+          ######    ###            ###    ######          
+      ###     ##    ##              ##    ##     ###      
+   ###         ## ###      ####      ### ##         ###   
+  ##           ####      ########      ####           ##  
+ ##             ###     ##########     ###             ## 
+  ##           ####      ########      ####           ##  
+   ###         ## ###      ####      ### ##         ###   
+      ###     ##    ##              ##    ##     ###      
+          ######    ###            ###    ######          
+             ##  ########################  ##             
+            ##         ###      ###         ##            
+            ##           ##    ##           ##            
+            ##             ####             ##            
+            ##             ####             ##            
+            ##          ###    ###          ##            
+             ###     ####        ####     ###             
+               ######                ######               
+                                                          
+
+              Welcome to React Native 0.75.2!                
+                 Learn once, write anywhere               
+
+✔ Downloading template
+✔ Copying template
+✔ Processing template
+✔ Installing dependencies
+✔ Do you want to install CocoaPods now? Only needed if you run your project in Xcode directly … yes
+✔ Installing Ruby Gems
+✔ Installing CocoaPods dependencies  (this may take a few minutes)
+.
+.
+.
+$ cd TVTest
 # Now build and start the app in the tvOS Simulator - this will only work on a macOS machine.
-# This command can also be run via "yarn tvos".
-npx expo run:ios --scheme MyApp-tvOS --device "Apple TV"
-# You can also build and start the app on an iOS phone simulator.
-# This command can also be run via "yarn ios".
-npx expo run:ios
-# or specify a simulator:
-npx expo run:ios --scheme MyApp --device "iPhone 15"
-# This command builds and starts the app in an Android TV emulator or a phone emulator (needs to be created in advance).
-# This command can also be run via "yarn android".
-npx expo run:android --device tv_api_31
+npx react-native run-ios --simulator "Apple TV"
+# This command builds and starts the app in an Android TV emulator (needs to be created in advance).
+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.)
 
-## _(New)_ Using the Expo SDK with TV apps
-
-See the [Building Expo apps for TV](https://docs.expo.dev/guides/building-for-tv/) guide from Expo for details, including supported Expo modules and limitations.
-
-Expo SDK 50 or greater, and react-native-tvos 0.73.x or later, are required.
-
-## _(New)_ How to support TV specific file extensions
+## 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)
 
@@ -172,11 +210,10 @@ const TVEventHandlerView: () => React.Node = () => {
 // Class based component
 
 class Game2048 extends React.Component {
-  _tvEventHandler: any;
+  _tvEventHandlerSubscription: EventSubscription || undefined;
 
   _enableTVEventHandler() {
-    this._tvEventHandler = new TVEventHandler();
-    this._tvEventHandler.enable(this, function(cmp, evt) {
+    this._tvEventHandlerSubscription = TVEventHandler.addListener(function(evt) {
       if (evt && evt.eventType === 'right') {
         cmp.setState({board: cmp.state.board.move(2)});
       } else if(evt && evt.eventType === 'up') {
@@ -192,9 +229,9 @@ class Game2048 extends React.Component {
   }
 
   _disableTVEventHandler() {
-    if (this._tvEventHandler) {
-      this._tvEventHandler.disable();
-      delete this._tvEventHandler;
+    if (this._tvEventHandlerSubscription) {
+      this._tvEventHandlerSubscription.remove();
+      delete this._tvEventHandlerSubscription;
     }
   }
 
@@ -222,6 +259,8 @@ 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.
+
 - _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.
 
   | Prop | Value | Description | 
@@ -237,11 +276,9 @@ class Game2048 extends React.Component {
   
   - _TVTextScrollView_: On Apple TV, a ScrollView will not scroll unless there are focusable items inside it or above/below it.  This component wraps ScrollView and uses tvOS-specific native code to allow scrolling using swipe gestures from the remote control.
 
-- VirtualizedList: We extend `VirtualizedList` to make virtualization work well with focus management in mind. All of the improvements that we made are automatically available to all the VirtualizedList based components such as `FlatList`.
-  - Defaults
-    - VirtualizeList contents are automatically wrapped with a `TVFocusGuideView` with `trapFocus*` properties enabled depending on the orientation of the list. This default makes sure that focus doesn't leave the list accidentally due to a virtualization issue etc. until reaching the beginning or the end of the list.
-
-  New Props:
+  - _VirtualizedList_: We extend `VirtualizedList` to make virtualization work well with focus management in mind. All of the improvements that we made are automatically available to all the VirtualizedList based components such as `FlatList`.
+    - Defaults: VirtualizeList contents are automatically wrapped with a `TVFocusGuideView` with `trapFocus*` properties enabled depending on the orientation of the list. This default makes sure that focus doesn't leave the list accidentally due to a virtualization issue etc. until reaching the beginning or the end of the list.
+    - New Props:
 
   | Prop | Value | Description | 
   |---|---|---|

package/React/Base/RCTBridge+Inspector.h

@@ -18,7 +18,7 @@
  */
 @property (nonatomic, assign, readonly)
 #ifdef __cplusplus
-    facebook::react::jsinspector_modern::PageTarget *
+    facebook::react::jsinspector_modern::HostTarget *
 #else
     // The inspector infrastructure cannot be used in C or Swift code.
     void *

package/React/Base/RCTBridge.h

@@ -61,10 +61,6 @@ void RCTEnableFabricInteropLayer(BOOL enabled);
 BOOL RCTTurboModuleSyncVoidMethodsEnabled(void);
 void RCTEnableTurboModuleSyncVoidMethods(BOOL enabled);
 
-// Use a shared queue for executing module methods
-BOOL RCTTurboModuleSharedQueueEnabled(void);
-void RCTEnableTurboModuleSharedQueue(BOOL enabled);
-
 BOOL RCTUIManagerDispatchAccessibilityManagerInitOntoMain(void);
 void RCTUIManagerSetDispatchAccessibilityManagerInitOntoMain(BOOL enabled);
 

package/React/Base/RCTBridge.mm

@@ -23,6 +23,7 @@
 #import "RCTJSThread.h"
 #import "RCTLog.h"
 #import "RCTModuleData.h"
+#import "RCTPausedInDebuggerOverlayController.h"
 #import "RCTPerformanceLogger.h"
 #import "RCTProfile.h"
 #import "RCTReloadCommand.h"
@@ -166,18 +167,6 @@ void RCTEnableTurboModuleSyncVoidMethods(BOOL enabled)
   gTurboModuleEnableSyncVoidMethods = enabled;
 }
 
-// Use a shared queue for executing module methods
-static BOOL gTurboModuleEnableSharedQueue = NO;
-BOOL RCTTurboModuleSharedQueueEnabled(void)
-{
-  return gTurboModuleEnableSharedQueue;
-}
-
-void RCTEnableTurboModuleSharedQueue(BOOL enabled)
-{
-  gTurboModuleEnableSharedQueue = enabled;
-}
-
 BOOL kDispatchAccessibilityManagerInitOntoMain = NO;
 BOOL RCTUIManagerDispatchAccessibilityManagerInitOntoMain(void)
 {
@@ -189,9 +178,19 @@ void RCTUIManagerSetDispatchAccessibilityManagerInitOntoMain(BOOL enabled)
   kDispatchAccessibilityManagerInitOntoMain = enabled;
 }
 
-class RCTBridgePageTargetDelegate : public facebook::react::jsinspector_modern::PageTargetDelegate {
+class RCTBridgeHostTargetDelegate : public facebook::react::jsinspector_modern::HostTargetDelegate {
  public:
-  RCTBridgePageTargetDelegate(RCTBridge *bridge) : bridge_(bridge) {}
+  RCTBridgeHostTargetDelegate(RCTBridge *bridge)
+      : bridge_(bridge), pauseOverlayController_([[RCTPausedInDebuggerOverlayController alloc] init])
+  {
+  }
+
+  facebook::react::jsinspector_modern::HostTargetMetadata getMetadata() override
+  {
+    return {
+        .integrationName = "iOS Bridge (RCTBridge)",
+    };
+  }
 
   void onReload(const PageReloadRequest &request) override
   {
@@ -199,8 +198,32 @@ class RCTBridgePageTargetDelegate : public facebook::react::jsinspector_modern::
     [bridge_ reload];
   }
 
+  void onSetPausedInDebuggerMessage(const OverlaySetPausedInDebuggerMessageRequest &request) override
+  {
+    RCTAssertMainQueue();
+    if (!request.message.has_value()) {
+      [pauseOverlayController_ hide];
+    } else {
+      __weak RCTBridge *bridgeWeak = bridge_;
+      [pauseOverlayController_ showWithMessage:@(request.message.value().c_str())
+                                      onResume:^{
+                                        RCTAssertMainQueue();
+                                        RCTBridge *bridgeStrong = bridgeWeak;
+                                        if (!bridgeStrong) {
+                                          return;
+                                        }
+                                        if (!bridgeStrong.inspectorTarget) {
+                                          return;
+                                        }
+                                        bridgeStrong.inspectorTarget->sendCommand(
+                                            facebook::react::jsinspector_modern::HostCommand::DebuggerResume);
+                                      }];
+    }
+  }
+
  private:
   __weak RCTBridge *bridge_;
+  RCTPausedInDebuggerOverlayController *pauseOverlayController_;
 };
 
 @interface RCTBridge () <RCTReloadListener>
@@ -209,8 +232,8 @@ class RCTBridgePageTargetDelegate : public facebook::react::jsinspector_modern::
 @implementation RCTBridge {
   NSURL *_delegateBundleURL;
 
-  std::unique_ptr<RCTBridgePageTargetDelegate> _inspectorPageDelegate;
-  std::shared_ptr<facebook::react::jsinspector_modern::PageTarget> _inspectorTarget;
+  std::unique_ptr<RCTBridgeHostTargetDelegate> _inspectorHostDelegate;
+  std::shared_ptr<facebook::react::jsinspector_modern::HostTarget> _inspectorTarget;
   std::optional<int> _inspectorPageId;
 }
 
@@ -260,7 +283,7 @@ static RCTBridge *RCTCurrentBridgeInstance = nil;
     _bundleURL = bundleURL;
     _moduleProvider = block;
     _launchOptions = [launchOptions copy];
-    _inspectorPageDelegate = std::make_unique<RCTBridgePageTargetDelegate>(self);
+    _inspectorHostDelegate = std::make_unique<RCTBridgeHostTargetDelegate>(self);
 
     [self setUp];
   }
@@ -278,10 +301,20 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
   // NOTE: RCTCxxBridge will use _inspectorTarget during [self invalidate], so we must
   // keep it alive until after the call returns.
   [self invalidate];
+
+  // `invalidate` is asynchronous if we aren't on the main queue. Unregister
+  // the HostTarget on the main queue so that `invalidate` can complete safely
+  // in that case.
   if (_inspectorPageId.has_value()) {
-    facebook::react::jsinspector_modern::getInspectorInstance().removePage(*_inspectorPageId);
-    _inspectorPageId.reset();
-    _inspectorTarget.reset();
+    // Since we can't keep using `self` after dealloc, steal its inspector
+    // state into block-mutable variables
+    __block auto inspectorPageId = std::move(_inspectorPageId);
+    __block auto inspectorTarget = std::move(_inspectorTarget);
+    RCTExecuteOnMainQueue(^{
+      facebook::react::jsinspector_modern::getInspectorInstance().removePage(*inspectorPageId);
+      inspectorPageId.reset();
+      inspectorTarget.reset();
+    });
   }
 }
 
@@ -299,7 +332,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
 {
 #if RCT_ENABLE_INSPECTOR
   auto &inspectorFlags = facebook::react::jsinspector_modern::InspectorFlags::getInstance();
-  if (!inspectorFlags.getEnableModernCDPRegistry()) {
+  if (!inspectorFlags.getFuseboxEnabled()) {
     // Disable debugger to resume the JsVM & avoid thread locks while reloading
     [RCTInspectorDevServerHelper disableDebugger];
   }
@@ -412,9 +445,9 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
   [_performanceLogger markStartForTag:RCTPLTTI];
 
   auto &inspectorFlags = facebook::react::jsinspector_modern::InspectorFlags::getInstance();
-  if (inspectorFlags.getEnableModernCDPRegistry() && !_inspectorPageId.has_value()) {
+  if (inspectorFlags.getFuseboxEnabled() && !_inspectorPageId.has_value()) {
     _inspectorTarget =
-        facebook::react::jsinspector_modern::PageTarget::create(*_inspectorPageDelegate, [](auto callback) {
+        facebook::react::jsinspector_modern::HostTarget::create(*_inspectorHostDelegate, [](auto callback) {
           RCTExecuteOnMainQueue(^{
             callback();
           });
@@ -430,13 +463,9 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
             // This can happen if we're about to be dealloc'd. Reject the connection.
             return nullptr;
           }
-          return strongSelf->_inspectorTarget->connect(
-              std::move(remote),
-              {
-                  .integrationName = "iOS Bridge (RCTBridge)",
-              });
+          return strongSelf->_inspectorTarget->connect(std::move(remote));
         },
-        {.nativePageReloads = true});
+        {.nativePageReloads = true, .prefersFuseboxFrontend = true});
   }
 
   Class bridgeClass = self.bridgeClass;
@@ -527,7 +556,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
   [self.batchedBridge registerSegmentWithId:segmentId path:path];
 }
 
-- (facebook::react::jsinspector_modern::PageTarget *)inspectorTarget
+- (facebook::react::jsinspector_modern::HostTarget *)inspectorTarget
 {
   return _inspectorTarget.get();
 }

package/React/Base/RCTBridgeModule.h

@@ -283,12 +283,10 @@ RCT_EXTERN_C_END
 /**
  * Like RCT_EXTERN_MODULE, but allows setting a custom JavaScript name.
  */
-#define RCT_EXTERN_REMAP_MODULE(js_name, objc_name, objc_supername) \
-  objc_name:                                                        \
-  objc_supername @                                                  \
-  end @interface objc_name(RCTExternModule)<RCTBridgeModule>        \
-  @end                                                              \
-  @implementation objc_name (RCTExternModule)                       \
+#define RCT_EXTERN_REMAP_MODULE(js_name, objc_name, objc_supername)                      \
+  objc_name : objc_supername @end @interface objc_name(RCTExternModule)<RCTBridgeModule> \
+  @end                                                                                   \
+  @implementation objc_name (RCTExternModule)                                            \
   RCT_EXPORT_MODULE_NO_LOAD(js_name, objc_name)
 
 /**
@@ -370,6 +368,9 @@ RCT_EXTERN_C_END
 - (id)moduleForName:(const char *)moduleName;
 - (id)moduleForName:(const char *)moduleName lazilyLoadIfNecessary:(BOOL)lazilyLoad;
 - (BOOL)moduleIsInitialized:(Class)moduleClass;
+
+// Note: This method lazily load the module as necessary.
+- (id)moduleForClass:(Class)moduleClass;
 @end
 
 typedef UIView * (^RCTBridgelessComponentViewProvider)(NSNumber *);

package/React/Base/RCTBridgeModuleDecorator.m

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include "RCTBridgeModuleDecorator.h"
+#import "RCTBridgeModuleDecorator.h"
 
 @implementation RCTBridgeModuleDecorator
 

package/React/Base/RCTBundleManager.h

@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#import <Foundation/Foundation.h>
+
 @class RCTBridge;
 
 typedef NSURL * (^RCTBridgelessBundleURLGetter)(void);

package/React/Base/RCTBundleURLProvider.mm

@@ -12,6 +12,8 @@
 #import "RCTDefines.h"
 #import "RCTLog.h"
 
+#import <jsinspector-modern/InspectorFlags.h>
+
 NSString *const RCTBundleURLProviderUpdatedNotification = @"RCTBundleURLProviderUpdatedNotification";
 
 const NSUInteger kRCTBundleURLProviderDefaultPort = RCT_METRO_PORT;
@@ -281,6 +283,12 @@ static NSURL *serverRootWithHostPort(NSString *hostPort, NSString *scheme)
     [[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"]];
+  }
 
   NSString *bundleID = [[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString *)kCFBundleIdentifierKey];
   if (bundleID) {

package/React/Base/RCTCallInvoker.h

@@ -0,0 +1,27 @@
+/*
+ * 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 <Foundation/Foundation.h>
+
+#ifdef __cplusplus
+#import <ReactCommon/CallInvoker.h>
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RCTCallInvoker : NSObject
+
+#ifdef __cplusplus
+- (instancetype)initWithCallInvoker:(std::shared_ptr<facebook::react::CallInvoker>)callInvoker
+    NS_DESIGNATED_INITIALIZER;
+
+- (std::shared_ptr<facebook::react::CallInvoker>)callInvoker;
+#endif
+
+@end
+
+NS_ASSUME_NONNULL_END

package/React/Base/RCTCallInvoker.mm

@@ -0,0 +1,28 @@
+/*
+ * 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 "RCTCallInvoker.h"
+
+@implementation RCTCallInvoker {
+  std::shared_ptr<facebook::react::CallInvoker> _callInvoker;
+}
+
+- (instancetype)initWithCallInvoker:(std::shared_ptr<facebook::react::CallInvoker>)callInvoker
+{
+  if (self = [super init]) {
+    _callInvoker = callInvoker;
+  }
+
+  return self;
+}
+
+- (std::shared_ptr<facebook::react::CallInvoker>)callInvoker
+{
+  return _callInvoker;
+}
+
+@end

package/React/Base/RCTCallInvokerModule.h

@@ -0,0 +1,17 @@
+/*
+ * 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.
+ */
+
+@class RCTCallInvoker;
+
+/**
+ * Have your module conform to this protocol to access the CallInvoker.
+ */
+@protocol RCTCallInvokerModule <NSObject>
+
+@property (nonatomic, nullable, readwrite) RCTCallInvoker *callInvoker;
+
+@end

package/React/Base/RCTConvert.h

@@ -21,6 +21,15 @@
 #import <WebKit/WebKit.h>
 #endif
 
+typedef NS_ENUM(NSInteger, RCTColorSpace) {
+  RCTColorSpaceSRGB,
+  RCTColorSpaceDisplayP3,
+};
+
+// Change the default color space
+RCTColorSpace RCTGetDefaultColorSpace(void);
+RCT_EXTERN void RCTSetDefaultColorSpace(RCTColorSpace colorSpace);
+
 /**
  * This class provides a collection of conversion functions for mapping
  * JSON objects to native types and classes. These are useful when writing
@@ -73,6 +82,8 @@ typedef NSURL RCTFileURL;
 + (UIKeyboardAppearance)UIKeyboardAppearance:(id)json;
 + (UIReturnKeyType)UIReturnKeyType:(id)json;
 + (UIUserInterfaceStyle)UIUserInterfaceStyle:(id)json API_AVAILABLE(ios(12));
++ (UIModalPresentationStyle)UIModalPresentationStyle:(id)json;
+
 #if !TARGET_OS_TV
 + (UIInterfaceOrientationMask)UIInterfaceOrientationMask:(NSString *)orientation;
 + (UIDataDetectorTypes)UIDataDetectorTypes:(id)json;
@@ -100,6 +111,13 @@ typedef NSURL RCTFileURL;
 
 + (CGAffineTransform)CGAffineTransform:(id)json;
 
++ (UIColor *)UIColorWithRed:(CGFloat)red green:(CGFloat)green blue:(CGFloat)blue alpha:(CGFloat)alpha;
++ (UIColor *)UIColorWithRed:(CGFloat)red
+                      green:(CGFloat)green
+                       blue:(CGFloat)blue
+                      alpha:(CGFloat)alpha
+              andColorSpace:(RCTColorSpace)colorSpace;
++ (RCTColorSpace)RCTColorSpaceFromString:(NSString *)colorSpace;
 + (UIColor *)UIColor:(id)json;
 + (CGColorRef)CGColor:(id)json CF_RETURNS_NOT_RETAINED;