@visactor/vrender-core 1.1.5 → 1.1.6-alpha.0

package/dist/index.es.js

@@ -711,7 +711,7 @@ class Node extends EventEmitter {
         this.parent = null;
         this._count = 1;
     }
-    onParentSharedStateTreeChanged(_stage, _layer) {
+    onParentSharedStateTreeChanged(_stage, _layer, _inheritedSharedStateScope) {
         return;
     }
     forEachChildren(cb, reverse = false) {
@@ -9960,9 +9960,8 @@ class GraphicImpl extends Node {
         }
         return (_a = this.stage) === null || _a === void 0 ? void 0 : _a.rootSharedStateScope;
     }
-    syncSharedStateScopeBindingFromTree(markDirty = true) {
+    syncSharedStateScopeBinding(nextScope, markDirty = true) {
         var _a;
-        const nextScope = this.resolveBoundSharedStateScope();
         if (this.boundSharedStateScope === nextScope) {
             this.syncSharedStateActiveRegistrations();
             return false;
@@ -9979,7 +9978,13 @@ class GraphicImpl extends Node {
         }
         return true;
     }
-    syncSharedStateScopeBindingOnTreeChange(markDirty = 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) {
         var _a, _b;
         if (!((_a = this.currentStates) === null || _a === void 0 ? void 0 : _a.length) &&
             !this.boundSharedStateScope &&
@@ -9987,7 +9992,7 @@ class GraphicImpl extends Node {
             !this.sharedStateDirty) {
             return false;
         }
-        return this.syncSharedStateScopeBindingFromTree(markDirty);
+        return this.syncSharedStateScopeBindingFromTree(markDirty, inheritedSharedStateScope);
     }
     syncSharedStateActiveRegistrations() {
         var _a;
@@ -10002,6 +10007,9 @@ 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)) {
@@ -10013,6 +10021,18 @@ 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) {
@@ -10028,12 +10048,12 @@ class GraphicImpl extends Node {
         enqueueGraphicSharedStateRefresh(this.stage, this);
         scheduleStageSharedStateRefresh(this.stage);
     }
-    onParentSharedStateTreeChanged(stage, layer) {
+    onParentSharedStateTreeChanged(stage, layer, inheritedSharedStateScope) {
         if (this.stage !== stage || this.layer !== layer) {
-            this.setStage(stage, layer);
+            this.setStage(stage, layer, inheritedSharedStateScope);
             return;
         }
-        this.syncSharedStateScopeBindingOnTreeChange();
+        this.syncSharedStateScopeBindingOnTreeChange(true, inheritedSharedStateScope);
     }
     refreshSharedStateBeforeRender() {
         var _a;
@@ -11190,6 +11210,16 @@ 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);
@@ -11748,7 +11778,7 @@ class GraphicImpl extends Node {
             this._globalTransMatrix.translate(scrollX, scrollY);
         }
     }
-    setStage(stage, layer) {
+    setStage(stage, layer, inheritedSharedStateScope) {
         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;
@@ -11759,7 +11789,7 @@ class GraphicImpl extends Node {
                 this.boundSharedStateScope ||
                 ((_e = this.registeredActiveScopes) === null || _e === void 0 ? void 0 : _e.size) ||
                 this.sharedStateDirty) {
-                this.syncSharedStateScopeBindingOnTreeChange(true);
+                this.syncSharedStateScopeBindingOnTreeChange(true, inheritedSharedStateScope);
             }
             this.setStageToShadowRoot(stage, layer);
             if (this.mayHaveTrackedAnimates() && this.hasAnyTrackedAnimate()) {
@@ -11809,7 +11839,7 @@ class GraphicImpl extends Node {
             this.boundSharedStateScope ||
             ((_k = this.registeredActiveScopes) === null || _k === void 0 ? void 0 : _k.size) ||
             this.sharedStateDirty) {
-            this.syncSharedStateScopeBindingOnTreeChange(true);
+            this.syncSharedStateScopeBindingOnTreeChange(true, inheritedSharedStateScope);
         }
     }
     detachStageForRelease() {
@@ -15596,8 +15626,8 @@ class RichText extends Graphic {
     clone() {
         return new RichText(Object.assign({}, this.attribute));
     }
-    setStage(stage, layer) {
-        super.setStage(stage, layer);
+    setStage(stage, layer, inheritedSharedStateScope) {
+        super.setStage(stage, layer, inheritedSharedStateScope);
         const frameCache = this.getFrameCache();
         frameCache.icons.forEach(icon => {
             icon.setStage(stage, layer);
@@ -16518,7 +16548,7 @@ class Group extends Graphic {
         });
         this.addUpdateBoundTag();
     }
-    setStage(stage, layer) {
+    setStage(stage, layer, inheritedSharedStateScope) {
         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() ||
@@ -16532,12 +16562,12 @@ class Group extends Graphic {
             this.layer = layer;
             if (needsSharedStateTreeSync) {
                 this.ensureSharedStateScopeBound();
-                this.syncSharedStateScopeBindingOnTreeChange(true);
+                this.syncSharedStateScopeBindingOnTreeChange(true, inheritedSharedStateScope);
             }
             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();
+            this.notifyChildrenSharedStateTreeChanged(inheritedSharedStateScope);
             return;
         }
         const layerChanged = this.layer !== layer;
@@ -16546,11 +16576,11 @@ class Group extends Graphic {
         }
         if (needsSharedStateTreeSync) {
             this.ensureSharedStateScopeBound();
-            this.syncSharedStateScopeBindingOnTreeChange(true);
-            this.notifyChildrenSharedStateTreeChanged();
+            this.syncSharedStateScopeBindingOnTreeChange(true, inheritedSharedStateScope);
+            this.notifyChildrenSharedStateTreeChanged(inheritedSharedStateScope);
         }
         else if (layerChanged) {
-            this.notifyChildrenSharedStateTreeChanged();
+            this.notifyChildrenSharedStateTreeChanged(inheritedSharedStateScope);
         }
     }
     addUpdatePositionTag() {
@@ -16645,23 +16675,48 @@ class Group extends Graphic {
     hasSharedStateDefinitions() {
         return !!this._sharedStateDefinitions && Object.keys(this._sharedStateDefinitions).length > 0;
     }
-    notifyChildrenSharedStateTreeChanged() {
+    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);
         this.forEachChildren(item => {
-            this.syncChildSharedStateTreeBinding(item);
+            this.setStageToChild(item, childSharedStateScope);
         });
     }
-    syncChildSharedStateTreeBinding(child) {
-        child.onParentSharedStateTreeChanged(this.stage, this.layer);
+    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);
     }
-    onParentSharedStateTreeChanged(stage, layer) {
+    onParentSharedStateTreeChanged(stage, layer, inheritedSharedStateScope) {
         var _a;
         if (this.stage !== stage || this.layer !== layer) {
-            this.setStage(stage, layer);
+            this.setStage(stage, layer, inheritedSharedStateScope);
             return;
         }
         this.ensureSharedStateScopeBound();
-        this.syncSharedStateScopeBindingOnTreeChange(!!((_a = this.currentStates) === null || _a === void 0 ? void 0 : _a.length));
-        this.notifyChildrenSharedStateTreeChanged();
+        this.syncSharedStateScopeBindingOnTreeChange(!!((_a = this.currentStates) === null || _a === void 0 ? void 0 : _a.length), inheritedSharedStateScope);
+        this.notifyChildrenSharedStateTreeChanged(inheritedSharedStateScope);
     }
 }
 Group.NOWORK_ANIMATE_ATTR = NOWORK_ANIMATE_ATTR;

package/es/graphic/graphic.d.ts

@@ -142,12 +142,14 @@ 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 syncSharedStateScopeBindingFromTree(markDirty?: boolean): boolean;
-    protected syncSharedStateScopeBindingOnTreeChange(markDirty?: boolean): boolean;
+    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 syncSharedStateActiveRegistrations(): void;
+    protected isSharedStateScopeChainRegistered(previousScopes: Set<SharedStateScope<T>>): boolean;
     protected clearSharedStateActiveRegistrations(): void;
     protected markSharedStateDirty(): void;
-    onParentSharedStateTreeChanged(stage?: IStage, layer?: ILayer): void;
+    onParentSharedStateTreeChanged(stage?: IStage, layer?: ILayer, inheritedSharedStateScope?: SharedStateScope<Record<string, any>> | null): void;
     refreshSharedStateBeforeRender(): void;
     protected getLocalStatesVersion(): number;
     protected resolveEffectiveCompiledDefinitions(): {
@@ -237,6 +239,7 @@ 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>;
@@ -292,7 +295,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): void;
+    setStage(stage?: IStage, layer?: ILayer, inheritedSharedStateScope?: SharedStateScope<Record<string, any>> | null): void;
     detachStageForRelease(): void;
     setStageToShadowRoot(stage?: IStage, layer?: ILayer): void;
     onAddStep(step: IStep): void;

package/es/graphic/graphic.js

@@ -181,9 +181,8 @@ class GraphicImpl extends Node {
         }
         return null === (_a = this.stage) || void 0 === _a ? void 0 : _a.rootSharedStateScope;
     }
-    syncSharedStateScopeBindingFromTree(markDirty = !0) {
+    syncSharedStateScopeBinding(nextScope, 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, 
@@ -191,9 +190,13 @@ class GraphicImpl extends Node {
         markDirty && (null === (_a = this.currentStates) || void 0 === _a ? void 0 : _a.length) && this.markSharedStateDirty(), 
         !0);
     }
-    syncSharedStateScopeBindingOnTreeChange(markDirty = !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) {
         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);
+        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);
     }
     syncSharedStateActiveRegistrations() {
         var _a;
@@ -201,6 +204,7 @@ 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);
@@ -208,6 +212,14 @@ 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 => {
@@ -218,8 +230,8 @@ class GraphicImpl extends Node {
         this.sharedStateDirty = !0, enqueueGraphicSharedStateRefresh(this.stage, this), 
         scheduleStageSharedStateRefresh(this.stage);
     }
-    onParentSharedStateTreeChanged(stage, layer) {
-        this.stage === stage && this.layer === layer ? this.syncSharedStateScopeBindingOnTreeChange() : this.setStage(stage, layer);
+    onParentSharedStateTreeChanged(stage, layer, inheritedSharedStateScope) {
+        this.stage === stage && this.layer === layer ? this.syncSharedStateScopeBindingOnTreeChange(!0, inheritedSharedStateScope) : this.setStage(stage, layer, inheritedSharedStateScope);
     }
     refreshSharedStateBeforeRender() {
         var _a;
@@ -862,6 +874,12 @@ 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;
@@ -1186,11 +1204,11 @@ class GraphicImpl extends Node {
             this._globalTransMatrix.translate(scrollX, scrollY);
         }
     }
-    setStage(stage, layer) {
+    setStage(stage, layer, inheritedSharedStateScope) {
         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), 
+            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), 
             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 => {
@@ -1208,7 +1226,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);
+        ((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);
     }
     detachStageForRelease() {
         var _a, _b, _c;