framer-motion 7.6.13 → 7.6.15

package/dist/cjs/index.js

@@ -2257,7 +2257,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.6.13";
+        this.version = "7.6.15";
         /**
          * Duration, in milliseconds, since last updating frame.
          *
@@ -3330,7 +3330,7 @@ function calcLength(axis) {
     return axis.max - axis.min;
 }
 function isNear(value, target = 0, maxDistance = 0.01) {
-    return popmotion.distance(value, target) < maxDistance;
+    return Math.abs(value - target) <= maxDistance;
 }
 function calcAxisDelta(delta, source, target, origin = 0.5) {
     delta.origin = origin;
@@ -3630,6 +3630,17 @@ function applyTreeDeltas(box, treeScale, treePath, isSharedTransition = false) {
             transformBox(box, node.latestValues);
         }
     }
+    /**
+     * Snap tree scale back to 1 if it's within a non-perceivable threshold.
+     * This will help reduce useless scales getting rendered.
+     */
+    treeScale.x = snapToDefault(treeScale.x);
+    treeScale.y = snapToDefault(treeScale.y);
+}
+function snapToDefault(scale) {
+    if (Number.isInteger(scale))
+        return scale;
+    return scale > 1.0000000000001 || scale < 0.999999999999 ? scale : 1;
 }
 function translateAxis(axis, distance) {
     axis.min = axis.min + distance;
@@ -4523,7 +4534,7 @@ function updateMotionValuesFromProps(element, next, prev) {
              * and warn against mismatches.
              */
             if (process.env.NODE_ENV === "development") {
-                warnOnce(nextValue.version === "7.6.13", `Attempting to mix Framer Motion versions ${nextValue.version} with 7.6.13 may not work as expected.`);
+                warnOnce(nextValue.version === "7.6.15", `Attempting to mix Framer Motion versions ${nextValue.version} with 7.6.15 may not work as expected.`);
             }
         }
         else if (isMotionValue(prevValue)) {
@@ -4677,17 +4688,6 @@ class VisualElement {
                 }
             }
         }
