@visactor/vrender-core 1.1.0-alpha.8 → 1.1.0

package/cjs/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    const subAttrs = this.subGraphic.map(() => ({}));\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        if (attrs.subAttributes?.length) {\n          subAttrs.forEach((subAttrs, index) => {\n            Object.assign(subAttrs, attrs.subAttributes[index]);\n          });\n        }\n      }\n    });\n\n    // this.subGraphic.forEach((graphic, index) => {\n    //   graphic.updateNormalAttrs(subAttrs[index]);\n    //   graphic.applyStateAttrs(subAttrs[index], states, hasAnimation);\n    // });\n\n    if (!this.beforeStateUpdate(stateAttrs, previousStates, states, hasAnimation, false)) {\n      return;\n    }\n\n    this.updateNormalAttrs(stateAttrs);\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.subGraphic.forEach(graphic => {\n      //   graphic.applyStateAttrs(graphic.normalAttrs, this.currentStates, hasAnimation, true);\n      //   graphic.normalAttrs = null;\n      // });\n      this.applyStateAttrs(this.normalAttrs, this.currentStates, hasAnimation, true);\n    } else {\n      this.currentStates = [];\n    }\n    this.normalAttrs = null;\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":";;;AACA,uCAAyD;AASzD,mCAAmC;AACnC,2CAAgD;AAEhD,MAAa,KAAM,SAAQ,iBAA+B;IAsBxD,YAAY,MAAuC;QACjD,KAAK,CAAC,MAAM,CAAC,CAAC;QAtBhB,SAAI,GAAgB,OAAO,CAAC;QAuB1B,IAAI,CAAC,UAAU,GAAG,6BAAiB,CAAC;QACpC,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;IAC9B,CAAC;IAED,aAAa,CAAC,UAAsB;QAClC,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACrB,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC;YACnB,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC5B,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC3B,CAAC;IAES,gBAAgB;QACxB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC1B,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC;YACnB,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,MAAM,CAAC,EAAqB;QAC1B,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;IACpB,CAAC;IAED,QAAQ,CAAC,EAAqB;QAC5B,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;IACtB,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YAAY,CAAC,GAAW,EAAE,KAAU,EAAE,cAAwB,EAAE,OAA8B;QAC5F,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;QACxD,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC1B,CAAC,CAAC,0BAA0B,EAAE,CAAC;YAC/B,CAAC,CAAC,oBAAoB,EAAE,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC;IAED,aAAa,CACX,MAAuC,EACvC,iBAA0B,KAAK,EAC/B,OAA8B;QAE9B,KAAK,CAAC,aAAa,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;QACrD,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC1B,CAAC,CAAC,0BAA0B,EAAE,CAAC;YAC/B,CAAC,CAAC,oBAAoB,EAAE,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC;IAED,SAAS,CAAC,CAAS,EAAE,CAAS;QAC5B,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAEtB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC1B,CAAC,CAAC,oBAAoB,EAAE,CAAC;YACzB,CAAC,CAAC,iBAAiB,EAAE,CAAC;QACxB,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IAED,WAAW,CAAC,CAAS,EAAE,CAAS;QAC9B,KAAK,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAExB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC1B,CAAC,CAAC,oBAAoB,EAAE,CAAC;YACzB,CAAC,CAAC,iBAAiB,EAAE,CAAC;QACxB,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,MAAc,EAAE,MAAc,EAAE,WAAwB;QAC5D,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;QAEzC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC1B,CAAC,CAAC,oBAAoB,EAAE,CAAC;YACzB,CAAC,CAAC,iBAAiB,EAAE,CAAC;QACxB,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,CAAC,MAAc,EAAE,MAAc;QACpC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAE9B,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC1B,CAAC,CAAC,oBAAoB,EAAE,CAAC;YACzB,CAAC,CAAC,iBAAiB,EAAE,CAAC;QACxB,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,CAAC,KAAa;QAClB,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAEpB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC1B,CAAC,CAAC,oBAAoB,EAAE,CAAC;YACzB,CAAC,CAAC,iBAAiB,EAAE,CAAC;QACxB,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAEpB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC1B,CAAC,CAAC,oBAAoB,EAAE,CAAC;YACzB,CAAC,CAAC,iBAAiB,EAAE,CAAC;QACxB,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IAED,eAAe;QACb,OAAO,IAAA,gBAAQ,EAAC,IAAgB,CAAC,CAAC,KAAK,CAAC;IAC1C,CAAC;IAES,gBAAgB,CACxB,SAAiC,EACjC,KAAuC,EACvC,UAAuB;QAGvB,IAAI,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,CAAC,IAAc,EAAE,EAAE;YAC9C,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QAIH,OAAO,UAAU,CAAC;IACpB,CAAC;IAES,kBAAkB;QAC1B,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC7B,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QACzB,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,eAAe,EAAE,EAAE,IAAI,CAAC,WAAW,CAAe,CAAC;QAC7G,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3B,OAAO,MAAM,CAAC;IAChB,CAAC;IAES,cAAc,CAAC,IAAc;QACrC,OAAO,KAAK,CAAC;IACf,CAAC;IACS,aAAa,CAAC,GAAW;QACjC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,SAAS,CAAC,MAAgB,EAAE,YAAsB;;QAChD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAClB,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;YAC/B,OAAO;SACR;QACD,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAE5E,MAAM,QAAQ,GACZ,CAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,MAAM,MAAK,MAAM,CAAC,MAAM;YAC5C,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,SAAS,CAAC,CAAC;QAC7E,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO;SACR;QAED,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAEzB,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACtC;QACD,MAAM,UAAU,GAAG,EAAE,CAAC;QACtB,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YACzB,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;YAE3G,IAAI,KAAK,EAAE;gBACT,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;aAC7C;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE;YACpF,OAAO;SACR;QAED,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC;QAC5B,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IACzD,CAAC;IAED,WAAW,CAAC,YAAsB;QAChC,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5E,IAAI,IAAI,CAAC,QAAQ,EAAE,IAAI,IAAI,CAAC,WAAW,EAAE;YACvC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,EAAE,EAAE,EAAE,YAAY,EAAE,IAAI,CAAC,EAAE;gBACrF,OAAO;aACR;YACD,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;YACxB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,aAAa,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;SAChF;aAAM;YACL,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;SACzB;IACH,CAAC;IAED,KAAK;QACH,MAAM,KAAK,GAAG,IAAI,KAAK,mBAAM,IAAI,CAAC,SAAS,EAAG,CAAC;QAC/C,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACzD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,oBAAoB;QAClB,OAAO,KAAK,CAAC,mBAAmB,CAAC;IACnC,CAAC;;AA5OH,sBA6OC;AAzNQ,yBAAmB,GAAG,6BAAmB,CAAC;AA2NnD,SAAgB,WAAW,CAAC,UAAkC;IAC5D,OAAO,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC;AAC/B,CAAC;AAFD,kCAEC","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"]}

package/cjs/graphic/graphic-service/graphic-service.d.ts

@@ -20,6 +20,10 @@ export declare class DefaultGraphicService implements IGraphicService {
     };
     protected tempAABBBounds1: AABBBounds;
     protected tempAABBBounds2: AABBBounds;
+    protected tempAABBBoundsResult: {
+        tb1: AABBBounds;
+        tb2: AABBBounds;
+    };
     constructor(creator?: IGraphicCreator);
     onAttributeUpdate(graphic: IGraphic): void;
     onSetStage(graphic: IGraphic, stage: IStage): void;
@@ -32,7 +36,6 @@ export declare class DefaultGraphicService implements IGraphicService {
         globalAABBBounds: IAABBBounds;
     }, selfChange: boolean): void;
     clearAABBBounds(graphic: IGraphic, stage: IStage, b: IAABBBounds): void;
