react-native-reanimated 4.3.1 → 4.3.3

package/android/generate-stub-pch.gradle.kts

@@ -0,0 +1,84 @@
+import groovy.json.JsonSlurper
+
+// Workaround for Android Studio's C++ analyzer surfacing errors during Gradle
+// Sync when CMake's precompiled header binary (`cmake_pch.hxx.pch`, generated
+// from `ReanimatedPCH.h`) hasn't been built yet. The project compiles fine,
+// but on a clean sync the IDE can't index sources without the PCH binary. See
+// the underlying issue: https://issuetracker.google.com/issues/187448826
+
+// Generates minimal stub `.pch` files from an empty header so the IDE's C++
+// engine doesn't fail during sync. The actual build regenerates the real PCH
+// files via ninja because we set each stub PCH's mtime older than its source
+// (`cmake_pch.hxx.cxx`).
+
+// Adapted from Expo's PR: https://github.com/expo/expo/pull/45921
+
+val cxxDir = project.file(".cxx")
+
+val generateStubPCHTask = tasks.register("generateStubPCH") {
+    dependsOn("configureCMakeDebug")
+    doLast {
+        if (!cxxDir.exists()) {
+            return@doLast
+        }
+        cxxDir.walkTopDown().forEach { file ->
+            if (file.name != "compile_commands.json") {
+                return@forEach
+            }
+            @Suppress("UNCHECKED_CAST")
+            val entries = JsonSlurper().parseText(file.readText()) as List<Map<String, Any>>
+            entries.forEach entry@{ entry ->
+                val entryFile = entry["file"] as String
+                if (!entryFile.endsWith("cmake_pch.hxx.cxx")) {
+                    return@entry
+                }
+                val pchFile = File(entryFile.substring(0, entryFile.length - ".cxx".length) + ".pch")
+                if (!pchFile.exists() || pchFile.length() == 0L) {
+                    pchFile.parentFile.mkdirs()
+
+                    val command = entry["command"] as String
+                    val compiler = command.split(" ").first()
+                    val target = Regex("""--target=\S+""").find(command)!!.value
+                    val sysroot = Regex("""--sysroot=\S+""").find(command)!!.value
+
+                    val stubHeader = File(pchFile.parentFile, "stub_pch.hxx")
+                    stubHeader.writeText("")
+
+                    val process = ProcessBuilder(
+                        compiler,
+                        target,
+                        sysroot,
+                        "-x", "c++-header",
+                        "-o", pchFile.absolutePath,
+                        stubHeader.absolutePath,
+                    )
+                        .directory(File(entry["directory"] as String))
+                        .redirectErrorStream(true)
+                        .start()
+                    process.outputStream.close()
+                    if (process.waitFor() != 0) {
+                        throw GradleException(
+                            "Stub PCH generation failed: ${process.inputStream.bufferedReader().readText()}",
+                        )
+                    }
+                }
+                // Ensure PCH is older than source so ninja rebuilds the real one during build
+                pchFile.setLastModified(File(entryFile).lastModified() - 1)
+            }
+        }
+    }
+}
+
+// Register `prepareKotlinBuildScriptModel` if absent (Android Studio sync needs it
+// to exist so the stub PCH generation runs) or configure it if some other plugin
+// already registered it (e.g. on CI, where re-registering throws `Cannot add task
+// 'prepareKotlinBuildScriptModel' as a task with that name already exists.`).
+if (tasks.findByName("prepareKotlinBuildScriptModel") == null) {
+    tasks.register("prepareKotlinBuildScriptModel") {
+        dependsOn(generateStubPCHTask)
+    }
+} else {
+    tasks.named("prepareKotlinBuildScriptModel") {
+        dependsOn(generateStubPCHTask)
+    }
+}

package/android/src/main/cpp/ReanimatedPCH.h

@@ -0,0 +1,46 @@
+#pragma once
+
+// IWYU pragma: begin_keep
+
+// C++ standard library
+#include <algorithm>
+#include <atomic>
+#include <functional>
+#include <map>
+#include <memory>
+#include <mutex>
+#include <optional>
+#include <ostream>
+#include <string>
+#include <string_view>
+#include <type_traits>
+#include <unordered_map>
+#include <unordered_set>
+#include <utility>
+#include <vector>
+
+// fbjni
+#include <fbjni/fbjni.h>
+
+// folly
+#include <folly/Conv.h>
+#include <folly/Expected.h>
+#include <folly/Format.h>
+#include <folly/dynamic.h>
+#include <folly/json/dynamic.h>
+
+// jsi
+#include <jsi/JSIDynamic.h>
+#include <jsi/jsi.h>
+
+// react-native renderer (Fabric)
+#include <react/renderer/components/root/RootProps.h>
+#include <react/renderer/components/root/RootShadowNode.h>
+#include <react/renderer/components/view/BaseViewProps.h>
+#include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/EventDispatcher.h>
+#include <react/renderer/core/ShadowNode.h>
+#include <react/renderer/mounting/ShadowTree.h>
+#include <react/renderer/uimanager/UIManager.h>
+
+// IWYU pragma: end_keep

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

@@ -15,6 +15,7 @@ import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.annotations.FrameworkAPI;
 import com.facebook.react.fabric.FabricUIManager;
 import com.facebook.react.turbomodule.core.CallInvokerHolderImpl;
+import com.facebook.react.uimanager.IllegalViewOperationException;
 import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.common.UIManagerType;
 import com.facebook.soloader.SoLoader;
@@ -305,7 +306,19 @@ public class NativeProxy {
     }
 
     for (int i = 0; i < tags.length; i++) {
-      if (mFabricUIManager.resolveView(tags[i]) == null) {
+      try {
+        if (mFabricUIManager.resolveView(tags[i]) == null) {
+          tags[i] = -1;
+        }
+      } catch (IllegalViewOperationException e) {
+        // `resolveView` is expected to return `null` for a tag without a
+        // mounted view, but it instead throws when the tag's `ViewState` is
+        // already registered while the Android view hasn't been created yet.
+        // This happens when a view is mid-preallocation and a third-party view
+        // manager (e.g. lottie-react-native) dispatches an event synchronously
+        // from within `createView`, re-entering this code path. Treat it the
+        // same as a missing view.
+        // See https://github.com/software-mansion/react-native-reanimated/issues/9636.
         tags[i] = -1;
       }
     }

package/android/src/main/java/com/swmansion/reanimated/keyboard/KeyboardAnimationCallback.java

@@ -10,6 +10,7 @@ public class KeyboardAnimationCallback extends WindowInsetsAnimationCompat.Callb
   private final NotifyAboutKeyboardChangeFunction mNotifyAboutKeyboardChange;
   private static final int CONTENT_TYPE_MASK = WindowInsetsCompat.Type.ime();
   private final boolean mIsNavigationBarTranslucent;
+  private boolean mPendingStartDispatch = false;
 
   public KeyboardAnimationCallback(
       Keyboard keyboard,
@@ -30,7 +31,9 @@ public class KeyboardAnimationCallback extends WindowInsetsAnimationCompat.Callb
       return bounds;
     }
     mKeyboard.onAnimationStart();
-    mNotifyAboutKeyboardChange.call();
+    // Dispatching synchronously here can cancel the still-pending insets
+    // animation, so the dispatch is deferred to onProgress or onEnd.
+    mPendingStartDispatch = true;
     return super.onStart(animation, bounds);
   }
 