-        /**
-         * Update external values with initial values
-         */
-        if (props.values) {
-            for (const key in props.values) {
-                const value = props.values[key];
-                if (latestValues[key] !== undefined && isMotionValue(value)) {
-                    value.set(latestValues[key]);
-                }
-            }
-        }
     }
     /**
      * This method takes React props and returns found MotionValues. For example, HTML
@@ -5550,9 +5550,6 @@ function boxEquals(a, b) {
 function aspectRatio(box) {
     return calcLength(box.x) / calcLength(box.y);
 }
-function isCloseTo(a, b, max = 0.1) {
-    return popmotion.distance(a, b) <= max;
-}
 
 class NodeStack {
     constructor() {
@@ -7012,7 +7009,7 @@ function roundBox(box) {
 function shouldAnimatePositionOnly(animationType, snapshot, layout) {
     return (animationType === "position" ||
         (animationType === "preserve-aspect" &&
-            !isCloseTo(aspectRatio(snapshot), aspectRatio(layout), 0.2)));
+            !isNear(aspectRatio(snapshot), aspectRatio(layout), 0.2)));
 }
 
 const DocumentProjectionNode = createProjectionNode({

package/dist/es/projection/geometry/delta-apply.mjs

@@ -72,6 +72,17 @@ function applyTreeDeltas(box, treeScale, treePath, isSharedTransition = false) {
             transformBox(box, node.latestValues);
         }
     }
+    /**
+     * Snap tree scale back to 1 if it's within a non-perceivable threshold.
+     * This will help reduce useless scales getting rendered.
+     */
+    treeScale.x = snapToDefault(treeScale.x);
+    treeScale.y = snapToDefault(treeScale.y);
+}
+function snapToDefault(scale) {
+    if (Number.isInteger(scale))
+        return scale;
+    return scale > 1.0000000000001 || scale < 0.999999999999 ? scale : 1;
 }
 function translateAxis(axis, distance) {
     axis.min = axis.min + distance;

package/dist/es/projection/geometry/delta-calc.mjs

@@ -1,10 +1,10 @@
-import { mix, distance } from 'popmotion';
+import { mix } from 'popmotion';
 
 function calcLength(axis) {
     return axis.max - axis.min;
 }
 function isNear(value, target = 0, maxDistance = 0.01) {
-    return distance(value, target) < maxDistance;
+    return Math.abs(value - target) <= maxDistance;
 }
 function calcAxisDelta(delta, source, target, origin = 0.5) {
     delta.origin = origin;

package/dist/es/projection/geometry/utils.mjs

@@ -1,4 +1,3 @@
-import { distance } from 'popmotion';
 import { calcLength } from './delta-calc.mjs';
 
 function isAxisDeltaZero(delta) {
@@ -16,8 +15,5 @@ function boxEquals(a, b) {
 function aspectRatio(box) {
     return calcLength(box.x) / calcLength(box.y);
 }
-function isCloseTo(a, b, max = 0.1) {
-    return distance(a, b) <= max;
-}
 
-export { aspectRatio, boxEquals, isCloseTo, isDeltaZero };
+export { aspectRatio, boxEquals, isDeltaZero };

package/dist/es/projection/node/create-projection-node.mjs

@@ -5,11 +5,11 @@ import { SubscriptionManager } from '../../utils/subscription-manager.mjs';
 import { mixValues } from '../animation/mix-values.mjs';
 import { copyBoxInto } from '../geometry/copy.mjs';
 import { translateAxis, transformBox, applyBoxDelta, applyTreeDeltas } from '../geometry/delta-apply.mjs';
-import { calcRelativePosition, calcRelativeBox, calcBoxDelta, calcLength } from '../geometry/delta-calc.mjs';
+import { calcRelativePosition, calcRelativeBox, calcBoxDelta, calcLength, isNear } from '../geometry/delta-calc.mjs';
 import { removeBoxTransforms } from '../geometry/delta-remove.mjs';
 import { createBox, createDelta } from '../geometry/models.mjs';
 import { getValueTransition } from '../../animation/utils/transitions.mjs';
-import { boxEquals, isDeltaZero, isCloseTo, aspectRatio } from '../geometry/utils.mjs';
+import { boxEquals, isDeltaZero, aspectRatio } from '../geometry/utils.mjs';
 import { NodeStack } from '../shared/stack.mjs';
 import { scaleCorrectors } from '../styles/scale-correction.mjs';
 import { buildProjectionTransform } from '../styles/transform.mjs';
@@ -1308,7 +1308,7 @@ function roundBox(box) {
 function shouldAnimatePositionOnly(animationType, snapshot, layout) {
     return (animationType === "position" ||
         (animationType === "preserve-aspect" &&
-            !isCloseTo(aspectRatio(snapshot), aspectRatio(layout), 0.2)));
+            !isNear(aspectRatio(snapshot), aspectRatio(layout), 0.2)));
 }
 
 export { createProjectionNode, mixAxis, mixAxisDelta, mixBox, propagateDirtyNodes };

package/dist/es/render/VisualElement.mjs

@@ -134,17 +134,6 @@ class VisualElement {
                 }
             }
         }
-        /**
-         * Update external values with initial values
-         */
-        if (props.values) {
-            for (const key in props.values) {
-                const value = props.values[key];
-                if (latestValues[key] !== undefined && isMotionValue(value)) {
-                    value.set(latestValues[key]);
-                }
-            }
-        }
     }
     /**
      * This method takes React props and returns found MotionValues. For example, HTML

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.6.13", `Attempting to mix Framer Motion versions ${nextValue.version} with 7.6.13 may not work as expected.`);
+                warnOnce(nextValue.version === "7.6.15", `Attempting to mix Framer Motion versions ${nextValue.version} with 7.6.15 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.6.13";
+        this.version = "7.6.15";
         /**
          * Duration, in milliseconds, since last updating frame.
          *

package/dist/framer-motion.dev.js

@@ -3425,7 +3425,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.6.13";
+            this.version = "7.6.15";
             /**
              * Duration, in milliseconds, since last updating frame.
              *
@@ -4498,7 +4498,7 @@
         return axis.max - axis.min;
     }
     function isNear(value, target = 0, maxDistance = 0.01) {
-        return distance(value, target) < maxDistance;
+        return Math.abs(value - target) <= maxDistance;
     }
     function calcAxisDelta(delta, source, target, origin = 0.5) {
         delta.origin = origin;
@@ -4798,6 +4798,17 @@
                 transformBox(box, node.latestValues);
             }
         }
+        /**
+         * Snap tree scale back to 1 if it's within a non-perceivable threshold.
+         * This will help reduce useless scales getting rendered.
+         */
+        treeScale.x = snapToDefault(treeScale.x);
+        treeScale.y = snapToDefault(treeScale.y);
+    }
+    function snapToDefault(scale) {
+        if (Number.isInteger(scale))
+            return scale;
+        return scale > 1.0000000000001 || scale < 0.999999999999 ? scale : 1;
     }
     function translateAxis(axis, distance) {
         axis.min = axis.min + distance;
@@ -5691,7 +5702,7 @@
                  * and warn against mismatches.
                  */
                 {
-                    warnOnce(nextValue.version === "7.6.13", `Attempting to mix Framer Motion versions ${nextValue.version} with 7.6.13 may not work as expected.`);
+                    warnOnce(nextValue.version === "7.6.15", `Attempting to mix Framer Motion versions ${nextValue.version} with 7.6.15 may not work as expected.`);
                 }
             }
             else if (isMotionValue(prevValue)) {
@@ -5845,17 +5856,6 @@
                     }
                 }
             }
-            /**
-             * Update external values with initial values
-             */
-            if (props.values) {
-                for (const key in props.values) {
-                    const value = props.values[key];
-                    if (latestValues[key] !== undefined && isMotionValue(value)) {
-                        value.set(latestValues[key]);
-                    }
-                }
-            }
         }
         /**
          * This method takes React props and returns found MotionValues. For example, HTML
@@ -6718,9 +6718,6 @@
     function aspectRatio(box) {
         return calcLength(box.x) / calcLength(box.y);
     }
-    function isCloseTo(a, b, max = 0.1) {
-        return distance(a, b) <= max;
-    }
 
     class NodeStack {
         constructor() {
@@ -8180,7 +8177,7 @@
     function shouldAnimatePositionOnly(animationType, snapshot, layout) {
         return (animationType === "position" ||
             (animationType === "preserve-aspect" &&
-                !isCloseTo(aspectRatio(snapshot), aspectRatio(layout), 0.2)));
+                !isNear(aspectRatio(snapshot), aspectRatio(layout), 0.2)));
     }
 
     const DocumentProjectionNode = createProjectionNode({