@visactor/vrender-core 1.1.10-alpha.0 → 1.1.11-alpha.0

package/es/graphic/glyph.d.ts

@@ -1,6 +1,9 @@
-import type { AABBBounds, IAABBBounds, IPointLike } from '@visactor/vutils';
+import type { AABBBounds, IAABBBounds } from '@visactor/vutils';
 import { Graphic } from './graphic';
 import type { GraphicType, IGraphic, IGlyph, IGlyphGraphicAttribute, IGraphicAttribute, ISetAttributeContext } from '../interface';
+import type { CompiledStateDefinition } from './state/state-definition';
+import type { SharedStateScope } from './state/shared-state-scope';
+import { UpdateCategory } from './state/attribute-update-classifier';
 export declare class Glyph extends Graphic<IGlyphGraphicAttribute> implements IGlyph {
     type: GraphicType;
     _onInit: (g: IGlyph) => void;
@@ -14,6 +17,11 @@ export declare class Glyph extends Graphic<IGlyphGraphicAttribute> implements IG
         subAttributes: Partial<IGraphicAttribute>[];
     };
     protected subGraphic: IGraphic[];
+    private subGraphicEncoder?;
+    private legacyDefinitionsSource?;
+    private legacyProxySource?;
+    private legacyDefinitions?;
+    private legacyCompiledDefinitions?;
     static NOWORK_ANIMATE_ATTR: {
         strokeSeg: number;
         boundsPadding: number;
@@ -51,22 +59,26 @@ export declare class Glyph extends Graphic<IGlyphGraphicAttribute> implements IG
     onInit(cb: (g: this) => void): void;
     onUpdate(cb: (g: this) => void): void;
     isValid(): boolean;
-    setAttribute(key: string, value: any, forceUpdateTag?: boolean, context?: ISetAttributeContext): void;
-    setAttributes(params: Partial<IGlyphGraphicAttribute>, forceUpdateTag?: boolean, context?: ISetAttributeContext): void;
-    translate(x: number, y: number): this;
-    translateTo(x: number, y: number): this;
-    scale(scaleX: number, scaleY: number, scaleCenter?: IPointLike): this;
-    scaleTo(scaleX: number, scaleY: number): this;
-    rotate(angle: number): this;
-    rotateTo(angle: number): this;
+    setSubGraphicEncoder(encoder?: (g: IGlyph, context?: ISetAttributeContext) => void): void;
+    commitSubGraphicAttributes(subGraphic: IGraphic, patch: Record<string, any>, removedKeys?: readonly string[], context?: ISetAttributeContext): void;
+    onAttributeUpdate(context?: ISetAttributeContext): void;
+    protected submitUpdateByCategory(category: UpdateCategory, forceUpdateTag?: boolean): void;
+    protected commitBaseAttributesByTouchedKeys(params: Partial<IGlyphGraphicAttribute>, forceUpdateTag?: boolean, context?: ISetAttributeContext): void;
+    protected commitBaseAttributeBySingleKey(key: string, value: any, forceUpdateTag?: boolean, context?: ISetAttributeContext): void;
     getGraphicTheme(): Required<IGlyphGraphicAttribute>;
     protected updateAABBBounds(attribute: IGlyphGraphicAttribute, theme: Required<IGlyphGraphicAttribute>, aabbBounds: IAABBBounds): import("@visactor/vutils").IBounds;
     protected doUpdateAABBBounds(): AABBBounds;
     protected needUpdateTags(keys: string[]): boolean;
     protected needUpdateTag(key: string): boolean;
-    useStates(states: string[], hasAnimation?: boolean): void;
-    clearStates(hasAnimation?: boolean): void;
+    protected hasLegacyStateDefinitions(): boolean;
+    protected syncSharedStateScopeBindingFromTree(markDirty?: boolean, inheritedSharedStateScope?: SharedStateScope<Record<string, any>> | null): boolean;
+    protected resolveEffectiveCompiledDefinitions(stateNames?: readonly string[]): {
+        compiledDefinitions?: Map<string, CompiledStateDefinition<IGlyphGraphicAttribute>>;
+        stateOrder?: "input";
+    };
+    private createLegacyStateDefinition;
     clone(): IGraphic<Partial<IGlyphGraphicAttribute>>;
+    release(): void;
     getNoWorkAnimateAttr(): Record<string, number>;
 }
 export declare function createGlyph(attributes: IGlyphGraphicAttribute): IGlyph;

package/es/graphic/glyph.js

@@ -1,7 +1,11 @@
 import { Graphic, NOWORK_ANIMATE_ATTR } from "./graphic";
 
+import { StateDefinitionCompiler } from "./state/state-definition-compiler";
+
 import { getTheme } from "./theme";
 
