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

package/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.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<<67b23d4209c5fa6b721921953d76a829>>
+ * @generated SignedSource<<6b7e2af51ba9d64ae4e474dfa104a7c3>>
  */
 
 /**
@@ -39,6 +39,9 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool cxxNativeAnimatedEnabled(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
+  static bool defaultTextToOverflowHidden(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
   static bool disableEarlyViewCommandExecution(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
@@ -48,9 +51,6 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool disableMountItemReorderingAndroid(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
-  static bool disableOldAndroidAttachmentMetricsWorkarounds(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
-
   static bool disableSubviewClippingAndroid(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
@@ -99,6 +99,9 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool enableExclusivePropsUpdateAndroid(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
+  static bool enableFabricCommitBranching(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
   static bool enableFabricLogs(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
@@ -189,13 +192,7 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool enableVirtualViewDebugFeatures(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
-  static bool enableVirtualViewRenderState(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
-
-  static bool enableVirtualViewWindowFocusDetection(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
-
-  static bool enableWebPerformanceAPIsByDefault(
+  static bool fixFindShadowNodeByTagRaceCondition(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
   static bool fixMappingOfEventPrioritiesBetweenFabricAndReact(
@@ -234,30 +231,24 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool shouldPressibilityUseW3CPointerEventsForHover(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
-  static bool shouldResetClickableWhenRecyclingView(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
-
-  static bool shouldResetOnClickListenerWhenRecyclingView(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
-
-  static bool shouldSetEnabledBasedOnAccessibilityState(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
-
-  static bool shouldSetIsClickableByDefault(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
-
   static bool shouldTriggerResponderTransferOnScrollAndroid(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
   static bool skipActivityIdentityAssertionOnHostPause(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
+  static bool syncAndroidClipToPaddingWithOverflow(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
   static bool traceTurboModulePromiseRejectionsOnAndroid(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
   static bool updateRuntimeShadowNodeReferencesOnCommit(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
+  static bool updateRuntimeShadowNodeReferencesOnCommitThread(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
   static bool useAlwaysAvailableJSErrorHandling(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
@@ -267,10 +258,7 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool useNativeViewConfigsInBridgelessMode(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
-  static bool useRawPropsJsiValue(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
-
-  static bool useShadowNodeStateOnClone(
+  static bool useNestedScrollViewAndroid(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
   static bool useSharedAnimatedBackend(
@@ -285,10 +273,13 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool useTurboModules(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
+  static bool useUnorderedMapInDifferentiator(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
   static double viewCullingOutsetRatio(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
-  static double virtualViewHysteresisRatio(
+  static bool viewTransitionEnabled(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
   static double virtualViewPrerenderRatio(

package/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt

@@ -51,7 +51,6 @@ include(${REACT_ANDROID_DIR}/src/main/jni/first-party/jni-lib-merge/SoMerging-ut
 add_library(
         reactnativejni
         OBJECT
-          CatalystInstanceImpl.cpp
           InspectorNetworkRequestListener.cpp
           JExecutor.cpp
           JMessageQueueThread.cpp

package/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.cpp

@@ -12,6 +12,7 @@
 #include <cxxreact/CxxNativeModule.h>
 #include <cxxreact/Instance.h>
 #include <cxxreact/JsArgumentHelpers.h>
+#include <cxxreact/MessageQueueThread.h>
 #include <cxxreact/NativeModule.h>
 #include <fbjni/fbjni.h>
 
@@ -19,7 +20,6 @@
 #include <fbsystrace.h>
 #endif
 
-#include "CatalystInstanceImpl.h"
 #include "ReadableNativeArray.h"
 
 #ifndef RCT_REMOVE_LEGACY_ARCH

package/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp

@@ -10,7 +10,6 @@
 #include <fb/glog_init.h>
 #include <fbjni/fbjni.h>
 
-#include "CatalystInstanceImpl.h"
 #include "InspectorNetworkRequestListener.h"
 #include "JavaScriptExecutorHolder.h"
 
@@ -33,12 +32,6 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
 #if WITH_GLOGINIT
     gloginit::initialize();
     FLAGS_minloglevel = 0;
-#endif
-#ifndef RCT_REMOVE_LEGACY_ARCH
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    CatalystInstanceImpl::registerNatives();
-#pragma clang diagnostic pop
 #endif
     InspectorNetworkRequestListener::registerNatives();
   });

package/ReactAndroid/src/main/jni/react/runtime/jni/JReactHostInspectorTarget.cpp

@@ -48,7 +48,7 @@ JReactHostInspectorTarget::JReactHostInspectorTarget(
           // Reject the connection.
           return nullptr;
         },
-        {.nativePageReloads = true, .prefersFuseboxFrontend = true});
+        {.nativePageReloads = true});
   }
 }
 
@@ -73,13 +73,16 @@ JReactHostInspectorTarget::initHybrid(
 }
 
 void JReactHostInspectorTarget::sendDebuggerResumeCommand() {
+  inspectorTarget().sendCommand(HostCommand::DebuggerResume);
+}
+
+jsinspector_modern::HostTarget& JReactHostInspectorTarget::inspectorTarget() {
   if (inspectorTarget_) {
-    inspectorTarget_->sendCommand(HostCommand::DebuggerResume);
-  } else {
-    jni::throwNewJavaException(
-        "java/lang/IllegalStateException",
-        "Cannot send command while the Fusebox backend is not enabled");
+    return *inspectorTarget_;
   }
+  jni::throwNewJavaException(
+      "java/lang/IllegalStateException",
+      "Inspector method called while the Fusebox backend is not enabled.");
 }
 
 jsinspector_modern::HostTargetMetadata
@@ -147,58 +150,22 @@ HostTarget* JReactHostInspectorTarget::getInspectorTarget() {
 }
 
 bool JReactHostInspectorTarget::startBackgroundTrace() {
-  if (inspectorTarget_) {
-    return inspectorTarget_->startTracing(
-        tracing::Mode::Background,
-        {
-            tracing::Category::HiddenTimeline,
-            tracing::Category::RuntimeExecution,
-            tracing::Category::Timeline,
-            tracing::Category::UserTiming,
-        });
-  } else {
-    jni::throwNewJavaException(
-        "java/lang/IllegalStateException",
-        "Cannot start Tracing session while the Fusebox backend is not enabled.");
-  }
+  return inspectorTarget().startTracing(
+      tracing::Mode::Background,
+      {
+          tracing::Category::HiddenTimeline,
+          tracing::Category::RuntimeExecution,
+          tracing::Category::Timeline,
+          tracing::Category::UserTiming,
+      });
 }
 
-tracing::HostTracingProfile JReactHostInspectorTarget::stopTracing() {
-  if (inspectorTarget_) {
-    return inspectorTarget_->stopTracing();
-  } else {
-    jni::throwNewJavaException(
-        "java/lang/IllegalStateException",
-        "Cannot stop Tracing session while the Fusebox backend is not enabled.");
-  }
+void JReactHostInspectorTarget::stopTracing() {
+  inspectorTarget().stopTracing();
 }
 
 jboolean JReactHostInspectorTarget::stopAndMaybeEmitBackgroundTrace() {
-  auto capturedTrace = inspectorTarget_->stopTracing();
-  if (inspectorTarget_->hasActiveSessionWithFuseboxClient()) {
-    inspectorTarget_->emitTracingProfileForFirstFuseboxClient(
-        std::move(capturedTrace));
-    return jboolean(true);
-  }
-
-  stashTracingProfile(std::move(capturedTrace));
-  return jboolean(false);
-}
-
-void JReactHostInspectorTarget::stopAndDiscardBackgroundTrace() {
-  inspectorTarget_->stopTracing();
-}
-
-void JReactHostInspectorTarget::stashTracingProfile(
-    tracing::HostTracingProfile&& hostTracingProfile) {
-  stashedTracingProfile_ = std::move(hostTracingProfile);
-}
-
-std::optional<tracing::HostTracingProfile> JReactHostInspectorTarget::
-    unstable_getHostTracingProfileThatWillBeEmittedOnInitialization() {
-  auto tracingProfile = std::move(stashedTracingProfile_);
-  stashedTracingProfile_.reset();
-  return tracingProfile;
+  return jboolean(inspectorTarget().stopAndMaybeEmitBackgroundTrace());
 }
 
 void JReactHostInspectorTarget::registerNatives() {
@@ -213,9 +180,7 @@ void JReactHostInspectorTarget::registerNatives() {
       makeNativeMethod(
           "stopAndMaybeEmitBackgroundTrace",
           JReactHostInspectorTarget::stopAndMaybeEmitBackgroundTrace),
-      makeNativeMethod(
-          "stopAndDiscardBackgroundTrace",
-          JReactHostInspectorTarget::stopAndDiscardBackgroundTrace),
+      makeNativeMethod("stopTracing", JReactHostInspectorTarget::stopTracing),
       makeNativeMethod(
           "getTracingState", JReactHostInspectorTarget::getTracingState),
       makeNativeMethod(
@@ -256,12 +221,11 @@ HostTargetTracingDelegate* JReactHostInspectorTarget::getTracingDelegate() {
 
 void JReactHostInspectorTarget::recordFrameTimings(
     jni::alias_ref<JFrameTimingSequence::javaobject> frameTimingSequence) {
-  inspectorTarget_->recordFrameTimings({
+  inspectorTarget().recordFrameTimings({
       frameTimingSequence->getId(),
       frameTimingSequence->getThreadId(),
-      frameTimingSequence->getBeginDrawingTimestamp(),
-      frameTimingSequence->getCommitTimestamp(),
-      frameTimingSequence->getEndDrawingTimestamp(),
+      frameTimingSequence->getBeginTimestamp(),
+      frameTimingSequence->getEndTimestamp(),
       frameTimingSequence->getScreenshot(),
   });
 }

package/ReactAndroid/src/main/jni/react/runtime/jni/JReactHostInspectorTarget.h

@@ -84,23 +84,16 @@ struct JFrameTimingSequence : public jni::JavaClass<JFrameTimingSequence> {
     return static_cast<uint64_t>(getFieldValue(field));
   }
 
-  HighResTimeStamp getBeginDrawingTimestamp() const
+  HighResTimeStamp getBeginTimestamp() const
   {
-    auto field = javaClassStatic()->getField<jlong>("beginDrawingTimestamp");
+    auto field = javaClassStatic()->getField<jlong>("beginTimestamp");
     return HighResTimeStamp::fromChronoSteadyClockTimePoint(
         std::chrono::steady_clock::time_point(std::chrono::nanoseconds(getFieldValue(field))));
   }
 
-  HighResTimeStamp getCommitTimestamp() const
+  HighResTimeStamp getEndTimestamp() const
   {
-    auto field = javaClassStatic()->getField<jlong>("commitTimestamp");
-    return HighResTimeStamp::fromChronoSteadyClockTimePoint(
-        std::chrono::steady_clock::time_point(std::chrono::nanoseconds(getFieldValue(field))));
-  }
-
-  HighResTimeStamp getEndDrawingTimestamp() const
-  {
-    auto field = javaClassStatic()->getField<jlong>("endDrawingTimestamp");
+    auto field = javaClassStatic()->getField<jlong>("endTimestamp");
     return HighResTimeStamp::fromChronoSteadyClockTimePoint(
         std::chrono::steady_clock::time_point(std::chrono::nanoseconds(getFieldValue(field))));
   }
@@ -240,7 +233,7 @@ class JReactHostInspectorTarget : public jni::HybridClass<JReactHostInspectorTar
   /**
    * Stops previously started trace recording and discards the captured trace.
    */
