framer-motion 11.2.0 → 11.2.2

package/dist/framer-motion.dev.js

@@ -1301,12 +1301,21 @@
         return newValues;
     }
 
-    function resolveVariantFromProps(props, definition, custom, currentValues = {}, currentVelocity = {}) {
+    function getValueState(visualElement) {
+        const state = [{}, {}];
+        visualElement === null || visualElement === void 0 ? void 0 : visualElement.values.forEach((value, key) => {
+            state[0][key] = value.get();
+            state[1][key] = value.getVelocity();
+        });
+        return state;
+    }
+    function resolveVariantFromProps(props, definition, custom, visualElement) {
         /**
          * If the variant definition is a function, resolve.
          */
         if (typeof definition === "function") {
-            definition = definition(custom !== undefined ? custom : props.custom, currentValues, currentVelocity);
+            const [current, velocity] = getValueState(visualElement);
+            definition = definition(custom !== undefined ? custom : props.custom, current, velocity);
         }
         /**
          * If the variant definition is a variant label, or
@@ -1321,7 +1330,8 @@
          * If so, resolve. This can only have returned a valid target object.
          */
         if (typeof definition === "function") {
-            definition = definition(custom !== undefined ? custom : props.custom, currentValues, currentVelocity);
+            const [current, velocity] = getValueState(visualElement);
+            definition = definition(custom !== undefined ? custom : props.custom, current, velocity);
         }
         return definition;
     }
@@ -1943,25 +1953,9 @@
         return true;
     }
 
-    /**
-     * Creates an object containing the latest state of every MotionValue on a VisualElement
-     */
-    function getCurrent(visualElement) {
-        const current = {};
-        visualElement.values.forEach((value, key) => (current[key] = value.get()));
-        return current;
-    }
-    /**
-     * Creates an object containing the latest velocity of every MotionValue on a VisualElement
-     */
-    function getVelocity$1(visualElement) {
-        const velocity = {};
-        visualElement.values.forEach((value, key) => (velocity[key] = value.getVelocity()));
-        return velocity;
-    }
     function resolveVariant(visualElement, definition, custom) {
         const props = visualElement.getProps();
-        return resolveVariantFromProps(props, definition, custom !== undefined ? custom : props.custom, getCurrent(visualElement), getVelocity$1(visualElement));
+        return resolveVariantFromProps(props, definition, custom !== undefined ? custom : props.custom, visualElement);
     }
 
     /**
@@ -4639,7 +4633,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 = "11.2.0";
+            this.version = "11.2.2";
             /**
              * Tracks whether this value can output a velocity. Currently this is only true
              * if the value is numerical, but we might be able to widen the scope here and support
@@ -4984,7 +4978,7 @@
                 const props = visualElement.getProps();
                 const appearId = props[optimizedAppearDataAttribute];
                 if (appearId) {
-                    const elapsed = window.HandoffAppearAnimations(appearId, key);
+                    const elapsed = window.HandoffAppearAnimations(appearId, key, value, frame);
                     if (elapsed !== null) {
                         valueTransition.elapsed = elapsed;
                         isHandoff = true;
@@ -7102,7 +7096,7 @@
                  * and warn against mismatches.
                  */
                 {
-                    warnOnce(nextValue.version === "11.2.0", `Attempting to mix Framer Motion versions ${nextValue.version} with 11.2.0 may not work as expected.`);
+                    warnOnce(nextValue.version === "11.2.2", `Attempting to mix Framer Motion versions ${nextValue.version} with 11.2.2 may not work as expected.`);
                 }
             }
             else if (isMotionValue(prevValue)) {
@@ -11970,7 +11964,7 @@
      *
      * Remove in early 2024.
      */
-    _value, _frame) {
+    _value, frame) {
         const optimisedValueName = transformProps.has(valueName)
             ? "transform"
             : valueName;
@@ -11982,10 +11976,31 @@
         const { animation, startTime } = optimisedAnimation;
         const cancelAnimation = () => {
             appearAnimationStore.delete(storeId);
-            try {
-                animation.cancel();
+            if (frame) {
+                /**
+                 * If we've been provided the frameloop as an argument, use it to defer
+                 * cancellation until keyframes of the subsequent animation have been resolved.
+                 * This "papers over" a gap where the JS animations haven't rendered with
+                 * the latest time after a potential heavy blocking workload.
+                 * Otherwise cancel immediately.
+                 *
+                 * This is an optional dependency to deal with the fact that this inline
+                 * script and the library can be version sharded, and there have been
+                 * times when this isn't provided as an argument.
+                 */
+                frame.render(() => frame.render(() => {
+                    try {
+                        animation.cancel();
+                    }
+                    catch (error) { }
+                }));
+            }
+            else {
+                try {
+                    animation.cancel();
+                }
+                catch (error) { }
             }
-            catch (error) { }
         };
         /**
          * If the startTime is null, this animation is the Paint Ready detection animation