@visactor/vrender 0.9.0 → 0.9.1-circular.0

package/cjs/graphic/glyph.d.ts

@@ -1,7 +1,6 @@
 import { AABBBounds, IPointLike, OBBBounds } from '@visactor/vutils';
 import { Graphic } from './graphic';
 import { GraphicType, IGraphic, IGlyph, IGlyphGraphicAttribute, IGraphicAttribute, ISetAttributeContext } from '../interface';
-export declare const GLYPH_NUMBER_TYPE: number;
 export declare class Glyph extends Graphic<IGlyphGraphicAttribute> implements IGlyph {
     type: GraphicType;
     _onInit: (g: IGlyph) => void;

package/cjs/graphic/glyph.js

@@ -2,15 +2,13 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.Glyph = exports.GLYPH_NUMBER_TYPE = void 0;
+}), exports.Glyph = void 0;
 
-const graphic_1 = require("./graphic"), theme_1 = require("./theme"), modules_1 = require("../modules");
-
-exports.GLYPH_NUMBER_TYPE = (0, graphic_1.genNumberType)();
+const graphic_1 = require("./graphic"), theme_1 = require("./theme"), application_1 = require("../application"), constants_1 = require("./constants");
 
 class Glyph extends graphic_1.Graphic {
     constructor(params) {
-        super(params), this.type = "glyph", this.numberType = exports.GLYPH_NUMBER_TYPE, 
+        super(params), this.type = "glyph", this.numberType = constants_1.GLYPH_NUMBER_TYPE, 
         this.subGraphic = [], this._onInit && this._onInit(this), this.valid = this.isValid();
     }
     setSubGraphic(subGraphic) {
@@ -77,7 +75,7 @@ class Glyph extends graphic_1.Graphic {
     }
     doUpdateAABBBounds() {
         this._AABBBounds.setValue(1 / 0, 1 / 0, -1 / 0, -1 / 0);
-        const bounds = modules_1.graphicService.updateGlyphAABBBounds(this.attribute, (0, 
+        const bounds = application_1.application.graphicService.updateGlyphAABBBounds(this.attribute, (0, 
         theme_1.getTheme)(this).glyph, this._AABBBounds, this);
         return this.clearUpdateBoundTag(), bounds;
     }

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 { AABBBounds, IPointLike, OBBBounds } from '@visactor/vutils';\nimport { Graphic, genNumberType } from './graphic';\nimport {\n  GraphicType,\n  IGraphic,\n  IGlyph,\n  IGlyphGraphicAttribute,\n  IGraphicAttribute,\n  ISetAttributeContext\n} from '../interface';\nimport { getTheme } from './theme';\nimport { graphicService } from '../modules';\n\nexport const GLYPH_NUMBER_TYPE = genNumberType();\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  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  protected doUpdateAABBBounds(): AABBBounds {\n    this._AABBBounds.setValue(Infinity, Infinity, -Infinity, -Infinity);\n    const bounds = graphicService.updateGlyphAABBBounds(\n      this.attribute,\n      getTheme(this).glyph,\n      this._AABBBounds,\n      this\n    ) as AABBBounds;\n    this.clearUpdateBoundTag();\n    return bounds;\n  }\n\n  protected tryUpdateOBBBounds(): OBBBounds {\n    throw new Error('暂不支持');\n  }\n\n  needUpdateTags(keys: string[]): boolean {\n    return false;\n  }\n  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\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    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    this.updateNormalAttrs(stateAttrs);\n    this.currentStates = states;\n    this.applyStateAttrs(stateAttrs, states, hasAnimation);\n  }\n\n  clearStates(hasAnimation?: boolean) {\n    if (!this.hasState() || !this.normalAttrs) {\n      return;\n    }\n\n    this.subGraphic.forEach(graphic => {\n      graphic.applyStateAttrs(graphic.normalAttrs, this.currentStates, hasAnimation, true);\n      graphic.normalAttrs = null;\n    });\n\n    this.applyStateAttrs(this.normalAttrs, this.currentStates, hasAnimation, true);\n    this.normalAttrs = null;\n\n    this.currentStates = [];\n  }\n\n  clone(): Graphic<Partial<IGlyphGraphicAttribute>> {\n    const glyph = new Glyph({ ...this.attribute });\n    glyph.setSubGraphic(this.subGraphic.map(g => g.clone()));\n    return glyph;\n  }\n}\n"]}
+{"version":3,"sources":["../../src/graphic/glyph.ts"],"names":[],"mappings":"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","file":"glyph.js","sourcesContent":["import { AABBBounds, IPointLike, OBBBounds } from '@visactor/vutils';\nimport { Graphic } from './graphic';\nimport {\n  GraphicType,\n  IGraphic,\n  IGlyph,\n  IGlyphGraphicAttribute,\n  IGraphicAttribute,\n  ISetAttributeContext\n} from '../interface';\nimport { getTheme } from './theme';\nimport { application } from '../application';\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  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  protected doUpdateAABBBounds(): AABBBounds {\n    this._AABBBounds.setValue(Infinity, Infinity, -Infinity, -Infinity);\n    const bounds = application.graphicService.updateGlyphAABBBounds(\n      this.attribute,\n      getTheme(this).glyph,\n      this._AABBBounds,\n      this\n    ) as AABBBounds;\n    this.clearUpdateBoundTag();\n    return bounds;\n  }\n\n  protected tryUpdateOBBBounds(): OBBBounds {\n    throw new Error('暂不支持');\n  }\n\n  needUpdateTags(keys: string[]): boolean {\n    return false;\n  }\n  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\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    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    this.updateNormalAttrs(stateAttrs);\n    this.currentStates = states;\n    this.applyStateAttrs(stateAttrs, states, hasAnimation);\n  }\n\n  clearStates(hasAnimation?: boolean) {\n    if (!this.hasState() || !this.normalAttrs) {\n      return;\n    }\n\n    this.subGraphic.forEach(graphic => {\n      graphic.applyStateAttrs(graphic.normalAttrs, this.currentStates, hasAnimation, true);\n      graphic.normalAttrs = null;\n    });\n\n    this.applyStateAttrs(this.normalAttrs, this.currentStates, hasAnimation, true);\n    this.normalAttrs = null;\n\n    this.currentStates = [];\n  }\n\n  clone(): Graphic<Partial<IGlyphGraphicAttribute>> {\n    const glyph = new Glyph({ ...this.attribute });\n    glyph.setSubGraphic(this.subGraphic.map(g => g.clone()));\n    return glyph;\n  }\n}\n"]}

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

@@ -4,24 +4,25 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 });
 
