@visactor/vrender-core 1.1.4-alpha.2 → 1.1.4-alpha.3

package/dist/index.es.js

@@ -711,7 +711,7 @@ class Node extends EventEmitter {
         this.parent = null;
         this._count = 1;
     }
-    onParentSharedStateTreeChanged(_stage, _layer, _inheritedSharedStateScope) {
+    onParentSharedStateTreeChanged(_stage, _layer) {
         return;
     }
     forEachChildren(cb, reverse = false) {
@@ -9222,10 +9222,6 @@ class StateEngine {
         this.baseAttributes = baseAttributes;
     }
     applyStates(stateNames) {
-        const singleStaticStateResult = this.tryApplySingleStaticState(stateNames);
-        if (singleStaticStateResult) {
-            return singleStaticStateResult;
-        }
         const uniqueStates = Array.from(new Set(stateNames));
         const sortedStates = this.sortStates(uniqueStates);
         const adjudicated = this.adjudicate(sortedStates);
@@ -9248,36 +9244,6 @@ class StateEngine {
             suppressed: [...this._suppressed]
         };
     }
-    tryApplySingleStaticState(stateNames) {
-        if (stateNames.length !== 1 || this.mergeMode !== 'shallow') {
-            return undefined;
-        }
-        const stateName = stateNames[0];
-        const definition = this.compiledDefinitions.get(stateName);
-        if (definition && (definition.hasResolver || definition.exclude.size || definition.suppress.size)) {
-            return undefined;
-        }
-        const changed = this._activeStates.length !== 1 ||
-            this._activeStates[0] !== stateName ||
-            this._effectiveStates.length !== 1 ||
-            this._effectiveStates[0] !== stateName ||
-            this._suppressed.length !== 0;
-        this._activeStates = [stateName];
-        this._effectiveStates = [stateName];
-        this._suppressed = [];
-        if (changed || !this.resolverCacheValid) {
-            this.resolverPatchCache.clear();
-            this.resolverCacheKey = stateName;
-            this.resolverCacheValid = true;
-            this._resolvedPatch = (definition === null || definition === void 0 ? void 0 : definition.patch) ? cloneValue(definition.patch) : {};
-        }
-        return {
-            changed,
-            activeStates: [...this._activeStates],
-            effectiveStates: [...this._effectiveStates],
-            suppressed: []
-        };
-    }
     addState(stateName, keepCurrentStates) {
         if (this._activeStates.includes(stateName) && (keepCurrentStates || this._activeStates.length === 1)) {
             return {
@@ -9994,8 +9960,9 @@ class GraphicImpl extends Node {
         }
         return (_a = this.stage) === null || _a === void 0 ? void 0 : _a.rootSharedStateScope;
     }
-    syncSharedStateScopeBinding(nextScope, markDirty = true) {
+    syncSharedStateScopeBindingFromTree(markDirty = true) {
         var _a;
+        const nextScope = this.resolveBoundSharedStateScope();
         if (this.boundSharedStateScope === nextScope) {
             this.syncSharedStateActiveRegistrations();
             return false;
@@ -10012,13 +9979,7 @@ class GraphicImpl extends Node {
         }
         return true;
     }
-    syncSharedStateScopeBindingFromTree(markDirty = true, inheritedSharedStateScope) {
-        const nextScope = inheritedSharedStateScope === undefined
-            ? this.resolveBoundSharedStateScope()
-            : inheritedSharedStateScope !== null && inheritedSharedStateScope !== void 0 ? inheritedSharedStateScope : undefined;
-        return this.syncSharedStateScopeBinding(nextScope, markDirty);
-    }
-    syncSharedStateScopeBindingOnTreeChange(markDirty = true, inheritedSharedStateScope) {
+    syncSharedStateScopeBindingOnTreeChange(markDirty = true) {
         var _a, _b;
         if (!((_a = this.currentStates) === null || _a === void 0 ? void 0 : _a.length) &&
             !this.boundSharedStateScope &&
@@ -10026,7 +9987,7 @@ class GraphicImpl extends Node {
             !this.sharedStateDirty) {
             return false;
         }
-        return this.syncSharedStateScopeBindingFromTree(markDirty, inheritedSharedStateScope);
+        return this.syncSharedStateScopeBindingFromTree(markDirty);
     }
     syncSharedStateActiveRegistrations() {
         var _a;
@@ -10041,9 +10002,6 @@ class GraphicImpl extends Node {
             this.registeredActiveScopes = undefined;
             return;
         }
-        if ((previousScopes === null || previousScopes === void 0 ? void 0 : previousScopes.size) && this.isSharedStateScopeChainRegistered(previousScopes)) {
-            return;
-        }
         const nextScopes = new Set(collectSharedStateScopeChain(this.boundSharedStateScope));
         previousScopes === null || previousScopes === void 0 ? void 0 : previousScopes.forEach(scope => {
             if (!nextScopes.has(scope)) {
@@ -10055,18 +10013,6 @@ class GraphicImpl extends Node {
         });
         this.registeredActiveScopes = nextScopes;
     }
-    isSharedStateScopeChainRegistered(previousScopes) {
-        let scope = this.boundSharedStateScope;
-        let scopeCount = 0;
-        while (scope) {
-            if (!previousScopes.has(scope)) {
-                return false;
-            }
-            scopeCount += 1;
-            scope = scope.parentScope;
-        }
-        return scopeCount === previousScopes.size;
-    }
     clearSharedStateActiveRegistrations() {
         const previousScopes = this.registeredActiveScopes;
         if (previousScopes) {
@@ -10082,12 +10028,12 @@ class GraphicImpl extends Node {
         enqueueGraphicSharedStateRefresh(this.stage, this);
         scheduleStageSharedStateRefresh(this.stage);
     }
-    onParentSharedStateTreeChanged(stage, layer, inheritedSharedStateScope) {
+    onParentSharedStateTreeChanged(stage, layer) {
         if (this.stage !== stage || this.layer !== layer) {
-            this.setStage(stage, layer, inheritedSharedStateScope);
+            this.setStage(stage, layer);
             return;
         }
-        this.syncSharedStateScopeBindingOnTreeChange(true, inheritedSharedStateScope);
+        this.syncSharedStateScopeBindingOnTreeChange();
     }
     refreshSharedStateBeforeRender() {
         var _a;
@@ -11244,16 +11190,6 @@ class GraphicImpl extends Node {
         var _a;
         return (_a = this.states) === null || _a === void 0 ? void 0 : _a[stateName];
     }
-    setStateDefinitionsWithCompiled(definitions, compiledDefinitions) {
-        var _a;
-        this.states = definitions;
-        if (this.localStateDefinitionsSource !== definitions) {
-            this.localStateDefinitionsSource = definitions;
-            this.localStateDefinitionsVersion = ((_a = this.localStateDefinitionsVersion) !== null && _a !== void 0 ? _a : 0) + 1;
-        }
-        this.compiledStateDefinitions = compiledDefinitions;
-        this.compiledStateDefinitionsCacheKey = `local:${this.localStateDefinitionsVersion}`;
-    }
     getStateResolveBaseAttrs() {
         var _a;
         return ((_a = this.baseAttributes) !== null && _a !== void 0 ? _a : this.attribute);
@@ -11570,12 +11506,11 @@ class GraphicImpl extends Node {
         }
     }
     addState(stateName, keepCurrentStates, hasAnimation) {
-        const currentStates = this.currentStates;
-        if ((currentStates === null || currentStates === void 0 ? void 0 : currentStates.includes(stateName)) && (keepCurrentStates || currentStates.length === 1)) {
+        const transition = this.resolveAddStateTransition(stateName, keepCurrentStates);
+        if (!transition.changed) {
             return;
         }
-        const nextStates = keepCurrentStates && (currentStates === null || currentStates === void 0 ? void 0 : currentStates.length) ? currentStates.concat([stateName]) : [stateName];
-        this.useStates(nextStates, hasAnimation);
+        this.useStates(transition.states, hasAnimation);
     }
     setStates(states, options) {
         var _a, _b, _c;
@@ -11813,7 +11748,7 @@ class GraphicImpl extends Node {
             this._globalTransMatrix.translate(scrollX, scrollY);
         }
     }
-    setStage(stage, layer, inheritedSharedStateScope) {
+    setStage(stage, layer) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const graphicService = (_c = (_a = stage === null || stage === void 0 ? void 0 : stage.graphicService) !== null && _a !== void 0 ? _a : (_b = this.stage) === null || _b === void 0 ? void 0 : _b.graphicService) !== null && _c !== void 0 ? _c : application.graphicService;
         const previousStage = this.stage;
@@ -11824,7 +11759,7 @@ class GraphicImpl extends Node {
                 this.boundSharedStateScope ||
                 ((_e = this.registeredActiveScopes) === null || _e === void 0 ? void 0 : _e.size) ||
                 this.sharedStateDirty) {
-                this.syncSharedStateScopeBindingOnTreeChange(true, inheritedSharedStateScope);
+                this.syncSharedStateScopeBindingOnTreeChange(true);
             }
             this.setStageToShadowRoot(stage, layer);
             if (this.mayHaveTrackedAnimates() && this.hasAnyTrackedAnimate()) {
@@ -11874,7 +11809,7 @@ class GraphicImpl extends Node {
             this.boundSharedStateScope ||
             ((_k = this.registeredActiveScopes) === null || _k === void 0 ? void 0 : _k.size) ||
             this.sharedStateDirty) {
-            this.syncSharedStateScopeBindingOnTreeChange(true, inheritedSharedStateScope);
+            this.syncSharedStateScopeBindingOnTreeChange(true);
         }
     }
     detachStageForRelease() {
@@ -15661,8 +15596,8 @@ class RichText extends Graphic {
     clone() {
         return new RichText(Object.assign({}, this.attribute));
     }
-    setStage(stage, layer, inheritedSharedStateScope) {
-        super.setStage(stage, layer, inheritedSharedStateScope);
+    setStage(stage, layer) {
+        super.setStage(stage, layer);
         const frameCache = this.getFrameCache();
         frameCache.icons.forEach(icon => {
             icon.setStage(stage, layer);
@@ -16516,7 +16451,7 @@ class Group extends Graphic {
     }
     incrementalAppendChild(node) {
         const data = super.appendChild(node);
-        if (data && this.shouldSyncChildSharedStateTreeBinding(data)) {
+        if (data) {
             this.syncChildSharedStateTreeBinding(data);
         }
         this.addUpdateBoundTag();
@@ -16530,7 +16465,7 @@ class Group extends Graphic {
         return;
     }
     _updateChildToStage(child) {
-        if (child && this.shouldSyncChildSharedStateTreeBinding(child)) {
+        if (child) {
             this.syncChildSharedStateTreeBinding(child);
         }
         this.addUpdateBoundTag();
@@ -16538,8 +16473,10 @@ class Group extends Graphic {
     }
     appendChild(node, addStage = true) {
         const data = super.appendChild(node);
-        if (data && addStage && this.shouldSyncChildSharedStateTreeBinding(data)) {
-            this.syncChildSharedStateTreeBinding(data);
+        if (data) {
+            if (addStage) {
+                this.syncChildSharedStateTreeBinding(data);
+            }
         }
         this.addUpdateBoundTag();
         return data;
@@ -16581,7 +16518,7 @@ class Group extends Graphic {
         });
         this.addUpdateBoundTag();
     }
-    setStage(stage, layer, inheritedSharedStateScope) {
+    setStage(stage, layer) {
         var _a, _b, _c, _d, _e, _f;
         const graphicService = (_c = (_a = stage === null || stage === void 0 ? void 0 : stage.graphicService) !== null && _a !== void 0 ? _a : (_b = this.stage) === null || _b === void 0 ? void 0 : _b.graphicService) !== null && _c !== void 0 ? _c : application.graphicService;
         const needsSharedStateTreeSync = this.hasSharedStateDefinitions() ||
@@ -16595,12 +16532,12 @@ class Group extends Graphic {
             this.layer = layer;
             if (needsSharedStateTreeSync) {
                 this.ensureSharedStateScopeBound();
-                this.syncSharedStateScopeBindingOnTreeChange(true, inheritedSharedStateScope);
+                this.syncSharedStateScopeBindingOnTreeChange(true);
             }
             this.setStageToShadowRoot(stage, layer);
             this._onSetStage && this._onSetStage(this, stage, layer);
             (_f = graphicService === null || graphicService === void 0 ? void 0 : graphicService.onSetStage) === null || _f === void 0 ? void 0 : _f.call(graphicService, this, stage);
-            this.notifyChildrenSharedStateTreeChanged(inheritedSharedStateScope);
+            this.notifyChildrenSharedStateTreeChanged();
             return;
         }
         const layerChanged = this.layer !== layer;
@@ -16609,11 +16546,11 @@ class Group extends Graphic {
         }
         if (needsSharedStateTreeSync) {
             this.ensureSharedStateScopeBound();
-            this.syncSharedStateScopeBindingOnTreeChange(true, inheritedSharedStateScope);
-            this.notifyChildrenSharedStateTreeChanged(inheritedSharedStateScope);
+            this.syncSharedStateScopeBindingOnTreeChange(true);
+            this.notifyChildrenSharedStateTreeChanged();
         }
         else if (layerChanged) {
-            this.notifyChildrenSharedStateTreeChanged(inheritedSharedStateScope);
+            this.notifyChildrenSharedStateTreeChanged();
         }
     }
     addUpdatePositionTag() {
@@ -16708,55 +16645,23 @@ class Group extends Graphic {
     hasSharedStateDefinitions() {
         return !!this._sharedStateDefinitions && Object.keys(this._sharedStateDefinitions).length > 0;
     }
-    resolveChildSharedStateScope(inheritedSharedStateScope) {
-        var _a;
-        if (this.sharedStateScope) {
-            return this.sharedStateScope;
-        }
-        if (inheritedSharedStateScope !== undefined) {
-            return inheritedSharedStateScope;
-        }
-        return (_a = this.resolveBoundSharedStateScope()) !== null && _a !== void 0 ? _a : null;
-    }
-    notifyChildrenSharedStateTreeChanged(inheritedSharedStateScope) {
-        const childSharedStateScope = this.resolveChildSharedStateScope(inheritedSharedStateScope);
+    notifyChildrenSharedStateTreeChanged() {
         this.forEachChildren(item => {
-            this.setStageToChild(item, childSharedStateScope);
+            this.syncChildSharedStateTreeBinding(item);
         });
     }
-    shouldSyncChildSharedStateTreeBinding(child) {
-        if (this.stage || this.layer) {
-            return true;
-        }
-        return (child.onParentSharedStateTreeChanged !== Graphic.prototype.onParentSharedStateTreeChanged &&
-            child.onParentSharedStateTreeChanged !== Group.prototype.onParentSharedStateTreeChanged);
-    }
-    setStageToChild(child, inheritedSharedStateScope) {
-        const graphic = child;
-        if (typeof graphic.setStage === 'function' &&
-            (child.onParentSharedStateTreeChanged === Graphic.prototype.onParentSharedStateTreeChanged ||
-                child.onParentSharedStateTreeChanged === Group.prototype.onParentSharedStateTreeChanged) &&
-            (graphic.stage !== this.stage || graphic.layer !== this.layer)) {
-            graphic.setStage(this.stage, this.layer, inheritedSharedStateScope);
-            return;
-        }
-        child.onParentSharedStateTreeChanged(this.stage, this.layer, inheritedSharedStateScope);
-    }
-    syncChildSharedStateTreeBinding(child, inheritedSharedStateScope) {
-        if (inheritedSharedStateScope === undefined) {
-            inheritedSharedStateScope = this.resolveChildSharedStateScope();
-        }
-        this.setStageToChild(child, inheritedSharedStateScope);
+    syncChildSharedStateTreeBinding(child) {
+        child.onParentSharedStateTreeChanged(this.stage, this.layer);
     }
-    onParentSharedStateTreeChanged(stage, layer, inheritedSharedStateScope) {
+    onParentSharedStateTreeChanged(stage, layer) {
         var _a;
         if (this.stage !== stage || this.layer !== layer) {
-            this.setStage(stage, layer, inheritedSharedStateScope);
+            this.setStage(stage, layer);
             return;
         }
         this.ensureSharedStateScopeBound();
-        this.syncSharedStateScopeBindingOnTreeChange(!!((_a = this.currentStates) === null || _a === void 0 ? void 0 : _a.length), inheritedSharedStateScope);
-        this.notifyChildrenSharedStateTreeChanged(inheritedSharedStateScope);
+        this.syncSharedStateScopeBindingOnTreeChange(!!((_a = this.currentStates) === null || _a === void 0 ? void 0 : _a.length));
+        this.notifyChildrenSharedStateTreeChanged();
     }
 }
 Group.NOWORK_ANIMATE_ATTR = NOWORK_ANIMATE_ATTR;

package/es/graphic/graphic.d.ts

@@ -142,14 +142,12 @@ declare abstract class GraphicImpl<T extends Partial<IGraphicAttribute> = Partia
     getAttributes(): T;
     protected getStateTransitionOrchestrator(): StateTransitionOrchestrator<T>;
     protected resolveBoundSharedStateScope(): SharedStateScope<T> | SharedStateScope<Record<string, any>> | undefined;
-    protected syncSharedStateScopeBinding(nextScope: SharedStateScope<T> | SharedStateScope<Record<string, any>> | undefined, markDirty?: boolean): boolean;
-    protected syncSharedStateScopeBindingFromTree(markDirty?: boolean, inheritedSharedStateScope?: SharedStateScope<Record<string, any>> | null): boolean;
-    protected syncSharedStateScopeBindingOnTreeChange(markDirty?: boolean, inheritedSharedStateScope?: SharedStateScope<Record<string, any>> | null): boolean;
+    protected syncSharedStateScopeBindingFromTree(markDirty?: boolean): boolean;
+    protected syncSharedStateScopeBindingOnTreeChange(markDirty?: boolean): boolean;
     protected syncSharedStateActiveRegistrations(): void;
-    protected isSharedStateScopeChainRegistered(previousScopes: Set<SharedStateScope<T>>): boolean;
     protected clearSharedStateActiveRegistrations(): void;
     protected markSharedStateDirty(): void;
-    onParentSharedStateTreeChanged(stage?: IStage, layer?: ILayer, inheritedSharedStateScope?: SharedStateScope<Record<string, any>> | null): void;
+    onParentSharedStateTreeChanged(stage?: IStage, layer?: ILayer): void;
     refreshSharedStateBeforeRender(): void;
     protected getLocalStatesVersion(): number;
     protected resolveEffectiveCompiledDefinitions(): {
@@ -239,7 +237,6 @@ declare abstract class GraphicImpl<T extends Partial<IGraphicAttribute> = Partia
     }): void;
     hasState(stateName?: string): boolean;
     getState(stateName: string): Partial<T> | StateDefinition<T> | undefined;
-    setStateDefinitionsWithCompiled(definitions: StateDefinitionsInput<T>, compiledDefinitions: Map<string, CompiledStateDefinition<T>>): void;
     protected getStateResolveBaseAttrs(): Partial<T>;
     protected syncStateResolveContext(stateResolveBaseAttrs?: Partial<T>): Partial<T>;
     protected ensureStateEngine(stateResolveBaseAttrs?: Partial<T>): StateEngine<T>;
@@ -295,7 +292,7 @@ declare abstract class GraphicImpl<T extends Partial<IGraphicAttribute> = Partia
     }, resetScale?: boolean): [number, number];
     protected doUpdateLocalMatrix(): void;
     protected doUpdateGlobalMatrix(): void;
-    setStage(stage?: IStage, layer?: ILayer, inheritedSharedStateScope?: SharedStateScope<Record<string, any>> | null): void;
+    setStage(stage?: IStage, layer?: ILayer): void;
     detachStageForRelease(): void;
     setStageToShadowRoot(stage?: IStage, layer?: ILayer): void;
     onAddStep(step: IStep): void;

package/es/graphic/graphic.js

@@ -181,8 +181,9 @@ class GraphicImpl extends Node {
         }
         return null === (_a = this.stage) || void 0 === _a ? void 0 : _a.rootSharedStateScope;
     }
-    syncSharedStateScopeBinding(nextScope, markDirty = !0) {
+    syncSharedStateScopeBindingFromTree(markDirty = !0) {
         var _a;
+        const nextScope = this.resolveBoundSharedStateScope();
         return this.boundSharedStateScope === nextScope ? (this.syncSharedStateActiveRegistrations(), 
         !1) : (this.boundSharedStateScope = nextScope, this.boundSharedStateRevision = void 0, 
         this.compiledStateDefinitions = void 0, this.compiledStateDefinitionsCacheKey = void 0, 
@@ -190,13 +191,9 @@ class GraphicImpl extends Node {
         markDirty && (null === (_a = this.currentStates) || void 0 === _a ? void 0 : _a.length) && this.markSharedStateDirty(), 
         !0);
     }
-    syncSharedStateScopeBindingFromTree(markDirty = !0, inheritedSharedStateScope) {
-        const nextScope = void 0 === inheritedSharedStateScope ? this.resolveBoundSharedStateScope() : null != inheritedSharedStateScope ? inheritedSharedStateScope : void 0;
-        return this.syncSharedStateScopeBinding(nextScope, markDirty);
-    }
-    syncSharedStateScopeBindingOnTreeChange(markDirty = !0, inheritedSharedStateScope) {
+    syncSharedStateScopeBindingOnTreeChange(markDirty = !0) {
         var _a, _b;
-        return !!((null === (_a = this.currentStates) || void 0 === _a ? void 0 : _a.length) || this.boundSharedStateScope || (null === (_b = this.registeredActiveScopes) || void 0 === _b ? void 0 : _b.size) || this.sharedStateDirty) && this.syncSharedStateScopeBindingFromTree(markDirty, inheritedSharedStateScope);
+        return !!((null === (_a = this.currentStates) || void 0 === _a ? void 0 : _a.length) || this.boundSharedStateScope || (null === (_b = this.registeredActiveScopes) || void 0 === _b ? void 0 : _b.size) || this.sharedStateDirty) && this.syncSharedStateScopeBindingFromTree(markDirty);
     }
     syncSharedStateActiveRegistrations() {
         var _a;
@@ -204,7 +201,6 @@ class GraphicImpl extends Node {
         if (!(null === (_a = this.currentStates) || void 0 === _a ? void 0 : _a.length) || !this.boundSharedStateScope) return (null == previousScopes ? void 0 : previousScopes.size) && (previousScopes.forEach((scope => {
             scope.subtreeActiveDescendants.delete(this);
         })), previousScopes.clear()), void (this.registeredActiveScopes = void 0);
-        if ((null == previousScopes ? void 0 : previousScopes.size) && this.isSharedStateScopeChainRegistered(previousScopes)) return;
         const nextScopes = new Set(collectSharedStateScopeChain(this.boundSharedStateScope));
         null == previousScopes || previousScopes.forEach((scope => {
             nextScopes.has(scope) || scope.subtreeActiveDescendants.delete(this);
@@ -212,14 +208,6 @@ class GraphicImpl extends Node {
             scope.subtreeActiveDescendants.add(this);
         })), this.registeredActiveScopes = nextScopes;
     }
-    isSharedStateScopeChainRegistered(previousScopes) {
-        let scope = this.boundSharedStateScope, scopeCount = 0;
-        for (;scope; ) {
-            if (!previousScopes.has(scope)) return !1;
-            scopeCount += 1, scope = scope.parentScope;
-        }
-        return scopeCount === previousScopes.size;
-    }
     clearSharedStateActiveRegistrations() {
         const previousScopes = this.registeredActiveScopes;
         previousScopes && (previousScopes.forEach((scope => {
@@ -230,8 +218,8 @@ class GraphicImpl extends Node {
         this.sharedStateDirty = !0, enqueueGraphicSharedStateRefresh(this.stage, this), 
         scheduleStageSharedStateRefresh(this.stage);
     }
-    onParentSharedStateTreeChanged(stage, layer, inheritedSharedStateScope) {
-        this.stage === stage && this.layer === layer ? this.syncSharedStateScopeBindingOnTreeChange(!0, inheritedSharedStateScope) : this.setStage(stage, layer, inheritedSharedStateScope);
+    onParentSharedStateTreeChanged(stage, layer) {
+        this.stage === stage && this.layer === layer ? this.syncSharedStateScopeBindingOnTreeChange() : this.setStage(stage, layer);
     }
     refreshSharedStateBeforeRender() {
         var _a;
@@ -874,12 +862,6 @@ class GraphicImpl extends Node {
         var _a;
         return null === (_a = this.states) || void 0 === _a ? void 0 : _a[stateName];
     }
-    setStateDefinitionsWithCompiled(definitions, compiledDefinitions) {
-        var _a;
-        this.states = definitions, this.localStateDefinitionsSource !== definitions && (this.localStateDefinitionsSource = definitions, 
-        this.localStateDefinitionsVersion = (null !== (_a = this.localStateDefinitionsVersion) && void 0 !== _a ? _a : 0) + 1), 
-        this.compiledStateDefinitions = compiledDefinitions, this.compiledStateDefinitionsCacheKey = `local:${this.localStateDefinitionsVersion}`;
-    }
     getStateResolveBaseAttrs() {
         var _a;
         return null !== (_a = this.baseAttributes) && void 0 !== _a ? _a : this.attribute;
@@ -1068,10 +1050,8 @@ class GraphicImpl extends Node {
         transition.changed && this.useStates(transition.states, hasAnimation);
     }
     addState(stateName, keepCurrentStates, hasAnimation) {
-        const currentStates = this.currentStates;
-        if ((null == currentStates ? void 0 : currentStates.includes(stateName)) && (keepCurrentStates || 1 === currentStates.length)) return;
-        const nextStates = keepCurrentStates && (null == currentStates ? void 0 : currentStates.length) ? currentStates.concat([ stateName ]) : [ stateName ];
-        this.useStates(nextStates, hasAnimation);
+        const transition = this.resolveAddStateTransition(stateName, keepCurrentStates);
+        transition.changed && this.useStates(transition.states, hasAnimation);
     }
     setStates(states, options) {
         var _a, _b, _c;
@@ -1206,11 +1186,11 @@ class GraphicImpl extends Node {
             this._globalTransMatrix.translate(scrollX, scrollY);
         }
     }
-    setStage(stage, layer, inheritedSharedStateScope) {
+    setStage(stage, layer) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const graphicService = null !== (_c = null !== (_a = null == stage ? void 0 : stage.graphicService) && void 0 !== _a ? _a : null === (_b = this.stage) || void 0 === _b ? void 0 : _b.graphicService) && void 0 !== _c ? _c : application.graphicService, previousStage = this.stage;
         if (this.stage !== stage || this.layer !== layer) {
-            if (this.stage = stage, this.layer = layer, ((null === (_d = this.currentStates) || void 0 === _d ? void 0 : _d.length) || this.boundSharedStateScope || (null === (_e = this.registeredActiveScopes) || void 0 === _e ? void 0 : _e.size) || this.sharedStateDirty) && this.syncSharedStateScopeBindingOnTreeChange(!0, inheritedSharedStateScope), 
+            if (this.stage = stage, this.layer = layer, ((null === (_d = this.currentStates) || void 0 === _d ? void 0 : _d.length) || this.boundSharedStateScope || (null === (_e = this.registeredActiveScopes) || void 0 === _e ? void 0 : _e.size) || this.sharedStateDirty) && this.syncSharedStateScopeBindingOnTreeChange(!0), 
             this.setStageToShadowRoot(stage, layer), this.mayHaveTrackedAnimates() && this.hasAnyTrackedAnimate()) {
                 const previousTimeline = null === (_f = null == previousStage ? void 0 : previousStage.getTimeline) || void 0 === _f ? void 0 : _f.call(previousStage), nextTimeline = null === (_g = null == stage ? void 0 : stage.getTimeline) || void 0 === _g ? void 0 : _g.call(stage), detachedStageAnimates = [];
                 this.visitTrackedAnimates((a => {
@@ -1228,7 +1208,7 @@ class GraphicImpl extends Node {
             }
             return this._onSetStage && this._onSetStage(this, stage, layer), void (null === (_h = null == graphicService ? void 0 : graphicService.onSetStage) || void 0 === _h || _h.call(graphicService, this, stage));
         }
-        ((null === (_j = this.currentStates) || void 0 === _j ? void 0 : _j.length) || this.boundSharedStateScope || (null === (_k = this.registeredActiveScopes) || void 0 === _k ? void 0 : _k.size) || this.sharedStateDirty) && this.syncSharedStateScopeBindingOnTreeChange(!0, inheritedSharedStateScope);
+        ((null === (_j = this.currentStates) || void 0 === _j ? void 0 : _j.length) || this.boundSharedStateScope || (null === (_k = this.registeredActiveScopes) || void 0 === _k ? void 0 : _k.size) || this.sharedStateDirty) && this.syncSharedStateScopeBindingOnTreeChange(!0);
     }
     detachStageForRelease() {
         var _a, _b, _c;