react-native-tvos 0.84.1-0 → 0.85.0-0rc5

package/React/CoreModules/RCTDeviceInfo.mm

@@ -25,7 +25,7 @@ using namespace facebook::react;
 @end
 
 @implementation RCTDeviceInfo {
-#if !TARGET_OS_TV
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
   UIInterfaceOrientation _currentInterfaceOrientation;
 #endif
   NSDictionary *_currentInterfaceDimensions;
@@ -109,10 +109,11 @@ RCT_EXPORT_MODULE()
                                              object:nil];
 #endif
 
-#if TARGET_OS_IOS
-
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
   _currentInterfaceOrientation = RCTKeyWindow().windowScene.interfaceOrientation;
+#endif
 
+#if TARGET_OS_IOS
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(interfaceFrameDidChange)
                                                name:UIDeviceOrientationDidChangeNotification

package/React/CoreModules/RCTKeyboardObserver.mm

@@ -25,7 +25,6 @@ RCT_EXPORT_MODULE()
 - (void)startObserving
 {
 #if !TARGET_OS_TV
-
   NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
 
 #define ADD_KEYBOARD_HANDLER(NAME, SELECTOR) [nc addObserver:self selector:@selector(SELECTOR:) name:NAME object:nil]
@@ -38,7 +37,6 @@ RCT_EXPORT_MODULE()
   ADD_KEYBOARD_HANDLER(UIKeyboardDidChangeFrameNotification, keyboardDidChangeFrame);
 
 #undef ADD_KEYBOARD_HANDLER
-
 #endif
 }
 
@@ -86,6 +84,7 @@ IMPLEMENT_KEYBOARD_HANDLER(keyboardDidChangeFrame)
 
 @end
 
+#if !TARGET_OS_TV
 NS_INLINE NSDictionary *RCTRectDictionaryValue(CGRect rect)
 {
   return @{
@@ -140,6 +139,14 @@ static NSDictionary *RCTParseKeyboardNotification(NSNotification *notification)
 #endif
 }
 
+#else
+static NSDictionary *RCTParseKeyboardNotification(NSNotification *notification)
+{
+  return @{};
+}
+
+#endif
+
 Class RCTKeyboardObserverCls(void)
 {
   return RCTKeyboardObserver.class;

package/React/CoreModules/RCTLogBoxView.mm

@@ -20,12 +20,10 @@
 - (instancetype)initWithFrame:(CGRect)frame
 {
   if ((self = [super initWithFrame:frame]) != nullptr) {
-#if TARGET_OS_TV
-      self.windowLevel = UIWindowLevelNormal;
-#else
-      self.windowLevel = UIWindowLevelStatusBar - 1;
+#if !TARGET_OS_TV
+    self.windowLevel = UIWindowLevelStatusBar - 1;
 #endif
-      self.backgroundColor = [UIColor clearColor];
+    self.backgroundColor = [UIColor clearColor];
   }
   return self;
 }
@@ -44,9 +42,7 @@
 {
   self = [super initWithWindowScene:window.windowScene];
 
-#if TARGET_OS_TV
-  self.windowLevel = UIWindowLevelNormal;
-#else
+#if !TARGET_OS_TV
   self.windowLevel = UIWindowLevelStatusBar - 1;
 #endif
   self.backgroundColor = [UIColor clearColor];

package/React/CoreModules/RCTPerfMonitor.mm

@@ -180,6 +180,11 @@ RCT_EXPORT_MODULE()
     [_container addGestureRecognizer:self.gestureRecognizer];
     [_container addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tap)]];
 
+#if TARGET_OS_TV
+    _container.backgroundColor = [UIColor whiteColor];
+#else
+    _container.backgroundColor = [UIColor systemBackgroundColor];
+#endif
   }
 
   return _container;

package/React/CoreModules/RCTStatusBarManager.h

@@ -10,6 +10,7 @@
 #import <React/RCTConvert.h>
 #import <React/RCTEventEmitter.h>
 
+#if !TARGET_OS_TV
 @interface RCTConvert (UIStatusBar)
 
 #if !TARGET_OS_TV
@@ -18,6 +19,7 @@
 #endif
 
 @end
+#endif
 
 @interface RCTStatusBarManager : RCTEventEmitter
 

package/React/CoreModules/RCTWebSocketModule.h

@@ -18,6 +18,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+@class SRWebSocket;
+
+typedef SRWebSocket * (^SRWebSocketProvider)(NSURLRequest *request);
+
+RCT_EXTERN void RCTSetCustomSRWebSocketProvider(SRWebSocketProvider provider);
+
 @interface RCTWebSocketModule : RCTEventEmitter
 
 // Register a custom handler for a specific websocket. The handler will be strongly held by the WebSocketModule.

