react-native-reanimated 3.17.1 → 3.17.3

package/Common/cpp/reanimated/Fabric/PropsRegistry.cpp

@@ -32,6 +32,33 @@ void PropsRegistry::for_each(std::function<void(
   }
 }
 
+void PropsRegistry::markNodeAsRemovable(const ShadowNode::Shared &shadowNode) {
+  removableShadowNodes_[shadowNode->getTag()] = shadowNode;
+}
+
+void PropsRegistry::unmarkNodeAsRemovable(Tag viewTag) {
+  removableShadowNodes_.erase(viewTag);
+}
+
+void PropsRegistry::handleNodeRemovals(const RootShadowNode &rootShadowNode) {
+  for (auto it = removableShadowNodes_.begin();
+       it != removableShadowNodes_.end();) {
+    const auto &shadowNode = it->second;
+    const auto &family = shadowNode->getFamily();
+    const auto &ancestors = family.getAncestors(rootShadowNode);
+
+    // Skip if the node hasn't been removed
+    if (!ancestors.empty()) {
+      ++it;
+      continue;
+    }
+
+    const auto tag = shadowNode->getTag();
+    map_.erase(tag);
+    it = removableShadowNodes_.erase(it);
+  }
+}
+
 void PropsRegistry::remove(const Tag tag) {
   map_.erase(tag);
 }

package/Common/cpp/reanimated/Fabric/PropsRegistry.h

@@ -45,8 +45,17 @@ class PropsRegistry {
     return shouldCommitAfterPause_.exchange(false);
   }
 
+  bool isEmpty() {
+    return map_.empty();
+  }
+
+  void markNodeAsRemovable(const ShadowNode::Shared &shadowNode);
+  void unmarkNodeAsRemovable(Tag viewTag);
+  void handleNodeRemovals(const RootShadowNode &rootShadowNode);
+
  private:
   std::unordered_map<Tag, std::pair<ShadowNode::Shared, folly::dynamic>> map_;
+  std::unordered_map<Tag, ShadowNode::Shared> removableShadowNodes_;
 
   mutable std::mutex mutex_; // Protects `map_`.
 

package/Common/cpp/reanimated/Fabric/ReanimatedMountHook.cpp

