@tamagui/animations-motion 2.0.0-rc.4 → 2.0.0-rc.40

package/dist/cjs/createAnimations.cjs

@@ -2,243 +2,326 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf,
-  __hasOwnProp = Object.prototype.hasOwnProperty;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-    value: mod,
-    enumerable: !0
-  }) : target, mod)),
-  __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-    value: !0
-  }), mod);
+// If the importer is in node compatibility mode or this is not an ESM
+// file that has been converted to a CommonJS file using a Babel-
+// compatible transform (i.e. "__esModule" has not been set), then set
+// "default" to the CommonJS "module.exports" for node compatibility.
+isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+  value: mod,
+  enumerable: true
+}) : target, mod));
+var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
+  value: true
+}), mod);
 var createAnimations_exports = {};
 __export(createAnimations_exports, {
-  createAnimations: () => createAnimations
+  createAnimations: () => createAnimations,
+  disableAnimationProps: () => disableAnimationProps
 });
 module.exports = __toCommonJS(createAnimations_exports);
-var import_animation_helpers = require("@tamagui/animation-helpers"),
-  import_use_presence = require("@tamagui/use-presence"),
-  import_web = require("@tamagui/web"),
-  import_react = require("motion/react"),
-  import_react2 = __toESM(require("react"), 1),
-  import_jsx_runtime = require("react/jsx-runtime");
-const MotionValueStrategy = /* @__PURE__ */new WeakMap(),
-  nonPositionTransformRe = /scale|rotate|skew|matrix|perspective/;
-function createAnimations(animationsProp) {
-  const animations = {};
-  for (const key in animationsProp) {
-    const config = animationsProp[key],
-      isTimingBased = config.duration !== void 0 && config.damping === void 0 && config.stiffness === void 0 && config.mass === void 0;
-    animations[key] = {
-      type: isTimingBased ? "tween" : "spring",
-      ...config,
-      // Convert duration/delay from ms to seconds for motion library
-      ...(config.duration ? {
-        duration: config.duration / 1e3
-      } : null),
-      ...(config.delay ? {
-        delay: config.delay / 1e3
-      } : null)
-    };
+var import_animation_helpers = require("@tamagui/animation-helpers");
+var import_use_presence = require("@tamagui/use-presence");
+var import_web = require("@tamagui/web");
+var import_react = require("motion/react");
+var import_react2 = __toESM(require("react"), 1);
+var import_jsx_runtime = require("react/jsx-runtime");
+const isServer = typeof window === "undefined";
+function useAnimateSSRSafe() {
+  if (isServer) {
+    return [(0, import_react2.useRef)(null), () => {}];
   }
+  return (0, import_react.useAnimate)();
+}
+const MotionValueStrategy = /* @__PURE__ */new WeakMap();
+const PendingMotionOnFinish = /* @__PURE__ */new WeakMap();
+function settlePendingMotionOnFinish(mv, controls) {
+  const onFinish = PendingMotionOnFinish.get(mv);
+  if (!onFinish) return;
+  PendingMotionOnFinish.delete(mv);
+  controls.then(() => onFinish()).catch(() => onFinish());
+}
+function createAnimations(animations) {
   let isHydratingGlobal;
   const hydratingComponents = /* @__PURE__ */new Set();
   return {
-    // this is only used by Sheet basically for now to pass result of useAnimatedStyle to
     View: MotionView,
     Text: MotionText,
-    isReactNative: !1,
-    supportsCSS: !0,
+    isReactNative: false,
     inputStyle: "css",
     outputStyle: "inline",
-    needsWebStyles: !0,
-    avoidReRenders: !0,
+    avoidReRenders: true,
     animations,
     usePresence: import_use_presence.usePresence,
     ResetPresence: import_use_presence.ResetPresence,
     onMount() {
-      isHydratingGlobal = !1, hydratingComponents.forEach(cb => cb());
+      isHydratingGlobal = false;
+      hydratingComponents.forEach(cb => cb());
     },
     useAnimations: animationProps => {
-      isHydratingGlobal === void 0 && !(0, import_web.getConfig)().settings.disableSSR && (isHydratingGlobal = !0);
+      if (isHydratingGlobal === void 0 && !(0, import_web.getConfig)().settings.disableSSR) {
+        isHydratingGlobal = true;
+      }
       const {
-          props,
-          style,
-          componentState,
-          stateRef,
-          useStyleEmitter,
-          presence
-        } = animationProps,
-        animationKey = Array.isArray(props.transition) ? props.transition[0] : props.transition,
-        isComponentHydrating = componentState.unmounted === !0,
-        isMounting = componentState.unmounted === "should-enter",
-        isEntering = !!componentState.unmounted,
-        isExiting = presence?.[0] === !1,
-        sendExitComplete = presence?.[1],
-        wasEnteringRef = (0, import_react2.useRef)(isEntering),
-        justFinishedEntering = wasEnteringRef.current && !isEntering;
+        props,
+        style,
+        componentState,
+        stateRef,
+        useStyleEmitter,
+        presence
+      } = animationProps;
+      const animationKey = Array.isArray(props.transition) ? props.transition[0] : props.transition;
+      const isComponentHydrating = componentState.unmounted === true;
+      const isMounting = componentState.unmounted === "should-enter";
+      const isEntering = !!componentState.unmounted;
+      const isExiting = presence?.[0] === false;
+      const sendExitComplete = presence?.[1];
+      const refs = (0, import_react2.useRef)(null);
+      if (!refs.current) {
+        refs.current = {
+          isFirstRender: true,
+          lastDoAnimate: null,
+          lastDontAnimate: null,
+          controls: null,
+          lastAnimateAt: 0,
+          disposed: false,
+          wasExiting: false,
+          isExiting: false,
+          sendExitComplete: void 0,
+          animationState: "default",
+          frozenExitTarget: null,
+          exitCompleteScheduled: false,
+          wasEntering: false
+        };
+      }
+      const justFinishedEntering = refs.current.wasEntering && !isEntering;
       (0, import_react2.useEffect)(() => {
-        wasEnteringRef.current = isEntering;
+        refs.current.wasEntering = isEntering;
       });
-      const animationState = isExiting ? "exit" : isMounting || justFinishedEntering ? "enter" : "default",
-        disableAnimation = isComponentHydrating || isMounting || !animationKey,
-        isFirstRender = (0, import_react2.useRef)(!0),
-        [scope, animate] = (0, import_react.useAnimate)(),
-        lastDoAnimate = (0, import_react2.useRef)(null),
-        controls = (0, import_react2.useRef)(null),
-        styleKey = JSON.stringify(style),
-        shouldDebug =
-        // process.env.NODE_ENV === 'development' &&
-        props.debug && props.debug !== "profile",
-        {
-          dontAnimate = {},
-          doAnimate,
-          animationOptions
-        } = (0, import_react2.useMemo)(() => getMotionAnimatedProps(props, style, disableAnimation, animationState), [isExiting, animationKey, styleKey, animationState, disableAnimation]),
-        id = (0, import_react2.useId)(),
-        debugId = process.env.NODE_ENV === "development" ? id : "",
-        lastAnimateAt = (0, import_react2.useRef)(0),
-        disposed = (0, import_react2.useRef)(!1),
-        [firstRenderStyle] = (0, import_react2.useState)(style),
-        lastDontAnimate = (0, import_react2.useRef)(firstRenderStyle),
-        [isHydrating, setIsHydrating] = (0, import_react2.useState)(isHydratingGlobal);
-      (0, import_react2.useLayoutEffect)(() => (isHydratingGlobal && hydratingComponents.add(() => {
-        setIsHydrating(!1);
-      }), () => {
-        disposed.current = !0;
-      }), []);
+      const animationState = isExiting ? "exit" : isMounting || justFinishedEntering ? "enter" : "default";
+      const disableAnimation = isComponentHydrating || isMounting || !animationKey;
+      const [scope, animate] = useAnimateSSRSafe();
+      refs.current.isExiting = isExiting;
+      refs.current.sendExitComplete = sendExitComplete;
+      refs.current.animationState = animationState;
+      const justStartedExiting = isExiting && !refs.current.wasExiting;
+      const justStoppedExiting = !isExiting && refs.current.wasExiting;
+      if (justStartedExiting || justStoppedExiting) {
+        refs.current.frozenExitTarget = null;
+        refs.current.exitCompleteScheduled = false;
+      }
+      (0, import_react2.useEffect)(() => {
+        refs.current.wasExiting = isExiting;
+      });
+      const {
+        dontAnimate = {},
+        doAnimate,
+        animationOptions
+      } = getMotionAnimatedProps(props, style, disableAnimation, animationState);
+      const [firstRenderStyle] = (0, import_react2.useState)(style);
+      if (refs.current.isFirstRender) {
+        refs.current.lastDontAnimate = firstRenderStyle;
+      }
+      const [isHydrating, setIsHydrating] = (0, import_react2.useState)(isHydratingGlobal);
+      (0, import_react2.useLayoutEffect)(() => {
+        if (isHydratingGlobal) {
+          hydratingComponents.add(() => {
+            setIsHydrating(false);
+          });
+        }
+        return () => {
+          refs.current.disposed = true;
+        };
+      }, []);
       const flushAnimation = ({
-        doAnimate: doAnimate2 = {},
-        animationOptions: animationOptions2 = {},
+        doAnimate: doAnimateRaw = {},
+        animationOptions: passedOptions = {},
         dontAnimate: dontAnimate2
       }) => {
+        let startedControls = null;
+        const isCurrentlyExiting = refs.current.isExiting;
+        const currentSendExitComplete = refs.current.sendExitComplete;
+        let doAnimate2 = doAnimateRaw;
+        if (isCurrentlyExiting && refs.current.frozenExitTarget) {
+          doAnimate2 = refs.current.frozenExitTarget;
+        }
+        const animationOptions2 = isCurrentlyExiting && currentSendExitComplete ? getAnimationOptions(props.transition ?? null, "exit") : passedOptions;
         try {
           const node = stateRef.current.host;
-          if (isFirstRender.current && (lastDontAnimate.current = null, lastDoAnimate.current = null), shouldDebug && (console.groupCollapsed(`[motion] ${debugId} \u{1F30A} animate (${JSON.stringify(getDiff(lastDoAnimate.current, doAnimate2), null, 2)})`), console.info({
-            props,
-            componentState,
-            doAnimate: doAnimate2,
-            dontAnimate: dontAnimate2,
-            animationOptions: animationOptions2,
-            animationProps,
-            lastDoAnimate: {
-              ...lastDoAnimate.current
-            },
-            lastDontAnimate: {
-              ...lastDontAnimate.current
-            },
-            isExiting,
-            style,
-            node
-          }), console.groupCollapsed("trace >"), console.trace(), console.groupEnd(), console.groupEnd()), !(node instanceof HTMLElement)) return;
-          const prevDont = lastDontAnimate.current;
-          if (dontAnimate2) if (prevDont) {
-            removeRemovedStyles(prevDont, dontAnimate2, node, doAnimate2);
-            const changed = getDiff(prevDont, dontAnimate2);
-            changed && Object.assign(node.style, changed);
-          } else Object.assign(node.style, dontAnimate2);
+          if (refs.current.isFirstRender) {
+            refs.current.lastDontAnimate = null;
+            refs.current.lastDoAnimate = null;
+          }
+          if (process.env.NODE_ENV === "development") {
+            if (props["debug"] && props["debug"] !== "profile") {
+              console.groupCollapsed(`[motion] animate (${JSON.stringify(getDiff(refs.current.lastDoAnimate, doAnimate2), null, 2)})`);
+              console.info({
+                props,
+                componentState,
+                doAnimate: doAnimate2,
+                dontAnimate: dontAnimate2,
+                animationOptions: animationOptions2,
+                animationProps,
+                lastDoAnimate: {
+                  ...refs.current.lastDoAnimate
+                },
+                lastDontAnimate: {
+                  ...refs.current.lastDontAnimate
+                },
+                isExiting,
+                style,
+                node
+              });
+              console.groupCollapsed(`trace >`);
+              console.trace();
+              console.groupEnd();
+              console.groupEnd();
+            }
+          }
+          if (!(node instanceof HTMLElement)) {
+            return;
+          }
+          const prevDont = refs.current.lastDontAnimate;
+          if (dontAnimate2) {
+            if (prevDont) {
+              removeRemovedStyles(prevDont, dontAnimate2, node, doAnimate2);
+              const changed = getDiff(prevDont, dontAnimate2);
+              if (changed) {
+                Object.assign(node.style, changed);
+              }
+            } else {
+              Object.assign(node.style, dontAnimate2);
+            }
+          }
           if (doAnimate2) {
             if (prevDont) {
-              const movedToAnimate = {};
-              for (const key in prevDont) key in doAnimate2 && (node.style[key] = prevDont[key], movedToAnimate[key] = prevDont[key], lastDoAnimate.current && (lastDoAnimate.current[key] = prevDont[key]));
-              Object.keys(movedToAnimate).length > 0 && animate(scope.current, {
-                ...movedToAnimate
-              }, {
-                duration: 0
-              });
+              for (const key in prevDont) {
+                if (key in doAnimate2) {
+                  node.style[key] = prevDont[key];
+                  if (refs.current.lastDoAnimate) {
+                    refs.current.lastDoAnimate[key] = prevDont[key];
+                  }
+                }
+              }
             }
-            const lastAnimated = lastDoAnimate.current;
-            lastAnimated && removeRemovedStyles(lastAnimated, doAnimate2, node, dontAnimate2);
-            const diff = getDiff(lastDoAnimate.current, doAnimate2);
+            const lastAnimated = refs.current.lastDoAnimate;
+            if (lastAnimated) {
+              removeRemovedStyles(lastAnimated, doAnimate2, node, dontAnimate2);
+            }
+            const diff = getDiff(refs.current.lastDoAnimate, doAnimate2);
             if (diff) {
-              const isRunning = controls.current?.state === "running",
-                targetTransform = typeof diff.transform == "string" ? diff.transform : null,
-                isPositionOnlyTransform = targetTransform && targetTransform.includes("translate") && !nonPositionTransformRe.test(targetTransform),
-                isPopperElement = node.hasAttribute("data-popper-animate-position"),
-                isEnteringPresenceChild = presence && justFinishedEntering;
-              if (isRunning && controls.current && isPositionOnlyTransform && (isPopperElement || isEnteringPresenceChild)) {
-                const currentTransform = getComputedStyle(node).transform;
-                if (currentTransform && currentTransform !== "none") {
-                  const matrixMatch = currentTransform.match(/matrix\([^,]+,\s*[^,]+,\s*[^,]+,\s*[^,]+,\s*([^,]+),\s*([^)]+)\)/);
-                  if (matrixMatch) {
-                    controls.current.stop(), node.style.transform = currentTransform;
-                    const currentX = Number.parseFloat(matrixMatch[1]),
-                      currentY = Number.parseFloat(matrixMatch[2]),
-                      keyframeDiff = {
-                        ...diff,
-                        transform: [`translateX(${currentX}px) translateY(${currentY}px)`, targetTransform]
-                      };
-                    controls.current = animate(scope.current, keyframeDiff, animationOptions2), lastAnimateAt.current = Date.now(), lastDontAnimate.current = dontAnimate2 ? {
-                      ...dontAnimate2
-                    } : {}, lastDoAnimate.current = doAnimate2 ? {
-                      ...doAnimate2
-                    } : {};
-                    return;
+              if (isCurrentlyExiting && !refs.current.frozenExitTarget) {
+                refs.current.frozenExitTarget = {
+                  ...doAnimate2
+                };
+              }
+              const isPopperPosition = node.hasAttribute("data-popper-animate-position");
+              let midFlightValues = null;
+              if (refs.current.controls) {
+                try {
+                  const computed = getComputedStyle(node);
+                  midFlightValues = {};
+                  for (const key in diff) {
+                    const val = computed[key];
+                    if (val !== void 0 && val !== "") {
+                      midFlightValues[key] = val;
+                    }
+                  }
+                } catch {}
+                if (isCurrentlyExiting) {
+                  refs.current.controls.stop();
+                }
+                if (midFlightValues) {
+                  for (const key in midFlightValues) {
+                    ;
+                    node.style[key] = midFlightValues[key];
                   }
                 }
+                if (isPopperPosition) {
+                  const anims = node.getAnimations();
+                  for (const anim of anims) {
+                    anim.cancel();
+                  }
+                }
+              }
+              const fixedDiff = fixTransparentColors(diff, refs.current.lastDoAnimate, doAnimate2);
+              if (midFlightValues?.transform && fixedDiff.transform) {
+                fixedDiff.transform = [midFlightValues.transform, fixedDiff.transform];
               }
-              const fixedDiff = fixTransparentColors({
-                ...diff
-              }, lastDoAnimate.current);
-              controls.current = animate(scope.current, fixedDiff, animationOptions2), lastAnimateAt.current = Date.now();
+              startedControls = animate(scope.current, fixedDiff, animationOptions2);
+              refs.current.controls = startedControls;
+              refs.current.lastAnimateAt = Date.now();
             }
           }
-          lastDontAnimate.current = dontAnimate2 ? {
+          refs.current.lastDontAnimate = dontAnimate2 ? {
             ...dontAnimate2
-          } : {}, lastDoAnimate.current = doAnimate2 ? {
+          } : {};
+          refs.current.lastDoAnimate = doAnimate2 ? {
             ...doAnimate2
           } : {};
         } finally {
-          isExiting && (controls.current ? controls.current.finished.then(() => {
-            sendExitComplete?.();
-          }) : sendExitComplete?.());
+          if (isCurrentlyExiting && currentSendExitComplete) {
+            if (startedControls) {
+              refs.current.exitCompleteScheduled = true;
+              startedControls.finished.then(() => {
+                if (refs.current.isExiting) {
+                  currentSendExitComplete();
+                }
+              }).catch(() => {
+                if (refs.current.isExiting) {
+                  currentSendExitComplete();
+                }
+              });
+            } else if (!refs.current.exitCompleteScheduled) {
+              currentSendExitComplete();
+            }
+          }
         }
       };
-      return useStyleEmitter?.(nextStyle => {
-        const animationProps2 = getMotionAnimatedProps(props, nextStyle, disableAnimation, animationState);
+      useStyleEmitter?.((nextStyle, effectiveTransition) => {
+        const animationProps2 = getMotionAnimatedProps(props, nextStyle, disableAnimation, refs.current.animationState, effectiveTransition);
         flushAnimation(animationProps2);
-      }), (0, import_web.useIsomorphicLayoutEffect)(() => {
-        if (isFirstRender.current) {
-          if (isFirstRender.current = !1, isHydrating) {
-            const node = stateRef.current.host;
-            node instanceof HTMLElement && (dontAnimate && (Object.assign(node.style, dontAnimate), animate(scope.current, {
-              ...dontAnimate
-            }, {
-              duration: 0
-            })), doAnimate && Object.keys(doAnimate).length > 0 ? (lastDoAnimate.current = {
-              ...doAnimate
-            }, animate(scope.current, {
-              ...doAnimate
-            }, {
-              duration: 0
-            })) : lastDoAnimate.current = dontAnimate ? {
-              ...dontAnimate
-            } : {}), lastDontAnimate.current = dontAnimate ? {
+      });
+      (0, import_web.useIsomorphicLayoutEffect)(() => {
+        if (refs.current.isFirstRender) {
+          refs.current.isFirstRender = false;
+          if (isHydrating) {
+            if (doAnimate && Object.keys(doAnimate).length > 0) {
+              refs.current.lastDoAnimate = {
+                ...doAnimate
+              };
+            } else {
+              refs.current.lastDoAnimate = dontAnimate ? {
+                ...dontAnimate
+              } : {};
+            }
+            refs.current.lastDontAnimate = dontAnimate ? {
               ...dontAnimate
-            } : {}, lastAnimateAt.current = Date.now();
+            } : {};
+            refs.current.lastAnimateAt = Date.now();
             return;
           }
-          lastDontAnimate.current = dontAnimate ? {
+          refs.current.lastDontAnimate = dontAnimate ? {
             ...dontAnimate
-          } : {}, lastDoAnimate.current = doAnimate ? {
+          } : {};
+          refs.current.lastDoAnimate = doAnimate ? {
             ...doAnimate
           } : {};
           return;
@@ -248,18 +331,24 @@ function createAnimations(animationsProp) {
           dontAnimate,
           animationOptions
         });
-      }, [styleKey, isExiting, disableAnimation]), shouldDebug && (console.groupCollapsed("[motion] \u{1F30A} render"), console.info({
-        style,
-        doAnimate,
-        dontAnimate,
-        styleKey,
-        scope,
-        animationOptions,
-        isExiting,
-        isFirstRender: isFirstRender.current,
-        animationProps
-      }), console.groupEnd()), {
-        // we never change this, after first render on
+      }, [style, isExiting, disableAnimation]);
+      if (process.env.NODE_ENV === "development") {
+        if (props["debug"] && props["debug"] !== "profile") {
+          console.groupCollapsed(`[motion] render`);
+          console.info({
+            style,
+            doAnimate,
+            dontAnimate,
+            scope,
+            animationOptions,
+            isExiting,
+            isFirstRender: refs.current.isFirstRender,
+            animationProps
+          });
+          console.groupEnd();
+        }
+      }
+      return {
         style: firstRenderStyle,
         ref: scope,
         render: "div"
@@ -277,16 +366,24 @@ function createAnimations(animationsProp) {
         setValue(next, config = {
           type: "spring"
         }, onFinish) {
-          if (config.type === "direct") MotionValueStrategy.set(motionValue, {
-            type: "direct"
-          }), motionValue.set(next), onFinish?.();else {
-            if (MotionValueStrategy.set(motionValue, config), onFinish) {
-              const unsubscribe = motionValue.on("change", value => {
-                Math.abs(value - next) < 0.01 && (unsubscribe(), onFinish());
-              });
-            }
+          if (config.type === "direct") {
+            MotionValueStrategy.set(motionValue, {
+              type: "direct"
+            });
             motionValue.set(next);
+            onFinish?.();
+            return;
+          }
+          MotionValueStrategy.set(motionValue, config);
+          if (onFinish) {
+            const prior = PendingMotionOnFinish.get(motionValue);
+            if (prior) {
+              PendingMotionOnFinish.delete(motionValue);
+              prior();
+            }
+            PendingMotionOnFinish.set(motionValue, onFinish);
           }
+          motionValue.set(next);
         },
         stop() {
           motionValue.stop();
@@ -300,24 +397,49 @@ function createAnimations(animationsProp) {
       (0, import_react.useMotionValueEvent)(instance, "change", onValue);
     },
     useAnimatedNumberStyle(val, getStyleProp) {
-      const motionValue = val.getInstance(),
-        getStyleRef = (0, import_react2.useRef)(getStyleProp);
-      return getStyleRef.current = getStyleProp, (0, import_react2.useMemo)(() => ({
-        getStyle: cur => getStyleRef.current(cur),
-        motionValue
-      }), []);
+      const motionValue = val.getInstance();
+      const getStyleRef = (0, import_react2.useRef)(getStyleProp);
+      getStyleRef.current = getStyleProp;
+      return (0, import_react2.useMemo)(() => {
+        return {
+          getStyle: cur => {
+            return getStyleRef.current(cur);
+          },
+          motionValue
+        };
+      }, []);
+    },
+    useAnimatedNumbersStyle(vals, getStyleProp) {
+      const motionValues = vals.map(v => v.getInstance());
+      const getStyleRef = (0, import_react2.useRef)(getStyleProp);
+      getStyleRef.current = getStyleProp;
+      return (0, import_react2.useMemo)(() => {
+        return {
+          getStyle: (...currentValues) => getStyleRef.current(...currentValues),
+          motionValues
+        };
+      }, []);
     }
   };
-  function getMotionAnimatedProps(props, style, disable, animationState = "default") {
-    if (disable) return {
-      dontAnimate: style
-    };
-    const animationOptions = transitionPropToAnimationConfig(props.transition, animationState);
-    let dontAnimate, doAnimate;
+  function getMotionAnimatedProps(props, style, disable, animationState = "default", transitionOverride) {
+    if (disable) {
+      return {
+        dontAnimate: style
+      };
+    }
+    const animationOptions = getAnimationOptions(transitionOverride ?? props.transition ?? null, animationState);
+    let dontAnimate;
+    let doAnimate;
     const animateOnly = props.animateOnly;
     for (const key in style) {
       const value = style[key];
-      disableAnimationProps.has(key) || animateOnly && !animateOnly.includes(key) ? (dontAnimate ||= {}, dontAnimate[key] = value) : (doAnimate ||= {}, doAnimate[key] = value);
+      if (disableAnimationProps.has(key) || animateOnly && !animateOnly.includes(key)) {
+        dontAnimate ||= {};
+        dontAnimate[key] = value;
+      } else {
+        doAnimate ||= {};
+        doAnimate[key] = value;
+      }
     }
     return {
       dontAnimate,
@@ -325,83 +447,168 @@ function createAnimations(animationsProp) {
       animationOptions
     };
   }
-  function transitionPropToAnimationConfig(transitionProp, animationState = "default") {
-    const normalized = (0, import_animation_helpers.normalizeTransition)(transitionProp),
-      effectiveKey = (0, import_animation_helpers.getEffectiveAnimation)(normalized, animationState);
-    if (!effectiveKey && Object.keys(normalized.properties).length === 0) return {};
-    const defaultConfig = effectiveKey ? animations[effectiveKey] : null,
-      delay = typeof normalized.delay == "number" ? normalized.delay / 1e3 : void 0,
-      result = {};
-    defaultConfig && (result.default = delay ? {
-      ...defaultConfig,
-      delay
-    } : defaultConfig);
-    for (const [propName, animationNameOrConfig] of Object.entries(normalized.properties)) if (typeof animationNameOrConfig == "string") result[propName] = animations[animationNameOrConfig];else if (animationNameOrConfig && typeof animationNameOrConfig == "object") {
-      const baseConfig = animationNameOrConfig.type ? animations[animationNameOrConfig.type] : defaultConfig;
-      result[propName] = {
-        ...baseConfig,
-        ...animationNameOrConfig
+  function getAnimationOptions(transitionProp, animationState = "default") {
+    const normalized = (0, import_animation_helpers.normalizeTransition)(transitionProp);
+    let effectiveKey = (0, import_animation_helpers.getEffectiveAnimation)(normalized, animationState);
+    if (!effectiveKey && animationState === "default") {
+      effectiveKey = normalized.enter || normalized.exit || null;
+    }
+    const globalConfigOverride = normalized.config ? {
+      ...normalized.config
+    } : void 0;
+    if (!effectiveKey && Object.keys(normalized.properties).length === 0 && !globalConfigOverride) {
+      return {};
+    }
+    const defaultConfig = effectiveKey ? withInferredType(animations[effectiveKey]) : null;
+    const delay = normalized.delay;
+    const result = {};
+    if (defaultConfig) {
+      Object.assign(result, defaultConfig);
+    }
+    if (globalConfigOverride) {
+      Object.assign(result, globalConfigOverride);
+      if (result.type === void 0 && result.duration !== void 0 && result.damping === void 0 && result.stiffness === void 0 && result.mass === void 0) {
+        result.type = "tween";
+      }
+    }
+    if (delay) {
+      result.delay = delay;
+    }
+    if (defaultConfig || globalConfigOverride || delay) {
+      result.default = {
+        ...defaultConfig,
+        ...globalConfigOverride,
+        ...(delay ? {
+          delay
+        } : null)
       };
     }
+    for (const [propName, animationNameOrConfig] of Object.entries(normalized.properties)) {
+      if (typeof animationNameOrConfig === "string") {
+        result[propName] = withInferredType(animations[animationNameOrConfig]);
+      } else if (animationNameOrConfig && typeof animationNameOrConfig === "object") {
+        const baseConfig = animationNameOrConfig.type ? withInferredType(animations[animationNameOrConfig.type]) : defaultConfig;
+        result[propName] = {
+          ...baseConfig,
+          ...animationNameOrConfig
+        };
+      }
+    }
+    convertMsToS(result);
+    convertMsToS(result.default);
+    for (const key in result) {
+      if (key !== "default" && typeof result[key] === "object") {
+        convertMsToS(result[key]);
+      }
+    }
     return result;
   }
 }
+function withInferredType(config) {
+  if (!config) {
+    return {
+      type: "spring"
+    };
+  }
+  const isTimingBased = config.duration !== void 0 && config.damping === void 0 && config.stiffness === void 0 && config.mass === void 0;
+  return {
+    type: isTimingBased ? "tween" : "spring",
+    ...config
+  };
+}
+function convertMsToS(config) {
+  if (!config) return;
+  if (typeof config.delay === "number") config.delay = config.delay / 1e3;
+  if (typeof config.duration === "number") {
+    const isTimingBased = config.type === "tween" || config.type === void 0 && config.damping === void 0 && config.stiffness === void 0 && config.mass === void 0;
+    if (isTimingBased) {
+      config.duration = config.duration / 1e3;
+    }
+  }
+}
 function removeRemovedStyles(prev, next, node, dontClearIfIn) {
-  for (const key in prev) if (!(key in next)) {
-    if (dontClearIfIn && key in dontClearIfIn) continue;
-    node.style[key] = "";
+  for (const key in prev) {
+    if (!(key in next)) {
+      if (dontClearIfIn && key in dontClearIfIn) {
+        continue;
+      }
+      node.style[key] = "";
+    }
   }
 }
-const disableAnimationProps = /* @__PURE__ */new Set(["alignContent", "alignItems", "aspectRatio", "backdropFilter", "boxSizing", "contain", "containerType", "display", "flexBasis", "flexDirection", "flexGrow", "flexShrink", "fontFamily", "justifyContent", "marginBottom", "marginLeft", "marginRight", "marginTop", "maxHeight", "maxWidth", "minHeight", "minWidth", "overflow", "overflowX", "overflowY", "pointerEvents", "position", "textWrap", "transformOrigin", "userSelect", "WebkitBackdropFilter", "zIndex"]),
-  MotionView = createMotionView("div"),
-  MotionText = createMotionView("span");
+const disableAnimationProps = /* @__PURE__ */new Set(["alignContent", "alignItems", "boxSizing", "contain", "containerType", "display", "flexBasis", "flexDirection", "fontFamily", "justifyContent", "overflow", "overflowX", "overflowY", "pointerEvents", "position", "textWrap", "userSelect"]);
+const MotionView = createMotionView("div");
+const MotionText = createMotionView("span");
 function createMotionView(defaultTag) {
-  const isText = defaultTag === "span",
-    Component = (0, import_react2.forwardRef)((propsIn, ref) => {
-      const {
-          forwardedRef,
-          animation,
-          render = defaultTag,
-          style,
-          ...propsRest
-        } = propsIn,
-        [scope, animate] = (0, import_react.useAnimate)(),
-        hostRef = (0, import_react2.useRef)(null),
-        composedRefs = (0, import_web.useComposedRefs)(forwardedRef, ref, hostRef, scope),
-        stateRef = (0, import_react2.useRef)(null);
-      stateRef.current || (stateRef.current = {
+  const isText = defaultTag === "span";
+  const Component = (0, import_react2.forwardRef)((propsIn, ref) => {
+    const {
+      forwardedRef,
+      animation,
+      render = defaultTag,
+      style,
+      ...propsRest
+    } = propsIn;
+    const [scope, animate] = useAnimateSSRSafe();
+    const hostRef = (0, import_react2.useRef)(null);
+    const composedRefs = (0, import_web.useComposedRefs)(forwardedRef, ref, hostRef, scope);
+    const stateRef = (0, import_react2.useRef)(null);
+    if (!stateRef.current) {
+      stateRef.current = {
         get host() {
           return hostRef.current;
         }
+      };
+    }
+    const [_, state] = (0, import_web.useThemeWithState)({});
+    const styles = Array.isArray(style) ? style : [style];
+    const [animatedStyle, nonAnimatedStyles] = (() => {
+      let animatedStyle2;
+      const nonAnimatedStyles2 = [];
+      for (const style2 of styles) {
+        if (style2.getStyle) {
+          animatedStyle2 = style2;
+        } else {
+          nonAnimatedStyles2.push(style2);
+        }
+      }
+      return [animatedStyle2, nonAnimatedStyles2];
+    })();
+    function getProps(props2) {
+      const out = (0, import_web.getSplitStyles)(props2, isText ? import_web.Text.staticConfig : import_web.View.staticConfig, state?.theme, state?.name, {
+        unmounted: false
+      }, {
+        isAnimated: false,
+        noClass: true,
+        resolveValues: "auto"
       });
-      const [_, state] = (0, import_web.useThemeWithState)({}),
-        styles = Array.isArray(style) ? style : [style],
-        [animatedStyle, nonAnimatedStyles] = [styles.find(x => x.getStyle), styles.filter(x => !x.getStyle)];
-      function getProps(props2) {
-        const out = (0, import_web.getSplitStyles)(props2, isText ? import_web.Text.staticConfig : import_web.View.staticConfig, state?.theme, state?.name, {
-          unmounted: !1
-        }, {
-          isAnimated: !1,
-          noClass: !0,
-          // noMergeStyle: true,
-          resolveValues: "auto"
-        });
-        return out ? (out.viewProps.style && ((0, import_web.fixStyles)(out.viewProps.style), (0, import_web.styleToCSS)(out.viewProps.style)), out.viewProps) : {};
+      if (!out) {
+        return {};
       }
-      const props = getProps({
-          ...propsRest,
-          style: nonAnimatedStyles
-        }),
-        Element = render || "div",
-        transformedProps = import_web.hooks.usePropsTransform?.(render, props, stateRef, !1);
-      return (0, import_react2.useEffect)(() => {
-        if (animatedStyle) return animatedStyle.motionValue.on("change", value => {
-          const nextStyle = animatedStyle.getStyle(value),
-            animationConfig = MotionValueStrategy.get(animatedStyle.motionValue),
-            node = hostRef.current,
-            webStyle = getProps({
-              style: nextStyle
-            }).style;
+      if (out.viewProps.style) {
+        (0, import_web.fixStyles)(out.viewProps.style);
+        (0, import_web.styleToCSS)(out.viewProps.style);
+      }
+      return out.viewProps;
+    }
+    const props = getProps({
+      ...propsRest,
+      style: nonAnimatedStyles
+    });
+    const Element = render || "div";
+    const transformedProps = import_web.hooks.usePropsTransform?.(render, props, stateRef, false);
+    (0, import_react2.useEffect)(() => {
+      if (!animatedStyle) return;
+      if (animatedStyle.motionValues) {
+        const mvs = animatedStyle.motionValues;
+        const unsubs = mvs.map(mv => mv.on("change", () => {
+          const currentValues = mvs.map(v => v.get());
+          const nextStyle = animatedStyle.getStyle(...currentValues);
+          const animationConfig = MotionValueStrategy.get(mv);
+          const node = hostRef.current;
+          const webStyle = getProps({
+            style: nextStyle
+          }).style;
           if (webStyle && node instanceof HTMLElement) {
             const motionAnimationConfig = animationConfig?.type === "timing" ? {
               type: "tween",
@@ -413,34 +620,79 @@ function createMotionView(defaultTag) {
               type: "spring",
               ...animationConfig
             };
-            animate(node, webStyle, motionAnimationConfig);
+            const controls = animate(node, webStyle, motionAnimationConfig);
+            settlePendingMotionOnFinish(mv, controls);
           }
-        });
-      }, [animatedStyle]), /* @__PURE__ */(0, import_jsx_runtime.jsx)(Element, {
-        ...transformedProps,
-        ref: composedRefs
+        }));
+        return () => unsubs.forEach(fn => fn());
+      }
+      if (!animatedStyle.motionValue) return;
+      return animatedStyle.motionValue.on("change", value => {
+        const nextStyle = animatedStyle.getStyle(value);
+        const animationConfig = MotionValueStrategy.get(animatedStyle.motionValue);
+        const node = hostRef.current;
+        const webStyle = getProps({
+          style: nextStyle
+        }).style;
+        if (webStyle && node instanceof HTMLElement) {
+          const motionAnimationConfig = animationConfig?.type === "timing" ? {
+            type: "tween",
+            duration: (animationConfig?.duration || 0) / 1e3
+          } : animationConfig?.type === "direct" ? {
+            type: "tween",
+            duration: 0
+          } : {
+            type: "spring",
+            ...animationConfig
+          };
+          const controls = animate(node, webStyle, motionAnimationConfig);
+          settlePendingMotionOnFinish(animatedStyle.motionValue, controls);
+        }
       });
+    }, [animatedStyle]);
+    return /* @__PURE__ */(0, import_jsx_runtime.jsx)(Element, {
+      ...transformedProps,
+      ref: composedRefs
     });
-  return Component.acceptTagProp = !0, Component;
+  });
+  Component["acceptRenderProp"] = true;
+  return Component;
 }
 function getDiff(previous, next) {
-  if (!previous) return next;
+  if (!previous) {
+    return next;
+  }
   let diff = null;
-  for (const key in next) next[key] !== previous[key] && (diff ||= {}, diff[key] = next[key]);
+  for (const key in next) {
+    if (next[key] !== previous[key]) {
+      diff ||= {};
+      diff[key] = next[key];
+    }
+  }
   return diff;
 }
-function fixTransparentColors(diff, previous) {
+function fixTransparentColors(diff, previous, next) {
   let result = diff;
-  for (const key in diff) if (diff[key] === "transparent") {
-    const prev = previous?.[key];
-    let fixed = "rgba(0, 0, 0, 0)";
-    if (typeof prev == "string") {
-      const rgbaMatch = prev.match(/^rgba?\(([^,]+),\s*([^,]+),\s*([^,)]+)/);
-      rgbaMatch && (fixed = `rgba(${rgbaMatch[1]}, ${rgbaMatch[2]}, ${rgbaMatch[3]}, 0)`);
+  for (const key in diff) {
+    if (diff[key] === "transparent") {
+      let fixed = "rgba(0, 0, 0, 0)";
+      const candidates = [previous?.[key], next?.[key]];
+      for (const candidate of candidates) {
+        if (typeof candidate === "string" && candidate !== "transparent") {
+          const rgbaMatch = candidate.match(/^rgba?\(([^,]+),\s*([^,]+),\s*([^,)]+)/);
+          if (rgbaMatch) {
+            fixed = `rgba(${rgbaMatch[1]}, ${rgbaMatch[2]}, ${rgbaMatch[3]}, 0)`;
+            break;
+          }
+        }
+      }
+      if (result === diff) {
+        result = {
+          ...diff
+        };
+      }
+      result[key] = fixed;
     }
-    result === diff && (result = {
-      ...diff
-    }), result[key] = fixed;
   }
   return result;
 }