@visactor/vchart 2.1.0-alpha.18 → 2.1.0-alpha.19

package/cjs/mark/area.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/area.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAE5C,gDAAyE;AAIzE,gDAAkE;AAClE,iFAA6E;AAC7E,6FAAyF;AACzF,kEAAgF;AAChF,sEAAoF;AACpF,yDAAoD;AAEpD,MAAM,uBAAuB,GAAG;IAC9B,GAAG,mCAAuB;IAC1B,MAAM;IACN,aAAa;IACb,YAAY;IACZ,SAAS;IACT,gBAAgB;IAChB,aAAa;IACb,cAAc;CACf,CAAC;AAEF,MAAa,QAAS,SAAQ,wBAA2B;IAAzD;;QAEW,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;QAkB9B,yBAAoB,GAAG,CAAC,OAAe,EAAE,EAAE;YACzC,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC7D,CAAC,CAAC;IACJ,CAAC;IAnBW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,SAAS,EAAE,CAAC,GACb,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;IAES,qBAAqB;QAC7B,OAAO,uBAAuB,CAAC;IACjC,CAAC;IAES,oBAAoB;QAC5B,OAAO,EAAE,CAAC;IACZ,CAAC;;AAlBH,4BAuBC;AAtBiB,aAAI,UAAqB;AAwBpC,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,iBAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9C,IAAA,wCAAkB,GAAE,CAAC;IACrB,IAAA,4BAAY,GAAE,CAAC;IACf,IAAA,4BAAqB,GAAE,CAAC;IACxB,IAAA,gCAAuB,GAAE,CAAC;IAC1B,IAAA,oCAA2B,GAAE,CAAC;IAC9B,iBAAO,CAAC,wBAAwB,SAAoB,yBAAU,CAAC,CAAC;AAClE,CAAC,CAAC;AARW,QAAA,gBAAgB,oBAQ3B","file":"area.js","sourcesContent":["import { Factory } from './../core/factory';\nimport type { IAreaMarkSpec } from '../typings/visual';\nimport { BaseLineMark, LINE_SEGMENT_ATTRIBUTES } from './base/base-line';\nimport type { IAreaMark, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\nimport { registerLineOrAreaAnimation } from '../animation/config';\nimport { registerArea } from '@visactor/vrender-kits/register/register-area';\nimport { registerShadowRoot } from '@visactor/vrender-kits/register/register-shadowRoot';\nimport { registerLineDataLabel } from '@visactor/vrender-components/label/line';\nimport { registerSymbolDataLabel } from '@visactor/vrender-components/label/symbol';\nimport { createArea } from '@visactor/vrender-core';\n\nconst AREA_SEGMENT_ATTRIBUTES = [\n  ...LINE_SEGMENT_ATTRIBUTES,\n  'fill',\n  'fillOpacity',\n  'background',\n  'texture',\n  'texturePadding',\n  'textureSize',\n  'textureColor'\n];\n\nexport class AreaMark extends BaseLineMark<IAreaMarkSpec> implements IAreaMark {\n  static readonly type = MarkTypeEnum.area;\n  readonly type = AreaMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IAreaMarkSpec> = {\n      ...super._getDefaultStyle(),\n      lineWidth: 0\n    };\n    return defaultStyle;\n  }\n\n  protected _getSegmentAttributes() {\n    return AREA_SEGMENT_ATTRIBUTES;\n  }\n\n  protected _getIgnoreAttributes(): string[] {\n    return [];\n  }\n\n  _isValidPointChannel = (channel: string) => {\n    return ['x', 'y', 'x1', 'y1', 'defined'].includes(channel);\n  };\n}\n\nexport const registerAreaMark = () => {\n  Factory.registerMark(AreaMark.type, AreaMark);\n  registerShadowRoot();\n  registerArea();\n  registerLineDataLabel();\n  registerSymbolDataLabel();\n  registerLineOrAreaAnimation();\n  Factory.registerGraphicComponent(MarkTypeEnum.area, createArea);\n};\n"]}
+{"version":3,"sources":["../src/mark/area.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAE5C,gDAAyE;AAIzE,gDAAkE;AAClE,yDAA0E;AAC1E,qEAA8F;AAC9F,yDAAoD;AAEpD,MAAM,uBAAuB,GAAG;IAC9B,GAAG,mCAAuB;IAC1B,MAAM;IACN,aAAa;IACb,YAAY;IACZ,SAAS;IACT,gBAAgB;IAChB,aAAa;IACb,cAAc;CACf,CAAC;AAEF,MAAa,QAAS,SAAQ,wBAA2B;IAAzD;;QAEW,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;QAkB9B,yBAAoB,GAAG,CAAC,OAAe,EAAE,EAAE;YACzC,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC7D,CAAC,CAAC;IACJ,CAAC;IAnBW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,SAAS,EAAE,CAAC,GACb,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;IAES,qBAAqB;QAC7B,OAAO,uBAAuB,CAAC;IACjC,CAAC;IAES,oBAAoB;QAC5B,OAAO,EAAE,CAAC;IACZ,CAAC;;AAlBH,4BAuBC;AAtBiB,aAAI,UAAqB;AAwBpC,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,iBAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9C,IAAA,iCAAkB,GAAE,CAAC;IACrB,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,0CAAqB,GAAE,CAAC;IACxB,IAAA,4CAAuB,GAAE,CAAC;IAC1B,IAAA,oCAA2B,GAAE,CAAC;IAC9B,iBAAO,CAAC,wBAAwB,SAAoB,yBAAU,CAAC,CAAC;AAClE,CAAC,CAAC;AARW,QAAA,gBAAgB,oBAQ3B","file":"area.js","sourcesContent":["import { Factory } from './../core/factory';\nimport type { IAreaMarkSpec } from '../typings/visual';\nimport { BaseLineMark, LINE_SEGMENT_ATTRIBUTES } from './base/base-line';\nimport type { IAreaMark, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\nimport { registerLineOrAreaAnimation } from '../animation/config';\nimport { registerArea, registerShadowRoot } from '@visactor/vrender-kits';\nimport { registerLineDataLabel, registerSymbolDataLabel } from '@visactor/vrender-components';\nimport { createArea } from '@visactor/vrender-core';\n\nconst AREA_SEGMENT_ATTRIBUTES = [\n  ...LINE_SEGMENT_ATTRIBUTES,\n  'fill',\n  'fillOpacity',\n  'background',\n  'texture',\n  'texturePadding',\n  'textureSize',\n  'textureColor'\n];\n\nexport class AreaMark extends BaseLineMark<IAreaMarkSpec> implements IAreaMark {\n  static readonly type = MarkTypeEnum.area;\n  readonly type = AreaMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IAreaMarkSpec> = {\n      ...super._getDefaultStyle(),\n      lineWidth: 0\n    };\n    return defaultStyle;\n  }\n\n  protected _getSegmentAttributes() {\n    return AREA_SEGMENT_ATTRIBUTES;\n  }\n\n  protected _getIgnoreAttributes(): string[] {\n    return [];\n  }\n\n  _isValidPointChannel = (channel: string) => {\n    return ['x', 'y', 'x1', 'y1', 'defined'].includes(channel);\n  };\n}\n\nexport const registerAreaMark = () => {\n  Factory.registerMark(AreaMark.type, AreaMark);\n  registerShadowRoot();\n  registerArea();\n  registerLineDataLabel();\n  registerSymbolDataLabel();\n  registerLineOrAreaAnimation();\n  Factory.registerGraphicComponent(MarkTypeEnum.area, createArea);\n};\n"]}

package/cjs/mark/base/base-mark.d.ts

@@ -5,7 +5,7 @@ import { MarkTypeEnum } from '../interface';
 import type { IMarkRaw, IMarkStateStyle, IMarkStyle, IMark, IMarkOption, StyleConvert, MarkInputStyle, GroupedData, IAttrs, IMarkGraphic, ProgressiveContext, IProgressiveTransformResult, MarkType, AnimationStateValues } from '../interface';
 import type { ICompilableMark, IMarkCompileOption, IMarkConfig, IMarkStateManager, StateValueType } from '../../compile/mark/interface';
 import type { ICompilableInitOption } from '../../compile/interface';
-import type { IGroupGraphicAttribute, IGroup, IGraphic, StateDefinitionsInput } from '@visactor/vrender-core';
+import type { IGroupGraphicAttribute, IGroup, IGraphic } from '@visactor/vrender-core';
 import { GrammarItem } from '../../compile/grammar-item';
 import type { IModel } from '../../model/interface';
 import type { ICompilableData } from '../../compile/data/interface';
@@ -74,7 +74,7 @@ export declare class BaseMark<T extends ICommonSpec> extends GrammarItem impleme
     stopAnimationByState(state?: string): void;
     pauseAnimationByState(state?: string): void;
     resumeAnimationByState(state?: string): void;
-    removeProduct(releaseDetach?: boolean): void;
+    removeProduct(): void;
     release(): void;
     protected _simpleStyle: T;
     setSimpleStyle(s: T): void;
@@ -82,10 +82,6 @@ export declare class BaseMark<T extends ICommonSpec> extends GrammarItem impleme
     protected _option: IMarkOption;
     protected _attributeContext: IModelMarkAttributeContext;
     protected _encoderOfState: Record<string, Record<string, (datum: Datum) => any>>;
-    protected _sharedStateDefinitionsCacheKey?: string;
-    protected _sharedStateDefinitionsCache?: StateDefinitionsInput<Record<string, unknown>>;
-    protected _sharedStateDefinitionRefIds: WeakMap<object, number>;
-    protected _sharedStateDefinitionRefId: number;
     _extensionChannel: {
         [key: string | number | symbol]: string[];
     };
@@ -159,14 +155,8 @@ export declare class BaseMark<T extends ICommonSpec> extends GrammarItem impleme
     protected _getEncoderOfStyle: (stateName: string, style: Partial<IAttrs<T>>) => Record<string, (datum: Datum) => any>;
     protected _setGraphicFromMarkConfig: (g: IMarkGraphic) => void;
     protected _setStateOfGraphic: (g: IMarkGraphic, hasAnimation?: boolean) => void;
-    protected _getSharedStateDefinitionRefId(value: unknown): string;
-    protected _getSharedStateDefinitionValueKey(value: unknown): string;
-    protected _isStaticSharedStateAttribute(stateName: string, key: string): boolean;
-    protected _applySharedStateDefinitions(): void;
     protected _addProgressiveGraphic(parent: IGroup, g: IMarkGraphic): void;
     protected _runEncoder(graphics: IMarkGraphic[], noGroupEncode?: boolean): void;
-    protected _excludeStateControlledDiffAttrs(g: IMarkGraphic, diffAttrs: Record<string, any>): Record<string, any>;
-    protected _hasDiffAttrs(g: IMarkGraphic): boolean;
     protected _runApplyGraphic(graphics: IMarkGraphic[]): void;
     protected _updateEncoderByState(): void;
     protected _runState(graphics: IMarkGraphic[]): void;

package/cjs/mark/base/base-mark.js

@@ -14,7 +14,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.BaseMark = void 0;
 
-const enum_1 = require("../interface/enum"), interface_1 = require("../../compile/mark/interface"), vutils_extension_1 = require("@visactor/vutils-extension"), color_1 = require("../../util/color"), scale_1 = require("../../util/scale"), gradient_1 = require("../../constant/gradient"), attribute_1 = require("../../constant/attribute"), vscale_1 = require("@visactor/vscale"), util_1 = require("../../theme/color-scheme/util"), mark_1 = require("../../compile/mark"), vutils_1 = require("@visactor/vutils"), common_1 = require("../utils/common"), interface_2 = require("../../compile/interface"), vrender_core_1 = require("@visactor/vrender-core"), util_2 = require("../../compile/mark/util"), factory_1 = require("../../core/factory"), data_1 = require("../../constant/data"), grammar_item_1 = require("../../compile/grammar-item"), layout_1 = require("../../constant/layout"), interface_3 = require("../../animation/interface"), compilable_data_1 = require("../../compile/data/compilable-data"), mark_2 = require("../../util/mark"), debug_1 = require("../../util/debug"), morph_1 = require("../../compile/morph"), graphic_state_1 = require("../../util/graphic-state"), statesClearedBeforeReInitKey = Symbol("statesClearedBeforeReInit");
+const enum_1 = require("../interface/enum"), interface_1 = require("../../compile/mark/interface"), vutils_extension_1 = require("@visactor/vutils-extension"), color_1 = require("../../util/color"), scale_1 = require("../../util/scale"), gradient_1 = require("../../constant/gradient"), attribute_1 = require("../../constant/attribute"), vscale_1 = require("@visactor/vscale"), util_1 = require("../../theme/color-scheme/util"), mark_1 = require("../../compile/mark"), vutils_1 = require("@visactor/vutils"), common_1 = require("../utils/common"), interface_2 = require("../../compile/interface"), vrender_core_1 = require("@visactor/vrender-core"), util_2 = require("../../compile/mark/util"), factory_1 = require("../../core/factory"), data_1 = require("../../constant/data"), grammar_item_1 = require("../../compile/grammar-item"), layout_1 = require("../../constant/layout"), interface_3 = require("../../animation/interface"), compilable_data_1 = require("../../compile/data/compilable-data"), mark_2 = require("../../util/mark"), debug_1 = require("../../util/debug"), morph_1 = require("../../compile/morph");
 
 class BaseMark extends grammar_item_1.GrammarItem {
     commit(render, recursion) {
@@ -170,8 +170,8 @@ class BaseMark extends grammar_item_1.GrammarItem {
     stopAnimationByState(state) {}
     pauseAnimationByState(state) {}
     resumeAnimationByState(state) {}
-    removeProduct(releaseDetach) {
-        this._product && this._product.parent && this._product.parent.removeChild(this._product, releaseDetach), 
+    removeProduct() {
+        this._product && this._product.parent && this._product.parent.removeChild(this._product), 
         this._product = null, this._compiledProductId = null;
     }
     release() {
@@ -189,8 +189,7 @@ class BaseMark extends grammar_item_1.GrammarItem {
             zIndex: layout_1.LayoutZIndex.Mark,
             morph: !1
         }, this._visible = !0, this.stateStyle = {}, this._unCompileChannel = {}, this._disabledAnimationStates = [], 
-        this._skipBeforeLayouted = !1, this._sharedStateDefinitionRefIds = new WeakMap, 
-        this._sharedStateDefinitionRefId = 0, this._extensionChannel = {}, this._computeExChannel = {}, 
+        this._skipBeforeLayouted = !1, this._extensionChannel = {}, this._computeExChannel = {}, 
         this._graphicMap = new Map, this._graphics = [], this._getEncoderOfStyle = (stateName, style) => {
             if (style && stateName) {
                 const validEncoder = {};
@@ -204,10 +203,10 @@ class BaseMark extends grammar_item_1.GrammarItem {
             setCustomizedShape && (g.pathProxy = attrs => setCustomizedShape(g.context.data, attrs, new vrender_core_1.CustomPath2D)), 
             graphicName && ((0, vutils_1.isFunction)(graphicName) ? g.name = graphicName(g) : g.name = graphicName);
         }, this._setStateOfGraphic = (g, hasAnimation) => {
-            var _a, _b, _c;
-            const targetStates = g.context.diffState === enum_1.DiffState.enter || g.context.diffState === enum_1.DiffState.update ? g.context.states : void 0, hasCurrentState = !!((null === (_a = g.currentStates) || void 0 === _a ? void 0 : _a.length) || (null === (_b = g.effectiveStates) || void 0 === _b ? void 0 : _b.length) || g.resolvedStatePatch || (null === (_c = g.registeredActiveScopes) || void 0 === _c ? void 0 : _c.size));
-            ((null == targetStates ? void 0 : targetStates.length) || hasCurrentState) && (0, 
-            graphic_state_1.setGraphicStates)(g, targetStates, hasAnimation);
+            g.clearStates(), g.stateProxy = null, g.context.diffState !== enum_1.DiffState.enter && g.context.diffState !== enum_1.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));
         }, this.name = name, this.model = option.model, this.key = option.key, this.state = new mark_1.MarkStateManager(option, this), 
         this._attributeContext = option.attributeContext, null === (_a = option.map) || void 0 === _a || _a.set(this.id, this);
     }
@@ -545,7 +544,6 @@ class BaseMark extends grammar_item_1.GrammarItem {
         if (graphics.forEach((g => {
             const state = g.context.animationState;
             if ("appear" === state) return;
-            if ("update" === state && !this._hasDiffAttrs(g)) return;
             const config = animationConfig[state];
             if (config && config.length > 0) {
                 const configList = config.map(((item, index) => ({
@@ -576,7 +574,7 @@ class BaseMark extends grammar_item_1.GrammarItem {
             return diffState === interface_3.AnimationStateEnum.exit ? interface_3.AnimationStateEnum.exit : diffState === interface_3.AnimationStateEnum.update ? interface_3.AnimationStateEnum.update : interface_3.AnimationStateEnum.appear;
         }), customizedState = callback(g);
         g.context.animationState = null != customizedState ? customizedState : g.context.diffState, 
-        g.context.animationState === enum_1.DiffState.exit && (g.context.reusing = !0, g.stopAnimates());
+        g.context.animationState === enum_1.DiffState.exit && (g.context.reusing = !0, g.animates && g.animates.forEach((a => a.stop())));
     }
     _runJoin(data) {
         const newGroupedData = this._getDataByKey(data), prevGroupedData = this._prevDataByKey, allGraphics = [], enterGraphics = new Set(this._graphics.filter((g => g.context.diffState === enum_1.DiffState.enter))), callback = (key, newData, prevData) => {
@@ -645,102 +643,41 @@ class BaseMark extends grammar_item_1.GrammarItem {
             groupStyles: groupStyles
         };
     }
-    _getSharedStateDefinitionRefId(value) {
-        if ("object" != typeof value && "function" != typeof value || null === value) return `${value}`;
-        const objectValue = value;
-        let id = this._sharedStateDefinitionRefIds.get(objectValue);
-        return id || (id = ++this._sharedStateDefinitionRefId, this._sharedStateDefinitionRefIds.set(objectValue, id)), 
-        `ref:${id}`;
-    }
-    _getSharedStateDefinitionValueKey(value) {
-        try {
-            const jsonValue = JSON.stringify(value);
-            return null != jsonValue ? jsonValue : `${value}`;
-        } catch (_error) {
-            return this._getSharedStateDefinitionRefId(value);
-        }
-    }
-    _isStaticSharedStateAttribute(stateName, key) {
-        var _a, _b;
-        const stateStyle = null === (_a = this.stateStyle[stateName]) || void 0 === _a ? void 0 : _a[key];
-        if (!stateStyle || stateStyle.referer || (0, vutils_1.isFunction)(stateStyle.postProcess) || key in this._computeExChannel) return !1;
-        const style = stateStyle.style;
-        return !(0, vutils_1.isFunction)(style) && (!gradient_1.GradientType.includes(null == style ? void 0 : style.gradient) && (![ "outerBorder", "innerBorder" ].includes(key) && !(0, 
-        vscale_1.isValidScaleType)(null === (_b = null == style ? void 0 : style.scale) || void 0 === _b ? void 0 : _b.type)));
-    }
-    _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 (void 0 !== this._product.sharedStateDefinitions && (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 = {}, cacheKeys = [];
-        if (stateNames.forEach((stateName => {
-            var _a;
-            const encoder = this._encoderOfState[stateName], patch = {}, dynamicEncoder = {}, patchKeys = [], dynamicKeys = [];
-            if (Object.keys(null != encoder ? encoder : {}).forEach((key => {
-                this._isStaticSharedStateAttribute(stateName, key) ? (patch[key] = this._computeAttribute(key, stateName)(void 0), 
-                patchKeys.push(key)) : (dynamicEncoder[key] = encoder[key], dynamicKeys.push(key));
-            })), !patchKeys.length && !dynamicKeys.length) return;
-            const definition = {
-                priority: null !== (_a = statePriority.get(stateName)) && void 0 !== _a ? _a : 0
-            };
-            patchKeys.length && (definition.patch = patch), dynamicKeys.length && (definition.declaredAffectedKeys = dynamicKeys, 
-            definition.resolver = ({graphic: graphic}) => this._runEncoderOfGraphic(dynamicEncoder, graphic)), 
-            sharedStateDefinitions[stateName] = definition, cacheKeys.push([ stateName, definition.priority, patchKeys.sort().map((key => `${key}:${this._getSharedStateDefinitionValueKey(patch[key])}`)), dynamicKeys.sort().map((key => {
-                var _a;
-                const stateStyle = null === (_a = this.stateStyle[stateName]) || void 0 === _a ? void 0 : _a[key];
-                return `${key}:${this._getSharedStateDefinitionRefId(null == stateStyle ? void 0 : stateStyle.style)}:${this._getSharedStateDefinitionRefId(null == stateStyle ? void 0 : stateStyle.postProcess)}:${this._getSharedStateDefinitionRefId(null == stateStyle ? void 0 : stateStyle.referer)}`;
-            })) ].join("|"));
-        })), !cacheKeys.length) return void (void 0 !== this._product.sharedStateDefinitions && (this._product.sharedStateDefinitions = void 0));
-        const cacheKey = cacheKeys.sort().join("||");
-        cacheKey === this._sharedStateDefinitionsCacheKey && this._sharedStateDefinitionsCache ? this._product.sharedStateDefinitions !== this._sharedStateDefinitionsCache && (this._product.sharedStateDefinitions = this._sharedStateDefinitionsCache) : (this._sharedStateDefinitionsCacheKey = cacheKey, 
-        this._sharedStateDefinitionsCache = sharedStateDefinitions, 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 => {
-            var _a;
-            const attrs = this._runEncoderOfGraphic(null === (_a = this._encoderOfState) || void 0 === _a ? void 0 : _a.update, g);
-            (0, vutils_1.isNil)(this._markConfig.interactive) || (attrs.pickable = this._markConfig.interactive);
+        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);
+            })), (0, vutils_1.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;
         }));
     }
-    _excludeStateControlledDiffAttrs(g, diffAttrs) {
-        if (!diffAttrs || !Object.keys(diffAttrs).length || !g.resolvedStatePatch) return diffAttrs;
-        let nextDiffAttrs;
-        return Object.keys(g.resolvedStatePatch).forEach((key => {
-            key in diffAttrs && (nextDiffAttrs || (nextDiffAttrs = Object.assign({}, diffAttrs)), 
-            delete nextDiffAttrs[key]);
-        })), null != nextDiffAttrs ? nextDiffAttrs : diffAttrs;
-    }
-    _hasDiffAttrs(g) {
-        return !!g.context.diffAttrs && Object.keys(g.context.diffAttrs).length > 0;
-    }
     _runApplyGraphic(graphics) {
         const hasAnimation = this.hasAnimation();
         graphics.forEach(((g, index) => {
-            var _a, _b;
+            var _a, _b, _c;
             const finalAttrs = g.context.finalAttrs, hasStateAnimation = this.hasAnimationByState(g.context.animationState);
             if (g.setAttributes) {
-                const diffAttrs = this._excludeStateControlledDiffAttrs(g, (0, mark_2.getDiffAttributesOfGraphic)(g, finalAttrs));
+                const diffAttrs = (0, mark_2.getDiffAttributesOfGraphic)(g, finalAttrs);
                 g.context.diffAttrs = diffAttrs, g.context.reusing ? (g.context.lastAttrs = g.attribute, 
-                g.initAttributes(finalAttrs), g.context.reusing = !1) : hasStateAnimation || (hasAnimation ? g.setAttributesAndPreventAnimate(diffAttrs) : g.setAttributes(diffAttrs)), 
-                !(null === (_b = this.renderContext) || void 0 === _b ? void 0 : _b.progressive) && this._product && g.parent !== this._product && this._product.appendChild(g);
+                g.initAttributes({}), g.context.reusing = !1) : hasStateAnimation || (hasAnimation ? g.setAttributesAndPreventAnimate(diffAttrs) : g.setAttributes(diffAttrs)), 
+                !(null === (_c = this.renderContext) || void 0 === _c ? void 0 : _c.progressive) && this._product && g.parent !== this._product && this._product.appendChild(g), 
+                hasAnimation && g.setFinalAttributes(finalAttrs);
             } else {
                 const mockGraphic = g;
-                (g = this._createGraphic(finalAttrs)).context = mockGraphic.context, g.context.diffAttrs = finalAttrs, 
-                g.stateSort = this._stateSort;
+                g = this._createGraphic(finalAttrs), hasAnimation && (null === (_a = g.setFinalAttributes) || void 0 === _a || _a.call(g, finalAttrs)), 
+                g.context = mockGraphic.context, g.context.diffAttrs = finalAttrs, g.stateSort = this._stateSort;
                 const gIndex = this._graphics === graphics ? index : index + this._graphics.length - graphics.length;
-                if (gIndex >= 0 && (this._graphics[gIndex] = g), null === (_a = this.renderContext) || void 0 === _a ? void 0 : _a.progressive) {
+                if (gIndex >= 0 && (this._graphics[gIndex] = g), null === (_b = this.renderContext) || void 0 === _b ? void 0 : _b.progressive) {
                     const groupIndex = this._dataByGroup ? this._dataByGroup.keys.indexOf(g.context.groupKey) : 0, group = groupIndex >= 0 ? this._product.getChildAt(groupIndex) : null;
                     group && this._addProgressiveGraphic(group, g);
                 } else this._product.appendChild(g), this._graphicMap.set(g.context.uniqueKey, g);
@@ -803,7 +740,7 @@ class BaseMark extends grammar_item_1.GrammarItem {
     }
     renderInner() {
         var _a, _b, _c;
-        this._updateEncoderByState(), this._applySharedStateDefinitions();
+        this._updateEncoderByState();
         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) {
@@ -829,12 +766,7 @@ class BaseMark extends grammar_item_1.GrammarItem {
         if (!this._product) return;
         const stateInfo = this.state.getStateInfo(key);
         this._graphics.forEach((g => {
-            const reinitStateGraphic = g, statesClearedBeforeReInit = reinitStateGraphic[statesClearedBeforeReInitKey], wasStateClearedBeforeReInit = null == statesClearedBeforeReInit ? void 0 : statesClearedBeforeReInit.includes(key), hasStateAnimation = !wasStateClearedBeforeReInit && this.hasAnimationByState("state");
-            if ("in" === this.state.checkOneState(g, g.context.data, stateInfo) ? (0, graphic_state_1.addGraphicState)(g, key, !0, hasStateAnimation) : (0, 
-            graphic_state_1.removeGraphicState)(g, key, hasStateAnimation), wasStateClearedBeforeReInit) {
-                const nextStates = statesClearedBeforeReInit.filter((stateName => stateName !== key));
-                nextStates.length ? reinitStateGraphic[statesClearedBeforeReInitKey] = nextStates : delete reinitStateGraphic[statesClearedBeforeReInitKey];
-            }
+            "in" === this.state.checkOneState(g, g.context.data, stateInfo) ? g.addState(key, !0, this.hasAnimationByState("state")) : g.removeState(key, this.hasAnimationByState("state"));
         }));
     }
     clearExitGraphics() {
@@ -854,7 +786,7 @@ class BaseMark extends grammar_item_1.GrammarItem {
                         })
                     })));
                     g.applyAnimationState([ "exit" ], [ 1 === exitConfigList.length ? exitConfigList[0] : exitConfigList ], (() => {
-                        g.context.diffState === enum_1.DiffState.exit && g.isExiting && this._graphicMap.get(key) === g && doRemove(g, key);
+                        doRemove(g, key);
                     }));
                 }
             } else doRemove(g, key);
@@ -965,8 +897,7 @@ class BaseMark extends grammar_item_1.GrammarItem {
     }
     clearBeforeReInit() {
         this.state.clearAllStateInfo(), this.uncommit(), this.stateStyle = {}, this.getGraphics().forEach((g => {
-            var _a;
-            (null === (_a = g.currentStates) || void 0 === _a ? void 0 : _a.length) && (g[statesClearedBeforeReInitKey] = g.currentStates.slice());
+            g.clearStates();
         }));
     }
 }