@visactor/vgrammar-core 0.14.0-alpha.0 → 0.14.0-alpha.1

package/es/graph/animation/morph.js

@@ -4,168 +4,81 @@ import { isNil, isNumber, isValidNumber } from "@visactor/vutils";
 
 import { invokeFunctionType, parseField } from "../../parse/util";
 
-import { diffMultiple, diffSingle, groupData } from "../mark/differ";
+import { diffMultiple } from "../mark/differ";
 
-import { GrammarMarkType } from "../enums";
-
-const EmptyKey = Symbol.for("key");
-
-export class Morph {
-    diffGrammar(prevGrammars, nextGrammars) {
-        return diffSingle(prevGrammars, nextGrammars, (grammar => {
-            var _a;
-            return null !== (_a = grammar.id()) && void 0 !== _a ? _a : Symbol();
-        }));
-    }
-    diffMark(prevMarks, nextMarks, runningConfig) {
-        const diffResult = {
-            enter: [],
-            exit: [],
-            update: []
-        };
-        let prevDiffMarks = [], nextDiffMarks = [];
-        prevMarks.forEach((mark => {
-            mark.markType !== GrammarMarkType.group && (runningConfig.morph && mark.getMorphConfig().morph || runningConfig.morphAll || runningConfig.reuse) ? prevDiffMarks.push(mark) : diffResult.exit.push({
-                prev: [ mark ]
-            });
-        })), nextMarks.forEach((mark => {
-            mark.markType !== GrammarMarkType.group && (runningConfig.morph && mark.getMorphConfig().morph || runningConfig.morphAll || runningConfig.reuse) ? nextDiffMarks.push(mark) : diffResult.enter.push({
-                next: [ mark ]
-            });
-        }));
-        const keyDiffResult = this.diffUpdateByGroup(prevDiffMarks, nextDiffMarks, (mark => mark.getMorphConfig().morphKey), (mark => mark.getMorphConfig().morphKey));
-        prevDiffMarks = keyDiffResult.prev, nextDiffMarks = keyDiffResult.next, diffResult.update = diffResult.update.concat(keyDiffResult.update);
-        const nameDiffResult = this.diffUpdateByGroup(prevDiffMarks, nextDiffMarks, (mark => mark.id()), (mark => mark.id()));
-        prevDiffMarks = nameDiffResult.prev, nextDiffMarks = nameDiffResult.next, diffResult.update = diffResult.update.concat(nameDiffResult.update);
-        const prevParentGroup = groupData(prevDiffMarks, (mark => {
-            var _a, _b;
-            return null === (_b = null === (_a = mark.group) || void 0 === _a ? void 0 : _a.id) || void 0 === _b ? void 0 : _b.call(_a);
-        })), nextParentGroup = groupData(nextDiffMarks, (mark => {
-            var _a, _b;
-            return null === (_b = null === (_a = mark.group) || void 0 === _a ? void 0 : _a.id) || void 0 === _b ? void 0 : _b.call(_a);
+const doMorph = (prev, next, runningConfig, onEnd, parameters) => {
+    var _a, _b;
+    const morphData = {
+        prev: prev.map((element => element.getDatum())),
+        next: next.map((element => element.getDatum()))
+    }, morphElements = {
+        prev: prev.slice(),
+        next: next.slice()
+    }, easing = runningConfig.animation.easing, delay = invokeFunctionType(runningConfig.animation.delay, parameters, morphData, morphElements), duration = invokeFunctionType(runningConfig.animation.duration, parameters, morphData, morphElements), oneByOne = invokeFunctionType(runningConfig.animation.oneByOne, parameters, morphData, morphElements), splitPath = invokeFunctionType(runningConfig.animation.splitPath, parameters, morphData, morphElements), individualDelay = isValidNumber(oneByOne) && oneByOne > 0 ? index => isNumber(oneByOne) ? index * oneByOne : !0 === oneByOne ? index * duration : 0 : void 0;
+    1 !== prev.length && 0 !== prev.length || 1 !== next.length ? 1 === prev.length && next.length > 1 ? oneToMultiMorph(prev[0].getGraphicItem(), next.map((element => element.getGraphicItem())), {
+        delay: delay,
+        duration: duration,
+        easing: easing,
+        onEnd: onEnd,
+        individualDelay: individualDelay,
+        splitPath: splitPath
+    }) : prev.length > 1 && 1 === next.length && multiToOneMorph(prev.map((element => element.getGraphicItem())), next[0].getGraphicItem(), {
+        delay: delay,
+        duration: duration,
+        easing: easing,
+        onEnd: onEnd,
+        individualDelay: individualDelay,
+        splitPath: splitPath
+    }) : morphPath(null === (_b = null === (_a = prev[0]) || void 0 === _a ? void 0 : _a.getGraphicItem) || void 0 === _b ? void 0 : _b.call(_a), next[0].getGraphicItem(), {
+        delay: delay,
+        duration: duration,
+        easing: easing,
+        onEnd: onEnd
+    });
+}, divideElements = (elements, count) => {
+    const divideLength = Math.floor(elements.length / count);
+    return new Array(count).fill(0).map(((i, index) => elements.slice(divideLength * index, index === count - 1 ? elements.length : divideLength * (index + 1))));
+}, appendMorphKeyToElements = mark => {
+    const config = mark.getMorphConfig();
+    if (!isNil(config.morphElementKey)) {
+        const getter = parseField(config.morphElementKey);
+        mark.elements && mark.elements.forEach((el => {
+            el.morphKey = getter(el.getDatum());
         }));
-        return Object.keys(nextParentGroup).forEach((groupName => {
-            const prevChildren = prevParentGroup.data.get(groupName), nextChildren = nextParentGroup.data.get(groupName);
-            if (prevChildren && nextChildren) {
-                for (let i = 0; i < Math.max(prevChildren.length, nextChildren.length); i += 1) {
-                    const prevChild = prevChildren[i], nextChild = nextChildren[i];
-                    prevChild && nextChild ? diffResult.update.push({
-                        prev: [ prevChild ],
-                        next: [ nextChild ]
-                    }) : prevChild ? diffResult.exit.push({
-                        prev: [ prevChild ]
-                    }) : nextChild && diffResult.enter.push({
-                        next: [ nextChild ]
-                    });
-                }
-                prevDiffMarks = prevDiffMarks.filter((mark => !prevChildren.includes(mark))), nextDiffMarks = nextDiffMarks.filter((mark => !nextChildren.includes(mark)));
-            }
-        })), prevDiffMarks.forEach((mark => diffResult.exit.push({
-            prev: [ mark ]
-        }))), nextDiffMarks.forEach((mark => diffResult.enter.push({
-            next: [ mark ]
-        }))), diffResult;
-    }
-    _appendMorphKeyToElements(mark) {
-        const config = mark.getMorphConfig();
-        if (!isNil(config.morphElementKey)) {
-            const getter = parseField(config.morphElementKey);
-            mark.elements && mark.elements.forEach((el => {
-                el.morphKey = getter(el.getDatum());
-            }));
-        }
     }
-    morph(prevMarks, nextMarks, runningConfig) {
-        const prevElements = prevMarks.reduce(((elements, mark) => (this._appendMorphKeyToElements(mark), 
-        elements.concat(mark.elements))), []), nextElements = nextMarks.reduce(((elements, mark) => (this._appendMorphKeyToElements(mark), 
-        elements.concat(mark.elements))), []), diffResult = diffMultiple(prevElements, nextElements, (element => {
-            var _a;
-            return null !== (_a = element.morphKey) && void 0 !== _a ? _a : element.key;
-        }));
-        prevMarks.forEach((mark => {
-            var _a, _b;
-            return null === (_b = null === (_a = mark.animate) || void 0 === _a ? void 0 : _a.disable) || void 0 === _b ? void 0 : _b.call(_a);
-        })), nextMarks.forEach((mark => {
+};
+
+export const morph = (prevMarks, nextMarks, runningConfig) => {
+    const prevElements = prevMarks.reduce(((elements, mark) => (appendMorphKeyToElements(mark), 
+    elements.concat(mark.elements))), []), nextElements = nextMarks.reduce(((elements, mark) => (appendMorphKeyToElements(mark), 
+    elements.concat(mark.elements))), []), diffResult = diffMultiple(prevElements, nextElements, (element => {
+        var _a;
+        return null !== (_a = element.morphKey) && void 0 !== _a ? _a : element.key;
+    }));
+    prevMarks.forEach((mark => {
+        var _a, _b;
+        return null === (_b = null === (_a = mark.animate) || void 0 === _a ? void 0 : _a.disable) || void 0 === _b ? void 0 : _b.call(_a);
+    })), nextMarks.forEach((mark => {
+        var _a, _b;
+        return null === (_b = null === (_a = mark.animate) || void 0 === _a ? void 0 : _a.disable) || void 0 === _b ? void 0 : _b.call(_a);
+    }));
+    const parameters = prevMarks.concat(nextMarks).reduce(((parameters, mark) => (Object.assign(parameters, mark.parameters()), 
+    parameters)), {});
+    let morphCount = 0;
+    const onMorphEnd = () => {
+        morphCount -= 1, 0 === morphCount && nextMarks.forEach((mark => {
             var _a, _b;
-            return null === (_b = null === (_a = mark.animate) || void 0 === _a ? void 0 : _a.disable) || void 0 === _b ? void 0 : _b.call(_a);
-        }));
-        const parameters = prevMarks.concat(nextMarks).reduce(((parameters, mark) => (Object.assign(parameters, mark.parameters()), 
-        parameters)), {});
-        let morphCount = 0;
-        const onMorphEnd = () => {
-            morphCount -= 1, 0 === morphCount && nextMarks.forEach((mark => {
-                var _a, _b;
-                null === (_b = null === (_a = mark.animate) || void 0 === _a ? void 0 : _a.enable) || void 0 === _b || _b.call(_a);
-            }));
-        };
-        diffResult.enter.forEach((diff => {
-            diff.next.forEach((element => {
-                this.doMorph([], [ element ], runningConfig, onMorphEnd, parameters);
-            })), morphCount += 1;
-        })), diffResult.update.forEach((diff => {
-            const divideCount = Math.min(diff.prev.length, diff.next.length), prevDivide = this.divideElements(diff.prev, divideCount), nextDivide = this.divideElements(diff.next, divideCount);
-            for (let i = 0; i < divideCount; i++) this.doMorph(prevDivide[i], nextDivide[i], runningConfig, onMorphEnd, parameters), 
-            morphCount += 1;
-        }));
-    }
-    diffUpdateByGroup(prev, next, prevKey, nextKey) {
-        const prevGroup = groupData(prev, (datum => {
-            var _a;
-            return null !== (_a = prevKey(datum)) && void 0 !== _a ? _a : EmptyKey;
-        })), nextGroup = groupData(next, (datum => {
-            var _a;
-            return null !== (_a = nextKey(datum)) && void 0 !== _a ? _a : EmptyKey;
+            null === (_b = null === (_a = mark.animate) || void 0 === _a ? void 0 : _a.enable) || void 0 === _b || _b.call(_a);
         }));
-        let prevAfterDiff = prev, nextAfterDiff = next;
-        const update = [];
-        return nextGroup.keys.forEach((key => {
-            if (key !== EmptyKey) {
-                const prevKeyData = prevGroup.data.get(key), nextKeyData = nextGroup.data.get(key);
-                prevKeyData && nextKeyData && (update.push({
-                    prev: prevKeyData,
-                    next: nextKeyData
-                }), prevAfterDiff = prevAfterDiff.filter((datum => !prevKeyData.includes(datum))), 
-                nextAfterDiff = nextAfterDiff.filter((datum => !nextKeyData.includes(datum))));
-            }
-        })), {
-            prev: prevAfterDiff,
-            next: nextAfterDiff,
-            update: update
-        };
-    }
-    doMorph(prev, next, runningConfig, onEnd, parameters) {
-        var _a, _b;
-        const morphData = {
-            prev: prev.map((element => element.getDatum())),
-            next: next.map((element => element.getDatum()))
-        }, morphElements = {
-            prev: prev.slice(),
-            next: next.slice()
-        }, easing = runningConfig.animation.easing, delay = invokeFunctionType(runningConfig.animation.delay, parameters, morphData, morphElements), duration = invokeFunctionType(runningConfig.animation.duration, parameters, morphData, morphElements), oneByOne = invokeFunctionType(runningConfig.animation.oneByOne, parameters, morphData, morphElements), splitPath = invokeFunctionType(runningConfig.animation.splitPath, parameters, morphData, morphElements), individualDelay = isValidNumber(oneByOne) && oneByOne > 0 ? index => isNumber(oneByOne) ? index * oneByOne : !0 === oneByOne ? index * duration : 0 : void 0;
-        1 !== prev.length && 0 !== prev.length || 1 !== next.length ? 1 === prev.length && next.length > 1 ? oneToMultiMorph(prev[0].getGraphicItem(), next.map((element => element.getGraphicItem())), {
-            delay: delay,
-            duration: duration,
-            easing: easing,
-            onEnd: onEnd,
-            individualDelay: individualDelay,
-            splitPath: splitPath
-        }) : prev.length > 1 && 1 === next.length && multiToOneMorph(prev.map((element => element.getGraphicItem())), next[0].getGraphicItem(), {
-            delay: delay,
-            duration: duration,
-            easing: easing,
-            onEnd: onEnd,
-            individualDelay: individualDelay,
-            splitPath: splitPath
-        }) : morphPath(null === (_b = null === (_a = prev[0]) || void 0 === _a ? void 0 : _a.getGraphicItem) || void 0 === _b ? void 0 : _b.call(_a), next[0].getGraphicItem(), {
-            delay: delay,
-            duration: duration,
-            easing: easing,
-            onEnd: onEnd
-        });
-    }
-    divideElements(elements, count) {
-        const divideLength = Math.floor(elements.length / count);
-        return new Array(count).fill(0).map(((i, index) => elements.slice(divideLength * index, index === count - 1 ? elements.length : divideLength * (index + 1))));
-    }
-}
+    };
+    diffResult.enter.forEach((diff => {
+        diff.next.forEach((element => {
+            doMorph([], [ element ], runningConfig, onMorphEnd, parameters);
+        })), morphCount += 1;
+    })), diffResult.update.forEach((diff => {
+        const divideCount = Math.min(diff.prev.length, diff.next.length), prevDivide = divideElements(diff.prev, divideCount), nextDivide = divideElements(diff.next, divideCount);
+        for (let i = 0; i < divideCount; i++) doMorph(prevDivide[i], nextDivide[i], runningConfig, onMorphEnd, parameters), 
+        morphCount += 1;
+    }));
+};
 //# sourceMappingURL=morph.js.map

package/es/graph/animation/morph.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graph/animation/morph.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACrF,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIlE,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AAEnC,MAAM,OAAO,KAAK;IAChB,WAAW,CAAyB,YAAiB,EAAE,YAAiB;QACtE,MAAM,GAAG,GAAG,CAAC,OAAU,EAAE,EAAE,WAAC,OAAA,MAAA,OAAO,CAAC,EAAE,EAAE,mCAAI,MAAM,EAAE,CAAA,EAAA,CAAC;QACrD,OAAO,UAAU,CAAC,YAAY,EAAE,YAAY,EAAE,GAAG,CAAC,CAAC;IACrD,CAAC;IAED,QAAQ,CAAC,SAAkB,EAAE,SAAkB,EAAE,aAA6B;QAC5E,MAAM,UAAU,GAAiC;YAC/C,KAAK,EAAE,EAAE;YACT,IAAI,EAAE,EAAE;YACR,MAAM,EAAE,EAAE;SACX,CAAC;QAEF,IAAI,aAAa,GAAY,EAAE,CAAC;QAChC,IAAI,aAAa,GAAY,EAAE,CAAC;QAGhC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACvB,IAEE,IAAI,CAAC,QAAQ,KAAK,eAAe,CAAC,KAAK;gBACvC,CAAC,CAAC,aAAa,CAAC,KAAK,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC,KAAK,CAAC,IAAI,aAAa,CAAC,QAAQ,IAAI,aAAa,CAAC,KAAK,CAAC,EACvG;gBACA,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC1B;iBAAM;gBACL,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aACxC;QACH,CAAC,CAAC,CAAC;QACH,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACvB,IACE,IAAI,CAAC,QAAQ,KAAK,eAAe,CAAC,KAAK;gBACvC,CAAC,CAAC,aAAa,CAAC,KAAK,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC,KAAK,CAAC,IAAI,aAAa,CAAC,QAAQ,IAAI,aAAa,CAAC,KAAK,CAAC,EACvG;gBACA,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC1B;iBAAM;gBACL,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aACzC;QACH,CAAC,CAAC,CAAC;QAGH,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAC1C,aAAa,EACb,aAAa,EACb,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,QAAQ,EACtC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,QAAQ,CACvC,CAAC;QACF,aAAa,GAAG,aAAa,CAAC,IAAI,CAAC;QACnC,aAAa,GAAG,aAAa,CAAC,IAAI,CAAC;QACnC,UAAU,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAGnE,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAC3C,aAAa,EACb,aAAa,EACb,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,EACjB,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,CAClB,CAAC;QACF,aAAa,GAAG,cAAc,CAAC,IAAI,CAAC;QACpC,aAAa,GAAG,cAAc,CAAC,IAAI,CAAC;QACpC,UAAU,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAKpE,MAAM,eAAe,GAAG,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE,eAAC,OAAA,MAAA,MAAA,IAAI,CAAC,KAAK,0CAAE,EAAE,kDAAI,CAAA,EAAA,CAAC,CAAC;QAC7E,MAAM,eAAe,GAAG,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE,eAAC,OAAA,MAAA,MAAA,IAAI,CAAC,KAAK,0CAAE,EAAE,kDAAI,CAAA,EAAA,CAAC,CAAC;QAE7E,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAC/C,MAAM,YAAY,GAAG,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACzD,MAAM,YAAY,GAAG,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACzD,IAAI,YAAY,IAAI,YAAY,EAAE;gBAChC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE;oBAC9E,MAAM,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;oBAClC,MAAM,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;oBAClC,IAAI,SAAS,IAAI,SAAS,EAAE;wBAC1B,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;qBAClE;yBAAM,IAAI,SAAS,EAAE;wBACpB,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;qBAC7C;yBAAM,IAAI,SAAS,EAAE;wBACpB,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;qBAC9C;iBACF;gBAED,aAAa,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC3E,aAAa,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;aAC5E;QACH,CAAC,CAAC,CAAC;QAGH,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QACtE,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QAEvE,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,yBAAyB,CAAC,IAAW;QAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAErC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;YAClC,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YAElD,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACjB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;oBACxB,EAAU,CAAC,QAAQ,GAAG,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC/C,CAAC,CAAC,CAAC;aACJ;SACF;IACH,CAAC;IAED,KAAK,CAAC,SAAkB,EAAE,SAAkB,EAAE,aAA6B;QACzE,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE;YACvD,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC;YAErC,OAAO,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxC,CAAC,EAAE,EAAgB,CAAC,CAAC;QACrB,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE;YACvD,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC;YAErC,OAAO,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxC,CAAC,EAAE,EAAgB,CAAC,CAAC;QAErB,MAAM,GAAG,GAAG,CAAC,OAAiB,EAAE,EAAE,WAAC,OAAA,MAAC,OAAe,CAAC,QAAQ,mCAAI,OAAO,CAAC,GAAG,CAAA,EAAA,CAAC;QAC5E,MAAM,UAAU,GAAG,YAAY,CAAC,YAAY,EAAE,YAAY,EAAE,GAAG,CAAC,CAAC;QAGjE,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,eAAC,OAAA,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,OAAO,kDAAI,CAAA,EAAA,CAAC,CAAC;QACrD,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,eAAC,OAAA,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,OAAO,kDAAI,CAAA,EAAA,CAAC,CAAC;QAErD,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE;YACzE,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;YAC7C,OAAO,UAAU,CAAC;QACpB,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,MAAM,UAAU,GAAG,GAAG,EAAE;YACtB,UAAU,IAAI,CAAC,CAAC;YAChB,IAAI,UAAU,KAAK,CAAC,EAAE;gBACpB,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;;oBACvB,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,MAAM,kDAAI,CAAC;gBAC3B,CAAC,CAAC,CAAC;aACJ;QACH,CAAC,CAAC;QAEF,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC9B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBAC1B,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;YACrE,CAAC,CAAC,CAAC;YACH,UAAU,IAAI,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;QACH,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC/B,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACjE,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAC/D,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAC/D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE;gBACpC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;gBAClF,UAAU,IAAI,CAAC,CAAC;aACjB;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,iBAAiB,CACvB,IAAS,EACT,IAAS,EACT,OAAsC,EACtC,OAAsC;QAEtC,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,WAAC,OAAA,MAAA,OAAO,CAAC,KAAK,CAAC,mCAAI,QAAQ,CAAA,EAAA,CAAC,CAAC;QACvE,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,WAAC,OAAA,MAAA,OAAO,CAAC,KAAK,CAAC,mCAAI,QAAQ,CAAA,EAAA,CAAC,CAAC;QAEvE,IAAI,aAAa,GAAG,IAAI,CAAC;QACzB,IAAI,aAAa,GAAG,IAAI,CAAC;QACzB,MAAM,MAAM,GAA+B,EAAE,CAAC;QAC9C,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC3B,IAAI,GAAG,KAAK,QAAQ,EAAE;gBACpB,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBAC5C,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBAC5C,IAAI,WAAW,IAAI,WAAW,EAAE;oBAC9B,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;oBACtD,aAAa,GAAG,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;oBAC5E,aAAa,GAAG,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;iBAC7E;aACF;QACH,CAAC,CAAC,CAAC;QACH,OAAO;YACL,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,aAAa;YACnB,MAAM;SACP,CAAC;IACJ,CAAC;IAEO,OAAO,CACb,IAAgB,EAChB,IAAgB,EAChB,aAA6B,EAC7B,KAAiB,EACjB,UAAe;;QAEf,MAAM,SAAS,GAAc;YAC3B,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;YAC7C,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;SAC9C,CAAC;QACF,MAAM,aAAa,GAAkB;YACnC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE;YAClB,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE;SACnB,CAAC;QACF,MAAM,MAAM,GAAG,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC;QAC9C,MAAM,KAAK,GAAG,kBAAkB,CAAC,aAAa,CAAC,SAAS,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;QACtG,MAAM,QAAQ,GAAG,kBAAkB,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;QAC5G,MAAM,QAAQ,GAAG,kBAAkB,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;QAC5G,MAAM,SAAS,GAAG,kBAAkB,CAAC,aAAa,CAAC,SAAS,CAAC,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;QAC9G,MAAM,eAAe,GACnB,aAAa,CAAC,QAAQ,CAAC,IAAI,QAAQ,GAAG,CAAC;YACrC,CAAC,CAAC,CAAC,KAAa,EAAE,EAAE;gBAChB,IAAI,QAAQ,CAAC,QAAQ,CAAC,EAAE;oBACtB,OAAO,KAAK,GAAG,QAAQ,CAAC;iBACzB;qBAAM,IAAI,QAAQ,KAAK,IAAI,EAAE;oBAC5B,OAAO,KAAK,GAAG,QAAQ,CAAC;iBACzB;gBACD,OAAO,CAAC,CAAC;YACX,CAAC;YACH,CAAC,CAAC,SAAS,CAAC;QAGhB,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACjE,SAAS,CAAC,MAAA,MAAA,IAAI,CAAC,CAAC,CAAC,0CAAE,cAAc,kDAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,cAAc,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;SACtG;aAAM,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/C,eAAe,CACb,IAAI,CAAC,CAAC,CAAC,CAAC,cAAc,EAAE,EACxB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,EAC7C,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,CAC/D,CAAC;SACH;aAAM,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YAC/C,eAAe,CACb,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,EAC7C,IAAI,CAAC,CAAC,CAAC,CAAC,cAAc,EAAE,EACxB,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,CAC/D,CAAC;SACH;IACH,CAAC;IAEO,cAAc,CAAC,QAAoB,EAAE,KAAa;QACxD,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,KAAK,CAAC,CAAC;QACzD,OAAO,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;YAC/C,OAAO,QAAQ,CAAC,KAAK,CAAC,YAAY,GAAG,KAAK,EAAE,KAAK,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;QAClH,CAAC,CAAC,CAAC;IACL,CAAC;CACF","file":"morph.js","sourcesContent":["import { morphPath, multiToOneMorph, oneToMultiMorph } from '@visactor/vrender-core';\nimport { isNil, isNumber, isValidNumber } from '@visactor/vutils';\nimport type { IElement, IGrammarBase, IMark, IRunningConfig, MarkSpec } from '../../types';\nimport type { DiffResult } from '../../types/base';\nimport type { IMorph, MorphData, MorphElements } from '../../types/morph';\nimport { invokeFunctionType, parseField } from '../../parse/util';\nimport { diffMultiple, diffSingle, groupData } from '../mark/differ';\nimport { GrammarMarkType } from '../enums';\n\nconst EmptyKey = Symbol.for('key');\n\nexport class Morph implements IMorph {\n  diffGrammar<U extends IGrammarBase>(prevGrammars: U[], nextGrammars: U[]): DiffResult<U, U> {\n    const key = (grammar: U) => grammar.id() ?? Symbol();\n    return diffSingle(prevGrammars, nextGrammars, key);\n  }\n\n  diffMark(prevMarks: IMark[], nextMarks: IMark[], runningConfig: IRunningConfig): DiffResult<IMark[], IMark[]> {\n    const diffResult: DiffResult<IMark[], IMark[]> = {\n      enter: [],\n      exit: [],\n      update: []\n    };\n\n    let prevDiffMarks: IMark[] = [];\n    let nextDiffMarks: IMark[] = [];\n\n    // filter out marks & specs which will not morph\n    prevMarks.forEach(mark => {\n      if (\n        // group mark does not support reusing or morphing\n        mark.markType !== GrammarMarkType.group &&\n        ((runningConfig.morph && mark.getMorphConfig().morph) || runningConfig.morphAll || runningConfig.reuse)\n      ) {\n        prevDiffMarks.push(mark);\n      } else {\n        diffResult.exit.push({ prev: [mark] });\n      }\n    });\n    nextMarks.forEach(mark => {\n      if (\n        mark.markType !== GrammarMarkType.group &&\n        ((runningConfig.morph && mark.getMorphConfig().morph) || runningConfig.morphAll || runningConfig.reuse)\n      ) {\n        nextDiffMarks.push(mark);\n      } else {\n        diffResult.enter.push({ next: [mark] });\n      }\n    });\n\n    // 1. match by custom key\n    const keyDiffResult = this.diffUpdateByGroup(\n      prevDiffMarks,\n      nextDiffMarks,\n      mark => mark.getMorphConfig().morphKey,\n      mark => mark.getMorphConfig().morphKey\n    );\n    prevDiffMarks = keyDiffResult.prev;\n    nextDiffMarks = keyDiffResult.next;\n    diffResult.update = diffResult.update.concat(keyDiffResult.update);\n\n    // 2. match by name\n    const nameDiffResult = this.diffUpdateByGroup(\n      prevDiffMarks,\n      nextDiffMarks,\n      mark => mark.id(),\n      mark => mark.id()\n    );\n    prevDiffMarks = nameDiffResult.prev;\n    nextDiffMarks = nameDiffResult.next;\n    diffResult.update = diffResult.update.concat(nameDiffResult.update);\n\n    // 3. match by index\n\n    // FIXME: mark index cannot be get before executing, index is decided by remove/order for now\n    const prevParentGroup = groupData(prevDiffMarks, mark => mark.group?.id?.());\n    const nextParentGroup = groupData(nextDiffMarks, mark => mark.group?.id?.());\n\n    Object.keys(nextParentGroup).forEach(groupName => {\n      const prevChildren = prevParentGroup.data.get(groupName);\n      const nextChildren = nextParentGroup.data.get(groupName);\n      if (prevChildren && nextChildren) {\n        for (let i = 0; i < Math.max(prevChildren.length, nextChildren.length); i += 1) {\n          const prevChild = prevChildren[i];\n          const nextChild = nextChildren[i];\n          if (prevChild && nextChild) {\n            diffResult.update.push({ prev: [prevChild], next: [nextChild] });\n          } else if (prevChild) {\n            diffResult.exit.push({ prev: [prevChild] });\n          } else if (nextChild) {\n            diffResult.enter.push({ next: [nextChild] });\n          }\n        }\n\n        prevDiffMarks = prevDiffMarks.filter(mark => !prevChildren.includes(mark));\n        nextDiffMarks = nextDiffMarks.filter(mark => !nextChildren.includes(mark));\n      }\n    });\n\n    // 4. handle unmatched marks\n    prevDiffMarks.forEach(mark => diffResult.exit.push({ prev: [mark] }));\n    nextDiffMarks.forEach(mark => diffResult.enter.push({ next: [mark] }));\n\n    return diffResult;\n  }\n\n  private _appendMorphKeyToElements(mark: IMark) {\n    const config = mark.getMorphConfig();\n\n    if (!isNil(config.morphElementKey)) {\n      const getter = parseField(config.morphElementKey);\n\n      if (mark.elements) {\n        mark.elements.forEach(el => {\n          (el as any).morphKey = getter(el.getDatum());\n        });\n      }\n    }\n  }\n\n  morph(prevMarks: IMark[], nextMarks: IMark[], runningConfig: IRunningConfig) {\n    const prevElements = prevMarks.reduce((elements, mark) => {\n      this._appendMorphKeyToElements(mark);\n\n      return elements.concat(mark.elements);\n    }, [] as IElement[]);\n    const nextElements = nextMarks.reduce((elements, mark) => {\n      this._appendMorphKeyToElements(mark);\n\n      return elements.concat(mark.elements);\n    }, [] as IElement[]);\n\n    const key = (element: IElement) => (element as any).morphKey ?? element.key;\n    const diffResult = diffMultiple(prevElements, nextElements, key);\n\n    // disable normal animations of previous marks\n    prevMarks.forEach(mark => mark.animate?.disable?.());\n    nextMarks.forEach(mark => mark.animate?.disable?.());\n\n    const parameters = prevMarks.concat(nextMarks).reduce((parameters, mark) => {\n      Object.assign(parameters, mark.parameters());\n      return parameters;\n    }, {});\n\n    let morphCount = 0;\n    const onMorphEnd = () => {\n      morphCount -= 1;\n      if (morphCount === 0) {\n        nextMarks.forEach(mark => {\n          mark.animate?.enable?.();\n        });\n      }\n    };\n    // no animation for exit result\n    diffResult.enter.forEach(diff => {\n      diff.next.forEach(element => {\n        this.doMorph([], [element], runningConfig, onMorphEnd, parameters);\n      });\n      morphCount += 1;\n    });\n    diffResult.update.forEach(diff => {\n      const divideCount = Math.min(diff.prev.length, diff.next.length);\n      const prevDivide = this.divideElements(diff.prev, divideCount);\n      const nextDivide = this.divideElements(diff.next, divideCount);\n      for (let i = 0; i < divideCount; i++) {\n        this.doMorph(prevDivide[i], nextDivide[i], runningConfig, onMorphEnd, parameters);\n        morphCount += 1;\n      }\n    });\n  }\n\n  private diffUpdateByGroup<U extends IMark | MarkSpec, V extends IMark | MarkSpec>(\n    prev: U[],\n    next: V[],\n    prevKey: (datum: U) => symbol | string,\n    nextKey: (datum: V) => symbol | string\n  ) {\n    const prevGroup = groupData(prev, datum => prevKey(datum) ?? EmptyKey);\n    const nextGroup = groupData(next, datum => nextKey(datum) ?? EmptyKey);\n\n    let prevAfterDiff = prev;\n    let nextAfterDiff = next;\n    const update: { prev: U[]; next: V[] }[] = [];\n    nextGroup.keys.forEach(key => {\n      if (key !== EmptyKey) {\n        const prevKeyData = prevGroup.data.get(key);\n        const nextKeyData = nextGroup.data.get(key);\n        if (prevKeyData && nextKeyData) {\n          update.push({ prev: prevKeyData, next: nextKeyData });\n          prevAfterDiff = prevAfterDiff.filter(datum => !prevKeyData.includes(datum));\n          nextAfterDiff = nextAfterDiff.filter(datum => !nextKeyData.includes(datum));\n        }\n      }\n    });\n    return {\n      prev: prevAfterDiff,\n      next: nextAfterDiff,\n      update\n    };\n  }\n\n  private doMorph(\n    prev: IElement[],\n    next: IElement[],\n    runningConfig: IRunningConfig,\n    onEnd: () => void,\n    parameters: any\n  ) {\n    const morphData: MorphData = {\n      prev: prev.map(element => element.getDatum()),\n      next: next.map(element => element.getDatum())\n    };\n    const morphElements: MorphElements = {\n      prev: prev.slice(),\n      next: next.slice()\n    };\n    const easing = runningConfig.animation.easing;\n    const delay = invokeFunctionType(runningConfig.animation.delay, parameters, morphData, morphElements);\n    const duration = invokeFunctionType(runningConfig.animation.duration, parameters, morphData, morphElements);\n    const oneByOne = invokeFunctionType(runningConfig.animation.oneByOne, parameters, morphData, morphElements);\n    const splitPath = invokeFunctionType(runningConfig.animation.splitPath, parameters, morphData, morphElements);\n    const individualDelay =\n      isValidNumber(oneByOne) && oneByOne > 0\n        ? (index: number) => {\n            if (isNumber(oneByOne)) {\n              return index * oneByOne;\n            } else if (oneByOne === true) {\n              return index * duration;\n            }\n            return 0;\n          }\n        : undefined;\n\n    // if no previous item, still execute morph animation\n    if ((prev.length === 1 || prev.length === 0) && next.length === 1) {\n      morphPath(prev[0]?.getGraphicItem?.(), next[0].getGraphicItem(), { delay, duration, easing, onEnd });\n    } else if (prev.length === 1 && next.length > 1) {\n      oneToMultiMorph(\n        prev[0].getGraphicItem(),\n        next.map(element => element.getGraphicItem()),\n        { delay, duration, easing, onEnd, individualDelay, splitPath }\n      );\n    } else if (prev.length > 1 && next.length === 1) {\n      multiToOneMorph(\n        prev.map(element => element.getGraphicItem()),\n        next[0].getGraphicItem(),\n        { delay, duration, easing, onEnd, individualDelay, splitPath }\n      );\n    }\n  }\n\n  private divideElements(elements: IElement[], count: number) {\n    const divideLength = Math.floor(elements.length / count);\n    return new Array(count).fill(0).map((i, index) => {\n      return elements.slice(divideLength * index, index === count - 1 ? elements.length : divideLength * (index + 1));\n    });\n  }\n}\n"]}
+{"version":3,"sources":["../src/graph/animation/morph.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACrF,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGlE,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,OAAO,GAAG,CACd,IAAgB,EAChB,IAAgB,EAChB,aAA6B,EAC7B,KAAiB,EACjB,UAAe,EACf,EAAE;;IACF,MAAM,SAAS,GAAc;QAC3B,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QAC7C,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;KAC9C,CAAC;IACF,MAAM,aAAa,GAAkB;QACnC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE;QAClB,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE;KACnB,CAAC;IACF,MAAM,MAAM,GAAG,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC;IAC9C,MAAM,KAAK,GAAG,kBAAkB,CAAC,aAAa,CAAC,SAAS,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;IACtG,MAAM,QAAQ,GAAG,kBAAkB,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;IAC5G,MAAM,QAAQ,GAAG,kBAAkB,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;IAC5G,MAAM,SAAS,GAAG,kBAAkB,CAAC,aAAa,CAAC,SAAS,CAAC,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;IAC9G,MAAM,eAAe,GACnB,aAAa,CAAC,QAAQ,CAAC,IAAK,QAAmB,GAAG,CAAC;QACjD,CAAC,CAAC,CAAC,KAAa,EAAE,EAAE;YAChB,IAAI,QAAQ,CAAC,QAAQ,CAAC,EAAE;gBACtB,OAAO,KAAK,GAAI,QAAmB,CAAC;aACrC;iBAAM,IAAI,QAAQ,KAAK,IAAI,EAAE;gBAC5B,OAAO,KAAK,GAAG,QAAQ,CAAC;aACzB;YACD,OAAO,CAAC,CAAC;QACX,CAAC;QACH,CAAC,CAAC,SAAS,CAAC;IAGhB,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QACjE,SAAS,CAAC,MAAA,MAAA,IAAI,CAAC,CAAC,CAAC,0CAAE,cAAc,kDAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,cAAc,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;KACtG;SAAM,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;QAC/C,eAAe,CACb,IAAI,CAAC,CAAC,CAAC,CAAC,cAAc,EAAE,EACxB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,EAC7C,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,CAC/D,CAAC;KACH;SAAM,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QAC/C,eAAe,CACb,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,EAC7C,IAAI,CAAC,CAAC,CAAC,CAAC,cAAc,EAAE,EACxB,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,CAC/D,CAAC;KACH;AACH,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,QAAoB,EAAE,KAAa,EAAE,EAAE;IAC7D,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,KAAK,CAAC,CAAC;IACzD,OAAO,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;QAC/C,OAAO,QAAQ,CAAC,KAAK,CAAC,YAAY,GAAG,KAAK,EAAE,KAAK,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;IAClH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAAC,IAAW,EAAE,EAAE;IAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;IAErC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QAClC,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAElD,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;gBACxB,EAAU,CAAC,QAAQ,GAAG,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC/C,CAAC,CAAC,CAAC;SACJ;KACF;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,SAAkB,EAAE,SAAkB,EAAE,aAA6B,EAAE,EAAE;IAC7F,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE;QACvD,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAE/B,OAAO,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC,EAAE,EAAgB,CAAC,CAAC;IACrB,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE;QACvD,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAE/B,OAAO,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC,EAAE,EAAgB,CAAC,CAAC;IAErB,MAAM,GAAG,GAAG,CAAC,OAAiB,EAAE,EAAE,WAAC,OAAA,MAAC,OAAe,CAAC,QAAQ,mCAAI,OAAO,CAAC,GAAG,CAAA,EAAA,CAAC;IAC5E,MAAM,UAAU,GAAG,YAAY,CAAC,YAAY,EAAE,YAAY,EAAE,GAAG,CAAC,CAAC;IAGjE,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,eAAC,OAAA,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,OAAO,kDAAI,CAAA,EAAA,CAAC,CAAC;IACrD,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,eAAC,OAAA,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,OAAO,kDAAI,CAAA,EAAA,CAAC,CAAC;IAErD,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE;QACzE,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAC7C,OAAO,UAAU,CAAC;IACpB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,MAAM,UAAU,GAAG,GAAG,EAAE;QACtB,UAAU,IAAI,CAAC,CAAC;QAChB,IAAI,UAAU,KAAK,CAAC,EAAE;YACpB,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;;gBACvB,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,MAAM,kDAAI,CAAC;YAC3B,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,CAAC;IAEF,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAC9B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YAC1B,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;QACH,UAAU,IAAI,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IACH,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAC/B,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACjE,MAAM,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAC1D,MAAM,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAC1D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE;YACpC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;YAC7E,UAAU,IAAI,CAAC,CAAC;SACjB;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC","file":"morph.js","sourcesContent":["import { morphPath, multiToOneMorph, oneToMultiMorph } from '@visactor/vrender-core';\nimport { isNil, isNumber, isValidNumber } from '@visactor/vutils';\nimport type { IElement, IMark, IRunningConfig } from '../../types';\nimport type { MorphData, MorphElements } from '../../types/morph';\nimport { invokeFunctionType, parseField } from '../../parse/util';\nimport { diffMultiple } from '../mark/differ';\n\nconst doMorph = (\n  prev: IElement[],\n  next: IElement[],\n  runningConfig: IRunningConfig,\n  onEnd: () => void,\n  parameters: any\n) => {\n  const morphData: MorphData = {\n    prev: prev.map(element => element.getDatum()),\n    next: next.map(element => element.getDatum())\n  };\n  const morphElements: MorphElements = {\n    prev: prev.slice(),\n    next: next.slice()\n  };\n  const easing = runningConfig.animation.easing;\n  const delay = invokeFunctionType(runningConfig.animation.delay, parameters, morphData, morphElements);\n  const duration = invokeFunctionType(runningConfig.animation.duration, parameters, morphData, morphElements);\n  const oneByOne = invokeFunctionType(runningConfig.animation.oneByOne, parameters, morphData, morphElements);\n  const splitPath = invokeFunctionType(runningConfig.animation.splitPath, parameters, morphData, morphElements);\n  const individualDelay =\n    isValidNumber(oneByOne) && (oneByOne as number) > 0\n      ? (index: number) => {\n          if (isNumber(oneByOne)) {\n            return index * (oneByOne as number);\n          } else if (oneByOne === true) {\n            return index * duration;\n          }\n          return 0;\n        }\n      : undefined;\n\n  // if no previous item, still execute morph animation\n  if ((prev.length === 1 || prev.length === 0) && next.length === 1) {\n    morphPath(prev[0]?.getGraphicItem?.(), next[0].getGraphicItem(), { delay, duration, easing, onEnd });\n  } else if (prev.length === 1 && next.length > 1) {\n    oneToMultiMorph(\n      prev[0].getGraphicItem(),\n      next.map(element => element.getGraphicItem()),\n      { delay, duration, easing, onEnd, individualDelay, splitPath }\n    );\n  } else if (prev.length > 1 && next.length === 1) {\n    multiToOneMorph(\n      prev.map(element => element.getGraphicItem()),\n      next[0].getGraphicItem(),\n      { delay, duration, easing, onEnd, individualDelay, splitPath }\n    );\n  }\n};\n\nconst divideElements = (elements: IElement[], count: number) => {\n  const divideLength = Math.floor(elements.length / count);\n  return new Array(count).fill(0).map((i, index) => {\n    return elements.slice(divideLength * index, index === count - 1 ? elements.length : divideLength * (index + 1));\n  });\n};\n\nconst appendMorphKeyToElements = (mark: IMark) => {\n  const config = mark.getMorphConfig();\n\n  if (!isNil(config.morphElementKey)) {\n    const getter = parseField(config.morphElementKey);\n\n    if (mark.elements) {\n      mark.elements.forEach(el => {\n        (el as any).morphKey = getter(el.getDatum());\n      });\n    }\n  }\n};\n\nexport const morph = (prevMarks: IMark[], nextMarks: IMark[], runningConfig: IRunningConfig) => {\n  const prevElements = prevMarks.reduce((elements, mark) => {\n    appendMorphKeyToElements(mark);\n\n    return elements.concat(mark.elements);\n  }, [] as IElement[]);\n  const nextElements = nextMarks.reduce((elements, mark) => {\n    appendMorphKeyToElements(mark);\n\n    return elements.concat(mark.elements);\n  }, [] as IElement[]);\n\n  const key = (element: IElement) => (element as any).morphKey ?? element.key;\n  const diffResult = diffMultiple(prevElements, nextElements, key);\n\n  // disable normal animations of previous marks\n  prevMarks.forEach(mark => mark.animate?.disable?.());\n  nextMarks.forEach(mark => mark.animate?.disable?.());\n\n  const parameters = prevMarks.concat(nextMarks).reduce((parameters, mark) => {\n    Object.assign(parameters, mark.parameters());\n    return parameters;\n  }, {});\n\n  let morphCount = 0;\n  const onMorphEnd = () => {\n    morphCount -= 1;\n    if (morphCount === 0) {\n      nextMarks.forEach(mark => {\n        mark.animate?.enable?.();\n      });\n    }\n  };\n  // no animation for exit result\n  diffResult.enter.forEach(diff => {\n    diff.next.forEach(element => {\n      doMorph([], [element], runningConfig, onMorphEnd, parameters);\n    });\n    morphCount += 1;\n  });\n  diffResult.update.forEach(diff => {\n    const divideCount = Math.min(diff.prev.length, diff.next.length);\n    const prevDivide = divideElements(diff.prev, divideCount);\n    const nextDivide = divideElements(diff.next, divideCount);\n    for (let i = 0; i < divideCount; i++) {\n      doMorph(prevDivide[i], nextDivide[i], runningConfig, onMorphEnd, parameters);\n      morphCount += 1;\n    }\n  });\n};\n"]}

package/es/graph/element.d.ts

@@ -27,6 +27,7 @@ export declare class Element implements IElement {
     private _setCustomizedShape;
     encodeItems(items: MarkElementItem[], encoders: BaseEncodeSpec, isReentered?: boolean, parameters?: any): void;
     protected coordinateTransformEncode(items: MarkElementItem[]): void;
+    hasStateAnimation(): boolean;
     clearStates(hasAnimation?: boolean): void;
     private _updateRuntimeStates;
     hasState(state: string): boolean;

package/es/graph/element.js

@@ -48,10 +48,11 @@ export class Element {
         this.setNextGraphicAttributes(attributes), this.setFinalGraphicAttributes(attributes)));
     }
     updateGraphicItem() {
+        var _a;
         if (!this.graphicItem) return;
         this.diffState === DiffState.exit ? this.graphicItem.releaseStatus = "willRelease" : this.graphicItem.releaseStatus = void 0;
-        const stateAnimation = this.mark.animate.getAnimationConfigs("state");
-        0 !== stateAnimation.length && (this.graphicItem.stateAnimateConfig = stateAnimation[0].originConfig);
+        const stateAnimation = null === (_a = this.mark.animate) || void 0 === _a ? void 0 : _a.getAnimationConfigs("state");
+        stateAnimation && 0 !== stateAnimation.length && (this.graphicItem.stateAnimateConfig = stateAnimation[0].originConfig);
     }
     getGraphicItem() {
         return this.graphicItem;
@@ -132,8 +133,13 @@ export class Element {
             Object.assign(nextAttrs, convertedPoint);
         }));
     }
+    hasStateAnimation() {
+        var _a;
+        const stateAnimation = null === (_a = this.mark.animate) || void 0 === _a ? void 0 : _a.getAnimationConfigs("state");
+        return stateAnimation && stateAnimation.length > 0;
+    }
     clearStates(hasAnimation) {
-        const stateAnimationEnable = isBoolean(hasAnimation) ? hasAnimation : 0 !== this.mark.animate.getAnimationConfigs("state").length;
+        const stateAnimationEnable = isBoolean(hasAnimation) ? hasAnimation : this.hasStateAnimation();
         this.states = [], this.graphicItem && this.graphicItem.clearStates(stateAnimationEnable), 
         this.runtimeStatesEncoder && (this.runtimeStatesEncoder = {});
     }
@@ -192,7 +198,7 @@ export class Element {
         }, this);
         const stateSort = null === (_a = this.mark.getSpec()) || void 0 === _a ? void 0 : _a.stateSort;
         stateSort && states.sort(stateSort), this.states = states;
-        const stateAnimationEnable = isBoolean(hasAnimation) ? hasAnimation : 0 !== this.mark.animate.getAnimationConfigs("state").length;
+        const stateAnimationEnable = isBoolean(hasAnimation) ? hasAnimation : this.hasStateAnimation();
         return this.graphicItem.stateProxy = this.getStateAttrs, this.graphicItem.useStates(this.states, stateAnimationEnable), 
         this.mark.emit(HOOK_EVENT.AFTER_ELEMENT_STATE, {
             states: states
@@ -233,14 +239,14 @@ export class Element {
         return nextAttrs;
     }
     applyGraphicAttributes(graphicAttributes) {
-        var _a, _b;
+        var _a, _b, _c;
         if (!isEmpty(graphicAttributes)) if (this.mark.needAnimate()) {
             const nextGraphicAttributes = this.diffAttributes(graphicAttributes), prevGraphicAttributes = null !== (_a = this.getPrevGraphicAttributes()) && void 0 !== _a ? _a : {}, finalGraphicAttributes = null !== (_b = this.getFinalGraphicAttributes()) && void 0 !== _b ? _b : {};
             Object.keys(nextGraphicAttributes).forEach((channel => {
                 prevGraphicAttributes[channel] = this.getGraphicAttribute(channel), finalGraphicAttributes[channel] = nextGraphicAttributes[channel];
             })), this.setNextGraphicAttributes(nextGraphicAttributes), this.setPrevGraphicAttributes(prevGraphicAttributes), 
             this.setFinalGraphicAttributes(finalGraphicAttributes);
-            const animateGraphicAttributes = this.mark.animate.getElementAnimators(this).reduce(((attributes, animator) => Object.assign(attributes, animator.getEndAttributes())), {}), currentGraphicAttributes = Object.assign({}, animateGraphicAttributes, finalGraphicAttributes);
+            const animateGraphicAttributes = ((null === (_c = this.mark.animate) || void 0 === _c ? void 0 : _c.getElementAnimators(this)) || []).reduce(((attributes, animator) => Object.assign(attributes, animator.getEndAttributes())), {}), currentGraphicAttributes = Object.assign({}, animateGraphicAttributes, finalGraphicAttributes);
             this.graphicItem.setAttributes(currentGraphicAttributes);
         } else this.graphicItem.setAttributes(graphicAttributes);
     }