@@ -47,6 +50,7 @@ public class KeyboardAnimationCallback extends WindowInsetsAnimationCompat.Callb
       }
     }
     if (isAnyKeyboardAnimationRunning) {
+      mPendingStartDispatch = false;
       mKeyboard.updateHeight(insets, mIsNavigationBarTranslucent);
       mNotifyAboutKeyboardChange.call();
     }
@@ -56,6 +60,10 @@ public class KeyboardAnimationCallback extends WindowInsetsAnimationCompat.Callb
   @Override
   public void onEnd(@NonNull WindowInsetsAnimationCompat animation) {
     if (isKeyboardAnimation(animation)) {
+      if (mPendingStartDispatch) {
+        mNotifyAboutKeyboardChange.call();
+      }
+      mPendingStartDispatch = false;
       mKeyboard.onAnimationEnd();
       mNotifyAboutKeyboardChange.call();
     }

package/apple/reanimated/apple/ReanimatedModule.mm

@@ -130,7 +130,18 @@ RCT_EXPORT_MODULE(ReanimatedModule);
 - (BOOL)hasReactNativeFailedReload
 {
   id workletsModule = [_moduleRegistry moduleForName:"WorkletsModule"];
-  return ![_moduleRegistry moduleIsInitialized:[workletsModule class]];
+  if (![_moduleRegistry moduleIsInitialized:[workletsModule class]]) {
+    return YES;
+  }
+
+  // On a double reload React Native can momentarily leave the surface presenter without
+  // a scheduler. This is another manifestation of the same non-fatal reload race, so we
+  // bail on it here instead of asserting on a nil scheduler later in installTurboModule.
+  if ([_surfacePresenter scheduler] == nil) {
+    return YES;
+  }
+
+  return NO;
 }
 
 - (void)checkBridgeless

package/lib/module/PropsRegistryGarbageCollector.js

@@ -4,7 +4,6 @@ import { unprocessColor, unprocessColorsInProps } from './common/style/processor
 import { ReanimatedModule } from './ReanimatedModule';
 const FLUSH_INTERVAL_MS = 500;
 export const PropsRegistryGarbageCollector = {
-  viewsCount: 0,
   viewsMap: new Map(),
   intervalId: null,
   registerView(viewTag, component) {
@@ -17,15 +16,13 @@ export const PropsRegistryGarbageCollector = {
       return;
     }
     this.viewsMap.set(viewTag, component);
-    this.viewsCount++;
-    if (this.viewsCount === 1) {
+    if (this.viewsMap.size === 1) {
       this.registerInterval();
     }
   },
   unregisterView(viewTag) {
-    this.viewsMap.delete(viewTag);
-    this.viewsCount--;
-    if (this.viewsCount === 0) {
+    const deleted = this.viewsMap.delete(viewTag);
+    if (deleted && this.viewsMap.size === 0) {
       this.unregisterInterval();
     }
   },

package/lib/module/PropsRegistryGarbageCollector.js.map

@@ -1 +1 @@
-{"version":3,"names":["unprocessColor","unprocessColorsInProps","ReanimatedModule","FLUSH_INTERVAL_MS","PropsRegistryGarbageCollector","viewsCount","viewsMap","Map","intervalId","registerView","viewTag","component","has","set","registerInterval","unregisterView","delete","unregisterInterval","syncPropsBackToReact","settledUpdates","getSettledUpdates","styleProps","get","unprocessProps","_syncStylePropsBackToReact","setInterval","bind","clearInterval","props","unprocessBoxShadow","Array","isArray","boxShadow","map","color"],"sourceRoot":"../../src","sources":["PropsRegistryGarbageCollector.ts"],"mappings":"AAAA,YAAY;;AAEZ,SACEA,cAAc,EACdC,sBAAsB,QACjB,kCAAkC;AAGzC,SAASC,gBAAgB,QAAQ,oBAAoB;AAErD,MAAMC,iBAAiB,GAAG,GAAG;AAE7B,OAAO,MAAMC,6BAA6B,GAAG;EAC3CC,UAAU,EAAE,CAAC;EACbC,QAAQ,EAAE,IAAIC,GAAG,CAAqC,CAAC;EACvDC,UAAU,EAAE,IAA6B;EAEzCC,YAAYA,CAACC,OAAe,EAAEC,SAAqC,EAAE;IACnE,IAAI,IAAI,CAACL,QAAQ,CAACM,GAAG,CAACF,OAAO,CAAC,EAAE;MAC9B;MACA;MACA;MACA;MACA;MACA;IACF;IACA,IAAI,CAACJ,QAAQ,CAACO,GAAG,CAACH,OAAO,EAAEC,SAAS,CAAC;IACrC,IAAI,CAACN,UAAU,EAAE;IACjB,IAAI,IAAI,CAACA,UAAU,KAAK,CAAC,EAAE;MACzB,IAAI,CAACS,gBAAgB,CAAC,CAAC;IACzB;EACF,CAAC;EAEDC,cAAcA,CAACL,OAAe,EAAE;IAC9B,IAAI,CAACJ,QAAQ,CAACU,MAAM,CAACN,OAAO,CAAC;IAC7B,IAAI,CAACL,UAAU,EAAE;IACjB,IAAI,IAAI,CAACA,UAAU,KAAK,CAAC,EAAE;MACzB,IAAI,CAACY,kBAAkB,CAAC,CAAC;IAC3B;EACF,CAAC;EAEDC,oBAAoBA,CAAA,EAAG;IACrB,MAAMC,cAAc,GAAGjB,gBAAgB,CAACkB,iBAAiB,CAAC,CAAC;IAC3D,KAAK,MAAM;MAAEV,OAAO;MAAEW;IAAW,CAAC,IAAIF,cAAc,EAAE;MACpD,IAAIE,UAAU,KAAK,IAAI,EAAE;QACvB;MACF;MACA,MAAMV,SAAS,GAAG,IAAI,CAACL,QAAQ,CAACgB,GAAG,CAACZ,OAAO,CAAC;MAC5Ca,cAAc,CAACF,UAAU,CAAC;MAC1BV,SAAS,EAAEa,0BAA0B,CAACH,UAAU,CAAC;IACnD;EACF,CAAC;EAEDP,gBAAgBA,CAAA,EAAG;IACjB,IAAI,CAACN,UAAU,GAAGiB,WAAW,CAC3B,IAAI,CAACP,oBAAoB,CAACQ,IAAI,CAAC,IAAI,CAAC,EACpCvB,iBACF,CAAC;EACH,CAAC;EAEDc,kBAAkBA,CAAA,EAAG;IACnB,IAAI,IAAI,CAACT,UAAU,KAAK,IAAI,EAAE;MAC5BmB,aAAa,CAAC,IAAI,CAACnB,UAAU,CAAC;MAC9B,IAAI,CAACA,UAAU,GAAG,IAAI;IACxB;EACF;AACF,CAAC;AAED,SAASe,cAAcA,CAACK,KAAiB,EAAE;EACzC3B,sBAAsB,CAAC2B,KAAK,CAAC;EAC7BC,kBAAkB,CAACD,KAAK,CAAC;AAC3B;AAEA,SAASC,kBAAkBA,CAACD,KAAiB,EAAE;EAC7C,IAAIE,KAAK,CAACC,OAAO,CAACH,KAAK,CAACI,SAAS,CAAC,EAAE;IAClC;IACAJ,KAAK,CAACI,SAAS,GAAGJ,KAAK,CAACI,SAAS,CAACC,GAAG,CAAED,SAAS,KAAM;MACpD,GAAGA,SAAS;MACZE,KAAK,EAAElC,cAAc,CAACgC,SAAS,CAACE,KAAK;IACvC,CAAC,CAAC,CAAC;EACL;AACF","ignoreList":[]}
+{"version":3,"names":["unprocessColor","unprocessColorsInProps","ReanimatedModule","FLUSH_INTERVAL_MS","PropsRegistryGarbageCollector","viewsMap","Map","intervalId","registerView","viewTag","component","has","set","size","registerInterval","unregisterView","deleted","delete","unregisterInterval","syncPropsBackToReact","settledUpdates","getSettledUpdates","styleProps","get","unprocessProps","_syncStylePropsBackToReact","setInterval","bind","clearInterval","props","unprocessBoxShadow","Array","isArray","boxShadow","map","color"],"sourceRoot":"../../src","sources":["PropsRegistryGarbageCollector.ts"],"mappings":"AAAA,YAAY;;AAEZ,SACEA,cAAc,EACdC,sBAAsB,QACjB,kCAAkC;AAGzC,SAASC,gBAAgB,QAAQ,oBAAoB;AAErD,MAAMC,iBAAiB,GAAG,GAAG;AAE7B,OAAO,MAAMC,6BAA6B,GAAG;EAC3CC,QAAQ,EAAE,IAAIC,GAAG,CAAqC,CAAC;EACvDC,UAAU,EAAE,IAA6B;EAEzCC,YAAYA,CAACC,OAAe,EAAEC,SAAqC,EAAE;IACnE,IAAI,IAAI,CAACL,QAAQ,CAACM,GAAG,CAACF,OAAO,CAAC,EAAE;MAC9B;MACA;MACA;MACA;MACA;MACA;IACF;IACA,IAAI,CAACJ,QAAQ,CAACO,GAAG,CAACH,OAAO,EAAEC,SAAS,CAAC;IACrC,IAAI,IAAI,CAACL,QAAQ,CAACQ,IAAI,KAAK,CAAC,EAAE;MAC5B,IAAI,CAACC,gBAAgB,CAAC,CAAC;IACzB;EACF,CAAC;EAEDC,cAAcA,CAACN,OAAe,EAAE;IAC9B,MAAMO,OAAO,GAAG,IAAI,CAACX,QAAQ,CAACY,MAAM,CAACR,OAAO,CAAC;IAC7C,IAAIO,OAAO,IAAI,IAAI,CAACX,QAAQ,CAACQ,IAAI,KAAK,CAAC,EAAE;MACvC,IAAI,CAACK,kBAAkB,CAAC,CAAC;IAC3B;EACF,CAAC;EAEDC,oBAAoBA,CAAA,EAAG;IACrB,MAAMC,cAAc,GAAGlB,gBAAgB,CAACmB,iBAAiB,CAAC,CAAC;IAC3D,KAAK,MAAM;MAAEZ,OAAO;MAAEa;IAAW,CAAC,IAAIF,cAAc,EAAE;MACpD,IAAIE,UAAU,KAAK,IAAI,EAAE;QACvB;MACF;MACA,MAAMZ,SAAS,GAAG,IAAI,CAACL,QAAQ,CAACkB,GAAG,CAACd,OAAO,CAAC;MAC5Ce,cAAc,CAACF,UAAU,CAAC;MAC1BZ,SAAS,EAAEe,0BAA0B,CAACH,UAAU,CAAC;IACnD;EACF,CAAC;EAEDR,gBAAgBA,CAAA,EAAG;IACjB,IAAI,CAACP,UAAU,GAAGmB,WAAW,CAC3B,IAAI,CAACP,oBAAoB,CAACQ,IAAI,CAAC,IAAI,CAAC,EACpCxB,iBACF,CAAC;EACH,CAAC;EAEDe,kBAAkBA,CAAA,EAAG;IACnB,IAAI,IAAI,CAACX,UAAU,KAAK,IAAI,EAAE;MAC5BqB,aAAa,CAAC,IAAI,CAACrB,UAAU,CAAC;MAC9B,IAAI,CAACA,UAAU,GAAG,IAAI;IACxB;EACF;AACF,CAAC;AAED,SAASiB,cAAcA,CAACK,KAAiB,EAAE;EACzC5B,sBAAsB,CAAC4B,KAAK,CAAC;EAC7BC,kBAAkB,CAACD,KAAK,CAAC;AAC3B;AAEA,SAASC,kBAAkBA,CAACD,KAAiB,EAAE;EAC7C,IAAIE,KAAK,CAACC,OAAO,CAACH,KAAK,CAACI,SAAS,CAAC,EAAE;IAClC;IACAJ,KAAK,CAACI,SAAS,GAAGJ,KAAK,CAACI,SAAS,CAACC,GAAG,CAAED,SAAS,KAAM;MACpD,GAAGA,SAAS;MACZE,KAAK,EAAEnC,cAAc,CAACiC,SAAS,CAACE,KAAK;IACvC,CAAC,CAAC,CAAC;EACL;AACF","ignoreList":[]}

package/lib/module/animation/styleAnimation.js

@@ -45,7 +45,7 @@ function setPath(obj, path, value) {
 }
 export function withStyleAnimation(
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-styleAnimations) {
+styleAnimations, callback) {
   'worklet';
 
   return defineAnimation({}, () => {
@@ -148,7 +148,7 @@ styleAnimations) {
         }
       }
     };
-    const callback = finished => {
+    const styleAnimationCallback = finished => {
       if (!finished) {
         const animationsToCheck = [styleAnimations];
         while (animationsToCheck.length > 0) {
@@ -169,6 +169,7 @@ styleAnimations) {
           }
         }
       }
+      callback?.(finished);
     };
     return {
       isHigherOrder: true,
@@ -176,7 +177,7 @@ styleAnimations) {
       onStart,
       current: {},
       styleAnimations,
-      callback
+      callback: styleAnimationCallback
     };
   });
 }

package/lib/module/animation/styleAnimation.js.map

@@ -1 +1 @@
-{"version":3,"names":["ColorProperties","logger","processColor","withTiming","defineAnimation","isValidLayoutAnimationProp","resolvePath","obj","path","keys","Array","isArray","reduce","acc","current","undefined","setPath","value","currObj","i","length","withStyleAnimation","styleAnimations","onFrame","animation","now","stillGoing","entriesToCheck","currentEntry","pop","index","push","concat","key","Object","currentStyleAnimation","finished","callback","isAnimatingColorProp","includes","onStart","previousAnimation","prevAnimation","prevVal","__DEV__","warn","join","propName","trim","currentAnimation","duration","animationsToCheck","element","values","isHigherOrder"],"sourceRoot":"../../../src","sources":["animation/styleAnimation.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["ColorProperties","logger","processColor","withTiming","defineAnimation","isValidLayoutAnimationProp","resolvePath","obj","path","keys","Array","isArray","reduce","acc","current","undefined","setPath","value","currObj","i","length","withStyleAnimation","styleAnimations","callback","onFrame","animation","now","stillGoing","entriesToCheck","currentEntry","pop","index","push","concat","key","Object","currentStyleAnimation","finished","isAnimatingColorProp","includes","onStart","previousAnimation","prevAnimation","prevVal","__DEV__","warn","join","propName","trim","currentAnimation","duration","styleAnimationCallback","animationsToCheck","element","values","isHigherOrder"],"sourceRoot":"../../../src","sources":["animation/styleAnimation.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/common/constants/platform.js

@@ -8,12 +8,12 @@ function isWindowAvailable() {
   // @ts-ignore Fallback if `window` is undefined.
   return typeof window !== 'undefined';
 }
-export const IS_ANDROID = /* @__PURE__ */(() => Platform.OS === 'android')();
-export const IS_IOS = /* @__PURE__ */(() => Platform.OS === 'ios')();
-export const IS_WEB = Platform.OS === 'web';
-export const IS_JEST = !!process.env.JEST_WORKER_ID;
+export const IS_ANDROID = /* @__PURE__ */(() => Platform?.OS === 'android')();
+export const IS_IOS = /* @__PURE__ */(() => Platform?.OS === 'ios')();
+export const IS_WEB = Platform?.OS === 'web';
+export const IS_JEST = typeof globalThis.jest !== 'undefined' || process.env.NODE_ENV === 'test';
 /** @knipIgnore */
-export const IS_WINDOWS = Platform.OS === 'windows';
+export const IS_WINDOWS = Platform?.OS === 'windows';
 export const IS_WINDOW_AVAILABLE = isWindowAvailable();
 export const SHOULD_BE_USE_WEB = IS_JEST || IS_WEB || IS_WINDOWS;
 //# sourceMappingURL=platform.js.map

package/lib/module/common/constants/platform.js.map

@@ -1 +1 @@
-{"version":3,"names":["Platform","isWindowAvailable","window","IS_ANDROID","OS","IS_IOS","IS_WEB","IS_JEST","process","env","JEST_WORKER_ID","IS_WINDOWS","IS_WINDOW_AVAILABLE","SHOULD_BE_USE_WEB"],"sourceRoot":"../../../../src","sources":["common/constants/platform.ts"],"mappings":"AAAA,YAAY;;AACZ,SAASA,QAAQ,QAAQ,cAAc;AAEvC,SAASC,iBAAiBA,CAAA,EAAG;EAC3B;EACA;EACA;EACA;EACA,OAAO,OAAOC,MAAM,KAAK,WAAW;AACtC;AAEA,OAAO,MAAMC,UAAmB,GAAG,eAAgB,CAAC,MAClDH,QAAQ,CAACI,EAAE,KAAK,SAAS,EAAE,CAAC;AAC9B,OAAO,MAAMC,MAAe,GAAG,eAAgB,CAAC,MAAML,QAAQ,CAACI,EAAE,KAAK,KAAK,EAAE,CAAC;AAC9E,OAAO,MAAME,MAAe,GAAGN,QAAQ,CAACI,EAAE,KAAK,KAAK;AACpD,OAAO,MAAMG,OAAgB,GAAG,CAAC,CAACC,OAAO,CAACC,GAAG,CAACC,cAAc;AAC5D;AACA,OAAO,MAAMC,UAAmB,GAAGX,QAAQ,CAACI,EAAE,KAAK,SAAS;AAE5D,OAAO,MAAMQ,mBAA4B,GAAGX,iBAAiB,CAAC,CAAC;AAE/D,OAAO,MAAMY,iBAAiB,GAAGN,OAAO,IAAID,MAAM,IAAIK,UAAU","ignoreList":[]}
+{"version":3,"names":["Platform","isWindowAvailable","window","IS_ANDROID","OS","IS_IOS","IS_WEB","IS_JEST","globalThis","jest","process","env","NODE_ENV","IS_WINDOWS","IS_WINDOW_AVAILABLE","SHOULD_BE_USE_WEB"],"sourceRoot":"../../../../src","sources":["common/constants/platform.ts"],"mappings":"AAAA,YAAY;;AACZ,SAASA,QAAQ,QAAQ,cAAc;AAEvC,SAASC,iBAAiBA,CAAA,EAAG;EAC3B;EACA;EACA;EACA;EACA,OAAO,OAAOC,MAAM,KAAK,WAAW;AACtC;AAEA,OAAO,MAAMC,UAAmB,GAAG,eAAgB,CAAC,MAClDH,QAAQ,EAAEI,EAAE,KAAK,SAAS,EAAE,CAAC;AAC/B,OAAO,MAAMC,MAAe,GAAG,eAAgB,CAAC,MAAML,QAAQ,EAAEI,EAAE,KAAK,KAAK,EAAE,CAAC;AAC/E,OAAO,MAAME,MAAe,GAAGN,QAAQ,EAAEI,EAAE,KAAK,KAAK;AACrD,OAAO,MAAMG,OAAgB,GAC3B,OAAOC,UAAU,CAACC,IAAI,KAAK,WAAW,IAAIC,OAAO,CAACC,GAAG,CAACC,QAAQ,KAAK,MAAM;AAC3E;AACA,OAAO,MAAMC,UAAmB,GAAGb,QAAQ,EAAEI,EAAE,KAAK,SAAS;AAE7D,OAAO,MAAMU,mBAA4B,GAAGb,iBAAiB,CAAC,CAAC;AAE/D,OAAO,MAAMc,iBAAiB,GAAGR,OAAO,IAAID,MAAM,IAAIO,UAAU","ignoreList":[]}

package/lib/module/createAnimatedComponent/getViewInfo.js

@@ -15,7 +15,9 @@
 //                         reactViewName via componentNameByReactViewName().
 export function getViewInfo(element) {
   return {
-    reactViewName: element?._viewConfig?.uiViewClassName ?? element?.__internalInstanceHandle?.type ?? element?.__internalInstanceHandle?.elementType,
+    reactViewName: element?.__viewConfig?.uiViewClassName ??
+    // ReactFabricHostComponent (e.g. react-native-macos) exposes `_viewConfig`.
+    element?._viewConfig?.uiViewClassName ?? element?.__internalInstanceHandle?.type ?? element?.__internalInstanceHandle?.elementType,
     viewTag: element?.__nativeTag
   };
 }

package/lib/module/createAnimatedComponent/getViewInfo.js.map

@@ -1 +1 @@
-{"version":3,"names":["getViewInfo","element","reactViewName","_viewConfig","uiViewClassName","__internalInstanceHandle","type","elementType","viewTag","__nativeTag"],"sourceRoot":"../../../src","sources":["createAnimatedComponent/getViewInfo.ts"],"mappings":"AAAA,YAAY;;AAIZ;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASA,WAAWA,CAACC,OAAqB,EAG/C;EACA,OAAO;IACLC,aAAa,EAAGD,OAAO,EAAEE,WAAW,EAAEC,eAAe,IACnDH,OAAO,EAAEI,wBAAwB,EAAEC,IAAI,IACvCL,OAAO,EAAEI,wBAAwB,EAAEE,WAAsB;IAC3DC,OAAO,EAAEP,OAAO,EAAEQ;EACpB,CAAC;AACH","ignoreList":[]}
+{"version":3,"names":["getViewInfo","element","reactViewName","__viewConfig","uiViewClassName","_viewConfig","__internalInstanceHandle","type","elementType","viewTag","__nativeTag"],"sourceRoot":"../../../src","sources":["createAnimatedComponent/getViewInfo.ts"],"mappings":"AAAA,YAAY;;AAIZ;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASA,WAAWA,CAACC,OAAqB,EAG/C;EACA,OAAO;IACLC,aAAa,EAAGD,OAAO,EAAEE,YAAY,EAAEC,eAAe;IACpD;IACAH,OAAO,EAAEI,WAAW,EAAED,eAAe,IACrCH,OAAO,EAAEK,wBAAwB,EAAEC,IAAI,IACvCN,OAAO,EAAEK,wBAAwB,EAAEE,WAAsB;IAC3DC,OAAO,EAAER,OAAO,EAAES;EACpB,CAAC;AACH","ignoreList":[]}

package/lib/module/css/component/AnimatedComponent.js

@@ -16,7 +16,6 @@ import { jsx as _jsx } from "react/jsx-runtime";
 export default class AnimatedComponent extends Component {
   _cssStyle = {}; // RN style object with Reanimated CSS properties
   _componentRef = null;
-  _hasAnimatedRef = false;
   // Used only on web
   _componentDOMRef = null;
   _willUnmount = false;
@@ -95,7 +94,6 @@ export default class AnimatedComponent extends Component {
     // Component can specify ref which should be animated when animated version of the component is created.
     // Otherwise, we animate the component itself.
     if (componentRef && componentRef.getAnimatableRef) {
-      this._hasAnimatedRef = true;
       return componentRef.getAnimatableRef();
     }
     // Case for SVG components on Web

package/lib/module/css/component/AnimatedComponent.js.map

@@ -1 +1 @@
-{"version":3,"names":["Component","Platform","StyleSheet","IS_JEST","ReanimatedError","SHOULD_BE_USE_WEB","getViewInfo","getShadowNodeWrapperFromRef","findHostInstance","markNodeAsRemovable","unmarkNodeAsRemovable","CSSManager","filterNonCSSStyleProps","jsx","_jsx","AnimatedComponent","_cssStyle","_componentRef","_hasAnimatedRef","_componentDOMRef","_willUnmount","constructor","ChildComponent","props","getComponentViewTag","_getViewInfo","viewTag","_onSetLocalRef","_viewInfo","undefined","shadowNodeWrapper","DOMElement","reactViewName","hostInstance","viewInfo","_setComponentRef","ref","forwardedRef","current","_resolveComponentRef","componentRef","getAnimatableRef","elementRef","_updateStyles","flatten","style","componentDidMount","_CSSManager","displayName","update","componentWillUnmount","unmountCleanup","wrapper","shouldComponentUpdate","nextProps","render","platformProps","select","web","default","collapsable"],"sourceRoot":"../../../../src","sources":["css/component/AnimatedComponent.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["Component","Platform","StyleSheet","IS_JEST","ReanimatedError","SHOULD_BE_USE_WEB","getViewInfo","getShadowNodeWrapperFromRef","findHostInstance","markNodeAsRemovable","unmarkNodeAsRemovable","CSSManager","filterNonCSSStyleProps","jsx","_jsx","AnimatedComponent","_cssStyle","_componentRef","_componentDOMRef","_willUnmount","constructor","ChildComponent","props","getComponentViewTag","_getViewInfo","viewTag","_onSetLocalRef","_viewInfo","undefined","shadowNodeWrapper","DOMElement","reactViewName","hostInstance","viewInfo","_setComponentRef","ref","forwardedRef","current","_resolveComponentRef","componentRef","getAnimatableRef","elementRef","_updateStyles","flatten","style","componentDidMount","_CSSManager","displayName","update","componentWillUnmount","unmountCleanup","wrapper","shouldComponentUpdate","nextProps","render","platformProps","select","web","default","collapsable"],"sourceRoot":"../../../../src","sources":["css/component/AnimatedComponent.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/css/native/managers/CSSManager.js

@@ -30,13 +30,13 @@ export default class CSSManager {
     const hasAnimation = animationProperties !== null;
     const hasTransition = transitionProperties !== null;
     const normalizedStyle = hasAnimation || hasTransition || IS_ANDROID && this.hadTransitionLastUpdate ? this.propsBuilder.build(filteredStyle) : undefined;
-    if (normalizedStyle && (hasAnimation ||
-    // We also need to update the current style on Android when the
-    // transition is detached.
-    IS_ANDROID && !hasTransition && this.hadTransitionLastUpdate)) {
+    const transitionDetached = this.cssTransitionsManager.update(transitionProperties, normalizedStyle ?? {});
+
+    // Record the committed style as the base so animations and (on Android) a
+    // detaching transition can revert to it instead of interpolator defaults.
+    if (normalizedStyle && (hasAnimation || IS_ANDROID && transitionDetached)) {
       setViewStyle(this.viewTag, normalizedStyle);
     }
-    this.cssTransitionsManager.update(transitionProperties, normalizedStyle ?? {});
     this.cssAnimationsManager.update(animationProperties);
     this.hadTransitionLastUpdate = hasTransition;
   }

package/lib/module/css/native/managers/CSSManager.js.map

@@ -1 +1 @@
-{"version":3,"names":["getCompoundComponentName","getPropsBuilder","IS_ANDROID","filterCSSAndStyleProperties","setViewStyle","CSSAnimationsManager","CSSTransitionsManager","CSSManager","hadTransitionLastUpdate","constructor","shadowNodeWrapper","viewTag","reactViewName","componentDisplayName","tag","wrapper","compoundComponentName","propsBuilder","cssAnimationsManager","cssTransitionsManager","update","style","animationProperties","transitionProperties","filteredStyle","hasAnimation","hasTransition","normalizedStyle","build","undefined","unmountCleanup"],"sourceRoot":"../../../../../src","sources":["css/native/managers/CSSManager.ts"],"mappings":"AAAA,YAAY;;AACZ,SACEA,wBAAwB,EACxBC,eAAe,EACfC,UAAU,QACL,iBAAiB;AAKxB,SAASC,2BAA2B,QAAQ,aAAa;AACzD,SAASC,YAAY,QAAQ,UAAU;AACvC,OAAOC,oBAAoB,MAAM,wBAAwB;AACzD,OAAOC,qBAAqB,MAAM,yBAAyB;AAE3D,eAAe,MAAMC,UAAU,CAAwB;EAKrD;AACF;AACA;AACA;AACA;AACA;EACUC,uBAAuB,GAAG,KAAK;EAEvCC,WAAWA,CACT;IAAEC,iBAAiB;IAAEC,OAAO;IAAEC,aAAa,GAAG;EAAoB,CAAC,EACnEC,oBAAoB,GAAG,EAAE,EACzB;IACA,MAAMC,GAAG,GAAI,IAAI,CAACH,OAAO,GAAGA,OAAkB;IAC9C,MAAMI,OAAO,GAAGL,iBAAsC;IAEtD,MAAMM,qBAAqB,GAAGhB,wBAAwB,CACpDY,aAAa,EACbC,oBACF,CAAC;IAED,IAAI,CAACI,YAAY,GAAGhB,eAAe,CAACe,qBAAqB,CAAC;IAC1D,IAAI,CAACE,oBAAoB,GAAG,IAAIb,oBAAoB,CAClDU,OAAO,EACPD,GAAG,EACHE,qBACF,CAAC;IACD,IAAI,CAACG,qBAAqB,GAAG,IAAIb,qBAAqB,CAACS,OAAO,EAAED,GAAG,CAAC;EACtE;EAEAM,MAAMA,CAACC,KAAe,EAAQ;IAC5B,MAAM,CAACC,mBAAmB,EAAEC,oBAAoB,EAAEC,aAAa,CAAC,GAC9DrB,2BAA2B,CAACkB,KAAK,CAAC;IAEpC,MAAMI,YAAY,GAAGH,mBAAmB,KAAK,IAAI;IACjD,MAAMI,aAAa,GAAGH,oBAAoB,KAAK,IAAI;IAEnD,MAAMI,eAAe,GACnBF,YAAY,IACZC,aAAa,IACZxB,UAAU,IAAI,IAAI,CAACM,uBAAwB,GACxC,IAAI,CAACS,YAAY,CAACW,KAAK,CAACJ,aAAa,CAAC,GACtCK,SAAS;IAEf,IACEF,eAAe,KACdF,YAAY;IACX;IACA;IACCvB,UAAU,IAAI,CAACwB,aAAa,IAAI,IAAI,CAAClB,uBAAwB,CAAC,EACjE;MACAJ,YAAY,CAAC,IAAI,CAACO,OAAO,EAAEgB,eAAe,CAAC;IAC7C;IAEA,IAAI,CAACR,qBAAqB,CAACC,MAAM,CAC/BG,oBAAoB,EACpBI,eAAe,IAAI,CAAC,CACtB,CAAC;IACD,IAAI,CAACT,oBAAoB,CAACE,MAAM,CAACE,mBAAmB,CAAC;IAErD,IAAI,CAACd,uBAAuB,GAAGkB,aAAa;EAC9C;EAEAI,cAAcA,CAAA,EAAS;IACrB,IAAI,CAACZ,oBAAoB,CAACY,cAAc,CAAC,CAAC;IAC1C,IAAI,CAACX,qBAAqB,CAACW,cAAc,CAAC,CAAC;EAC7C;AACF","ignoreList":[]}
+{"version":3,"names":["getCompoundComponentName","getPropsBuilder","IS_ANDROID","filterCSSAndStyleProperties","setViewStyle","CSSAnimationsManager","CSSTransitionsManager","CSSManager","hadTransitionLastUpdate","constructor","shadowNodeWrapper","viewTag","reactViewName","componentDisplayName","tag","wrapper","compoundComponentName","propsBuilder","cssAnimationsManager","cssTransitionsManager","update","style","animationProperties","transitionProperties","filteredStyle","hasAnimation","hasTransition","normalizedStyle","build","undefined","transitionDetached","unmountCleanup"],"sourceRoot":"../../../../../src","sources":["css/native/managers/CSSManager.ts"],"mappings":"AAAA,YAAY;;AACZ,SACEA,wBAAwB,EACxBC,eAAe,EACfC,UAAU,QACL,iBAAiB;AAKxB,SAASC,2BAA2B,QAAQ,aAAa;AACzD,SAASC,YAAY,QAAQ,UAAU;AACvC,OAAOC,oBAAoB,MAAM,wBAAwB;AACzD,OAAOC,qBAAqB,MAAM,yBAAyB;AAE3D,eAAe,MAAMC,UAAU,CAAwB;EAKrD;AACF;AACA;AACA;AACA;AACA;EACUC,uBAAuB,GAAG,KAAK;EAEvCC,WAAWA,CACT;IAAEC,iBAAiB;IAAEC,OAAO;IAAEC,aAAa,GAAG;EAAoB,CAAC,EACnEC,oBAAoB,GAAG,EAAE,EACzB;IACA,MAAMC,GAAG,GAAI,IAAI,CAACH,OAAO,GAAGA,OAAkB;IAC9C,MAAMI,OAAO,GAAGL,iBAAsC;IAEtD,MAAMM,qBAAqB,GAAGhB,wBAAwB,CACpDY,aAAa,EACbC,oBACF,CAAC;IAED,IAAI,CAACI,YAAY,GAAGhB,eAAe,CAACe,qBAAqB,CAAC;IAC1D,IAAI,CAACE,oBAAoB,GAAG,IAAIb,oBAAoB,CAClDU,OAAO,EACPD,GAAG,EACHE,qBACF,CAAC;IACD,IAAI,CAACG,qBAAqB,GAAG,IAAIb,qBAAqB,CAACS,OAAO,EAAED,GAAG,CAAC;EACtE;EAEAM,MAAMA,CAACC,KAAe,EAAQ;IAC5B,MAAM,CAACC,mBAAmB,EAAEC,oBAAoB,EAAEC,aAAa,CAAC,GAC9DrB,2BAA2B,CAACkB,KAAK,CAAC;IAEpC,MAAMI,YAAY,GAAGH,mBAAmB,KAAK,IAAI;IACjD,MAAMI,aAAa,GAAGH,oBAAoB,KAAK,IAAI;IAEnD,MAAMI,eAAe,GACnBF,YAAY,IACZC,aAAa,IACZxB,UAAU,IAAI,IAAI,CAACM,uBAAwB,GACxC,IAAI,CAACS,YAAY,CAACW,KAAK,CAACJ,aAAa,CAAC,GACtCK,SAAS;IAEf,MAAMC,kBAAkB,GAAG,IAAI,CAACX,qBAAqB,CAACC,MAAM,CAC1DG,oBAAoB,EACpBI,eAAe,IAAI,CAAC,CACtB,CAAC;;IAED;IACA;IACA,IACEA,eAAe,KACdF,YAAY,IAAKvB,UAAU,IAAI4B,kBAAmB,CAAC,EACpD;MACA1B,YAAY,CAAC,IAAI,CAACO,OAAO,EAAEgB,eAAe,CAAC;IAC7C;IAEA,IAAI,CAACT,oBAAoB,CAACE,MAAM,CAACE,mBAAmB,CAAC;IAErD,IAAI,CAACd,uBAAuB,GAAGkB,aAAa;EAC9C;EAEAK,cAAcA,CAAA,EAAS;IACrB,IAAI,CAACb,oBAAoB,CAACa,cAAc,CAAC,CAAC;IAC1C,IAAI,CAACZ,qBAAqB,CAACY,cAAc,CAAC,CAAC;EAC7C;AACF","ignoreList":[]}

package/lib/module/css/native/managers/CSSTransitionsManager.js

@@ -15,6 +15,11 @@ export default class CSSTransitionsManager {
     this.viewTag = viewTag;
     this.shadowNodeWrapper = shadowNodeWrapper;
   }
+
+  /**
+   * @returns Whether this update detached a running transition (its props were
+   *   removed, or normalized to an empty config, e.g. when duration is 0).
+   */
   update(transitionProperties, nextProps = {}) {
     const transitionConfig = transitionProperties && normalizeCSSTransitionProperties(transitionProperties);
     const prevProps = this.prevProps;
@@ -26,8 +31,9 @@ export default class CSSTransitionsManager {
     if (!prevProps || !transitionConfig) {
       if (this.hasTransition) {
         this.detach();
+        return true;
       }
-      return;
+      return false;
     }
 
     // Trigger transition for changed properties only
@@ -36,6 +42,7 @@ export default class CSSTransitionsManager {
       runCSSTransition(this.shadowNodeWrapper, config);
       this.hasTransition = true;
     }
+    return false;
   }
   unmountCleanup() {
     // noop

package/lib/module/css/native/managers/CSSTransitionsManager.js.map

@@ -1 +1 @@
-{"version":3,"names":["deepEqual","normalizeCSSTransitionProperties","runCSSTransition","unregisterCSSTransition","CSSTransitionsManager","prevProps","propsWithTransitions","Set","hasTransition","constructor","shadowNodeWrapper","viewTag","update","transitionProperties","nextProps","transitionConfig","detach","config","processTransitionConfig","Object","keys","length","unmountCleanup","clear","oldProps","newProps","newTransitionConfig","result","specificProperties","isAllowedProperty","property","has","getPropertySettings","settings","all","triggerTransition","value","add","key","delete"],"sourceRoot":"../../../../../src","sources":["css/native/managers/CSSTransitionsManager.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["deepEqual","normalizeCSSTransitionProperties","runCSSTransition","unregisterCSSTransition","CSSTransitionsManager","prevProps","propsWithTransitions","Set","hasTransition","constructor","shadowNodeWrapper","viewTag","update","transitionProperties","nextProps","transitionConfig","detach","config","processTransitionConfig","Object","keys","length","unmountCleanup","clear","oldProps","newProps","newTransitionConfig","result","specificProperties","isAllowedProperty","property","has","getPropertySettings","settings","all","triggerTransition","value","add","key","delete"],"sourceRoot":"../../../../../src","sources":["css/native/managers/CSSTransitionsManager.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/css/svg/native/processors/stroke.js

@@ -10,16 +10,20 @@ export const processStrokeDashArray = value => {
   if (isLength(value)) {
     result = [value];
   } else if (Array.isArray(value)) {
-    // We have to repeat the same pattern twice if the number of elements is odd
-    // "If the number of values is odd, the pattern behaves as if it was duplicated
-    // to yield an even number of values"
-    // (https://www.w3.org/TR/fill-stroke-3/#valdef-stroke-dasharray-length-percentage)
-    result = value.length % 2 === 0 || value.length < 3 ? value : value.concat(value);
+    result = [...value];
   } else if (value === 'none') {
     return 'none';
   } else {
     throw new ReanimatedError(ERROR_MESSAGES.invalidDashArray(value));
   }
+
+  // Per the SVG spec an odd-length dash array is repeated to an even length.
+  // react-native-svg's extractStroke does this, but animated values bypass it
+  // and an odd-length array crashes Android's DashPathEffect, so we repeat here.
+  // https://www.w3.org/TR/fill-stroke-3/#valdef-stroke-dasharray-length-percentage
+  if (result.length % 2 === 1) {
+    result = result.concat(result);
+  }
   if (__DEV__) {
     isValidDashArray(result);
   }

package/lib/module/css/svg/native/processors/stroke.js.map

@@ -1 +1 @@
-{"version":3,"names":["ReanimatedError","isLength","ERROR_MESSAGES","invalidDashArray","value","JSON","stringify","processStrokeDashArray","result","Array","isArray","length","concat","__DEV__","isValidDashArray","every"],"sourceRoot":"../../../../../../src","sources":["css/svg/native/processors/stroke.ts"],"mappings":"AAAA,YAAY;;AAIZ,SAASA,eAAe,QAAQ,oBAAoB;AACpD,SAASC,QAAQ,QAAQ,gBAAgB;AAEzC,OAAO,MAAMC,cAAc,GAAG;EAC5BC,gBAAgB,EAAGC,KAAc,IAC/B,oCAAoCC,IAAI,CAACC,SAAS,CAACF,KAAK,CAAC;AAC7D,CAAC;AAED,OAAO,MAAMG,sBAGZ,GAAIH,KAAK,IAAK;EACb,IAAII,MAAoB,GAAG,EAAE;EAE7B,IAAIP,QAAQ,CAACG,KAAK,CAAC,EAAE;IACnBI,MAAM,GAAG,CAACJ,KAAK,CAAC;EAClB,CAAC,MAAM,IAAIK,KAAK,CAACC,OAAO,CAACN,KAAK,CAAC,EAAE;IAC/B;IACA;IACA;IACA;IACAI,MAAM,GACJJ,KAAK,CAACO,MAAM,GAAG,CAAC,KAAK,CAAC,IAAIP,KAAK,CAACO,MAAM,GAAG,CAAC,GAAGP,KAAK,GAAGA,KAAK,CAACQ,MAAM,CAACR,KAAK,CAAC;EAC5E,CAAC,MAAM,IAAIA,KAAK,KAAK,MAAM,EAAE;IAC3B,OAAO,MAAM;EACf,CAAC,MAAM;IACL,MAAM,IAAIJ,eAAe,CAACE,cAAc,CAACC,gBAAgB,CAACC,KAAK,CAAC,CAAC;EACnE;EAEA,IAAIS,OAAO,EAAE;IACXC,gBAAgB,CAACN,MAAM,CAAC;EAC1B;EAEA,OAAOA,MAAM;AACf,CAAC;AAED,MAAMM,gBAAgB,GAAIV,KAAmB,IAAK;EAChD,IAAI,CAACA,KAAK,CAACW,KAAK,CAACd,QAAQ,CAAC,EAAE;IAC1B,MAAM,IAAID,eAAe,CAACE,cAAc,CAACC,gBAAgB,CAACC,KAAK,CAAC,CAAC;EACnE;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["ReanimatedError","isLength","ERROR_MESSAGES","invalidDashArray","value","JSON","stringify","processStrokeDashArray","result","Array","isArray","length","concat","__DEV__","isValidDashArray","every"],"sourceRoot":"../../../../../../src","sources":["css/svg/native/processors/stroke.ts"],"mappings":"AAAA,YAAY;;AAIZ,SAASA,eAAe,QAAQ,oBAAoB;AACpD,SAASC,QAAQ,QAAQ,gBAAgB;AAEzC,OAAO,MAAMC,cAAc,GAAG;EAC5BC,gBAAgB,EAAGC,KAAc,IAC/B,oCAAoCC,IAAI,CAACC,SAAS,CAACF,KAAK,CAAC;AAC7D,CAAC;AAED,OAAO,MAAMG,sBAGZ,GAAIH,KAAK,IAAK;EACb,IAAII,MAAoB,GAAG,EAAE;EAE7B,IAAIP,QAAQ,CAACG,KAAK,CAAC,EAAE;IACnBI,MAAM,GAAG,CAACJ,KAAK,CAAC;EAClB,CAAC,MAAM,IAAIK,KAAK,CAACC,OAAO,CAACN,KAAK,CAAC,EAAE;IAC/BI,MAAM,GAAG,CAAC,GAAGJ,KAAK,CAAC;EACrB,CAAC,MAAM,IAAIA,KAAK,KAAK,MAAM,EAAE;IAC3B,OAAO,MAAM;EACf,CAAC,MAAM;IACL,MAAM,IAAIJ,eAAe,CAACE,cAAc,CAACC,gBAAgB,CAACC,KAAK,CAAC,CAAC;EACnE;;EAEA;EACA;EACA;EACA;EACA,IAAII,MAAM,CAACG,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE;IAC3BH,MAAM,GAAGA,MAAM,CAACI,MAAM,CAACJ,MAAM,CAAC;EAChC;EAEA,IAAIK,OAAO,EAAE;IACXC,gBAAgB,CAACN,MAAM,CAAC;EAC1B;EAEA,OAAOA,MAAM;AACf,CAAC;AAED,MAAMM,gBAAgB,GAAIV,KAAmB,IAAK;EAChD,IAAI,CAACA,KAAK,CAACW,KAAK,CAACd,QAAQ,CAAC,EAAE;IAC1B,MAAM,IAAID,eAAe,CAACE,cAAc,CAACC,gBAAgB,CAACC,KAAK,CAAC,CAAC;EACnE;AACF,CAAC","ignoreList":[]}

package/lib/module/layoutReanimation/animationsManager.js

@@ -1,7 +1,7 @@
 'use strict';
 
 import { runOnUISync } from 'react-native-worklets';
-import { withStyleAnimation } from '../animation';
+import { cancelAnimation, withStyleAnimation } from '../animation';
 import { SHOULD_BE_USE_WEB } from '../common';
 import { LayoutAnimationType } from '../commonTypes';
 import { makeMutableUI } from '../mutables';
@@ -52,8 +52,7 @@ function createLayoutAnimationManager() {
         stopObservingProgress(tag, value);
         value._value = style.initialValues;
       }
-      const animation = withStyleAnimation(currentAnimation);
-      animation.callback = finished => {
+      const animation = withStyleAnimation(currentAnimation, finished => {
         if (finished) {
           currentAnimationForTag.delete(tag);
           mutableValuesForTag.delete(tag);
@@ -61,9 +60,9 @@ function createLayoutAnimationManager() {
           stopObservingProgress(tag, value, shouldRemoveView);
         }
         if (style.callback) {
-          style.callback(finished === undefined ? false : finished);
+          style.callback(finished);
         }
-      };
+      });
       startObservingProgress(tag, value);
       value.value = animation;
     },
@@ -72,7 +71,11 @@ function createLayoutAnimationManager() {
       if (!value) {
         return;
       }
-      stopObservingProgress(tag, value);
+      // native already made its cleanup, so we just do cleanup here on JS side
+      value.removeListener(tag + TAG_OFFSET);
+      cancelAnimation(value);
+      currentAnimationForTag.delete(tag);
+      mutableValuesForTag.delete(tag);
     }
   };
 }

package/lib/module/layoutReanimation/animationsManager.js.map

@@ -1 +1 @@
-{"version":3,"names":["runOnUISync","withStyleAnimation","SHOULD_BE_USE_WEB","LayoutAnimationType","makeMutableUI","TAG_OFFSET","startObservingProgress","tag","sharedValue","addListener","global","_notifyAboutProgress","value","stopObservingProgress","removeView","removeListener","_notifyAboutEnd","createLayoutAnimationManager","currentAnimationForTag","Map","mutableValuesForTag","start","type","yogaValues","config","style","currentAnimation","animations","previousAnimation","get","set","undefined","initialValues","_value","animation","callback","finished","delete","shouldRemoveView","EXITING","stop","LayoutAnimationsManager"],"sourceRoot":"../../../src","sources":["layoutReanimation/animationsManager.ts"],"mappings":"AAAA,YAAY;;AAEZ,SAASA,WAAW,QAAQ,uBAAuB;AAEnD,SAASC,kBAAkB,QAAQ,cAAc;AACjD,SAASC,iBAAiB,QAAQ,WAAW;AAO7C,SAASC,mBAAmB,QAAQ,gBAAgB;AACpD,SAASC,aAAa,QAAQ,aAAa;AAE3C,MAAMC,UAAU,GAAG,GAAG;AAEtB,SAASC,sBAAsBA,CAC7BC,GAAW,EACXC,WAAiD,EAC3C;EACN,SAAS;;EACTA,WAAW,CAACC,WAAW,CAACF,GAAG,GAAGF,UAAU,EAAE,MAAM;IAC9CK,MAAM,CAACC,oBAAoB,CAACJ,GAAG,EAAEC,WAAW,CAACI,KAAK,CAAC;EACrD,CAAC,CAAC;AACJ;AAEA,SAASC,qBAAqBA,CAC5BN,GAAW,EACXC,WAAgC,EAChCM,UAAU,GAAG,KAAK,EACZ;EACN,SAAS;;EACTN,WAAW,CAACO,cAAc,CAACR,GAAG,GAAGF,UAAU,CAAC;EAC5CK,MAAM,CAACM,eAAe,CAACT,GAAG,EAAEO,UAAU,CAAC;AACzC;AAEA,SAASG,4BAA4BA,CAAA,EAGnC;EACA,SAAS;;EACT,MAAMC,sBAAsB,GAAG,IAAIC,GAAG,CAAC,CAAC;EACxC,MAAMC,mBAAmB,GAAG,IAAID,GAAG,CAAC,CAAC;EAErC,OAAO;IACLE,KAAKA,CACHd,GAAW,EACXe,IAAyB;IACzB;AACN;AACA;AACA;IACMC,UAA0C,EAC1CC,MAAgE,EAChE;MACA,MAAMC,KAAK,GAAGD,MAAM,CAACD,UAAU,CAAC;MAChC,IAAIG,gBAAgB,GAAGD,KAAK,CAACE,UAAU;;MAEvC;MACA;MACA,MAAMC,iBAAiB,GAAGV,sBAAsB,CAACW,GAAG,CAACtB,GAAG,CAAC;MACzD,IAAIqB,iBAAiB,EAAE;QACrBF,gBAAgB,GAAG;UAAE,GAAGE,iBAAiB;UAAE,GAAGH,KAAK,CAACE;QAAW,CAAC;MAClE;MACAT,sBAAsB,CAACY,GAAG,CAACvB,GAAG,EAAEmB,gBAAgB,CAAC;MAEjD,IAAId,KAAK,GAAGQ,mBAAmB,CAACS,GAAG,CAACtB,GAAG,CAAC;MACxC,IAAIK,KAAK,KAAKmB,SAAS,EAAE;QACvBnB,KAAK,GAAGR,aAAa,CAACqB,KAAK,CAACO,aAAa,CAAC;QAC1CZ,mBAAmB,CAACU,GAAG,CAACvB,GAAG,EAAEK,KAAK,CAAC;MACrC,CAAC,MAAM;QACLC,qBAAqB,CAACN,GAAG,EAAEK,KAAK,CAAC;QACjCA,KAAK,CAACqB,MAAM,GAAGR,KAAK,CAACO,aAAa;MACpC;MAEA,MAAME,SAAS,GAAGjC,kBAAkB,CAACyB,gBAAgB,CAAC;MAEtDQ,SAAS,CAACC,QAAQ,GAAIC,QAAkB,IAAK;QAC3C,IAAIA,QAAQ,EAAE;UACZlB,sBAAsB,CAACmB,MAAM,CAAC9B,GAAG,CAAC;UAClCa,mBAAmB,CAACiB,MAAM,CAAC9B,GAAG,CAAC;UAC/B,MAAM+B,gBAAgB,GAAGhB,IAAI,KAAKnB,mBAAmB,CAACoC,OAAO;UAC7D1B,qBAAqB,CAACN,GAAG,EAAEK,KAAK,EAAE0B,gBAAgB,CAAC;QACrD;QACA,IAAIb,KAAK,CAACU,QAAQ,EAAE;UAClBV,KAAK,CAACU,QAAQ,CAACC,QAAQ,KAAKL,SAAS,GAAG,KAAK,GAAGK,QAAQ,CAAC;QAC3D;MACF,CAAC;MAED9B,sBAAsB,CAACC,GAAG,EAAEK,KAAK,CAAC;MAClCA,KAAK,CAACA,KAAK,GAAGsB,SAAS;IACzB,CAAC;IACDM,IAAIA,CAACjC,GAAW,EAAE;MAChB,MAAMK,KAAK,GAAGQ,mBAAmB,CAACS,GAAG,CAACtB,GAAG,CAAC;MAC1C,IAAI,CAACK,KAAK,EAAE;QACV;MACF;MACAC,qBAAqB,CAACN,GAAG,EAAEK,KAAK,CAAC;IACnC;EACF,CAAC;AACH;AAEA,IAAI,CAACV,iBAAiB,EAAE;EACtBF,WAAW,CAAC,MAAM;IAChB,SAAS;;IACTU,MAAM,CAAC+B,uBAAuB,GAAGxB,4BAA4B,CAAC,CAAC;EACjE,CAAC,CAAC;AACJ","ignoreList":[]}
+{"version":3,"names":["runOnUISync","cancelAnimation","withStyleAnimation","SHOULD_BE_USE_WEB","LayoutAnimationType","makeMutableUI","TAG_OFFSET","startObservingProgress","tag","sharedValue","addListener","global","_notifyAboutProgress","value","stopObservingProgress","removeView","removeListener","_notifyAboutEnd","createLayoutAnimationManager","currentAnimationForTag","Map","mutableValuesForTag","start","type","yogaValues","config","style","currentAnimation","animations","previousAnimation","get","set","undefined","initialValues","_value","animation","finished","delete","shouldRemoveView","EXITING","callback","stop","LayoutAnimationsManager"],"sourceRoot":"../../../src","sources":["layoutReanimation/animationsManager.ts"],"mappings":"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","ignoreList":[]}