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

package/ReactCommon/react/featureflags/tests/test_rewrite_feature_flag_defaults.py

@@ -0,0 +1,60 @@
+# 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.
+
+# pyre-strict
+
+from __future__ import annotations
+
+import os
+import unittest
+
+from rewrite_feature_flag_defaults import cxx_literal, rewrite
+
+
+def _load_header() -> bytes:
+    with open(os.environ["HEADER_PATH"], "rb") as f:
+        return f.read()
+
+
+class RewriteFeatureFlagDefaultsTest(unittest.TestCase):
+    def setUp(self) -> None:
+        self.source = _load_header()
+
+    def test_empty_overrides_is_passthrough(self) -> None:
+        self.assertEqual(rewrite(self.source, {}), self.source)
+
+    def test_override_bool_to_true(self) -> None:
+        result = rewrite(self.source, {"commonTestFlag": True})
+        start, end = self._method_body_range(result, "commonTestFlag")
+        self.assertIn(b"return true;", result[start:end])
+
+    def test_override_bool_to_false(self) -> None:
+        result = rewrite(self.source, {"commonTestFlag": False})
+        start, end = self._method_body_range(result, "commonTestFlag")
+        self.assertIn(b"return false;", result[start:end])
+
+    def test_cxx_literal_int_produces_double(self) -> None:
+        self.assertEqual(cxx_literal(42), "42.0")
+
+    def test_cxx_literal_float(self) -> None:
+        self.assertEqual(cxx_literal(3.14), "3.14")
+
+    def test_unmatched_flag_raises(self) -> None:
+        with self.assertRaises(ValueError):
+            rewrite(self.source, {"bogusFlag": True})
+
+    def test_only_target_method_body_changes(self) -> None:
+        result = rewrite(self.source, {"commonTestFlag": True})
+        src_start, src_end = self._method_body_range(self.source, "commonTestFlag")
+        res_start, res_end = self._method_body_range(result, "commonTestFlag")
+        self.assertEqual(self.source[:src_start], result[:res_start])
+        self.assertEqual(self.source[src_end:], result[res_end:])
+
+    def _method_body_range(self, source: bytes, name: str) -> tuple[int, int]:
+        idx = source.find(name.encode())
+        self.assertNotEqual(idx, -1, f"{name} not found in output")
+        open_brace = source.find(b"{", idx)
+        close_brace = source.find(b"}", open_brace)
+        return (open_brace, close_brace + 1)

package/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTInteropTurboModule.h

