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

package/es/graphic/graphic.d.ts

@@ -57,7 +57,7 @@ export declare const NOWORK_ANIMATE_ATTR: {
     cursor: number;
     html: number;
 };
-export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Partial<IGraphicAttribute>> extends Node implements IGraphic<T>, IAnimateTarget {
+declare abstract class GraphicImpl<T extends Partial<IGraphicAttribute> = Partial<IGraphicAttribute>> extends Node implements IGraphic<T>, IAnimateTarget {
     static mixin(source: Dict<any>): void;
     _events?: any;
     context?: Record<string, any>;
@@ -142,12 +142,14 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     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 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     }): 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 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     }, 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;
@@ -320,4 +323,11 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     abstract clone(): IGraphic<any>;
     toCustomPath(): ICustomPath2D;
 }
+export type Graphic<T extends Partial<IGraphicAttribute> = Partial<IGraphicAttribute>> = GraphicImpl<T>;
+export declare const GRAPHIC_CLASS_SYMBOL: unique symbol;
+export interface IGraphicClassState {
+    Graphic: typeof GraphicImpl;
+}
+export declare function getGraphicClassState(): IGraphicClassState;
+export declare const Graphic: typeof GraphicImpl;
 export {};

package/es/graphic/graphic.js

@@ -116,12 +116,12 @@ export const NOWORK_ANIMATE_ATTR = {
     html: 1
 };
 
-export class Graphic extends Node {
+class GraphicImpl extends Node {
     static mixin(source) {
         const keys = Object.keys(source);
         for (let i = 0; i < keys.length; ++i) {
             const propertyName = keys[i];
-            Object.defineProperty(Graphic.prototype, propertyName, Object.getOwnPropertyDescriptor(source, propertyName));
+            Object.defineProperty(this.prototype, propertyName, Object.getOwnPropertyDescriptor(source, propertyName));
         }
     }
     get AABBBounds() {
@@ -181,9 +181,8 @@ export class Graphic 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 @@ export class Graphic 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 @@ export class Graphic 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 @@ export class Graphic 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 @@ export class Graphic 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 @@ export class Graphic 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;
@@ -1050,8 +1068,10 @@ export class Graphic extends Node {
         transition.changed && this.useStates(transition.states, hasAnimation);
     }
     addState(stateName, keepCurrentStates, hasAnimation) {
-        const transition = this.resolveAddStateTransition(stateName, keepCurrentStates);
-        transition.changed && this.useStates(transition.states, 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);
     }
     setStates(states, options) {
         var _a, _b, _c;
@@ -1186,11 +1206,11 @@ export class Graphic 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 +1228,7 @@ export class Graphic 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;
@@ -1353,6 +1373,25 @@ export class Graphic extends Node {
     }
 }
 
+GraphicImpl.userSymbolMap = {};
+
+export const GRAPHIC_CLASS_SYMBOL = Symbol.for("@visactor/vrender-core/graphic-class");
+
+function createGraphicClassState() {
+    return {
+        Graphic: GraphicImpl
+    };
+}
+
+export function getGraphicClassState() {
+    var _a;
+    const globalScope = globalThis;
+    return null !== (_a = globalScope[GRAPHIC_CLASS_SYMBOL]) && void 0 !== _a || (globalScope[GRAPHIC_CLASS_SYMBOL] = createGraphicClassState()), 
+    globalScope[GRAPHIC_CLASS_SYMBOL];
+}
+
+export const Graphic = getGraphicClassState().Graphic;
+
 function backgroundNotImage(image) {
     return "string" == typeof image ? !(image.startsWith("<svg") || isValidUrl(image) || image.includes("/") || isBase64(image)) : !(!image.fill && !image.stroke) || !("string" != typeof image.gradient || !Array.isArray(image.stops));
 }
@@ -1361,5 +1400,5 @@ function isExternalTexture(texture) {
     return !!texture && ("string" == typeof texture ? !builtinTextureTypes.has(texture) && (texture.startsWith("<svg") || isValidUrl(texture) || texture.includes("/") || isBase64(texture)) : isObject(texture));
 }
 
-Graphic.userSymbolMap = {}, Graphic.mixin(EventTarget);
+Graphic.mixin(EventTarget);
 //# sourceMappingURL=graphic.js.map