@tamagui/animations-moti 1.99.0 → 1.100.0

package/dist/cjs/createAnimations.js

@@ -119,7 +119,7 @@ function createAnimations(animations) {
       return (0, import_react_native_reanimated.useAnimatedStyle)(() => getStyle(derivedValue.value), [val, getStyle, derivedValue, instance]);
     },
     useAnimations: (animationProps) => {
-      const { props, presence, style, onDidAnimate, componentState } = animationProps, animationKey = Array.isArray(props.animation) ? props.animation[0] : props.animation, isHydrating = componentState.unmounted === "should-enter";
+      const { props, presence, style, onDidAnimate, componentState } = animationProps, animationKey = Array.isArray(props.animation) ? props.animation[0] : props.animation, isHydrating = componentState.unmounted === !0;
       let animate = {}, dontAnimate = {};
       if (isHydrating)
         dontAnimate = style;
@@ -127,10 +127,13 @@ function createAnimations(animations) {
         const animateOnly = props.animateOnly;
         for (const key in style) {
           const value = style[key];
-          !onlyAnimateKeys[key] || value === "auto" || animateOnly && !animateOnly.includes(key) ? dontAnimate[key] = value : animate[key] = value;
+          !onlyAnimateKeys[key] || value === "auto" || typeof value == "string" && value.startsWith("calc") || animateOnly && !animateOnly.includes(key) ? dontAnimate[key] = value : animate[key] = value;
         }
       }
-      const animateStr = JSON.stringify(animate), styles = (0, import_react.useMemo)(() => JSON.parse(animateStr), [animateStr]), isExiting = !!presence?.[1], presenceContext = (0, import_react.useContext)(import_use_presence.PresenceContext), usePresenceValue = presence || void 0, transition = animations[animationKey];
+      componentState.unmounted === "should-enter" && (dontAnimate = style);
+      const animateStr = JSON.stringify(animate), styles = (0, import_react.useMemo)(() => JSON.parse(animateStr), [animateStr]), isExiting = !!presence?.[1], presenceContext = (0, import_react.useContext)(import_use_presence.PresenceContext), usePresenceValue = presence || void 0, transition = isHydrating ? { type: "transition", duration: 0 } : {
+        ...animations[animationKey]
+      };
       if (Array.isArray(props.animation)) {
         const config = props.animation[1];
         if (config && typeof config == "object")
@@ -140,7 +143,8 @@ function createAnimations(animations) {
           }
       }
       const motiProps = {
-        animate: isExiting || isHydrating ? {} : styles,
+        animate: isExiting || componentState.unmounted ? {} : styles,
+        from: componentState.unmounted ? styles : {},
         transition,
         usePresenceValue,
         presenceContext,

package/dist/cjs/createAnimations.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/createAnimations.tsx"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["Animated"]
 }

package/dist/cjs/createAnimations.native.js

@@ -26,7 +26,27 @@ __export(createAnimations_exports, {
   createAnimations: () => createAnimations
 });
 module.exports = __toCommonJS(createAnimations_exports);
-var import_use_presence = require("@tamagui/use-presence"), import_author = require("moti/author"), import_react = require("react"), import_react_native_reanimated = __toESM(require("react-native-reanimated")), onlyAnimateKeys = {
+var import_use_presence = require("@tamagui/use-presence"), import_author = require("moti/author"), import_react = require("react"), import_react_native_reanimated = __toESM(require("react-native-reanimated"));
+function _define_property(obj, key, value) {
+  return key in obj ? Object.defineProperty(obj, key, {
+    value,
+    enumerable: !0,
+    configurable: !0,
+    writable: !0
+  }) : obj[key] = value, obj;
+}
+function _object_spread(target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = arguments[i] != null ? arguments[i] : {}, ownKeys = Object.keys(source);
+    typeof Object.getOwnPropertySymbols == "function" && (ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+      return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+    }))), ownKeys.forEach(function(key) {
+      _define_property(target, key, source[key]);
+    });
+  }
+  return target;
+}
+var onlyAnimateKeys = {
   transform: !0,
   opacity: !0,
   height: !0,
@@ -140,21 +160,25 @@ function createAnimations(animations) {
       );
     },
     useAnimations: function(animationProps) {
-      var props = animationProps.props, presence = animationProps.presence, style = animationProps.style, onDidAnimate = animationProps.onDidAnimate, componentState = animationProps.componentState, animationKey = Array.isArray(props.animation) ? props.animation[0] : props.animation, isHydrating = componentState.unmounted === "should-enter", animate = {}, dontAnimate = {};
+      var props = animationProps.props, presence = animationProps.presence, style = animationProps.style, onDidAnimate = animationProps.onDidAnimate, componentState = animationProps.componentState, animationKey = Array.isArray(props.animation) ? props.animation[0] : props.animation, isHydrating = componentState.unmounted === !0, animate = {}, dontAnimate = {};
       if (isHydrating)
         dontAnimate = style;
       else {
         var animateOnly = props.animateOnly;
         for (var key in style) {
           var value = style[key];
-          !onlyAnimateKeys[key] || value === "auto" || animateOnly && !animateOnly.includes(key) ? dontAnimate[key] = value : animate[key] = value;
+          !onlyAnimateKeys[key] || value === "auto" || typeof value == "string" && value.startsWith("calc") || animateOnly && !animateOnly.includes(key) ? dontAnimate[key] = value : animate[key] = value;
         }
       }
+      componentState.unmounted === "should-enter" && (dontAnimate = style);
       var animateStr = JSON.stringify(animate), styles = (0, import_react.useMemo)(function() {
         return JSON.parse(animateStr);
       }, [
         animateStr
-      ]), isExiting = !!(presence != null && presence[1]), presenceContext = (0, import_react.useContext)(import_use_presence.PresenceContext), usePresenceValue = presence || void 0, transition = animations[animationKey];
+      ]), isExiting = !!(presence != null && presence[1]), presenceContext = (0, import_react.useContext)(import_use_presence.PresenceContext), usePresenceValue = presence || void 0, transition = isHydrating ? {
+        type: "transition",
+        duration: 0
+      } : _object_spread({}, animations[animationKey]);
       if (Array.isArray(props.animation)) {
         var config = props.animation[1];
         if (config && typeof config == "object")
@@ -164,7 +188,8 @@ function createAnimations(animations) {
           }
       }
       var motiProps = {
-        animate: isExiting || isHydrating ? {} : styles,
+        animate: isExiting || componentState.unmounted ? {} : styles,
+        from: componentState.unmounted ? styles : {},
         transition,
         usePresenceValue,
         presenceContext,

package/dist/cjs/createAnimations.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Users/n8/tamagui/packages/animations-moti/src/createAnimations.tsx"],
-  "mappings": "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",
-  "names": ["onlyAnimateKeys", "transform", "opacity", "height", "width", "backgroundColor", "borderColor", "borderLeftColor", "borderRightColor", "borderTopColor", "borderBottomColor", "borderRadius", "borderTopLeftRadius", "borderTopRightRadius", "borderBottomLeftRadius", "borderBottomRightRadius", "borderLeftWidth", "borderRightWidth", "borderTopWidth", "borderBottomWidth", "color", "left", "right", "top", "bottom", "createAnimations", "animations", "View", "Animated", "Text", "isReactNative", "usePresence", "ResetPresence", "useAnimatedNumber", "initial", "sharedValue", "useSharedValue", "useMemo", "getInstance", "getValue", "value", "setValue", "next", "config", "type", "onFinish", "withSpring", "runOnJS", "undefined", "withTiming", "stop", "cancelAnimation", "useAnimatedNumberReaction", "onValue", "instance", "useAnimatedReaction", "prev", "useAnimatedNumberStyle", "val", "getStyle", "derivedValue", "useDerivedValue", "useAnimatedStyle", "useAnimations", "animationProps", "props", "presence", "style", "onDidAnimate", "componentState", "animationKey", "Array", "isArray", "animation", "isHydrating", "unmounted", "animate", "dontAnimate", "animateOnly", "key", "includes", "animateStr", "JSON", "stringify", "styles", "parse", "isExiting", "Boolean", "presenceContext", "useContext", "PresenceContext", "usePresenceValue", "transition", "motiProps", "exit", "moti", "useMotify", "process", "env", "NODE_ENV", "console", "info"]
+  "mappings": "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",
+  "names": ["onlyAnimateKeys", "transform", "opacity", "height", "width", "backgroundColor", "borderColor", "borderLeftColor", "borderRightColor", "borderTopColor", "borderBottomColor", "borderRadius", "borderTopLeftRadius", "borderTopRightRadius", "borderBottomLeftRadius", "borderBottomRightRadius", "borderLeftWidth", "borderRightWidth", "borderTopWidth", "borderBottomWidth", "color", "left", "right", "top", "bottom", "createAnimations", "animations", "View", "Animated", "Text", "isReactNative", "usePresence", "ResetPresence", "useAnimatedNumber", "initial", "sharedValue", "useSharedValue", "useMemo", "getInstance", "getValue", "value", "setValue", "next", "config", "type", "onFinish", "withSpring", "runOnJS", "undefined", "withTiming", "stop", "cancelAnimation", "useAnimatedNumberReaction", "onValue", "instance", "useAnimatedReaction", "prev", "useAnimatedNumberStyle", "val", "getStyle", "derivedValue", "useDerivedValue", "useAnimatedStyle", "useAnimations", "animationProps", "props", "presence", "style", "onDidAnimate", "componentState", "animationKey", "Array", "isArray", "animation", "isHydrating", "unmounted", "animate", "dontAnimate", "animateOnly", "key", "startsWith", "includes", "animateStr", "JSON", "stringify", "styles", "parse", "isExiting", "Boolean", "presenceContext", "useContext", "PresenceContext", "usePresenceValue", "transition", "duration", "motiProps", "from", "exit", "moti", "useMotify", "process", "env", "NODE_ENV", "console", "info"]
 }