-  void stopAndDiscardBackgroundTrace();
+  void stopTracing();
 
   jsinspector_modern::HostTarget *getInspectorTarget();
 
@@ -277,8 +270,6 @@ class JReactHostInspectorTarget : public jni::HybridClass<JReactHostInspectorTar
   void loadNetworkResource(
       const jsinspector_modern::LoadNetworkResourceRequest &params,
       jsinspector_modern::ScopedExecutor<jsinspector_modern::NetworkRequestListener> executor) override;
-  std::optional<jsinspector_modern::tracing::HostTracingProfile>
-  unstable_getHostTracingProfileThatWillBeEmittedOnInitialization() override;
   jsinspector_modern::HostTargetTracingDelegate *getTracingDelegate() override;
 
  private:
@@ -286,6 +277,13 @@ class JReactHostInspectorTarget : public jni::HybridClass<JReactHostInspectorTar
       jni::alias_ref<JReactHostInspectorTarget::javaobject> jobj,
       jni::alias_ref<JReactHostImpl> reactHostImpl,
       jni::alias_ref<JExecutor::javaobject> javaExecutor);
+
+  /**
+   * Returns a reference to the HostTarget, throwing a Java IllegalStateException
+   * if the Fusebox backend is not enabled (i.e., inspectorTarget_ is null).
+   */
+  jsinspector_modern::HostTarget &inspectorTarget();
+
   jni::global_ref<JReactHostInspectorTarget::javaobject> jobj_;
   // This weak reference breaks the cycle between the C++ HostTarget and the
   // Java ReactHostImpl, preventing memory leaks in apps that create multiple
