framer-motion 6.2.5 → 6.2.8

package/dist/cjs/index.js

@@ -4351,9 +4351,15 @@ var gestureAnimations = {
 
 var counter = 0;
 var incrementId = function () { return counter++; };
-var useId = React__namespace.useId
-    ? React__namespace.useId
-    : function () { return useConstant(incrementId); };
+var useId = function () { return useConstant(incrementId); };
+/**
+ * Ideally we'd use the following code to support React 18 optionally.
+ * But this fairly fails in Webpack (otherwise treeshaking wouldn't work at all).
+ * Need to come up with a different way of figuring this out.
+ */
+// export const useId = (React as any).useId
+//     ? (React as any).useId
+//     : () => useConstant(incrementId)
 
 /**
  * When a component is the child of `AnimatePresence`, it can use `usePresence`
@@ -5008,7 +5014,11 @@ function createAnimationState(visualElement) {
         // Propagate active change to children
         (_a = visualElement.variantChildren) === null || _a === void 0 ? void 0 : _a.forEach(function (child) { var _a; return (_a = child.animationState) === null || _a === void 0 ? void 0 : _a.setActive(type, isActive); });
         state[type].isActive = isActive;
-        return animateChanges(options, type);
+        var animations = animateChanges(options, type);
+        for (var key in state) {
+            state[key].protectedKeys = {};
+        }
+        return animations;
     }
     return {
         isAnimated: isAnimated,
@@ -7104,7 +7114,7 @@ var m = createMotionProxy(createDomMotionConfig);
 
 function useIsMounted() {
     var isMounted = React.useRef(false);
-    React.useLayoutEffect(function () {
+    useIsomorphicLayoutEffect(function () {
         isMounted.current = true;
         return function () {
             isMounted.current = false;
@@ -7362,21 +7372,28 @@ function nodeGroup() {
     };
 }
 
+var shouldInheritGroup = function (inherit) { return inherit === true; };
+var shouldInheritId = function (inherit) {
+    return shouldInheritGroup(inherit === true) || inherit === "id";
+};
 var LayoutGroup = function (_a) {
     var _b, _c;
-    var children = _a.children, id = _a.id, _d = _a.inheritId, inheritId = _d === void 0 ? true : _d;
+    var children = _a.children, id = _a.id, inheritId = _a.inheritId, _d = _a.inherit, inherit = _d === void 0 ? true : _d;
+    // Maintain backwards-compatibility with inheritId until 7.0
+    if (inheritId !== undefined)
+        inherit = inheritId;
     var layoutGroupContext = React.useContext(LayoutGroupContext);
     var deprecatedLayoutGroupContext = React.useContext(DeprecatedLayoutGroupContext);
     var _e = tslib.__read(useForceUpdate(), 2), forceRender = _e[0], key = _e[1];
     var context = React.useRef(null);
     var upstreamId = (_b = layoutGroupContext.id) !== null && _b !== void 0 ? _b : deprecatedLayoutGroupContext;
     if (context.current === null) {
-        if (inheritId && upstreamId) {
+        if (shouldInheritId(inherit) && upstreamId) {
             id = id ? upstreamId + "-" + id : upstreamId;
         }
         context.current = {
             id: id,
-            group: inheritId
+            group: shouldInheritGroup(inherit)
                 ? (_c = layoutGroupContext === null || layoutGroupContext === void 0 ? void 0 : layoutGroupContext.group) !== null && _c !== void 0 ? _c : nodeGroup()
                 : nodeGroup(),
         };

package/dist/es/components/LayoutGroup/index.mjs

@@ -6,21 +6,28 @@ import { DeprecatedLayoutGroupContext } from '../../context/DeprecatedLayoutGrou
 import { useForceUpdate } from '../../utils/use-force-update.mjs';
 import { nodeGroup } from '../../projection/node/group.mjs';
 
+var shouldInheritGroup = function (inherit) { return inherit === true; };
+var shouldInheritId = function (inherit) {
+    return shouldInheritGroup(inherit === true) || inherit === "id";
+};
 var LayoutGroup = function (_a) {
     var _b, _c;
-    var children = _a.children, id = _a.id, _d = _a.inheritId, inheritId = _d === void 0 ? true : _d;
+    var children = _a.children, id = _a.id, inheritId = _a.inheritId, _d = _a.inherit, inherit = _d === void 0 ? true : _d;
+    // Maintain backwards-compatibility with inheritId until 7.0
+    if (inheritId !== undefined)
+        inherit = inheritId;
     var layoutGroupContext = useContext(LayoutGroupContext);
     var deprecatedLayoutGroupContext = useContext(DeprecatedLayoutGroupContext);
     var _e = __read(useForceUpdate(), 2), forceRender = _e[0], key = _e[1];
     var context = useRef(null);
     var upstreamId = (_b = layoutGroupContext.id) !== null && _b !== void 0 ? _b : deprecatedLayoutGroupContext;
     if (context.current === null) {
-        if (inheritId && upstreamId) {
+        if (shouldInheritId(inherit) && upstreamId) {
             id = id ? upstreamId + "-" + id : upstreamId;
         }
         context.current = {
             id: id,
-            group: inheritId
+            group: shouldInheritGroup(inherit)
                 ? (_c = layoutGroupContext === null || layoutGroupContext === void 0 ? void 0 : layoutGroupContext.group) !== null && _c !== void 0 ? _c : nodeGroup()
                 : nodeGroup(),
         };

package/dist/es/render/utils/animation-state.mjs

@@ -294,7 +294,11 @@ function createAnimationState(visualElement) {
         // Propagate active change to children
         (_a = visualElement.variantChildren) === null || _a === void 0 ? void 0 : _a.forEach(function (child) { var _a; return (_a = child.animationState) === null || _a === void 0 ? void 0 : _a.setActive(type, isActive); });
         state[type].isActive = isActive;
-        return animateChanges(options, type);
+        var animations = animateChanges(options, type);
+        for (var key in state) {
+            state[key].protectedKeys = {};
+        }
+        return animations;
     }
     return {
         isAnimated: isAnimated,

package/dist/es/utils/use-id.mjs

@@ -1,10 +1,15 @@
-import * as React from 'react';
 import { useConstant } from './use-constant.mjs';
 
 var counter = 0;
 var incrementId = function () { return counter++; };
-var useId = React.useId
-    ? React.useId
-    : function () { return useConstant(incrementId); };
+var useId = function () { return useConstant(incrementId); };
+/**
+ * Ideally we'd use the following code to support React 18 optionally.
+ * But this fairly fails in Webpack (otherwise treeshaking wouldn't work at all).
+ * Need to come up with a different way of figuring this out.
+ */
+// export const useId = (React as any).useId
+//     ? (React as any).useId
+//     : () => useConstant(incrementId)
 
 export { useId };

package/dist/es/utils/use-is-mounted.mjs

@@ -1,8 +1,9 @@
-import { useRef, useLayoutEffect } from 'react';
+import { useRef } from 'react';
+import { useIsomorphicLayoutEffect } from './use-isomorphic-effect.mjs';
 
 function useIsMounted() {
     var isMounted = useRef(false);
-    useLayoutEffect(function () {
+    useIsomorphicLayoutEffect(function () {
         isMounted.current = true;
         return function () {
             isMounted.current = false;

package/dist/framer-motion.dev.js

@@ -5584,9 +5584,15 @@
 
     var counter = 0;
     var incrementId = function () { return counter++; };
-    var useId = React__namespace.useId
-        ? React__namespace.useId
-        : function () { return useConstant(incrementId); };
+    var useId = function () { return useConstant(incrementId); };
+    /**
+     * Ideally we'd use the following code to support React 18 optionally.
+     * But this fairly fails in Webpack (otherwise treeshaking wouldn't work at all).
+     * Need to come up with a different way of figuring this out.
+     */
+    // export const useId = (React as any).useId
+    //     ? (React as any).useId
+    //     : () => useConstant(incrementId)
 
     /**
      * When a component is the child of `AnimatePresence`, it can use `usePresence`
@@ -6241,7 +6247,11 @@
             // Propagate active change to children
             (_a = visualElement.variantChildren) === null || _a === void 0 ? void 0 : _a.forEach(function (child) { var _a; return (_a = child.animationState) === null || _a === void 0 ? void 0 : _a.setActive(type, isActive); });
             state[type].isActive = isActive;
-            return animateChanges(options, type);
+            var animations = animateChanges(options, type);
+            for (var key in state) {
+                state[key].protectedKeys = {};
+            }
+            return animations;
         }
         return {
             isAnimated: isAnimated,
@@ -8337,7 +8347,7 @@
 
     function useIsMounted() {
         var isMounted = React.useRef(false);
-        React.useLayoutEffect(function () {
+        useIsomorphicLayoutEffect(function () {
             isMounted.current = true;
             return function () {
                 isMounted.current = false;
@@ -8593,21 +8603,28 @@
         };
     }
 
+    var shouldInheritGroup = function (inherit) { return inherit === true; };
+    var shouldInheritId = function (inherit) {
+        return shouldInheritGroup(inherit === true) || inherit === "id";
+    };
     var LayoutGroup = function (_a) {
         var _b, _c;
-        var children = _a.children, id = _a.id, _d = _a.inheritId, inheritId = _d === void 0 ? true : _d;
+        var children = _a.children, id = _a.id, inheritId = _a.inheritId, _d = _a.inherit, inherit = _d === void 0 ? true : _d;
+        // Maintain backwards-compatibility with inheritId until 7.0
+        if (inheritId !== undefined)
+            inherit = inheritId;
         var layoutGroupContext = React.useContext(LayoutGroupContext);
         var deprecatedLayoutGroupContext = React.useContext(DeprecatedLayoutGroupContext);
         var _e = __read(useForceUpdate(), 2), forceRender = _e[0], key = _e[1];
         var context = React.useRef(null);
         var upstreamId = (_b = layoutGroupContext.id) !== null && _b !== void 0 ? _b : deprecatedLayoutGroupContext;
         if (context.current === null) {
-            if (inheritId && upstreamId) {
+            if (shouldInheritId(inherit) && upstreamId) {
                 id = id ? upstreamId + "-" + id : upstreamId;
             }
             context.current = {
                 id: id,
-                group: inheritId
+                group: shouldInheritGroup(inherit)
                     ? (_c = layoutGroupContext === null || layoutGroupContext === void 0 ? void 0 : layoutGroupContext.group) !== null && _c !== void 0 ? _c : nodeGroup()
                     : nodeGroup(),
             };