@visactor/vrender-core 1.1.0-alpha.18 → 1.1.0-alpha.19

package/dist/index.es.js

@@ -10841,18 +10841,17 @@ class Graphic extends Node {
         };
     }
     recomputeCurrentStatePatch() {
-        var _a, _b, _c, _d;
+        var _a, _b;
         if (!((_a = this.currentStates) === null || _a === void 0 ? void 0 : _a.length)) {
             this.effectiveStates = [];
             this.resolvedStatePatch = undefined;
             this.syncSharedStateActiveRegistrations();
             return;
         }
-        const stateResolveBaseAttrs = ((_b = this.baseAttributes) !== null && _b !== void 0 ? _b : this.attribute);
-        const stateModel = this.createStateModel();
-        (_c = this.stateEngine) === null || _c === void 0 ? void 0 : _c.setResolveContext(this, stateResolveBaseAttrs);
+        const stateResolveBaseAttrs = this.getStateResolveBaseAttrs();
+        const stateModel = this.createStateModel(stateResolveBaseAttrs);
         const transition = stateModel.useStates(this.currentStates);
-        const effectiveStates = (_d = transition.effectiveStates) !== null && _d !== void 0 ? _d : transition.states;
+        const effectiveStates = (_b = transition.effectiveStates) !== null && _b !== void 0 ? _b : transition.states;
         const resolvedStateAttrs = this.stateEngine && this.compiledStateDefinitions
             ? Object.assign({}, this.stateEngine.resolvedPatch) : this.getStateStyleResolver(this.stateMergeMode).resolve(stateResolveBaseAttrs, this.states, this.stateProxy, transition.states, this.stateSort);
         this.currentStates = transition.states;
@@ -11903,7 +11902,16 @@ class Graphic extends Node {
         var _a;
         return (_a = this.states) === null || _a === void 0 ? void 0 : _a[stateName];
     }
-    createStateModel() {
+    getStateResolveBaseAttrs() {
+        var _a;
+        return ((_a = this.baseAttributes) !== null && _a !== void 0 ? _a : this.attribute);
+    }
+    syncStateResolveContext(stateResolveBaseAttrs = this.getStateResolveBaseAttrs()) {
+        var _a;
+        (_a = this.stateEngine) === null || _a === void 0 ? void 0 : _a.setResolveContext(this, stateResolveBaseAttrs);
+        return stateResolveBaseAttrs;
+    }
+    createStateModel(stateResolveBaseAttrs = this.getStateResolveBaseAttrs()) {
         const { compiledDefinitions, stateProxyEligibility, stateProxyModeKey } = this.resolveEffectiveCompiledDefinitions();
         this.compiledStateDefinitions = compiledDefinitions;
         if (!compiledDefinitions) {
@@ -11931,6 +11939,7 @@ class Graphic extends Node {
             this.stateEngineMergeMode = this.stateMergeMode;
             this.stateEngineStateProxyModeKey = stateProxyModeKey;
         }
+        this.syncStateResolveContext(stateResolveBaseAttrs);
         return new StateModel({
             states: this.states,
             currentStates: this.currentStates,
@@ -12031,7 +12040,7 @@ class Graphic extends Node {
         };
     }
     resolveGraphicStateTransition(states, previousStates, forceResolverRefresh = false) {
-        var _a, _b, _c, _d;
+        var _a, _b;
         let transition = this.resolveSimpleLocalStateTransition(states, previousStates);
         const isSimpleLocalTransition = !!transition;
         let resolvedStateAttrs;
@@ -12039,18 +12048,17 @@ class Graphic extends Node {
             resolvedStateAttrs = transition.resolvedStateAttrs;
         }
         else {
-            const stateResolveBaseAttrs = ((_a = this.baseAttributes) !== null && _a !== void 0 ? _a : this.attribute);
-            const stateModel = this.createStateModel();
-            (_b = this.stateEngine) === null || _b === void 0 ? void 0 : _b.setResolveContext(this, stateResolveBaseAttrs);
+            const stateResolveBaseAttrs = this.getStateResolveBaseAttrs();
+            const stateModel = this.createStateModel(stateResolveBaseAttrs);
             if (forceResolverRefresh) {
-                (_c = this.stateEngine) === null || _c === void 0 ? void 0 : _c.invalidateResolverCache();
+                (_a = this.stateEngine) === null || _a === void 0 ? void 0 : _a.invalidateResolverCache();
             }
             transition = stateModel.useStates(states);
             resolvedStateAttrs =
                 this.stateEngine && this.compiledStateDefinitions
                     ? Object.assign({}, this.stateEngine.resolvedPatch) : this.getStateStyleResolver(this.stateMergeMode).resolve(stateResolveBaseAttrs, this.states, this.stateProxy, transition.states, this.stateSort);
         }
-        const effectiveStates = (_d = transition.effectiveStates) !== null && _d !== void 0 ? _d : transition.states;
+        const effectiveStates = (_b = transition.effectiveStates) !== null && _b !== void 0 ? _b : transition.states;
         return {
             transition,
             effectiveStates: effectiveStates,
@@ -12331,13 +12339,12 @@ class Graphic extends Node {
         }
     }
     invalidateResolver() {
-        var _a, _b, _c;
+        var _a, _b;
         if (!this.stateEngine || !((_a = this.currentStates) === null || _a === void 0 ? void 0 : _a.length) || !this.compiledStateDefinitions) {
             return;
         }
-        const stateResolveBaseAttrs = ((_b = this.baseAttributes) !== null && _b !== void 0 ? _b : this.attribute);
-        this.stateEngine.setResolveContext(this, stateResolveBaseAttrs);
-        this.resolverEpoch = ((_c = this.resolverEpoch) !== null && _c !== void 0 ? _c : 0) + 1;
+        this.syncStateResolveContext();
+        this.resolverEpoch = ((_b = this.resolverEpoch) !== null && _b !== void 0 ? _b : 0) + 1;
         this.stateEngine.invalidateResolverCache();
         const transition = this.stateEngine.applyStates(this.currentStates);
         const resolvedStateAttrs = Object.assign({}, this.stateEngine.resolvedPatch);

package/es/graphic/graphic.d.ts

@@ -245,7 +245,9 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     }): void;
     hasState(stateName?: string): boolean;
     getState(stateName: string): Partial<T> | StateDefinition<T> | undefined;
-    protected createStateModel(): StateModel<T>;
+    protected getStateResolveBaseAttrs(): Partial<T>;
+    protected syncStateResolveContext(stateResolveBaseAttrs?: Partial<T>): Partial<T>;
+    protected createStateModel(stateResolveBaseAttrs?: Partial<T>): StateModel<T>;
     protected resolveSimpleLocalStateTransition(states: string[], previousStates: readonly string[]): {
         changed: boolean;
         states: string[];

package/es/graphic/graphic.js

@@ -290,12 +290,10 @@ export class Graphic extends Node {
         };
     }
     recomputeCurrentStatePatch() {
-        var _a, _b, _c, _d;
+        var _a, _b;
         if (!(null === (_a = this.currentStates) || void 0 === _a ? void 0 : _a.length)) return this.effectiveStates = [], 
         this.resolvedStatePatch = void 0, void this.syncSharedStateActiveRegistrations();
-        const stateResolveBaseAttrs = null !== (_b = this.baseAttributes) && void 0 !== _b ? _b : this.attribute, stateModel = this.createStateModel();
-        null === (_c = this.stateEngine) || void 0 === _c || _c.setResolveContext(this, stateResolveBaseAttrs);
-        const transition = stateModel.useStates(this.currentStates), effectiveStates = null !== (_d = transition.effectiveStates) && void 0 !== _d ? _d : transition.states, resolvedStateAttrs = this.stateEngine && this.compiledStateDefinitions ? Object.assign({}, this.stateEngine.resolvedPatch) : this.getStateStyleResolver(this.stateMergeMode).resolve(stateResolveBaseAttrs, this.states, this.stateProxy, transition.states, this.stateSort);
+        const stateResolveBaseAttrs = this.getStateResolveBaseAttrs(), transition = this.createStateModel(stateResolveBaseAttrs).useStates(this.currentStates), effectiveStates = null !== (_b = transition.effectiveStates) && void 0 !== _b ? _b : transition.states, resolvedStateAttrs = this.stateEngine && this.compiledStateDefinitions ? Object.assign({}, this.stateEngine.resolvedPatch) : this.getStateStyleResolver(this.stateMergeMode).resolve(stateResolveBaseAttrs, this.states, this.stateProxy, transition.states, this.stateSort);
         this.currentStates = transition.states, this.effectiveStates = [ ...effectiveStates ], 
         this.resolvedStatePatch = resolvedStateAttrs, this.syncSharedStateActiveRegistrations();
     }
@@ -879,7 +877,16 @@ export class Graphic extends Node {
         var _a;
         return null === (_a = this.states) || void 0 === _a ? void 0 : _a[stateName];
     }
-    createStateModel() {
+    getStateResolveBaseAttrs() {
+        var _a;
+        return null !== (_a = this.baseAttributes) && void 0 !== _a ? _a : this.attribute;
+    }
+    syncStateResolveContext(stateResolveBaseAttrs = this.getStateResolveBaseAttrs()) {
+        var _a;
+        return null === (_a = this.stateEngine) || void 0 === _a || _a.setResolveContext(this, stateResolveBaseAttrs), 
+        stateResolveBaseAttrs;
+    }
+    createStateModel(stateResolveBaseAttrs = this.getStateResolveBaseAttrs()) {
         const {compiledDefinitions: compiledDefinitions, stateProxyEligibility: stateProxyEligibility, stateProxyModeKey: stateProxyModeKey} = this.resolveEffectiveCompiledDefinitions();
         return this.compiledStateDefinitions = compiledDefinitions, compiledDefinitions ? this.stateEngine && this.stateEngineCompiledDefinitions === compiledDefinitions && this.stateEngineStateProxy === this.stateProxy && this.stateEngineStateSort === this.stateSort && this.stateEngineMergeMode === this.stateMergeMode && this.stateEngineStateProxyModeKey === stateProxyModeKey || (this.stateEngine = new StateEngine({
             compiledDefinitions: compiledDefinitions,
@@ -892,7 +899,7 @@ export class Graphic extends Node {
         this.stateEngineStateSort = this.stateSort, this.stateEngineMergeMode = this.stateMergeMode, 
         this.stateEngineStateProxyModeKey = stateProxyModeKey) : (this.stateEngine = void 0, 
         this.stateEngineCompiledDefinitions = void 0, this.stateEngineStateProxyModeKey = void 0), 
-        new StateModel({
+        this.syncStateResolveContext(stateResolveBaseAttrs), new StateModel({
             states: this.states,
             currentStates: this.currentStates,
             stateSort: this.stateSort,
@@ -954,19 +961,18 @@ export class Graphic extends Node {
         };
     }
     resolveGraphicStateTransition(states, previousStates, forceResolverRefresh = !1) {
-        var _a, _b, _c, _d;
+        var _a, _b;
         let transition = this.resolveSimpleLocalStateTransition(states, previousStates);
         const isSimpleLocalTransition = !!transition;
         let resolvedStateAttrs;
         if (transition) resolvedStateAttrs = transition.resolvedStateAttrs; else {
-            const stateResolveBaseAttrs = null !== (_a = this.baseAttributes) && void 0 !== _a ? _a : this.attribute, stateModel = this.createStateModel();
-            null === (_b = this.stateEngine) || void 0 === _b || _b.setResolveContext(this, stateResolveBaseAttrs), 
-            forceResolverRefresh && (null === (_c = this.stateEngine) || void 0 === _c || _c.invalidateResolverCache()), 
+            const stateResolveBaseAttrs = this.getStateResolveBaseAttrs(), stateModel = this.createStateModel(stateResolveBaseAttrs);
+            forceResolverRefresh && (null === (_a = this.stateEngine) || void 0 === _a || _a.invalidateResolverCache()), 
             transition = stateModel.useStates(states), resolvedStateAttrs = this.stateEngine && this.compiledStateDefinitions ? Object.assign({}, this.stateEngine.resolvedPatch) : this.getStateStyleResolver(this.stateMergeMode).resolve(stateResolveBaseAttrs, this.states, this.stateProxy, transition.states, this.stateSort);
         }
         return {
             transition: transition,
-            effectiveStates: null !== (_d = transition.effectiveStates) && void 0 !== _d ? _d : transition.states,
+            effectiveStates: null !== (_b = transition.effectiveStates) && void 0 !== _b ? _b : transition.states,
             resolvedStateAttrs: resolvedStateAttrs,
             isSimpleLocalTransition: isSimpleLocalTransition
         };
@@ -1123,10 +1129,10 @@ export class Graphic extends Node {
         }
     }
     invalidateResolver() {
-        var _a, _b, _c;
+        var _a, _b;
         if (!this.stateEngine || !(null === (_a = this.currentStates) || void 0 === _a ? void 0 : _a.length) || !this.compiledStateDefinitions) return;
-        const stateResolveBaseAttrs = null !== (_b = this.baseAttributes) && void 0 !== _b ? _b : this.attribute;
-        this.stateEngine.setResolveContext(this, stateResolveBaseAttrs), this.resolverEpoch = (null !== (_c = this.resolverEpoch) && void 0 !== _c ? _c : 0) + 1, 
+        this.syncStateResolveContext();
+        this.resolverEpoch = (null !== (_b = this.resolverEpoch) && void 0 !== _b ? _b : 0) + 1, 
         this.stateEngine.invalidateResolverCache();
         const transition = this.stateEngine.applyStates(this.currentStates), resolvedStateAttrs = Object.assign({}, this.stateEngine.resolvedPatch);
         this.effectiveStates = [ ...transition.effectiveStates ], this.resolvedStatePatch = resolvedStateAttrs,