+import { UpdateCategory } from "./state/attribute-update-classifier";
+
 import { GLYPH_NUMBER_TYPE } from "./constants";
 
 export class Glyph extends Graphic {
@@ -10,13 +14,14 @@ export class Glyph extends Graphic {
         this._onInit && this._onInit(this), this.valid = this.isValid();
     }
     setSubGraphic(subGraphic) {
+        var _a;
         this.detachSubGraphic(), this.subGraphic = subGraphic, subGraphic.forEach((g => {
-            g.glyphHost = this, Object.setPrototypeOf(g.attribute, this.attribute);
-        })), this.valid = this.isValid(), this.addUpdateBoundTag();
+            g.glyphHost = this, Graphic.bindGlyphAttributes(g, this.attribute);
+        })), this.valid = this.isValid(), this.addUpdateBoundTag(), null === (_a = this.subGraphicEncoder) || void 0 === _a || _a.call(this, this);
     }
     detachSubGraphic() {
         this.subGraphic.forEach((g => {
-            g.glyphHost = null, Object.setPrototypeOf(g.attribute, {});
+            g.glyphHost = null, Graphic.bindGlyphAttributes(g, Object.prototype);
         }));
     }
     getSubGraphic() {
@@ -31,45 +36,33 @@ export class Glyph extends Graphic {
     isValid() {
         return !0;
     }
-    setAttribute(key, value, forceUpdateTag, context) {
-        super.setAttribute(key, value, forceUpdateTag, context), this.subGraphic.forEach((g => {
-            g.addUpdateShapeAndBoundsTag(), g.addUpdatePositionTag();
-        }));
-    }
-    setAttributes(params, forceUpdateTag = !1, context) {
-        super.setAttributes(params, forceUpdateTag, context), this.subGraphic.forEach((g => {
-            g.addUpdateShapeAndBoundsTag(), g.addUpdatePositionTag();
-        }));
+    setSubGraphicEncoder(encoder) {
+        this.subGraphicEncoder = encoder, null == encoder || encoder(this);
     }
-    translate(x, y) {
-        return super.translate(x, y), this.subGraphic.forEach((g => {
-            g.addUpdatePositionTag(), g.addUpdateBoundTag();
-        })), this;
+    commitSubGraphicAttributes(subGraphic, patch, removedKeys, context) {
+        Graphic.commitDerivedAttributePatch(subGraphic, patch, removedKeys, context);
     }
-    translateTo(x, y) {
-        return super.translateTo(x, y), this.subGraphic.forEach((g => {
-            g.addUpdatePositionTag(), g.addUpdateBoundTag();
-        })), this;
+    onAttributeUpdate(context) {
+        var _a, _b;
+        this.glyphHost && Graphic.bindGlyphAttributes(this, this.glyphHost.attribute);
+        for (const child of this.subGraphic) Graphic.bindGlyphAttributes(child, this.attribute);
+        null === (_a = this.subGraphicEncoder) || void 0 === _a || _a.call(this, this, context), 
+        (null == context ? void 0 : context.skipUpdateCallback) || null === (_b = this._onUpdate) || void 0 === _b || _b.call(this, this), 
+        super.onAttributeUpdate(context);
     }
-    scale(scaleX, scaleY, scaleCenter) {
-        return super.scale(scaleX, scaleY, scaleCenter), this.subGraphic.forEach((g => {
-            g.addUpdatePositionTag(), g.addUpdateBoundTag();
-        })), this;
+    submitUpdateByCategory(category, forceUpdateTag = !1) {
+        super.submitUpdateByCategory(category, forceUpdateTag);
+        for (const child of this.subGraphic) forceUpdateTag || category & UpdateCategory.SHAPE ? child.addUpdateShapeAndBoundsTag() : category & UpdateCategory.BOUNDS && child.addUpdateBoundTag(), 
+        category & UpdateCategory.PAINT && child.addUpdatePaintTag(), (forceUpdateTag || category & UpdateCategory.TRANSFORM) && child.addUpdatePositionTag(), 
+        (forceUpdateTag || category & UpdateCategory.LAYOUT) && child.addUpdateLayoutTag();
     }
-    scaleTo(scaleX, scaleY) {
-        return super.scaleTo(scaleX, scaleY), this.subGraphic.forEach((g => {
-            g.addUpdatePositionTag(), g.addUpdateBoundTag();
-        })), this;
+    commitBaseAttributesByTouchedKeys(params, forceUpdateTag = !1, context) {
+        this.commitBaseAttributesByCategory(params, forceUpdateTag, context);
     }
-    rotate(angle) {
-        return super.rotate(angle), this.subGraphic.forEach((g => {
-            g.addUpdatePositionTag(), g.addUpdateBoundTag();
-        })), this;
-    }
-    rotateTo(angle) {
-        return super.rotate(angle), this.subGraphic.forEach((g => {
-            g.addUpdatePositionTag(), g.addUpdateBoundTag();
-        })), this;
+    commitBaseAttributeBySingleKey(key, value, forceUpdateTag = !1, context) {
+        this.commitBaseAttributesByTouchedKeys({
+            [key]: value
+        }, forceUpdateTag, context);
     }
     getGraphicTheme() {
         return getTheme(this).glyph;
@@ -90,31 +83,62 @@ export class Glyph extends Graphic {
     needUpdateTag(key) {
         return !1;
     }
-    useStates(states, hasAnimation) {
-        var _a;
-        if (!states.length) return void this.clearStates(hasAnimation);
-        const previousStates = this.currentStates ? this.currentStates.slice() : [];
-        if (!((null === (_a = this.currentStates) || void 0 === _a ? void 0 : _a.length) !== states.length || states.some(((stateName, index) => this.currentStates[index] !== stateName)))) return;
-        this.stopStateAnimates(), this.stateSort && (states = states.sort(this.stateSort));
-        const stateAttrs = {};
-        states.forEach((stateName => {
-            const attrs = this.glyphStateProxy ? this.glyphStateProxy(stateName, states) : this.glyphStates[stateName];
-            attrs && Object.assign(stateAttrs, attrs.attributes);
-        })), this.beforeStateUpdate(stateAttrs, previousStates, states, hasAnimation, !1) && (this.currentStates = states, 
-        this.applyStateAttrs(stateAttrs, states, hasAnimation));
-    }
-    clearStates(hasAnimation) {
-        this.stopStateAnimates();
-        const previousStates = this.currentStates ? this.currentStates.slice() : [];
-        if (this.hasState() && this.normalAttrs) {
-            if (!this.beforeStateUpdate(this.normalAttrs, previousStates, [], hasAnimation, !0)) return;
-            this.currentStates = [], this.applyStateAttrs(this.normalAttrs, this.currentStates, hasAnimation, !0);
-        } else this.currentStates = [];
+    hasLegacyStateDefinitions() {
+        if (this.glyphStateProxy) return !0;
+        for (const name in this.glyphStates) if (Object.prototype.hasOwnProperty.call(this.glyphStates, name)) return !0;
+        return !1;
+    }
+    syncSharedStateScopeBindingFromTree(markDirty = !0, inheritedSharedStateScope) {
+        return this.hasLegacyStateDefinitions() ? this.syncSharedStateScopeBinding(void 0, markDirty) : super.syncSharedStateScopeBindingFromTree(markDirty, inheritedSharedStateScope);
+    }
+    resolveEffectiveCompiledDefinitions(stateNames = []) {
+        var _a, _b;
+        if (!this.hasLegacyStateDefinitions()) return this.legacyDefinitions = void 0, this.legacyCompiledDefinitions = void 0, 
+        super.resolveEffectiveCompiledDefinitions(stateNames);
+        this.syncSharedStateScopeBindingFromTree(!1);
+        let changed = !1;
+        if (!this.legacyDefinitions || this.legacyDefinitionsSource !== this.glyphStates || this.legacyProxySource !== this.glyphStateProxy) {
+            this.legacyDefinitionsSource = this.glyphStates, this.legacyProxySource = this.glyphStateProxy, 
+            this.legacyDefinitions = {};
+            for (const name of Object.keys(null !== (_a = this.glyphStates) && void 0 !== _a ? _a : {})) this.legacyDefinitions[name] = this.createLegacyStateDefinition(name);
+            changed = !0;
+        }
+        if (this.glyphStateProxy) {
+            const addDefinition = name => {
+                Object.prototype.hasOwnProperty.call(this.legacyDefinitions, name) || (this.legacyDefinitions[name] = this.createLegacyStateDefinition(name), 
+                changed = !0);
+            };
+            null === (_b = this.currentStates) || void 0 === _b || _b.forEach(addDefinition), 
+            stateNames.forEach(addDefinition);
+        }
+        return changed && (this.legacyCompiledDefinitions = (new StateDefinitionCompiler).compile(this.legacyDefinitions)), 
+        {
+            compiledDefinitions: this.legacyCompiledDefinitions,
+            stateOrder: "input"
+        };
+    }
+    createLegacyStateDefinition(name) {
+        return this.glyphStateProxy ? {
+            name: name,
+            resolver: ({graphic: graphic, activeStates: activeStates}) => {
+                var _a;
+                return null === (_a = graphic.glyphStateProxy(name, activeStates)) || void 0 === _a ? void 0 : _a.attributes;
+            }
+        } : {
+            name: name,
+            patch: this.glyphStates[name].attributes
+        };
     }
     clone() {
         const glyph = new Glyph(Object.assign({}, this.attribute));
         return glyph.setSubGraphic(this.subGraphic.map((g => g.clone()))), glyph;
     }
+    release() {
+        super.release(), this.subGraphicEncoder = void 0, this._onUpdate = void 0, this.legacyDefinitions = void 0, 
+        this.legacyCompiledDefinitions = void 0, this.legacyDefinitionsSource = void 0, 
+        this.legacyProxySource = void 0, this.detachSubGraphic(), this.subGraphic.forEach((child => child.release())), 
+        this.subGraphic = [];
+    }
     getNoWorkAnimateAttr() {
         return Glyph.NOWORK_ANIMATE_ATTR;
     }

package/es/graphic/glyph.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graphic/glyph.ts"],"names":[],"mappings":"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","file":"glyph.js","sourcesContent":["import type { AABBBounds, IAABBBounds, IPointLike } from '@visactor/vutils';\nimport { Graphic, NOWORK_ANIMATE_ATTR } from './graphic';\nimport type {\n  GraphicType,\n  IGraphic,\n  IGlyph,\n  IGlyphGraphicAttribute,\n  IGraphicAttribute,\n  ISetAttributeContext\n} from '../interface';\nimport { getTheme } from './theme';\nimport { GLYPH_NUMBER_TYPE } from './constants';\n\nexport class Glyph extends Graphic<IGlyphGraphicAttribute> implements IGlyph {\n  type: GraphicType = 'glyph';\n  declare _onInit: (g: IGlyph) => void;\n  declare _onUpdate: (g: IGlyph) => void;\n  declare glyphStates?: Record<\n    string,\n    {\n      attributes: Partial<IGlyphGraphicAttribute>;\n      subAttributes: Partial<IGraphicAttribute>[];\n    }\n  >;\n  declare glyphStateProxy?: (\n    stateName: string,\n    targetStates?: string[]\n  ) => {\n    attributes: Partial<IGlyphGraphicAttribute>;\n    subAttributes: Partial<IGraphicAttribute>[];\n  };\n  protected declare subGraphic: IGraphic[];\n\n  static NOWORK_ANIMATE_ATTR = NOWORK_ANIMATE_ATTR;\n\n  constructor(params: Partial<IGlyphGraphicAttribute>) {\n    super(params);\n    this.numberType = GLYPH_NUMBER_TYPE;\n    this.subGraphic = [];\n    this._onInit && this._onInit(this);\n    this.valid = this.isValid();\n  }\n\n  setSubGraphic(subGraphic: IGraphic[]) {\n    this.detachSubGraphic();\n    this.subGraphic = subGraphic;\n    subGraphic.forEach(g => {\n      g.glyphHost = this;\n      Object.setPrototypeOf(g.attribute, this.attribute);\n    });\n    this.valid = this.isValid();\n    this.addUpdateBoundTag();\n  }\n\n  protected detachSubGraphic() {\n    this.subGraphic.forEach(g => {\n      g.glyphHost = null;\n      Object.setPrototypeOf(g.attribute, {});\n    });\n  }\n\n  getSubGraphic() {\n    return this.subGraphic;\n  }\n\n  onInit(cb: (g: this) => void): void {\n    this._onInit = cb;\n  }\n\n  onUpdate(cb: (g: this) => void): void {\n    this._onUpdate = cb;\n  }\n\n  isValid(): boolean {\n    return true;\n  }\n\n  setAttribute(key: string, value: any, forceUpdateTag?: boolean, context?: ISetAttributeContext) {\n    super.setAttribute(key, value, forceUpdateTag, context);\n    this.subGraphic.forEach(g => {\n      g.addUpdateShapeAndBoundsTag();\n      g.addUpdatePositionTag();\n    });\n  }\n\n  setAttributes(\n    params: Partial<IGlyphGraphicAttribute>,\n    forceUpdateTag: boolean = false,\n    context?: ISetAttributeContext\n  ) {\n    super.setAttributes(params, forceUpdateTag, context);\n    this.subGraphic.forEach(g => {\n      g.addUpdateShapeAndBoundsTag();\n      g.addUpdatePositionTag();\n    });\n  }\n\n  translate(x: number, y: number) {\n    super.translate(x, y);\n\n    this.subGraphic.forEach(g => {\n      g.addUpdatePositionTag();\n      g.addUpdateBoundTag();\n    });\n    return this;\n  }\n\n  translateTo(x: number, y: number) {\n    super.translateTo(x, y);\n\n    this.subGraphic.forEach(g => {\n      g.addUpdatePositionTag();\n      g.addUpdateBoundTag();\n    });\n    return this;\n  }\n\n  scale(scaleX: number, scaleY: number, scaleCenter?: IPointLike) {\n    super.scale(scaleX, scaleY, scaleCenter);\n\n    this.subGraphic.forEach(g => {\n      g.addUpdatePositionTag();\n      g.addUpdateBoundTag();\n    });\n    return this;\n  }\n\n  scaleTo(scaleX: number, scaleY: number) {\n    super.scaleTo(scaleX, scaleY);\n\n    this.subGraphic.forEach(g => {\n      g.addUpdatePositionTag();\n      g.addUpdateBoundTag();\n    });\n    return this;\n  }\n\n  rotate(angle: number) {\n    super.rotate(angle);\n\n    this.subGraphic.forEach(g => {\n      g.addUpdatePositionTag();\n      g.addUpdateBoundTag();\n    });\n    return this;\n  }\n\n  rotateTo(angle: number) {\n    super.rotate(angle);\n\n    this.subGraphic.forEach(g => {\n      g.addUpdatePositionTag();\n      g.addUpdateBoundTag();\n    });\n    return this;\n  }\n\n  getGraphicTheme(): Required<IGlyphGraphicAttribute> {\n    return getTheme(this as IGraphic).glyph;\n  }\n\n  protected updateAABBBounds(\n    attribute: IGlyphGraphicAttribute,\n    theme: Required<IGlyphGraphicAttribute>,\n    aabbBounds: IAABBBounds\n  ) {\n    // 添加子节点\n    this.getSubGraphic().forEach((node: IGraphic) => {\n      aabbBounds.union(node.AABBBounds);\n    });\n\n    // glyph不需要计算AABBBounds\n    // this.transformAABBBounds(attribute, aabbBounds, theme, graphic);\n    return aabbBounds;\n  }\n\n  protected doUpdateAABBBounds(): AABBBounds {\n    this.updateAABBBoundsStamp++;\n    this._AABBBounds.clear();\n    const bounds = this.updateAABBBounds(this.attribute, this.getGraphicTheme(), this._AABBBounds) as AABBBounds;\n    this.clearUpdateBoundTag();\n    return bounds;\n  }\n\n  protected needUpdateTags(keys: string[]): boolean {\n    return false;\n  }\n  protected needUpdateTag(key: string): boolean {\n    return false;\n  }\n\n  useStates(states: string[], hasAnimation?: boolean): void {\n    if (!states.length) {\n      this.clearStates(hasAnimation);\n      return;\n    }\n    const previousStates = this.currentStates ? this.currentStates.slice() : [];\n\n    const isChange =\n      this.currentStates?.length !== states.length ||\n      states.some((stateName, index) => this.currentStates[index] !== stateName);\n    if (!isChange) {\n      return;\n    }\n\n    this.stopStateAnimates();\n\n    if (this.stateSort) {\n      states = states.sort(this.stateSort);\n    }\n    const stateAttrs = {};\n    states.forEach(stateName => {\n      const attrs = this.glyphStateProxy ? this.glyphStateProxy(stateName, states) : this.glyphStates[stateName];\n\n      if (attrs) {\n        Object.assign(stateAttrs, attrs.attributes);\n      }\n    });\n\n    if (!this.beforeStateUpdate(stateAttrs, previousStates, states, hasAnimation, false)) {\n      return;\n    }\n\n    this.currentStates = states;\n    this.applyStateAttrs(stateAttrs, states, hasAnimation);\n  }\n\n  clearStates(hasAnimation?: boolean) {\n    this.stopStateAnimates();\n    const previousStates = this.currentStates ? this.currentStates.slice() : [];\n    if (this.hasState() && this.normalAttrs) {\n      if (!this.beforeStateUpdate(this.normalAttrs, previousStates, [], hasAnimation, true)) {\n        return;\n      }\n      this.currentStates = [];\n      this.applyStateAttrs(this.normalAttrs, this.currentStates, hasAnimation, true);\n    } else {\n      this.currentStates = [];\n    }\n  }\n\n  clone(): IGraphic<Partial<IGlyphGraphicAttribute>> {\n    const glyph = new Glyph({ ...this.attribute });\n    glyph.setSubGraphic(this.subGraphic.map(g => g.clone()));\n    return glyph;\n  }\n\n  getNoWorkAnimateAttr(): Record<string, number> {\n    return Glyph.NOWORK_ANIMATE_ATTR;\n  }\n}\n\nexport function createGlyph(attributes: IGlyphGraphicAttribute): IGlyph {\n  return new Glyph(attributes);\n}\n"]}
+{"version":3,"sources":["../src/graphic/glyph.ts"],"names":[],"mappings":"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","file":"glyph.js","sourcesContent":["import type { AABBBounds, IAABBBounds } from '@visactor/vutils';\nimport { Graphic, NOWORK_ANIMATE_ATTR } from './graphic';\nimport type {\n  GraphicType,\n  IGraphic,\n  IGlyph,\n  IGlyphGraphicAttribute,\n  IGraphicAttribute,\n  ISetAttributeContext\n} from '../interface';\nimport { StateDefinitionCompiler } from './state/state-definition-compiler';\nimport type { CompiledStateDefinition, StateDefinition, StateDefinitionsInput } from './state/state-definition';\nimport type { SharedStateScope } from './state/shared-state-scope';\nimport { getTheme } from './theme';\nimport { UpdateCategory } from './state/attribute-update-classifier';\nimport { GLYPH_NUMBER_TYPE } from './constants';\n\nexport class Glyph extends Graphic<IGlyphGraphicAttribute> implements IGlyph {\n  type: GraphicType = 'glyph';\n  declare _onInit: (g: IGlyph) => void;\n  declare _onUpdate: (g: IGlyph) => void;\n  declare glyphStates?: Record<\n    string,\n    {\n      attributes: Partial<IGlyphGraphicAttribute>;\n      subAttributes: Partial<IGraphicAttribute>[];\n    }\n  >;\n  declare glyphStateProxy?: (\n    stateName: string,\n    targetStates?: string[]\n  ) => {\n    attributes: Partial<IGlyphGraphicAttribute>;\n    subAttributes: Partial<IGraphicAttribute>[];\n  };\n  protected declare subGraphic: IGraphic[];\n  private subGraphicEncoder?: (g: IGlyph, context?: ISetAttributeContext) => void;\n  private legacyDefinitionsSource?: Glyph['glyphStates'];\n  private legacyProxySource?: Glyph['glyphStateProxy'];\n  private legacyDefinitions?: StateDefinitionsInput<IGlyphGraphicAttribute>;\n  private legacyCompiledDefinitions?: Map<string, CompiledStateDefinition<IGlyphGraphicAttribute>>;\n\n  static NOWORK_ANIMATE_ATTR = NOWORK_ANIMATE_ATTR;\n\n  constructor(params: Partial<IGlyphGraphicAttribute>) {\n    super(params);\n    this.numberType = GLYPH_NUMBER_TYPE;\n    this.subGraphic = [];\n    this._onInit && this._onInit(this);\n    this.valid = this.isValid();\n  }\n\n  setSubGraphic(subGraphic: IGraphic[]) {\n    this.detachSubGraphic();\n    this.subGraphic = subGraphic;\n    subGraphic.forEach(g => {\n      g.glyphHost = this;\n      Graphic.bindGlyphAttributes(g as Graphic, this.attribute);\n    });\n    this.valid = this.isValid();\n    this.addUpdateBoundTag();\n    this.subGraphicEncoder?.(this);\n  }\n\n  protected detachSubGraphic() {\n    this.subGraphic.forEach(g => {\n      g.glyphHost = null;\n      Graphic.bindGlyphAttributes(g as Graphic, Object.prototype);\n    });\n  }\n\n  getSubGraphic() {\n    return this.subGraphic;\n  }\n\n  onInit(cb: (g: this) => void): void {\n    this._onInit = cb;\n  }\n\n  onUpdate(cb: (g: this) => void): void {\n    this._onUpdate = cb;\n  }\n\n  isValid(): boolean {\n    return true;\n  }\n\n  setSubGraphicEncoder(encoder?: (g: IGlyph, context?: ISetAttributeContext) => void): void {\n    this.subGraphicEncoder = encoder;\n    encoder?.(this);\n  }\n\n  commitSubGraphicAttributes(\n    subGraphic: IGraphic,\n    patch: Record<string, any>,\n    removedKeys?: readonly string[],\n    context?: ISetAttributeContext\n  ): void {\n    Graphic.commitDerivedAttributePatch(subGraphic as Graphic, patch, removedKeys, context);\n  }\n\n  onAttributeUpdate(context?: ISetAttributeContext): void {\n    if (this.glyphHost) {\n      Graphic.bindGlyphAttributes(this, this.glyphHost.attribute);\n    }\n    for (const child of this.subGraphic) {\n      Graphic.bindGlyphAttributes(child as Graphic, this.attribute);\n    }\n    this.subGraphicEncoder?.(this, context);\n    if (!context?.skipUpdateCallback) {\n      this._onUpdate?.(this);\n    }\n    super.onAttributeUpdate(context);\n  }\n\n  protected submitUpdateByCategory(category: UpdateCategory, forceUpdateTag: boolean = false): void {\n    super.submitUpdateByCategory(category, forceUpdateTag);\n    for (const child of this.subGraphic) {\n      if (forceUpdateTag || category & UpdateCategory.SHAPE) {\n        child.addUpdateShapeAndBoundsTag();\n      } else if (category & UpdateCategory.BOUNDS) {\n        child.addUpdateBoundTag();\n      }\n      if (category & UpdateCategory.PAINT) {\n        child.addUpdatePaintTag();\n      }\n      if (forceUpdateTag || category & UpdateCategory.TRANSFORM) {\n        child.addUpdatePositionTag();\n      }\n      if (forceUpdateTag || category & UpdateCategory.LAYOUT) {\n        child.addUpdateLayoutTag();\n      }\n    }\n  }\n\n  // Glyph forwards inherited invalidation to children, so its base fast path must\n  // classify changed keys too. Ordinary Graphic setters keep their existing path.\n  protected commitBaseAttributesByTouchedKeys(\n    params: Partial<IGlyphGraphicAttribute>,\n    forceUpdateTag: boolean = false,\n    context?: ISetAttributeContext\n  ): void {\n    this.commitBaseAttributesByCategory(params, forceUpdateTag, context);\n  }\n\n  protected commitBaseAttributeBySingleKey(\n    key: string,\n    value: any,\n    forceUpdateTag: boolean = false,\n    context?: ISetAttributeContext\n  ): void {\n    this.commitBaseAttributesByTouchedKeys({ [key]: value }, forceUpdateTag, context);\n  }\n\n  getGraphicTheme(): Required<IGlyphGraphicAttribute> {\n    return getTheme(this as IGraphic).glyph;\n  }\n\n  protected updateAABBBounds(\n    attribute: IGlyphGraphicAttribute,\n    theme: Required<IGlyphGraphicAttribute>,\n    aabbBounds: IAABBBounds\n  ) {\n    // 添加子节点\n    this.getSubGraphic().forEach((node: IGraphic) => {\n      aabbBounds.union(node.AABBBounds);\n    });\n\n    // glyph不需要计算AABBBounds\n    // this.transformAABBBounds(attribute, aabbBounds, theme, graphic);\n    return aabbBounds;\n  }\n\n  protected doUpdateAABBBounds(): AABBBounds {\n    this.updateAABBBoundsStamp++;\n    this._AABBBounds.clear();\n    const bounds = this.updateAABBBounds(this.attribute, this.getGraphicTheme(), this._AABBBounds) as AABBBounds;\n    this.clearUpdateBoundTag();\n    return bounds;\n  }\n\n  protected needUpdateTags(keys: string[]): boolean {\n    return false;\n  }\n  protected needUpdateTag(key: string): boolean {\n    return false;\n  }\n\n  protected hasLegacyStateDefinitions(): boolean {\n    if (this.glyphStateProxy) {\n      return true;\n    }\n    for (const name in this.glyphStates) {\n      if (Object.prototype.hasOwnProperty.call(this.glyphStates, name)) {\n        return true;\n      }\n    }\n    return false;\n  }\n\n  protected syncSharedStateScopeBindingFromTree(\n    markDirty: boolean = true,\n    inheritedSharedStateScope?: SharedStateScope<Record<string, any>> | null\n  ): boolean {\n    // Legacy Glyph definitions historically own the whole state surface.\n    return this.hasLegacyStateDefinitions()\n      ? this.syncSharedStateScopeBinding(undefined, markDirty)\n      : super.syncSharedStateScopeBindingFromTree(markDirty, inheritedSharedStateScope);\n  }\n\n  protected resolveEffectiveCompiledDefinitions(stateNames: readonly string[] = []) {\n    if (!this.hasLegacyStateDefinitions()) {\n      this.legacyDefinitions = undefined;\n      this.legacyCompiledDefinitions = undefined;\n      return super.resolveEffectiveCompiledDefinitions(stateNames);\n    }\n    this.syncSharedStateScopeBindingFromTree(false);\n    let changed = false;\n    if (\n      !this.legacyDefinitions ||\n      this.legacyDefinitionsSource !== this.glyphStates ||\n      this.legacyProxySource !== this.glyphStateProxy\n    ) {\n      this.legacyDefinitionsSource = this.glyphStates;\n      this.legacyProxySource = this.glyphStateProxy;\n      this.legacyDefinitions = {};\n      for (const name of Object.keys(this.glyphStates ?? {})) {\n        this.legacyDefinitions[name] = this.createLegacyStateDefinition(name);\n      }\n      changed = true;\n    }\n    if (this.glyphStateProxy) {\n      const addDefinition = (name: string) => {\n        if (!Object.prototype.hasOwnProperty.call(this.legacyDefinitions, name)) {\n          this.legacyDefinitions[name] = this.createLegacyStateDefinition(name);\n          changed = true;\n        }\n      };\n      this.currentStates?.forEach(addDefinition);\n      stateNames.forEach(addDefinition);\n    }\n    if (changed) {\n      this.legacyCompiledDefinitions = new StateDefinitionCompiler<IGlyphGraphicAttribute>().compile(\n        this.legacyDefinitions\n      );\n    }\n    return { compiledDefinitions: this.legacyCompiledDefinitions, stateOrder: 'input' as const };\n  }\n\n  private createLegacyStateDefinition(name: string): StateDefinition<IGlyphGraphicAttribute> {\n    return this.glyphStateProxy\n      ? {\n          name,\n          resolver: ({ graphic, activeStates }) =>\n            (graphic as Glyph).glyphStateProxy(name, activeStates as string[])?.attributes\n        }\n      : { name, patch: this.glyphStates[name].attributes };\n  }\n\n  clone(): IGraphic<Partial<IGlyphGraphicAttribute>> {\n    const glyph = new Glyph({ ...this.attribute });\n    glyph.setSubGraphic(this.subGraphic.map(g => g.clone()));\n    return glyph;\n  }\n\n  release(): void {\n    super.release();\n    this.subGraphicEncoder = undefined;\n    this._onUpdate = undefined;\n    this.legacyDefinitions = undefined;\n    this.legacyCompiledDefinitions = undefined;\n    this.legacyDefinitionsSource = undefined;\n    this.legacyProxySource = undefined;\n    this.detachSubGraphic();\n    this.subGraphic.forEach(child => child.release());\n    this.subGraphic = [];\n  }\n\n  getNoWorkAnimateAttr(): Record<string, number> {\n    return Glyph.NOWORK_ANIMATE_ATTR;\n  }\n}\n\nexport function createGlyph(attributes: IGlyphGraphicAttribute): IGlyph {\n  return new Glyph(attributes);\n}\n"]}

package/es/graphic/graphic.d.ts

@@ -128,6 +128,7 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     protected stateEngine?: StateEngine<T>;
     protected stateEngineCompiledDefinitions?: Map<string, CompiledStateDefinition<T>>;
     protected stateEngineStateSort?: (stateA: string, stateB: string) => number;
+    protected stateEngineStateOrder?: 'input';
     protected stateEngineMergeMode?: StateMergeMode;
     protected stateTransitionOrchestrator?: StateTransitionOrchestrator<T>;
     protected localStateDefinitionsSource?: StateDefinitionsInput<T>;
@@ -152,8 +153,9 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     onParentSharedStateTreeChanged(stage?: IStage, layer?: ILayer, inheritedSharedStateScope?: SharedStateScope<Record<string, any>> | null): void;
     refreshSharedStateBeforeRender(): void;
     protected getLocalStatesVersion(): number;
-    protected resolveEffectiveCompiledDefinitions(): {
+    protected resolveEffectiveCompiledDefinitions(_stateNames?: readonly string[]): {
         compiledDefinitions?: Map<string, CompiledStateDefinition<T>>;
+        stateOrder?: 'input';
     };
     protected recomputeCurrentStatePatch(): void;
     protected buildStaticAttributeSnapshot(): Partial<T>;
@@ -173,6 +175,7 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     protected canCommitBaseAttributesByTouchedKeys(): boolean;
     protected detachAttributeFromBaseAttributes(): void;
     protected commitInternalBaseAttributes(params: Partial<T>, context?: ISetAttributeContext): void;
+    protected commitBaseAttributesByCategory(params: Partial<T>, forceUpdateTag?: boolean, context?: ISetAttributeContext): void;
     protected commitBaseAttributesByTouchedKeys(params: Partial<T>, forceUpdateTag?: boolean, context?: ISetAttributeContext): void;
     protected commitBaseAttributeBySingleKey(key: string, value: any, forceUpdateTag?: boolean, context?: ISetAttributeContext): void;
     protected applyBaseAttributes(params: Partial<T>): void;
@@ -235,6 +238,8 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     rotate(angle: number, rotateCenter?: IPointLike): this;
     rotateTo(angle: number): this;
     skewTo(b: number, c: number): this;
+    protected static bindGlyphAttributes(graphic: Graphic, inherited: object): void;
+    protected static commitDerivedAttributePatch(graphic: Graphic, patch: Record<string, any>, removedKeys?: readonly string[], context?: ISetAttributeContext): void;
     onAttributeUpdate(context?: ISetAttributeContext): void;
     update(d?: {
         bounds: boolean;
@@ -245,7 +250,7 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     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>;
+    protected ensureStateEngine(stateResolveBaseAttrs?: Partial<T>, stateNames?: readonly string[]): StateEngine<T>;
     protected toGraphicStateTransition(result: StateTransitionResult): GraphicStateTransition;
     protected sortLocalStates(states: readonly string[]): string[];
     protected resolveLocalUseStatesTransition(states: readonly string[]): GraphicStateTransition;

package/es/graphic/graphic.js

@@ -247,7 +247,7 @@ export class Graphic extends Node {
         this.localStateDefinitionsVersion = (null !== (_a = this.localStateDefinitionsVersion) && void 0 !== _a ? _a : 0) + 1), 
         null !== (_b = this.localStateDefinitionsVersion) && void 0 !== _b ? _b : 0;
     }
-    resolveEffectiveCompiledDefinitions() {
+    resolveEffectiveCompiledDefinitions(_stateNames) {
         this.syncSharedStateScopeBindingFromTree(!1);
         const boundScope = this.boundSharedStateScope;
         boundScope && (ensureSharedStateScopeFresh(boundScope), this.boundSharedStateRevision = boundScope.revision);
@@ -372,7 +372,22 @@ export class Graphic extends Node {
         params && Object.keys(params).length && (this.canCommitBaseAttributesByTouchedKeys() ? this.commitBaseAttributesByTouchedKeys(params, !1, context) : (this.detachAttributeFromBaseAttributes(), 
         this.applyBaseAttributes(params), this.commitBaseAttributeMutation(!1, context)));
     }
+    commitBaseAttributesByCategory(params, forceUpdateTag = !1, context) {
+        const base = this.getBaseAttributesStorage();
+        let category = UpdateCategory.NONE, hasKeys = !1;
+        for (const key in params) {
+            if (!Object.prototype.hasOwnProperty.call(params, key)) continue;
+            hasKeys = !0;
+            const prev = base[key], next = params[key];
+            prev !== next && (category = this.mergeAttributeDeltaCategory(category, key, prev, next)), 
+            base[key] = next;
+        }
+        hasKeys && (this.attribute = base, this._baseAttributes = void 0, this.attributeMayContainTransientAttrs = !1, 
+        this.valid = this.isValid(), this.submitUpdateByCategory(category, forceUpdateTag), 
+        this.onAttributeUpdate(context));
+    }
     commitBaseAttributesByTouchedKeys(params, forceUpdateTag = !1, context) {
+        if (this.glyphHost) return void this.commitBaseAttributesByCategory(params, forceUpdateTag, context);
         const source = params, baseAttributes = this.getBaseAttributesStorage();
         let hasKeys = !1, needsShapeAndBounds = forceUpdateTag;
         for (const key in source) Object.prototype.hasOwnProperty.call(source, key) && (hasKeys = !0, 
@@ -858,8 +873,19 @@ export class Graphic extends Node {
     skewTo(b, c) {
         return this;
     }
+    static bindGlyphAttributes(graphic, inherited) {
+        Object.getPrototypeOf(graphic.attribute) !== inherited && Object.setPrototypeOf(graphic.attribute, inherited), 
+        graphic._baseAttributes && Object.getPrototypeOf(graphic._baseAttributes) !== inherited && Object.setPrototypeOf(graphic._baseAttributes, inherited);
+    }
+    static commitDerivedAttributePatch(graphic, patch, removedKeys, context) {
+        if (!(null == removedKeys ? void 0 : removedKeys.length)) return void graphic.setAttributes(patch, !1, context);
+        graphic.detachAttributeFromBaseAttributes();
+        const base = graphic.getBaseAttributesStorage();
+        removedKeys.forEach((key => delete base[key])), graphic.applyBaseAttributes(patch), 
+        graphic.commitBaseAttributeMutation(!1, context);
+    }
     onAttributeUpdate(context) {
-        context && context.skipUpdateCallback || (this.getGraphicService().onAttributeUpdate(this), 
+        this.glyphHost && Graphic.bindGlyphAttributes(this, this.glyphHost.attribute), context && context.skipUpdateCallback || (this.getGraphicService().onAttributeUpdate(this), 
         this._emitCustomEvent("afterAttributeUpdate", context));
     }
     update(d) {
@@ -888,15 +914,20 @@ export class Graphic extends Node {
         return null === (_a = this.stateEngine) || void 0 === _a || _a.setResolveContext(this, stateResolveBaseAttrs), 
         stateResolveBaseAttrs;
     }
-    ensureStateEngine(stateResolveBaseAttrs = this.getStateResolveBaseAttrs()) {
-        const {compiledDefinitions: compiledDefinitions} = this.resolveEffectiveCompiledDefinitions();
-        return this.compiledStateDefinitions = compiledDefinitions, compiledDefinitions ? this.stateEngine && this.stateEngineCompiledDefinitions === compiledDefinitions && this.stateEngineStateSort === this.stateSort && this.stateEngineMergeMode === this.stateMergeMode || (this.stateEngine = new StateEngine({
+    ensureStateEngine(stateResolveBaseAttrs, stateNames) {
+        var _a;
+        void 0 === stateResolveBaseAttrs && (stateResolveBaseAttrs = this.getStateResolveBaseAttrs()), 
+        void 0 === stateNames && (stateNames = null !== (_a = this.currentStates) && void 0 !== _a ? _a : EMPTY_STATE_NAMES);
+        const {compiledDefinitions: compiledDefinitions, stateOrder: stateOrder} = this.resolveEffectiveCompiledDefinitions(stateNames);
+        return this.compiledStateDefinitions = compiledDefinitions, compiledDefinitions ? this.stateEngine && this.stateEngineCompiledDefinitions === compiledDefinitions && this.stateEngineStateSort === this.stateSort && this.stateEngineStateOrder === stateOrder && this.stateEngineMergeMode === this.stateMergeMode || (this.stateEngine = new StateEngine({
             compiledDefinitions: compiledDefinitions,
             stateSort: this.stateSort,
+            stateOrder: stateOrder,
             mergeMode: this.stateMergeMode
         }), this.stateEngineCompiledDefinitions = compiledDefinitions, this.stateEngineStateSort = this.stateSort, 
-        this.stateEngineMergeMode = this.stateMergeMode) : (this.stateEngine = void 0, this.stateEngineCompiledDefinitions = void 0), 
-        this.syncStateResolveContext(stateResolveBaseAttrs), this.stateEngine && this.currentStates && !this.sameStateNames(this.stateEngine.activeStates, this.currentStates) && this.stateEngine.applyStates(this.currentStates), 
+        this.stateEngineStateOrder = stateOrder, this.stateEngineMergeMode = this.stateMergeMode) : (this.stateEngine = void 0, 
+        this.stateEngineCompiledDefinitions = void 0), this.syncStateResolveContext(stateResolveBaseAttrs), 
+        this.stateEngine && this.currentStates && !this.sameStateNames(this.stateEngine.activeStates, this.currentStates) && this.stateEngine.applyStates(this.currentStates), 
         this.stateEngine;
     }
     toGraphicStateTransition(result) {
@@ -925,7 +956,7 @@ export class Graphic extends Node {
         };
     }
     resolveUseStatesTransition(states, stateResolveBaseAttrs = this.getStateResolveBaseAttrs()) {
-        const stateEngine = this.ensureStateEngine(stateResolveBaseAttrs);
+        const stateEngine = this.ensureStateEngine(stateResolveBaseAttrs, states);
         return stateEngine ? this.toGraphicStateTransition(stateEngine.applyStates(states)) : this.resolveLocalUseStatesTransition(states);
     }
     resolveClearStatesTransition() {
@@ -934,7 +965,7 @@ export class Graphic extends Node {
     }
     resolveAddStateTransition(stateName, keepCurrentStates) {
         var _a;
-        const stateEngine = this.ensureStateEngine();
+        const stateEngine = this.ensureStateEngine(void 0, [ stateName ]);
         if (stateEngine) return this.toGraphicStateTransition(stateEngine.addState(stateName, keepCurrentStates));
         if (this.currentStates && this.currentStates.includes(stateName) && (keepCurrentStates || 1 === this.currentStates.length)) return {
             changed: !1,
@@ -957,7 +988,7 @@ export class Graphic extends Node {
         } : this.resolveLocalUseStatesTransition(nextStates);
     }
     resolveToggleStateTransition(stateName) {
-        const stateEngine = this.ensureStateEngine();
+        const stateEngine = this.ensureStateEngine(void 0, [ stateName ]);
         if (stateEngine) return this.toGraphicStateTransition(stateEngine.toggleState(stateName));
         if (this.hasState(stateName)) return this.resolveRemoveStateTransition(stateName);
         const nextStates = this.currentStates ? this.currentStates.slice() : [];
@@ -965,7 +996,7 @@ export class Graphic extends Node {
     }
     resolveGraphicStateTransition(states, forceResolverRefresh = !1) {
         var _a;
-        const stateResolveBaseAttrs = this.getStateResolveBaseAttrs(), stateEngine = this.ensureStateEngine(stateResolveBaseAttrs);
+        const stateResolveBaseAttrs = this.getStateResolveBaseAttrs(), stateEngine = this.ensureStateEngine(stateResolveBaseAttrs, states);
         forceResolverRefresh && (null == stateEngine || stateEngine.invalidateResolverCache());
         const transition = stateEngine ? this.toGraphicStateTransition(stateEngine.applyStates(states)) : this.resolveLocalUseStatesTransition(states), resolvedStateAttrs = this.stateEngine && this.compiledStateDefinitions ? Object.assign({}, this.stateEngine.resolvedPatch) : {};
         return {
@@ -1043,7 +1074,7 @@ export class Graphic extends Node {
     shouldSkipStateTransitionDefaultAttribute(_key, _targetAttrs) {
         return !1;
     }
-    stopStateAnimates(type = "end") {
+    stopStateAnimates(type) {
         const stopAnimationState = this.stopAnimationState;
         if ("function" == typeof stopAnimationState) return void stopAnimationState.call(this, "state", type);
         if (!this.mayHaveTrackedAnimates()) return;