-const inversify_1 = require("inversify"), common_1 = require("../../common"), arc_contribution_1 = require("./arc-contribution"), circle_contribution_1 = require("./circle-contribution"), graphic_service_1 = require("./graphic-service"), path_contribution_1 = require("./path-contribution"), rect_contribution_1 = require("./rect-contribution"), symbol_contribution_1 = require("./symbol-contribution");
+const inversify_1 = require("inversify"), contribution_provider_1 = require("../../common/contribution-provider"), arc_contribution_1 = require("./arc-contribution"), circle_contribution_1 = require("./circle-contribution"), graphic_service_1 = require("./graphic-service"), path_contribution_1 = require("./path-contribution"), rect_contribution_1 = require("./rect-contribution"), symbol_contribution_1 = require("./symbol-contribution"), constants_1 = require("../constants"), graphic_creator_1 = require("../graphic-creator");
 
 exports.default = new inversify_1.ContainerModule((bind => {
-    bind(graphic_service_1.DefaultGraphicService).toSelf().inSingletonScope(), bind(graphic_service_1.GraphicService).toService(graphic_service_1.DefaultGraphicService), 
+    bind(graphic_service_1.DefaultGraphicService).toSelf().inSingletonScope(), bind(constants_1.GraphicService).toService(graphic_service_1.DefaultGraphicService), 
     bind(rect_contribution_1.DefaultRectOuterBorderBoundsContribution).toSelf().inSingletonScope(), 
     bind(rect_contribution_1.RectBoundsContribution).toService(rect_contribution_1.DefaultRectOuterBorderBoundsContribution), 
-    (0, common_1.bindContributionProvider)(bind, rect_contribution_1.RectBoundsContribution), 
+    (0, contribution_provider_1.bindContributionProvider)(bind, rect_contribution_1.RectBoundsContribution), 
     bind(symbol_contribution_1.DefaultSymbolOuterBorderBoundsContribution).toSelf().inSingletonScope(), 
     bind(symbol_contribution_1.SymbolBoundsContribution).toService(symbol_contribution_1.DefaultSymbolOuterBorderBoundsContribution), 
-    (0, common_1.bindContributionProvider)(bind, symbol_contribution_1.SymbolBoundsContribution), 
+    (0, contribution_provider_1.bindContributionProvider)(bind, symbol_contribution_1.SymbolBoundsContribution), 
     bind(circle_contribution_1.DefaultCircleOuterBorderBoundsContribution).toSelf().inSingletonScope(), 
     bind(circle_contribution_1.CircleBoundsContribution).toService(circle_contribution_1.DefaultCircleOuterBorderBoundsContribution), 
-    (0, common_1.bindContributionProvider)(bind, circle_contribution_1.CircleBoundsContribution), 
+    (0, contribution_provider_1.bindContributionProvider)(bind, circle_contribution_1.CircleBoundsContribution), 
     bind(arc_contribution_1.DefaultArcOuterBorderBoundsContribution).toSelf().inSingletonScope(), 
     bind(arc_contribution_1.ArcBoundsContribution).toService(arc_contribution_1.DefaultArcOuterBorderBoundsContribution), 
-    (0, common_1.bindContributionProvider)(bind, arc_contribution_1.ArcBoundsContribution), 
+    (0, contribution_provider_1.bindContributionProvider)(bind, arc_contribution_1.ArcBoundsContribution), 
     bind(path_contribution_1.DefaultPathOuterBorderBoundsContribution).toSelf().inSingletonScope(), 
     bind(path_contribution_1.PathBoundsContribution).toService(path_contribution_1.DefaultPathOuterBorderBoundsContribution), 
-    (0, common_1.bindContributionProvider)(bind, path_contribution_1.PathBoundsContribution);
+    (0, contribution_provider_1.bindContributionProvider)(bind, path_contribution_1.PathBoundsContribution), 
+    bind(constants_1.GraphicCreator).toConstantValue(graphic_creator_1.graphicCreator);
 }));
 //# sourceMappingURL=graphic-module.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/graphic/graphic-service/graphic-module.ts"],"names":[],"mappings":";;AAAA,yCAA4C;AAC5C,yCAAwD;AACxD,yDAAoG;AACpG,+DAA6G;AAE7G,uDAA0E;AAC1E,2DAAuG;AACvG,2DAAuG;AACvG,+DAA6G;AAG7G,kBAAe,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACxC,IAAI,CAAC,uCAAqB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACxD,IAAI,CAAC,gCAAc,CAAC,CAAC,SAAS,CAAC,uCAAqB,CAAC,CAAC;IAGtD,IAAI,CAAC,4DAAwC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC3E,IAAI,CAAC,0CAAsB,CAAC,CAAC,SAAS,CAAC,4DAAwC,CAAC,CAAC;IACjF,IAAA,iCAAwB,EAAC,IAAI,EAAE,0CAAsB,CAAC,CAAC;IAGvD,IAAI,CAAC,gEAA0C,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC7E,IAAI,CAAC,8CAAwB,CAAC,CAAC,SAAS,CAAC,gEAA0C,CAAC,CAAC;IACrF,IAAA,iCAAwB,EAAC,IAAI,EAAE,8CAAwB,CAAC,CAAC;IAGzD,IAAI,CAAC,gEAA0C,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC7E,IAAI,CAAC,8CAAwB,CAAC,CAAC,SAAS,CAAC,gEAA0C,CAAC,CAAC;IACrF,IAAA,iCAAwB,EAAC,IAAI,EAAE,8CAAwB,CAAC,CAAC;IAGzD,IAAI,CAAC,0DAAuC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1E,IAAI,CAAC,wCAAqB,CAAC,CAAC,SAAS,CAAC,0DAAuC,CAAC,CAAC;IAC/E,IAAA,iCAAwB,EAAC,IAAI,EAAE,wCAAqB,CAAC,CAAC;IAGtD,IAAI,CAAC,4DAAwC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC3E,IAAI,CAAC,0CAAsB,CAAC,CAAC,SAAS,CAAC,4DAAwC,CAAC,CAAC;IACjF,IAAA,iCAAwB,EAAC,IAAI,EAAE,0CAAsB,CAAC,CAAC;AAMzD,CAAC,CAAC,CAAC","file":"graphic-module.js","sourcesContent":["import { ContainerModule } from 'inversify';\nimport { bindContributionProvider } from '../../common';\nimport { ArcBoundsContribution, DefaultArcOuterBorderBoundsContribution } from './arc-contribution';\nimport { CircleBoundsContribution, DefaultCircleOuterBorderBoundsContribution } from './circle-contribution';\n// import { DefaultTheme } from './default-theme';\nimport { DefaultGraphicService, GraphicService } from './graphic-service';\nimport { DefaultPathOuterBorderBoundsContribution, PathBoundsContribution } from './path-contribution';\nimport { RectBoundsContribution, DefaultRectOuterBorderBoundsContribution } from './rect-contribution';\nimport { DefaultSymbolOuterBorderBoundsContribution, SymbolBoundsContribution } from './symbol-contribution';\n// import { DefaultThemeService, Theme, ThemeServce } from './theme-service';\n\nexport default new ContainerModule(bind => {\n  bind(DefaultGraphicService).toSelf().inSingletonScope();\n  bind(GraphicService).toService(DefaultGraphicService);\n\n  // rect的bounds contributions\n  bind(DefaultRectOuterBorderBoundsContribution).toSelf().inSingletonScope();\n  bind(RectBoundsContribution).toService(DefaultRectOuterBorderBoundsContribution);\n  bindContributionProvider(bind, RectBoundsContribution);\n\n  // symbol的bounds contributions\n  bind(DefaultSymbolOuterBorderBoundsContribution).toSelf().inSingletonScope();\n  bind(SymbolBoundsContribution).toService(DefaultSymbolOuterBorderBoundsContribution);\n  bindContributionProvider(bind, SymbolBoundsContribution);\n\n  // circle的bounds contributions\n  bind(DefaultCircleOuterBorderBoundsContribution).toSelf().inSingletonScope();\n  bind(CircleBoundsContribution).toService(DefaultCircleOuterBorderBoundsContribution);\n  bindContributionProvider(bind, CircleBoundsContribution);\n\n  // arc的bounds contributions\n  bind(DefaultArcOuterBorderBoundsContribution).toSelf().inSingletonScope();\n  bind(ArcBoundsContribution).toService(DefaultArcOuterBorderBoundsContribution);\n  bindContributionProvider(bind, ArcBoundsContribution);\n\n  // path的bounds contributions\n  bind(DefaultPathOuterBorderBoundsContribution).toSelf().inSingletonScope();\n  bind(PathBoundsContribution).toService(DefaultPathOuterBorderBoundsContribution);\n  bindContributionProvider(bind, PathBoundsContribution);\n  // bind(DefaultThemeService).toSelf().inSingletonScope();\n  // bind(ThemeServce).toService(DefaultThemeService);\n  // bind(DefaultTheme).toSelf().inSingletonScope();\n  // bind(Theme).toService(DefaultTheme);\n  // bindContributionProvider(bind, Theme);\n});\n"]}