package/React/CoreModules/RCTWebSocketModule.mm

@@ -34,6 +34,13 @@
 
 @end
 
+static SRWebSocketProvider srWebSocketProvider;
+
+void RCTSetCustomSRWebSocketProvider(SRWebSocketProvider provider)
+{
+  srWebSocketProvider = provider;
+}
+
 @implementation RCTWebSocketModule {
   NSMutableDictionary<NSNumber *, SRWebSocket *> *_sockets;
   NSMutableDictionary<NSNumber *, id<RCTWebSocketContentHandler>> *_contentHandlers;
@@ -88,7 +95,13 @@ RCT_EXPORT_METHOD(
     }];
   }
 
-  SRWebSocket *webSocket = [[SRWebSocket alloc] initWithURLRequest:request protocols:protocols];
+  SRWebSocket *webSocket;
+  if (srWebSocketProvider != nullptr) {
+    webSocket = srWebSocketProvider(request);
+  }
+  if (webSocket == nil) {
+    webSocket = [[SRWebSocket alloc] initWithURLRequest:request protocols:protocols];
+  }
   [webSocket setDelegateDispatchQueue:[self methodQueue]];
   webSocket.delegate = self;
   webSocket.reactTag = @(socketID);

package/React/DevSupport/RCTInspectorDevServerHelper.mm

@@ -14,33 +14,39 @@
 
 #import <React/RCTCxxInspectorPackagerConnection.h>
 #import <React/RCTDefines.h>
+#import <React/RCTDevSupportHttpHeaders.h>
 
 #import <CommonCrypto/CommonCrypto.h>
 #import <jsinspector-modern/InspectorFlags.h>
 
 static NSString *const kDebuggerMsgDisable = @"{ \"id\":1,\"method\":\"Debugger.disable\" }";
+static const int kDefaultMetroPort = 8081;
 
 static NSString *getServerHost(NSURL *bundleURL)
 {
-  NSNumber *port = @8081;
-  NSString *portStr = [[[NSProcessInfo processInfo] environment] objectForKey:@"RCT_METRO_PORT"];
-  if ((portStr != nullptr) && [portStr length] > 0) {
-    port = [NSNumber numberWithInt:[portStr intValue]];
-  }
-  if ([bundleURL port] != nullptr) {
-    port = [bundleURL port];
-  }
   NSString *host = [bundleURL host];
   if (host == nullptr) {
     host = @"localhost";
   }
 
-  // this is consistent with the Android implementation, where http:// is the
-  // hardcoded implicit scheme for the debug server. Note, packagerURL
-  // technically looks like it could handle schemes/protocols other than HTTP,
-  // so rather than force HTTP, leave it be for now, in case someone is relying
-  // on that ability when developing against iOS.
-  return [NSString stringWithFormat:@"%@:%@", host, port];
+  // Use explicit port from URL if available
+  if ([bundleURL port] != nullptr) {
+    return [NSString stringWithFormat:@"%@:%@", host, [bundleURL port]];
+  }
+
+  // Check environment variable
+  NSString *portStr = [[[NSProcessInfo processInfo] environment] objectForKey:@"RCT_METRO_PORT"];
+  if ((portStr != nullptr) && [portStr length] > 0) {
+    return [NSString stringWithFormat:@"%@:%@", host, portStr];
+  }
+
+  // For https, omit port — the scheme implies 443
+  if ([[bundleURL scheme] isEqualToString:@"https"]) {
+    return host;
+  }
+
+  // Default to 8081 for local development (Metro's default port)
+  return [NSString stringWithFormat:@"%@:%d", host, kDefaultMetroPort];
 }
 
 static NSString *getSHA256(NSString *string)
@@ -111,13 +117,15 @@ static NSURL *getInspectorDeviceUrl(NSURL *bundleURL)
   NSString *escapedInspectorDeviceId = [getInspectorDeviceId()
       stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLQueryAllowedCharacterSet];
 
-  return [NSURL
-      URLWithString:[NSString stringWithFormat:@"http://%@/inspector/device?name=%@&app=%@&device=%@&profiling=%@",
-                                               getServerHost(bundleURL),
-                                               escapedDeviceName,
-                                               escapedAppName,
-                                               escapedInspectorDeviceId,
-                                               isProfilingBuild ? @"true" : @"false"]];
+  NSString *scheme = [bundleURL scheme] != nullptr ? [bundleURL scheme] : @"http";
+  return
+      [NSURL URLWithString:[NSString stringWithFormat:@"%@://%@/inspector/device?name=%@&app=%@&device=%@&profiling=%@",
+                                                      scheme,
+                                                      getServerHost(bundleURL),
+                                                      escapedDeviceName,
+                                                      escapedAppName,
+                                                      escapedInspectorDeviceId,
+                                                      isProfilingBuild ? @"true" : @"false"]];
 }
 
 @implementation RCTInspectorDevServerHelper