package/dist/esm/createAnimations.js

@@ -104,7 +104,7 @@ function createAnimations(animations) {
       return useAnimatedStyle(() => getStyle(derivedValue.value), [val, getStyle, derivedValue, instance]);
     },
     useAnimations: (animationProps) => {
-      const { props, presence, style, onDidAnimate, componentState } = animationProps, animationKey = Array.isArray(props.animation) ? props.animation[0] : props.animation, isHydrating = componentState.unmounted === "should-enter";
+      const { props, presence, style, onDidAnimate, componentState } = animationProps, animationKey = Array.isArray(props.animation) ? props.animation[0] : props.animation, isHydrating = componentState.unmounted === !0;
       let animate = {}, dontAnimate = {};
       if (isHydrating)
         dontAnimate = style;
@@ -112,10 +112,13 @@ function createAnimations(animations) {
         const animateOnly = props.animateOnly;
         for (const key in style) {
           const value = style[key];
-          !onlyAnimateKeys[key] || value === "auto" || animateOnly && !animateOnly.includes(key) ? dontAnimate[key] = value : animate[key] = value;
+          !onlyAnimateKeys[key] || value === "auto" || typeof value == "string" && value.startsWith("calc") || animateOnly && !animateOnly.includes(key) ? dontAnimate[key] = value : animate[key] = value;
         }
       }
-      const animateStr = JSON.stringify(animate), styles = useMemo(() => JSON.parse(animateStr), [animateStr]), isExiting = !!presence?.[1], presenceContext = useContext(PresenceContext), usePresenceValue = presence || void 0, transition = animations[animationKey];
+      componentState.unmounted === "should-enter" && (dontAnimate = style);
+      const animateStr = JSON.stringify(animate), styles = useMemo(() => JSON.parse(animateStr), [animateStr]), isExiting = !!presence?.[1], presenceContext = useContext(PresenceContext), usePresenceValue = presence || void 0, transition = isHydrating ? { type: "transition", duration: 0 } : {
+        ...animations[animationKey]
+      };
       if (Array.isArray(props.animation)) {
         const config = props.animation[1];
         if (config && typeof config == "object")
@@ -125,7 +128,8 @@ function createAnimations(animations) {
           }
       }
       const motiProps = {
-        animate: isExiting || isHydrating ? {} : styles,
+        animate: isExiting || componentState.unmounted ? {} : styles,
+        from: componentState.unmounted ? styles : {},
         transition,
         usePresenceValue,
         presenceContext,

package/dist/esm/createAnimations.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/createAnimations.tsx"],
-  "mappings": "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",
+  "mappings": "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",
   "names": []
 }

package/dist/esm/createAnimations.mjs

@@ -100,22 +100,28 @@ function createAnimations(animations) {
           componentState
         } = animationProps,
         animationKey = Array.isArray(props.animation) ? props.animation[0] : props.animation,
-        isHydrating = componentState.unmounted === "should-enter";
+        isHydrating = componentState.unmounted === !0;
       let animate = {},
         dontAnimate = {};
       if (isHydrating) dontAnimate = style;else {
         const animateOnly = props.animateOnly;
         for (const key in style) {
           const value = style[key];
-          !onlyAnimateKeys[key] || value === "auto" || animateOnly && !animateOnly.includes(key) ? dontAnimate[key] = value : animate[key] = value;
+          !onlyAnimateKeys[key] || value === "auto" || typeof value == "string" && value.startsWith("calc") || animateOnly && !animateOnly.includes(key) ? dontAnimate[key] = value : animate[key] = value;
         }
       }
+      componentState.unmounted === "should-enter" && (dontAnimate = style);
       const animateStr = JSON.stringify(animate),
         styles = useMemo(() => JSON.parse(animateStr), [animateStr]),
         isExiting = !!presence?.[1],
         presenceContext = useContext(PresenceContext),
         usePresenceValue = presence || void 0,
-        transition = animations[animationKey];
+        transition = isHydrating ? {
+          type: "transition",
+          duration: 0
+        } : {
+          ...animations[animationKey]
+        };
       if (Array.isArray(props.animation)) {
         const config = props.animation[1];
         if (config && typeof config == "object") for (const key in config) {
@@ -124,7 +130,8 @@ function createAnimations(animations) {
         }
       }
       const motiProps = {
-          animate: isExiting || isHydrating ? {} : styles,
+          animate: isExiting || componentState.unmounted ? {} : styles,
+          from: componentState.unmounted ? styles : {},
           transition,
           usePresenceValue,
           presenceContext,

package/dist/esm/createAnimations.native.js

@@ -2,6 +2,25 @@ import { PresenceContext, ResetPresence, usePresence } from "@tamagui/use-presen
 import { useMotify } from "moti/author";
 import { useContext, useMemo } from "react";
 import Animated, { cancelAnimation, runOnJS, useAnimatedReaction, useAnimatedStyle, useDerivedValue, useSharedValue, withSpring, withTiming } from "react-native-reanimated";
+function _define_property(obj, key, value) {
+  return key in obj ? Object.defineProperty(obj, key, {
+    value,
+    enumerable: !0,
+    configurable: !0,
+    writable: !0
+  }) : obj[key] = value, obj;
+}
+function _object_spread(target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = arguments[i] != null ? arguments[i] : {}, ownKeys = Object.keys(source);
+    typeof Object.getOwnPropertySymbols == "function" && (ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+      return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+    }))), ownKeys.forEach(function(key) {
+      _define_property(target, key, source[key]);
+    });
+  }
+  return target;
+}
 var onlyAnimateKeys = {
   transform: !0,
   opacity: !0,
@@ -116,21 +135,25 @@ function createAnimations(animations) {
       );
     },
     useAnimations: function(animationProps) {
-      var props = animationProps.props, presence = animationProps.presence, style = animationProps.style, onDidAnimate = animationProps.onDidAnimate, componentState = animationProps.componentState, animationKey = Array.isArray(props.animation) ? props.animation[0] : props.animation, isHydrating = componentState.unmounted === "should-enter", animate = {}, dontAnimate = {};
+      var props = animationProps.props, presence = animationProps.presence, style = animationProps.style, onDidAnimate = animationProps.onDidAnimate, componentState = animationProps.componentState, animationKey = Array.isArray(props.animation) ? props.animation[0] : props.animation, isHydrating = componentState.unmounted === !0, animate = {}, dontAnimate = {};
       if (isHydrating)
         dontAnimate = style;
       else {
         var animateOnly = props.animateOnly;
         for (var key in style) {
           var value = style[key];
-          !onlyAnimateKeys[key] || value === "auto" || animateOnly && !animateOnly.includes(key) ? dontAnimate[key] = value : animate[key] = value;
+          !onlyAnimateKeys[key] || value === "auto" || typeof value == "string" && value.startsWith("calc") || animateOnly && !animateOnly.includes(key) ? dontAnimate[key] = value : animate[key] = value;
         }
       }
+      componentState.unmounted === "should-enter" && (dontAnimate = style);
       var animateStr = JSON.stringify(animate), styles = useMemo(function() {
         return JSON.parse(animateStr);
       }, [
         animateStr
-      ]), isExiting = !!(presence != null && presence[1]), presenceContext = useContext(PresenceContext), usePresenceValue = presence || void 0, transition = animations[animationKey];
+      ]), isExiting = !!(presence != null && presence[1]), presenceContext = useContext(PresenceContext), usePresenceValue = presence || void 0, transition = isHydrating ? {
+        type: "transition",
+        duration: 0
+      } : _object_spread({}, animations[animationKey]);
       if (Array.isArray(props.animation)) {
         var config = props.animation[1];
         if (config && typeof config == "object")
@@ -140,7 +163,8 @@ function createAnimations(animations) {
           }
       }
       var motiProps = {
-        animate: isExiting || isHydrating ? {} : styles,
+        animate: isExiting || componentState.unmounted ? {} : styles,
+        from: componentState.unmounted ? styles : {},
         transition,
         usePresenceValue,
         presenceContext,

package/dist/esm/createAnimations.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Users/n8/tamagui/packages/animations-moti/src/createAnimations.tsx"],
-  "mappings": "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",
-  "names": ["PresenceContext", "ResetPresence", "usePresence", "useMotify", "useContext", "useMemo", "Animated", "cancelAnimation", "runOnJS", "useAnimatedReaction", "useAnimatedStyle", "useDerivedValue", "useSharedValue", "withSpring", "withTiming", "onlyAnimateKeys", "transform", "opacity", "height", "width", "backgroundColor", "borderColor", "borderLeftColor", "borderRightColor", "borderTopColor", "borderBottomColor", "borderRadius", "borderTopLeftRadius", "borderTopRightRadius", "borderBottomLeftRadius", "borderBottomRightRadius", "borderLeftWidth", "borderRightWidth", "borderTopWidth", "borderBottomWidth", "color", "left", "right", "top", "bottom", "createAnimations", "animations", "View", "Text", "isReactNative", "useAnimatedNumber", "initial", "sharedValue", "getInstance", "getValue", "value", "setValue", "next", "config", "type", "onFinish", "undefined", "stop", "useAnimatedNumberReaction", "onValue", "instance", "prev", "useAnimatedNumberStyle", "val", "getStyle", "derivedValue", "useAnimations", "animationProps", "props", "presence", "style", "onDidAnimate", "componentState", "animationKey", "Array", "isArray", "animation", "isHydrating", "unmounted", "animate", "dontAnimate", "animateOnly", "key", "includes", "animateStr", "JSON", "stringify", "styles", "parse", "isExiting", "Boolean", "presenceContext", "usePresenceValue", "transition", "motiProps", "exit", "moti", "process", "env", "NODE_ENV", "console", "info"]
+  "mappings": "AAAA,SAASA,iBAAiBC,eAAeC,mBAAmB;AAG5D,SAASC,iBAAiB;AAC1B,SAA6BC,YAAYC,eAAe;AAGxD,OAAOC,YACLC,iBACAC,SACAC,qBACAC,kBACAC,iBACAC,gBACAC,YACAC,kBACK;;;;;;;;;;;;;;;;;;;;AA8BP,IAAMC,kBAAgF;EACpFC,WAAW;EACXC,SAAS;EACTC,QAAQ;EACRC,OAAO;EACPC,iBAAiB;EACjBC,aAAa;EACbC,iBAAiB;EACjBC,kBAAkB;EAClBC,gBAAgB;EAChBC,mBAAmB;EACnBC,cAAc;EACdC,qBAAqB;EACrBC,sBAAsB;EACtBC,wBAAwB;EACxBC,yBAAyB;EACzBC,iBAAiB;EACjBC,kBAAkB;EAClBC,gBAAgB;EAChBC,mBAAmB;EACnBC,OAAO;EACPC,MAAM;EACNC,OAAO;EACPC,KAAK;EACLC,QAAQ;AACV;AAEO,SAASC,iBACdC,YAAa;AAEb,SAAO;;;IAGLC,MAAMpC,SAASoC;IACfC,MAAMrC,SAASqC;IACfC,eAAe;IACfH;IACAvC;IACAD;IAEA4C,mBAAAA,SAAkBC,SAAO;AACvB,UAAMC,cAAcnC,eAAekC,OAAAA;AAEnC,aAAOzC,QACL,WAAA;eAAO;UACL2C,aAAAA,WAAAA;AACE;AACA,mBAAOD;UACT;UACAE,UAAAA,WAAAA;AACE;AACA,mBAAOF,YAAYG;UACrB;UACAC,UAAAA,SAASC,MAAI;AACX;gBADaC,SAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAAS;cAAEC,MAAM;YAAS,GAAGC,WAAAA,UAAAA,SAAAA,IAAAA,UAAAA,CAAAA,IAAAA;AAE1C,YAAIF,OAAOC,SAAS,YAClBP,YAAYG,QAAQE,MACpBG,YAAAA,QAAAA,SAAAA,KACSF,OAAOC,SAAS,WACzBP,YAAYG,QAAQrC,WAClBuC,MACAC,QACAE,WACI,WAAA;AACE;AACA/C,sBAAQ+C,QAAAA,EAAAA;YACV,IACAC,MAAAA,IAGNT,YAAYG,QAAQpC,WAClBsC,MACAC,QACAE,WACI,WAAA;AACE;AACA/C,sBAAQ+C,QAAAA,EAAAA;YACV,IACAC,MAAAA;UAGV;UACAC,MAAAA,WAAAA;AACE;AACAlD,4BAAgBwC,WAAAA;UAClB;QACF;SACA;QAACA;OAAY;IAEjB;IAEAW,2BAAAA,SAA0B,OAAWC,SAAO;UAAhBT,QAAF,MAAEA,OACpBU,WAAWV,MAAMF,YAAW;AAClC,aAAOvC;QACL,WAAA;AACE,iBAAOmD,SAASV;QAClB;QACA,SAACE,MAAMS,MAAAA;AACL,UAAIA,SAAST,QAGX5C,QAAQmD,OAAAA,EAASP,IAAAA;QAErB;;QAEA;UAACO;UAASC;;MAAS;IAEvB;;;;IAKAE,wBAAAA,SAAuBC,KAAKC,UAAQ;AAClC,UAAMJ,WAAWG,IAAIf,YAAW,GAG1BiB,eAAetD;QAAgB,WAAA;AACnC,iBAAOiD,SAASV;QAElB;;QAAG;UAACU;UAAUI;;MAAS;AAEvB,aAAOtD;QAAiB,WAAA;AACtB,iBAAOsD,SAASC,aAAaf,KAAK;QAEpC;;QAAG;UAACa;UAAKC;UAAUC;UAAcL;;MAAS;IAC5C;IAEAM,eAAe,SAACC,gBAAAA;AACd,UAAQC,QAAyDD,eAAzDC,OAAOC,WAAkDF,eAAlDE,UAAUC,QAAwCH,eAAxCG,OAAOC,eAAiCJ,eAAjCI,cAAcC,iBAAmBL,eAAnBK,gBACxCC,eAAeC,MAAMC,QAAQP,MAAMQ,SAAS,IAC9CR,MAAMQ,UAAU,CAAA,IAChBR,MAAMQ,WAEJC,cAAcL,eAAeM,cAAc,IAC7CC,UAAU,CAAC,GACXC,cAAc,CAAC;AAEnB,UAAIH;AACFG,sBAAcV;WACT;AACL,YAAMW,cAAcb,MAAMa;AAC1B,iBAAWC,OAAOZ,OAAO;AACvB,cAAMpB,QAAQoB,MAAMY,GAAAA;AACpB,UACE,CAACnE,gBAAgBmE,GAAAA,KACjBhC,UAAU,UACT,OAAOA,SAAU,YAAYA,MAAMiC,WAAW,MAAA,KAC9CF,eAAe,CAACA,YAAYG,SAASF,GAAAA,IAEtCF,YAAYE,GAAAA,IAAOhC,QAEnB6B,QAAQG,GAAAA,IAAOhC;QAEnB;MACF;AAGA,MAAIsB,eAAeM,cAAc,mBAC/BE,cAAcV;AAKhB,UAAMe,aAAaC,KAAKC,UAAUR,OAAAA,GAC5BS,SAASnF,QAAQ,WAAA;eAAMiF,KAAKG,MAAMJ,UAAAA;SAAa;QAACA;OAAW,GAE3DK,YAAYC,GAAQtB,YAAAA,QAAAA,SAAW,CAAA,IAC/BuB,kBAAkBxF,WAAWJ,eAAAA,GAC7B6F,mBAAoBxB,YAAYb,QAKhCsC,aAAajB,cACf;QAAEvB,MAAM;QAAcyC,UAAU;MAAE,IAClC,eAAA,CAAA,GACMtD,WAAWgC,YAAAA,CAAwC;AAG7D,UAAIC,MAAMC,QAAQP,MAAMQ,SAAS,GAAG;AAClC,YAAMvB,SAASe,MAAMQ,UAAU,CAAA;AAC/B,YAAIvB,UAAU,OAAOA,UAAW;AAC9B,mBAAW6B,QAAO7B,QAAQ;AACxB,gBAAMU,MAAMV,OAAO6B,IAAAA;AAEnB,YAAI,OAAOnB,OAAQ,WACjB+B,WAAWZ,IAAAA,IAAOzC,WAAWsB,GAAAA,IAE7B+B,WAAWZ,IAAAA,IAAOnB;UAEtB;MAEJ;AAEA,UAAMiC,YAAY;QAChBjB,SAASW,aAAalB,eAAeM,YAAY,CAAC,IAAIU;QACtDS,MAAMzB,eAAeM,YAAYU,SAAS,CAAC;QAC3CM;QACAD;QACAD;QACAM,MAAMR,YAAYF,SAAShC;MAC7B,GAEM2C,OAAOhG,UAAU6F,SAAAA;AAEvB,aAAII,QAAQC,IAAIC,aAAa,iBAAiBlC,MAAM,SAClDmC,QAAQC,KAAM,cAAalB,KAAKC,UAAUS,WAAW,MAAM,CAAA,IAAK,KAAK;QACnE7B;QACA6B;QACAG;QACA7B,OAAO;UAACU;UAAamB,KAAK7B;;MAC5B,CAAA,GAGK;QACLA,OAAO;UAACU;UAAamB,KAAK7B;;MAC5B;IACF;EACF;AACF;",
+  "names": ["PresenceContext", "ResetPresence", "usePresence", "useMotify", "useContext", "useMemo", "Animated", "cancelAnimation", "runOnJS", "useAnimatedReaction", "useAnimatedStyle", "useDerivedValue", "useSharedValue", "withSpring", "withTiming", "onlyAnimateKeys", "transform", "opacity", "height", "width", "backgroundColor", "borderColor", "borderLeftColor", "borderRightColor", "borderTopColor", "borderBottomColor", "borderRadius", "borderTopLeftRadius", "borderTopRightRadius", "borderBottomLeftRadius", "borderBottomRightRadius", "borderLeftWidth", "borderRightWidth", "borderTopWidth", "borderBottomWidth", "color", "left", "right", "top", "bottom", "createAnimations", "animations", "View", "Text", "isReactNative", "useAnimatedNumber", "initial", "sharedValue", "getInstance", "getValue", "value", "setValue", "next", "config", "type", "onFinish", "undefined", "stop", "useAnimatedNumberReaction", "onValue", "instance", "prev", "useAnimatedNumberStyle", "val", "getStyle", "derivedValue", "useAnimations", "animationProps", "props", "presence", "style", "onDidAnimate", "componentState", "animationKey", "Array", "isArray", "animation", "isHydrating", "unmounted", "animate", "dontAnimate", "animateOnly", "key", "startsWith", "includes", "animateStr", "JSON", "stringify", "styles", "parse", "isExiting", "Boolean", "presenceContext", "usePresenceValue", "transition", "duration", "motiProps", "from", "exit", "moti", "process", "env", "NODE_ENV", "console", "info"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/animations-moti",
-  "version": "1.99.0",
+  "version": "1.100.0",
   "source": "src/index.ts",
   "license": "MIT",
   "types": "./types/index.d.ts",
@@ -15,11 +15,11 @@
     "dist"
   ],
   "dependencies": {
-    "@tamagui/use-presence": "1.99.0",
-    "@tamagui/web": "1.99.0"
+    "@tamagui/use-presence": "1.100.0",
+    "@tamagui/web": "1.100.0"
   },
   "devDependencies": {
-    "@tamagui/build": "1.99.0",
+    "@tamagui/build": "1.100.0",
     "moti": "^0.29.0",
     "react": "^18.2.0",
     "react-native-reanimated": "3.11.0"

package/src/createAnimations.tsx

@@ -177,7 +177,7 @@ export function createAnimations<A extends Record<string, TransitionConfig>>(
         ? props.animation[0]
         : props.animation
 
-      const isHydrating = componentState.unmounted === 'should-enter'
+      const isHydrating = componentState.unmounted === true
       let animate = {}
       let dontAnimate = {}
 
@@ -190,6 +190,7 @@ export function createAnimations<A extends Record<string, TransitionConfig>>(
           if (
             !onlyAnimateKeys[key] ||
             value === 'auto' ||
+            (typeof value === 'string' && value.startsWith('calc')) ||
             (animateOnly && !animateOnly.includes(key))
           ) {
             dontAnimate[key] = value
@@ -199,6 +200,11 @@ export function createAnimations<A extends Record<string, TransitionConfig>>(
         }
       }
 
+      // if we don't do this moti seems to flicker a frame before applying animation
+      if (componentState.unmounted === 'should-enter') {
+        dontAnimate = style
+      }
+
       // without this, the driver breaks on native
       // stringifying -> parsing fixes that
       const animateStr = JSON.stringify(animate)
@@ -211,7 +217,11 @@ export function createAnimations<A extends Record<string, TransitionConfig>>(
       type UseMotiProps = Parameters<typeof useMotify>[0]
 
       // TODO moti is giving us type troubles, but this should work
-      const transition = animations[animationKey as keyof typeof animations] as any
+      const transition = isHydrating
+        ? { type: 'transition', duration: 0 }
+        : {
+            ...(animations[animationKey as keyof typeof animations] as any),
+          }
 
       if (Array.isArray(props.animation)) {
         const config = props.animation[1]
@@ -229,7 +239,8 @@ export function createAnimations<A extends Record<string, TransitionConfig>>(
       }
 
       const motiProps = {
-        animate: isExiting || isHydrating ? {} : styles,
+        animate: isExiting || componentState.unmounted ? {} : styles,
+        from: componentState.unmounted ? styles : {},
         transition,
         usePresenceValue,
         presenceContext,

package/types/createAnimations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createAnimations.d.ts","sourceRoot":"","sources":["../src/createAnimations.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAA2B,MAAM,cAAc,CAAA;AAC5E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,MAAM,CAAA;AAuE5C,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,EACzE,UAAU,EAAE,CAAC,GACZ,eAAe,CAAC,CAAC,CAAC,CAmLpB"}
+{"version":3,"file":"createAnimations.d.ts","sourceRoot":"","sources":["../src/createAnimations.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAA2B,MAAM,cAAc,CAAA;AAC5E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,MAAM,CAAA;AAuE5C,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,EACzE,UAAU,EAAE,CAAC,GACZ,eAAe,CAAC,CAAC,CAAC,CA8LpB"}