+{"version":3,"sources":["../../src/graphic/graphic-service/graphic-module.ts"],"names":[],"mappings":";;AAAA,yCAA4C;AAC5C,8EAA8E;AAC9E,yDAAoG;AACpG,+DAA6G;AAE7G,uDAA0D;AAC1D,2DAAuG;AACvG,2DAAuG;AACvG,+DAA6G;AAC7G,4CAA8D;AAC9D,wDAAoD;AAGpD,kBAAe,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACxC,IAAI,CAAC,uCAAqB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACxD,IAAI,CAAC,0BAAc,CAAC,CAAC,SAAS,CAAC,uCAAqB,CAAC,CAAC;IAGtD,IAAI,CAAC,4DAAwC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC3E,IAAI,CAAC,0CAAsB,CAAC,CAAC,SAAS,CAAC,4DAAwC,CAAC,CAAC;IACjF,IAAA,gDAAwB,EAAC,IAAI,EAAE,0CAAsB,CAAC,CAAC;IAGvD,IAAI,CAAC,gEAA0C,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC7E,IAAI,CAAC,8CAAwB,CAAC,CAAC,SAAS,CAAC,gEAA0C,CAAC,CAAC;IACrF,IAAA,gDAAwB,EAAC,IAAI,EAAE,8CAAwB,CAAC,CAAC;IAGzD,IAAI,CAAC,gEAA0C,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC7E,IAAI,CAAC,8CAAwB,CAAC,CAAC,SAAS,CAAC,gEAA0C,CAAC,CAAC;IACrF,IAAA,gDAAwB,EAAC,IAAI,EAAE,8CAAwB,CAAC,CAAC;IAGzD,IAAI,CAAC,0DAAuC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1E,IAAI,CAAC,wCAAqB,CAAC,CAAC,SAAS,CAAC,0DAAuC,CAAC,CAAC;IAC/E,IAAA,gDAAwB,EAAC,IAAI,EAAE,wCAAqB,CAAC,CAAC;IAGtD,IAAI,CAAC,4DAAwC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC3E,IAAI,CAAC,0CAAsB,CAAC,CAAC,SAAS,CAAC,4DAAwC,CAAC,CAAC;IACjF,IAAA,gDAAwB,EAAC,IAAI,EAAE,0CAAsB,CAAC,CAAC;IAEvD,IAAI,CAAC,0BAAc,CAAC,CAAC,eAAe,CAAC,gCAAc,CAAC,CAAC;AAMvD,CAAC,CAAC,CAAC","file":"graphic-module.js","sourcesContent":["import { ContainerModule } from 'inversify';\nimport { bindContributionProvider } from '../../common/contribution-provider';\nimport { ArcBoundsContribution, DefaultArcOuterBorderBoundsContribution } from './arc-contribution';\nimport { CircleBoundsContribution, DefaultCircleOuterBorderBoundsContribution } from './circle-contribution';\n// import { DefaultTheme } from './default-theme';\nimport { DefaultGraphicService } from './graphic-service';\nimport { DefaultPathOuterBorderBoundsContribution, PathBoundsContribution } from './path-contribution';\nimport { RectBoundsContribution, DefaultRectOuterBorderBoundsContribution } from './rect-contribution';\nimport { DefaultSymbolOuterBorderBoundsContribution, SymbolBoundsContribution } from './symbol-contribution';\nimport { GraphicCreator, GraphicService } from '../constants';\nimport { graphicCreator } from '../graphic-creator';\n// import { DefaultThemeService, Theme, ThemeServce } from './theme-service';\n\nexport default new ContainerModule(bind => {\n  bind(DefaultGraphicService).toSelf().inSingletonScope();\n  bind(GraphicService).toService(DefaultGraphicService);\n\n  // rect的bounds contributions\n  bind(DefaultRectOuterBorderBoundsContribution).toSelf().inSingletonScope();\n  bind(RectBoundsContribution).toService(DefaultRectOuterBorderBoundsContribution);\n  bindContributionProvider(bind, RectBoundsContribution);\n\n  // symbol的bounds contributions\n  bind(DefaultSymbolOuterBorderBoundsContribution).toSelf().inSingletonScope();\n  bind(SymbolBoundsContribution).toService(DefaultSymbolOuterBorderBoundsContribution);\n  bindContributionProvider(bind, SymbolBoundsContribution);\n\n  // circle的bounds contributions\n  bind(DefaultCircleOuterBorderBoundsContribution).toSelf().inSingletonScope();\n  bind(CircleBoundsContribution).toService(DefaultCircleOuterBorderBoundsContribution);\n  bindContributionProvider(bind, CircleBoundsContribution);\n\n  // arc的bounds contributions\n  bind(DefaultArcOuterBorderBoundsContribution).toSelf().inSingletonScope();\n  bind(ArcBoundsContribution).toService(DefaultArcOuterBorderBoundsContribution);\n  bindContributionProvider(bind, ArcBoundsContribution);\n\n  // path的bounds contributions\n  bind(DefaultPathOuterBorderBoundsContribution).toSelf().inSingletonScope();\n  bind(PathBoundsContribution).toService(DefaultPathOuterBorderBoundsContribution);\n  bindContributionProvider(bind, PathBoundsContribution);\n\n  bind(GraphicCreator).toConstantValue(graphicCreator);\n  // bind(DefaultThemeService).toSelf().inSingletonScope();\n  // bind(ThemeServce).toService(DefaultThemeService);\n  // bind(DefaultTheme).toSelf().inSingletonScope();\n  // bind(Theme).toService(DefaultTheme);\n  // bindContributionProvider(bind, Theme);\n});\n"]}

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

