framer-motion 8.3.0 → 8.3.2

package/dist/cjs/index.js

@@ -1547,6 +1547,7 @@ function useTapGesture({ onTap, onTapStart, onTapCancel, whileTap, visualElement
         return !isDragActive();
     }
     function onPointerUp(event, info) {
+        var _a, _b, _c, _d;
         if (!checkPointerEnd())
             return;
         /**
@@ -1554,15 +1555,17 @@ function useTapGesture({ onTap, onTapStart, onTapCancel, whileTap, visualElement
          * as, or a child of, this component's element
          */
         !isNodeOrChild(visualElement.current, event.target)
-            ? onTapCancel && onTapCancel(event, info)
-            : onTap && onTap(event, info);
+            ? (_b = (_a = visualElement.getProps()).onTapCancel) === null || _b === void 0 ? void 0 : _b.call(_a, event, info)
+            : (_d = (_c = visualElement.getProps()).onTap) === null || _d === void 0 ? void 0 : _d.call(_c, event, info);
     }
     function onPointerCancel(event, info) {
+        var _a, _b;
         if (!checkPointerEnd())
             return;
-        onTapCancel && onTapCancel(event, info);
+        (_b = (_a = visualElement.getProps()).onTapCancel) === null || _b === void 0 ? void 0 : _b.call(_a, event, info);
     }
     const startPress = React.useCallback((event, info) => {
+        var _a, _b;
         removePointerEndListener();
         if (isPressing.current)
             return;
@@ -1573,8 +1576,8 @@ function useTapGesture({ onTap, onTapStart, onTapCancel, whileTap, visualElement
          */
         visualElement.animationState &&
             visualElement.animationState.setActive(exports.AnimationType.Tap, true);
-        onTapStart && onTapStart(event, info);
-    }, [onTapStart, visualElement]);
+        (_b = (_a = visualElement.getProps()).onTapStart) === null || _b === void 0 ? void 0 : _b.call(_a, event, info);
+    }, [Boolean(onTapStart), visualElement]);
     usePointerEvent(visualElement, "pointerdown", hasPressListeners ? startPress : undefined, eventOptions);
     useUnmountEffect(removePointerEndListener);
 }
@@ -2072,7 +2075,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 = "8.3.0";
+        this.version = "8.3.2";
         /**
          * Duration, in milliseconds, since last updating frame.
          *
@@ -5928,7 +5931,7 @@ function updateMotionValuesFromProps(element, next, prev) {
              * and warn against mismatches.
              */
             if (process.env.NODE_ENV === "development") {
-                warnOnce(nextValue.version === "8.3.0", `Attempting to mix Framer Motion versions ${nextValue.version} with 8.3.0 may not work as expected.`);
+                warnOnce(nextValue.version === "8.3.2", `Attempting to mix Framer Motion versions ${nextValue.version} with 8.3.2 may not work as expected.`);
             }
         }
         else if (isMotionValue(prevValue)) {
@@ -9208,12 +9211,13 @@ function useMotionTemplate(fragments, ...values) {
         for (let i = 0; i < numFragments; i++) {
             output += fragments[i];
             const value = values[i];
-            if (value)
-                output += values[i].get();
+            if (value) {
+                output += isMotionValue(value) ? value.get() : value;
+            }
         }
         return output;
     }
-    return useCombineMotionValues(values, buildValue);
+    return useCombineMotionValues(values.filter(isMotionValue), buildValue);
 }
 
 /**

package/dist/es/gestures/use-tap-gesture.mjs

@@ -35,6 +35,7 @@ function useTapGesture({ onTap, onTapStart, onTapCancel, whileTap, visualElement
         return !isDragActive();
     }
     function onPointerUp(event, info) {
+        var _a, _b, _c, _d;
         if (!checkPointerEnd())
             return;
         /**
@@ -42,15 +43,17 @@ function useTapGesture({ onTap, onTapStart, onTapCancel, whileTap, visualElement
          * as, or a child of, this component's element
          */
         !isNodeOrChild(visualElement.current, event.target)