-    updatePathProxyAABBBounds(aabbBounds: IAABBBounds, graphic?: IGraphic): boolean;
     updateHTMLTextAABBBounds(attribute: ITextGraphicAttribute, textTheme: Required<ITextGraphicAttribute>, aabbBounds: IAABBBounds, graphic?: IText): void;
     combindShadowAABBBounds(bounds: IAABBBounds, graphic?: IGraphic): void;
     transformAABBBounds(attribute: Partial<IGraphicAttribute>, aabbBounds: IAABBBounds, theme: Required<IGraphicAttribute>, miter: boolean, graphic?: IGraphic): void;

package/cjs/graphic/graphic-service/graphic-service.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultGraphicService = exports.shouldUseMat4 = exports.getModelMatrix = exports.getExtraModelMatrix = void 0;
 
-const vutils_1 = require("@visactor/vutils"), tapable_1 = require("../../tapable"), text_1 = require("../../common/text"), tools_1 = require("../tools"), matrix_allocate_1 = require("../../allocator/matrix-allocate"), bounds_context_1 = require("../../common/bounds-context"), render_command_list_1 = require("../../common/render-command-list"), matrix_1 = require("../../common/matrix"), graphic_creator_1 = require("../graphic-creator");
+const vutils_1 = require("@visactor/vutils"), tapable_1 = require("../../tapable"), text_1 = require("../../common/text"), tools_1 = require("../tools"), matrix_allocate_1 = require("../../allocator/matrix-allocate"), matrix_1 = require("../../common/matrix"), graphic_creator_1 = require("../graphic-creator");
 
 function getExtraModelMatrix(dx, dy, graphic) {
     const {alpha: alpha, beta: beta} = graphic.attribute;
@@ -86,7 +86,11 @@ class DefaultGraphicService {
             beforeUpdateAABBBounds: new tapable_1.SyncHook([ "graphic", "stage", "willUpdate", "aabbBounds" ]),
             afterUpdateAABBBounds: new tapable_1.SyncHook([ "graphic", "stage", "aabbBounds", "globalAABBBounds", "selfChange" ]),
             clearAABBBounds: new tapable_1.SyncHook([ "graphic", "stage", "aabbBounds" ])
-        }, this.tempAABBBounds1 = new vutils_1.AABBBounds, this.tempAABBBounds2 = new vutils_1.AABBBounds;
+        }, this.tempAABBBounds1 = new vutils_1.AABBBounds, this.tempAABBBounds2 = new vutils_1.AABBBounds, 
+        this.tempAABBBoundsResult = {
+            tb1: this.tempAABBBounds1,
+            tb2: this.tempAABBBounds2
+        };
     }
     onAttributeUpdate(graphic) {
         this.hooks.onAttributeUpdate.taps.length && this.hooks.onAttributeUpdate.call(graphic);
@@ -115,13 +119,6 @@ class DefaultGraphicService {
     clearAABBBounds(graphic, stage, b) {
         this.hooks.clearAABBBounds.taps.length && this.hooks.clearAABBBounds.call(graphic, stage, b);
     }
-    updatePathProxyAABBBounds(aabbBounds, graphic) {
-        const path = "function" == typeof graphic.pathProxy ? graphic.pathProxy(graphic.attribute) : graphic.pathProxy;
-        if (!path) return !1;
-        const boundsContext = new bounds_context_1.BoundsContext(aabbBounds);
-        return (0, render_command_list_1.renderCommandList)(path.commandList, boundsContext, 0, 0), 
-        !0;
-    }
     updateHTMLTextAABBBounds(attribute, textTheme, aabbBounds, graphic) {
         const {textAlign: textAlign, textBaseline: textBaseline} = attribute;
         if (null != attribute.forceBoundsHeight) {
@@ -172,10 +169,7 @@ class DefaultGraphicService {
     updateTempAABBBounds(aabbBounds) {
         const tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
         return tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), 
-        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), {
-            tb1: tb1,
-            tb2: tb2
-        };
+        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this.tempAABBBoundsResult;
     }
 }
 

package/cjs/graphic/graphic-service/graphic-service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graphic/graphic-service/graphic-service.ts"],"names":[],"mappings":"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","file":"graphic-service.js","sourcesContent":["import { AABBBounds, isNumber, transformBoundsWithMatrix, type IAABBBounds } from '@visactor/vutils';\nimport { SyncHook } from '../../tapable';\nimport type {\n  mat4,\n  IGraphicAttribute,\n  IGraphic,\n  IGroup,\n  IStage,\n  IText,\n  ITextGraphicAttribute,\n  ITransform,\n  IGraphicService,\n  IGraphicCreator,\n  ISyncHook\n} from '../../interface';\nimport { textDrawOffsetX, textLayoutOffsetY } from '../../common/text';\nimport { boundStroke } from '../tools';\nimport { mat4Allocate } from '../../allocator/matrix-allocate';\n// eslint-disable-next-line @typescript-eslint/consistent-type-imports\nimport { BoundsContext } from '../../common/bounds-context';\nimport { renderCommandList } from '../../common/render-command-list';\nimport { identityMat4, multiplyMat4Mat4, rotateX, rotateY, rotateZ, scaleMat4, translate } from '../../common/matrix';\nimport { graphicCreator } from '../graphic-creator';\n\nexport function getExtraModelMatrix(dx: number, dy: number, graphic: IGraphic): mat4 | null {\n  const { alpha, beta } = graphic.attribute;\n  if (!alpha && !beta) {\n    return null;\n  }\n  const { anchor3d = graphic.attribute.anchor } = graphic.attribute;\n\n  const _anchor: [number, number] = [0, 0];\n  if (anchor3d) {\n    if (typeof anchor3d[0] === 'string') {\n      const ratio = parseFloat(anchor3d[0]) / 100;\n      const bounds = graphic.AABBBounds;\n      _anchor[0] = bounds.x1 + (bounds.x2 - bounds.x1) * ratio;\n    } else {\n      _anchor[0] = anchor3d[0];\n    }\n    if (typeof anchor3d[1] === 'string') {\n      const ratio = parseFloat(anchor3d[1]) / 100;\n      const bounds = graphic.AABBBounds;\n      _anchor[1] = bounds.x1 + (bounds.x2 - bounds.x1) * ratio;\n    } else {\n      _anchor[1] = anchor3d[1];\n    }\n  }\n\n  if (graphic.type === 'text') {\n    const { textAlign } = graphic.attribute as ITextGraphicAttribute;\n    // 计算偏移\n    _anchor[0] += textDrawOffsetX(textAlign, (graphic as IText).clipedWidth);\n  }\n\n  // 应用偏移，计算全局的偏移\n  _anchor[0] += dx;\n  _anchor[1] += dy;\n  // matrix.scale(dpr, dpr);\n\n  const modelMatrix = mat4Allocate.allocate();\n  translate(modelMatrix, modelMatrix, [_anchor[0], _anchor[1], 0]);\n  if (beta) {\n    rotateX(modelMatrix, modelMatrix, beta);\n  }\n  if (alpha) {\n    rotateY(modelMatrix, modelMatrix, alpha);\n  }\n  translate(modelMatrix, modelMatrix, [-_anchor[0], -_anchor[1], 0]);\n\n  return modelMatrix;\n}\n\n// 计算3d下的模型矩阵\nexport function getModelMatrix(out: mat4, graphic: IGraphic, theme: ITransform) {\n  const {\n    x = theme.x,\n    y = theme.y,\n    z = theme.z,\n    dx = theme.dx,\n    dy = theme.dy,\n    dz = theme.dz,\n    scaleX = theme.scaleX,\n    scaleY = theme.scaleY,\n    scaleZ = theme.scaleZ,\n    alpha = theme.alpha,\n    beta = theme.beta,\n    angle = theme.angle,\n    anchor3d = graphic.attribute.anchor,\n    anchor\n  } = graphic.attribute;\n\n  const _anchor: [number, number, number] = [0, 0, 0];\n  if (anchor3d) {\n    if (typeof anchor3d[0] === 'string') {\n      const ratio = parseFloat(anchor3d[0]) / 100;\n      const bounds = graphic.AABBBounds;\n      _anchor[0] = bounds.x1 + (bounds.x2 - bounds.x1) * ratio;\n    } else {\n      _anchor[0] = anchor3d[0];\n    }\n    if (typeof anchor3d[1] === 'string') {\n      const ratio = parseFloat(anchor3d[1]) / 100;\n      const bounds = graphic.AABBBounds;\n      _anchor[1] = bounds.x1 + (bounds.x2 - bounds.x1) * ratio;\n    } else {\n      _anchor[1] = anchor3d[1];\n    }\n    _anchor[2] = anchor3d[2] ?? 0;\n  }\n\n  // if (graphic.type === 'text') {\n  //   const { textAlign } = graphic.attribute as ITextGraphicAttribute;\n  //   // 计算偏移\n  //   _anchor[0] += textDrawOffsetX(textAlign, (graphic as IText).clipedWidth);\n  // }\n\n  identityMat4(out);\n  // 平移\n  translate(out, out, [x + dx, y + dy, z + dz]);\n  translate(out, out, [_anchor[0], _anchor[1], _anchor[2]]);\n  rotateX(out, out, beta);\n  rotateY(out, out, alpha);\n  // 基于z轴的偏移基于anchor计算\n  // rotateZ(out, out, angle);\n  translate(out, out, [-_anchor[0], -_anchor[1], _anchor[2]]);\n  scaleMat4(out, out, [scaleX, scaleY, scaleZ]);\n\n  // 计算基于z轴的偏移\n  if (angle) {\n    const m = mat4Allocate.allocate();\n    const _anchor: [number, number] = [0, 0];\n    if (anchor) {\n      if (typeof anchor3d[0] === 'string') {\n        const ratio = parseFloat(anchor3d[0]) / 100;\n        const bounds = graphic.AABBBounds;\n        _anchor[0] = bounds.x1 + (bounds.x2 - bounds.x1) * ratio;\n      } else {\n        _anchor[0] = anchor3d[0];\n      }\n      if (typeof anchor3d[1] === 'string') {\n        const ratio = parseFloat(anchor3d[1]) / 100;\n        const bounds = graphic.AABBBounds;\n        _anchor[1] = bounds.x1 + (bounds.x2 - bounds.x1) * ratio;\n      } else {\n        _anchor[1] = anchor3d[1];\n      }\n    }\n\n    translate(m, m, [_anchor[0], _anchor[1], 0]);\n    // 基于z轴的偏移基于anchor计算\n    rotateZ(m, m, angle);\n    translate(m, m, [-_anchor[0], -_anchor[1], 0]);\n\n    multiplyMat4Mat4(out, out, m);\n  }\n}\n\nexport function shouldUseMat4(graphic: IGraphic) {\n  const { alpha, beta } = graphic.attribute;\n  return alpha || beta;\n}\n\n// 管理graphic\nexport class DefaultGraphicService implements IGraphicService {\n  declare hooks: {\n    onAttributeUpdate: ISyncHook<[IGraphic]>;\n    onSetStage: ISyncHook<[IGraphic, IStage]>;\n    onRemove: ISyncHook<[IGraphic]>;\n    onRelease: ISyncHook<[IGraphic]>;\n    onAddIncremental: ISyncHook<[IGraphic, IGroup, IStage]>;\n    onClearIncremental: ISyncHook<[IGroup, IStage]>;\n    beforeUpdateAABBBounds: ISyncHook<[IGraphic, IStage, boolean, IAABBBounds]>;\n    afterUpdateAABBBounds: ISyncHook<[IGraphic, IStage, IAABBBounds, { globalAABBBounds: IAABBBounds }, boolean]>;\n    clearAABBBounds: ISyncHook<[IGraphic, IStage, IAABBBounds]>;\n  };\n\n  // 临时bounds，用作缓存\n  protected tempAABBBounds1: AABBBounds;\n  protected tempAABBBounds2: AABBBounds;\n  constructor(public readonly creator: IGraphicCreator = graphicCreator as unknown as IGraphicCreator) {\n    this.hooks = {\n      onAttributeUpdate: new SyncHook<[IGraphic]>(['graphic']),\n      onSetStage: new SyncHook<[IGraphic, IStage]>(['graphic', 'stage']),\n      onRemove: new SyncHook<[IGraphic]>(['graphic']),\n      onRelease: new SyncHook<[IGraphic]>(['graphic']),\n      onAddIncremental: new SyncHook<[IGraphic, IGroup, IStage]>(['graphic', 'group', 'stage']),\n      onClearIncremental: new SyncHook<[IGroup, IStage]>(['graphic', 'group', 'stage']),\n      beforeUpdateAABBBounds: new SyncHook<[IGraphic, IStage, boolean, IAABBBounds]>([\n        'graphic',\n        'stage',\n        'willUpdate',\n        'aabbBounds'\n      ]),\n      afterUpdateAABBBounds: new SyncHook<[IGraphic, IStage, IAABBBounds, { globalAABBBounds: IAABBBounds }, boolean]>([\n        'graphic',\n        'stage',\n        'aabbBounds',\n        'globalAABBBounds',\n        'selfChange'\n      ]),\n      clearAABBBounds: new SyncHook<[IGraphic, IStage, IAABBBounds]>(['graphic', 'stage', 'aabbBounds'])\n    };\n    this.tempAABBBounds1 = new AABBBounds();\n    this.tempAABBBounds2 = new AABBBounds();\n  }\n  onAttributeUpdate(graphic: IGraphic) {\n    if (this.hooks.onAttributeUpdate.taps.length) {\n      this.hooks.onAttributeUpdate.call(graphic);\n    }\n  }\n  onSetStage(graphic: IGraphic, stage: IStage): void {\n    if (this.hooks.onSetStage.taps.length) {\n      this.hooks.onSetStage.call(graphic, stage);\n    }\n  }\n  onRemove(graphic: IGraphic<Partial<IGraphicAttribute>>): void {\n    if (this.hooks.onRemove.taps.length) {\n      this.hooks.onRemove.call(graphic);\n    }\n  }\n  onRelease(graphic: IGraphic<Partial<IGraphicAttribute>>): void {\n    if (this.hooks.onRelease.taps.length) {\n      this.hooks.onRelease.call(graphic);\n    }\n  }\n  onAddIncremental(graphic: IGraphic, group: IGroup, stage: IStage): void {\n    if (this.hooks.onAddIncremental.taps.length) {\n      this.hooks.onAddIncremental.call(graphic, group, stage);\n    }\n  }\n  onClearIncremental(group: IGroup, stage: IStage): void {\n    if (this.hooks.onClearIncremental.taps.length) {\n      this.hooks.onClearIncremental.call(group, stage);\n    }\n  }\n  beforeUpdateAABBBounds(graphic: IGraphic, stage: IStage, willUpdate: boolean, bounds: IAABBBounds) {\n    if (this.hooks.beforeUpdateAABBBounds.taps.length) {\n      this.hooks.beforeUpdateAABBBounds.call(graphic, stage, willUpdate, bounds);\n    }\n  }\n  afterUpdateAABBBounds(\n    graphic: IGraphic,\n    stage: IStage,\n    bounds: IAABBBounds,\n    params: { globalAABBBounds: IAABBBounds },\n    selfChange: boolean\n  ) {\n    if (this.hooks.afterUpdateAABBBounds.taps.length) {\n      this.hooks.afterUpdateAABBBounds.call(graphic, stage, bounds, params, selfChange);\n    }\n  }\n  clearAABBBounds(graphic: IGraphic, stage: IStage, b: IAABBBounds) {\n    if (this.hooks.clearAABBBounds.taps.length) {\n      this.hooks.clearAABBBounds.call(graphic, stage, b);\n    }\n  }\n  // TODO delete\n  updatePathProxyAABBBounds(aabbBounds: IAABBBounds, graphic?: IGraphic): boolean {\n    const path = typeof graphic.pathProxy === 'function' ? graphic.pathProxy(graphic.attribute) : graphic.pathProxy;\n    if (!path) {\n      return false;\n    }\n    const boundsContext = new BoundsContext(aabbBounds);\n    renderCommandList(path.commandList, boundsContext, 0, 0);\n    return true;\n  }\n\n  updateHTMLTextAABBBounds(\n    attribute: ITextGraphicAttribute,\n    textTheme: Required<ITextGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IText\n  ) {\n    const { textAlign, textBaseline } = attribute;\n    if (attribute.forceBoundsHeight != null) {\n      const h = isNumber(attribute.forceBoundsHeight) ? attribute.forceBoundsHeight : attribute.forceBoundsHeight();\n      const dy = textLayoutOffsetY(textBaseline, h, h);\n      aabbBounds.set(aabbBounds.x1, dy, aabbBounds.x2, dy + h);\n    }\n    if (attribute.forceBoundsWidth != null) {\n      const w = isNumber(attribute.forceBoundsWidth) ? attribute.forceBoundsWidth : attribute.forceBoundsWidth();\n      const dx = textDrawOffsetX(textAlign, w);\n      aabbBounds.set(dx, aabbBounds.y1, dx + w, aabbBounds.y2);\n    }\n  }\n\n  combindShadowAABBBounds(bounds: IAABBBounds, graphic?: IGraphic) {\n    // 合并shadowRoot的Bounds\n    if (graphic && graphic.shadowRoot) {\n      const b = graphic.shadowRoot.AABBBounds;\n      bounds.union(b);\n    }\n  }\n\n  transformAABBBounds(\n    attribute: Partial<IGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    theme: Required<IGraphicAttribute>,\n    miter: boolean,\n    graphic?: IGraphic\n  ) {\n    if (!aabbBounds.empty()) {\n      const {\n        scaleX = theme.scaleX,\n        scaleY = theme.scaleY,\n        stroke = theme.stroke,\n        shadowBlur = theme.shadowBlur,\n        lineWidth = theme.lineWidth,\n        pickStrokeBuffer = theme.pickStrokeBuffer,\n        strokeBoundsBuffer = theme.strokeBoundsBuffer\n      } = attribute;\n      const tb1 = this.tempAABBBounds1;\n      const tb2 = this.tempAABBBounds2;\n      if (stroke && lineWidth) {\n        const scaledHalfLineWidth = (lineWidth + pickStrokeBuffer) / Math.abs(scaleX + scaleY);\n        boundStroke(tb1, scaledHalfLineWidth, miter, strokeBoundsBuffer);\n        aabbBounds.union(tb1);\n        tb1.setValue(tb2.x1, tb2.y1, tb2.x2, tb2.y2);\n      }\n      if (shadowBlur) {\n        const { shadowOffsetX = theme.shadowOffsetX, shadowOffsetY = theme.shadowOffsetY } = attribute;\n        const shadowBlurWidth = (shadowBlur / Math.abs(scaleX + scaleY)) * 2;\n        boundStroke(tb1, shadowBlurWidth, false, strokeBoundsBuffer + 1);\n        tb1.translate(shadowOffsetX, shadowOffsetY);\n        aabbBounds.union(tb1);\n        // tb1.setValue(tb2.x1, tb2.y1, tb2.x2, tb2.y2);\n      }\n    }\n\n    // 合并shadowRoot的bounds\n    this.combindShadowAABBBounds(aabbBounds, graphic);\n    if (aabbBounds.empty()) {\n      return;\n    }\n\n    // 性能优化逻辑，group类型变换较少，不需要矩阵变换\n    let updateMatrix = true;\n    const m = graphic.transMatrix;\n    if (graphic && graphic.isContainer) {\n      updateMatrix = !(m.a === 1 && m.b === 0 && m.c === 0 && m.d === 1 && m.e === 0 && m.f === 0);\n    }\n    updateMatrix && transformBoundsWithMatrix(aabbBounds, aabbBounds, m);\n\n    // TODO 加上锚点\n    // transformBounds(aabbBounds, x, y, scaleX, scaleY, angle);\n    // if (graphic.attribute.postMatrix) {\n    //   console.log('aaa');\n    //   transformBoundsWithMatrix(aabbBounds, graphic.attribute.postMatrix);\n    // }\n    // aabbBounds.translate(dx, dy);\n  }\n\n  validCheck(\n    attribute: Partial<IGraphicAttribute>,\n    theme: Required<IGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IGraphic\n  ): boolean {\n    if (!graphic) {\n      return true;\n    }\n\n    // 设置了强制wh，那就直接认为是合法的\n    if (attribute.forceBoundsHeight != null || attribute.forceBoundsWidth != null) {\n      return true;\n    }\n\n    // 是Group或者有影子节点的话，就直接认为是合法的\n    if (graphic.shadowRoot || graphic.isContainer) {\n      return true;\n    }\n\n    const { visible = theme.visible } = attribute;\n\n    if (!(graphic.valid && visible)) {\n      // application.graphicService.beforeUpdateAABBBounds(graphic, graphic.stage, true, aabbBounds);\n      if (!aabbBounds.empty()) {\n        graphic.parent && aabbBounds.transformWithMatrix((graphic.parent as IGroup).globalTransMatrix);\n        this.clearAABBBounds(graphic, graphic.stage, aabbBounds);\n        aabbBounds.clear();\n      }\n      return false;\n    }\n    return true;\n  }\n\n  updateTempAABBBounds(aabbBounds: IAABBBounds) {\n    const tb1 = this.tempAABBBounds1;\n    const tb2 = this.tempAABBBounds2;\n    tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2);\n    tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2);\n\n    return { tb1, tb2 };\n  }\n}\n"]}
+{"version":3,"sources":["../src/graphic/graphic-service/graphic-service.ts"],"names":[],"mappings":"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","file":"graphic-service.js","sourcesContent":["import { AABBBounds, isNumber, transformBoundsWithMatrix, type IAABBBounds } from '@visactor/vutils';\nimport { SyncHook } from '../../tapable';\nimport type {\n  mat4,\n  IGraphicAttribute,\n  IGraphic,\n  IGroup,\n  IStage,\n  IText,\n  ITextGraphicAttribute,\n  ITransform,\n  IGraphicService,\n  IGraphicCreator,\n  ISyncHook\n} from '../../interface';\nimport { textDrawOffsetX, textLayoutOffsetY } from '../../common/text';\nimport { boundStroke } from '../tools';\nimport { mat4Allocate } from '../../allocator/matrix-allocate';\nimport { identityMat4, multiplyMat4Mat4, rotateX, rotateY, rotateZ, scaleMat4, translate } from '../../common/matrix';\nimport { graphicCreator } from '../graphic-creator';\n\nexport function getExtraModelMatrix(dx: number, dy: number, graphic: IGraphic): mat4 | null {\n  const { alpha, beta } = graphic.attribute;\n  if (!alpha && !beta) {\n    return null;\n  }\n  const { anchor3d = graphic.attribute.anchor } = graphic.attribute;\n\n  const _anchor: [number, number] = [0, 0];\n  if (anchor3d) {\n    if (typeof anchor3d[0] === 'string') {\n      const ratio = parseFloat(anchor3d[0]) / 100;\n      const bounds = graphic.AABBBounds;\n      _anchor[0] = bounds.x1 + (bounds.x2 - bounds.x1) * ratio;\n    } else {\n      _anchor[0] = anchor3d[0];\n    }\n    if (typeof anchor3d[1] === 'string') {\n      const ratio = parseFloat(anchor3d[1]) / 100;\n      const bounds = graphic.AABBBounds;\n      _anchor[1] = bounds.x1 + (bounds.x2 - bounds.x1) * ratio;\n    } else {\n      _anchor[1] = anchor3d[1];\n    }\n  }\n\n  if (graphic.type === 'text') {\n    const { textAlign } = graphic.attribute as ITextGraphicAttribute;\n    // 计算偏移\n    _anchor[0] += textDrawOffsetX(textAlign, (graphic as IText).clipedWidth);\n  }\n\n  // 应用偏移，计算全局的偏移\n  _anchor[0] += dx;\n  _anchor[1] += dy;\n  // matrix.scale(dpr, dpr);\n\n  const modelMatrix = mat4Allocate.allocate();\n  translate(modelMatrix, modelMatrix, [_anchor[0], _anchor[1], 0]);\n  if (beta) {\n    rotateX(modelMatrix, modelMatrix, beta);\n  }\n  if (alpha) {\n    rotateY(modelMatrix, modelMatrix, alpha);\n  }\n  translate(modelMatrix, modelMatrix, [-_anchor[0], -_anchor[1], 0]);\n\n  return modelMatrix;\n}\n\n// 计算3d下的模型矩阵\nexport function getModelMatrix(out: mat4, graphic: IGraphic, theme: ITransform) {\n  const {\n    x = theme.x,\n    y = theme.y,\n    z = theme.z,\n    dx = theme.dx,\n    dy = theme.dy,\n    dz = theme.dz,\n    scaleX = theme.scaleX,\n    scaleY = theme.scaleY,\n    scaleZ = theme.scaleZ,\n    alpha = theme.alpha,\n    beta = theme.beta,\n    angle = theme.angle,\n    anchor3d = graphic.attribute.anchor,\n    anchor\n  } = graphic.attribute;\n\n  const _anchor: [number, number, number] = [0, 0, 0];\n  if (anchor3d) {\n    if (typeof anchor3d[0] === 'string') {\n      const ratio = parseFloat(anchor3d[0]) / 100;\n      const bounds = graphic.AABBBounds;\n      _anchor[0] = bounds.x1 + (bounds.x2 - bounds.x1) * ratio;\n    } else {\n      _anchor[0] = anchor3d[0];\n    }\n    if (typeof anchor3d[1] === 'string') {\n      const ratio = parseFloat(anchor3d[1]) / 100;\n      const bounds = graphic.AABBBounds;\n      _anchor[1] = bounds.x1 + (bounds.x2 - bounds.x1) * ratio;\n    } else {\n      _anchor[1] = anchor3d[1];\n    }\n    _anchor[2] = anchor3d[2] ?? 0;\n  }\n\n  // if (graphic.type === 'text') {\n  //   const { textAlign } = graphic.attribute as ITextGraphicAttribute;\n  //   // 计算偏移\n  //   _anchor[0] += textDrawOffsetX(textAlign, (graphic as IText).clipedWidth);\n  // }\n\n  identityMat4(out);\n  // 平移\n  translate(out, out, [x + dx, y + dy, z + dz]);\n  translate(out, out, [_anchor[0], _anchor[1], _anchor[2]]);\n  rotateX(out, out, beta);\n  rotateY(out, out, alpha);\n  // 基于z轴的偏移基于anchor计算\n  // rotateZ(out, out, angle);\n  translate(out, out, [-_anchor[0], -_anchor[1], _anchor[2]]);\n  scaleMat4(out, out, [scaleX, scaleY, scaleZ]);\n\n  // 计算基于z轴的偏移\n  if (angle) {\n    const m = mat4Allocate.allocate();\n    const _anchor: [number, number] = [0, 0];\n    if (anchor) {\n      if (typeof anchor3d[0] === 'string') {\n        const ratio = parseFloat(anchor3d[0]) / 100;\n        const bounds = graphic.AABBBounds;\n        _anchor[0] = bounds.x1 + (bounds.x2 - bounds.x1) * ratio;\n      } else {\n        _anchor[0] = anchor3d[0];\n      }\n      if (typeof anchor3d[1] === 'string') {\n        const ratio = parseFloat(anchor3d[1]) / 100;\n        const bounds = graphic.AABBBounds;\n        _anchor[1] = bounds.x1 + (bounds.x2 - bounds.x1) * ratio;\n      } else {\n        _anchor[1] = anchor3d[1];\n      }\n    }\n\n    translate(m, m, [_anchor[0], _anchor[1], 0]);\n    // 基于z轴的偏移基于anchor计算\n    rotateZ(m, m, angle);\n    translate(m, m, [-_anchor[0], -_anchor[1], 0]);\n\n    multiplyMat4Mat4(out, out, m);\n  }\n}\n\nexport function shouldUseMat4(graphic: IGraphic) {\n  const { alpha, beta } = graphic.attribute;\n  return alpha || beta;\n}\n\n// 管理graphic\nexport class DefaultGraphicService implements IGraphicService {\n  declare hooks: {\n    onAttributeUpdate: ISyncHook<[IGraphic]>;\n    onSetStage: ISyncHook<[IGraphic, IStage]>;\n    onRemove: ISyncHook<[IGraphic]>;\n    onRelease: ISyncHook<[IGraphic]>;\n    onAddIncremental: ISyncHook<[IGraphic, IGroup, IStage]>;\n    onClearIncremental: ISyncHook<[IGroup, IStage]>;\n    beforeUpdateAABBBounds: ISyncHook<[IGraphic, IStage, boolean, IAABBBounds]>;\n    afterUpdateAABBBounds: ISyncHook<[IGraphic, IStage, IAABBBounds, { globalAABBBounds: IAABBBounds }, boolean]>;\n    clearAABBBounds: ISyncHook<[IGraphic, IStage, IAABBBounds]>;\n  };\n\n  // 临时bounds，用作缓存\n  protected tempAABBBounds1: AABBBounds;\n  protected tempAABBBounds2: AABBBounds;\n  protected tempAABBBoundsResult: { tb1: AABBBounds; tb2: AABBBounds };\n  constructor(public readonly creator: IGraphicCreator = graphicCreator as unknown as IGraphicCreator) {\n    this.hooks = {\n      onAttributeUpdate: new SyncHook<[IGraphic]>(['graphic']),\n      onSetStage: new SyncHook<[IGraphic, IStage]>(['graphic', 'stage']),\n      onRemove: new SyncHook<[IGraphic]>(['graphic']),\n      onRelease: new SyncHook<[IGraphic]>(['graphic']),\n      onAddIncremental: new SyncHook<[IGraphic, IGroup, IStage]>(['graphic', 'group', 'stage']),\n      onClearIncremental: new SyncHook<[IGroup, IStage]>(['graphic', 'group', 'stage']),\n      beforeUpdateAABBBounds: new SyncHook<[IGraphic, IStage, boolean, IAABBBounds]>([\n        'graphic',\n        'stage',\n        'willUpdate',\n        'aabbBounds'\n      ]),\n      afterUpdateAABBBounds: new SyncHook<[IGraphic, IStage, IAABBBounds, { globalAABBBounds: IAABBBounds }, boolean]>([\n        'graphic',\n        'stage',\n        'aabbBounds',\n        'globalAABBBounds',\n        'selfChange'\n      ]),\n      clearAABBBounds: new SyncHook<[IGraphic, IStage, IAABBBounds]>(['graphic', 'stage', 'aabbBounds'])\n    };\n    this.tempAABBBounds1 = new AABBBounds();\n    this.tempAABBBounds2 = new AABBBounds();\n    this.tempAABBBoundsResult = {\n      tb1: this.tempAABBBounds1,\n      tb2: this.tempAABBBounds2\n    };\n  }\n  onAttributeUpdate(graphic: IGraphic) {\n    if (this.hooks.onAttributeUpdate.taps.length) {\n      this.hooks.onAttributeUpdate.call(graphic);\n    }\n  }\n  onSetStage(graphic: IGraphic, stage: IStage): void {\n    if (this.hooks.onSetStage.taps.length) {\n      this.hooks.onSetStage.call(graphic, stage);\n    }\n  }\n  onRemove(graphic: IGraphic<Partial<IGraphicAttribute>>): void {\n    if (this.hooks.onRemove.taps.length) {\n      this.hooks.onRemove.call(graphic);\n    }\n  }\n  onRelease(graphic: IGraphic<Partial<IGraphicAttribute>>): void {\n    if (this.hooks.onRelease.taps.length) {\n      this.hooks.onRelease.call(graphic);\n    }\n  }\n  onAddIncremental(graphic: IGraphic, group: IGroup, stage: IStage): void {\n    if (this.hooks.onAddIncremental.taps.length) {\n      this.hooks.onAddIncremental.call(graphic, group, stage);\n    }\n  }\n  onClearIncremental(group: IGroup, stage: IStage): void {\n    if (this.hooks.onClearIncremental.taps.length) {\n      this.hooks.onClearIncremental.call(group, stage);\n    }\n  }\n  beforeUpdateAABBBounds(graphic: IGraphic, stage: IStage, willUpdate: boolean, bounds: IAABBBounds) {\n    if (this.hooks.beforeUpdateAABBBounds.taps.length) {\n      this.hooks.beforeUpdateAABBBounds.call(graphic, stage, willUpdate, bounds);\n    }\n  }\n  afterUpdateAABBBounds(\n    graphic: IGraphic,\n    stage: IStage,\n    bounds: IAABBBounds,\n    params: { globalAABBBounds: IAABBBounds },\n    selfChange: boolean\n  ) {\n    if (this.hooks.afterUpdateAABBBounds.taps.length) {\n      this.hooks.afterUpdateAABBBounds.call(graphic, stage, bounds, params, selfChange);\n    }\n  }\n  clearAABBBounds(graphic: IGraphic, stage: IStage, b: IAABBBounds) {\n    if (this.hooks.clearAABBBounds.taps.length) {\n      this.hooks.clearAABBBounds.call(graphic, stage, b);\n    }\n  }\n  updateHTMLTextAABBBounds(\n    attribute: ITextGraphicAttribute,\n    textTheme: Required<ITextGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IText\n  ) {\n    const { textAlign, textBaseline } = attribute;\n    if (attribute.forceBoundsHeight != null) {\n      const h = isNumber(attribute.forceBoundsHeight) ? attribute.forceBoundsHeight : attribute.forceBoundsHeight();\n      const dy = textLayoutOffsetY(textBaseline, h, h);\n      aabbBounds.set(aabbBounds.x1, dy, aabbBounds.x2, dy + h);\n    }\n    if (attribute.forceBoundsWidth != null) {\n      const w = isNumber(attribute.forceBoundsWidth) ? attribute.forceBoundsWidth : attribute.forceBoundsWidth();\n      const dx = textDrawOffsetX(textAlign, w);\n      aabbBounds.set(dx, aabbBounds.y1, dx + w, aabbBounds.y2);\n    }\n  }\n\n  combindShadowAABBBounds(bounds: IAABBBounds, graphic?: IGraphic) {\n    // 合并shadowRoot的Bounds\n    if (graphic && graphic.shadowRoot) {\n      const b = graphic.shadowRoot.AABBBounds;\n      bounds.union(b);\n    }\n  }\n\n  transformAABBBounds(\n    attribute: Partial<IGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    theme: Required<IGraphicAttribute>,\n    miter: boolean,\n    graphic?: IGraphic\n  ) {\n    if (!aabbBounds.empty()) {\n      const {\n        scaleX = theme.scaleX,\n        scaleY = theme.scaleY,\n        stroke = theme.stroke,\n        shadowBlur = theme.shadowBlur,\n        lineWidth = theme.lineWidth,\n        pickStrokeBuffer = theme.pickStrokeBuffer,\n        strokeBoundsBuffer = theme.strokeBoundsBuffer\n      } = attribute;\n      const tb1 = this.tempAABBBounds1;\n      const tb2 = this.tempAABBBounds2;\n      if (stroke && lineWidth) {\n        const scaledHalfLineWidth = (lineWidth + pickStrokeBuffer) / Math.abs(scaleX + scaleY);\n        boundStroke(tb1, scaledHalfLineWidth, miter, strokeBoundsBuffer);\n        aabbBounds.union(tb1);\n        tb1.setValue(tb2.x1, tb2.y1, tb2.x2, tb2.y2);\n      }\n      if (shadowBlur) {\n        const { shadowOffsetX = theme.shadowOffsetX, shadowOffsetY = theme.shadowOffsetY } = attribute;\n        const shadowBlurWidth = (shadowBlur / Math.abs(scaleX + scaleY)) * 2;\n        boundStroke(tb1, shadowBlurWidth, false, strokeBoundsBuffer + 1);\n        tb1.translate(shadowOffsetX, shadowOffsetY);\n        aabbBounds.union(tb1);\n        // tb1.setValue(tb2.x1, tb2.y1, tb2.x2, tb2.y2);\n      }\n    }\n\n    // 合并shadowRoot的bounds\n    this.combindShadowAABBBounds(aabbBounds, graphic);\n    if (aabbBounds.empty()) {\n      return;\n    }\n\n    // 性能优化逻辑，group类型变换较少，不需要矩阵变换\n    let updateMatrix = true;\n    const m = graphic.transMatrix;\n    if (graphic && graphic.isContainer) {\n      updateMatrix = !(m.a === 1 && m.b === 0 && m.c === 0 && m.d === 1 && m.e === 0 && m.f === 0);\n    }\n    updateMatrix && transformBoundsWithMatrix(aabbBounds, aabbBounds, m);\n\n    // TODO 加上锚点\n    // transformBounds(aabbBounds, x, y, scaleX, scaleY, angle);\n    // if (graphic.attribute.postMatrix) {\n    //   console.log('aaa');\n    //   transformBoundsWithMatrix(aabbBounds, graphic.attribute.postMatrix);\n    // }\n    // aabbBounds.translate(dx, dy);\n  }\n\n  validCheck(\n    attribute: Partial<IGraphicAttribute>,\n    theme: Required<IGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IGraphic\n  ): boolean {\n    if (!graphic) {\n      return true;\n    }\n\n    // 设置了强制wh，那就直接认为是合法的\n    if (attribute.forceBoundsHeight != null || attribute.forceBoundsWidth != null) {\n      return true;\n    }\n\n    // 是Group或者有影子节点的话，就直接认为是合法的\n    if (graphic.shadowRoot || graphic.isContainer) {\n      return true;\n    }\n\n    const { visible = theme.visible } = attribute;\n\n    if (!(graphic.valid && visible)) {\n      // application.graphicService.beforeUpdateAABBBounds(graphic, graphic.stage, true, aabbBounds);\n      if (!aabbBounds.empty()) {\n        graphic.parent && aabbBounds.transformWithMatrix((graphic.parent as IGroup).globalTransMatrix);\n        this.clearAABBBounds(graphic, graphic.stage, aabbBounds);\n        aabbBounds.clear();\n      }\n      return false;\n    }\n    return true;\n  }\n\n  updateTempAABBBounds(aabbBounds: IAABBBounds) {\n    const tb1 = this.tempAABBBounds1;\n    const tb2 = this.tempAABBBounds2;\n    tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2);\n    tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2);\n\n    return this.tempAABBBoundsResult;\n  }\n}\n"]}

package/cjs/graphic/graphic.d.ts

@@ -1,14 +1,13 @@
 import type { ICustomPath2D } from './../interface/path';
 import { Matrix, Point, type Dict, type IAABBBounds, type IOBBBounds, type IPointLike } from '@visactor/vutils';
-import type { GraphicType, IAnimateConfig, IGraphicAttribute, IGraphic, IGraphicJson, ISetAttributeContext, ITransform, GraphicReleaseStatus } from '../interface/graphic';
+import type { GraphicType, IAnimateConfig, IGraphicAttribute, IGraphic, IGraphicJson, ISetAttributeContext, ISetStatesOptions, ITransform, GraphicReleaseStatus } from '../interface/graphic';
 import { Node } from './node-tree';
 import type { IAnimate, IAnimateTarget, IGlyphGraphicAttribute, ILayer, IPickerService, IShadowRoot, IStage, IStep, ISymbolClass } from '../interface';
 import { IContainPointMode } from '../common/enums';
 import { CustomSymbolClass } from './builtin-symbol';
-import type { CompiledStateDefinition, StateDefinition, StateDefinitionsInput } from './state/state-definition';
+import type { CompiledStateDefinition, StateDefinition, StateDefinitionsInput, StateMergeMode, StateTransitionResult } from './state/state-definition';
 import { StateEngine } from './state/state-engine';
-import { StateModel } from './state/state-model';
-import { StateStyleResolver, type StateMergeMode } from './state/state-style-resolver';
+import { UpdateCategory } from './state/attribute-update-classifier';
 import { StateTransitionOrchestrator } from './state/state-transition-orchestrator';
 import { type SharedStateScope } from './state/shared-state-scope';
 export declare const PURE_STYLE_KEY: string[];
@@ -17,7 +16,16 @@ type AttributeDelta = Map<string, {
     prev: unknown;
     next: unknown;
 }>;
-export declare function shouldUseSimpleAttributeFastPath(value: unknown): value is Record<string, any>;
+type GraphicStateTransition = {
+    changed: boolean;
+    states: string[];
+    effectiveStates?: string[];
+};
+type ResolvedGraphicStateTransition<T> = {
+    transition: GraphicStateTransition;
+    effectiveStates: string[];
+    resolvedStateAttrs: Partial<T>;
+};
 export declare const NOWORK_ANIMATE_ATTR: {
     strokeSeg: number;
     boundsPadding: number;
@@ -52,6 +60,8 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     static mixin(source: Dict<any>): void;
     _events?: any;
     context?: Record<string, any>;
+    private transientFromAttrsBeforePreventAnimate?;
+    private transientFromAttrsBeforePreventAnimateDiffAttrs?;
     static userSymbolMap: Record<string, ISymbolClass>;
     onBeforeAttributeUpdate?: (val: any, attributes: Partial<T>, key: null | string | string[], context?: ISetAttributeContext) => T | undefined;
     parent: any;
@@ -88,7 +98,9 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     protected _updateTag: number;
     stamp?: number;
     attribute: T;
-    baseAttributes: Partial<T>;
+    protected _baseAttributes?: Partial<T>;
+    get baseAttributes(): Partial<T>;
+    set baseAttributes(value: Partial<T>);
     shadowRoot?: IShadowRoot;
     releaseStatus?: GraphicReleaseStatus;
     states?: StateDefinitionsInput<T>;
@@ -99,10 +111,7 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     boundSharedStateRevision?: number;
     sharedStateDirty?: boolean;
     registeredActiveScopes?: Set<SharedStateScope<T>>;
-    localFallbackCompiledDefinitions?: Map<string, CompiledStateDefinition<T>>;
-    localFallbackVersion?: number;
     stateAnimateConfig?: IAnimateConfig;
-    stateProxy?: (stateName: string, targetStates?: string[]) => Partial<T>;
     stateMergeMode?: StateMergeMode;
     animates: Map<string | number, IAnimate>;
     animate?: () => IAnimate;
@@ -117,25 +126,23 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     protected compiledStateDefinitionsCacheKey?: string;
     protected stateEngine?: StateEngine<T>;
     protected stateEngineCompiledDefinitions?: Map<string, CompiledStateDefinition<T>>;
-    protected stateEngineStateProxy?: (stateName: string, targetStates?: string[]) => Partial<T>;
     protected stateEngineStateSort?: (stateA: string, stateB: string) => number;
     protected stateEngineMergeMode?: StateMergeMode;
-    protected stateEngineStateProxyModeKey?: string;
-    protected stateStyleResolver?: StateStyleResolver<T>;
-    protected deepStateStyleResolver?: StateStyleResolver<T>;
     protected stateTransitionOrchestrator?: StateTransitionOrchestrator<T>;
-    protected _deprecatedNormalAttrsView?: Partial<T> | null;
     protected localStateDefinitionsSource?: StateDefinitionsInput<T>;
-    protected resolverEpoch: number;
+    protected localStateDefinitionsVersion?: number;
+    protected resolverEpoch?: number;
+    protected attributeMayContainTransientAttrs?: boolean;
     constructor(params?: T);
     get normalAttrs(): Partial<T> | undefined;
-    set normalAttrs(value: Partial<T> | undefined);
+    set normalAttrs(_value: Partial<T> | undefined);
+    protected getBaseAttributesStorage(): Partial<T>;
     getGraphicService(): import("../interface").IGraphicService;
     getAttributes(): T;
-    protected getStateStyleResolver(mergeMode?: StateMergeMode): StateStyleResolver<T>;
     protected getStateTransitionOrchestrator(): StateTransitionOrchestrator<T>;
     protected resolveBoundSharedStateScope(): SharedStateScope<T> | SharedStateScope<Record<string, any>> | undefined;
     protected syncSharedStateScopeBindingFromTree(markDirty?: boolean): boolean;
+    protected syncSharedStateScopeBindingOnTreeChange(markDirty?: boolean): boolean;
     protected syncSharedStateActiveRegistrations(): void;
     protected clearSharedStateActiveRegistrations(): void;
     protected markSharedStateDirty(): void;
@@ -144,8 +151,6 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     protected getLocalStatesVersion(): number;
     protected resolveEffectiveCompiledDefinitions(): {
         compiledDefinitions?: Map<string, CompiledStateDefinition<T>>;
-        stateProxyModeKey: string;
-        stateProxyEligibility?: (stateName: string) => boolean;
     };
     protected recomputeCurrentStatePatch(): void;
     protected buildStaticAttributeSnapshot(): Partial<T>;
@@ -153,11 +158,28 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     protected syncObjectToSnapshot(target: Record<string, any>, snapshot: Record<string, any>): AttributeDelta;
     protected _syncAttribute(): AttributeDelta;
     protected _syncFinalAttributeFromStaticTruth(): void;
+    protected mergeAttributeDeltaCategory(category: UpdateCategory, key: string, prev: unknown, next: unknown): number;
+    protected submitUpdateByCategory(category: UpdateCategory, forceUpdateTag?: boolean): void;
     protected submitUpdateByDelta(delta: AttributeDelta, forceUpdateTag?: boolean): void;
+    protected submitTouchedKeyUpdate(keys: string[], forceUpdateTag?: boolean): void;
+    protected submitTouchedUpdate(needsShapeAndBounds: boolean): void;
     protected commitBaseAttributeMutation(forceUpdateTag?: boolean, context?: ISetAttributeContext): void;
+    protected canCommitBaseAttributesByTouchedKeys(): boolean;
+    protected detachAttributeFromBaseAttributes(): void;
+    protected commitInternalBaseAttributes(params: Partial<T>, 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;
+    applyAnimationTransientAttributes(params: Partial<T>, forceUpdateTag?: boolean, context?: ISetAttributeContext): void;
     protected applyTransientAttributes(params: Partial<T>, forceUpdateTag?: boolean, context?: ISetAttributeContext): void;
     protected _restoreAttributeFromStaticTruth(context?: ISetAttributeContext): void;
+    protected collectStatePatchDeltaKeys(previousPatch?: Partial<T>, nextPatch?: Partial<T>): string[];
+    protected getStaticTruthValueForStateKey(key: string, nextPatch?: Partial<T>): {
+        hasValue: boolean;
+        value: any;
+    };
+    protected syncStatePatchDeltaToTarget(target: Record<string, any>, keys: string[], nextPatch?: Partial<T>, collectCategory?: boolean): UpdateCategory;
+    protected restoreAttributeFromStatePatchDelta(previousPatch?: Partial<T>, nextPatch?: Partial<T>, context?: ISetAttributeContext): void;
     setMode(mode: '2d' | '3d'): void;
     set3dMode(): void;
     set2dMode(): void;
@@ -165,6 +187,7 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     onAnimateBind(animate: IAnimate): void;
     protected visitTrackedAnimates(cb: (animate: IAnimate) => void): void;
     protected hasAnyTrackedAnimate(): any;
+    protected mayHaveTrackedAnimates(): boolean;
     protected tryUpdateAABBBounds(): IAABBBounds;
     protected tryUpdateOBBBounds(): IOBBBounds;
     protected combindShadowAABBBounds(bounds: IAABBBounds): void;
@@ -173,7 +196,7 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     protected abstract updateAABBBounds(attribute: T, symbolTheme: Required<T>, aabbBounds: IAABBBounds, full?: boolean): IAABBBounds;
     getClipPath(): ISymbolClass;
     parsePath(symbolType: string): ISymbolClass | CustomSymbolClass;
-    protected doUpdateAABBBounds(full?: boolean): IAABBBounds;
+    protected doUpdateAABBBounds(full?: boolean, graphicTheme?: Required<T>): IAABBBounds;
     updatePathProxyAABBBounds(aabbBounds: IAABBBounds): boolean;
     protected tryUpdateGlobalAABBBounds(): IAABBBounds;
     protected tryUpdateGlobalTransMatrix(clearTag?: boolean): Matrix;
@@ -189,6 +212,9 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     containsPoint(x: number, y: number, mode: IContainPointMode, picker?: IPickerService): boolean;
     protected setWidthHeightWithoutTransform(aabbBounds: IAABBBounds): void;
     setAttributesAndPreventAnimate(params: Partial<T>, forceUpdateTag?: boolean, context?: ISetAttributeContext, ignorePriority?: boolean): void;
+    protected syncFinalAttributesFromUpdateContext(context?: ISetAttributeContext): void;
+    protected captureTransientFromAttrsBeforePreventAnimate(params: Partial<T>, keys: string[], context?: ISetAttributeContext): void;
+    protected consumeTransientFromAttrsBeforePreventAnimate(diffAttrs: Record<string, any>): Record<string, any> | null;
     setAttributes(params: Partial<T>, forceUpdateTag?: boolean, context?: ISetAttributeContext): void;
     _setAttributes(params: Partial<T>, forceUpdateTag?: boolean, context?: ISetAttributeContext): void;
     setAttribute(key: string, value: any, forceUpdateTag?: boolean, context?: ISetAttributeContext): void;
@@ -209,18 +235,38 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     }): void;
     hasState(stateName?: string): boolean;
     getState(stateName: string): Partial<T> | StateDefinition<T> | undefined;
-    protected createStateModel(): StateModel<T>;
+    protected getStateResolveBaseAttrs(): Partial<T>;
+    protected syncStateResolveContext(stateResolveBaseAttrs?: Partial<T>): Partial<T>;
+    protected ensureStateEngine(stateResolveBaseAttrs?: Partial<T>): StateEngine<T>;
+    protected toGraphicStateTransition(result: StateTransitionResult): GraphicStateTransition;
+    protected sortLocalStates(states: readonly string[]): string[];
+    protected resolveLocalUseStatesTransition(states: readonly string[]): GraphicStateTransition;
+    protected resolveLocalClearStatesTransition(): GraphicStateTransition;
+    protected resolveUseStatesTransition(states: string[], stateResolveBaseAttrs?: Partial<T>): GraphicStateTransition;
+    protected resolveClearStatesTransition(): GraphicStateTransition;
+    protected resolveAddStateTransition(stateName: string, keepCurrentStates?: boolean): GraphicStateTransition;
+    protected resolveRemoveStateTransition(stateName: string | string[]): GraphicStateTransition;
+    protected resolveToggleStateTransition(stateName: string): GraphicStateTransition;
+    protected resolveGraphicStateTransition(states: string[], forceResolverRefresh?: boolean): ResolvedGraphicStateTransition<T>;
+    protected normalizeSetStatesOptions(options?: boolean | ISetStatesOptions): {
+        hasAnimation?: boolean;
+        animateSameStatePatchChange: boolean;
+        shouldRefreshSameStatePatch: boolean;
+    };
+    protected sameStatePatches(left?: Partial<T>, right?: Partial<T>): boolean;
+    protected commitSameStatePatchRefresh(states: string[], hasAnimation?: boolean, animateSameStatePatchChange?: boolean): void;
     protected resolveStateAnimateConfig(animateConfig?: IAnimateConfig): any;
     applyStateAttrs(attrs: Partial<T>, stateNames: string[], hasAnimation?: boolean, isClear?: boolean, animateConfig?: IAnimateConfig, extraAnimateAttrs?: Partial<T>): void;
-    updateNormalAttrs(stateAttrs: Partial<T>): void;
+    updateNormalAttrs(_stateAttrs: Partial<T>): void;
     protected getStateTransitionDefaultAttribute(key: string, targetAttrs?: Partial<T>): any;
     protected shouldSkipStateTransitionDefaultAttribute(_key: string, _targetAttrs?: Partial<T>): boolean;
     protected stopStateAnimates(type?: 'start' | 'end'): void;
-    private getNormalAttribute;
     clearStates(hasAnimation?: boolean): void;
     removeState(stateName: string | string[], hasAnimation?: boolean): void;
     toggleState(stateName: string, hasAnimation?: boolean): void;
     addState(stateName: string, keepCurrentStates?: boolean, hasAnimation?: boolean): void;
+    setStates(states?: string[] | null, hasAnimation?: boolean): void;
+    setStates(states?: string[] | null, options?: ISetStatesOptions): void;
     useStates(states: string[], hasAnimation?: boolean): void;
     invalidateResolver(): void;
     private sameStateNames;
@@ -228,6 +274,7 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     addUpdatePaintTag(): void;
     addUpdateShapeTag(): void;
     addUpdateShapeAndBoundsTag(): void;
+    protected addBroadUpdateTag(): void;
     protected updateShapeAndBoundsTagSetted(): boolean;
     protected clearUpdateBoundTag(): void;
     protected clearUpdatePaintTag(): void;
@@ -244,6 +291,7 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     protected doUpdateLocalMatrix(): void;
     protected doUpdateGlobalMatrix(): void;
     setStage(stage?: IStage, layer?: ILayer): void;
+    detachStageForRelease(): void;
     setStageToShadowRoot(stage?: IStage, layer?: ILayer): void;
     onAddStep(step: IStep): void;
     onStop(props?: Partial<T>): void;
@@ -261,8 +309,10 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     private _stopAnimates;
     stopAnimates(stopChildren?: boolean): void;
     release(): void;
+    protected hasCustomEvent(type: string): boolean;
     protected _dispatchCustomEvent(type: string, context?: any): any;
-    protected beforeStateUpdate(attrs: Partial<T>, prevStates: string[], nextStates: string[], hasAnimation?: boolean, isClear?: boolean): any;
+    protected beforeStateUpdate(attrs: Partial<T>, prevStates: readonly string[], nextStates: readonly string[], hasAnimation?: boolean, isClear?: boolean): any;
+    protected emitStateUpdateEvent(): void;
     protected _emitCustomEvent(type: string, context?: any): void;
     abstract getNoWorkAnimateAttr(): Record<string, number>;
     abstract clone(): IGraphic<any>;