@@ -1,13 +1,12 @@
 import { AABBBounds, IAABBBounds, IBounds, IMatrix } from '@visactor/vutils';
 import { SyncHook } from '../../tapable';
-import { mat4, vec3, IArc, IArcGraphicAttribute, IArea, IAreaGraphicAttribute, IGraphicAttribute, ICircle, ICircleGraphicAttribute, IGraphic, IGroup, IGroupGraphicAttribute, ILine, ILineGraphicAttribute, IPath, IPathGraphicAttribute, IPolygon, IPolygonGraphicAttribute, IRectGraphicAttribute, IStage, ISymbol, ISymbolGraphicAttribute, IText, ITextGraphicAttribute, IGlyph, IGlyphGraphicAttribute, IRichTextGraphicAttribute, IRichText, IPyramid3dGraphicAttribute, IPyramid3d, IArc3dGraphicAttribute, IArc3d, IImageGraphicAttribute, IImage, ITransform } from '../../interface';
-import { graphicCreator } from '../graphic-creator';
+import { mat4, vec3, IArc, IArcGraphicAttribute, IArea, IAreaGraphicAttribute, IGraphicAttribute, ICircle, ICircleGraphicAttribute, IGraphic, IGroup, IGroupGraphicAttribute, ILine, ILineGraphicAttribute, IPath, IPathGraphicAttribute, IPolygon, IPolygonGraphicAttribute, IRectGraphicAttribute, IStage, ISymbol, ISymbolGraphicAttribute, IText, ITextGraphicAttribute, IGlyph, IGlyphGraphicAttribute, IRichTextGraphicAttribute, IRichText, IPyramid3dGraphicAttribute, IPyramid3d, IArc3dGraphicAttribute, IArc3d, IImageGraphicAttribute, ITransform, IGraphicService, IGraphicCreator } from '../../interface';
 import { IRectBoundsContribution } from './rect-contribution';
-import { ContributionProvider } from '../../common';
 import { ISymbolBoundsContribution } from './symbol-contribution';
 import { ICircleBoundsContribution } from './circle-contribution';
 import { IArcBoundsContribution } from './arc-contribution';
 import { IPathBoundsContribution } from './path-contribution';
+import { ContributionProvider } from '../../common/contribution-provider';
 export declare function rotateX(out: mat4, a: mat4, rad: number): mat4;
 export declare function rotateY(out: mat4, a: mat4, rad: number): mat4;
 export declare function translate(out: mat4, a: mat4, v: vec3): mat4;
@@ -17,46 +16,8 @@ export declare function multiplyMat4Mat4(out: mat4, a: mat4, b: mat4): mat4;
 export declare function getExtraModelMatrix(dx: number, dy: number, graphic: IGraphic): mat4 | null;
 export declare function getModelMatrix(out: mat4, graphic: IGraphic, theme: ITransform): void;
 export declare function shouldUseMat4(graphic: IGraphic): number;
-export interface IGraphicService {
-    onAttributeUpdate: (graphic: IGraphic) => void;
-    onSetStage: (graphic: IGraphic, stage: IStage) => void;
-    onRemove: (graphic: IGraphic) => void;
-    onAddIncremental: (graphic: IGraphic, group: IGroup, stage: IStage) => void;
-    onClearIncremental: (group: IGroup, stage: IStage) => void;
-    hooks: {
-        onAttributeUpdate: SyncHook<[IGraphic]>;
-        onSetStage: SyncHook<[IGraphic, IStage]>;
-        onRemove: SyncHook<[IGraphic]>;
-        onAddIncremental: SyncHook<[IGraphic, IGroup, IStage]>;
-        onClearIncremental: SyncHook<[IGroup, IStage]>;
-        beforeUpdateAABBBounds: SyncHook<[IGraphic, IStage, boolean, IAABBBounds]>;
-        afterUpdateAABBBounds: SyncHook<[IGraphic, IStage, IAABBBounds, {
-            globalAABBBounds: IAABBBounds;
-        }, boolean]>;
-    };
-    beforeUpdateAABBBounds: (graphic: IGraphic, stage: IStage, willUpdate: boolean, bounds: IAABBBounds) => void;
-    afterUpdateAABBBounds: (graphic: IGraphic, stage: IStage, bounds: IAABBBounds, params: {
-        globalAABBBounds: IAABBBounds;
-    }, selfChange: boolean) => void;
-    creator: typeof graphicCreator;
-    updateRectAABBBounds: (attribute: IRectGraphicAttribute, rectTheme: Required<IRectGraphicAttribute>, aabbBounds: IAABBBounds, graphic?: IGraphic) => IAABBBounds;
-    updateGroupAABBBounds: (attribute: IGroupGraphicAttribute, groupTheme: Required<IGroupGraphicAttribute>, aabbBounds: IAABBBounds, graphic?: IGroup) => IAABBBounds;
-    updateGlyphAABBBounds: (attribute: IGlyphGraphicAttribute, groupTheme: Required<IGlyphGraphicAttribute>, aabbBounds: IAABBBounds, graphic?: IGlyph) => IAABBBounds;
-    updateSymbolAABBBounds: (attribute: ISymbolGraphicAttribute, symbolTheme: Required<ISymbolGraphicAttribute>, aabbBounds: IAABBBounds, full?: boolean, graphic?: ISymbol) => IAABBBounds;
-    updateCircleAABBBounds: (attribute: ICircleGraphicAttribute, circleTheme: Required<ICircleGraphicAttribute>, aabbBounds: IAABBBounds, full?: boolean, graphic?: ICircle) => IAABBBounds;
-    updateArcAABBBounds: (attribute: IArcGraphicAttribute, arcTheme: Required<IArcGraphicAttribute>, aabbBounds: IAABBBounds, full?: boolean, graphic?: IArc) => IAABBBounds;
-    updateArc3dAABBBounds: (attribute: IArc3dGraphicAttribute, arcTheme: Required<IArc3dGraphicAttribute>, aabbBounds: IAABBBounds, graphic?: IArc3d) => IAABBBounds;
-    updateAreaAABBBounds: (attribute: IAreaGraphicAttribute, areaTheme: Required<IAreaGraphicAttribute>, aabbBounds: IAABBBounds, graphic?: IArea) => IAABBBounds;
-    updateLineAABBBounds: (attribute: ILineGraphicAttribute, lineTheme: Required<ILineGraphicAttribute>, aabbBounds: IAABBBounds, graphic?: ILine) => IAABBBounds;
-    updatePathAABBBounds: (attribute: IPathGraphicAttribute, pathTheme: Required<IPathGraphicAttribute>, aabbBounds: IAABBBounds, graphic?: IPath) => IAABBBounds;
-    updatePolygonAABBBounds: (attribute: IPolygonGraphicAttribute, polygonTheme: Required<IPolygonGraphicAttribute>, aabbBounds: IAABBBounds, graphic?: IPolygon) => IAABBBounds;
-    updatePyramid3dAABBBounds: (attribute: IPyramid3dGraphicAttribute, polygonTheme: Required<IPyramid3dGraphicAttribute>, aabbBounds: IAABBBounds, graphic?: IPyramid3d) => IAABBBounds;
-    updateTextAABBBounds: (attribute: ITextGraphicAttribute, textTheme: Required<ITextGraphicAttribute>, aabbBounds: IAABBBounds, graphic?: IText) => IAABBBounds;
-    updateRichTextAABBBounds: (attribute: IRichTextGraphicAttribute, textTheme: Required<IRichTextGraphicAttribute>, aabbBounds: IAABBBounds, graphic?: IRichText) => IAABBBounds;
-    updateImageAABBBounds: (attribute: IImageGraphicAttribute, textTheme: Required<IImageGraphicAttribute>, aabbBounds: IAABBBounds, graphic?: IImage) => IAABBBounds;
-}
-export declare const GraphicService: unique symbol;
 export declare class DefaultGraphicService implements IGraphicService {
+    readonly creator: IGraphicCreator;
     protected readonly rectBoundsContribitions: ContributionProvider<IRectBoundsContribution>;
     protected readonly symbolBoundsContribitions: ContributionProvider<ISymbolBoundsContribution>;
     protected readonly circleBoundsContribitions: ContributionProvider<ICircleBoundsContribution>;
@@ -73,23 +34,6 @@ export declare class DefaultGraphicService implements IGraphicService {
             globalAABBBounds: IAABBBounds;
         }, boolean]>;
     };