-            ? onTapCancel && onTapCancel(event, info)
-            : onTap && onTap(event, info);
+            ? (_b = (_a = visualElement.getProps()).onTapCancel) === null || _b === void 0 ? void 0 : _b.call(_a, event, info)
+            : (_d = (_c = visualElement.getProps()).onTap) === null || _d === void 0 ? void 0 : _d.call(_c, event, info);
     }
     function onPointerCancel(event, info) {
+        var _a, _b;
         if (!checkPointerEnd())
             return;
-        onTapCancel && onTapCancel(event, info);
+        (_b = (_a = visualElement.getProps()).onTapCancel) === null || _b === void 0 ? void 0 : _b.call(_a, event, info);
     }
     const startPress = useCallback((event, info) => {
+        var _a, _b;
         removePointerEndListener();
         if (isPressing.current)
             return;
@@ -61,8 +64,8 @@ function useTapGesture({ onTap, onTapStart, onTapCancel, whileTap, visualElement
          */
         visualElement.animationState &&
             visualElement.animationState.setActive(AnimationType.Tap, true);
-        onTapStart && onTapStart(event, info);
-    }, [onTapStart, visualElement]);
+        (_b = (_a = visualElement.getProps()).onTapStart) === null || _b === void 0 ? void 0 : _b.call(_a, event, info);
+    }, [Boolean(onTapStart), visualElement]);
     usePointerEvent(visualElement, "pointerdown", hasPressListeners ? startPress : undefined, eventOptions);
     useUnmountEffect(removePointerEndListener);
 }

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 === "8.3.0", `Attempting to mix Framer Motion versions ${nextValue.version} with 8.3.0 may not work as expected.`);
+                warnOnce(nextValue.version === "8.3.2", `Attempting to mix Framer Motion versions ${nextValue.version} with 8.3.2 may not work as expected.`);
             }
         }
         else if (isMotionValue(prevValue)) {

package/dist/es/value/index.mjs

@@ -25,7 +25,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 = "8.3.0";
+        this.version = "8.3.2";
         /**
          * Duration, in milliseconds, since last updating frame.
          *

package/dist/es/value/use-motion-template.mjs

@@ -1,4 +1,5 @@
 import { useCombineMotionValues } from './use-combine-values.mjs';
+import { isMotionValue } from './utils/is-motion-value.mjs';
 
 /**
  * Combine multiple motion values into a new one using a string template literal.
@@ -32,12 +33,13 @@ function useMotionTemplate(fragments, ...values) {
         for (let i = 0; i < numFragments; i++) {
             output += fragments[i];
             const value = values[i];
-            if (value)
-                output += values[i].get();
+            if (value) {
+                output += isMotionValue(value) ? value.get() : value;
+            }
         }
         return output;
     }
-    return useCombineMotionValues(values, buildValue);
+    return useCombineMotionValues(values.filter(isMotionValue), buildValue);
 }
 
 export { useMotionTemplate };

package/dist/framer-motion.dev.js

@@ -1545,6 +1545,7 @@
             return !isDragActive();
         }
         function onPointerUp(event, info) {
+            var _a, _b, _c, _d;
             if (!checkPointerEnd())
                 return;
             /**
@@ -1552,15 +1553,17 @@
              * as, or a child of, this component's element
              */
             !isNodeOrChild(visualElement.current, event.target)
-                ? onTapCancel && onTapCancel(event, info)
-                : onTap && onTap(event, info);
+                ? (_b = (_a = visualElement.getProps()).onTapCancel) === null || _b === void 0 ? void 0 : _b.call(_a, event, info)
+                : (_d = (_c = visualElement.getProps()).onTap) === null || _d === void 0 ? void 0 : _d.call(_c, event, info);
         }
         function onPointerCancel(event, info) {
+            var _a, _b;
             if (!checkPointerEnd())
                 return;
-            onTapCancel && onTapCancel(event, info);
+            (_b = (_a = visualElement.getProps()).onTapCancel) === null || _b === void 0 ? void 0 : _b.call(_a, event, info);
         }
         const startPress = React.useCallback((event, info) => {
+            var _a, _b;
             removePointerEndListener();
             if (isPressing.current)
                 return;
@@ -1571,8 +1574,8 @@
              */
             visualElement.animationState &&
                 visualElement.animationState.setActive(exports.AnimationType.Tap, true);
-            onTapStart && onTapStart(event, info);
-        }, [onTapStart, visualElement]);
+            (_b = (_a = visualElement.getProps()).onTapStart) === null || _b === void 0 ? void 0 : _b.call(_a, event, info);
+        }, [Boolean(onTapStart), visualElement]);
         usePointerEvent(visualElement, "pointerdown", hasPressListeners ? startPress : undefined, eventOptions);
         useUnmountEffect(removePointerEndListener);
     }
@@ -2070,7 +2073,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 = "8.3.0";
+            this.version = "8.3.2";
             /**
              * Duration, in milliseconds, since last updating frame.
              *
@@ -5941,7 +5944,7 @@
                  * and warn against mismatches.
                  */
                 {
-                    warnOnce(nextValue.version === "8.3.0", `Attempting to mix Framer Motion versions ${nextValue.version} with 8.3.0 may not work as expected.`);
+                    warnOnce(nextValue.version === "8.3.2", `Attempting to mix Framer Motion versions ${nextValue.version} with 8.3.2 may not work as expected.`);
                 }
             }
             else if (isMotionValue(prevValue)) {
@@ -9219,12 +9222,13 @@
             for (let i = 0; i < numFragments; i++) {
                 output += fragments[i];
                 const value = values[i];
-                if (value)
-                    output += values[i].get();
+                if (value) {
+                    output += isMotionValue(value) ? value.get() : value;
+                }
             }
             return output;
         }
-        return useCombineMotionValues(values, buildValue);
+        return useCombineMotionValues(values.filter(isMotionValue), buildValue);
     }
 
     /**