@@ -296,20 +294,6 @@ class JReactHostInspectorTarget : public jni::HybridClass<JReactHostInspectorTar
   std::shared_ptr<jsinspector_modern::HostTarget> inspectorTarget_;
   std::optional<int> inspectorPageId_;
 
-  /**
-   * Stops previously started trace recording and returns the captured HostTracingProfile.
-   */
-  jsinspector_modern::tracing::HostTracingProfile stopTracing();
-  /**
-   * Stashes previously recorded HostTracingProfile that will be emitted when
-   * CDP session is created. Once emitted, the value will be cleared from this
-   * instance.
-   */
-  void stashTracingProfile(jsinspector_modern::tracing::HostTracingProfile &&hostTracingProfile);
-  /**
-   * Previously recorded HostTracingProfile that will be emitted when CDP session is created.
-   */
-  std::optional<jsinspector_modern::tracing::HostTracingProfile> stashedTracingProfile_;
   /**
    * Encapsulates the logic around tracing for this HostInspectorTarget.
    */

package/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.cpp

@@ -118,7 +118,8 @@ void TurboModuleManager::registerNatives() {
   registerHybrid({
       makeNativeMethod("initHybrid", TurboModuleManager::initHybrid),
       makeNativeMethod(
-          "installJSIBindings", TurboModuleManager::installJSIBindings),
+          "dispatchJSBindingInstall",
+          TurboModuleManager::dispatchJSBindingInstall),
   });
 }
 