-    creator: {
-        arc: typeof import("../graphic-creator").createArc;
-        area: typeof import("../graphic-creator").createArea;
-        circle: typeof import("../graphic-creator").createCircle;
-        group: typeof import("../graphic-creator").createGroup;
-        image: typeof import("../graphic-creator").createImage;
-        line: typeof import("../graphic-creator").createLine;
-        path: typeof import("../graphic-creator").createPath;
-        rect: typeof import("../graphic-creator").createRect;
-        rect3d: typeof import("../graphic-creator").createRect3d;
-        symbol: typeof import("../graphic-creator").createSymbol;
-        text: typeof import("../graphic-creator").createText;
-        richtext: typeof import("../graphic-creator").createRichText;
-        polygon: typeof import("../graphic-creator").createPolygon;
-        shadowRoot: typeof import("../graphic-creator").createShadowRoot;
-        wrapText: typeof import("../graphic-creator").createWrapText;
-    };
     protected _rectBoundsContribitions: IRectBoundsContribution[];
     protected _symbolBoundsContribitions: ISymbolBoundsContribution[];
     protected _circleBoundsContribitions: ICircleBoundsContribution[];
@@ -97,7 +41,7 @@ export declare class DefaultGraphicService implements IGraphicService {
     protected _pathBoundsContribitions: IPathBoundsContribution[];
     protected tempAABBBounds1: AABBBounds;
     protected tempAABBBounds2: AABBBounds;
-    constructor(rectBoundsContribitions: ContributionProvider<IRectBoundsContribution>, symbolBoundsContribitions: ContributionProvider<ISymbolBoundsContribution>, circleBoundsContribitions: ContributionProvider<ICircleBoundsContribution>, arcBoundsContribitions: ContributionProvider<IArcBoundsContribution>, pathBoundsContribitions: ContributionProvider<IPathBoundsContribution>);
+    constructor(creator: IGraphicCreator, rectBoundsContribitions: ContributionProvider<IRectBoundsContribution>, symbolBoundsContribitions: ContributionProvider<ISymbolBoundsContribution>, circleBoundsContribitions: ContributionProvider<ICircleBoundsContribution>, arcBoundsContribitions: ContributionProvider<IArcBoundsContribution>, pathBoundsContribitions: ContributionProvider<IPathBoundsContribution>);
     onAttributeUpdate(graphic: IGraphic): void;
     onSetStage(graphic: IGraphic, stage: IStage): void;
     onRemove(graphic: IGraphic<Partial<IGraphicAttribute>>): void;

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

@@ -14,9 +14,9 @@ var __decorate = this && this.__decorate || function(decorators, target, key, de
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.DefaultGraphicService = exports.GraphicService = exports.shouldUseMat4 = exports.getModelMatrix = exports.getExtraModelMatrix = exports.multiplyMat4Mat4 = exports.multiplyMat4Mat3 = exports.mat3Tomat4 = exports.translate = exports.rotateY = exports.rotateX = void 0;
+}), exports.DefaultGraphicService = exports.shouldUseMat4 = exports.getModelMatrix = exports.getExtraModelMatrix = exports.multiplyMat4Mat4 = exports.multiplyMat4Mat3 = exports.mat3Tomat4 = exports.translate = exports.rotateY = exports.rotateX = void 0;
 
