react-native-reanimated 3.16.5 → 3.16.6

package/Common/cpp/reanimated/Fabric/ReanimatedCommitHook.cpp

@@ -27,23 +27,31 @@ ReanimatedCommitHook::~ReanimatedCommitHook() noexcept {
   uiManager_->unregisterCommitHook(*this);
 }
 
+void ReanimatedCommitHook::maybeInitializeLayoutAnimations(
+    SurfaceId surfaceId) {
+  auto lock = std::unique_lock<std::mutex>(mutex_);
+  if (surfaceId > currentMaxSurfaceId_) {
+    // when a new surfaceId is observed we call setMountingOverrideDelegate
+    // for all yet unseen surfaces
+    uiManager_->getShadowTreeRegistry().enumerate(
+        [this](const ShadowTree &shadowTree, bool &stop) {
+          if (shadowTree.getSurfaceId() <= currentMaxSurfaceId_) {
+            // the set function actually adds our delegate to a list, so we
+            // shouldn't invoke it twice for the same surface
+            return;
+          }
+          shadowTree.getMountingCoordinator()->setMountingOverrideDelegate(
+              layoutAnimationsProxy_);
+        });
+    currentMaxSurfaceId_ = surfaceId;
+  }
+}
+
 RootShadowNode::Unshared ReanimatedCommitHook::shadowTreeWillCommit(
     ShadowTree const &,
     RootShadowNode::Shared const &,
     RootShadowNode::Unshared const &newRootShadowNode) noexcept {
-  auto surfaceId = newRootShadowNode->getSurfaceId();
-
-  {
-    auto lock = std::unique_lock<std::mutex>(mutex_);
-    if (surfaceId > currentMaxSurfaceId_) {
-      uiManager_->getShadowTreeRegistry().enumerate(
-          [this](const ShadowTree &shadowTree, bool &stop) {
-            shadowTree.getMountingCoordinator()->setMountingOverrideDelegate(
-                layoutAnimationsProxy_);
-          });
-      currentMaxSurfaceId_ = surfaceId;
-    }
-  }
+  maybeInitializeLayoutAnimations(newRootShadowNode->getSurfaceId());
 
   auto reaShadowNode =
       std::reinterpret_pointer_cast<ReanimatedCommitShadowNode>(

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

@@ -42,6 +42,8 @@ class ReanimatedCommitHook : public UIManagerCommitHook {
       const noexcept override;
 #endif
 
+  void maybeInitializeLayoutAnimations(SurfaceId surfaceId);
+
  private:
   std::shared_ptr<PropsRegistry> propsRegistry_;
 

package/lib/module/platform-specific/jsVersion.js

@@ -5,5 +5,5 @@
  * version used to build the native part of the library in runtime. Remember to
  * keep this in sync with the version declared in `package.json`
  */
-export const jsVersion = '3.16.5';
+export const jsVersion = '3.16.6';
 //# sourceMappingURL=jsVersion.js.map

package/lib/typescript/platform-specific/jsVersion.d.ts

@@ -3,5 +3,5 @@
  * version used to build the native part of the library in runtime. Remember to
  * keep this in sync with the version declared in `package.json`
  */
-export declare const jsVersion = "3.16.5";
+export declare const jsVersion = "3.16.6";
 //# sourceMappingURL=jsVersion.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-reanimated",
-  "version": "3.16.5",
+  "version": "3.16.6",
   "description": "More powerful alternative to Animated library for React Native.",
   "scripts": {
     "test": "jest",

package/src/platform-specific/jsVersion.ts

@@ -4,4 +4,4 @@
  * version used to build the native part of the library in runtime. Remember to
  * keep this in sync with the version declared in `package.json`
  */
-export const jsVersion = '3.16.5';
+export const jsVersion = '3.16.6';