framer-motion 7.5.1 → 7.5.3

package/dist/cjs/index.js

@@ -2245,7 +2245,7 @@ class MotionValue {
          * This will be replaced by the build step with the latest version number.
          * When MotionValues are provided to motion components, warn if versions are mixed.
          */
-        this.version = "7.5.1";
+        this.version = "7.5.3";
         /**
          * Duration, in milliseconds, since last updating frame.
          *
@@ -4221,7 +4221,7 @@ function updateMotionValuesFromProps(element, next, prev) {
              * and warn against mismatches.
              */
             if (process.env.NODE_ENV === "development") {
-                warnOnce(nextValue.version === "7.5.1", `Attempting to mix Framer Motion versions ${nextValue.version} with 7.5.1 may not work as expected.`);
+                warnOnce(nextValue.version === "7.5.3", `Attempting to mix Framer Motion versions ${nextValue.version} with 7.5.3 may not work as expected.`);
             }
         }
         else if (isMotionValue(prevValue)) {
@@ -4300,6 +4300,10 @@ const visualElement = ({ treeType = "", build, getBaseTarget, makeTargetAnimatab
     const baseTarget = {
         ...latestValues,
     };
+    /**
+     * Create an object of the values we initially animated from (if initial prop present).
+     */
+    const initialValues = props.initial ? { ...latestValues } : {};
     // Internal methods ========================
     /**
      * On mount, this will be hydrated with a callback to disconnect
@@ -4361,8 +4365,9 @@ const visualElement = ({ treeType = "", build, getBaseTarget, makeTargetAnimatab
      */
     if (props.values) {
         for (const key in props.values) {
-            if (latestValues[key] !== undefined) {
-                props.values[key].set(latestValues[key]);
+            const value = props.values[key];
+            if (latestValues[key] !== undefined && isMotionValue(value)) {
+                value.set(latestValues[key]);
             }
         }
     }
@@ -4645,12 +4650,34 @@ const visualElement = ({ treeType = "", build, getBaseTarget, makeTargetAnimatab
          * props.
          */
         getBaseTarget(key) {
+            var _a;
+            const { initial } = props;
+            const valueFromInitial = typeof initial === "string" || typeof initial === "object"
+                ? (_a = resolveVariantFromProps(props, initial)) === null || _a === void 0 ? void 0 : _a[key]
+                : undefined;
+            /**
+             * If this value still exists in the current initial variant, read that.
+             */
+            if (initial && valueFromInitial !== undefined) {
+                return valueFromInitial;
+            }
+            /**
+             * Alternatively, if this VisualElement config has defined a getBaseTarget
+             * so we can read the value from an alternative source, try that.
+             */
             if (getBaseTarget) {
                 const target = getBaseTarget(props, key);
                 if (target !== undefined && !isMotionValue(target))
                     return target;
             }
-            return baseTarget[key];
+            /**
+             * If the value was initially defined on initial, but it doesn't any more,
+             * return undefined. Otherwise return the value as initially read from the DOM.
+             */
+            return initialValues[key] !== undefined &&
+                valueFromInitial === undefined
+                ? undefined
+                : baseTarget[key];
         },
         // Lifecyles ========================
         ...lifecycles,

package/dist/es/render/index.mjs

@@ -14,6 +14,7 @@ import { invariant } from 'hey-listen';
 import { featureDefinitions } from '../motion/features/definitions.mjs';
 import { createElement } from 'react';
 import { isRefObject } from '../utils/is-ref-object.mjs';
+import { resolveVariantFromProps } from './utils/resolve-variants.mjs';
 
 const featureNames = Object.keys(featureDefinitions);
 const numFeatures = featureNames.length;
@@ -56,6 +57,10 @@ const visualElement = ({ treeType = "", build, getBaseTarget, makeTargetAnimatab
     const baseTarget = {
         ...latestValues,
     };
+    /**
+     * Create an object of the values we initially animated from (if initial prop present).
+     */
+    const initialValues = props.initial ? { ...latestValues } : {};
     // Internal methods ========================
     /**
      * On mount, this will be hydrated with a callback to disconnect
@@ -117,8 +122,9 @@ const visualElement = ({ treeType = "", build, getBaseTarget, makeTargetAnimatab
      */
     if (props.values) {
         for (const key in props.values) {
-            if (latestValues[key] !== undefined) {
-                props.values[key].set(latestValues[key]);
+            const value = props.values[key];
+            if (latestValues[key] !== undefined && isMotionValue(value)) {
+                value.set(latestValues[key]);
             }
         }
     }
@@ -401,12 +407,34 @@ const visualElement = ({ treeType = "", build, getBaseTarget, makeTargetAnimatab
          * props.
          */
         getBaseTarget(key) {
+            var _a;
+            const { initial } = props;
+            const valueFromInitial = typeof initial === "string" || typeof initial === "object"
+                ? (_a = resolveVariantFromProps(props, initial)) === null || _a === void 0 ? void 0 : _a[key]
+                : undefined;
+            /**
+             * If this value still exists in the current initial variant, read that.
+             */
+            if (initial && valueFromInitial !== undefined) {
+                return valueFromInitial;
+            }
+            /**
+             * Alternatively, if this VisualElement config has defined a getBaseTarget
+             * so we can read the value from an alternative source, try that.
+             */
             if (getBaseTarget) {
                 const target = getBaseTarget(props, key);
                 if (target !== undefined && !isMotionValue(target))
                     return target;
             }
-            return baseTarget[key];
+            /**
+             * If the value was initially defined on initial, but it doesn't any more,
+             * return undefined. Otherwise return the value as initially read from the DOM.
+             */
+            return initialValues[key] !== undefined &&
+                valueFromInitial === undefined
+                ? undefined
+                : baseTarget[key];
         },
         // Lifecyles ========================
         ...lifecycles,

package/dist/es/render/utils/motion-values.mjs

@@ -22,7 +22,7 @@ function updateMotionValuesFromProps(element, next, prev) {
              * and warn against mismatches.
              */
             if (process.env.NODE_ENV === "development") {
-                warnOnce(nextValue.version === "7.5.1", `Attempting to mix Framer Motion versions ${nextValue.version} with 7.5.1 may not work as expected.`);
+                warnOnce(nextValue.version === "7.5.3", `Attempting to mix Framer Motion versions ${nextValue.version} with 7.5.3 may not work as expected.`);
             }
         }
         else if (isMotionValue(prevValue)) {

package/dist/es/value/index.mjs

@@ -24,7 +24,7 @@ class MotionValue {
          * This will be replaced by the build step with the latest version number.
          * When MotionValues are provided to motion components, warn if versions are mixed.
          */
-        this.version = "7.5.1";
+        this.version = "7.5.3";
         /**
          * Duration, in milliseconds, since last updating frame.
          *

package/dist/framer-motion.dev.js

@@ -3413,7 +3413,7 @@
              * This will be replaced by the build step with the latest version number.
              * When MotionValues are provided to motion components, warn if versions are mixed.
              */
-            this.version = "7.5.1";
+            this.version = "7.5.3";
             /**
              * Duration, in milliseconds, since last updating frame.
              *
@@ -5389,7 +5389,7 @@
                  * and warn against mismatches.
                  */
                 {
-                    warnOnce(nextValue.version === "7.5.1", `Attempting to mix Framer Motion versions ${nextValue.version} with 7.5.1 may not work as expected.`);
+                    warnOnce(nextValue.version === "7.5.3", `Attempting to mix Framer Motion versions ${nextValue.version} with 7.5.3 may not work as expected.`);
                 }
             }
             else if (isMotionValue(prevValue)) {
@@ -5468,6 +5468,10 @@
         const baseTarget = {
             ...latestValues,
         };
+        /**
+         * Create an object of the values we initially animated from (if initial prop present).
+         */
+        const initialValues = props.initial ? { ...latestValues } : {};
         // Internal methods ========================
         /**
          * On mount, this will be hydrated with a callback to disconnect
@@ -5529,8 +5533,9 @@
          */
         if (props.values) {
             for (const key in props.values) {
-                if (latestValues[key] !== undefined) {
-                    props.values[key].set(latestValues[key]);
+                const value = props.values[key];
+                if (latestValues[key] !== undefined && isMotionValue(value)) {
+                    value.set(latestValues[key]);
                 }
             }
         }
@@ -5813,12 +5818,34 @@
              * props.
              */
             getBaseTarget(key) {
+                var _a;
+                const { initial } = props;
+                const valueFromInitial = typeof initial === "string" || typeof initial === "object"
+                    ? (_a = resolveVariantFromProps(props, initial)) === null || _a === void 0 ? void 0 : _a[key]
+                    : undefined;
+                /**
+                 * If this value still exists in the current initial variant, read that.
+                 */
+                if (initial && valueFromInitial !== undefined) {
+                    return valueFromInitial;
+                }
+                /**
+                 * Alternatively, if this VisualElement config has defined a getBaseTarget
+                 * so we can read the value from an alternative source, try that.
+                 */
                 if (getBaseTarget) {
                     const target = getBaseTarget(props, key);
                     if (target !== undefined && !isMotionValue(target))
                         return target;
                 }
-                return baseTarget[key];
+                /**
+                 * If the value was initially defined on initial, but it doesn't any more,
+                 * return undefined. Otherwise return the value as initially read from the DOM.
+                 */
+                return initialValues[key] !== undefined &&
+                    valueFromInitial === undefined
+                    ? undefined
+                    : baseTarget[key];
             },
             // Lifecyles ========================
             ...lifecycles,