-const inversify_1 = require("inversify"), vutils_1 = require("@visactor/vutils"), tapable_1 = require("../../tapable"), graphic_creator_1 = require("../graphic-creator"), rect_contribution_1 = require("./rect-contribution"), common_1 = require("../../common"), symbol_contribution_1 = require("./symbol-contribution"), tools_1 = require("../tools"), circle_contribution_1 = require("./circle-contribution"), arc_contribution_1 = require("./arc-contribution"), path_contribution_1 = require("./path-contribution"), modules_1 = require("../../modules");
+const inversify_1 = require("inversify"), vutils_1 = require("@visactor/vutils"), tapable_1 = require("../../tapable"), rect_contribution_1 = require("./rect-contribution"), text_1 = require("../../common/text"), symbol_contribution_1 = require("./symbol-contribution"), tools_1 = require("../tools"), circle_contribution_1 = require("./circle-contribution"), arc_contribution_1 = require("./arc-contribution"), path_contribution_1 = require("./path-contribution"), matrix_allocate_1 = require("../../allocator/matrix-allocate"), contribution_provider_1 = require("../../common/contribution-provider"), bounds_context_1 = require("../../common/bounds-context"), render_command_list_1 = require("../../common/render-command-list"), utils_1 = require("../../common/utils"), constants_1 = require("../constants");
 
 function identity(out) {
     return out[0] = 1, out[1] = 0, out[2] = 0, out[3] = 0, out[4] = 0, out[5] = 1, out[6] = 0, 
@@ -124,10 +124,10 @@ function getExtraModelMatrix(dx, dy, graphic) {
     }
     if ("text" === graphic.type) {
         const {textAlign: textAlign} = graphic.attribute;
-        _anchor[0] += (0, common_1.textDrawOffsetX)(textAlign, graphic.clipedWidth);
+        _anchor[0] += (0, text_1.textDrawOffsetX)(textAlign, graphic.clipedWidth);
     }
     _anchor[0] += dx, _anchor[1] += dy;
-    const modelMatrix = modules_1.mat4Allocate.allocate();
+    const modelMatrix = matrix_allocate_1.mat4Allocate.allocate();
     return translate(modelMatrix, modelMatrix, [ _anchor[0], _anchor[1], 0 ]), beta && rotateX(modelMatrix, modelMatrix, beta), 
     alpha && rotateY(modelMatrix, modelMatrix, alpha), translate(modelMatrix, modelMatrix, [ -_anchor[0], -_anchor[1], 0 ]), 
     modelMatrix;
@@ -150,7 +150,7 @@ function getModelMatrix(out, graphic, theme) {
     if (identity(out), translate(out, out, [ x + dx, y + dy, z + dz ]), translate(out, out, [ _anchor[0], _anchor[1], _anchor[2] ]), 
     rotateX(out, out, beta), rotateY(out, out, alpha), translate(out, out, [ -_anchor[0], -_anchor[1], _anchor[2] ]), 
     scale(out, out, [ scaleX, scaleY, scaleZ ]), angle) {
-        const m = modules_1.mat4Allocate.allocate(), _anchor = [ 0, 0 ];
+        const m = matrix_allocate_1.mat4Allocate.allocate(), _anchor = [ 0, 0 ];
         if (anchor) {
             if ("string" == typeof anchor3d[0]) {
                 const ratio = parseFloat(anchor3d[0]) / 100, bounds = graphic.AABBBounds;
@@ -174,13 +174,13 @@ function shouldUseMat4(graphic) {
 exports.rotateX = rotateX, exports.rotateY = rotateY, exports.translate = translate, 
 exports.mat3Tomat4 = mat3Tomat4, exports.multiplyMat4Mat3 = multiplyMat4Mat3, exports.multiplyMat4Mat4 = multiplyMat4Mat4, 
 exports.getExtraModelMatrix = getExtraModelMatrix, exports.getModelMatrix = getModelMatrix, 
-exports.shouldUseMat4 = shouldUseMat4, exports.GraphicService = Symbol.for("GraphicService");
+exports.shouldUseMat4 = shouldUseMat4;
 
 let DefaultGraphicService = class {
-    constructor(rectBoundsContribitions, symbolBoundsContribitions, circleBoundsContribitions, arcBoundsContribitions, pathBoundsContribitions) {
-        this.rectBoundsContribitions = rectBoundsContribitions, this.symbolBoundsContribitions = symbolBoundsContribitions, 
-        this.circleBoundsContribitions = circleBoundsContribitions, this.arcBoundsContribitions = arcBoundsContribitions, 
-        this.pathBoundsContribitions = pathBoundsContribitions, this.creator = graphic_creator_1.graphicCreator, 
+    constructor(creator, rectBoundsContribitions, symbolBoundsContribitions, circleBoundsContribitions, arcBoundsContribitions, pathBoundsContribitions) {
+        this.creator = creator, this.rectBoundsContribitions = rectBoundsContribitions, 
+        this.symbolBoundsContribitions = symbolBoundsContribitions, this.circleBoundsContribitions = circleBoundsContribitions, 
+        this.arcBoundsContribitions = arcBoundsContribitions, this.pathBoundsContribitions = pathBoundsContribitions, 
         this.hooks = {
             onAttributeUpdate: new tapable_1.SyncHook([ "graphic" ]),
             onSetStage: new tapable_1.SyncHook([ "graphic", "stage" ]),
@@ -215,8 +215,9 @@ let DefaultGraphicService = class {
     updatePathProxyAABBBounds(aabbBounds, graphic) {
         const path = "function" == typeof graphic.pathProxy ? graphic.pathProxy(graphic.attribute) : graphic.pathProxy;
         if (!path) return !1;
-        const boundsContext = new common_1.BoundsContext(aabbBounds);
-        return (0, common_1.renderCommandList)(path.commandList, boundsContext, 0, 0), !0;
+        const boundsContext = new bounds_context_1.BoundsContext(aabbBounds);
+        return (0, render_command_list_1.renderCommandList)(path.commandList, boundsContext, 0, 0), 
+        !0;
     }
     updateRectAABBBounds(attribute, rectTheme, aabbBounds, graphic) {
         if (!this.updatePathProxyAABBBounds(aabbBounds, graphic)) {
@@ -228,19 +229,18 @@ let DefaultGraphicService = class {
         tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this._rectBoundsContribitions || (this._rectBoundsContribitions = this.rectBoundsContribitions.getContributions() || []), 
         this._rectBoundsContribitions.length && this._rectBoundsContribitions.forEach((c => {
             c.updateBounds(attribute, rectTheme, tb1, graphic), aabbBounds.union(tb1), tb1.setValue(tb2.x1, tb2.y1, tb2.x2, tb2.y2);
-        })), this.combindShadowAABBBounds(aabbBounds, graphic), this.transformAABBBounds(attribute, aabbBounds, rectTheme, graphic), 
-        aabbBounds;
+        })), this.transformAABBBounds(attribute, aabbBounds, rectTheme, graphic), aabbBounds;
     }
     updateGroupAABBBounds(attribute, groupTheme, aabbBounds, graphic) {
         const {width: width, height: height, path: path, clip: clip = groupTheme.clip} = attribute;
         path && path.length ? path.forEach((g => {
             aabbBounds.union(g.AABBBounds);
-        })) : null != width && null != height && aabbBounds.set(0, 0, width, height);
+        })) : null != width && null != height && aabbBounds.set(0, 0, width, height), clip || graphic.forEachChildren((node => {
+            aabbBounds.union(node.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), clip || (graphic.forEachChildren((node => {
-            aabbBounds.union(node.AABBBounds);
-        })), this.combindShadowAABBBounds(aabbBounds, graphic)), this.transformAABBBounds(attribute, aabbBounds, groupTheme, graphic), 
+        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this.transformAABBBounds(attribute, aabbBounds, groupTheme, graphic), 
         aabbBounds;
     }
     updateGlyphAABBBounds(attribute, theme, aabbBounds, graphic) {
@@ -287,8 +287,8 @@ let DefaultGraphicService = class {
         aabbBounds.translate(deltaX, deltaY);
         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), this.combindShadowAABBBounds(aabbBounds, graphic), 
-        this.transformAABBBounds(attribute, aabbBounds, richtextTheme, graphic), aabbBounds;
+        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this.transformAABBBounds(attribute, aabbBounds, richtextTheme, graphic), 
+        aabbBounds;
     }
     updateTextAABBBounds(attribute, textTheme, aabbBounds, graphic) {
         if (!graphic) return aabbBounds;
@@ -296,8 +296,7 @@ let DefaultGraphicService = class {
         Array.isArray(text) ? graphic.updateMultilineAABBBounds(text) : graphic.updateSingallineAABBBounds(text);
         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), this.combindShadowAABBBounds(aabbBounds, graphic), 
-        (0, vutils_1.transformBoundsWithMatrix)(aabbBounds, aabbBounds, graphic.transMatrix), 
+        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), (0, vutils_1.transformBoundsWithMatrix)(aabbBounds, aabbBounds, graphic.transMatrix), 
         aabbBounds;
     }
     updatePathAABBBounds(attribute, pathTheme, aabbBounds, graphic) {
@@ -307,8 +306,7 @@ let DefaultGraphicService = class {
         tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this._pathBoundsContribitions || (this._pathBoundsContribitions = this.pathBoundsContribitions.getContributions() || []), 
         this._pathBoundsContribitions.length && this._pathBoundsContribitions.forEach((c => {
             c.updateBounds(attribute, pathTheme, tb1, graphic), aabbBounds.union(tb1), tb1.setValue(tb2.x1, tb2.y1, tb2.x2, tb2.y2);
-        })), this.combindShadowAABBBounds(aabbBounds, graphic), this.transformAABBBounds(attribute, aabbBounds, pathTheme, graphic), 
-        aabbBounds;
+        })), this.transformAABBBounds(attribute, aabbBounds, pathTheme, graphic), aabbBounds;
     }
     updatePathAABBBoundsImprecise(attribute, pathTheme, aabbBounds, graphic) {
         if (!graphic) return aabbBounds;
@@ -325,8 +323,8 @@ let DefaultGraphicService = class {
         }));
         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), this.combindShadowAABBBounds(aabbBounds, graphic), 
-        this.transformAABBBounds(attribute, aabbBounds, polygonTheme, graphic), aabbBounds;
+        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this.transformAABBBounds(attribute, aabbBounds, polygonTheme, graphic), 
+        aabbBounds;
     }
     updateArc3dAABBBounds(attribute, arcTheme, aabbBounds, graphic) {
         if (!graphic) return aabbBounds;
@@ -336,15 +334,15 @@ let DefaultGraphicService = class {
         aabbBounds.setValue(-r, -r, r, r);
         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), this.combindShadowAABBBounds(aabbBounds, graphic), 
-        this.transformAABBBounds(attribute, aabbBounds, arcTheme, graphic), aabbBounds;
+        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this.transformAABBBounds(attribute, aabbBounds, arcTheme, graphic), 
+        aabbBounds;
     }
     updatePolygonAABBBounds(attribute, polygonTheme, aabbBounds, graphic) {
         this.updatePathProxyAABBBounds(aabbBounds, graphic) || this.updatePolygonAABBBoundsImprecise(attribute, polygonTheme, aabbBounds, graphic);
         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), this.combindShadowAABBBounds(aabbBounds, graphic), 
-        this.transformAABBBounds(attribute, aabbBounds, polygonTheme, graphic), aabbBounds;
+        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this.transformAABBBounds(attribute, aabbBounds, polygonTheme, graphic), 
+        aabbBounds;
     }
     updatePolygonAABBBoundsImprecise(attribute, polygonTheme, aabbBounds, graphic) {
         const {points: points = polygonTheme.points} = attribute;
@@ -356,8 +354,8 @@ let DefaultGraphicService = class {
         this.updatePathProxyAABBBounds(aabbBounds, graphic) || (attribute.segments ? this.updateLineAABBBoundsBySegments(attribute, lineTheme, aabbBounds, graphic) : this.updateLineAABBBoundsByPoints(attribute, lineTheme, aabbBounds, graphic));
         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), this.combindShadowAABBBounds(aabbBounds, graphic), 
-        this.transformAABBBounds(attribute, aabbBounds, lineTheme, graphic), aabbBounds;
+        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this.transformAABBBounds(attribute, aabbBounds, lineTheme, graphic), 
+        aabbBounds;
     }
     updateLineAABBBoundsByPoints(attribute, lineTheme, aabbBounds, graphic) {
         const {points: points = lineTheme.points} = attribute, b = aabbBounds;
@@ -377,8 +375,8 @@ let DefaultGraphicService = class {
         this.updatePathProxyAABBBounds(aabbBounds, graphic) || (attribute.segments ? this.updateAreaAABBBoundsBySegments(attribute, areaTheme, aabbBounds, graphic) : this.updateAreaAABBBoundsByPoints(attribute, areaTheme, aabbBounds, graphic));
         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), this.combindShadowAABBBounds(aabbBounds, graphic), 
-        this.transformAABBBounds(attribute, aabbBounds, areaTheme, graphic), aabbBounds;
+        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this.transformAABBBounds(attribute, aabbBounds, areaTheme, graphic), 
+        aabbBounds;
     }
     updateAreaAABBBoundsByPoints(attribute, areaTheme, aabbBounds, graphic) {
         const {points: points = areaTheme.points} = attribute, b = aabbBounds;
@@ -403,8 +401,7 @@ let DefaultGraphicService = class {
         tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this._circleBoundsContribitions || (this._circleBoundsContribitions = this.circleBoundsContribitions.getContributions() || []), 
         this._circleBoundsContribitions.length && this._circleBoundsContribitions.forEach((c => {
             c.updateBounds(attribute, circleTheme, tb1, graphic), aabbBounds.union(tb1), tb1.setValue(tb2.x1, tb2.y1, tb2.x2, tb2.y2);
-        })), this.combindShadowAABBBounds(aabbBounds, graphic), this.transformAABBBounds(attribute, aabbBounds, circleTheme, graphic), 
-        aabbBounds;
+        })), this.transformAABBBounds(attribute, aabbBounds, circleTheme, graphic), aabbBounds;
     }
     updateCircleAABBBoundsImprecise(attribute, circleTheme, aabbBounds, graphic) {
         const {radius: radius = circleTheme.radius} = attribute;
@@ -413,7 +410,7 @@ let DefaultGraphicService = class {
     updateCircleAABBBoundsAccurate(attribute, circleTheme, aabbBounds, graphic) {
         const {startAngle: startAngle = circleTheme.startAngle, endAngle: endAngle = circleTheme.endAngle, radius: radius = circleTheme.radius} = attribute;
         return endAngle - startAngle > vutils_1.pi2 - vutils_1.epsilon ? aabbBounds.set(-radius, -radius, radius, radius) : (0, 
-        common_1.circleBounds)(startAngle, endAngle, radius, aabbBounds), aabbBounds;
+        utils_1.circleBounds)(startAngle, endAngle, radius, aabbBounds), aabbBounds;
     }
     updateArcAABBBounds(attribute, arcTheme, aabbBounds, full, graphic) {
         this.updatePathProxyAABBBounds(aabbBounds, graphic) || (full ? this.updateArcAABBBoundsImprecise(attribute, arcTheme, aabbBounds, graphic) : this.updateArcAABBBoundsAccurate(attribute, arcTheme, aabbBounds, graphic));
@@ -422,8 +419,7 @@ let DefaultGraphicService = class {
         tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this._arcBoundsContribitions || (this._arcBoundsContribitions = this.arcBoundsContribitions.getContributions() || []), 
         this._arcBoundsContribitions.length && this._arcBoundsContribitions.forEach((c => {
             c.updateBounds(attribute, arcTheme, tb1, graphic), aabbBounds.union(tb1), tb1.setValue(tb2.x1, tb2.y1, tb2.x2, tb2.y2);
-        })), this.combindShadowAABBBounds(aabbBounds, graphic), this.transformAABBBounds(attribute, aabbBounds, arcTheme, graphic), 
-        aabbBounds;
+        })), this.transformAABBBounds(attribute, aabbBounds, arcTheme, graphic), aabbBounds;
     }
     updateArcAABBBoundsImprecise(attribute, arcTheme, aabbBounds, graphic) {
         const {outerRadius: outerRadius = arcTheme.outerRadius} = attribute;
@@ -432,7 +428,7 @@ let DefaultGraphicService = class {
     updateArcAABBBoundsAccurate(attribute, arcTheme, aabbBounds, graphic) {
         const {outerRadius: outerRadius = arcTheme.outerRadius, innerRadius: innerRadius = arcTheme.innerRadius, endAngle: endAngle = arcTheme.endAngle, startAngle: startAngle = arcTheme.startAngle} = attribute;
         return outerRadius <= vutils_1.epsilon ? aabbBounds.set(0, 0, 0, 0) : Math.abs(endAngle - startAngle) > vutils_1.pi2 - vutils_1.epsilon ? aabbBounds.set(-outerRadius, -outerRadius, outerRadius, outerRadius) : ((0, 
-        common_1.circleBounds)(startAngle, endAngle, outerRadius, aabbBounds), (0, common_1.circleBounds)(startAngle, endAngle, innerRadius, aabbBounds)), 
+        utils_1.circleBounds)(startAngle, endAngle, outerRadius, aabbBounds), (0, utils_1.circleBounds)(startAngle, endAngle, innerRadius, aabbBounds)), 
         aabbBounds;
     }
     updateSymbolAABBBounds(attribute, symbolTheme, aabbBounds, full, graphic) {
@@ -464,8 +460,8 @@ let DefaultGraphicService = class {
         }
         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), this.combindShadowAABBBounds(aabbBounds, graphic), 