@@ -17,7 +17,7 @@ ReanimatedMountHook::~ReanimatedMountHook() noexcept {
 }
 
 void ReanimatedMountHook::shadowTreeDidMount(
-    RootShadowNode::Shared const &rootShadowNode,
+    const RootShadowNode::Shared &rootShadowNode,
     double) noexcept {
   auto reaShadowNode =
       std::reinterpret_pointer_cast<ReanimatedCommitShadowNode>(
@@ -32,11 +32,16 @@ void ReanimatedMountHook::shadowTreeDidMount(
     return;
   }
 
-  // When commit from React Native has finished, we reset the skip commit flag
-  // in order to allow Reanimated to commit its tree
-  propsRegistry_->unpauseReanimatedCommits();
-  if (!propsRegistry_->shouldCommitAfterPause()) {
-    return;
+  {
+    auto lock = propsRegistry_->createLock();
+    propsRegistry_->handleNodeRemovals(*rootShadowNode);
+
+    // When commit from React Native has finished, we reset the skip commit flag
+    // in order to allow Reanimated to commit its tree
+    propsRegistry_->unpauseReanimatedCommits();
+    if (!propsRegistry_->shouldCommitAfterPause()) {
+      return;
+    }
   }
 
   const auto &shadowTreeRegistry = uiManager_->getShadowTreeRegistry();

package/Common/cpp/reanimated/NativeModules/ReanimatedModuleProxy.cpp

@@ -64,8 +64,6 @@ ReanimatedModuleProxy::ReanimatedModuleProxy(
       layoutAnimationsManager_(
           std::make_shared<LayoutAnimationsManager>(jsLogger_)),
 #ifdef RCT_NEW_ARCH_ENABLED
-      synchronouslyUpdateUIPropsFunction_(
-          platformDepMethodsHolder.synchronouslyUpdateUIPropsFunction),
       propsRegistry_(std::make_shared<PropsRegistry>()),
 #else
       obtainPropFunction_(platformDepMethodsHolder.obtainPropFunction),
@@ -205,7 +203,6 @@ void ReanimatedModuleProxy::init(
   UIRuntimeDecorator::decorate(
       uiRuntime,
 #ifdef RCT_NEW_ARCH_ENABLED
-      removeFromPropsRegistry,
       obtainProp,
       updateProps,
       measure,
@@ -489,7 +486,6 @@ jsi::Value ReanimatedModuleProxy::configureProps(
   auto nativePropsArray = nativeProps.asObject(rt).asArray(rt);
   for (size_t i = 0; i < nativePropsArray.size(rt); ++i) {
     auto name = nativePropsArray.getValueAtIndex(rt, i).asString(rt).utf8(rt);
-    nativePropNames_.insert(name);
     animatablePropNames_.insert(name);
   }
 #else
@@ -600,20 +596,18 @@ void ReanimatedModuleProxy::cleanupSensors() {
 }
 
 #ifdef RCT_NEW_ARCH_ENABLED
-bool ReanimatedModuleProxy::isThereAnyLayoutProp(
+
+void ReanimatedModuleProxy::markNodeAsRemovable(
     jsi::Runtime &rt,
-    const jsi::Object &props) {
-  const jsi::Array propNames = props.getPropertyNames(rt);
-  for (size_t i = 0; i < propNames.size(rt); ++i) {
-    const std::string propName =
-        propNames.getValueAtIndex(rt, i).asString(rt).utf8(rt);
-    bool isLayoutProp =
-        nativePropNames_.find(propName) != nativePropNames_.end();
-    if (isLayoutProp) {
-      return true;
-    }
-  }
-  return false;
+    const jsi::Value &shadowNodeWrapper) {
+  auto shadowNode = shadowNodeFromValue(rt, shadowNodeWrapper);
+  propsRegistry_->markNodeAsRemovable(shadowNode);
+}
+
+void ReanimatedModuleProxy::unmarkNodeAsRemovable(
+    jsi::Runtime &rt,
+    const jsi::Value &viewTag) {
+  propsRegistry_->unmarkNodeAsRemovable(viewTag.asNumber());
 }
 
 jsi::Value ReanimatedModuleProxy::filterNonAnimatableProps(
@@ -760,25 +754,6 @@ void ReanimatedModuleProxy::performOperations() {
     jsPropsUpdater.call(rt, viewTag, nonAnimatableProps);
   }
 
-  bool hasLayoutUpdates = false;
-
-  for (const auto &[shadowNode, props] : copiedOperationsQueue) {
-    if (isThereAnyLayoutProp(rt, props->asObject(rt))) {
-      hasLayoutUpdates = true;
-      break;
-    }
-  }
-
-  if (!hasLayoutUpdates) {
-    // If there's no layout props to be updated, we can apply the updates
-    // directly onto the components and skip the commit.
-    for (const auto &[shadowNode, props] : copiedOperationsQueue) {
-      Tag tag = shadowNode->getTag();
-      synchronouslyUpdateUIPropsFunction_(rt, tag, props->asObject(rt));
-    }
-    return;
-  }
-
   if (propsRegistry_->shouldReanimatedSkipCommit()) {
     // It may happen that `performOperations` is called on the UI thread
     // while React Native tries to commit a new tree on the JS thread.
@@ -829,15 +804,6 @@ void ReanimatedModuleProxy::performOperations() {
   }
 }
 
-void ReanimatedModuleProxy::removeFromPropsRegistry(
-    jsi::Runtime &rt,
-    const jsi::Value &viewTags) {
-  auto array = viewTags.asObject(rt).asArray(rt);
-  for (size_t i = 0, size = array.size(rt); i < size; ++i) {
-    tagsToRemove_.push_back(array.getValueAtIndex(rt, i).asNumber());
-  }
-}
-
 void ReanimatedModuleProxy::dispatchCommand(
     jsi::Runtime &rt,
     const jsi::Value &shadowNodeValue,
@@ -846,7 +812,19 @@ void ReanimatedModuleProxy::dispatchCommand(
   ShadowNode::Shared shadowNode = shadowNodeFromValue(rt, shadowNodeValue);
   std::string commandName = stringFromValue(rt, commandNameValue);
   folly::dynamic args = commandArgsFromValue(rt, argsValue);
-  uiManager_->dispatchCommand(shadowNode, commandName, args);
+  const auto &scheduler = static_cast<Scheduler *>(uiManager_->getDelegate());
+
+  if (!scheduler) {
+    return;
+  }
+
+  const auto &schedulerDelegate = scheduler->getDelegate();
+
+  if (schedulerDelegate) {
+    const auto shadowView = ShadowView(*shadowNode);
+    schedulerDelegate->schedulerDidDispatchCommand(
+        shadowView, commandName, args);
+  }
 }
 
 jsi::String ReanimatedModuleProxy::obtainProp(
@@ -936,6 +914,30 @@ void ReanimatedModuleProxy::initializeLayoutAnimationsProxy() {
   }
 }
 
+#ifdef IS_REANIMATED_EXAMPLE_APP
+
+std::string format(bool b) {
+  return b ? "✅" : "❌";
+}
+
+std::function<std::string()>
+ReanimatedModuleProxy::createRegistriesLeakCheck() {
+  return [weakThis = weak_from_this()]() {
+    auto strongThis = weakThis.lock();
+    if (!strongThis) {
+      return std::string("");
+    }
+
+    std::string result = "";
+
+    result += "PropsRegistry: " + format(strongThis->propsRegistry_->isEmpty());
+
+    return result;
+  };
+}
+
+#endif // IS_REANIMATED_EXAMPLE_APP
+
 #endif // RCT_NEW_ARCH_ENABLED
 
 jsi::Value ReanimatedModuleProxy::subscribeForKeyboardEvents(

package/Common/cpp/reanimated/NativeModules/ReanimatedModuleProxy.h

@@ -124,6 +124,12 @@ class ReanimatedModuleProxy
 
   void performOperations();
 
+  void markNodeAsRemovable(
+      jsi::Runtime &rt,
+      const jsi::Value &shadowNodeWrapper) override;
+  void unmarkNodeAsRemovable(jsi::Runtime &rt, const jsi::Value &viewTag)
+      override;
+
   void dispatchCommand(
       jsi::Runtime &rt,
       const jsi::Value &shadowNodeValue,
@@ -145,6 +151,10 @@ class ReanimatedModuleProxy
       jsi::Runtime &rt,
       const std::string &propName,
       const ShadowNode::Shared &shadowNode);
+
+#ifdef IS_REANIMATED_EXAMPLE_APP
+  std::function<std::string()> createRegistriesLeakCheck();
+#endif // IS_REANIMATED_EXAMPLE_APP
 #endif
 
   jsi::Value registerSensor(
@@ -191,7 +201,6 @@ class ReanimatedModuleProxy
   void requestAnimationFrame(jsi::Runtime &rt, const jsi::Value &callback);
 
 #ifdef RCT_NEW_ARCH_ENABLED
-  bool isThereAnyLayoutProp(jsi::Runtime &rt, const jsi::Object &props);
   jsi::Value filterNonAnimatableProps(
       jsi::Runtime &rt,
       const jsi::Value &props);
@@ -213,9 +222,6 @@ class ReanimatedModuleProxy
   std::shared_ptr<LayoutAnimationsManager> layoutAnimationsManager_;
 
 #ifdef RCT_NEW_ARCH_ENABLED
-  const SynchronouslyUpdateUIPropsFunction synchronouslyUpdateUIPropsFunction_;
-
-  std::unordered_set<std::string> nativePropNames_; // filled by configureProps
   std::unordered_set<std::string>
       animatablePropNames_; // filled by configureProps
   std::shared_ptr<UIManager> uiManager_;

package/Common/cpp/reanimated/NativeModules/ReanimatedModuleProxySpec.cpp

@@ -160,6 +160,30 @@ static jsi::Value REANIMATED_SPEC_PREFIX(setShouldAnimateExiting)(
   return jsi::Value::undefined();
 }
 
+#ifdef RCT_NEW_ARCH_ENABLED
+
+static jsi::Value REANIMATED_SPEC_PREFIX(markNodeAsRemovable)(
+    jsi::Runtime &rt,
+    TurboModule &turboModule,
+    const jsi::Value *args,
+    size_t) {
+  static_cast<ReanimatedModuleProxySpec *>(&turboModule)
+      ->markNodeAsRemovable(rt, std::move(args[0]));
+  return jsi::Value::undefined();
+}
+
+static jsi::Value REANIMATED_SPEC_PREFIX(unmarkNodeAsRemovable)(
+    jsi::Runtime &rt,
+    TurboModule &turboModule,
+    const jsi::Value *args,
+    size_t) {
+  static_cast<ReanimatedModuleProxySpec *>(&turboModule)
+      ->unmarkNodeAsRemovable(rt, std::move(args[0]));
+  return jsi::Value::undefined();
+}
+
+#endif // RCT_NEW_ARCH_ENABLED
+
 ReanimatedModuleProxySpec::ReanimatedModuleProxySpec(
     const std::shared_ptr<CallInvoker> &jsInvoker)
     : TurboModule("NativeReanimated", jsInvoker) {
@@ -196,5 +220,12 @@ ReanimatedModuleProxySpec::ReanimatedModuleProxySpec(
       MethodMetadata{1, REANIMATED_SPEC_PREFIX(configureLayoutAnimationBatch)};
   methodMap_["setShouldAnimateExitingForTag"] =
       MethodMetadata{2, REANIMATED_SPEC_PREFIX(setShouldAnimateExiting)};
+
+#ifdef RCT_NEW_ARCH_ENABLED
+  methodMap_["markNodeAsRemovable"] =
+      MethodMetadata{1, REANIMATED_SPEC_PREFIX(markNodeAsRemovable)};
+  methodMap_["unmarkNodeAsRemovable"] =
+      MethodMetadata{1, REANIMATED_SPEC_PREFIX(unmarkNodeAsRemovable)};
+#endif // RCT_NEW_ARCH_ENABLED
 }
 } // namespace reanimated

package/Common/cpp/reanimated/NativeModules/ReanimatedModuleProxySpec.h

@@ -94,6 +94,16 @@ class JSI_EXPORT ReanimatedModuleProxySpec : public TurboModule {
       jsi::Runtime &rt,
       const jsi::Value &viewTag,
       const jsi::Value &shouldAnimate) = 0;
+
+#ifdef RCT_NEW_ARCH_ENABLED
+  // Cleanup
+  virtual void markNodeAsRemovable(
+      jsi::Runtime &rt,
+      const jsi::Value &shadowNodeWrapper) = 0;
+  virtual void unmarkNodeAsRemovable(
+      jsi::Runtime &rt,
+      const jsi::Value &viewTag) = 0;
+#endif // RCT_NEW_ARCH_ENABLED
 };
 
 } // namespace reanimated

package/Common/cpp/reanimated/RuntimeDecorators/RNRuntimeDecorator.cpp

@@ -1,4 +1,5 @@
 #include <reanimated/RuntimeDecorators/RNRuntimeDecorator.h>
+#include <worklets/Tools/ReanimatedJSIUtils.h>
 #include <worklets/Tools/ReanimatedVersion.h>
 
 namespace reanimated {
@@ -32,6 +33,13 @@ void RNRuntimeDecorator::decorate(
 #ifndef NDEBUG
   checkJSVersion(rnRuntime, reanimatedModuleProxy->getJSLogger());
 #endif // NDEBUG
+
+#if defined(IS_REANIMATED_EXAMPLE_APP) && defined(RCT_NEW_ARCH_ENABLED)
+  jsi_utils::installJsiFunction(
+      rnRuntime,
+      "_registriesLeakCheck",
+      reanimatedModuleProxy->createRegistriesLeakCheck());
+#endif // defined(IS_REANIMATED_EXAMPLE_APP) && defined(RCT_NEW_ARCH_ENABLED)
   injectReanimatedCppVersion(rnRuntime);
 
   rnRuntime.global().setProperty(

package/Common/cpp/reanimated/RuntimeDecorators/UIRuntimeDecorator.cpp

@@ -8,7 +8,7 @@ using namespace worklets;
 void UIRuntimeDecorator::decorate(
     jsi::Runtime &uiRuntime,
 #ifdef RCT_NEW_ARCH_ENABLED
-    const RemoveFromPropsRegistryFunction removeFromPropsRegistry,
+// nothing
 #else
     const ScrollToFunction scrollTo,
 #endif
@@ -26,8 +26,6 @@ void UIRuntimeDecorator::decorate(
 
 #ifdef RCT_NEW_ARCH_ENABLED
   jsi_utils::installJsiFunction(uiRuntime, "_updatePropsFabric", updateProps);
-  jsi_utils::installJsiFunction(
-      uiRuntime, "_removeFromPropsRegistry", removeFromPropsRegistry);
   jsi_utils::installJsiFunction(
       uiRuntime, "_dispatchCommandFabric", dispatchCommand);
   jsi_utils::installJsiFunction(uiRuntime, "_measureFabric", measure);

package/Common/cpp/reanimated/RuntimeDecorators/UIRuntimeDecorator.h

@@ -16,7 +16,7 @@ class UIRuntimeDecorator {
   static void decorate(
       jsi::Runtime &uiRuntime,
 #ifdef RCT_NEW_ARCH_ENABLED
-      const RemoveFromPropsRegistryFunction removeFromPropsRegistry,
+// nothing
 #else
       const ScrollToFunction scrollTo,
 #endif

package/Common/cpp/reanimated/Tools/PlatformDepMethodsHolder.h

@@ -20,12 +20,8 @@ namespace reanimated {
 
 #ifdef RCT_NEW_ARCH_ENABLED
 
-using SynchronouslyUpdateUIPropsFunction =
-    std::function<void(jsi::Runtime &rt, Tag tag, const jsi::Object &props)>;
 using UpdatePropsFunction =
     std::function<void(jsi::Runtime &rt, const jsi::Value &operations)>;
-using RemoveFromPropsRegistryFunction =
-    std::function<void(jsi::Runtime &rt, const jsi::Value &viewTags)>;
 using ObtainPropFunction = std::function<jsi::Value(
     jsi::Runtime &rt,
     const jsi::Value &shadowNodeWrapper,
@@ -79,7 +75,7 @@ using MaybeFlushUIUpdatesQueueFunction = std::function<void()>;
 struct PlatformDepMethodsHolder {
   RequestRenderFunction requestRender;
 #ifdef RCT_NEW_ARCH_ENABLED
-  SynchronouslyUpdateUIPropsFunction synchronouslyUpdateUIPropsFunction;
+  // nothing
 #else
   UpdatePropsFunction updatePropsFunction;
   ScrollToFunction scrollToFunction;

package/Common/cpp/worklets/Tools/ReanimatedJSIUtils.h

@@ -108,6 +108,16 @@ inline jsi::Value apply(
   return std::apply(function, std::move(args));
 }
 
+// calls string-returning `function` with `args`,
+// and returns the string
+template <typename... Args>
+inline jsi::Value apply(
+    jsi::Runtime &rt,
+    std::function<std::string(Args...)> function,
+    std::tuple<Args...> args) {
+  return jsi::String::createFromUtf8(rt, std::apply(function, std::move(args)));
+}
+
 // calls void-returning `function` with `args`,
 // and returns `undefined`
 template <typename... Args>
@@ -132,6 +142,21 @@ jsi::HostFunctionType createHostFunction(Fun function) {
   };
 }
 
+// returns a function with JSI calling convention
+// from a native function `function` returning a string
+template <typename... Args>
+jsi::HostFunctionType createHostFunction(
+    std::function<std::string(Args...)> function) {
+  return [function](
+             jsi::Runtime &rt,
+             const jsi::Value &,
+             const jsi::Value *args,
+             const size_t count) {
+    auto argz = getArgsForFunction(function, rt, args, count);
+    return apply(rt, function, std::move(argz));
+  };
+}
+
 // used to determine if `function<Ret(Args...)>`
 // takes `Runtime &` as its first argument
 template <typename... Args>

package/android/src/fabric/java/com/swmansion/reanimated/NativeProxy.java

@@ -16,6 +16,7 @@ import com.swmansion.worklets.JSCallInvokerResolver;
 import com.swmansion.worklets.WorkletsModule;
 import java.util.HashMap;
 import java.util.Objects;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * @noinspection JavaJniMissingFunction
@@ -25,6 +26,12 @@ public class NativeProxy extends NativeProxyCommon {
   @SuppressWarnings("unused")
   private final HybridData mHybridData;
 
+  /**
+   * Invalidating concurrently could be fatal. It shouldn't happen in a normal flow, but it doesn't
+   * cost us much to add synchronization for extra safety.
+   */
+  private final AtomicBoolean mInvalidated = new AtomicBoolean(false);
+
   public @OptIn(markerClass = FrameworkAPI.class) NativeProxy(
       ReactApplicationContext context, WorkletsModule workletsModule) {
     super(context);
@@ -72,8 +79,13 @@ public class NativeProxy extends NativeProxyCommon {
 
   private native void invalidateCpp();
 
-  public void invalidate() {
-    invalidateCpp();
+  protected void invalidate() {
+    if (mInvalidated.getAndSet(true)) {
+      return;
+    }
+    if (mHybridData != null && mHybridData.isValid()) {
+      invalidateCpp();
+    }
   }
 
   public static NativeMethodsHolder createNativeMethodsHolder(

package/android/src/fabric/java/com/swmansion/reanimated/ReaCompatibility.java

@@ -1,7 +1,6 @@
 package com.swmansion.reanimated;
 
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.fabric.FabricUIManager;
 import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.common.UIManagerType;
@@ -26,8 +25,4 @@ class ReaCompatibility {
       fabricUIManager.getEventDispatcher().removeListener(nodesManager);
     }
   }
-
-  public void synchronouslyUpdateUIProps(int viewTag, ReadableMap uiProps) {
-    fabricUIManager.synchronouslyUpdateViewOnUIThread(viewTag, uiProps);
-  }
 }

package/android/src/main/cpp/reanimated/android/NativeProxy.cpp

@@ -318,26 +318,6 @@ std::vector<std::pair<std::string, double>> NativeProxy::measure(int viewTag) {
 }
 #endif // RCT_NEW_ARCH_ENABLED
 
-#ifdef RCT_NEW_ARCH_ENABLED
-inline jni::local_ref<ReadableMap::javaobject> castReadableMap(
-    jni::local_ref<ReadableNativeMap::javaobject> const &nativeMap) {
-  return make_local(reinterpret_cast<ReadableMap::javaobject>(nativeMap.get()));
-}
-
-void NativeProxy::synchronouslyUpdateUIProps(
-    jsi::Runtime &rt,
-    Tag tag,
-    const jsi::Object &props) {
-  static const auto method =
-      getJniMethod<void(int, jni::local_ref<ReadableMap::javaobject>)>(
-          "synchronouslyUpdateUIProps");
-  jni::local_ref<ReadableMap::javaobject> uiProps =
-      castReadableMap(ReadableNativeMap::newObjectCxxArgs(
-          jsi::dynamicFromValue(rt, jsi::Value(rt, props))));
-  method(javaPart_.get(), tag, uiProps);
-}
-#endif
-
 int NativeProxy::registerSensor(
     int sensorType,
     int interval,
@@ -456,8 +436,7 @@ PlatformDepMethodsHolder NativeProxy::getPlatformDependentMethods() {
   auto requestRender = bindThis(&NativeProxy::requestRender);
 
 #ifdef RCT_NEW_ARCH_ENABLED
-  auto synchronouslyUpdateUIPropsFunction =
-      bindThis(&NativeProxy::synchronouslyUpdateUIProps);
+  // nothing
 #else
   auto configurePropsFunction = bindThis(&NativeProxy::configureProps);
 #endif
@@ -491,7 +470,7 @@ PlatformDepMethodsHolder NativeProxy::getPlatformDependentMethods() {
   return {
       requestRender,
 #ifdef RCT_NEW_ARCH_ENABLED
-      synchronouslyUpdateUIPropsFunction,
+  // nothing
 #else
       updatePropsFunction,
       scrollToFunction,

package/android/src/main/cpp/reanimated/android/NativeProxy.h

@@ -181,12 +181,6 @@ class NativeProxy : public jni::HybridClass<NativeProxy>,
   // std::shared_ptr<EventListener> eventListener_;
 #endif // RCT_NEW_ARCH_ENABLED
   void installJSIBindings();
-#ifdef RCT_NEW_ARCH_ENABLED
-  void synchronouslyUpdateUIProps(
-      jsi::Runtime &rt,
-      Tag viewTag,
-      const jsi::Object &props);
-#endif
   PlatformDepMethodsHolder getPlatformDependentMethods();
   void setupLayoutAnimations();
 

package/android/src/main/java/com/swmansion/reanimated/NodesManager.java

@@ -440,10 +440,6 @@ public class NodesManager implements EventDispatcherListener {
     }
   }
 
-  public void synchronouslyUpdateUIProps(int viewTag, ReadableMap uiProps) {
-    compatibility.synchronouslyUpdateUIProps(viewTag, uiProps);
-  }
-
   public String obtainProp(int viewTag, String propName) {
     View view;
     try {

package/android/src/main/java/com/swmansion/reanimated/nativeProxy/NativeProxyCommon.java

@@ -9,7 +9,6 @@ import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableNativeArray;
 import com.facebook.soloader.SoLoader;
 import com.swmansion.common.GestureHandlerStateManager;
@@ -129,11 +128,6 @@ public abstract class NativeProxyCommon {
     mNodesManager.updateProps(viewTag, props);
   }
 
-  @DoNotStrip
-  public void synchronouslyUpdateUIProps(int viewTag, ReadableMap uiProps) {
-    mNodesManager.synchronouslyUpdateUIProps(viewTag, uiProps);
-  }
-
   @DoNotStrip
   public String obtainProp(int viewTag, String propName) {
     return mNodesManager.obtainProp(viewTag, propName);

package/android/src/main/java/com/swmansion/worklets/WorkletsModule.java

@@ -12,6 +12,7 @@ import com.facebook.react.turbomodule.core.CallInvokerHolderImpl;
 import com.facebook.soloader.SoLoader;
 import com.swmansion.reanimated.NativeWorkletsModuleSpec;
 import java.util.Objects;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * @noinspection JavaJniMissingFunction
@@ -38,6 +39,12 @@ public class WorkletsModule extends NativeWorkletsModuleSpec {
     return mAndroidUIScheduler;
   }
 
+  /**
+   * Invalidating concurrently could be fatal. It shouldn't happen in a normal flow, but it doesn't
+   * cost us much to add synchronization for extra safety.
+   */
+  private final AtomicBoolean mInvalidated = new AtomicBoolean(false);
+
   @OptIn(markerClass = FrameworkAPI.class)
   private native HybridData initHybrid(
       long jsContext,
@@ -69,11 +76,15 @@ public class WorkletsModule extends NativeWorkletsModuleSpec {
   }
 
   public void invalidate() {
-    // We have to destroy extra runtimes when invalidate is called. If we clean
-    // it up later instead there's a chance the runtime will retain references
-    // to invalidated memory and will crash on its destruction.
-    invalidateCpp();
-
+    if (mInvalidated.getAndSet(true)) {
+      return;
+    }
+    if (mHybridData != null && mHybridData.isValid()) {
+      // We have to destroy extra runtimes when invalidate is called. If we clean
+      // it up later instead there's a chance the runtime will retain references
+      // to invalidated memory and will crash on its destruction.
+      invalidateCpp();
+    }
     mAndroidUIScheduler.deactivate();
   }
 

package/android/src/paper/java/com/swmansion/reanimated/NativeProxy.java

@@ -16,6 +16,7 @@ import com.swmansion.worklets.WorkletsModule;
 import java.lang.ref.WeakReference;
 import java.util.HashMap;
 import java.util.Objects;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * @noinspection JavaJniMissingFunction
@@ -25,6 +26,12 @@ public class NativeProxy extends NativeProxyCommon {
   @SuppressWarnings("unused")
   private final HybridData mHybridData;
 
+  /**
+   * Invalidating concurrently could be fatal. It shouldn't happen in a normal flow, but it doesn't
+   * cost us much to add synchronization for extra safety.
+   */
+  private final AtomicBoolean mInvalidated = new AtomicBoolean(false);
+
   @OptIn(markerClass = FrameworkAPI.class)
   public NativeProxy(ReactApplicationContext context, WorkletsModule workletsModule) {
     super(context);
@@ -63,8 +70,13 @@ public class NativeProxy extends NativeProxyCommon {
 
   private native void invalidateCpp();
 
-  public void invalidate() {
-    invalidateCpp();
+  protected void invalidate() {
+    if (mInvalidated.getAndSet(true)) {
+      return;
+    }
+    if (mHybridData != null && mHybridData.isValid()) {
+      invalidateCpp();
+    }
   }
 
   public static NativeMethodsHolder createNativeMethodsHolder(LayoutAnimations layoutAnimations) {