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

package/ReactAndroid/build.gradle.kts

@@ -102,6 +102,8 @@ val preparePrefab by
                       Pair("../ReactCommon/hermes/inspector-modern/", "hermes/inspector-modern/"),
                       // fabricjni
                       Pair("src/main/jni/react/fabric", "react/fabric/"),
+                      // uimanagerjni
+                      Pair("src/main/jni/react/uimanager", "react/uimanager/"),
                       // glog
                       Pair(File(buildDir, "third-party-ndk/glog/exported/").absolutePath, ""),
                       // jsiinpsector
@@ -270,6 +272,13 @@ val preparePrefab by
                       // yoga
                       Pair("../ReactCommon/yoga/", ""),
                       Pair("src/main/jni/first-party/yogajni/jni", ""),
+                      // oscompat
+                      Pair("../ReactCommon/oscompat/", "oscompat/"),
+                      // react_renderer_animationbackend
+                      Pair(
+                          "../ReactCommon/react/renderer/animationbackend/",
+                          "react/renderer/animationbackend/",
+                      ),
                   ),
               ),
               PrefabPreprocessingEntry(

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.84.1-0
+VERSION_NAME=0.85.0-0
 react.internal.publishingGroup=io.github.react-native-tvos
 react.internal.hermesPublishingGroup=com.facebook.hermes
 

package/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java

@@ -13,9 +13,6 @@ import static com.facebook.react.bridge.ReactMarkerConstants.ATTACH_MEASURED_ROO
 import static com.facebook.react.bridge.ReactMarkerConstants.BUILD_NATIVE_MODULE_REGISTRY_END;
 import static com.facebook.react.bridge.ReactMarkerConstants.BUILD_NATIVE_MODULE_REGISTRY_START;
 import static com.facebook.react.bridge.ReactMarkerConstants.CHANGE_THREAD_PRIORITY;
-import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_CATALYST_INSTANCE_END;
-import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_CATALYST_INSTANCE_START;
-import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_REACT_CONTEXT_START;
 import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_VIEW_MANAGERS_END;
 import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_VIEW_MANAGERS_START;
 import static com.facebook.react.bridge.ReactMarkerConstants.PRE_SETUP_REACT_CONTEXT_END;
@@ -49,9 +46,7 @@ import com.facebook.infer.annotation.Assertions;
 import com.facebook.infer.annotation.ThreadConfined;
 import com.facebook.infer.annotation.ThreadSafe;
 import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.BridgeReactContext;
 import com.facebook.react.bridge.CatalystInstance;
-import com.facebook.react.bridge.CatalystInstanceImpl;
 import com.facebook.react.bridge.JSBundleLoader;
 import com.facebook.react.bridge.JSExceptionHandler;
 import com.facebook.react.bridge.JavaScriptExecutor;
@@ -67,7 +62,6 @@ import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.UIManagerProvider;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.WritableNativeMap;
-import com.facebook.react.bridge.queue.ReactQueueConfigurationSpec;
 import com.facebook.react.common.LifecycleState;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.SurfaceDelegateFactory;
@@ -86,14 +80,11 @@ import com.facebook.react.interfaces.TaskInterface;
 import com.facebook.react.internal.AndroidChoreographerProvider;
 import com.facebook.react.internal.ChoreographerProvider;
 import com.facebook.react.internal.featureflags.ReactNativeNewArchitectureFeatureFlags;
-import com.facebook.react.internal.turbomodule.core.TurboModuleManager;
-import com.facebook.react.internal.turbomodule.core.TurboModuleManagerDelegate;
 import com.facebook.react.modules.appearance.AppearanceModule;
 import com.facebook.react.modules.appregistry.AppRegistry;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.modules.core.ReactChoreographer;
-import com.facebook.react.modules.debug.interfaces.DeveloperSettings;
 import com.facebook.react.packagerconnection.RequestHandler;
 import com.facebook.react.uimanager.DisplayMetricsHolder;
 import com.facebook.react.uimanager.ReactRoot;
@@ -194,7 +185,7 @@ public class ReactInstanceManager {
   private boolean mUseFallbackBundle = true;
   private volatile boolean mInstanceManagerInvalidated = false;
 
-  private class ReactContextInitParams {
+  private static class ReactContextInitParams {
     private final JavaScriptExecutorFactory mJsExecutorFactory;
     private final JSBundleLoader mJsBundleLoader;
 
@@ -301,14 +292,11 @@ public class ReactInstanceManager {
       mDevSupportManager.startInspector();
     }
 
-    // Using `if (true)` just to prevent tests / lint errors.
-    if (true) {
-      // Legacy architecture of React Native is deprecated and can't be initialized anymore.
-      // More details on:
-      // https://github.com/react-native-community/discussions-and-proposals/blob/nc/legacy-arch-removal/proposals/0929-legacy-architecture-removal.md
-      throw new UnsupportedOperationException(
-          "ReactInstanceManager.createReactContext is unsupported.");
-    }
+    // Legacy architecture of React Native is deprecated and can't be initialized anymore.
+    // More details on:
+    // https://github.com/react-native-community/discussions-and-proposals/blob/nc/legacy-arch-removal/proposals/0929-legacy-architecture-removal.md
+    throw new UnsupportedOperationException(
+        "ReactInstanceManager.createReactContext is unsupported.");
   }
 
   private ReactInstanceDevHelper createDevHelperInterface() {
@@ -450,7 +438,6 @@ public class ReactInstanceManager {
     UiThreadUtil.assertOnUiThread();
 
     if (mUseDeveloperSupport && mJSMainModulePath != null) {
-      final DeveloperSettings devSettings = mDevSupportManager.getDevSettings();
       if (!Systrace.isTracing(TRACE_TAG_REACT)) {
         if (mBundleLoader == null) {
           mDevSupportManager.handleReloadJS();
@@ -1164,6 +1151,7 @@ public class ReactInstanceManager {
                   try {
                     ReactInstanceManager.this.mHasStartedDestroying.wait();
                   } catch (InterruptedException e) {
+                    // Interrupted while waiting for destruction to complete, just retry
                     continue;
                   }
                 }
@@ -1399,88 +1387,10 @@ public class ReactInstanceManager {
    */
   private ReactApplicationContext createReactContext(
       JavaScriptExecutor jsExecutor, JSBundleLoader jsBundleLoader) {
-
-    FLog.d(ReactConstants.TAG, "ReactInstanceManager.createReactContext()");
-    ReactMarker.logMarker(CREATE_REACT_CONTEXT_START, jsExecutor.getName());
-
-    final BridgeReactContext reactContext = new BridgeReactContext(mApplicationContext);
-
-    JSExceptionHandler exceptionHandler =
-        mJSExceptionHandler != null ? mJSExceptionHandler : mDevSupportManager;
-    reactContext.setJSExceptionHandler(exceptionHandler);
-
-    NativeModuleRegistry nativeModuleRegistry = processPackages(reactContext, mPackages);
-
-    CatalystInstanceImpl.Builder catalystInstanceBuilder =
-        new CatalystInstanceImpl.Builder()
-            .setReactQueueConfigurationSpec(ReactQueueConfigurationSpec.createDefault())
-            .setJSExecutor(jsExecutor)
-            .setRegistry(nativeModuleRegistry)
-            .setJSBundleLoader(jsBundleLoader)
-            .setJSExceptionHandler(exceptionHandler);
-
-    ReactMarker.logMarker(CREATE_CATALYST_INSTANCE_START);
-    // CREATE_CATALYST_INSTANCE_END is in JSCExecutor.cpp
-    Systrace.beginSection(TRACE_TAG_REACT, "createCatalystInstance");
-    final CatalystInstance catalystInstance;
-    try {
-      catalystInstance = catalystInstanceBuilder.build();
-    } finally {
-      Systrace.endSection(TRACE_TAG_REACT);
-      ReactMarker.logMarker(CREATE_CATALYST_INSTANCE_END);
-    }
-
-    reactContext.initializeWithInstance(catalystInstance);
-
-    // On Old Architecture, we need to initialize the Native Runtime Scheduler so that
-    // the `nativeRuntimeScheduler` object is registered on JS.
-    // On New Architecture, this is normally triggered by instantiate a TurboModuleManager.
-    // Here we invoke getRuntimeScheduler() to trigger the creation of it regardless of the
-    // architecture so it will always be there.
-    catalystInstance.getRuntimeScheduler();
-
-    if (ReactNativeNewArchitectureFeatureFlags.useTurboModules() && mTMMDelegateBuilder != null) {
-      TurboModuleManagerDelegate tmmDelegate =
-          mTMMDelegateBuilder
-              .setPackages(mPackages)
-              .setReactApplicationContext(reactContext)
-              .build();
-
-      TurboModuleManager turboModuleManager =
-          new TurboModuleManager(
-              catalystInstance.getRuntimeExecutor(),
-              tmmDelegate,
-              catalystInstance.getJSCallInvokerHolder(),
-              catalystInstance.getNativeMethodCallInvokerHolder());
-
-      catalystInstance.setTurboModuleRegistry(turboModuleManager);
-
-      // Eagerly initialize TurboModules
-      for (String moduleName : turboModuleManager.getEagerInitModuleNames()) {
-        turboModuleManager.getModule(moduleName);
-      }
-    }
-
-    if (mUIManagerProvider != null) {
-      UIManager uiManager = mUIManagerProvider.createUIManager(reactContext);
-      if (uiManager != null) {
-        catalystInstance.setFabricUIManager(uiManager);
-
-        // Initialize the UIManager
-        uiManager.initialize();
-        catalystInstance.setFabricUIManager(uiManager);
-      }
-    }
-    if (BuildConfig.ENABLE_PERFETTO || Systrace.isTracing(TRACE_TAG_REACT)) {
-      catalystInstance.setGlobalVariable("__RCTProfileIsProfiling", "true");
-    }
-
-    ReactMarker.logMarker(ReactMarkerConstants.PRE_RUN_JS_BUNDLE_START);
-    Systrace.beginSection(TRACE_TAG_REACT, "runJSBundle");
-    catalystInstance.runJSBundle();
-    Systrace.endSection(TRACE_TAG_REACT);
-
-    return reactContext;
+    // CatalystInstanceImpl has been removed as part of the Legacy Architecture cleanup.
+    throw new UnsupportedOperationException(
+        "ReactInstanceManager.createReactContext is unsupported. CatalystInstanceImpl has been"
+            + " removed.");
   }
 
   private NativeModuleRegistry processPackages(

package/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.kt

@@ -387,13 +387,13 @@ public class ReactInstanceManagerBuilder {
   }
 
   private companion object {
+    private val TAG: String = ReactInstanceManagerBuilder::class.java.simpleName
+
     init {
       LegacyArchitectureLogger.assertLegacyArchitecture(
           "ReactInstanceManagerBuilder",
           LegacyArchitectureLogLevel.ERROR,
       )
     }
-
-    private val TAG: String = ReactInstanceManagerBuilder::class.java.simpleName
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java

@@ -13,6 +13,7 @@ import static com.facebook.react.uimanager.common.UIManagerType.FABRIC;
 import static com.facebook.react.uimanager.common.UIManagerType.LEGACY;
 import static com.facebook.systrace.Systrace.TRACE_TAG_REACT;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.BlendMode;
 import android.graphics.Canvas;
@@ -213,8 +214,7 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
       return;
     }
 
-    EventDispatcher eventDispatcher =
-        UIManagerHelper.getEventDispatcher(reactContext, getUIManagerType());
+    EventDispatcher eventDispatcher = UIManagerHelper.getEventDispatcher(reactContext);
     if (eventDispatcher != null) {
       mJSTouchDispatcher.onChildStartedNativeGesture(ev, eventDispatcher, reactContext);
       if (childView != null && mJSPointerDispatcher != null) {
@@ -229,8 +229,7 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
       return;
     }
 
-    EventDispatcher eventDispatcher =
-        UIManagerHelper.getEventDispatcher(getCurrentReactContext(), getUIManagerType());
+    EventDispatcher eventDispatcher = UIManagerHelper.getEventDispatcher(getCurrentReactContext());
     if (eventDispatcher != null) {
       mJSTouchDispatcher.onChildEndedNativeGesture(ev, eventDispatcher);
       if (mJSPointerDispatcher != null) {
@@ -363,8 +362,7 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
       return;
     }
 
-    EventDispatcher eventDispatcher =
-        UIManagerHelper.getEventDispatcher(getCurrentReactContext(), getUIManagerType());
+    EventDispatcher eventDispatcher = UIManagerHelper.getEventDispatcher(getCurrentReactContext());
     if (eventDispatcher != null) {
       mJSPointerDispatcher.handleMotionEvent(event, eventDispatcher, isCapture);
     }
@@ -380,8 +378,7 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
       return;
     }
 
-    EventDispatcher eventDispatcher =
-        UIManagerHelper.getEventDispatcher(getCurrentReactContext(), getUIManagerType());
+    EventDispatcher eventDispatcher = UIManagerHelper.getEventDispatcher(getCurrentReactContext());
     if (eventDispatcher != null) {
       mJSTouchDispatcher.handleTouchEvent(event, eventDispatcher, getCurrentReactContext());
     }
@@ -403,8 +400,7 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
     }
     ReactContext context = getCurrentReactContext();
     if (context != null) {
-      EventDispatcher eventDispatcher =
-          UIManagerHelper.getEventDispatcher(context, getUIManagerType());
+      EventDispatcher eventDispatcher = UIManagerHelper.getEventDispatcher(context);
       int surfaceId = UIManagerHelper.getSurfaceId(context);
       if (eventDispatcher != null) {
         mJSKeyDispatcher.handleKeyEvent(ev, eventDispatcher, surfaceId);
@@ -570,6 +566,7 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
     return appProperties != null ? appProperties.getString("surfaceID") : null;
   }
 
+  @Override
   public AtomicInteger getState() {
     return mState;
   }
@@ -809,6 +806,9 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
     }
   }
 
+  @SuppressLint("ClassImplementsFinalize") // Used for memory leak detection during development.
+  // The finalize method only performs an assertion check and doesn't do cleanup,
+  // so the typical finalize() risks (performance, deadlocks) don't apply here.
   @Override
   protected void finalize() throws Throwable {
     super.finalize();

package/ReactAndroid/src/main/java/com/facebook/react/animated/AnimationDriver.kt

@@ -34,8 +34,6 @@ internal abstract class AnimationDriver {
    * start animating with the new properties (different destination or spring settings)
    */
   open fun resetConfig(config: ReadableMap) {
-    throw JSApplicationCausedNativeException(
-        "Animation config for ${javaClass.simpleName} cannot be reset"
-    )
+    throw JSApplicationCausedNativeException("Animation config for AnimationDriver cannot be reset")
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/animated/ColorAnimatedNode.kt

@@ -27,10 +27,6 @@ internal class ColorAnimatedNode(
   private var nativeColor: ReadableMap? = null
   private var nativeColorApplied = false
 
-  init {
-    onUpdateConfig(config)
-  }
-
   val color: Int
     get() {
       tryApplyNativeColor()
@@ -45,6 +41,17 @@ internal class ColorAnimatedNode(
       return normalize(r, g, b, a)
     }
 
+  private val context: Context?
+    get() {
+      // There are cases where the activity may not exist (such as for VRShell panel apps). In this
+      // case we will search for a view associated with a PropsAnimatedNode to get the context.
+      return reactApplicationContext.currentActivity ?: getContextHelper(this)
+    }
+
+  init {
+    onUpdateConfig(config)
+  }
+
   override fun onUpdateConfig(config: ReadableMap?) {
     if (config != null) {
       rNodeId = config.getInt("r")
@@ -84,13 +91,6 @@ internal class ColorAnimatedNode(
     nativeColorApplied = true
   }
 
-  private val context: Context?
-    get() {
-      // There are cases where the activity may not exist (such as for VRShell panel apps). In this
-      // case we will search for a view associated with a PropsAnimatedNode to get the context.
-      return reactApplicationContext.currentActivity ?: getContextHelper(this)
-    }
-
   companion object {
     private fun getContextHelper(node: AnimatedNode): Context? {
       // Search children depth-first until we get to a PropsAnimatedNode, from which we can

package/ReactAndroid/src/main/java/com/facebook/react/animated/DiffClampAnimatedNode.kt

@@ -21,6 +21,17 @@ internal class DiffClampAnimatedNode(
   private val maxValue: Double
   private var lastValue: Double = 0.0
 
+  private val inputNodeValue: Double
+    get() {
+      val animatedNode = nativeAnimatedNodesManager.getNodeById(inputNodeTag)
+      if (animatedNode == null || animatedNode !is ValueAnimatedNode) {
+        throw JSApplicationCausedNativeException(
+            "Illegal node ID set as an input for Animated.DiffClamp node"
+        )
+      }
+      return animatedNode.getValue()
+    }
+
   init {
     inputNodeTag = config.getInt("input")
     minValue = config.getDouble("min")
@@ -35,17 +46,6 @@ internal class DiffClampAnimatedNode(
     nodeValue = min(max(nodeValue + diff, minValue), maxValue)
   }
 
-  private val inputNodeValue: Double
-    get() {
-      val animatedNode = nativeAnimatedNodesManager.getNodeById(inputNodeTag)
-      if (animatedNode == null || animatedNode !is ValueAnimatedNode) {
-        throw JSApplicationCausedNativeException(
-            "Illegal node ID set as an input for Animated.DiffClamp node"
-        )
-      }
-      return animatedNode.getValue()
-    }
-
   override fun prettyPrint(): String =
       "DiffClampAnimatedNode[$tag]: InputNodeTag: $inputNodeTag min: $minValue " +
           "max: $maxValue lastValue: $lastValue super: ${super.prettyPrint()}"

package/ReactAndroid/src/main/java/com/facebook/react/animated/EventAnimationDriver.kt

@@ -11,7 +11,6 @@ import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.ReadableType
 import com.facebook.react.bridge.UnexpectedNativeTypeException
-import com.facebook.react.bridge.WritableArray
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.EventCategoryDef
 import com.facebook.react.uimanager.events.RCTModernEventEmitter
@@ -23,31 +22,6 @@ internal class EventAnimationDriver(
     private val eventPath: List<String>,
     @JvmField internal var valueNode: ValueAnimatedNode,
 ) : RCTModernEventEmitter {
-  @Deprecated(
-      "Deprecated in Java",
-      ReplaceWith("receiveEvent(surfaceId, targetTag, eventName, params)"),
-  )
-  override fun receiveEvent(targetTag: Int, eventName: String, params: WritableMap?) =
-      receiveEvent(-1, targetTag, eventName, params)
-
-  override fun receiveEvent(
-      surfaceId: Int,
-      targetTag: Int,
-      eventName: String,
-      params: WritableMap?,
-  ) =
-      // We assume this event can't be coalesced. `customCoalesceKey` has no meaning in Fabric.
-      receiveEvent(surfaceId, targetTag, eventName, false, 0, params, EventCategoryDef.UNSPECIFIED)
-
-  @Deprecated("Deprecated in Java")
-  override fun receiveTouches(
-      eventName: String,
-      touches: WritableArray,
-      changedIndices: WritableArray,
-  ) {
-    throw UnsupportedOperationException("receiveTouches is not support by native animated events")
-  }
-
   override fun receiveEvent(
       surfaceId: Int,
       targetTag: Int,

package/ReactAndroid/src/main/java/com/facebook/react/animated/InterpolationAnimatedNode.kt

@@ -8,6 +8,7 @@
 package com.facebook.react.animated
 
 import androidx.core.graphics.ColorUtils
+import com.facebook.common.logging.FLog
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
@@ -44,6 +45,15 @@ internal class InterpolationAnimatedNode(config: ReadableMap) : ValueAnimatedNod
       outputType = OutputType.String
       outputRange = fromStringPattern(output)
       pattern = output.getString(0)
+    } else if (output != null && output.size() > 0 && output.getType(0) != ReadableType.Number) {
+      FLog.e(
+          TAG,
+          "Unsupported value type in interpolation outputRange: expected Number but got " +
+              "${output.getType(0)}. This may indicate PlatformColor or other unsupported " +
+              "values are being used. Interpolation will not work correctly.",
+      )
+      outputType = OutputType.Number
+      outputRange = DoubleArray(output.size())
     } else {
       outputType = OutputType.Number
       outputRange = fromDoubleArray(output)
@@ -101,6 +111,8 @@ internal class InterpolationAnimatedNode(config: ReadableMap) : ValueAnimatedNod
       "InterpolationAnimatedNode[$tag] super: ${super.prettyPrint()}"
 
   companion object {
+    private const val TAG = "InterpolationAnimatedNode"
+
     const val EXTRAPOLATE_TYPE_IDENTITY: String = "identity"
     const val EXTRAPOLATE_TYPE_CLAMP: String = "clamp"
     const val EXTRAPOLATE_TYPE_EXTEND: String = "extend"

package/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.kt

@@ -17,6 +17,7 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactSoftExceptionLogger
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.ScrollEndedListener
 import com.facebook.react.bridge.UIManager
 import com.facebook.react.bridge.UIManagerListener
 import com.facebook.react.bridge.buildReadableMap
@@ -80,7 +81,10 @@ import kotlin.concurrent.Volatile
 @OptIn(UnstableReactNativeAPI::class)
 @ReactModule(name = NativeAnimatedModuleSpec.NAME)
 public class NativeAnimatedModule(reactContext: ReactApplicationContext) :
-    NativeAnimatedModuleSpec(reactContext), LifecycleEventListener, UIManagerListener {
+    NativeAnimatedModuleSpec(reactContext),
+    LifecycleEventListener,
+    UIManagerListener,
+    ScrollEndedListener {
 
   // For `queueAndExecuteBatchedOperations`
   private enum class BatchExecutionOpCodes(value: Int) {
@@ -239,6 +243,11 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) :
     super.initialize()
 
     reactApplicationContext.addLifecycleEventListener(this)
+    reactApplicationContext.scrollEndedListeners.addListener(this)
+  }
+
+  override fun onScrollEnded(scrollView: android.view.ViewGroup) {
+    userDrivenScrollEnded(scrollView.id)
   }
 
   override fun onHostResume() {
@@ -913,6 +922,7 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) :
   override fun invalidate() {
     super.invalidate()
 
+    reactApplicationContext.scrollEndedListeners.removeListener(this)
     reactApplicationContext.removeLifecycleEventListener(this)
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.kt

@@ -233,7 +233,7 @@ public class NativeAnimatedNodesManager(
             )
     if (node !is ValueAnimatedNode) {
       throw JSApplicationIllegalArgumentException(
-          ("startAnimatingNode: Animated node [${animatedNodeTag}] should be of type ${ValueAnimatedNode::class.java.name}")
+          ("startAnimatingNode: Animated node [${animatedNodeTag}] should be of type ValueAnimatedNode")
       )
     }
 
@@ -389,7 +389,7 @@ public class NativeAnimatedNodesManager(
             )
     if (node !is PropsAnimatedNode) {
       throw JSApplicationIllegalArgumentException(
-          ("connectAnimatedNodeToView: Animated node connected to view [${viewTag}] should be of type ${PropsAnimatedNode::class.java.name}")
+          ("connectAnimatedNodeToView: Animated node connected to view [${viewTag}] should be of type PropsAnimatedNode")
       )
     }
     checkNotNull(reactApplicationContext) {
@@ -420,7 +420,7 @@ public class NativeAnimatedNodesManager(
             )
     if (node !is PropsAnimatedNode) {
       throw JSApplicationIllegalArgumentException(
-          ("disconnectAnimatedNodeFromView: Animated node connected to view [${viewTag}] should be of type ${PropsAnimatedNode::class.java.name}")
+          ("disconnectAnimatedNodeFromView: Animated node connected to view [${viewTag}] should be of type PropsAnimatedNode")
       )
     }
     node.disconnectFromView(viewTag)
@@ -463,7 +463,7 @@ public class NativeAnimatedNodesManager(
     // default values since it will never actually update the view.
     if (node !is PropsAnimatedNode) {
       throw JSApplicationIllegalArgumentException(
-          "Animated node connected to view [?] should be of type ${PropsAnimatedNode::class.java.name}"
+          "Animated node connected to view [?] should be of type PropsAnimatedNode"
       )
     }
     node.restoreDefaultValues()
@@ -483,7 +483,7 @@ public class NativeAnimatedNodesManager(
             )
     if (node !is ValueAnimatedNode) {
       throw JSApplicationIllegalArgumentException(
-          ("addAnimatedEventToView: Animated node on view [${viewTag}] connected to event handler (${eventHandlerName}) should be of type ${ValueAnimatedNode::class.java.name}")
+          ("addAnimatedEventToView: Animated node on view [${viewTag}] connected to event handler (${eventHandlerName}) should be of type ValueAnimatedNode")
       )
     }
 

package/ReactAndroid/src/main/java/com/facebook/react/animated/PropsAnimatedNode.kt

@@ -29,6 +29,11 @@ internal class PropsAnimatedNode(
   private val propMap = JavaOnlyMap()
   private var connectedViewUIManager: UIManager? = null
 
+  val connectedView: View?
+    // resolveView throws an [IllegalViewOperationException] when the view doesn't exist
+    // (this can happen if the surface is being deallocated).
+    get() = runCatching { connectedViewUIManager?.resolveView(connectedViewTag) }.getOrNull()
+
   init {
     val props = config.getMap("props")
     val iter = props?.keySetIterator()
@@ -112,11 +117,6 @@ internal class PropsAnimatedNode(
     connectedViewUIManager?.synchronouslyUpdateViewOnUIThread(connectedViewTag, propMap)
   }
 
-  val connectedView: View?
-    // resolveView throws an [IllegalViewOperationException] when the view doesn't exist
-    // (this can happen if the surface is being deallocated).
-    get() = runCatching { connectedViewUIManager?.resolveView(connectedViewTag) }.getOrNull()
-
   override fun prettyPrint(): String =
       "PropsAnimatedNode[$tag] connectedViewTag: $connectedViewTag " +
           "propNodeMapping: $propNodeMapping propMap: $propMap"

package/ReactAndroid/src/main/java/com/facebook/react/animated/SpringAnimation.kt

@@ -40,6 +40,24 @@ internal class SpringAnimation(config: ReadableMap) : AnimationDriver() {
   private var currentLoop = 0
   private var originalValue = 0.0
 
+  private val isAtRest: Boolean
+    /**
+     * check if the current state is at rest
+     *
+     * @return is the spring at rest
+     */
+    get() =
+        (abs(currentState.velocity) <= restSpeedThreshold &&
+            (getDisplacementDistanceForState(currentState) <= displacementFromRestThreshold ||
+                springStiffness == 0.0))
+
+  /* Check if the spring is overshooting beyond its target. */
+  private val isOvershooting: Boolean
+    get() =
+        (springStiffness > 0 &&
+            ((startValue < endValue && currentState.position > endValue) ||
+                (startValue > endValue && currentState.position < endValue)))
+
   init {
     currentState.velocity = config.getDouble("initialVelocity")
     resetConfig(config)
@@ -98,24 +116,6 @@ internal class SpringAnimation(config: ReadableMap) : AnimationDriver() {
   private fun getDisplacementDistanceForState(state: PhysicsState): Double =
       abs(endValue - state.position)
 
-  private val isAtRest: Boolean
-    /**
-     * check if the current state is at rest
-     *
-     * @return is the spring at rest
-     */
-    get() =
-        (abs(currentState.velocity) <= restSpeedThreshold &&
-            (getDisplacementDistanceForState(currentState) <= displacementFromRestThreshold ||
-                springStiffness == 0.0))
-
-  /* Check if the spring is overshooting beyond its target. */
-  private val isOvershooting: Boolean
-    get() =
-        (springStiffness > 0 &&
-            (startValue < endValue && currentState.position > endValue ||
-                startValue > endValue && currentState.position < endValue))
-
   private fun advance(realDeltaTime: Double) {
     if (isAtRest) {
       return
@@ -167,7 +167,7 @@ internal class SpringAnimation(config: ReadableMap) : AnimationDriver() {
     // End the spring immediately if it is overshooting and overshoot clamping is enabled.
     // Also make sure that if the spring was considered within a resting threshold that it's now
     // snapped to its end value.
-    if (isAtRest || overshootClampingEnabled && isOvershooting) {
+    if (isAtRest || (overshootClampingEnabled && isOvershooting)) {
       // Don't call setCurrentValue because that forces a call to onSpringUpdate
       if (springStiffness > 0) {
         startValue = endValue

package/ReactAndroid/src/main/java/com/facebook/react/animated/TrackingAnimatedNode.kt

@@ -25,7 +25,11 @@ internal class TrackingAnimatedNode(
     if (valAnimatedNode != null) {
       animationConfig.putDouble("toValue", valAnimatedNode.getValue())
     } else {
-      animationConfig.putNull("toValue")
+      val drivenNode = nativeAnimatedNodesManager.getNodeById(valueNode) as? ValueAnimatedNode
+      if (drivenNode == null) {
+        return
+      }
+      animationConfig.putDouble("toValue", drivenNode.getValue())
     }
     nativeAnimatedNodesManager.startAnimatingNode(animationId, valueNode, animationConfig, null)
   }