@visactor/vchart 2.0.23-alpha.6 → 2.1.0-alpha.0

package/esm/mark/base/base-mark.js

@@ -56,6 +56,8 @@ import { log } from "../../util/debug";
 
 import { morph as runMorph } from "../../compile/morph";
 
+import { addGraphicState, removeGraphicState } from "../../util/graphic-state";
+
 export class BaseMark extends GrammarItem {
     commit(render, recursion) {
         recursion && this.getMarks().length > 0 && this.getMarks().forEach((m => m.commit(!1, recursion))), 
@@ -241,10 +243,7 @@ export class BaseMark extends GrammarItem {
             setCustomizedShape && (g.pathProxy = attrs => setCustomizedShape(g.context.data, attrs, new CustomPath2D)), 
             graphicName && (isFunction(graphicName) ? g.name = graphicName(g) : g.name = graphicName);
         }, this._setStateOfGraphic = (g, hasAnimation) => {
-            g.clearStates(), g.stateProxy = null, g.context.diffState !== DiffState.enter && g.context.diffState !== DiffState.update || (g.stateProxy = (stateName, nexStates) => {
-                var _a;
-                return this._runEncoderOfGraphic(null === (_a = this._encoderOfState) || void 0 === _a ? void 0 : _a[stateName], g);
-            }, g.context.states && g.useStates(g.context.states, hasAnimation));
+            g.clearStates(), g.stateProxy = null, g.context.diffState !== DiffState.enter && g.context.diffState !== DiffState.update || g.context.states && g.useStates(g.context.states, hasAnimation);
         }, this.name = name, this.model = option.model, this.key = option.key, this.state = new MarkStateManager(option, this), 
         this._attributeContext = option.attributeContext, null === (_a = option.map) || void 0 === _a || _a.set(this.id, this);
     }
@@ -676,20 +675,36 @@ export class BaseMark extends GrammarItem {
             groupStyles: groupStyles
         };
     }
+    _applySharedStateDefinitions() {
+        var _a;
+        if (!this._product) return;
+        const stateNames = Object.keys(null !== (_a = this._encoderOfState) && void 0 !== _a ? _a : {}).filter((stateName => "group" !== stateName && "update" !== stateName));
+        if (!stateNames.length) return void (this._product.sharedStateDefinitions = void 0);
+        const sortedStateNames = this._stateSort ? stateNames.slice().sort(this._stateSort) : stateNames, statePriority = new Map;
+        sortedStateNames.forEach(((stateName, index) => {
+            statePriority.set(stateName, index);
+        }));
+        const sharedStateDefinitions = {};
+        stateNames.forEach((stateName => {
+            var _a;
+            const encoder = this._encoderOfState[stateName];
+            sharedStateDefinitions[stateName] = {
+                priority: null !== (_a = statePriority.get(stateName)) && void 0 !== _a ? _a : 0,
+                declaredAffectedKeys: Object.keys(null != encoder ? encoder : {}),
+                resolver: ({graphic: graphic}) => this._runEncoderOfGraphic(encoder, graphic)
+            };
+        })), this._product.sharedStateDefinitions = sharedStateDefinitions;
+    }
     _addProgressiveGraphic(parent, g) {
         parent.incrementalAppendChild(g);
     }
     _runEncoder(graphics, noGroupEncode) {
         var _a;
         const attrsByGroup = noGroupEncode ? null : this._runGroupEncoder(null === (_a = this._encoderOfState) || void 0 === _a ? void 0 : _a.group);
-        graphics.forEach(((g, index) => {
-            var _a, _b;
-            let attrs = this._runEncoderOfGraphic(null === (_a = this._encoderOfState) || void 0 === _a ? void 0 : _a.update, g);
-            null === (_b = g.currentStates) || void 0 === _b || _b.forEach((_state => {
-                var _a;
-                const stateAttr = this._runEncoderOfGraphic(null === (_a = this._encoderOfState) || void 0 === _a ? void 0 : _a[_state], g);
-                attrs = Object.assign(Object.assign({}, attrs), stateAttr);
-            })), isNil(this._markConfig.interactive) || (attrs.pickable = this._markConfig.interactive);
+        graphics.forEach((g => {
+            var _a;
+            const attrs = this._runEncoderOfGraphic(null === (_a = this._encoderOfState) || void 0 === _a ? void 0 : _a.update, g);
+            isNil(this._markConfig.interactive) || (attrs.pickable = this._markConfig.interactive);
             const finalAttrs = this._transformGraphicAttributes(g, attrs, null == attrsByGroup ? void 0 : attrsByGroup[g.context.groupKey]);
             g.context.finalAttrs = finalAttrs;
         }));
@@ -773,7 +788,7 @@ export class BaseMark extends GrammarItem {
     }
     renderInner() {
         var _a, _b, _c;
-        this._updateEncoderByState();
+        this._updateEncoderByState(), this._applySharedStateDefinitions();
         const data = null !== (_b = null === (_a = this._data) || void 0 === _a ? void 0 : _a.getProduct()) && void 0 !== _b ? _b : [ {} ], transformData = this._runBeforeTransform(data);
         let markData;
         if (null == transformData ? void 0 : transformData.progressive) {
@@ -798,7 +813,7 @@ export class BaseMark extends GrammarItem {
         if (!this._product) return;
         const stateInfo = this.state.getStateInfo(key);
         this._graphics.forEach((g => {
-            "in" === this.state.checkOneState(g, g.context.data, stateInfo) ? g.addState(key, !0, this.hasAnimationByState("state")) : g.removeState(key, this.hasAnimationByState("state"));
+            "in" === this.state.checkOneState(g, g.context.data, stateInfo) ? addGraphicState(g, key, !0, this.hasAnimationByState("state")) : removeGraphicState(g, key, this.hasAnimationByState("state"));
         }));
     }
     clearExitGraphics() {