@@ -318,7 +319,16 @@ std::shared_ptr<TurboModule> TurboModuleManager::getLegacyModule(
   return nullptr;
 }
 
-void TurboModuleManager::installJSIBindings(
+void TurboModuleManager::installJSBindings(
+    jsi::Runtime& runtime,
+    jni::alias_ref<jhybridobject> javaPart) {
+  TurboModuleBinding::install(
+      runtime,
+      createTurboModuleProvider(javaPart),
+      createLegacyModuleProvider(javaPart));
+}
+
+void TurboModuleManager::dispatchJSBindingInstall(
     jni::alias_ref<jhybridobject> javaPart,
     jni::alias_ref<JRuntimeExecutor::javaobject> runtimeExecutor) {
   auto cxxPart = javaPart->cthis();
@@ -328,10 +338,7 @@ void TurboModuleManager::installJSIBindings(
 
   runtimeExecutor->cthis()->get()(
       [javaPart = jni::make_global(javaPart)](jsi::Runtime& runtime) {
-        TurboModuleBinding::install(
-            runtime,
-            createTurboModuleProvider(javaPart),
-            createLegacyModuleProvider(javaPart));
+        installJSBindings(runtime, javaPart);
       });
 }
 

package/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.h

@@ -55,7 +55,8 @@ class TurboModuleManager : public jni::HybridClass<TurboModuleManager> {
       std::shared_ptr<NativeMethodCallInvoker> nativeMethodCallInvoker,
       jni::alias_ref<TurboModuleManagerDelegate::javaobject> delegate);
 
-  static void installJSIBindings(
+  static void installJSBindings(jsi::Runtime &runtime, jni::alias_ref<jhybridobject> javaPart);
+  static void dispatchJSBindingInstall(
       jni::alias_ref<jhybridobject> javaPart,
       jni::alias_ref<JRuntimeExecutor::javaobject> runtimeExecutor);
 

package/{ReactCommon/react/renderer/components/text/ParagraphComponentDescriptor.cpp → ReactAndroid/src/main/jni/react/uimanager/StateWrapper.h}

@@ -5,10 +5,15 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include "ParagraphComponentDescriptor.h"
+#pragma once
+
+#include <fbjni/fbjni.h>
 
 namespace facebook::react {
 
-extern const char TextLayoutManagerKey[] = "TextLayoutManager";
+class StateWrapper : public jni::HybridClass<StateWrapper> {
+ public:
+  constexpr static const char *const kJavaDescriptor = "Lcom/facebook/react/uimanager/StateWrapper;";
+};
 
 } // namespace facebook::react

package/ReactAndroid/src/main/res/views/uimanager/values/ids.xml

@@ -74,4 +74,7 @@
 
   <!-- tag is used to store mixBlendMode effects to apply to the view -->
   <item type="id" name="mix_blend_mode"/>
+
+  <!-- tag is used to store important_for_interaction state -->
+  <item type="id" name="important_for_interaction"/>
 </resources>

package/ReactAndroid/src/main/res/views/uimanager/values-ne/strings.xml

@@ -7,6 +7,7 @@
     <string name="image_description" gender="unknown">फोटो</string>
     <string name="imagebutton_description" gender="unknown">बटन, फोटो</string>
     <string name="header_description" gender="unknown">शीर्षक</string>
+    <string name="alert_description" gender="unknown">अलर्ट</string>
     <string name="combobox_description" gender="unknown">कम्बो बक्स</string>
     <string name="menu_description" gender="unknown">मेनु</string>
     <string name="menubar_description" gender="unknown">मेनु बार</string>
@@ -16,6 +17,7 @@
     <string name="scrollbar_description" gender="unknown">स्क्रोल बार</string>
     <string name="spinbutton_description" gender="unknown">स्पिन बटन</string>
     <string name="rn_tab_description" gender="unknown">टयाब</string>
+    <string name="tablist_description" gender="unknown">ट्याबको सूची</string>
     <string name="timer_description" gender="unknown">टाइमर</string>
     <string name="toolbar_description" gender="unknown">टुल बार</string>
     <string name="summary_description" gender="unknown">सारांश</string>

package/ReactApple/RCTAnimatedModuleProvider/RCTAnimatedModuleProvider.mm

@@ -14,6 +14,8 @@
 #else
 #import <QuartzCore/CADisplayLink.h>
 #endif
+
+#import <react/featureflags/ReactNativeFeatureFlags.h>
 #import <react/renderer/animated/AnimatedModule.h>
 #import <react/renderer/animated/NativeAnimatedNodesManagerProvider.h>
 
@@ -55,7 +57,12 @@
 
 - (void)_onDisplayLinkTick
 {
-  if (_nativeAnimatedNodesManagerProvider.lock() != nullptr && _displayLink != nullptr && _onRender != nullptr) {
+  // Hold a strong reference to the provider during callback execution to prevent
+  // use-after-free during hot reload. The provider must remain alive for the
+  // entire duration of _onRender() since it holds references to the animation
+  // nodes manager and related data structures.
+  auto strongProvider = _nativeAnimatedNodesManagerProvider.lock();
+  if (strongProvider != nullptr && _displayLink != nullptr && _onRender != nullptr) {
     _onRender();
   }
 }

package/ReactApple/RCTSwiftUI/RCTSwiftUI.podspec

@@ -25,7 +25,7 @@ Pod::Spec.new do |s|
   s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = min_supported_versions
   s.source                 = source
-  s.source_files           = "*.{h,m,swift}"
+  s.source_files           = podspec_sources("*.{h,m,swift}", "")
   s.public_header_files    = "*.h"
   s.module_name            = "RCTSwiftUI"
   s.header_dir             = "RCTSwiftUI"

package/ReactApple/RCTSwiftUIWrapper/RCTSwiftUIWrapper.podspec

@@ -25,12 +25,11 @@ Pod::Spec.new do |s|
   s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = min_supported_versions
   s.source                 = source
-  s.source_files           = "*.{h,m}"
+  s.source_files           = podspec_sources("*.{h,m}", "*.{h}")
   s.public_header_files    = "*.h"
   s.module_name            = "RCTSwiftUIWrapper"
   s.header_dir             = "RCTSwiftUIWrapper"
   s.dependency "RCTSwiftUI"
-  
   s.pod_target_xcconfig    = {
     "SWIFT_VERSION" => "5.0",
   }

package/ReactCommon/React-Fabric.podspec

@@ -56,9 +56,11 @@ Pod::Spec.new do |s|
   add_rncore_dependency(s)
 
   s.subspec "animated" do |ss|
+    ss.dependency             "React-Fabric/animationbackend"
     ss.source_files         = podspec_sources("react/renderer/animated/**/*.{m,mm,cpp,h}", "react/renderer/animated/**/*.{h}")
     ss.exclude_files        = "react/renderer/animated/tests"
     ss.header_dir           = "react/renderer/animated"
+    ss.header_mappings_dir  = "react/renderer/animated"
   end
 
   s.subspec "animations" do |ss|
@@ -95,6 +97,8 @@ Pod::Spec.new do |s|
       header_search_path = header_search_path + [
         "\"$(PODS_TARGET_SRCROOT)/react/renderer/textlayoutmanager/platform/ios\"",
         "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/scrollview/platform/cxx\"",
+        "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/scrollview/platform/ios\"",
+        "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/legacyviewmanagerinterop/platform/ios\"",
         "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/text/platform/cxx\"",
         "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/textinput/platform/ios\"",
         "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/view/platform/cxx\"",
@@ -157,6 +161,7 @@ Pod::Spec.new do |s|
     ss.source_files         = podspec_sources("react/renderer/scheduler/**/*.{m,mm,cpp,h}", "react/renderer/scheduler/**/*.h")
     ss.header_dir           = "react/renderer/scheduler"
 
+    ss.dependency             "React-Fabric/animationbackend"
     ss.dependency             "React-performancecdpmetrics"
     ss.dependency             "React-performancetimeline"
     ss.dependency             "React-Fabric/observers/events"
@@ -187,12 +192,6 @@ Pod::Spec.new do |s|
     end
   end
 
-  s.subspec "templateprocessor" do |ss|
-    ss.source_files         = podspec_sources("react/renderer/templateprocessor/**/*.{m,mm,cpp,h}", "react/renderer/templateprocessor/**/*.h")
-    ss.exclude_files        = "react/renderer/templateprocessor/tests"
-    ss.header_dir           = "react/renderer/templateprocessor"
-  end
-
   s.subspec "telemetry" do |ss|
     ss.source_files         = podspec_sources("react/renderer/telemetry/**/*.{m,mm,cpp,h}", "react/renderer/telemetry/**/*.h")
     ss.exclude_files        = "react/renderer/telemetry/tests"

package/ReactCommon/React-FabricComponents.podspec

@@ -28,6 +28,7 @@ if ENV['USE_FRAMEWORKS']
   header_search_path = header_search_path + [
     "\"$(PODS_TARGET_SRCROOT)/react/renderer/textlayoutmanager/platform/ios\"",
     "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/scrollview/platform/cxx\"",
+    "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/scrollview/platform/ios\"",
     "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/textinput/platform/ios\"",
     "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/text/platform/cxx\"",
     "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/view/platform/cxx\"",
@@ -70,6 +71,7 @@ Pod::Spec.new do |s|
   add_dependency(s, "React-graphics", :additional_framework_paths => ["react/renderer/graphics/platform/ios"])
   add_dependency(s, "React-Fabric", :additional_framework_paths => [
     "react/renderer/components/scrollview/platform/cxx",
+    "react/renderer/components/scrollview/platform/ios",
     "react/renderer/components/view/platform/cxx",
     "react/renderer/imagemanager/platform/ios"
   ])
@@ -101,9 +103,11 @@ Pod::Spec.new do |s|
 
     ss.subspec "scrollview" do |sss|
       sss.source_files         = podspec_sources(["react/renderer/components/scrollview/*.{m,mm,cpp,h}",
-                                  "react/renderer/components/scrollview/platform/cxx/**/*.{m,mm,cpp,h}"],
+                                  "react/renderer/components/scrollview/platform/cxx/**/*.{m,mm,cpp,h}",
+                                  "react/renderer/components/scrollview/platform/ios/**/*.{m,mm,cpp,h}"],
                                   ["react/renderer/components/scrollview/*.h",
-                                  "react/renderer/components/scrollview/platform/cxx/**/*.h"])
+                                  "react/renderer/components/scrollview/platform/cxx/**/*.h",
+                                  "react/renderer/components/scrollview/platform/ios/**/*.h"])
       sss.exclude_files        = "react/renderer/components/scrollview/tests"
       sss.header_dir           = "react/renderer/components/scrollview"
     end
@@ -149,12 +153,6 @@ Pod::Spec.new do |s|
       sss.header_dir           = "react/renderer/components/virtualview"
     end
 
-     ss.subspec "virtualviewexperimental" do |sss|
-      sss.source_files         = "react/renderer/components/virtualviewexperimental/**/*.{m,mm,cpp,h}"
-      sss.exclude_files        = "react/renderer/components/virtualviewexperimental/tests"
-      sss.header_dir           = "react/renderer/components/virtualviewexperimental"
-    end
-
     # Legacy header paths for backwards compat
     ss.subspec "rncore" do |sss|
       sss.source_files         = podspec_sources("react/renderer/components/rncore/**/*.h", "react/renderer/components/rncore/**/*.h")

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -13,16 +13,18 @@
 #include <string_view>
 
 #define REACT_NATIVE_VERSION_MAJOR 0
-#define REACT_NATIVE_VERSION_MINOR 84
-#define REACT_NATIVE_VERSION_PATCH 1
+#define REACT_NATIVE_VERSION_MINOR 85
+#define REACT_NATIVE_VERSION_PATCH 0
 
 namespace facebook::react {
 
-constexpr struct {
+struct ReactNativeVersionType {
   int32_t Major = 0;
-  int32_t Minor = 84;
-  int32_t Patch = 1;
+  int32_t Minor = 85;
+  int32_t Patch = 0;
   std::string_view Prerelease = "0";
-} ReactNativeVersion;
+};
+
+constexpr ReactNativeVersionType ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/hermes/executor/HermesExecutorFactory.cpp

@@ -265,7 +265,7 @@ HermesExecutor::getRuntimeTargetDelegate() {
   if (!targetDelegate_) {
     targetDelegate_ =
         std::make_unique<jsinspector_modern::HermesRuntimeTargetDelegate>(
-            hermesRuntime_);
+            hermesRuntime_, *hermesRuntime_);
   }
   return *targetDelegate_;
 }