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

package/cjs/graphic/state/state-definition.d.ts

@@ -37,5 +37,6 @@ export type StateDefinitionsInput<T extends Record<string, any> = Record<string,
 export interface IStateEngineOptions<T extends Record<string, any> = Record<string, any>> {
     compiledDefinitions: Map<string, CompiledStateDefinition<T>>;
     stateSort?: (a: string, b: string) => number;
+    stateOrder?: 'input';
     mergeMode?: StateMergeMode;
 }

package/cjs/graphic/state/state-definition.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graphic/state/state-definition.ts"],"names":[],"mappings":"","file":"state-definition.js","sourcesContent":["export interface StateDefinition<T extends Record<string, any> = Record<string, any>> {\n  name: string;\n  priority?: number;\n  patch?: Partial<T>;\n  resolver?: (ctx: StateResolveContext<T>) => Partial<T> | void;\n  declaredAffectedKeys?: string[] | Set<string>;\n  exclude?: string[];\n  suppress?: string[];\n}\n\nexport type StateMergeMode = 'shallow' | 'deep';\n\nexport interface CompiledStateDefinition<T extends Record<string, any> = Record<string, any>> {\n  name: string;\n  priority: number;\n  rank: number;\n  patch?: Partial<T>;\n  resolver?: (ctx: StateResolveContext<T>) => Partial<T> | void;\n  declaredAffectedKeys?: Set<string>;\n  exclude: Set<string>;\n  suppress: Set<string>;\n  hasResolver: boolean;\n  affectedKeys: Set<string>;\n}\n\nexport interface StateResolveContext<T extends Record<string, any> = Record<string, any>> {\n  graphic: any;\n  activeStates: ReadonlyArray<string>;\n  effectiveStates: ReadonlyArray<string>;\n  baseAttributes: Partial<T>;\n  resolvedPatch: Partial<T>;\n}\n\nexport interface StateTransitionResult {\n  changed: boolean;\n  activeStates: string[];\n  effectiveStates: string[];\n  suppressed: string[];\n}\n\nexport type StateDefinitionsInput<T extends Record<string, any> = Record<string, any>> = Record<\n  string,\n  Partial<T> | StateDefinition<T>\n>;\n\nexport interface IStateEngineOptions<T extends Record<string, any> = Record<string, any>> {\n  compiledDefinitions: Map<string, CompiledStateDefinition<T>>;\n  stateSort?: (a: string, b: string) => number;\n  mergeMode?: StateMergeMode;\n}\n"]}
+{"version":3,"sources":["../src/graphic/state/state-definition.ts"],"names":[],"mappings":"","file":"state-definition.js","sourcesContent":["export interface StateDefinition<T extends Record<string, any> = Record<string, any>> {\n  name: string;\n  priority?: number;\n  patch?: Partial<T>;\n  resolver?: (ctx: StateResolveContext<T>) => Partial<T> | void;\n  declaredAffectedKeys?: string[] | Set<string>;\n  exclude?: string[];\n  suppress?: string[];\n}\n\nexport type StateMergeMode = 'shallow' | 'deep';\n\nexport interface CompiledStateDefinition<T extends Record<string, any> = Record<string, any>> {\n  name: string;\n  priority: number;\n  rank: number;\n  patch?: Partial<T>;\n  resolver?: (ctx: StateResolveContext<T>) => Partial<T> | void;\n  declaredAffectedKeys?: Set<string>;\n  exclude: Set<string>;\n  suppress: Set<string>;\n  hasResolver: boolean;\n  affectedKeys: Set<string>;\n}\n\nexport interface StateResolveContext<T extends Record<string, any> = Record<string, any>> {\n  graphic: any;\n  activeStates: ReadonlyArray<string>;\n  effectiveStates: ReadonlyArray<string>;\n  baseAttributes: Partial<T>;\n  resolvedPatch: Partial<T>;\n}\n\nexport interface StateTransitionResult {\n  changed: boolean;\n  activeStates: string[];\n  effectiveStates: string[];\n  suppressed: string[];\n}\n\nexport type StateDefinitionsInput<T extends Record<string, any> = Record<string, any>> = Record<\n  string,\n  Partial<T> | StateDefinition<T>\n>;\n\nexport interface IStateEngineOptions<T extends Record<string, any> = Record<string, any>> {\n  compiledDefinitions: Map<string, CompiledStateDefinition<T>>;\n  stateSort?: (a: string, b: string) => number;\n  /** @internal Legacy Glyph inputs merge in requested order, after stateSort. */\n  stateOrder?: 'input';\n  mergeMode?: StateMergeMode;\n}\n"]}

package/cjs/graphic/state/state-engine.d.ts

