react-native-tvos 0.85.3-0 → 0.86.0-0

package/React/CoreModules/RCTDevMenuConfigurationDecorator.h

@@ -15,8 +15,8 @@
 
 @property (nonatomic, strong, readonly) RCTDevMenuConfiguration *__nullable devMenuConfiguration;
 
-- (instancetype)initWithDevMenuConfiguration:(RCTDevMenuConfiguration *__nullable)devMenuConfiguration;
-- (void)decorate:(id<RCTBridgeModule>)devMenuModule;
+- (instancetype _Nonnull)initWithDevMenuConfiguration:(RCTDevMenuConfiguration *__nullable)devMenuConfiguration;
+- (void)decorate:(id<RCTBridgeModule> _Nonnull)devMenuModule;
 
 #endif
 

package/React/CoreModules/RCTRedBox2AnsiParser.mm

@@ -29,7 +29,7 @@ static UIColor *RCTUIColorFromAnsiColor(const AnsiColor &c)
   }
 
   auto spans = parseAnsi(text.UTF8String);
-  NSMutableAttributedString *result =[NSMutableAttributedString new];
+  NSMutableAttributedString *result = [NSMutableAttributedString new];
   NSDictionary *baseAttributes = @{NSFontAttributeName : font, NSForegroundColorAttributeName : color};
 
   for (const auto &span : spans) {

package/React/CoreModules/RCTWebSocketModule.mm

@@ -10,6 +10,7 @@
 #import <objc/runtime.h>
 
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
+#import <React/RCTAssert.h>
 #import <React/RCTConvert.h>
 #import <React/RCTUtils.h>
 #import <SocketRocket/SRWebSocket.h>
@@ -73,6 +74,12 @@ RCT_EXPORT_METHOD(
     connect : (NSURL *)URL protocols : (NSArray *)protocols options : (JS::NativeWebSocketModule::SpecConnectOptions &)
         options socketID : (double)socketID)
 {
+  if (URL == nil || URL.absoluteString.length == 0u) {
+    RCTAssert(NO, @"RCTWebSocketModule: Invalid WebSocket URL passed to connect");
+    [self sendEventWithName:@"websocketFailed" body:@{@"message" : @"Invalid WebSocket URL", @"id" : @(socketID)}];
+    return;
+  }
+
   NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:URL];
 
   // We load cookies from sharedHTTPCookieStorage (shared with XHR and
@@ -84,14 +91,33 @@ RCT_EXPORT_METHOD(
   }
 
   // Load and set the cookie header.
-  NSArray<NSHTTPCookie *> *cookies = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookiesForURL:components.URL];
-  request.allHTTPHeaderFields = [NSHTTPCookie requestHeaderFieldsWithCookies:cookies];
+  if (components != nil && components.URL != nil) {
+    NSArray<NSHTTPCookie *> *cookies = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookiesForURL:components.URL];
+    request.allHTTPHeaderFields = [NSHTTPCookie requestHeaderFieldsWithCookies:cookies];
+  } else {
+    RCTLogError(@"RCTWebSocketModule: Invalid URL components - components or components.URL is nil");
+  }
 
   // Load supplied headers
   if ([options.headers() isKindOfClass:NSDictionary.class]) {
     NSDictionary *headers = (NSDictionary *)options.headers();
-    [headers enumerateKeysAndObjectsUsingBlock:^(NSString *key, id value, BOOL *stop) {
-      [request addValue:[RCTConvert NSString:value] forHTTPHeaderField:key];
+    [headers enumerateKeysAndObjectsUsingBlock:^(id key, id value, BOOL *stop) {
+      NSString *headerKey = [RCTConvert NSString:key];
+      NSString *headerValue = [RCTConvert NSString:value];
+
+      if (headerKey == nil || headerValue == nil) {
+        RCTLogError(
+            @"RCTWebSocketModule: Invalid header key and/or value types. "
+             "Expected NSString for both, got key of type %@ and value of type %@.",
+            NSStringFromClass([key class]),
+            NSStringFromClass([value class]));
+      }
+
+      if (headerKey == nil) {
+        return;
+      }
+
+      [request addValue:headerValue == nil ? @"" : headerValue forHTTPHeaderField:headerKey];
     }];
   }
 
@@ -153,6 +179,9 @@ RCT_EXPORT_METHOD(close : (double)code reason : (NSString *)reason socketID : (d
   NSString *type;
 
   NSNumber *socketID = [webSocket reactTag];
+  if (!socketID) {
+    return;
+  }
   id contentHandler = _contentHandlers[socketID];
   if (contentHandler) {
     message = [contentHandler processWebsocketMessage:message forSocketID:socketID withType:&type];
@@ -165,18 +194,25 @@ RCT_EXPORT_METHOD(close : (double)code reason : (NSString *)reason socketID : (d
     }
   }
 
-  [self sendEventWithName:@"websocketMessage" body:@{@"data" : message, @"type" : type, @"id" : webSocket.reactTag}];
+  [self sendEventWithName:@"websocketMessage" body:@{@"data" : message, @"type" : type, @"id" : socketID}];
 }
 
 - (void)webSocketDidOpen:(SRWebSocket *)webSocket
 {
+  NSNumber *socketID = [webSocket reactTag];
+  if (!socketID) {
+    return;
+  }
   [self sendEventWithName:@"websocketOpen"
-                     body:@{@"id" : webSocket.reactTag, @"protocol" : webSocket.protocol ? webSocket.protocol : @""}];
+                     body:@{@"id" : socketID, @"protocol" : webSocket.protocol ? webSocket.protocol : @""}];
 }
 
 - (void)webSocket:(SRWebSocket *)webSocket didFailWithError:(NSError *)error
 {
   NSNumber *socketID = [webSocket reactTag];
+  if (!socketID) {
+    return;
+  }
   _contentHandlers[socketID] = nil;
   _sockets[socketID] = nil;
   NSDictionary *body =
@@ -190,6 +226,9 @@ RCT_EXPORT_METHOD(close : (double)code reason : (NSString *)reason socketID : (d
             wasClean:(BOOL)wasClean
 {
   NSNumber *socketID = [webSocket reactTag];
+  if (!socketID) {
+    return;
+  }
   _contentHandlers[socketID] = nil;
   _sockets[socketID] = nil;
   [self sendEventWithName:@"websocketClosed"

package/React/CxxLogUtils/RCTDefaultCxxLogFunction.mm

@@ -28,7 +28,6 @@ void RCTDefaultCxxLogFunction(ReactNativeLogLevel level, const char *message)
       break;
     case ReactNativeLogLevelFatal:
       LOG(FATAL) << message;
-      break;
   }
 }
 

package/React/DevSupport/RCTInspectorDevServerHelper.mm

@@ -28,6 +28,10 @@ static NSString *getServerHost(NSURL *bundleURL)
   if (host == nullptr) {
     host = @"localhost";
   }
+  // NSURL.host strips IPv6 brackets, but URL authority requires them.
+  if ([host containsString:@":"] && ![host hasPrefix:@"["] && ![host hasSuffix:@"]"]) {
+    host = [NSString stringWithFormat:@"[%@]", host];
+  }
 
   // Use explicit port from URL if available
   if ([bundleURL port] != nullptr) {

package/React/DevSupport/RCTPackagerConnection.mm

@@ -64,22 +64,24 @@ struct Registration {
 
 static RCTReconnectingWebSocket *socketForLocation(NSString *const serverHostPort, NSString *scheme)
 {
-  NSString *serverHost;
-  NSString *serverPort;
-  NSArray *locationComponents = [serverHostPort componentsSeparatedByString:@":"];
-  if ([locationComponents count] > 0) {
-    serverHost = locationComponents[0];
-  }
-  if ([locationComponents count] > 1) {
-    serverPort = locationComponents[1];
-  }
   if (![scheme length]) {
     scheme = @"http";
   }
+
+  NSString *location = serverHostPort;
+  if (![location length]) {
+    location = @"localhost";
+  }
+
+  NSString *locationURLString = [location rangeOfString:@"://"].location == NSNotFound
+      ? [NSString stringWithFormat:@"%@://%@/", scheme, location]
+      : location;
+  NSURLComponents *locationURL = [NSURLComponents componentsWithString:locationURLString];
+
   NSURLComponents *const components = [NSURLComponents new];
-  components.host = serverHost ?: @"localhost";
+  components.host = locationURL.host ?: @"localhost";
   components.scheme = scheme;
-  components.port = serverPort ? @(serverPort.integerValue) : @(kRCTBundleURLProviderDefaultPort);
+  components.port = locationURL.port ?: @(kRCTBundleURLProviderDefaultPort);
   components.path = @"/message";
   components.queryItems = @[ [NSURLQueryItem queryItemWithName:@"role" value:RCTPlatformName] ];
   static dispatch_queue_t queue;

package/React/FBReactNativeSpec/FBReactNativeSpecJSI.h

@@ -236,13 +236,12 @@ protected:
     methodMap_["disableViewPreallocationAndroid"] = MethodMetadata {.argCount = 0, .invoker = __disableViewPreallocationAndroid};
     methodMap_["enableAccessibilityOrder"] = MethodMetadata {.argCount = 0, .invoker = __enableAccessibilityOrder};
     methodMap_["enableAccumulatedUpdatesInRawPropsAndroid"] = MethodMetadata {.argCount = 0, .invoker = __enableAccumulatedUpdatesInRawPropsAndroid};
-    methodMap_["enableAndroidAntialiasedBorderRadiusClipping"] = MethodMetadata {.argCount = 0, .invoker = __enableAndroidAntialiasedBorderRadiusClipping};
-    methodMap_["enableAndroidLinearText"] = MethodMetadata {.argCount = 0, .invoker = __enableAndroidLinearText};
     methodMap_["enableAndroidTextMeasurementOptimizations"] = MethodMetadata {.argCount = 0, .invoker = __enableAndroidTextMeasurementOptimizations};
     methodMap_["enableBridgelessArchitecture"] = MethodMetadata {.argCount = 0, .invoker = __enableBridgelessArchitecture};
     methodMap_["enableCppPropsIteratorSetter"] = MethodMetadata {.argCount = 0, .invoker = __enableCppPropsIteratorSetter};
     methodMap_["enableCustomFocusSearchOnClippedElementsAndroid"] = MethodMetadata {.argCount = 0, .invoker = __enableCustomFocusSearchOnClippedElementsAndroid};
     methodMap_["enableDestroyShadowTreeRevisionAsync"] = MethodMetadata {.argCount = 0, .invoker = __enableDestroyShadowTreeRevisionAsync};
+    methodMap_["enableDifferentiatorMutationVectorPreallocation"] = MethodMetadata {.argCount = 0, .invoker = __enableDifferentiatorMutationVectorPreallocation};
     methodMap_["enableDoubleMeasurementFixAndroid"] = MethodMetadata {.argCount = 0, .invoker = __enableDoubleMeasurementFixAndroid};
     methodMap_["enableEagerMainQueueModulesOnIOS"] = MethodMetadata {.argCount = 0, .invoker = __enableEagerMainQueueModulesOnIOS};
     methodMap_["enableEagerRootViewAttachment"] = MethodMetadata {.argCount = 0, .invoker = __enableEagerRootViewAttachment};
@@ -254,8 +253,6 @@ protected:
     methodMap_["enableIOSTextBaselineOffsetPerLine"] = MethodMetadata {.argCount = 0, .invoker = __enableIOSTextBaselineOffsetPerLine};
     methodMap_["enableIOSViewClipToPaddingBox"] = MethodMetadata {.argCount = 0, .invoker = __enableIOSViewClipToPaddingBox};
     methodMap_["enableImagePrefetchingAndroid"] = MethodMetadata {.argCount = 0, .invoker = __enableImagePrefetchingAndroid};
-    methodMap_["enableImagePrefetchingJNIBatchingAndroid"] = MethodMetadata {.argCount = 0, .invoker = __enableImagePrefetchingJNIBatchingAndroid};
-    methodMap_["enableImagePrefetchingOnUiThreadAndroid"] = MethodMetadata {.argCount = 0, .invoker = __enableImagePrefetchingOnUiThreadAndroid};
     methodMap_["enableImmediateUpdateModeForContentOffsetChanges"] = MethodMetadata {.argCount = 0, .invoker = __enableImmediateUpdateModeForContentOffsetChanges};
     methodMap_["enableImperativeFocus"] = MethodMetadata {.argCount = 0, .invoker = __enableImperativeFocus};
     methodMap_["enableInteropViewManagerClassLookUpOptimizationIOS"] = MethodMetadata {.argCount = 0, .invoker = __enableInteropViewManagerClassLookUpOptimizationIOS};
@@ -267,9 +264,11 @@ protected:
     methodMap_["enableModuleArgumentNSNullConversionIOS"] = MethodMetadata {.argCount = 0, .invoker = __enableModuleArgumentNSNullConversionIOS};
     methodMap_["enableMutationObserverByDefault"] = MethodMetadata {.argCount = 0, .invoker = __enableMutationObserverByDefault};
     methodMap_["enableNativeCSSParsing"] = MethodMetadata {.argCount = 0, .invoker = __enableNativeCSSParsing};
+    methodMap_["enableNativeViewPropTransformations"] = MethodMetadata {.argCount = 0, .invoker = __enableNativeViewPropTransformations};
     methodMap_["enableNetworkEventReporting"] = MethodMetadata {.argCount = 0, .invoker = __enableNetworkEventReporting};
     methodMap_["enablePreparedTextLayout"] = MethodMetadata {.argCount = 0, .invoker = __enablePreparedTextLayout};
     methodMap_["enablePropsUpdateReconciliationAndroid"] = MethodMetadata {.argCount = 0, .invoker = __enablePropsUpdateReconciliationAndroid};
+    methodMap_["enableSchedulerDelegateInvalidation"] = MethodMetadata {.argCount = 0, .invoker = __enableSchedulerDelegateInvalidation};
     methodMap_["enableSwiftUIBasedFilters"] = MethodMetadata {.argCount = 0, .invoker = __enableSwiftUIBasedFilters};
     methodMap_["enableViewCulling"] = MethodMetadata {.argCount = 0, .invoker = __enableViewCulling};
     methodMap_["enableViewRecycling"] = MethodMetadata {.argCount = 0, .invoker = __enableViewRecycling};
@@ -279,9 +278,10 @@ protected:
     methodMap_["enableViewRecyclingForView"] = MethodMetadata {.argCount = 0, .invoker = __enableViewRecyclingForView};
     methodMap_["enableVirtualViewContainerStateExperimental"] = MethodMetadata {.argCount = 0, .invoker = __enableVirtualViewContainerStateExperimental};
     methodMap_["enableVirtualViewDebugFeatures"] = MethodMetadata {.argCount = 0, .invoker = __enableVirtualViewDebugFeatures};
+    methodMap_["fixDifferentiatorParentTagForUnflattenCase"] = MethodMetadata {.argCount = 0, .invoker = __fixDifferentiatorParentTagForUnflattenCase};
     methodMap_["fixFindShadowNodeByTagRaceCondition"] = MethodMetadata {.argCount = 0, .invoker = __fixFindShadowNodeByTagRaceCondition};
     methodMap_["fixMappingOfEventPrioritiesBetweenFabricAndReact"] = MethodMetadata {.argCount = 0, .invoker = __fixMappingOfEventPrioritiesBetweenFabricAndReact};
-    methodMap_["fixTextClippingAndroid15useBoundsForWidth"] = MethodMetadata {.argCount = 0, .invoker = __fixTextClippingAndroid15useBoundsForWidth};
+    methodMap_["fixYogaFlexBasisFitContentInMainAxis"] = MethodMetadata {.argCount = 0, .invoker = __fixYogaFlexBasisFitContentInMainAxis};
     methodMap_["fuseboxAssertSingleHostState"] = MethodMetadata {.argCount = 0, .invoker = __fuseboxAssertSingleHostState};
     methodMap_["fuseboxEnabledRelease"] = MethodMetadata {.argCount = 0, .invoker = __fuseboxEnabledRelease};
     methodMap_["fuseboxFrameRecordingEnabled"] = MethodMetadata {.argCount = 0, .invoker = __fuseboxFrameRecordingEnabled};
@@ -298,14 +298,16 @@ protected:
     methodMap_["shouldPressibilityUseW3CPointerEventsForHover"] = MethodMetadata {.argCount = 0, .invoker = __shouldPressibilityUseW3CPointerEventsForHover};
     methodMap_["shouldTriggerResponderTransferOnScrollAndroid"] = MethodMetadata {.argCount = 0, .invoker = __shouldTriggerResponderTransferOnScrollAndroid};
     methodMap_["skipActivityIdentityAssertionOnHostPause"] = MethodMetadata {.argCount = 0, .invoker = __skipActivityIdentityAssertionOnHostPause};
-    methodMap_["syncAndroidClipToPaddingWithOverflow"] = MethodMetadata {.argCount = 0, .invoker = __syncAndroidClipToPaddingWithOverflow};
+    methodMap_["syncAndroidClipBoundsWithOverflow"] = MethodMetadata {.argCount = 0, .invoker = __syncAndroidClipBoundsWithOverflow};
     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_["useLISAlgorithmInDifferentiator"] = MethodMetadata {.argCount = 0, .invoker = __useLISAlgorithmInDifferentiator};
     methodMap_["useNativeViewConfigsInBridgelessMode"] = MethodMetadata {.argCount = 0, .invoker = __useNativeViewConfigsInBridgelessMode};
     methodMap_["useNestedScrollViewAndroid"] = MethodMetadata {.argCount = 0, .invoker = __useNestedScrollViewAndroid};
+    methodMap_["useOptimizedViewRegistryOnAndroid"] = MethodMetadata {.argCount = 0, .invoker = __useOptimizedViewRegistryOnAndroid};
     methodMap_["useSharedAnimatedBackend"] = MethodMetadata {.argCount = 0, .invoker = __useSharedAnimatedBackend};
     methodMap_["useTraitHiddenOnAndroid"] = MethodMetadata {.argCount = 0, .invoker = __useTraitHiddenOnAndroid};
     methodMap_["useTurboModuleInterop"] = MethodMetadata {.argCount = 0, .invoker = __useTurboModuleInterop};
@@ -408,20 +410,6 @@ private:
     return bridging::callFromJs<bool>(rt, &T::enableAccumulatedUpdatesInRawPropsAndroid,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
   }
 
-  static jsi::Value __enableAndroidAntialiasedBorderRadiusClipping(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
-    static_assert(
-      bridging::getParameterCount(&T::enableAndroidAntialiasedBorderRadiusClipping) == 1,
-      "Expected enableAndroidAntialiasedBorderRadiusClipping(...) to have 1 parameters");
-    return bridging::callFromJs<bool>(rt, &T::enableAndroidAntialiasedBorderRadiusClipping,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
-  }
-
-  static jsi::Value __enableAndroidLinearText(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
-    static_assert(
-      bridging::getParameterCount(&T::enableAndroidLinearText) == 1,
-      "Expected enableAndroidLinearText(...) to have 1 parameters");
-    return bridging::callFromJs<bool>(rt, &T::enableAndroidLinearText,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
-  }
-
   static jsi::Value __enableAndroidTextMeasurementOptimizations(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
     static_assert(
       bridging::getParameterCount(&T::enableAndroidTextMeasurementOptimizations) == 1,
@@ -457,6 +445,13 @@ private:
     return bridging::callFromJs<bool>(rt, &T::enableDestroyShadowTreeRevisionAsync,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
   }
 
+  static jsi::Value __enableDifferentiatorMutationVectorPreallocation(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
+    static_assert(
+      bridging::getParameterCount(&T::enableDifferentiatorMutationVectorPreallocation) == 1,
+      "Expected enableDifferentiatorMutationVectorPreallocation(...) to have 1 parameters");
+    return bridging::callFromJs<bool>(rt, &T::enableDifferentiatorMutationVectorPreallocation,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
+  }
+
   static jsi::Value __enableDoubleMeasurementFixAndroid(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
     static_assert(
       bridging::getParameterCount(&T::enableDoubleMeasurementFixAndroid) == 1,
@@ -534,20 +529,6 @@ private:
     return bridging::callFromJs<bool>(rt, &T::enableImagePrefetchingAndroid,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
   }
 
-  static jsi::Value __enableImagePrefetchingJNIBatchingAndroid(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
-    static_assert(
-      bridging::getParameterCount(&T::enableImagePrefetchingJNIBatchingAndroid) == 1,
-      "Expected enableImagePrefetchingJNIBatchingAndroid(...) to have 1 parameters");
-    return bridging::callFromJs<bool>(rt, &T::enableImagePrefetchingJNIBatchingAndroid,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
-  }
-
-  static jsi::Value __enableImagePrefetchingOnUiThreadAndroid(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
-    static_assert(
-      bridging::getParameterCount(&T::enableImagePrefetchingOnUiThreadAndroid) == 1,
-      "Expected enableImagePrefetchingOnUiThreadAndroid(...) to have 1 parameters");
-    return bridging::callFromJs<bool>(rt, &T::enableImagePrefetchingOnUiThreadAndroid,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
-  }
-
   static jsi::Value __enableImmediateUpdateModeForContentOffsetChanges(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
     static_assert(
       bridging::getParameterCount(&T::enableImmediateUpdateModeForContentOffsetChanges) == 1,
@@ -625,6 +606,13 @@ private:
     return bridging::callFromJs<bool>(rt, &T::enableNativeCSSParsing,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
   }
 
+  static jsi::Value __enableNativeViewPropTransformations(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
+    static_assert(
+      bridging::getParameterCount(&T::enableNativeViewPropTransformations) == 1,
+      "Expected enableNativeViewPropTransformations(...) to have 1 parameters");
+    return bridging::callFromJs<bool>(rt, &T::enableNativeViewPropTransformations,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
+  }
+
   static jsi::Value __enableNetworkEventReporting(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
     static_assert(
       bridging::getParameterCount(&T::enableNetworkEventReporting) == 1,
@@ -646,6 +634,13 @@ private:
     return bridging::callFromJs<bool>(rt, &T::enablePropsUpdateReconciliationAndroid,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
   }
 
+  static jsi::Value __enableSchedulerDelegateInvalidation(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
+    static_assert(
+      bridging::getParameterCount(&T::enableSchedulerDelegateInvalidation) == 1,
+      "Expected enableSchedulerDelegateInvalidation(...) to have 1 parameters");
+    return bridging::callFromJs<bool>(rt, &T::enableSchedulerDelegateInvalidation,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
+  }
+
   static jsi::Value __enableSwiftUIBasedFilters(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
     static_assert(
       bridging::getParameterCount(&T::enableSwiftUIBasedFilters) == 1,
@@ -709,6 +704,13 @@ private:
     return bridging::callFromJs<bool>(rt, &T::enableVirtualViewDebugFeatures,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
   }
 
+  static jsi::Value __fixDifferentiatorParentTagForUnflattenCase(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
+    static_assert(
+      bridging::getParameterCount(&T::fixDifferentiatorParentTagForUnflattenCase) == 1,
+      "Expected fixDifferentiatorParentTagForUnflattenCase(...) to have 1 parameters");
+    return bridging::callFromJs<bool>(rt, &T::fixDifferentiatorParentTagForUnflattenCase,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
+  }
+
   static jsi::Value __fixFindShadowNodeByTagRaceCondition(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
     static_assert(
       bridging::getParameterCount(&T::fixFindShadowNodeByTagRaceCondition) == 1,
@@ -723,11 +725,11 @@ private:
     return bridging::callFromJs<bool>(rt, &T::fixMappingOfEventPrioritiesBetweenFabricAndReact,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
   }
 
-  static jsi::Value __fixTextClippingAndroid15useBoundsForWidth(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
+  static jsi::Value __fixYogaFlexBasisFitContentInMainAxis(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
     static_assert(
-      bridging::getParameterCount(&T::fixTextClippingAndroid15useBoundsForWidth) == 1,
-      "Expected fixTextClippingAndroid15useBoundsForWidth(...) to have 1 parameters");
-    return bridging::callFromJs<bool>(rt, &T::fixTextClippingAndroid15useBoundsForWidth,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
+      bridging::getParameterCount(&T::fixYogaFlexBasisFitContentInMainAxis) == 1,
+      "Expected fixYogaFlexBasisFitContentInMainAxis(...) to have 1 parameters");
+    return bridging::callFromJs<bool>(rt, &T::fixYogaFlexBasisFitContentInMainAxis,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
   }
 
   static jsi::Value __fuseboxAssertSingleHostState(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
@@ -842,11 +844,11 @@ 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 jsi::Value __syncAndroidClipBoundsWithOverflow(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));
+      bridging::getParameterCount(&T::syncAndroidClipBoundsWithOverflow) == 1,
+      "Expected syncAndroidClipBoundsWithOverflow(...) to have 1 parameters");
+    return bridging::callFromJs<bool>(rt, &T::syncAndroidClipBoundsWithOverflow,  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*/) {
@@ -884,6 +886,13 @@ private:
     return bridging::callFromJs<bool>(rt, &T::useFabricInterop,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
   }
 
+  static jsi::Value __useLISAlgorithmInDifferentiator(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
+    static_assert(
+      bridging::getParameterCount(&T::useLISAlgorithmInDifferentiator) == 1,
+      "Expected useLISAlgorithmInDifferentiator(...) to have 1 parameters");
+    return bridging::callFromJs<bool>(rt, &T::useLISAlgorithmInDifferentiator,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
+  }
+
   static jsi::Value __useNativeViewConfigsInBridgelessMode(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
     static_assert(
       bridging::getParameterCount(&T::useNativeViewConfigsInBridgelessMode) == 1,
@@ -898,6 +907,13 @@ private:
     return bridging::callFromJs<bool>(rt, &T::useNestedScrollViewAndroid,  static_cast<NativeReactNativeFeatureFlagsCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule));
   }
 
+  static jsi::Value __useOptimizedViewRegistryOnAndroid(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* /*args*/, size_t /*count*/) {
+    static_assert(
+      bridging::getParameterCount(&T::useOptimizedViewRegistryOnAndroid) == 1,
+      "Expected useOptimizedViewRegistryOnAndroid(...) to have 1 parameters");
+    return bridging::callFromJs<bool>(rt, &T::useOptimizedViewRegistryOnAndroid,  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*/) {
     static_assert(
       bridging::getParameterCount(&T::useSharedAnimatedBackend) == 1,
@@ -5450,7 +5466,7 @@ private:
 
 #pragma mark - NativeFantomNativeEventCategory
 
-enum class NativeFantomNativeEventCategory { ContinuousStart, ContinuousEnd, Unspecified, Discrete, Continuous, Idle };
+enum class NativeFantomNativeEventCategory { ContinuousStart = 0, ContinuousEnd = 1, Unspecified = 2, Discrete = 3, Continuous = 4, Idle = 5 };
 
 template <>
 struct Bridging<NativeFantomNativeEventCategory> {
@@ -5922,6 +5938,55 @@ private:
 };
 
 
+template <typename T>
+class JSI_EXPORT NativeViewTransitionCxxSpec : public TurboModule {
+public:
+  static constexpr std::string_view kModuleName = "NativeViewTransitionCxx";
+
+protected:
+  NativeViewTransitionCxxSpec(std::shared_ptr<CallInvoker> jsInvoker) : TurboModule(std::string{NativeViewTransitionCxxSpec::kModuleName}, jsInvoker) {
+    methodMap_["getViewTransitionInstance"] = MethodMetadata {.argCount = 2, .invoker = __getViewTransitionInstance};
+    methodMap_["findPseudoElementShadowNodeByTag"] = MethodMetadata {.argCount = 1, .invoker = __findPseudoElementShadowNodeByTag};
+    methodMap_["waitForTransitionAnimation"] = MethodMetadata {.argCount = 1, .invoker = __waitForTransitionAnimation};
+    methodMap_["transitionAnimationFinished"] = MethodMetadata {.argCount = 1, .invoker = __transitionAnimationFinished};
+  }
+  
+private:
+  static jsi::Value __getViewTransitionInstance(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+    static_assert(
+      bridging::getParameterCount(&T::getViewTransitionInstance) == 3,
+      "Expected getViewTransitionInstance(...) to have 3 parameters");
+    auto result = bridging::callFromJs<std::optional<jsi::Object>>(rt, &T::getViewTransitionInstance,  static_cast<NativeViewTransitionCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule),
+      count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asString(rt),
+      count <= 1 ? throw jsi::JSError(rt, "Expected argument in position 1 to be passed") : args[1].asString(rt));return result ? jsi::Value(std::move(*result)) : jsi::Value::null();
+  }
+
+  static jsi::Value __findPseudoElementShadowNodeByTag(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+    static_assert(
+      bridging::getParameterCount(&T::findPseudoElementShadowNodeByTag) == 2,
+      "Expected findPseudoElementShadowNodeByTag(...) to have 2 parameters");
+    auto result = bridging::callFromJs<std::optional<jsi::Value>>(rt, &T::findPseudoElementShadowNodeByTag,  static_cast<NativeViewTransitionCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule),
+      count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asNumber());return result ? jsi::Value(std::move(*result)) : jsi::Value::null();
+  }
+
+  static jsi::Value __waitForTransitionAnimation(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+    static_assert(
+      bridging::getParameterCount(&T::waitForTransitionAnimation) == 2,
+      "Expected waitForTransitionAnimation(...) to have 2 parameters");
+    bridging::callFromJs<void>(rt, &T::waitForTransitionAnimation,  static_cast<NativeViewTransitionCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule),
+      count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asNumber());return jsi::Value::undefined();
+  }
+
+  static jsi::Value __transitionAnimationFinished(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+    static_assert(
+      bridging::getParameterCount(&T::transitionAnimationFinished) == 2,
+      "Expected transitionAnimationFinished(...) to have 2 parameters");
+    bridging::callFromJs<void>(rt, &T::transitionAnimationFinished,  static_cast<NativeViewTransitionCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule),
+      count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asNumber());return jsi::Value::undefined();
+  }
+};
+
+
 template <typename T>
 class JSI_EXPORT NativeDOMCxxSpec : public TurboModule {
 public:

package/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.h

@@ -42,6 +42,7 @@ Class<RCTComponentViewProtocol> RCTScrollViewCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTTextInputCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTUnimplementedNativeViewCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTViewCls(void) __attribute__((used));
+Class<RCTComponentViewProtocol> VirtualViewCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTImageCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTModalHostViewCls(void) __attribute__((used));
 

package/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.mm

@@ -31,6 +31,7 @@ Class<RCTComponentViewProtocol> RCTFabricComponentsProvider(const char *name) {
     {"TextInput", RCTTextInputCls},
     {"UnimplementedNativeView", RCTUnimplementedNativeViewCls},
     {"View", RCTViewCls},
+    {"VirtualView", VirtualViewCls},
     {"Image", RCTImageCls},
     {"ModalHostView", RCTModalHostViewCls},
   };

package/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h

@@ -36,7 +36,7 @@ NS_ASSUME_NONNULL_BEGIN
 /*
  * Returns an actual UIScrollView that this component uses under the hood.
  */
-@property (nonatomic, strong, readonly) UIScrollView *scrollView;
+@property (nonatomic, strong, readwrite) UIScrollView *scrollView;
 
 /** Focus area of newly-activated text input relative to the window to compare against UIKeyboardFrameBegin/End */
 @property (nonatomic, assign) CGRect firstResponderFocus;

package/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm

@@ -1171,13 +1171,20 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
   self->_eventEmitter->onBlur();
 }
 
-// Focus marker helper: traverses view hierarchy to find scrollSnapAlign prop
-// Returns the view that has the property via the output parameter
-- (NSString *)findScrollSnapAlignInView:(UIView *)view foundView:(UIView **)outView
+// Focus marker helper: traverses view hierarchy to find either scrollSnapAlign
+// or scrollSnapOffset. Returns the view that has the property via the output
+// parameter and the marker type via outAlign/outOffset (exactly one non-nil on
+// return). Walk is inner→outer, latest marker wins (same as PR-1068's
+// scrollSnapAlign behavior). On a single view declaring both, scrollSnapOffset
+// wins as the more specific config.
+- (UIView *)findScrollSnapInView:(UIView *)view
+                        outAlign:(NSString **)outAlign
+                       outOffset:(NSNumber **)outOffset
 {
     UIView *testView = view;
     UIView *snapTarget;
-    NSString *marker;
+    NSString *align;
+    NSNumber *offset;
 
     while (testView && testView != self) {
         if (![testView isKindOfClass:RCTViewComponentView.class])
@@ -1188,28 +1195,37 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
         RCTViewComponentView *componentView = (RCTViewComponentView *)testView;
 
         const auto &viewProps = static_cast<const facebook::react::BaseViewProps &>(*componentView.props);
-        if (viewProps.scrollSnapAlign.has_value() && !viewProps.scrollSnapAlign.value().empty()) {
-            marker = [NSString stringWithUTF8String:viewProps.scrollSnapAlign.value().c_str()];
+        if (viewProps.scrollSnapOffset.has_value()) {
+            offset = @(viewProps.scrollSnapOffset.value());
+            align = nil;
+            snapTarget = componentView;
+        } else if (viewProps.scrollSnapAlign.has_value() && !viewProps.scrollSnapAlign.value().empty()) {
+            align = [NSString stringWithUTF8String:viewProps.scrollSnapAlign.value().c_str()];
+            offset = nil;
             snapTarget = componentView;
         }
 
         testView = [testView superview];
     }
-    *outView = snapTarget;
-    return marker;
+    *outAlign = align;
+    *outOffset = offset;
+    return snapTarget;
 }
 
 - (void)_handleScrollSnapForFocusedView:(UIView *)focusedView
 {
     const auto &scrollProps = static_cast<const ScrollViewProps &>(*_props);
-    UIView *snapAlignView = nil;
-    NSString *scrollSnapAlign = [self findScrollSnapAlignInView:focusedView foundView:&snapAlignView];
-    if (scrollSnapAlign == nil || snapAlignView == nil) {
+
+    NSString *scrollSnapAlign = nil;
+    NSNumber *scrollSnapOffset = nil;
+    UIView *snapTargetView = [self findScrollSnapInView:focusedView
+                                               outAlign:&scrollSnapAlign
+                                              outOffset:&scrollSnapOffset];
+    if (snapTargetView == nil || (scrollSnapAlign == nil && scrollSnapOffset == nil)) {
         return;
     }
-
     RCTEnhancedScrollView *scrollView = (RCTEnhancedScrollView *)_scrollView;
-    CGRect focusedFrame = [snapAlignView convertRect:snapAlignView.bounds toView:_scrollView];
+    CGRect focusedFrame = [snapTargetView convertRect:snapTargetView.bounds toView:_scrollView];
     CGFloat targetOffset;
     CGFloat snapToItemPadding = scrollProps.snapToItemPadding;
 
@@ -1229,8 +1245,12 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
         currentOffset = scrollView.contentOffset.y;
         maxContentSize = scrollView.contentSize.height;
     }
-    // Calculate target offset based on scrollSnapAlign (unified for both axes)
-    if ([scrollSnapAlign isEqualToString:@"start"]) {
+
+    if (scrollSnapOffset != nil) {
+        // Per-item pixel offset path: land the snap target's leading edge
+        // at viewport coordinate = scrollSnapOffset.
+        targetOffset = focusedOrigin - scrollSnapOffset.doubleValue;
+    } else if ([scrollSnapAlign isEqualToString:@"start"]) {
         targetOffset = focusedOrigin - snapToItemPadding;
     } else if ([scrollSnapAlign isEqualToString:@"center"]) {
         CGFloat viewportCenter = viewportSize / 2;

package/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm

@@ -715,10 +715,10 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
   return {
       .text = RCTStringFromNSString(_backedTextInputView.attributedText.string),
       .selectionRange = [self _selectionRange],
-      .eventCount = static_cast<int>(_mostRecentEventCount),
+      .contentSize = RCTSizeFromCGSize(_backedTextInputView.contentSize),
       .contentOffset = RCTPointFromCGPoint(_backedTextInputView.contentOffset),
       .contentInset = RCTEdgeInsetsFromUIEdgeInsets(_backedTextInputView.contentInset),
-      .contentSize = RCTSizeFromCGSize(_backedTextInputView.contentSize),
+      .eventCount = static_cast<int>(_mostRecentEventCount),
       .layoutMeasurement = RCTSizeFromCGSize(_backedTextInputView.bounds.size),
       .zoomScale = _backedTextInputView.zoomScale,
   };