@@ -149,11 +157,14 @@ static void sendEventToAllConnections(NSString *event)
   NSString *escapedInspectorDeviceId = [getInspectorDeviceId()
       stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLQueryAllowedCharacterSet];
 
-  NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"http://%@/open-debugger?device=%@",
+  NSString *scheme = [bundleURL scheme] != nullptr ? [bundleURL scheme] : @"http";
+  NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"%@://%@/open-debugger?device=%@",
+                                                               scheme,
                                                                getServerHost(bundleURL),
                                                                escapedInspectorDeviceId]];
   NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url];
   [request setHTTPMethod:@"POST"];
+  [[RCTDevSupportHttpHeaders sharedInstance] applyHeadersToRequest:request];
 
   [[[NSURLSession sharedSession]
       dataTaskWithRequest:request

package/React/DevSupport/RCTInspectorNetworkHelper.mm

@@ -6,6 +6,7 @@
  */
 
 #import "RCTInspectorNetworkHelper.h"
+#import <React/RCTDevSupportHttpHeaders.h>
 #import <React/RCTLog.h>
 
 using ListenerBlock = void (^)(RCTInspectorNetworkListener *);
@@ -47,6 +48,7 @@ using ListenerBlock = void (^)(RCTInspectorNetworkListener *);
 
   NSMutableURLRequest *urlRequest = [NSMutableURLRequest requestWithURL:url];
   [urlRequest setHTTPMethod:@"GET"];
+  [[RCTDevSupportHttpHeaders sharedInstance] applyHeadersToRequest:urlRequest];
   NSURLSessionDataTask *dataTask = [self.session dataTaskWithRequest:urlRequest];
   __weak NSURLSessionDataTask *weakDataTask = dataTask;
 

package/React/FBReactNativeSpec/FBReactNativeSpecJSI.h

@@ -227,10 +227,10 @@ protected:
     methodMap_["commonTestFlagWithoutNativeImplementation"] = MethodMetadata {.argCount = 0, .invoker = __commonTestFlagWithoutNativeImplementation};
     methodMap_["cdpInteractionMetricsEnabled"] = MethodMetadata {.argCount = 0, .invoker = __cdpInteractionMetricsEnabled};
     methodMap_["cxxNativeAnimatedEnabled"] = MethodMetadata {.argCount = 0, .invoker = __cxxNativeAnimatedEnabled};
+    methodMap_["defaultTextToOverflowHidden"] = MethodMetadata {.argCount = 0, .invoker = __defaultTextToOverflowHidden};
     methodMap_["disableEarlyViewCommandExecution"] = MethodMetadata {.argCount = 0, .invoker = __disableEarlyViewCommandExecution};
     methodMap_["disableImageViewPreallocationAndroid"] = MethodMetadata {.argCount = 0, .invoker = __disableImageViewPreallocationAndroid};
     methodMap_["disableMountItemReorderingAndroid"] = MethodMetadata {.argCount = 0, .invoker = __disableMountItemReorderingAndroid};
-    methodMap_["disableOldAndroidAttachmentMetricsWorkarounds"] = MethodMetadata {.argCount = 0, .invoker = __disableOldAndroidAttachmentMetricsWorkarounds};
     methodMap_["disableSubviewClippingAndroid"] = MethodMetadata {.argCount = 0, .invoker = __disableSubviewClippingAndroid};
     methodMap_["disableTextLayoutManagerCacheAndroid"] = MethodMetadata {.argCount = 0, .invoker = __disableTextLayoutManagerCacheAndroid};
     methodMap_["disableViewPreallocationAndroid"] = MethodMetadata {.argCount = 0, .invoker = __disableViewPreallocationAndroid};
@@ -247,6 +247,7 @@ protected:
     methodMap_["enableEagerMainQueueModulesOnIOS"] = MethodMetadata {.argCount = 0, .invoker = __enableEagerMainQueueModulesOnIOS};
     methodMap_["enableEagerRootViewAttachment"] = MethodMetadata {.argCount = 0, .invoker = __enableEagerRootViewAttachment};
     methodMap_["enableExclusivePropsUpdateAndroid"] = MethodMetadata {.argCount = 0, .invoker = __enableExclusivePropsUpdateAndroid};
+    methodMap_["enableFabricCommitBranching"] = MethodMetadata {.argCount = 0, .invoker = __enableFabricCommitBranching};
     methodMap_["enableFabricLogs"] = MethodMetadata {.argCount = 0, .invoker = __enableFabricLogs};
     methodMap_["enableFabricRenderer"] = MethodMetadata {.argCount = 0, .invoker = __enableFabricRenderer};
     methodMap_["enableFontScaleChangesUpdatingLayout"] = MethodMetadata {.argCount = 0, .invoker = __enableFontScaleChangesUpdatingLayout};
@@ -277,9 +278,7 @@ protected:
     methodMap_["enableViewRecyclingForView"] = MethodMetadata {.argCount = 0, .invoker = __enableViewRecyclingForView};
     methodMap_["enableVirtualViewContainerStateExperimental"] = MethodMetadata {.argCount = 0, .invoker = __enableVirtualViewContainerStateExperimental};
     methodMap_["enableVirtualViewDebugFeatures"] = MethodMetadata {.argCount = 0, .invoker = __enableVirtualViewDebugFeatures};
-    methodMap_["enableVirtualViewRenderState"] = MethodMetadata {.argCount = 0, .invoker = __enableVirtualViewRenderState};
-    methodMap_["enableVirtualViewWindowFocusDetection"] = MethodMetadata {.argCount = 0, .invoker = __enableVirtualViewWindowFocusDetection};
-    methodMap_["enableWebPerformanceAPIsByDefault"] = MethodMetadata {.argCount = 0, .invoker = __enableWebPerformanceAPIsByDefault};
+    methodMap_["fixFindShadowNodeByTagRaceCondition"] = MethodMetadata {.argCount = 0, .invoker = __fixFindShadowNodeByTagRaceCondition};
     methodMap_["fixMappingOfEventPrioritiesBetweenFabricAndReact"] = MethodMetadata {.argCount = 0, .invoker = __fixMappingOfEventPrioritiesBetweenFabricAndReact};
     methodMap_["fixTextClippingAndroid15useBoundsForWidth"] = MethodMetadata {.argCount = 0, .invoker = __fixTextClippingAndroid15useBoundsForWidth};
     methodMap_["fuseboxAssertSingleHostState"] = MethodMetadata {.argCount = 0, .invoker = __fuseboxAssertSingleHostState};
@@ -292,25 +291,23 @@ protected:
     methodMap_["preparedTextCacheSize"] = MethodMetadata {.argCount = 0, .invoker = __preparedTextCacheSize};
     methodMap_["preventShadowTreeCommitExhaustion"] = MethodMetadata {.argCount = 0, .invoker = __preventShadowTreeCommitExhaustion};
     methodMap_["shouldPressibilityUseW3CPointerEventsForHover"] = MethodMetadata {.argCount = 0, .invoker = __shouldPressibilityUseW3CPointerEventsForHover};
-    methodMap_["shouldResetClickableWhenRecyclingView"] = MethodMetadata {.argCount = 0, .invoker = __shouldResetClickableWhenRecyclingView};
-    methodMap_["shouldResetOnClickListenerWhenRecyclingView"] = MethodMetadata {.argCount = 0, .invoker = __shouldResetOnClickListenerWhenRecyclingView};
-    methodMap_["shouldSetEnabledBasedOnAccessibilityState"] = MethodMetadata {.argCount = 0, .invoker = __shouldSetEnabledBasedOnAccessibilityState};
-    methodMap_["shouldSetIsClickableByDefault"] = MethodMetadata {.argCount = 0, .invoker = __shouldSetIsClickableByDefault};
     methodMap_["shouldTriggerResponderTransferOnScrollAndroid"] = MethodMetadata {.argCount = 0, .invoker = __shouldTriggerResponderTransferOnScrollAndroid};
     methodMap_["skipActivityIdentityAssertionOnHostPause"] = MethodMetadata {.argCount = 0, .invoker = __skipActivityIdentityAssertionOnHostPause};
+    methodMap_["syncAndroidClipToPaddingWithOverflow"] = MethodMetadata {.argCount = 0, .invoker = __syncAndroidClipToPaddingWithOverflow};
     methodMap_["traceTurboModulePromiseRejectionsOnAndroid"] = MethodMetadata {.argCount = 0, .invoker = __traceTurboModulePromiseRejectionsOnAndroid};
     methodMap_["updateRuntimeShadowNodeReferencesOnCommit"] = MethodMetadata {.argCount = 0, .invoker = __updateRuntimeShadowNodeReferencesOnCommit};
+    methodMap_["updateRuntimeShadowNodeReferencesOnCommitThread"] = MethodMetadata {.argCount = 0, .invoker = __updateRuntimeShadowNodeReferencesOnCommitThread};
     methodMap_["useAlwaysAvailableJSErrorHandling"] = MethodMetadata {.argCount = 0, .invoker = __useAlwaysAvailableJSErrorHandling};
     methodMap_["useFabricInterop"] = MethodMetadata {.argCount = 0, .invoker = __useFabricInterop};
     methodMap_["useNativeViewConfigsInBridgelessMode"] = MethodMetadata {.argCount = 0, .invoker = __useNativeViewConfigsInBridgelessMode};
-    methodMap_["useRawPropsJsiValue"] = MethodMetadata {.argCount = 0, .invoker = __useRawPropsJsiValue};
-    methodMap_["useShadowNodeStateOnClone"] = MethodMetadata {.argCount = 0, .invoker = __useShadowNodeStateOnClone};
+    methodMap_["useNestedScrollViewAndroid"] = MethodMetadata {.argCount = 0, .invoker = __useNestedScrollViewAndroid};
     methodMap_["useSharedAnimatedBackend"] = MethodMetadata {.argCount = 0, .invoker = __useSharedAnimatedBackend};
     methodMap_["useTraitHiddenOnAndroid"] = MethodMetadata {.argCount = 0, .invoker = __useTraitHiddenOnAndroid};
     methodMap_["useTurboModuleInterop"] = MethodMetadata {.argCount = 0, .invoker = __useTurboModuleInterop};
     methodMap_["useTurboModules"] = MethodMetadata {.argCount = 0, .invoker = __useTurboModules};
+    methodMap_["useUnorderedMapInDifferentiator"] = MethodMetadata {.argCount = 0, .invoker = __useUnorderedMapInDifferentiator};
     methodMap_["viewCullingOutsetRatio"] = MethodMetadata {.argCount = 0, .invoker = __viewCullingOutsetRatio};
-    methodMap_["virtualViewHysteresisRatio"] = MethodMetadata {.argCount = 0, .invoker = __virtualViewHysteresisRatio};
+    methodMap_["viewTransitionEnabled"] = MethodMetadata {.argCount = 0, .invoker = __viewTransitionEnabled};
     methodMap_["virtualViewPrerenderRatio"] = MethodMetadata {.argCount = 0, .invoker = __virtualViewPrerenderRatio};
   }
   
@@ -343,6 +340,13 @@ private:
     return bridging::callFromJs<bool>(rt, &T::cxxNativeAnimatedEnabled,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
   }
 
+  static jsi::Value __defaultTextToOverflowHidden(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
+    static_assert(
+      bridging::getParameterCount(&T::defaultTextToOverflowHidden) == 1,
+      "Expected defaultTextToOverflowHidden(...) to have 1 parameters");
+    return bridging::callFromJs<bool>(rt, &T::defaultTextToOverflowHidden,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
+  }
+
   static jsi::Value __disableEarlyViewCommandExecution(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
     static_assert(
       bridging::getParameterCount(&T::disableEarlyViewCommandExecution) == 1,
@@ -364,13 +368,6 @@ private:
     return bridging::callFromJs<bool>(rt, &T::disableMountItemReorderingAndroid,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
   }
 
-  static jsi::Value __disableOldAndroidAttachmentMetricsWorkarounds(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
-    static_assert(
-      bridging::getParameterCount(&T::disableOldAndroidAttachmentMetricsWorkarounds) == 1,
-      "Expected disableOldAndroidAttachmentMetricsWorkarounds(...) to have 1 parameters");
-    return bridging::callFromJs<bool>(rt, &T::disableOldAndroidAttachmentMetricsWorkarounds,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
-  }
-
   static jsi::Value __disableSubviewClippingAndroid(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
     static_assert(
       bridging::getParameterCount(&T::disableSubviewClippingAndroid) == 1,
@@ -483,6 +480,13 @@ private:
     return bridging::callFromJs<bool>(rt, &T::enableExclusivePropsUpdateAndroid,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
   }
 
+  static jsi::Value __enableFabricCommitBranching(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
+    static_assert(
+      bridging::getParameterCount(&T::enableFabricCommitBranching) == 1,
+      "Expected enableFabricCommitBranching(...) to have 1 parameters");
+    return bridging::callFromJs<bool>(rt, &T::enableFabricCommitBranching,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
+  }
+
   static jsi::Value __enableFabricLogs(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
     static_assert(
       bridging::getParameterCount(&T::enableFabricLogs) == 1,
@@ -693,25 +697,11 @@ private:
     return bridging::callFromJs<bool>(rt, &T::enableVirtualViewDebugFeatures,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
   }
 
-  static jsi::Value __enableVirtualViewRenderState(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
-    static_assert(
-      bridging::getParameterCount(&T::enableVirtualViewRenderState) == 1,
-      "Expected enableVirtualViewRenderState(...) to have 1 parameters");
-    return bridging::callFromJs<bool>(rt, &T::enableVirtualViewRenderState,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
-  }
-
-  static jsi::Value __enableVirtualViewWindowFocusDetection(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
+  static jsi::Value __fixFindShadowNodeByTagRaceCondition(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
     static_assert(
-      bridging::getParameterCount(&T::enableVirtualViewWindowFocusDetection) == 1,
-      "Expected enableVirtualViewWindowFocusDetection(...) to have 1 parameters");
-    return bridging::callFromJs<bool>(rt, &T::enableVirtualViewWindowFocusDetection,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
-  }
-
-  static jsi::Value __enableWebPerformanceAPIsByDefault(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
-    static_assert(
-      bridging::getParameterCount(&T::enableWebPerformanceAPIsByDefault) == 1,
-      "Expected enableWebPerformanceAPIsByDefault(...) to have 1 parameters");
-    return bridging::callFromJs<bool>(rt, &T::enableWebPerformanceAPIsByDefault,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
+      bridging::getParameterCount(&T::fixFindShadowNodeByTagRaceCondition) == 1,
+      "Expected fixFindShadowNodeByTagRaceCondition(...) to have 1 parameters");
+    return bridging::callFromJs<bool>(rt, &T::fixFindShadowNodeByTagRaceCondition,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
   }
 
   static jsi::Value __fixMappingOfEventPrioritiesBetweenFabricAndReact(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
@@ -798,34 +788,6 @@ private:
     return bridging::callFromJs<bool>(rt, &T::shouldPressibilityUseW3CPointerEventsForHover,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
   }
 
-  static jsi::Value __shouldResetClickableWhenRecyclingView(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
-    static_assert(
-      bridging::getParameterCount(&T::shouldResetClickableWhenRecyclingView) == 1,
-      "Expected shouldResetClickableWhenRecyclingView(...) to have 1 parameters");
-    return bridging::callFromJs<bool>(rt, &T::shouldResetClickableWhenRecyclingView,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
-  }
-
-  static jsi::Value __shouldResetOnClickListenerWhenRecyclingView(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
-    static_assert(
-      bridging::getParameterCount(&T::shouldResetOnClickListenerWhenRecyclingView) == 1,
-      "Expected shouldResetOnClickListenerWhenRecyclingView(...) to have 1 parameters");
-    return bridging::callFromJs<bool>(rt, &T::shouldResetOnClickListenerWhenRecyclingView,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
-  }
-
-  static jsi::Value __shouldSetEnabledBasedOnAccessibilityState(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
-    static_assert(
-      bridging::getParameterCount(&T::shouldSetEnabledBasedOnAccessibilityState) == 1,
-      "Expected shouldSetEnabledBasedOnAccessibilityState(...) to have 1 parameters");
-    return bridging::callFromJs<bool>(rt, &T::shouldSetEnabledBasedOnAccessibilityState,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
-  }
-
-  static jsi::Value __shouldSetIsClickableByDefault(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
-    static_assert(
-      bridging::getParameterCount(&T::shouldSetIsClickableByDefault) == 1,
-      "Expected shouldSetIsClickableByDefault(...) to have 1 parameters");
-    return bridging::callFromJs<bool>(rt, &T::shouldSetIsClickableByDefault,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
-  }
-
   static jsi::Value __shouldTriggerResponderTransferOnScrollAndroid(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
     static_assert(
       bridging::getParameterCount(&T::shouldTriggerResponderTransferOnScrollAndroid) == 1,
@@ -840,6 +802,13 @@ private:
     return bridging::callFromJs<bool>(rt, &T::skipActivityIdentityAssertionOnHostPause,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
   }
 
+  static jsi::Value __syncAndroidClipToPaddingWithOverflow(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
+    static_assert(
+      bridging::getParameterCount(&T::syncAndroidClipToPaddingWithOverflow) == 1,
+      "Expected syncAndroidClipToPaddingWithOverflow(...) to have 1 parameters");
+    return bridging::callFromJs<bool>(rt, &T::syncAndroidClipToPaddingWithOverflow,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
+  }
+
   static jsi::Value __traceTurboModulePromiseRejectionsOnAndroid(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
     static_assert(
       bridging::getParameterCount(&T::traceTurboModulePromiseRejectionsOnAndroid) == 1,
@@ -854,6 +823,13 @@ private:
     return bridging::callFromJs<bool>(rt, &T::updateRuntimeShadowNodeReferencesOnCommit,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
   }
 
+  static jsi::Value __updateRuntimeShadowNodeReferencesOnCommitThread(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
+    static_assert(
+      bridging::getParameterCount(&T::updateRuntimeShadowNodeReferencesOnCommitThread) == 1,
+      "Expected updateRuntimeShadowNodeReferencesOnCommitThread(...) to have 1 parameters");
+    return bridging::callFromJs<bool>(rt, &T::updateRuntimeShadowNodeReferencesOnCommitThread,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
+  }
+
   static jsi::Value __useAlwaysAvailableJSErrorHandling(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
     static_assert(
       bridging::getParameterCount(&T::useAlwaysAvailableJSErrorHandling) == 1,
@@ -875,18 +851,11 @@ private:
     return bridging::callFromJs<bool>(rt, &T::useNativeViewConfigsInBridgelessMode,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
   }
 
-  static jsi::Value __useRawPropsJsiValue(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
-    static_assert(
-      bridging::getParameterCount(&T::useRawPropsJsiValue) == 1,
-      "Expected useRawPropsJsiValue(...) to have 1 parameters");
-    return bridging::callFromJs<bool>(rt, &T::useRawPropsJsiValue,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
-  }
-
-  static jsi::Value __useShadowNodeStateOnClone(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
+  static jsi::Value __useNestedScrollViewAndroid(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
     static_assert(
-      bridging::getParameterCount(&T::useShadowNodeStateOnClone) == 1,
-      "Expected useShadowNodeStateOnClone(...) to have 1 parameters");
-    return bridging::callFromJs<bool>(rt, &T::useShadowNodeStateOnClone,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
+      bridging::getParameterCount(&T::useNestedScrollViewAndroid) == 1,
+      "Expected useNestedScrollViewAndroid(...) to have 1 parameters");
+    return bridging::callFromJs<bool>(rt, &T::useNestedScrollViewAndroid,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
   }
 
   static jsi::Value __useSharedAnimatedBackend(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
@@ -917,6 +886,13 @@ private:
     return bridging::callFromJs<bool>(rt, &T::useTurboModules,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
   }
 
+  static jsi::Value __useUnorderedMapInDifferentiator(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
+    static_assert(
+      bridging::getParameterCount(&T::useUnorderedMapInDifferentiator) == 1,
+      "Expected useUnorderedMapInDifferentiator(...) to have 1 parameters");
+    return bridging::callFromJs<bool>(rt, &T::useUnorderedMapInDifferentiator,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
+  }
+
   static jsi::Value __viewCullingOutsetRatio(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
     static_assert(
       bridging::getParameterCount(&T::viewCullingOutsetRatio) == 1,
@@ -924,11 +900,11 @@ private:
     return bridging::callFromJs<double>(rt, &T::viewCullingOutsetRatio,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
   }
 
-  static jsi::Value __virtualViewHysteresisRatio(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
+  static jsi::Value __viewTransitionEnabled(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
     static_assert(
-      bridging::getParameterCount(&T::virtualViewHysteresisRatio) == 1,
-      "Expected virtualViewHysteresisRatio(...) to have 1 parameters");
-    return bridging::callFromJs<double>(rt, &T::virtualViewHysteresisRatio,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
+      bridging::getParameterCount(&T::viewTransitionEnabled) == 1,
+      "Expected viewTransitionEnabled(...) to have 1 parameters");
+    return bridging::callFromJs<bool>(rt, &T::viewTransitionEnabled,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
   }
 
   static jsi::Value __virtualViewPrerenderRatio(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
@@ -5875,6 +5851,7 @@ protected:
   NativeFantomTestSpecificMethodsCxxSpec(std::shared_ptr<CallInvoker> jsInvoker) : TurboModule(std::string{NativeFantomTestSpecificMethodsCxxSpec::kModuleName}, jsInvoker) {
     methodMap_["registerForcedCloneCommitHook"] = MethodMetadata {.argCount = 0, .invoker = __registerForcedCloneCommitHook};
     methodMap_["takeFunctionAndNoop"] = MethodMetadata {.argCount = 1, .invoker = __takeFunctionAndNoop};
+    methodMap_["setRootNodeSize"] = MethodMetadata {.argCount = 3, .invoker = __setRootNodeSize};
   }
   
 private:
@@ -5892,6 +5869,16 @@ private:
     bridging::callFromJs<void>(rt, &T::takeFunctionAndNoop,  static_cast<NativeFantomTestSpecificMethodsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule),
       count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asObject(rt).asFunction(rt));return jsi::Value::undefined();
   }
+
+  static jsi::Value __setRootNodeSize(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+    static_assert(
+      bridging::getParameterCount(&T::setRootNodeSize) == 4,
+      "Expected setRootNodeSize(...) to have 4 parameters");
+    bridging::callFromJs<void>(rt, &T::setRootNodeSize,  static_cast<NativeFantomTestSpecificMethodsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule),
+      count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asNumber(),
+      count <= 1 ? throw jsi::JSError(rt, "Expected argument in position 1 to be passed") : args[1].asNumber(),
+      count <= 2 ? throw jsi::JSError(rt, "Expected argument in position 2 to be passed") : args[2].asNumber());return jsi::Value::undefined();
+  }
 };
 
 

package/React/FBReactNativeSpec/react/renderer/components/FBReactNativeSpec/Props.cpp

@@ -22,8 +22,8 @@ VirtualViewExperimentalProps::VirtualViewExperimentalProps(
     const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
 
     initialHidden(convertRawProp(context, rawProps, "initialHidden", sourceProps.initialHidden, {false})),
-    renderState(convertRawProp(context, rawProps, "renderState", sourceProps.renderState, {0})),
-    removeClippedSubviews(convertRawProp(context, rawProps, "removeClippedSubviews", sourceProps.removeClippedSubviews, {false})) {}
+    removeClippedSubviews(convertRawProp(context, rawProps, "removeClippedSubviews", sourceProps.removeClippedSubviews, {false})),
+    renderState(convertRawProp(context, rawProps, "renderState", sourceProps.renderState, {0})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
 ComponentName VirtualViewExperimentalProps::getDiffPropsImplementationTarget() const {
@@ -45,13 +45,13 @@ folly::dynamic VirtualViewExperimentalProps::getDiffProps(
     result["initialHidden"] = initialHidden;
   }
     
-  if (renderState != oldProps->renderState) {
-    result["renderState"] = renderState;
-  }
-    
   if (removeClippedSubviews != oldProps->removeClippedSubviews) {
     result["removeClippedSubviews"] = removeClippedSubviews;
   }
+    
+  if (renderState != oldProps->renderState) {
+    result["renderState"] = renderState;
+  }
   return result;
 }
 #endif
@@ -60,8 +60,8 @@ SharedDebugStringConvertibleList VirtualViewExperimentalProps::getDebugProps() c
   return ViewProps::getDebugProps() +
 		SharedDebugStringConvertibleList{
 			debugStringConvertibleItem("initialHidden", initialHidden, false),
-			debugStringConvertibleItem("renderState", renderState, 0),
-			debugStringConvertibleItem("removeClippedSubviews", removeClippedSubviews, false)
+			debugStringConvertibleItem("removeClippedSubviews", removeClippedSubviews, false),
+			debugStringConvertibleItem("renderState", renderState, 0)
 	};
 }
 #endif

package/React/FBReactNativeSpec/react/renderer/components/FBReactNativeSpec/Props.h

@@ -26,8 +26,8 @@ class VirtualViewExperimentalProps final : public ViewProps {
 #pragma mark - Props
 
   bool initialHidden{false};
-  int renderState{0};
   bool removeClippedSubviews{false};
+  int renderState{0};
 
   #ifdef RN_SERIALIZABLE_STATE
   ComponentName getDiffPropsImplementationTarget() const override;

package/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm

@@ -21,7 +21,7 @@ using namespace facebook::react;
 
 @implementation RCTImageComponentView {
   ImageShadowNode::ConcreteState::Shared _state;
-  RCTImageResponseObserverProxy _imageResponseObserverProxy;
+  std::shared_ptr<RCTImageResponseObserverProxy> _imageResponseObserverProxy;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
@@ -36,7 +36,7 @@ using namespace facebook::react;
     _imageView.layer.minificationFilter = kCAFilterTrilinear;
     _imageView.layer.magnificationFilter = kCAFilterTrilinear;
 
-    _imageResponseObserverProxy = RCTImageResponseObserverProxy(self);
+    _imageResponseObserverProxy = std::make_shared<RCTImageResponseObserverProxy>(self);
 
     self.contentView = _imageView;
   }

package/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.mm

@@ -43,7 +43,9 @@ static UIView<RCTBackedTextInputViewProtocol> *_Nullable RCTFindTextInputWithNat
 @implementation RCTInputAccessoryComponentView {
   InputAccessoryShadowNode::ConcreteState::Shared _state;
   RCTInputAccessoryContentView *_contentView;
+#if !TARGET_OS_TV
   RCTSurfaceTouchHandler *_touchHandler;
+#endif
   UIView<RCTBackedTextInputViewProtocol> __weak *_textInput;
 }
 
@@ -52,8 +54,10 @@ static UIView<RCTBackedTextInputViewProtocol> *_Nullable RCTFindTextInputWithNat
   if (self = [super initWithFrame:frame]) {
     _props = InputAccessoryShadowNode::defaultSharedProps();
     _contentView = [RCTInputAccessoryContentView new];
+#if !TARGET_OS_TV
     _touchHandler = [RCTSurfaceTouchHandler new];
     [_touchHandler attachToView:_contentView];
+#endif
   }
 
   return self;