@@ -34,9 +34,7 @@ class JSI_EXPORT ObjCInteropTurboModule : public ObjCTurboModule {
   jsi::Value create(jsi::Runtime &runtime, const jsi::PropNameID &propName) override;
 
   /**
-   * Why is this overriden?
-   *
-   * Purpose: Converts native module method returns from Objective C values to JavaScript values.
+   * Converts native module method returns from Objective C values to JavaScript values.
    *
    * ObjCTurboModule converts returns by returnType. But, Legacy native modules convert returns by the Objective C type:
    * React Native cannot infer a method's returnType from the RCT_EXPORT_METHOD annotations.
@@ -48,9 +46,7 @@ class JSI_EXPORT ObjCInteropTurboModule : public ObjCTurboModule {
       id result) override;
 
   /**
-   * Why is this overriden?
-   *
-   * Purpose: Get a native module method's argument's type, given the method name, and argument index.
+   * Get a native module method's argument's type, given the method name, and argument index.
    *
    * This override is meant to serve as a performance optimization.
    *
@@ -63,9 +59,7 @@ class JSI_EXPORT ObjCInteropTurboModule : public ObjCTurboModule {
   NSString *getArgumentTypeName(jsi::Runtime &runtime, NSString *methodName, int argIndex) override;
 
   /**
-   * Why is this overriden?
-   *
-   * Purpose: Convert arguments from JavaScript values to Objective C values. Assign the Objective C argument to the
+   * Convert arguments from JavaScript values to Objective C values. Assign the Objective C argument to the
    * method invocation.
    *
    * ObjCTurboModule tries to minimize reliance on RCTConvert for argument conversion. Why: RCTConvert relies on the

package/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModule.mm

@@ -156,7 +156,6 @@ convertJSIFunctionToCallback(jsi::Runtime &rt, jsi::Function &&function, const s
   return ^(NSArray *args) {
     if (!callback) {
       LOG(FATAL) << "Callback arg cannot be called more than once";
-      return;
     }
 
     callback->call([args](jsi::Runtime &rt, jsi::Function &jsFunction) {

package/ReactCommon/react/nativemodule/defaults/CMakeLists.txt

@@ -23,6 +23,7 @@ target_link_libraries(react_nativemodule_defaults
         react_nativemodule_idlecallbacks
         react_nativemodule_intersectionobserver
         react_nativemodule_mutationobserver
+        react_nativemodule_viewtransition
         react_nativemodule_webperformance
         react_renderer_animated
 )

package/ReactCommon/react/nativemodule/defaults/DefaultTurboModules.cpp

@@ -13,6 +13,7 @@
 #include <react/nativemodule/intersectionobserver/NativeIntersectionObserver.h>
 #include <react/nativemodule/microtasks/NativeMicrotasks.h>
 #include <react/nativemodule/mutationobserver/NativeMutationObserver.h>
+#include <react/nativemodule/viewtransition/NativeViewTransition.h>
 #include <react/nativemodule/webperformance/NativePerformance.h>
 #include <react/renderer/animated/AnimatedModule.h>
 
@@ -57,6 +58,12 @@ namespace facebook::react {
     }
   }
 
+  if (ReactNativeFeatureFlags::viewTransitionEnabled()) {
+    if (name == NativeViewTransition::kModuleName) {
+      return std::make_shared<NativeViewTransition>(jsInvoker);
+    }
+  }
+
   if (ReactNativeFeatureFlags::cxxNativeAnimatedEnabled() &&
       ReactNativeFeatureFlags::useSharedAnimatedBackend() &&
       name == AnimatedModule::kModuleName) {

package/ReactCommon/react/nativemodule/defaults/React-defaultsnativemodule.podspec

@@ -54,6 +54,7 @@ Pod::Spec.new do |s|
   s.dependency "React-idlecallbacksnativemodule"
   s.dependency "React-intersectionobservernativemodule"
   s.dependency "React-mutationobservernativemodule"
+  s.dependency "React-viewtransitionnativemodule"
   s.dependency "React-webperformancenativemodule"
   s.dependency "React-Fabric/animated"
   add_dependency(s, "React-RCTFBReactNativeSpec")

package/ReactCommon/react/nativemodule/fantomtestspecificmethods/NativeFantomTestSpecificMethods.cpp

@@ -46,8 +46,8 @@ void NativeFantomTestSpecificMethods::registerForcedCloneCommitHook(
 }
 
 void NativeFantomTestSpecificMethods::takeFunctionAndNoop(
-    jsi::Runtime& runtime,
-    jsi::Function function) {}
+    jsi::Runtime& /* runtime */,
+    jsi::Function /* callback */) {}
 
 void NativeFantomTestSpecificMethods::setRootNodeSize(
     jsi::Runtime& runtime,

package/ReactCommon/react/nativemodule/featureflags/NativeReactNativeFeatureFlags.cpp

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<4dd16dbf31dc31860960aa2abcb7862d>>
+ * @generated SignedSource<<80e1d4551c51800c138f16228cfae9f6>>
  */
 
 /**
@@ -104,16 +104,6 @@ bool NativeReactNativeFeatureFlags::enableAccumulatedUpdatesInRawPropsAndroid(
   return ReactNativeFeatureFlags::enableAccumulatedUpdatesInRawPropsAndroid();
 }
 
-bool NativeReactNativeFeatureFlags::enableAndroidAntialiasedBorderRadiusClipping(
-    jsi::Runtime& /*runtime*/) {
-  return ReactNativeFeatureFlags::enableAndroidAntialiasedBorderRadiusClipping();
-}
-
-bool NativeReactNativeFeatureFlags::enableAndroidLinearText(
-    jsi::Runtime& /*runtime*/) {
-  return ReactNativeFeatureFlags::enableAndroidLinearText();
-}
-
 bool NativeReactNativeFeatureFlags::enableAndroidTextMeasurementOptimizations(
     jsi::Runtime& /*runtime*/) {
   return ReactNativeFeatureFlags::enableAndroidTextMeasurementOptimizations();
@@ -139,6 +129,11 @@ bool NativeReactNativeFeatureFlags::enableDestroyShadowTreeRevisionAsync(
   return ReactNativeFeatureFlags::enableDestroyShadowTreeRevisionAsync();
 }
 
+bool NativeReactNativeFeatureFlags::enableDifferentiatorMutationVectorPreallocation(
+    jsi::Runtime& /*runtime*/) {
+  return ReactNativeFeatureFlags::enableDifferentiatorMutationVectorPreallocation();
+}
+
 bool NativeReactNativeFeatureFlags::enableDoubleMeasurementFixAndroid(
     jsi::Runtime& /*runtime*/) {
   return ReactNativeFeatureFlags::enableDoubleMeasurementFixAndroid();
@@ -194,16 +189,6 @@ bool NativeReactNativeFeatureFlags::enableImagePrefetchingAndroid(
   return ReactNativeFeatureFlags::enableImagePrefetchingAndroid();
 }
 
-bool NativeReactNativeFeatureFlags::enableImagePrefetchingJNIBatchingAndroid(
-    jsi::Runtime& /*runtime*/) {
-  return ReactNativeFeatureFlags::enableImagePrefetchingJNIBatchingAndroid();
-}
-
-bool NativeReactNativeFeatureFlags::enableImagePrefetchingOnUiThreadAndroid(
-    jsi::Runtime& /*runtime*/) {
-  return ReactNativeFeatureFlags::enableImagePrefetchingOnUiThreadAndroid();
-}
-
 bool NativeReactNativeFeatureFlags::enableImmediateUpdateModeForContentOffsetChanges(
     jsi::Runtime& /*runtime*/) {
   return ReactNativeFeatureFlags::enableImmediateUpdateModeForContentOffsetChanges();
@@ -259,6 +244,11 @@ bool NativeReactNativeFeatureFlags::enableNativeCSSParsing(
   return ReactNativeFeatureFlags::enableNativeCSSParsing();
 }
 
+bool NativeReactNativeFeatureFlags::enableNativeViewPropTransformations(
+    jsi::Runtime& /*runtime*/) {
+  return ReactNativeFeatureFlags::enableNativeViewPropTransformations();
+}
+
 bool NativeReactNativeFeatureFlags::enableNetworkEventReporting(
     jsi::Runtime& /*runtime*/) {
   return ReactNativeFeatureFlags::enableNetworkEventReporting();
@@ -274,6 +264,11 @@ bool NativeReactNativeFeatureFlags::enablePropsUpdateReconciliationAndroid(
   return ReactNativeFeatureFlags::enablePropsUpdateReconciliationAndroid();
 }
 
+bool NativeReactNativeFeatureFlags::enableSchedulerDelegateInvalidation(
+    jsi::Runtime& /*runtime*/) {
+  return ReactNativeFeatureFlags::enableSchedulerDelegateInvalidation();
+}
+
 bool NativeReactNativeFeatureFlags::enableSwiftUIBasedFilters(
     jsi::Runtime& /*runtime*/) {
   return ReactNativeFeatureFlags::enableSwiftUIBasedFilters();
@@ -319,6 +314,11 @@ bool NativeReactNativeFeatureFlags::enableVirtualViewDebugFeatures(
   return ReactNativeFeatureFlags::enableVirtualViewDebugFeatures();
 }
 
+bool NativeReactNativeFeatureFlags::fixDifferentiatorParentTagForUnflattenCase(
+    jsi::Runtime& /*runtime*/) {
+  return ReactNativeFeatureFlags::fixDifferentiatorParentTagForUnflattenCase();
+}
+
 bool NativeReactNativeFeatureFlags::fixFindShadowNodeByTagRaceCondition(
     jsi::Runtime& /*runtime*/) {
   return ReactNativeFeatureFlags::fixFindShadowNodeByTagRaceCondition();
@@ -329,9 +329,9 @@ bool NativeReactNativeFeatureFlags::fixMappingOfEventPrioritiesBetweenFabricAndR
   return ReactNativeFeatureFlags::fixMappingOfEventPrioritiesBetweenFabricAndReact();
 }
 
-bool NativeReactNativeFeatureFlags::fixTextClippingAndroid15useBoundsForWidth(
+bool NativeReactNativeFeatureFlags::fixYogaFlexBasisFitContentInMainAxis(
     jsi::Runtime& /*runtime*/) {
-  return ReactNativeFeatureFlags::fixTextClippingAndroid15useBoundsForWidth();
+  return ReactNativeFeatureFlags::fixYogaFlexBasisFitContentInMainAxis();
 }
 
 bool NativeReactNativeFeatureFlags::fuseboxAssertSingleHostState(
@@ -414,9 +414,9 @@ bool NativeReactNativeFeatureFlags::skipActivityIdentityAssertionOnHostPause(
   return ReactNativeFeatureFlags::skipActivityIdentityAssertionOnHostPause();
 }
 
-bool NativeReactNativeFeatureFlags::syncAndroidClipToPaddingWithOverflow(
+bool NativeReactNativeFeatureFlags::syncAndroidClipBoundsWithOverflow(
     jsi::Runtime& /*runtime*/) {
-  return ReactNativeFeatureFlags::syncAndroidClipToPaddingWithOverflow();
+  return ReactNativeFeatureFlags::syncAndroidClipBoundsWithOverflow();
 }
 
 bool NativeReactNativeFeatureFlags::traceTurboModulePromiseRejectionsOnAndroid(
@@ -444,6 +444,11 @@ bool NativeReactNativeFeatureFlags::useFabricInterop(
   return ReactNativeFeatureFlags::useFabricInterop();
 }
 
+bool NativeReactNativeFeatureFlags::useLISAlgorithmInDifferentiator(
+    jsi::Runtime& /*runtime*/) {
+  return ReactNativeFeatureFlags::useLISAlgorithmInDifferentiator();
+}
+
 bool NativeReactNativeFeatureFlags::useNativeViewConfigsInBridgelessMode(
     jsi::Runtime& /*runtime*/) {
   return ReactNativeFeatureFlags::useNativeViewConfigsInBridgelessMode();
@@ -454,6 +459,11 @@ bool NativeReactNativeFeatureFlags::useNestedScrollViewAndroid(
   return ReactNativeFeatureFlags::useNestedScrollViewAndroid();
 }
 
+bool NativeReactNativeFeatureFlags::useOptimizedViewRegistryOnAndroid(
+    jsi::Runtime& /*runtime*/) {
+  return ReactNativeFeatureFlags::useOptimizedViewRegistryOnAndroid();
+}
+
 bool NativeReactNativeFeatureFlags::useSharedAnimatedBackend(
     jsi::Runtime& /*runtime*/) {
   return ReactNativeFeatureFlags::useSharedAnimatedBackend();

package/ReactCommon/react/nativemodule/featureflags/NativeReactNativeFeatureFlags.h

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<ed4a87c5d258ebf5aa61e7d74d1b09be>>
+ * @generated SignedSource<<1df283aec4b56f36271a187341e7103d>>
  */
 
 /**
@@ -60,10 +60,6 @@ class NativeReactNativeFeatureFlags
 
   bool enableAccumulatedUpdatesInRawPropsAndroid(jsi::Runtime& runtime);
 
-  bool enableAndroidAntialiasedBorderRadiusClipping(jsi::Runtime& runtime);
-
-  bool enableAndroidLinearText(jsi::Runtime& runtime);
-
   bool enableAndroidTextMeasurementOptimizations(jsi::Runtime& runtime);
 
   bool enableBridgelessArchitecture(jsi::Runtime& runtime);
@@ -74,6 +70,8 @@ class NativeReactNativeFeatureFlags
 
   bool enableDestroyShadowTreeRevisionAsync(jsi::Runtime& runtime);
 
+  bool enableDifferentiatorMutationVectorPreallocation(jsi::Runtime& runtime);
+
   bool enableDoubleMeasurementFixAndroid(jsi::Runtime& runtime);
 
   bool enableEagerMainQueueModulesOnIOS(jsi::Runtime& runtime);
@@ -96,10 +94,6 @@ class NativeReactNativeFeatureFlags
 
   bool enableImagePrefetchingAndroid(jsi::Runtime& runtime);
 
-  bool enableImagePrefetchingJNIBatchingAndroid(jsi::Runtime& runtime);
-
-  bool enableImagePrefetchingOnUiThreadAndroid(jsi::Runtime& runtime);
-
   bool enableImmediateUpdateModeForContentOffsetChanges(jsi::Runtime& runtime);
 
   bool enableImperativeFocus(jsi::Runtime& runtime);
@@ -122,12 +116,16 @@ class NativeReactNativeFeatureFlags
 
   bool enableNativeCSSParsing(jsi::Runtime& runtime);
 
+  bool enableNativeViewPropTransformations(jsi::Runtime& runtime);
+
   bool enableNetworkEventReporting(jsi::Runtime& runtime);
 
   bool enablePreparedTextLayout(jsi::Runtime& runtime);
 
   bool enablePropsUpdateReconciliationAndroid(jsi::Runtime& runtime);
 
+  bool enableSchedulerDelegateInvalidation(jsi::Runtime& runtime);
+
   bool enableSwiftUIBasedFilters(jsi::Runtime& runtime);
 
   bool enableViewCulling(jsi::Runtime& runtime);
@@ -146,11 +144,13 @@ class NativeReactNativeFeatureFlags
 
   bool enableVirtualViewDebugFeatures(jsi::Runtime& runtime);
 
+  bool fixDifferentiatorParentTagForUnflattenCase(jsi::Runtime& runtime);
+
   bool fixFindShadowNodeByTagRaceCondition(jsi::Runtime& runtime);
 
   bool fixMappingOfEventPrioritiesBetweenFabricAndReact(jsi::Runtime& runtime);
 
-  bool fixTextClippingAndroid15useBoundsForWidth(jsi::Runtime& runtime);
+  bool fixYogaFlexBasisFitContentInMainAxis(jsi::Runtime& runtime);
 
   bool fuseboxAssertSingleHostState(jsi::Runtime& runtime);
 
@@ -184,7 +184,7 @@ class NativeReactNativeFeatureFlags
 
   bool skipActivityIdentityAssertionOnHostPause(jsi::Runtime& runtime);
 
-  bool syncAndroidClipToPaddingWithOverflow(jsi::Runtime& runtime);
+  bool syncAndroidClipBoundsWithOverflow(jsi::Runtime& runtime);
 
   bool traceTurboModulePromiseRejectionsOnAndroid(jsi::Runtime& runtime);
 
@@ -196,10 +196,14 @@ class NativeReactNativeFeatureFlags
 
   bool useFabricInterop(jsi::Runtime& runtime);
 
+  bool useLISAlgorithmInDifferentiator(jsi::Runtime& runtime);
+
   bool useNativeViewConfigsInBridgelessMode(jsi::Runtime& runtime);
 
   bool useNestedScrollViewAndroid(jsi::Runtime& runtime);
 
+  bool useOptimizedViewRegistryOnAndroid(jsi::Runtime& runtime);
+
   bool useSharedAnimatedBackend(jsi::Runtime& runtime);
 
   bool useTraitHiddenOnAndroid(jsi::Runtime& runtime);

package/ReactCommon/react/nativemodule/mutationobserver/NativeMutationObserver.cpp

@@ -116,8 +116,9 @@ void NativeMutationObserver::onMutations(std::vector<MutationRecord>& records) {
     pendingRecords_.emplace_back(
         NativeMutationRecord{
             record.mutationObserverId,
-            // FIXME(T157129303) Instead of assuming we can call into JS from
-            // here, we should use an API that explicitly indicates it.
+            // It's safe to call into JS here because we only check mutations
+            // synchronously when committing from React (so we're in a JS
+            // task already).
             getPublicInstanceFromShadowNode(*record.targetShadowNode),
             getPublicInstancesFromShadowNodes(record.addedShadowNodes),
             getPublicInstancesFromShadowNodes(record.removedShadowNodes)});

package/ReactCommon/react/nativemodule/viewtransition/CMakeLists.txt

@@ -0,0 +1,24 @@
+# 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.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
+
+file(GLOB react_nativemodule_viewtransition_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(react_nativemodule_viewtransition OBJECT ${react_nativemodule_viewtransition_SRC})
+
+target_include_directories(react_nativemodule_viewtransition PUBLIC ${REACT_COMMON_DIR})
+
+target_link_libraries(react_nativemodule_viewtransition
+        react_codegen_rncore
+        react_cxxreact
+        react_renderer_bridging
+        react_renderer_core
+        react_renderer_uimanager
+)
+target_compile_reactnative_options(react_nativemodule_viewtransition PRIVATE)
+target_compile_options(react_nativemodule_viewtransition PRIVATE -Wpedantic)

package/ReactCommon/react/nativemodule/viewtransition/NativeViewTransition.cpp

@@ -0,0 +1,92 @@
+/*
+ * 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.
+ */
+
+#include "NativeViewTransition.h"
+
+#include <react/renderer/uimanager/UIManagerBinding.h>
+
+#ifdef RN_DISABLE_OSS_PLUGIN_HEADER
+#include "Plugins.h"
+#endif
+
+std::shared_ptr<facebook::react::TurboModule>
+NativeViewTransitionModuleProvider(
+    std::shared_ptr<facebook::react::CallInvoker> jsInvoker) {
+  return std::make_shared<facebook::react::NativeViewTransition>(
+      std::move(jsInvoker));
+}
+
+namespace facebook::react {
+
+NativeViewTransition::NativeViewTransition(
+    std::shared_ptr<CallInvoker> jsInvoker)
+    : NativeViewTransitionCxxSpec(std::move(jsInvoker)) {}
+
+std::optional<jsi::Object> NativeViewTransition::getViewTransitionInstance(
+    jsi::Runtime& rt,
+    const std::string& name,
+    const std::string& pseudo) {
+  auto& uiManager = UIManagerBinding::getBinding(rt)->getUIManager();
+  auto* viewTransitionDelegate = uiManager.getViewTransitionDelegate();
+  if (viewTransitionDelegate == nullptr) {
+    return std::nullopt;
+  }
+
+  auto instance =
+      viewTransitionDelegate->getViewTransitionInstance(name, pseudo);
+  if (!instance) {
+    return std::nullopt;
+  }
+
+  auto result = jsi::Object(rt);
+  result.setProperty(rt, "x", instance->x);
+  result.setProperty(rt, "y", instance->y);
+  result.setProperty(rt, "width", instance->width);
+  result.setProperty(rt, "height", instance->height);
+  result.setProperty(rt, "nativeTag", static_cast<double>(instance->nativeTag));
+  return result;
+}
+
+jsi::Value NativeViewTransition::findPseudoElementShadowNodeByTag(
+    jsi::Runtime& rt,
+    double reactTag) {
+  auto& uiManager = UIManagerBinding::getBinding(rt)->getUIManager();
+  auto* viewTransitionDelegate = uiManager.getViewTransitionDelegate();
+  if (viewTransitionDelegate != nullptr) {
+    auto shadowNode = viewTransitionDelegate->findPseudoElementShadowNodeByTag(
+        static_cast<Tag>(reactTag));
+    if (shadowNode) {
+      return Bridging<std::shared_ptr<const ShadowNode>>::toJs(rt, shadowNode);
+    }
+  }
+
+  return jsi::Value::null();
+}
+
+void NativeViewTransition::waitForTransitionAnimation(
+    jsi::Runtime& rt,
+    double animationId) {
+  auto& uiManager = UIManagerBinding::getBinding(rt)->getUIManager();
+  auto* viewTransitionDelegate = uiManager.getViewTransitionDelegate();
+  if (viewTransitionDelegate != nullptr) {
+    viewTransitionDelegate->waitForTransitionAnimation(
+        static_cast<int>(animationId));
+  }
+}
+
+void NativeViewTransition::transitionAnimationFinished(
+    jsi::Runtime& rt,
+    double animationId) {
+  auto& uiManager = UIManagerBinding::getBinding(rt)->getUIManager();
+  auto* viewTransitionDelegate = uiManager.getViewTransitionDelegate();
+  if (viewTransitionDelegate != nullptr) {
+    viewTransitionDelegate->transitionAnimationFinished(
+        static_cast<int>(animationId));
+  }
+}
+
+} // namespace facebook::react

package/ReactCommon/react/nativemodule/viewtransition/NativeViewTransition.h

@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#include <optional>
+#include <string>
+
+#if __has_include("FBReactNativeSpecJSI.h") // CocoaPod headers on Apple
+#include "FBReactNativeSpecJSI.h"
+#else
+#include <FBReactNativeSpec/FBReactNativeSpecJSI.h>
+#endif
+
+#include <react/renderer/bridging/bridging.h>
+
+namespace facebook::react {
+
+class NativeViewTransition : public NativeViewTransitionCxxSpec<NativeViewTransition> {
+ public:
+  explicit NativeViewTransition(std::shared_ptr<CallInvoker> jsInvoker);
+
+  std::optional<jsi::Object>
+  getViewTransitionInstance(jsi::Runtime &rt, const std::string &name, const std::string &pseudo);
+
+  jsi::Value findPseudoElementShadowNodeByTag(jsi::Runtime &rt, double reactTag);
+
+  void waitForTransitionAnimation(jsi::Runtime &rt, double animationId);
+
+  void transitionAnimationFinished(jsi::Runtime &rt, double animationId);
+};
+
+} // namespace facebook::react

package/ReactCommon/react/nativemodule/viewtransition/React-viewtransitionnativemodule.podspec

@@ -0,0 +1,58 @@
+# 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.
+
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json")))
+version = package['version']
+
+source = { :git => 'https://github.com/facebook/react-native.git' }
+if version == '1000.0.0'
+  # This is an unpublished version, use the latest commit hash of the react-native repo, which we're presumably in.
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
+else
+  source[:tag] = "v#{version}"
+end
+
+header_search_paths = [
+  "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
+]
+
+if ENV['USE_FRAMEWORKS']
+  header_search_paths << "\"$(PODS_TARGET_SRCROOT)/../../..\"" # this is needed to allow the viewtransitionnativemodule to access its own files
+end
+
+Pod::Spec.new do |s|
+  s.name                   = "React-viewtransitionnativemodule"
+  s.version                = version
+  s.summary                = "React Native view transition native module"
+  s.homepage               = "https://reactnative.dev/"
+  s.license                = package["license"]
+  s.author                 = "Meta Platforms, Inc. and its affiliates"
+  s.platforms              = min_supported_versions
+  s.source                 = source
+  s.source_files           = podspec_sources("*.{cpp,h}", "*.h")
+  s.header_dir             = "react/nativemodule/viewtransition"
+  s.pod_target_xcconfig    = { "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
+                               "HEADER_SEARCH_PATHS" => header_search_paths.join(' '),
+                               "OTHER_CFLAGS" => "$(inherited)",
+                               "DEFINES_MODULE" => "YES" }
+
+  resolve_use_frameworks(s, header_mappings_dir: "../..", module_name: "React_viewtransitionnativemodule")
+
+  s.dependency "React-jsi"
+  s.dependency "React-jsiexecutor"
+
+  depend_on_js_engine(s)
+  add_rn_third_party_dependencies(s)
+  add_rncore_dependency(s)
+
+  s.dependency "Yoga"
+  s.dependency "ReactCommon/turbomodule/core"
+  s.dependency "React-Fabric"
+  s.dependency "React-Fabric/bridging"
+  add_dependency(s, "React-runtimeexecutor", :additional_framework_paths => ["platform/ios"])
+  add_dependency(s, "React-RCTFBReactNativeSpec")
+end

package/ReactCommon/react/nativemodule/webperformance/NativePerformance.cpp

@@ -34,6 +34,15 @@ namespace facebook::react {
 
 namespace {
 
+/**
+ * Default `durationThreshold` (in milliseconds) applied to `event` entries when
+ * the JS API does not provide an explicit value. Per the W3C Event Timing
+ * spec, observers for `event` entries default to a 104ms threshold:
+ * https://www.w3.org/TR/event-timing/#sec-modifications-perf-timeline
+ */
+constexpr HighResDuration DEFAULT_EVENT_DURATION_THRESHOLD =
+    HighResDuration::fromMilliseconds(104);
+
 class PerformanceObserverWrapper : public jsi::NativeState {
  public:
   explicit PerformanceObserverWrapper(
@@ -337,7 +346,7 @@ void NativePerformance::observe(
   }
 
   auto durationThreshold =
-      options.durationThreshold.value_or(HighResDuration::zero());
+      options.durationThreshold.value_or(DEFAULT_EVENT_DURATION_THRESHOLD);
 
   // observer of type multiple
   if (options.entryTypes.has_value()) {

package/ReactCommon/react/networking/NetworkReporter.h

@@ -9,7 +9,6 @@
 
 #include "NetworkTypes.h"
 
-#include <folly/dynamic.h>
 #include <react/timing/primitives.h>
 
 #include <mutex>

package/ReactCommon/react/performance/cdpmetrics/CdpPerfIssuesReporter.h

@@ -8,7 +8,6 @@
 #pragma once
 
 #include <ReactCommon/RuntimeExecutor.h>
-#include <folly/dynamic.h>
 #include <jsi/jsi.h>
 #include <react/performance/timeline/PerformanceEntry.h>
 #include <react/performance/timeline/PerformanceEntryReporterListeners.h>

package/ReactCommon/react/performance/timeline/PerformanceEntry.h

@@ -80,7 +80,7 @@ using PerformanceEntry = std::variant<
     PerformanceResourceTiming>;
 
 struct PerformanceEntrySorter {
-  bool operator()(const PerformanceEntry &lhs, const PerformanceEntry &rhs)
+  bool operator()(const PerformanceEntry &lhs, const PerformanceEntry &rhs) const
   {
     return std::visit(
         [](const auto &left, const auto &right) {