-        this.transformAABBBounds(attribute, aabbBounds, imageTheme, graphic), aabbBounds;
+        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this.transformAABBBounds(attribute, aabbBounds, imageTheme, graphic), 
+        aabbBounds;
     }
     combindShadowAABBBounds(bounds, graphic) {
         if (graphic && graphic.shadowRoot) {
@@ -474,7 +470,7 @@ let DefaultGraphicService = class {
         }
     }
     transformAABBBounds(attribute, aabbBounds, theme, graphic) {
-        const {scaleX: scaleX = theme.scaleX, scaleY: scaleY = theme.scaleY, stroke: stroke = (null == theme.stroke ? !!attribute.strokeColor : theme.stroke), shadowBlur: shadowBlur = theme.shadowBlur, lineWidth: lineWidth = theme.lineWidth, lineJoin: lineJoin = theme.lineJoin, strokeBoundsBuffer: strokeBoundsBuffer = theme.strokeBoundsBuffer} = attribute, tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
+        const {scaleX: scaleX = theme.scaleX, scaleY: scaleY = theme.scaleY, stroke: stroke = theme.stroke, shadowBlur: shadowBlur = theme.shadowBlur, lineWidth: lineWidth = theme.lineWidth, lineJoin: lineJoin = theme.lineJoin, strokeBoundsBuffer: strokeBoundsBuffer = theme.strokeBoundsBuffer} = attribute, tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
         if (stroke) {
             const scaledHalfLineWidth = lineWidth / Math.abs(scaleX + scaleY);
             (0, tools_1.boundStroke)(tb1, scaledHalfLineWidth, "miter" === lineJoin, strokeBoundsBuffer), 
@@ -490,10 +486,14 @@ let DefaultGraphicService = class {
 };
 
 DefaultGraphicService = __decorate([ (0, inversify_1.injectable)(), __param(0, (0, 
-inversify_1.inject)(common_1.ContributionProvider)), __param(0, (0, inversify_1.named)(rect_contribution_1.RectBoundsContribution)), __param(1, (0, 
-inversify_1.inject)(common_1.ContributionProvider)), __param(1, (0, inversify_1.named)(symbol_contribution_1.SymbolBoundsContribution)), __param(2, (0, 
-inversify_1.inject)(common_1.ContributionProvider)), __param(2, (0, inversify_1.named)(circle_contribution_1.CircleBoundsContribution)), __param(3, (0, 
-inversify_1.inject)(common_1.ContributionProvider)), __param(3, (0, inversify_1.named)(arc_contribution_1.ArcBoundsContribution)), __param(4, (0, 
-inversify_1.inject)(common_1.ContributionProvider)), __param(4, (0, inversify_1.named)(path_contribution_1.PathBoundsContribution)), __metadata("design:paramtypes", [ Object, Object, Object, Object, Object ]) ], DefaultGraphicService), 
+inversify_1.inject)(constants_1.GraphicCreator)), __param(1, (0, inversify_1.inject)(contribution_provider_1.ContributionProvider)), __param(1, (0, 
+inversify_1.named)(rect_contribution_1.RectBoundsContribution)), __param(2, (0, 
+inversify_1.inject)(contribution_provider_1.ContributionProvider)), __param(2, (0, 
+inversify_1.named)(symbol_contribution_1.SymbolBoundsContribution)), __param(3, (0, 
+inversify_1.inject)(contribution_provider_1.ContributionProvider)), __param(3, (0, 
+inversify_1.named)(circle_contribution_1.CircleBoundsContribution)), __param(4, (0, 
+inversify_1.inject)(contribution_provider_1.ContributionProvider)), __param(4, (0, 
+inversify_1.named)(arc_contribution_1.ArcBoundsContribution)), __param(5, (0, inversify_1.inject)(contribution_provider_1.ContributionProvider)), __param(5, (0, 
+inversify_1.named)(path_contribution_1.PathBoundsContribution)), __metadata("design:paramtypes", [ Object, Object, Object, Object, Object, Object ]) ], DefaultGraphicService), 
 exports.DefaultGraphicService = DefaultGraphicService;
 //# sourceMappingURL=graphic-service.js.map