@@ -2,6 +2,7 @@ import type { IStateEngineOptions, StateTransitionResult } from './state-definit
 export declare class StateEngine<T extends Record<string, any> = Record<string, any>> {
     private readonly compiledDefinitions;
     private readonly stateSort?;
+    private readonly stateOrder?;
     private readonly mergeMode;
     private _activeStates;
     private _effectiveStates;

package/cjs/graphic/state/state-engine.js

@@ -31,7 +31,7 @@ class StateEngine {
         this._activeStates = [], this._effectiveStates = [], this._suppressed = [], this._resolvedPatch = {}, 
         this.resolverPatchCache = new Map, this.resolverCacheKey = "", this.resolverCacheValid = !1, 
         this.baseAttributes = {}, this.compiledDefinitions = options.compiledDefinitions, 
-        this.stateSort = options.stateSort, this.mergeMode = null !== (_a = options.mergeMode) && void 0 !== _a ? _a : "shallow";
+        this.stateSort = options.stateSort, this.stateOrder = options.stateOrder, this.mergeMode = null !== (_a = options.mergeMode) && void 0 !== _a ? _a : "shallow";
     }
     get activeStates() {
         return this._activeStates;
@@ -106,6 +106,7 @@ class StateEngine {
         return !!this._activeStates.length && (null == stateName || this._activeStates.includes(stateName));
     }
     sortStates(states) {
+        if ("input" === this.stateOrder) return this.stateSort ? states.sort(this.stateSort) : states;
         const withDefinition = [], withoutDefinition = [];
         return states.forEach((stateName => {
             this.compiledDefinitions.has(stateName) ? withDefinition.push(stateName) : withoutDefinition.push(stateName);

package/cjs/graphic/state/state-engine.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graphic/state/state-engine.ts"],"names":[],"mappings":"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","file":"state-engine.js","sourcesContent":["import type { CompiledStateDefinition, IStateEngineOptions, StateTransitionResult } from './state-definition';\n\nfunction isPlainObject(value: unknown): value is Record<string, any> {\n  return value != null && typeof value === 'object' && !Array.isArray(value);\n}\n\nfunction cloneValue<T>(value: T): T {\n  if (!isPlainObject(value)) {\n    return value;\n  }\n\n  const clone: Record<string, any> = {};\n  Object.keys(value).forEach(key => {\n    clone[key] = cloneValue((value as Record<string, any>)[key]);\n  });\n  return clone as T;\n}\n\nfunction deepMerge(base: Record<string, any>, value: Record<string, any>): Record<string, any> {\n  const result: Record<string, any> = cloneValue(base) ?? {};\n\n  Object.keys(value).forEach(key => {\n    const nextValue = value[key];\n    const previousValue = result[key];\n\n    if (isPlainObject(previousValue) && isPlainObject(nextValue)) {\n      result[key] = deepMerge(previousValue, nextValue);\n      return;\n    }\n\n    result[key] = cloneValue(nextValue);\n  });\n\n  return result;\n}\n\nexport class StateEngine<T extends Record<string, any> = Record<string, any>> {\n  private readonly compiledDefinitions: Map<string, CompiledStateDefinition<T>>;\n  private readonly stateSort?: (a: string, b: string) => number;\n  private readonly mergeMode: 'shallow' | 'deep';\n\n  private _activeStates: string[] = [];\n  private _effectiveStates: string[] = [];\n  private _suppressed: string[] = [];\n  private _resolvedPatch: Partial<T> = {};\n  private resolverPatchCache = new Map<string, Partial<T>>();\n  private resolverCacheKey = '';\n  private resolverCacheValid = false;\n  private graphic: any;\n  private baseAttributes: Partial<T> = {};\n\n  constructor(options: IStateEngineOptions<T>) {\n    this.compiledDefinitions = options.compiledDefinitions;\n    this.stateSort = options.stateSort;\n    this.mergeMode = options.mergeMode ?? 'shallow';\n  }\n\n  get activeStates(): ReadonlyArray<string> {\n    return this._activeStates;\n  }\n\n  get effectiveStates(): ReadonlyArray<string> {\n    return this._effectiveStates;\n  }\n\n  get resolvedPatch(): Partial<T> {\n    return this._resolvedPatch;\n  }\n\n  get suppressed(): ReadonlyArray<string> {\n    return this._suppressed;\n  }\n\n  setResolveContext(graphic: any, baseAttributes: Partial<T>): void {\n    if (this.graphic !== graphic || this.baseAttributes !== baseAttributes) {\n      this.invalidateResolverCache();\n    }\n    this.graphic = graphic;\n    this.baseAttributes = baseAttributes;\n  }\n\n  applyStates(stateNames: string[]): StateTransitionResult {\n    const uniqueStates = Array.from(new Set(stateNames));\n    const sortedStates = this.sortStates(uniqueStates);\n    const adjudicated = this.adjudicate(sortedStates);\n    const activeStates = adjudicated.active;\n    const effectiveStates = activeStates.filter(stateName => !adjudicated.suppressedSet.has(stateName));\n    const suppressed = activeStates.filter(stateName => adjudicated.suppressedSet.has(stateName));\n\n    const changed =\n      !this.sameArray(this._activeStates, activeStates) ||\n      !this.sameArray(this._effectiveStates, effectiveStates) ||\n      !this.sameArray(this._suppressed, suppressed);\n\n    this._activeStates = activeStates;\n    this._effectiveStates = effectiveStates;\n    this._suppressed = suppressed;\n\n    if (changed || !this.resolverCacheValid) {\n      this.recomputePatch(effectiveStates);\n    }\n\n    return {\n      changed,\n      activeStates: [...this._activeStates],\n      effectiveStates: [...this._effectiveStates],\n      suppressed: [...this._suppressed]\n    };\n  }\n\n  addState(stateName: string, keepCurrentStates?: boolean): StateTransitionResult {\n    if (this._activeStates.includes(stateName) && (keepCurrentStates || this._activeStates.length === 1)) {\n      return {\n        changed: false,\n        activeStates: [...this._activeStates],\n        effectiveStates: [...this._effectiveStates],\n        suppressed: [...this._suppressed]\n      };\n    }\n\n    const nextStates =\n      keepCurrentStates && this._activeStates.length ? this._activeStates.concat([stateName]) : [stateName];\n\n    return this.applyStates(nextStates);\n  }\n\n  removeState(stateNames: string | string[]): StateTransitionResult {\n    if (!this._activeStates.length) {\n      return {\n        changed: false,\n        activeStates: [],\n        effectiveStates: [],\n        suppressed: []\n      };\n    }\n\n    const filteredNames = Array.isArray(stateNames)\n      ? this._activeStates.filter(stateName => !stateNames.includes(stateName))\n      : this._activeStates.filter(stateName => stateName !== stateNames);\n\n    if (filteredNames.length === this._activeStates.length) {\n      return {\n        changed: false,\n        activeStates: [...this._activeStates],\n        effectiveStates: [...this._effectiveStates],\n        suppressed: [...this._suppressed]\n      };\n    }\n\n    return this.applyStates(filteredNames);\n  }\n\n  toggleState(stateName: string): StateTransitionResult {\n    if (this.hasState(stateName)) {\n      return this.removeState(stateName);\n    }\n\n    return this.applyStates(this._activeStates.concat([stateName]));\n  }\n\n  clearStates(): StateTransitionResult {\n    const changed = this._activeStates.length > 0 || this._effectiveStates.length > 0 || this._suppressed.length > 0;\n    this._activeStates = [];\n    this._effectiveStates = [];\n    this._suppressed = [];\n    this._resolvedPatch = {};\n    this.resolverPatchCache.clear();\n    this.resolverCacheKey = '';\n    this.resolverCacheValid = false;\n\n    return {\n      changed,\n      activeStates: [],\n      effectiveStates: [],\n      suppressed: []\n    };\n  }\n\n  invalidateResolverCache(): void {\n    this.resolverPatchCache.clear();\n    this.resolverCacheKey = '';\n    this.resolverCacheValid = false;\n  }\n\n  hasState(stateName?: string): boolean {\n    if (!this._activeStates.length) {\n      return false;\n    }\n\n    if (stateName == null) {\n      return true;\n    }\n\n    return this._activeStates.includes(stateName);\n  }\n\n  private sortStates(states: string[]): string[] {\n    const withDefinition: string[] = [];\n    const withoutDefinition: string[] = [];\n\n    states.forEach(stateName => {\n      if (this.compiledDefinitions.has(stateName)) {\n        withDefinition.push(stateName);\n      } else {\n        withoutDefinition.push(stateName);\n      }\n    });\n\n    withDefinition.sort((left, right) => {\n      const leftDefinition = this.compiledDefinitions.get(left);\n      const rightDefinition = this.compiledDefinitions.get(right);\n      if (!leftDefinition || !rightDefinition) {\n        return 0;\n      }\n      if (leftDefinition.priority !== rightDefinition.priority) {\n        return leftDefinition.priority - rightDefinition.priority;\n      }\n      return leftDefinition.rank - rightDefinition.rank;\n    });\n\n    if (this.stateSort && withoutDefinition.length > 1) {\n      withoutDefinition.sort(this.stateSort);\n    }\n\n    return withDefinition.concat(withoutDefinition);\n  }\n\n  private adjudicate(sortedStates: string[]): { active: string[]; suppressedSet: Set<string> } {\n    const candidate = sortedStates.slice();\n    const suppressedSet = new Set<string>();\n\n    for (let index = candidate.length - 1; index >= 0; index--) {\n      const stateName = candidate[index];\n      const definition = this.compiledDefinitions.get(stateName);\n      if (!definition) {\n        continue;\n      }\n\n      definition.exclude.forEach(excludedState => {\n        const excludedIndex = candidate.indexOf(excludedState);\n        if (excludedIndex === -1) {\n          return;\n        }\n\n        candidate.splice(excludedIndex, 1);\n        if (excludedIndex < index) {\n          index -= 1;\n        }\n      });\n\n      definition.suppress.forEach(suppressedState => {\n        suppressedSet.add(suppressedState);\n      });\n    }\n\n    return {\n      active: candidate,\n      suppressedSet\n    };\n  }\n\n  private recomputePatch(effectiveStates: string[]): void {\n    const cacheKey = effectiveStates.join(',');\n    const nextPatch: Partial<T> = {};\n    const useResolverCache = this.resolverCacheValid && this.resolverCacheKey === cacheKey;\n\n    if (!useResolverCache) {\n      this.resolverPatchCache.clear();\n      this.resolverCacheKey = cacheKey;\n    }\n\n    effectiveStates.forEach(stateName => {\n      const definition = this.compiledDefinitions.get(stateName);\n      if (!definition) {\n        return;\n      }\n\n      if (definition.patch) {\n        this.mergeInto(nextPatch, definition.patch);\n      }\n\n      if (definition.hasResolver) {\n        const resolverPatch = useResolverCache\n          ? this.resolverPatchCache.get(stateName)\n          : definition.resolver?.({\n              graphic: this.graphic,\n              activeStates: this._activeStates,\n              effectiveStates: this._effectiveStates,\n              baseAttributes: this.baseAttributes,\n              resolvedPatch: nextPatch\n            });\n\n        if (resolverPatch) {\n          if (!useResolverCache) {\n            this.resolverPatchCache.set(stateName, resolverPatch);\n          }\n          this.mergeInto(nextPatch, resolverPatch);\n        }\n      }\n    });\n\n    if (!useResolverCache) {\n      this.resolverCacheValid = true;\n    }\n\n    this._resolvedPatch = nextPatch;\n  }\n\n  private mergeInto(target: Partial<T>, patch: Partial<T>): void {\n    if (this.mergeMode === 'deep') {\n      Object.keys(patch).forEach(key => {\n        const nextValue = (patch as Record<string, any>)[key];\n        const previousValue = (target as Record<string, any>)[key];\n        const baseValue = (this.baseAttributes as Record<string, any>)?.[key];\n\n        if (isPlainObject(previousValue) && isPlainObject(nextValue)) {\n          (target as Record<string, any>)[key] = deepMerge(previousValue, nextValue);\n          return;\n        }\n\n        if (!isPlainObject(previousValue) && isPlainObject(baseValue) && isPlainObject(nextValue)) {\n          (target as Record<string, any>)[key] = deepMerge(baseValue, nextValue);\n          return;\n        }\n\n        (target as Record<string, any>)[key] = cloneValue(nextValue);\n      });\n      return;\n    }\n\n    Object.keys(patch).forEach(key => {\n      (target as Record<string, any>)[key] = cloneValue((patch as Record<string, any>)[key]);\n    });\n  }\n\n  private sameArray(left: readonly string[], right: readonly string[]): boolean {\n    if (left.length !== right.length) {\n      return false;\n    }\n\n    for (let index = 0; index < left.length; index++) {\n      if (left[index] !== right[index]) {\n        return false;\n      }\n    }\n\n    return true;\n  }\n}\n"]}
+{"version":3,"sources":["../src/graphic/state/state-engine.ts"],"names":[],"mappings":"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","file":"state-engine.js","sourcesContent":["import type { CompiledStateDefinition, IStateEngineOptions, StateTransitionResult } from './state-definition';\n\nfunction isPlainObject(value: unknown): value is Record<string, any> {\n  return value != null && typeof value === 'object' && !Array.isArray(value);\n}\n\nfunction cloneValue<T>(value: T): T {\n  if (!isPlainObject(value)) {\n    return value;\n  }\n\n  const clone: Record<string, any> = {};\n  Object.keys(value).forEach(key => {\n    clone[key] = cloneValue((value as Record<string, any>)[key]);\n  });\n  return clone as T;\n}\n\nfunction deepMerge(base: Record<string, any>, value: Record<string, any>): Record<string, any> {\n  const result: Record<string, any> = cloneValue(base) ?? {};\n\n  Object.keys(value).forEach(key => {\n    const nextValue = value[key];\n    const previousValue = result[key];\n\n    if (isPlainObject(previousValue) && isPlainObject(nextValue)) {\n      result[key] = deepMerge(previousValue, nextValue);\n      return;\n    }\n\n    result[key] = cloneValue(nextValue);\n  });\n\n  return result;\n}\n\nexport class StateEngine<T extends Record<string, any> = Record<string, any>> {\n  private readonly compiledDefinitions: Map<string, CompiledStateDefinition<T>>;\n  private readonly stateSort?: (a: string, b: string) => number;\n  private readonly stateOrder?: 'input';\n  private readonly mergeMode: 'shallow' | 'deep';\n\n  private _activeStates: string[] = [];\n  private _effectiveStates: string[] = [];\n  private _suppressed: string[] = [];\n  private _resolvedPatch: Partial<T> = {};\n  private resolverPatchCache = new Map<string, Partial<T>>();\n  private resolverCacheKey = '';\n  private resolverCacheValid = false;\n  private graphic: any;\n  private baseAttributes: Partial<T> = {};\n\n  constructor(options: IStateEngineOptions<T>) {\n    this.compiledDefinitions = options.compiledDefinitions;\n    this.stateSort = options.stateSort;\n    this.stateOrder = options.stateOrder;\n    this.mergeMode = options.mergeMode ?? 'shallow';\n  }\n\n  get activeStates(): ReadonlyArray<string> {\n    return this._activeStates;\n  }\n\n  get effectiveStates(): ReadonlyArray<string> {\n    return this._effectiveStates;\n  }\n\n  get resolvedPatch(): Partial<T> {\n    return this._resolvedPatch;\n  }\n\n  get suppressed(): ReadonlyArray<string> {\n    return this._suppressed;\n  }\n\n  setResolveContext(graphic: any, baseAttributes: Partial<T>): void {\n    if (this.graphic !== graphic || this.baseAttributes !== baseAttributes) {\n      this.invalidateResolverCache();\n    }\n    this.graphic = graphic;\n    this.baseAttributes = baseAttributes;\n  }\n\n  applyStates(stateNames: string[]): StateTransitionResult {\n    const uniqueStates = Array.from(new Set(stateNames));\n    const sortedStates = this.sortStates(uniqueStates);\n    const adjudicated = this.adjudicate(sortedStates);\n    const activeStates = adjudicated.active;\n    const effectiveStates = activeStates.filter(stateName => !adjudicated.suppressedSet.has(stateName));\n    const suppressed = activeStates.filter(stateName => adjudicated.suppressedSet.has(stateName));\n\n    const changed =\n      !this.sameArray(this._activeStates, activeStates) ||\n      !this.sameArray(this._effectiveStates, effectiveStates) ||\n      !this.sameArray(this._suppressed, suppressed);\n\n    this._activeStates = activeStates;\n    this._effectiveStates = effectiveStates;\n    this._suppressed = suppressed;\n\n    if (changed || !this.resolverCacheValid) {\n      this.recomputePatch(effectiveStates);\n    }\n\n    return {\n      changed,\n      activeStates: [...this._activeStates],\n      effectiveStates: [...this._effectiveStates],\n      suppressed: [...this._suppressed]\n    };\n  }\n\n  addState(stateName: string, keepCurrentStates?: boolean): StateTransitionResult {\n    if (this._activeStates.includes(stateName) && (keepCurrentStates || this._activeStates.length === 1)) {\n      return {\n        changed: false,\n        activeStates: [...this._activeStates],\n        effectiveStates: [...this._effectiveStates],\n        suppressed: [...this._suppressed]\n      };\n    }\n\n    const nextStates =\n      keepCurrentStates && this._activeStates.length ? this._activeStates.concat([stateName]) : [stateName];\n\n    return this.applyStates(nextStates);\n  }\n\n  removeState(stateNames: string | string[]): StateTransitionResult {\n    if (!this._activeStates.length) {\n      return {\n        changed: false,\n        activeStates: [],\n        effectiveStates: [],\n        suppressed: []\n      };\n    }\n\n    const filteredNames = Array.isArray(stateNames)\n      ? this._activeStates.filter(stateName => !stateNames.includes(stateName))\n      : this._activeStates.filter(stateName => stateName !== stateNames);\n\n    if (filteredNames.length === this._activeStates.length) {\n      return {\n        changed: false,\n        activeStates: [...this._activeStates],\n        effectiveStates: [...this._effectiveStates],\n        suppressed: [...this._suppressed]\n      };\n    }\n\n    return this.applyStates(filteredNames);\n  }\n\n  toggleState(stateName: string): StateTransitionResult {\n    if (this.hasState(stateName)) {\n      return this.removeState(stateName);\n    }\n\n    return this.applyStates(this._activeStates.concat([stateName]));\n  }\n\n  clearStates(): StateTransitionResult {\n    const changed = this._activeStates.length > 0 || this._effectiveStates.length > 0 || this._suppressed.length > 0;\n    this._activeStates = [];\n    this._effectiveStates = [];\n    this._suppressed = [];\n    this._resolvedPatch = {};\n    this.resolverPatchCache.clear();\n    this.resolverCacheKey = '';\n    this.resolverCacheValid = false;\n\n    return {\n      changed,\n      activeStates: [],\n      effectiveStates: [],\n      suppressed: []\n    };\n  }\n\n  invalidateResolverCache(): void {\n    this.resolverPatchCache.clear();\n    this.resolverCacheKey = '';\n    this.resolverCacheValid = false;\n  }\n\n  hasState(stateName?: string): boolean {\n    if (!this._activeStates.length) {\n      return false;\n    }\n\n    if (stateName == null) {\n      return true;\n    }\n\n    return this._activeStates.includes(stateName);\n  }\n\n  private sortStates(states: string[]): string[] {\n    if (this.stateOrder === 'input') {\n      return this.stateSort ? states.sort(this.stateSort) : states;\n    }\n    const withDefinition: string[] = [];\n    const withoutDefinition: string[] = [];\n\n    states.forEach(stateName => {\n      if (this.compiledDefinitions.has(stateName)) {\n        withDefinition.push(stateName);\n      } else {\n        withoutDefinition.push(stateName);\n      }\n    });\n\n    withDefinition.sort((left, right) => {\n      const leftDefinition = this.compiledDefinitions.get(left);\n      const rightDefinition = this.compiledDefinitions.get(right);\n      if (!leftDefinition || !rightDefinition) {\n        return 0;\n      }\n      if (leftDefinition.priority !== rightDefinition.priority) {\n        return leftDefinition.priority - rightDefinition.priority;\n      }\n      return leftDefinition.rank - rightDefinition.rank;\n    });\n\n    if (this.stateSort && withoutDefinition.length > 1) {\n      withoutDefinition.sort(this.stateSort);\n    }\n\n    return withDefinition.concat(withoutDefinition);\n  }\n\n  private adjudicate(sortedStates: string[]): { active: string[]; suppressedSet: Set<string> } {\n    const candidate = sortedStates.slice();\n    const suppressedSet = new Set<string>();\n\n    for (let index = candidate.length - 1; index >= 0; index--) {\n      const stateName = candidate[index];\n      const definition = this.compiledDefinitions.get(stateName);\n      if (!definition) {\n        continue;\n      }\n\n      definition.exclude.forEach(excludedState => {\n        const excludedIndex = candidate.indexOf(excludedState);\n        if (excludedIndex === -1) {\n          return;\n        }\n\n        candidate.splice(excludedIndex, 1);\n        if (excludedIndex < index) {\n          index -= 1;\n        }\n      });\n\n      definition.suppress.forEach(suppressedState => {\n        suppressedSet.add(suppressedState);\n      });\n    }\n\n    return {\n      active: candidate,\n      suppressedSet\n    };\n  }\n\n  private recomputePatch(effectiveStates: string[]): void {\n    const cacheKey = effectiveStates.join(',');\n    const nextPatch: Partial<T> = {};\n    const useResolverCache = this.resolverCacheValid && this.resolverCacheKey === cacheKey;\n\n    if (!useResolverCache) {\n      this.resolverPatchCache.clear();\n      this.resolverCacheKey = cacheKey;\n    }\n\n    effectiveStates.forEach(stateName => {\n      const definition = this.compiledDefinitions.get(stateName);\n      if (!definition) {\n        return;\n      }\n\n      if (definition.patch) {\n        this.mergeInto(nextPatch, definition.patch);\n      }\n\n      if (definition.hasResolver) {\n        const resolverPatch = useResolverCache\n          ? this.resolverPatchCache.get(stateName)\n          : definition.resolver?.({\n              graphic: this.graphic,\n              activeStates: this._activeStates,\n              effectiveStates: this._effectiveStates,\n              baseAttributes: this.baseAttributes,\n              resolvedPatch: nextPatch\n            });\n\n        if (resolverPatch) {\n          if (!useResolverCache) {\n            this.resolverPatchCache.set(stateName, resolverPatch);\n          }\n          this.mergeInto(nextPatch, resolverPatch);\n        }\n      }\n    });\n\n    if (!useResolverCache) {\n      this.resolverCacheValid = true;\n    }\n\n    this._resolvedPatch = nextPatch;\n  }\n\n  private mergeInto(target: Partial<T>, patch: Partial<T>): void {\n    if (this.mergeMode === 'deep') {\n      Object.keys(patch).forEach(key => {\n        const nextValue = (patch as Record<string, any>)[key];\n        const previousValue = (target as Record<string, any>)[key];\n        const baseValue = (this.baseAttributes as Record<string, any>)?.[key];\n\n        if (isPlainObject(previousValue) && isPlainObject(nextValue)) {\n          (target as Record<string, any>)[key] = deepMerge(previousValue, nextValue);\n          return;\n        }\n\n        if (!isPlainObject(previousValue) && isPlainObject(baseValue) && isPlainObject(nextValue)) {\n          (target as Record<string, any>)[key] = deepMerge(baseValue, nextValue);\n          return;\n        }\n\n        (target as Record<string, any>)[key] = cloneValue(nextValue);\n      });\n      return;\n    }\n\n    Object.keys(patch).forEach(key => {\n      (target as Record<string, any>)[key] = cloneValue((patch as Record<string, any>)[key]);\n    });\n  }\n\n  private sameArray(left: readonly string[], right: readonly string[]): boolean {\n    if (left.length !== right.length) {\n      return false;\n    }\n\n    for (let index = 0; index < left.length; index++) {\n      if (left[index] !== right[index]) {\n        return false;\n      }\n    }\n\n    return true;\n  }\n}\n"]}

package/cjs/interface/graphic/glyph.d.ts

@@ -1,4 +1,4 @@
-import type { IGraphicAttribute, IGraphic } from '../graphic';
+import type { IGraphicAttribute, IGraphic, ISetAttributeContext } from '../graphic';
 import type { ICustomPath2D } from '../path';
 export type IGlyphAttribute = {
     path: string | ICustomPath2D;
@@ -21,4 +21,6 @@ export interface IGlyph<T extends Partial<IGraphicAttribute> = Partial<IGraphicA
     getSubGraphic: () => IGraphic[];
     onInit: (cb: (g: this) => void) => void;
     onUpdate: (cb: (g: this) => void) => void;
+    setSubGraphicEncoder: (encoder?: (g: IGlyph, context?: ISetAttributeContext) => void) => void;
+    commitSubGraphicAttributes: (subGraphic: IGraphic, patch: Record<string, any>, removedKeys?: readonly string[], context?: ISetAttributeContext) => void;
 }

package/cjs/interface/graphic/glyph.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/interface/graphic/glyph.ts"],"names":[],"mappings":"","file":"glyph.js","sourcesContent":["import type { IGraphicAttribute, IGraphic } from '../graphic';\nimport type { ICustomPath2D } from '../path';\n\n// glyph是一种图元，这种图元组合了各种其他图元\n// 1. 相对于group来说glyph不包含childrenPickable\n// 2. glyph不支持布局\n// 3. glyph不支持clip\n\nexport type IGlyphAttribute = {\n  path: string | ICustomPath2D;\n  width: number;\n  height: number;\n  cornerRadius: number | number[];\n  clip: boolean;\n};\n\nexport type IGlyphGraphicAttribute = Partial<IGraphicAttribute> & Partial<IGlyphAttribute>;\n\nexport interface IGlyph<T extends Partial<IGraphicAttribute> = Partial<IGraphicAttribute>>\n  extends IGraphic<IGlyphGraphicAttribute> {\n  glyphStates?: Record<\n    string,\n    {\n      attributes: IGlyphGraphicAttribute;\n      subAttributes: T[];\n    }\n  >;\n  glyphStateProxy?: (\n    stateName: string,\n    targetStates?: string[]\n  ) => {\n    attributes: IGlyphGraphicAttribute;\n    subAttributes: T[];\n  };\n\n  setSubGraphic: (subGraphic: IGraphic[]) => void;\n\n  getSubGraphic: () => IGraphic[];\n\n  onInit: (cb: (g: this) => void) => void;\n\n  onUpdate: (cb: (g: this) => void) => void;\n}\n"]}
+{"version":3,"sources":["../src/interface/graphic/glyph.ts"],"names":[],"mappings":"","file":"glyph.js","sourcesContent":["import type { IGraphicAttribute, IGraphic, ISetAttributeContext } from '../graphic';\nimport type { ICustomPath2D } from '../path';\n\n// glyph是一种图元，这种图元组合了各种其他图元\n// 1. 相对于group来说glyph不包含childrenPickable\n// 2. glyph不支持布局\n// 3. glyph不支持clip\n\nexport type IGlyphAttribute = {\n  path: string | ICustomPath2D;\n  width: number;\n  height: number;\n  cornerRadius: number | number[];\n  clip: boolean;\n};\n\nexport type IGlyphGraphicAttribute = Partial<IGraphicAttribute> & Partial<IGlyphAttribute>;\n\nexport interface IGlyph<T extends Partial<IGraphicAttribute> = Partial<IGraphicAttribute>>\n  extends IGraphic<IGlyphGraphicAttribute> {\n  glyphStates?: Record<\n    string,\n    {\n      attributes: IGlyphGraphicAttribute;\n      subAttributes: T[];\n    }\n  >;\n  glyphStateProxy?: (\n    stateName: string,\n    targetStates?: string[]\n  ) => {\n    attributes: IGlyphGraphicAttribute;\n    subAttributes: T[];\n  };\n\n  setSubGraphic: (subGraphic: IGraphic[]) => void;\n\n  getSubGraphic: () => IGraphic[];\n\n  onInit: (cb: (g: this) => void) => void;\n\n  /** Observes committed attributes after derived children are synchronized. Honors skipUpdateCallback. */\n  onUpdate: (cb: (g: this) => void) => void;\n\n  /** Bind after children/context are ready. Runs once immediately and after each host attribute commit. */\n  setSubGraphicEncoder: (encoder?: (g: IGlyph, context?: ISetAttributeContext) => void) => void;\n\n  /** Atomically apply derived values and remove owned keys, preserving child state/base truth. */\n  commitSubGraphicAttributes: (\n    subGraphic: IGraphic,\n    patch: Record<string, any>,\n    removedKeys?: readonly string[],\n    context?: ISetAttributeContext\n  ) => void;\n}\n"]}

package/dist/index.es.js

@@ -9203,6 +9203,7 @@ class StateEngine {
         this.baseAttributes = {};
         this.compiledDefinitions = options.compiledDefinitions;
         this.stateSort = options.stateSort;
+        this.stateOrder = options.stateOrder;
         this.mergeMode = (_a = options.mergeMode) !== null && _a !== void 0 ? _a : 'shallow';
     }
     get activeStates() {
@@ -9318,6 +9319,9 @@ class StateEngine {
         return this._activeStates.includes(stateName);
     }
     sortStates(states) {
+        if (this.stateOrder === 'input') {
+            return this.stateSort ? states.sort(this.stateSort) : states;
+        }
         const withDefinition = [];
         const withoutDefinition = [];
         states.forEach(stateName => {
@@ -10094,7 +10098,7 @@ class Graphic extends Node {
         }
         return (_b = this.localStateDefinitionsVersion) !== null && _b !== void 0 ? _b : 0;
     }
-    resolveEffectiveCompiledDefinitions() {
+    resolveEffectiveCompiledDefinitions(_stateNames) {
         this.syncSharedStateScopeBindingFromTree(false);
         const boundScope = this.boundSharedStateScope;
         if (boundScope) {
@@ -10329,7 +10333,37 @@ class Graphic extends Node {
         this.applyBaseAttributes(params);
         this.commitBaseAttributeMutation(false, context);
     }
+    commitBaseAttributesByCategory(params, forceUpdateTag = false, context) {
+        const base = this.getBaseAttributesStorage();
+        let category = UpdateCategory.NONE;
+        let hasKeys = false;
+        for (const key in params) {
+            if (!Object.prototype.hasOwnProperty.call(params, key)) {
+                continue;
+            }
+            hasKeys = true;
+            const prev = base[key];
+            const next = params[key];
+            if (prev !== next) {
+                category = this.mergeAttributeDeltaCategory(category, key, prev, next);
+            }
+            base[key] = next;
+        }
+        if (!hasKeys) {
+            return;
+        }
+        this.attribute = base;
+        this._baseAttributes = undefined;
+        this.attributeMayContainTransientAttrs = false;
+        this.valid = this.isValid();
+        this.submitUpdateByCategory(category, forceUpdateTag);
+        this.onAttributeUpdate(context);
+    }
     commitBaseAttributesByTouchedKeys(params, forceUpdateTag = false, context) {
+        if (this.glyphHost) {
+            this.commitBaseAttributesByCategory(params, forceUpdateTag, context);
+            return;
+        }
         const source = params;
         const baseAttributes = this.getBaseAttributesStorage();
         let hasKeys = false;
@@ -11193,7 +11227,29 @@ class Graphic extends Node {
     skewTo(b, c) {
         return this;
     }
+    static bindGlyphAttributes(graphic, inherited) {
+        if (Object.getPrototypeOf(graphic.attribute) !== inherited) {
+            Object.setPrototypeOf(graphic.attribute, inherited);
+        }
+        if (graphic._baseAttributes && Object.getPrototypeOf(graphic._baseAttributes) !== inherited) {
+            Object.setPrototypeOf(graphic._baseAttributes, inherited);
+        }
+    }
+    static commitDerivedAttributePatch(graphic, patch, removedKeys, context) {
+        if (!(removedKeys === null || removedKeys === void 0 ? void 0 : removedKeys.length)) {
+            graphic.setAttributes(patch, false, context);
+            return;
+        }
+        graphic.detachAttributeFromBaseAttributes();
+        const base = graphic.getBaseAttributesStorage();
+        removedKeys.forEach(key => delete base[key]);
+        graphic.applyBaseAttributes(patch);
+        graphic.commitBaseAttributeMutation(false, context);
+    }
     onAttributeUpdate(context) {
+        if (this.glyphHost) {
+            Graphic.bindGlyphAttributes(this, this.glyphHost.attribute);
+        }
         if (context && context.skipUpdateCallback) {
             return;
         }
@@ -11242,8 +11298,11 @@ class Graphic extends Node {
         (_a = this.stateEngine) === null || _a === void 0 ? void 0 : _a.setResolveContext(this, stateResolveBaseAttrs);
         return stateResolveBaseAttrs;
     }
-    ensureStateEngine(stateResolveBaseAttrs = this.getStateResolveBaseAttrs()) {
-        const { compiledDefinitions } = this.resolveEffectiveCompiledDefinitions();
+    ensureStateEngine(stateResolveBaseAttrs, stateNames) {
+        var _a;
+        if (stateResolveBaseAttrs === void 0) { stateResolveBaseAttrs = this.getStateResolveBaseAttrs(); }
+        if (stateNames === void 0) { stateNames = (_a = this.currentStates) !== null && _a !== void 0 ? _a : EMPTY_STATE_NAMES; }
+        const { compiledDefinitions, stateOrder } = this.resolveEffectiveCompiledDefinitions(stateNames);
         this.compiledStateDefinitions = compiledDefinitions;
         if (!compiledDefinitions) {
             this.stateEngine = undefined;
@@ -11252,14 +11311,17 @@ class Graphic extends Node {
         else if (!this.stateEngine ||
             this.stateEngineCompiledDefinitions !== compiledDefinitions ||
             this.stateEngineStateSort !== this.stateSort ||
+            this.stateEngineStateOrder !== stateOrder ||
             this.stateEngineMergeMode !== this.stateMergeMode) {
             this.stateEngine = new StateEngine({
                 compiledDefinitions,
                 stateSort: this.stateSort,
+                stateOrder,
                 mergeMode: this.stateMergeMode
             });
             this.stateEngineCompiledDefinitions = compiledDefinitions;
             this.stateEngineStateSort = this.stateSort;
+            this.stateEngineStateOrder = stateOrder;
             this.stateEngineMergeMode = this.stateMergeMode;
         }
         this.syncStateResolveContext(stateResolveBaseAttrs);
@@ -11300,7 +11362,7 @@ 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);
@@ -11313,7 +11375,7 @@ class Graphic extends Node {
     }
     resolveAddStateTransition(stateName, keepCurrentStates) {
         var _a;
-        const stateEngine = this.ensureStateEngine();
+        const stateEngine = this.ensureStateEngine(undefined, [stateName]);
         if (stateEngine) {
             return this.toGraphicStateTransition(stateEngine.addState(stateName, keepCurrentStates));
         }
@@ -11350,7 +11412,7 @@ class Graphic extends Node {
         return this.resolveLocalUseStatesTransition(nextStates);
     }
     resolveToggleStateTransition(stateName) {
-        const stateEngine = this.ensureStateEngine();
+        const stateEngine = this.ensureStateEngine(undefined, [stateName]);
         if (stateEngine) {
             return this.toGraphicStateTransition(stateEngine.toggleState(stateName));
         }
@@ -11364,7 +11426,7 @@ class Graphic extends Node {
     resolveGraphicStateTransition(states, forceResolverRefresh = false) {
         var _a;
         const stateResolveBaseAttrs = this.getStateResolveBaseAttrs();
-        const stateEngine = this.ensureStateEngine(stateResolveBaseAttrs);
+        const stateEngine = this.ensureStateEngine(stateResolveBaseAttrs, states);
         if (forceResolverRefresh) {
             stateEngine === null || stateEngine === void 0 ? void 0 : stateEngine.invalidateResolverCache();
         }
@@ -11493,7 +11555,7 @@ class Graphic extends Node {
     shouldSkipStateTransitionDefaultAttribute(_key, _targetAttrs) {
         return false;
     }
-    stopStateAnimates(type = 'end') {
+    stopStateAnimates(type) {
         const stopAnimationState = this.stopAnimationState;
         if (typeof stopAnimationState === 'function') {
             stopAnimationState.call(this, 'state', type);
@@ -13758,19 +13820,21 @@ class Glyph extends Graphic {
         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);
+            Graphic.bindGlyphAttributes(g, this.attribute);
         });
         this.valid = this.isValid();
         this.addUpdateBoundTag();
+        (_a = this.subGraphicEncoder) === null || _a === void 0 ? void 0 : _a.call(this, this);
     }
     detachSubGraphic() {
         this.subGraphic.forEach(g => {
             g.glyphHost = null;
-            Object.setPrototypeOf(g.attribute, {});
+            Graphic.bindGlyphAttributes(g, Object.prototype);
         });
     }
     getSubGraphic() {
@@ -13785,67 +13849,52 @@ class Glyph extends Graphic {
     isValid() {
         return true;
     }
-    setAttribute(key, value, forceUpdateTag, context) {
-        super.setAttribute(key, value, forceUpdateTag, context);
-        this.subGraphic.forEach(g => {
-            g.addUpdateShapeAndBoundsTag();
-            g.addUpdatePositionTag();
-        });
+    setSubGraphicEncoder(encoder) {
+        this.subGraphicEncoder = encoder;
+        encoder === null || encoder === void 0 ? void 0 : encoder(this);
     }
-    setAttributes(params, forceUpdateTag = false, context) {
-        super.setAttributes(params, forceUpdateTag, context);
-        this.subGraphic.forEach(g => {
-            g.addUpdateShapeAndBoundsTag();
-            g.addUpdatePositionTag();
-        });
+    commitSubGraphicAttributes(subGraphic, patch, removedKeys, context) {
+        Graphic.commitDerivedAttributePatch(subGraphic, patch, removedKeys, context);
     }
-    translate(x, y) {
-        super.translate(x, y);
-        this.subGraphic.forEach(g => {
-            g.addUpdatePositionTag();
-            g.addUpdateBoundTag();
-        });
-        return this;
-    }
-    translateTo(x, y) {
-        super.translateTo(x, y);
-        this.subGraphic.forEach(g => {
-            g.addUpdatePositionTag();
-            g.addUpdateBoundTag();
-        });
-        return this;
-    }
-    scale(scaleX, scaleY, scaleCenter) {
-        super.scale(scaleX, scaleY, scaleCenter);
-        this.subGraphic.forEach(g => {
-            g.addUpdatePositionTag();
-            g.addUpdateBoundTag();
-        });
-        return this;
+    onAttributeUpdate(context) {
+        var _a, _b;
+        if (this.glyphHost) {
+            Graphic.bindGlyphAttributes(this, this.glyphHost.attribute);
+        }
+        for (const child of this.subGraphic) {
+            Graphic.bindGlyphAttributes(child, this.attribute);
+        }
+        (_a = this.subGraphicEncoder) === null || _a === void 0 ? void 0 : _a.call(this, this, context);
+        if (!(context === null || context === void 0 ? void 0 : context.skipUpdateCallback)) {
+            (_b = this._onUpdate) === null || _b === void 0 ? void 0 : _b.call(this, this);
+        }
+        super.onAttributeUpdate(context);
     }
-    scaleTo(scaleX, scaleY) {
-        super.scaleTo(scaleX, scaleY);
-        this.subGraphic.forEach(g => {
-            g.addUpdatePositionTag();
-            g.addUpdateBoundTag();
-        });
-        return this;
+    submitUpdateByCategory(category, forceUpdateTag = false) {
+        super.submitUpdateByCategory(category, forceUpdateTag);
+        for (const child of this.subGraphic) {
+            if (forceUpdateTag || category & UpdateCategory.SHAPE) {
+                child.addUpdateShapeAndBoundsTag();
+            }
+            else if (category & UpdateCategory.BOUNDS) {
+                child.addUpdateBoundTag();
+            }
+            if (category & UpdateCategory.PAINT) {
+                child.addUpdatePaintTag();
+            }
+            if (forceUpdateTag || category & UpdateCategory.TRANSFORM) {
+                child.addUpdatePositionTag();
+            }
+            if (forceUpdateTag || category & UpdateCategory.LAYOUT) {
+                child.addUpdateLayoutTag();
+            }
+        }
     }
-    rotate(angle) {
-        super.rotate(angle);
-        this.subGraphic.forEach(g => {
-            g.addUpdatePositionTag();
-            g.addUpdateBoundTag();
-        });
-        return this;
+    commitBaseAttributesByTouchedKeys(params, forceUpdateTag = false, context) {
+        this.commitBaseAttributesByCategory(params, forceUpdateTag, context);
     }
-    rotateTo(angle) {
-        super.rotate(angle);
-        this.subGraphic.forEach(g => {
-            g.addUpdatePositionTag();
-            g.addUpdateBoundTag();
-        });
-        return this;
+    commitBaseAttributeBySingleKey(key, value, forceUpdateTag = false, context) {
+        this.commitBaseAttributesByTouchedKeys({ [key]: value }, forceUpdateTag, context);
     }
     getGraphicTheme() {
         return getTheme(this).glyph;
@@ -13869,54 +13918,82 @@ class Glyph extends Graphic {
     needUpdateTag(key) {
         return false;
     }
-    useStates(states, hasAnimation) {
-        var _a;
-        if (!states.length) {
-            this.clearStates(hasAnimation);
-            return;
-        }
-        const previousStates = this.currentStates ? this.currentStates.slice() : [];
-        const isChange = ((_a = this.currentStates) === null || _a === void 0 ? void 0 : _a.length) !== states.length ||
-            states.some((stateName, index) => this.currentStates[index] !== stateName);
-        if (!isChange) {
-            return;
-        }
-        this.stopStateAnimates();
-        if (this.stateSort) {
-            states = states.sort(this.stateSort);
+    hasLegacyStateDefinitions() {
+        if (this.glyphStateProxy) {
+            return true;
         }
-        const stateAttrs = {};
-        states.forEach(stateName => {
-            const attrs = this.glyphStateProxy ? this.glyphStateProxy(stateName, states) : this.glyphStates[stateName];
-            if (attrs) {
-                Object.assign(stateAttrs, attrs.attributes);
+        for (const name in this.glyphStates) {
+            if (Object.prototype.hasOwnProperty.call(this.glyphStates, name)) {
+                return true;
             }
-        });
-        if (!this.beforeStateUpdate(stateAttrs, previousStates, states, hasAnimation, false)) {
-            return;
         }
-        this.currentStates = states;
-        this.applyStateAttrs(stateAttrs, states, hasAnimation);
+        return false;
     }
-    clearStates(hasAnimation) {
-        this.stopStateAnimates();
-        const previousStates = this.currentStates ? this.currentStates.slice() : [];
-        if (this.hasState() && this.normalAttrs) {
-            if (!this.beforeStateUpdate(this.normalAttrs, previousStates, [], hasAnimation, true)) {
-                return;
-            }
-            this.currentStates = [];
-            this.applyStateAttrs(this.normalAttrs, this.currentStates, hasAnimation, true);
+    syncSharedStateScopeBindingFromTree(markDirty = true, inheritedSharedStateScope) {
+        return this.hasLegacyStateDefinitions()
+            ? this.syncSharedStateScopeBinding(undefined, markDirty)
+            : super.syncSharedStateScopeBindingFromTree(markDirty, inheritedSharedStateScope);
+    }
+    resolveEffectiveCompiledDefinitions(stateNames = []) {
+        var _a, _b;
+        if (!this.hasLegacyStateDefinitions()) {
+            this.legacyDefinitions = undefined;
+            this.legacyCompiledDefinitions = undefined;
+            return super.resolveEffectiveCompiledDefinitions(stateNames);
         }
-        else {
-            this.currentStates = [];
+        this.syncSharedStateScopeBindingFromTree(false);
+        let changed = false;
+        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((_a = this.glyphStates) !== null && _a !== void 0 ? _a : {})) {
+                this.legacyDefinitions[name] = this.createLegacyStateDefinition(name);
+            }
+            changed = true;
+        }
+        if (this.glyphStateProxy) {
+            const addDefinition = (name) => {
+                if (!Object.prototype.hasOwnProperty.call(this.legacyDefinitions, name)) {
+                    this.legacyDefinitions[name] = this.createLegacyStateDefinition(name);
+                    changed = true;
+                }
+            };
+            (_b = this.currentStates) === null || _b === void 0 ? void 0 : _b.forEach(addDefinition);
+            stateNames.forEach(addDefinition);
         }
+        if (changed) {
+            this.legacyCompiledDefinitions = new StateDefinitionCompiler().compile(this.legacyDefinitions);
+        }
+        return { compiledDefinitions: this.legacyCompiledDefinitions, stateOrder: 'input' };
+    }
+    createLegacyStateDefinition(name) {
+        return this.glyphStateProxy
+            ? {
+                name,
+                resolver: ({ graphic, activeStates }) => { var _a; return (_a = graphic.glyphStateProxy(name, activeStates)) === null || _a === void 0 ? void 0 : _a.attributes; }
+            }
+            : { name, patch: this.glyphStates[name].attributes };
     }
     clone() {
         const glyph = new Glyph(Object.assign({}, this.attribute));
         glyph.setSubGraphic(this.subGraphic.map(g => g.clone()));
         return glyph;
     }
+    release() {
+        super.release();
+        this.subGraphicEncoder = undefined;
+        this._onUpdate = undefined;
+        this.legacyDefinitions = undefined;
+        this.legacyCompiledDefinitions = undefined;
+        this.legacyDefinitionsSource = undefined;
+        this.legacyProxySource = undefined;
+        this.detachSubGraphic();
+        this.subGraphic.forEach(child => child.release());
+        this.subGraphic = [];
+    }
     getNoWorkAnimateAttr() {
         return Glyph.NOWORK_ANIMATE_ATTR;
     }