motion-v 0.11.2 → 0.11.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/cjs/index.js
CHANGED
|
@@ -8244,7 +8244,7 @@ function resolveStateAnimation(controlActiveState, transition) {
|
|
|
8244
8244
|
let resolvedVariant = core.isDef(definition) ? resolveVariant(definition, this.options.variants, this.options.custom) : void 0;
|
|
8245
8245
|
if (this.visualElement.isVariantNode) {
|
|
8246
8246
|
const controlVariant = resolveVariant(this.context[name], this.options.variants, this.options.custom);
|
|
8247
|
-
resolvedVariant = controlVariant ? Object.assign(controlVariant || {},
|
|
8247
|
+
resolvedVariant = controlVariant ? Object.assign(controlVariant || {}, resolvedVariant) : variant;
|
|
8248
8248
|
}
|
|
8249
8249
|
if (!resolvedVariant)
|
|
8250
8250
|
return;
|
|
@@ -8297,7 +8297,7 @@ function setupChildAnimations(transition, controlActiveState, isFallback) {
|
|
|
8297
8297
|
}).filter(Boolean);
|
|
8298
8298
|
return {
|
|
8299
8299
|
getChildAnimations: () => Promise.all(childAnimations.map((animation) => {
|
|
8300
|
-
return
|
|
8300
|
+
return animation == null ? void 0 : animation();
|
|
8301
8301
|
})),
|
|
8302
8302
|
childAnimations
|
|
8303
8303
|
};
|
|
@@ -46,14 +46,14 @@ declare const _default: __VLS_WithTemplateSlots<import('vue').DefineComponent<__
|
|
|
46
46
|
whileDrag: any;
|
|
47
47
|
crossfade: boolean;
|
|
48
48
|
}>>>, {
|
|
49
|
+
initial: import('../../types').VariantLabels | import('../../types').Variant | boolean;
|
|
50
|
+
animate: import('../../types').VariantLabels | import('../../types').Variant | import('../../animation/types').AnimationControls;
|
|
51
|
+
whileDrag: import('../../types').Options["whileDrag"];
|
|
49
52
|
layout: true | "position";
|
|
50
53
|
layoutId: string;
|
|
51
54
|
layoutScroll: boolean;
|
|
52
55
|
layoutRoot: boolean;
|
|
53
56
|
crossfade: boolean;
|
|
54
|
-
initial: import('../../types').VariantLabels | import('../../types').Variant | boolean;
|
|
55
|
-
animate: import('../../types').VariantLabels | import('../../types').Variant | import('../../animation/types').AnimationControls;
|
|
56
|
-
whileDrag: import('../../types').Options["whileDrag"];
|
|
57
57
|
dragElastic: number;
|
|
58
58
|
dragMomentum: boolean;
|
|
59
59
|
dragListener: boolean;
|
|
@@ -62,7 +62,7 @@ function resolveStateAnimation(controlActiveState, transition) {
|
|
|
62
62
|
let resolvedVariant = isDef(definition) ? resolveVariant(definition, this.options.variants, this.options.custom) : void 0;
|
|
63
63
|
if (this.visualElement.isVariantNode) {
|
|
64
64
|
const controlVariant = resolveVariant(this.context[name], this.options.variants, this.options.custom);
|
|
65
|
-
resolvedVariant = controlVariant ? Object.assign(controlVariant || {},
|
|
65
|
+
resolvedVariant = controlVariant ? Object.assign(controlVariant || {}, resolvedVariant) : variant;
|
|
66
66
|
}
|
|
67
67
|
if (!resolvedVariant)
|
|
68
68
|
return;
|
|
@@ -115,7 +115,7 @@ function setupChildAnimations(transition, controlActiveState, isFallback) {
|
|
|
115
115
|
}).filter(Boolean);
|
|
116
116
|
return {
|
|
117
117
|
getChildAnimations: () => Promise.all(childAnimations.map((animation) => {
|
|
118
|
-
return
|
|
118
|
+
return animation == null ? void 0 : animation();
|
|
119
119
|
})),
|
|
120
120
|
childAnimations
|
|
121
121
|
};
|