react-native-tvos 0.73.7-1 → 0.74.0-0

package/React/Base/RCTBridgeModule.h

@@ -11,6 +11,8 @@
 #import <React/RCTDefines.h>
 #import <React/RCTJSThread.h>
 
+#import <RCTDeprecation/RCTDeprecation.h>
+
 #import "RCTBundleManager.h"
 
 @class RCTBridge;
@@ -83,15 +85,15 @@ RCT_EXTERN_C_END
  * registration. Useful for registering swift classes that forbids use of load
  * Used in RCT_EXTERN_REMAP_MODULE
  */
-#define RCT_EXPORT_MODULE_NO_LOAD(js_name, objc_name)                           \
-  RCT_EXTERN void RCTRegisterModule(Class);                                     \
-  +(NSString *)moduleName                                                       \
-  {                                                                             \
-    return @ #js_name;                                                          \
-  }                                                                             \
-  __attribute__((constructor)) static void RCT_CONCAT(initialize_, objc_name)() \
-  {                                                                             \
-    RCTRegisterModule([objc_name class]);                                       \
+#define RCT_EXPORT_MODULE_NO_LOAD(js_name, objc_name)                               \
+  RCT_EXTERN void RCTRegisterModule(Class);                                         \
+  +(NSString *)moduleName                                                           \
+  {                                                                                 \
+    return @ #js_name;                                                              \
+  }                                                                                 \
+  __attribute__((constructor)) static void RCT_CONCAT(initialize_, objc_name)(void) \
+  {                                                                                 \
+    RCTRegisterModule([objc_name class]);                                           \
   }
 
 // Implemented by RCT_EXPORT_MODULE
@@ -146,30 +148,20 @@ RCT_EXTERN_C_END
  * To implement this in your module, just add `@synthesize bridge = _bridge;`
  * If using Swift, add `@objc var bridge: RCTBridge!` to your module.
  */
-@property (nonatomic, weak, readonly) RCTBridge *bridge;
+@property (nonatomic, weak, readonly) RCTBridge *bridge RCT_DEPRECATED;
 
 /**
- * The queue that will be used to call all exported methods. If omitted, this
- * will call on a default background queue, which is avoids blocking the main
- * thread.
- *
- * If the methods in your module need to interact with UIKit methods, they will
- * probably need to call those on the main thread, as most of UIKit is main-
- * thread-only. You can tell React Native to call your module methods on the
- * main thread by returning a reference to the main queue, like this:
- *
- * - (dispatch_queue_t)methodQueue
- * {
- *   return dispatch_get_main_queue();
- * }
- *
- * If you don't want to specify the queue yourself, but you need to use it
- * inside your class (e.g. if you have internal methods that need to dispatch
- * onto that queue), you can just add `@synthesize methodQueue = _methodQueue;`
- * and the bridge will populate the methodQueue property for you automatically
- * when it initializes the module.
+ * This property is deprecated. This selector used to support two functionalities.
+ *
+ * 1) Providing a queue to do additional async work.
+ * Instead of synthesizing this selector, retrieve a queue from GCD to do any asynchronous work.
+ * Example: _myQueue = dispatch_queue_create("myQueue", DISPATCH_QUEUE_SERIAL);
+ *
+ * 2) Overriding this in order to run all the module's methods on a specific queue, usually main.
+ * Instead of overriding this, directly dispatch the code onto main queue when necessary.
+ * Example: dispatch_async(dispatch_get_main_queue, ^{ ... });
  */
-@property (nonatomic, strong, readonly) dispatch_queue_t methodQueue;
+@property (nonatomic, strong, readonly) dispatch_queue_t methodQueue RCT_DEPRECATED;
 
 /**
  * Wrap the parameter line of your method implementation with this macro to
@@ -244,7 +236,7 @@ RCT_EXTERN_C_END
  */
 #define RCT_REMAP_METHOD(js_name, method)       \
   _RCT_EXTERN_REMAP_METHOD(js_name, method, NO) \
-  -(void)method RCT_DYNAMIC;
+  -(void)method RCT_DYNAMIC
 
 /**
  * Similar to RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD but lets you set
@@ -256,7 +248,7 @@ RCT_EXTERN_C_END
  */
 #define RCT_REMAP_BLOCKING_SYNCHRONOUS_METHOD(js_name, returnType, method) \
   _RCT_EXTERN_REMAP_METHOD(js_name, method, YES)                           \
-  -(returnType)method RCT_DYNAMIC;
+  -(returnType)method RCT_DYNAMIC
 
 /**
  * Use this macro in a private Objective-C implementation file to automatically

package/React/Base/RCTBridgeProxy+Cxx.h

@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+
+#ifdef __cplusplus
+#import <ReactCommon/CallInvoker.h>
+#endif
+
+#import "RCTBridgeProxy.h"
+
+@interface RCTBridgeProxy (Cxx)
+
+#ifdef __cplusplus
+@property (nonatomic, readwrite) std::shared_ptr<facebook::react::CallInvoker> jsCallInvoker;
+#endif
+
+@end

package/React/Base/RCTBridgeProxy.h

@@ -9,18 +9,23 @@
 
 #import "RCTBridgeModule.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @class RCTBundleManager;
 @class RCTCallableJSModules;
 @class RCTModuleRegistry;
 @class RCTViewRegistry;
 
 @interface RCTBridgeProxy : NSProxy
+
 - (instancetype)initWithViewRegistry:(RCTViewRegistry *)viewRegistry
                       moduleRegistry:(RCTModuleRegistry *)moduleRegistry
                        bundleManager:(RCTBundleManager *)bundleManager
                    callableJSModules:(RCTCallableJSModules *)callableJSModules
                   dispatchToJSThread:(void (^)(dispatch_block_t))dispatchToJSThread
-               registerSegmentWithId:(void (^)(NSNumber *, NSString *))registerSegmentWithId NS_DESIGNATED_INITIALIZER;
+               registerSegmentWithId:(void (^)(NSNumber *, NSString *))registerSegmentWithId
+                             runtime:(void *)runtime
+                       launchOptions:(nullable NSDictionary *)launchOptions NS_DESIGNATED_INITIALIZER;
 
 - (NSMethodSignature *)methodSignatureForSelector:(SEL)sel;
 - (void)forwardInvocation:(NSInvocation *)invocation;
@@ -33,4 +38,7 @@
  */
 - (id)moduleForClass:(Class)moduleClass;
 - (id)moduleForName:(NSString *)moduleName lazilyLoadIfNecessary:(BOOL)lazilyLoad;
+
 @end
+
+NS_ASSUME_NONNULL_END

package/React/Base/RCTBridgeProxy.mm

@@ -6,10 +6,13 @@
  */
 
 #import "RCTBridgeProxy.h"
+#import "RCTBridgeProxy+Cxx.h"
+
 #import <React/RCTBridge+Private.h>
 #import <React/RCTBridge.h>
 #import <React/RCTLog.h>
 #import <React/RCTUIManager.h>
+#import <ReactCommon/CallInvoker.h>
 #import <jsi/jsi.h>
 
 using namespace facebook;
@@ -21,13 +24,21 @@ using namespace facebook;
 - (void)forwardInvocation:(NSInvocation *)invocation;
 @end
 
+@interface RCTBridgeProxy ()
+
+@property (nonatomic, readwrite) std::shared_ptr<facebook::react::CallInvoker> jsCallInvoker;
+
+@end
+
 @implementation RCTBridgeProxy {
   RCTUIManagerProxy *_uiManagerProxy;
   RCTModuleRegistry *_moduleRegistry;
   RCTBundleManager *_bundleManager;
   RCTCallableJSModules *_callableJSModules;
+  NSDictionary *_launchOptions;
   void (^_dispatchToJSThread)(dispatch_block_t);
   void (^_registerSegmentWithId)(NSNumber *, NSString *);
+  void *_runtime;
 }
 
 - (instancetype)initWithViewRegistry:(RCTViewRegistry *)viewRegistry
@@ -36,15 +47,19 @@ using namespace facebook;
                    callableJSModules:(RCTCallableJSModules *)callableJSModules
                   dispatchToJSThread:(void (^)(dispatch_block_t))dispatchToJSThread
                registerSegmentWithId:(void (^)(NSNumber *, NSString *))registerSegmentWithId
+                             runtime:(void *)runtime
+                       launchOptions:(nullable NSDictionary *)launchOptions
 {
   self = [super self];
   if (self) {
-    self->_uiManagerProxy = [[RCTUIManagerProxy alloc] initWithViewRegistry:viewRegistry];
-    self->_moduleRegistry = moduleRegistry;
-    self->_bundleManager = bundleManager;
-    self->_callableJSModules = callableJSModules;
-    self->_dispatchToJSThread = dispatchToJSThread;
-    self->_registerSegmentWithId = registerSegmentWithId;
+    _uiManagerProxy = [[RCTUIManagerProxy alloc] initWithViewRegistry:viewRegistry];
+    _moduleRegistry = moduleRegistry;
+    _bundleManager = bundleManager;
+    _callableJSModules = callableJSModules;
+    _dispatchToJSThread = dispatchToJSThread;
+    _registerSegmentWithId = registerSegmentWithId;
+    _runtime = runtime;
+    _launchOptions = [launchOptions copy];
   }
   return self;
 }
@@ -75,10 +90,16 @@ using namespace facebook;
  * Used By:
  *  - RCTBlobCollector
  */
-- (jsi::Runtime *)runtime
+- (void *)runtime
 {
-  [self logWarning:@"This method is unsupported. Returning nullptr." cmd:_cmd];
-  return nullptr;
+  [self logWarning:@"Please migrate to C++ TurboModule or RuntimeExecutor." cmd:_cmd];
+  return _runtime;
+}
+
+- (std::shared_ptr<facebook::react::CallInvoker>)jsCallInvoker
+{
+  [self logWarning:@"Please migrate to RuntimeExecutor" cmd:_cmd];
+  return _jsCallInvoker;
 }
 
 /**
@@ -162,7 +183,7 @@ using namespace facebook;
 
 - (void)registerSegmentWithId:(NSUInteger)segmentId path:(NSString *)path
 {
-  self->_registerSegmentWithId(@(segmentId), path);
+  _registerSegmentWithId(@(segmentId), path);
 }
 
 - (id<RCTBridgeDelegate>)delegate
@@ -173,8 +194,7 @@ using namespace facebook;
 
 - (NSDictionary *)launchOptions
 {
-  [self logError:@"This method is not supported. Returning nil." cmd:_cmd];
-  return nil;
+  return _launchOptions;
 }
 
 - (BOOL)loading
@@ -411,8 +431,9 @@ using namespace facebook;
 {
   [self logWarning:@"Please migrate to RCTViewRegistry: @synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED."
                cmd:_cmd];
-  return [_viewRegistry viewForReactTag:reactTag] ? [_viewRegistry viewForReactTag:reactTag]
-                                                  : [_legacyViewRegistry objectForKey:reactTag];
+  UIView *view = [_viewRegistry viewForReactTag:reactTag] ? [_viewRegistry viewForReactTag:reactTag]
+                                                          : [_legacyViewRegistry objectForKey:reactTag];
+  return [RCTUIManager paperViewOrCurrentView:view];
 }
 
 - (void)addUIBlock:(RCTViewManagerUIBlock)block
@@ -425,7 +446,11 @@ using namespace facebook;
   RCTExecuteOnMainQueue(^{
     __typeof(self) strongSelf = weakSelf;
     if (strongSelf) {
-      block((RCTUIManager *)strongSelf, strongSelf->_legacyViewRegistry);
+      RCTUIManager *proxiedManager = (RCTUIManager *)strongSelf;
+      RCTComposedViewRegistry *composedViewRegistry =
+          [[RCTComposedViewRegistry alloc] initWithUIManager:proxiedManager
+                                                 andRegistry:strongSelf->_legacyViewRegistry];
+      block(proxiedManager, composedViewRegistry);
     }
   });
 }

package/React/Base/RCTBundleURLProvider.h

@@ -9,7 +9,7 @@
 
 #import "RCTDefines.h"
 
-RCT_EXTERN NSString *const RCTBundleURLProviderUpdatedNotification;
+RCT_EXTERN NSString *_Nonnull const RCTBundleURLProviderUpdatedNotification;
 RCT_EXTERN const NSUInteger kRCTBundleURLProviderDefaultPort;
 
 #if RCT_DEV_MENU | RCT_PACKAGER_LOADING_FUNCTIONALITY
@@ -22,6 +22,8 @@ RCT_EXTERN const NSUInteger kRCTBundleURLProviderDefaultPort;
 RCT_EXTERN void RCTBundleURLProviderAllowPackagerServerAccess(BOOL allowed);
 #endif
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface RCTBundleURLProvider : NSObject
 
 /**
@@ -52,52 +54,53 @@ RCT_EXTERN void RCTBundleURLProviderAllowPackagerServerAccess(BOOL allowed);
  * The port is optional, if not specified, kRCTBundleURLProviderDefaultPort will be used
  * The scheme is also optional, if not specified, a default http protocol will be used
  */
-+ (BOOL)isPackagerRunning:(NSString *)hostPort scheme:(NSString *)scheme;
++ (BOOL)isPackagerRunning:(NSString *)hostPort scheme:(NSString *__nullable)scheme;
 
 /**
  * Returns the jsBundleURL for a given bundle entrypoint and
  * the fallback offline JS bundle if the packager is not running.
  */
-- (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot fallbackURLProvider:(NSURL * (^)(void))fallbackURLProvider;
+- (NSURL *__nullable)jsBundleURLForBundleRoot:(NSString *)bundleRoot
+                          fallbackURLProvider:(NSURL *__nullable (^)(void))fallbackURLProvider;
 
 /**
  * Returns the jsBundleURL for a given split bundle entrypoint in development
  */
-- (NSURL *)jsBundleURLForSplitBundleRoot:(NSString *)bundleRoot;
+- (NSURL *__nullable)jsBundleURLForSplitBundleRoot:(NSString *)bundleRoot;
 
 /**
  * Returns the jsBundleURL for a given bundle entrypoint and
  * the fallback offline JS bundle if the packager is not running.
  * if extension is nil, "jsbundle" will be used.
  */
-- (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot fallbackExtension:(NSString *)extension;
+- (NSURL *__nullable)jsBundleURLForBundleRoot:(NSString *)bundleRoot fallbackExtension:(NSString *__nullable)extension;
 
 /**
  * Returns the jsBundleURL for a given bundle entrypoint and
  * the fallback offline JS bundle if the packager is not running.
  */
-- (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot;
+- (NSURL *__nullable)jsBundleURLForBundleRoot:(NSString *)bundleRoot;
 
 /**
  * Returns the jsBundleURL for a given bundle entrypoint and
  * the fallback offline JS bundle. If extension is nil,
  * "jsbundle" will be used.
  */
-- (NSURL *)jsBundleURLForFallbackExtension:(NSString *)extension;
+- (NSURL *__nullable)jsBundleURLForFallbackExtension:(NSString *__nullable)extension;
 
 /**
  * Returns the resourceURL for a given bundle entrypoint and
  * the fallback offline resource file if the packager is not running.
  */
-- (NSURL *)resourceURLForResourceRoot:(NSString *)root
-                         resourceName:(NSString *)name
-                    resourceExtension:(NSString *)extension
-                        offlineBundle:(NSBundle *)offlineBundle;
+- (NSURL *__nullable)resourceURLForResourceRoot:(NSString *)root
+                                   resourceName:(NSString *)name
+                              resourceExtension:(NSString *)extension
+                                  offlineBundle:(NSBundle *)offlineBundle;
 
 /**
  * The IP address or hostname of the packager.
  */
-@property (nonatomic, copy) NSString *jsLocation;
+@property (nonatomic, copy, nullable) NSString *jsLocation;
 
 @property (nonatomic, assign) BOOL enableMinification;
 @property (nonatomic, assign) BOOL enableDev;
@@ -119,41 +122,25 @@ RCT_EXTERN void RCTBundleURLProviderAllowPackagerServerAccess(BOOL allowed);
  * - enableDev: Whether to keep or remove `__DEV__` blocks from the bundle.
  * - enableMinification: Enables or disables minification. Usually production bundles are minified and development
  *     bundles are not.
+ * - inlineSourceMap: When true, the bundler will inline the source map in the bundle
  * - 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.
  */
-+ (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot
-                       packagerHost:(NSString *)packagerHost
-                          enableDev:(BOOL)enableDev
-                 enableMinification:(BOOL)enableMinification
-    __deprecated_msg(
-        "Use `jsBundleURLForBundleRoot:packagerHost:enableDev:enableMinification:inlineSourceMap:` instead");
-
-+ (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot
-                       packagerHost:(NSString *)packagerHost
-                     packagerScheme:(NSString *)scheme
-                          enableDev:(BOOL)enableDev
-                 enableMinification:(BOOL)enableMinification
-                        modulesOnly:(BOOL)modulesOnly
-                          runModule:(BOOL)runModule
-    __deprecated_msg(
-        "Use jsBundleURLForBundleRoot:packagerHost:enableDev:enableMinification:inlineSourceMap:modulesOnly:runModule:`  instead");
-
-+ (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot
-                       packagerHost:(NSString *)packagerHost
-                          enableDev:(BOOL)enableDev
-                 enableMinification:(BOOL)enableMinification
-                    inlineSourceMap:(BOOL)inlineSourceMap;
-
-+ (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot
-                       packagerHost:(NSString *)packagerHost
-                     packagerScheme:(NSString *)scheme
-                          enableDev:(BOOL)enableDev
-                 enableMinification:(BOOL)enableMinification
-                    inlineSourceMap:(BOOL)inlineSourceMap
-                        modulesOnly:(BOOL)modulesOnly
-                          runModule:(BOOL)runModule;
++ (NSURL *__nullable)jsBundleURLForBundleRoot:(NSString *)bundleRoot
+                                 packagerHost:(NSString *)packagerHost
+                                    enableDev:(BOOL)enableDev
+                           enableMinification:(BOOL)enableMinification
+                              inlineSourceMap:(BOOL)inlineSourceMap;
+
++ (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;
 /**
  * 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
@@ -161,8 +148,8 @@ RCT_EXTERN void RCTBundleURLProviderAllowPackagerServerAccess(BOOL allowed);
  */
 + (NSURL *)resourceURLForResourcePath:(NSString *)path
                          packagerHost:(NSString *)packagerHost
-                               scheme:(NSString *)scheme
-                                query:(NSString *)query
+                               scheme:(NSString *__nullable)scheme
+                                query:(NSString *__nullable)query
     __deprecated_msg("Use version with queryItems parameter instead");
 
 /**
@@ -173,6 +160,8 @@ RCT_EXTERN void RCTBundleURLProviderAllowPackagerServerAccess(BOOL allowed);
 + (NSURL *)resourceURLForResourcePath:(NSString *)path
                          packagerHost:(NSString *)packagerHost
                                scheme:(NSString *)scheme
-                           queryItems:(NSArray<NSURLQueryItem *> *)queryItems;
+                           queryItems:(NSArray<NSURLQueryItem *> *__nullable)queryItems;
 
 @end
+
+NS_ASSUME_NONNULL_END

package/React/Base/RCTBundleURLProvider.mm

@@ -245,27 +245,11 @@ static NSURL *serverRootWithHostPort(NSString *hostPort, NSString *scheme)
                                        queryItems:nil];
 }
 
-+ (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot
-                       packagerHost:(NSString *)packagerHost
-                          enableDev:(BOOL)enableDev
-                 enableMinification:(BOOL)enableMinification
-{
-  return [self jsBundleURLForBundleRoot:bundleRoot
-                           packagerHost:packagerHost
-                         packagerScheme:nil
-                              enableDev:enableDev
-                     enableMinification:enableMinification
-                        inlineSourceMap:NO
-                            modulesOnly:NO
-                              runModule:YES];
-}
-
 + (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot
                        packagerHost:(NSString *)packagerHost
                           enableDev:(BOOL)enableDev
                  enableMinification:(BOOL)enableMinification
                     inlineSourceMap:(BOOL)inlineSourceMap
-
 {
   return [self jsBundleURLForBundleRoot:bundleRoot
                            packagerHost:packagerHost
@@ -277,24 +261,6 @@ static NSURL *serverRootWithHostPort(NSString *hostPort, NSString *scheme)
                               runModule:YES];
 }
 
-+ (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot
-                       packagerHost:(NSString *)packagerHost
-                     packagerScheme:(NSString *)scheme
-                          enableDev:(BOOL)enableDev
-                 enableMinification:(BOOL)enableMinification
-                        modulesOnly:(BOOL)modulesOnly
-                          runModule:(BOOL)runModule
-{
-  return [self jsBundleURLForBundleRoot:bundleRoot
-                           packagerHost:packagerHost
-                         packagerScheme:nil
-                              enableDev:enableDev
-                     enableMinification:enableMinification
-                        inlineSourceMap:NO
-                            modulesOnly:modulesOnly
-                              runModule:runModule];
-}
-
 + (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot
                        packagerHost:(NSString *)packagerHost
                      packagerScheme:(NSString *)scheme

package/React/Base/RCTConstants.h

@@ -49,24 +49,12 @@ RCT_EXTERN NSString *const RCTDidInitializeModuleNotification;
 RCT_EXTERN BOOL RCTGetDispatchW3CPointerEvents(void);
 RCT_EXTERN void RCTSetDispatchW3CPointerEvents(BOOL value);
 
-/*
- * Validate RCTEventEmitter
- */
-RCT_EXTERN BOOL RCTGetValidateCanSendEventInRCTEventEmitter(void);
-RCT_EXTERN void RCTSetValidateCanSendEventInRCTEventEmitter(BOOL value);
-
 /*
  * Memory Pressure Unloading Level
  */
 RCT_EXTERN int RCTGetMemoryPressureUnloadLevel(void);
 RCT_EXTERN void RCTSetMemoryPressureUnloadLevel(int value);
 
-/*
- * Parse JS stack for unhandled JS errors caught in C++
- */
-RCT_EXTERN BOOL RCTGetParseUnhandledJSErrorStackNatively(void);
-RCT_EXTERN void RCTSetParseUnhandledJSErrorStackNatively(BOOL value);
-
 /*
  * Use native view configs in bridgeless mode
  */

package/React/Base/RCTConstants.m

@@ -36,21 +36,6 @@ void RCTSetDispatchW3CPointerEvents(BOOL value)
   RCTDispatchW3CPointerEvents = value;
 }
 
-/*
- * Validate RCTEventEmitter. For experimentation only.
- */
-static BOOL RCTValidateCanSendEventInRCTEventEmitter = NO;
-
-BOOL RCTGetValidateCanSendEventInRCTEventEmitter(void)
-{
-  return RCTValidateCanSendEventInRCTEventEmitter;
-}
-
-void RCTSetValidateCanSendEventInRCTEventEmitter(BOOL value)
-{
-  RCTValidateCanSendEventInRCTEventEmitter = value;
-}
-
 /*
  * Memory Pressure Unloading Level for experimentation only.
  * Default is 15, which is TRIM_MEMORY_RUNNING_CRITICAL.
@@ -67,22 +52,6 @@ void RCTSetMemoryPressureUnloadLevel(int value)
   RCTMemoryPressureUnloadLevel = value;
 }
 
-/*
- * In Bridge mode, parse the JS stack for unhandled JS errors, to display in RedBox.
- * When false (previous default behavior), a native stack is displayed in the RedBox.
- */
-static BOOL RCTParseUnhandledJSErrorStackNatively = NO;
-
-BOOL RCTGetParseUnhandledJSErrorStackNatively(void)
-{
-  return RCTParseUnhandledJSErrorStackNatively;
-}
-
-void RCTSetParseUnhandledJSErrorStackNatively(BOOL value)
-{
-  RCTParseUnhandledJSErrorStackNatively = value;
-}
-
 /*
  * Use native view configs in bridgeless mode
  */

package/React/Base/RCTConvert.h

@@ -11,6 +11,7 @@
 #import <React/RCTAnimationType.h>
 #import <React/RCTBorderCurve.h>
 #import <React/RCTBorderStyle.h>
+#import <React/RCTCursor.h>
 #import <React/RCTDefines.h>
 #import <React/RCTLog.h>
 #import <React/RCTPointerEvents.h>
@@ -78,14 +79,16 @@ typedef NSURL RCTFileURL;
 #endif
 
 #if TARGET_OS_IPHONE && !TARGET_OS_TV
-+ (WKDataDetectorTypes)WKDataDetectorTypes:(id)json API_AVAILABLE(ios(10.0));
++ (WKDataDetectorTypes)WKDataDetectorTypes:(id)json;
 #endif
 
 + (UIViewContentMode)UIViewContentMode:(id)json;
 #if !TARGET_OS_TV
-+ (UIBarStyle)UIBarStyle:(id)json;
++ (UIBarStyle)UIBarStyle:(id)json __deprecated;
 #endif
 
++ (RCTCursor)RCTCursor:(id)json;
+
 + (CGFloat)CGFloat:(id)json;
 + (CGPoint)CGPoint:(id)json;
 + (CGSize)CGSize:(id)json;

package/React/Base/{RCTConvert.m → RCTConvert.mm}

@@ -439,7 +439,8 @@ RCT_ENUM_CONVERTER(
     mapping = temporaryMapping;
   });
 
-  UIKeyboardType type = RCTConvertEnumValue("UIKeyboardType", mapping, @(UIKeyboardTypeDefault), json).integerValue;
+  UIKeyboardType type =
+      (UIKeyboardType)RCTConvertEnumValue("UIKeyboardType", mapping, @(UIKeyboardTypeDefault), json).integerValue;
   return type;
 }
 
@@ -451,6 +452,9 @@ RCT_MULTI_ENUM_CONVERTER(
       @"link" : @(UIDataDetectorTypeLink),
       @"address" : @(UIDataDetectorTypeAddress),
       @"calendarEvent" : @(UIDataDetectorTypeCalendarEvent),
+      @"trackingNumber" : @(UIDataDetectorTypeShipmentTrackingNumber),
+      @"flightNumber" : @(UIDataDetectorTypeFlightNumber),
+      @"lookupSuggestion" : @(UIDataDetectorTypeLookupSuggestion),
       @"none" : @(UIDataDetectorTypeNone),
       @"all" : @(UIDataDetectorTypeAll),
     }),
@@ -562,6 +566,15 @@ RCT_ENUM_CONVERTER(
     integerValue)
 #endif
 
+RCT_ENUM_CONVERTER(
+    RCTCursor,
+    (@{
+      @"auto" : @(RCTCursorAuto),
+      @"pointer" : @(RCTCursorPointer),
+    }),
+    RCTCursorAuto,
+    integerValue)
+
 static void convertCGStruct(const char *type, NSArray *fields, CGFloat *result, id json)
 {
   NSUInteger count = fields.count;
@@ -862,7 +875,7 @@ static UIColor *RCTColorFromSemanticColorName(NSString *semanticColorName)
     RCTAssert([UIColor respondsToSelector:selector], @"RCTUIColor does not respond to a semantic color selector.");
     Class klass = [UIColor class];
     IMP imp = [klass methodForSelector:selector];
-    id (*getSemanticColorObject)(id, SEL) = (void *)imp;
+    id (*getSemanticColorObject)(id, SEL) = (id(*)(id, SEL))imp;
     id colorObject = getSemanticColorObject(klass, selector);
     if ([colorObject isKindOfClass:[UIColor class]]) {
       color = colorObject;
@@ -1190,7 +1203,8 @@ RCT_ENUM_CONVERTER(
       @"stretch" : @(YGAlignStretch),
       @"baseline" : @(YGAlignBaseline),
       @"space-between" : @(YGAlignSpaceBetween),
-      @"space-around" : @(YGAlignSpaceAround)
+      @"space-around" : @(YGAlignSpaceAround),
+      @"space-evenly" : @(YGAlignSpaceEvenly)
     }),
     YGAlignFlexStart,
     intValue)
@@ -1207,11 +1221,7 @@ RCT_ENUM_CONVERTER(
 
 RCT_ENUM_CONVERTER(
     YGPositionType,
-    (@{
-      @"static" : @(YGPositionTypeStatic),
-      @"absolute" : @(YGPositionTypeAbsolute),
-      @"relative" : @(YGPositionTypeRelative)
-    }),
+    (@{@"absolute" : @(YGPositionTypeAbsolute), @"relative" : @(YGPositionTypeRelative)}),
     YGPositionTypeRelative,
     intValue)
 

package/React/Base/RCTDefines.h

@@ -185,8 +185,8 @@
  * Controls for activating the new architecture without the legacy system.
  * Note: this is work in progress.
  */
-#ifdef REACT_NATIVE_FORCE_NEW_ARCHITECTURE
-#define RCT_ONLY_NEW_ARCHITECTURE 1
+#ifdef REACT_NATIVE_FORCE_NEW_ARCHITECTURE_EXPERIMENTAL_DO_NOT_USE
+#define RCT_ONLY_NEW_ARCHITECTURE_EXPERIMENTAL_DO_NOT_USE 1
 #else
-#define RCT_ONLY_NEW_ARCHITECTURE 0
+#define RCT_ONLY_NEW_ARCHITECTURE_EXPERIMENTAL_DO_NOT_USE 0
 #endif