@visactor/vrender 0.9.0 → 0.9.1-circular.0

package/es/graphic/config.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/graphic/config.ts"],"names":[],"mappings":"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","file":"config.js","sourcesContent":["// 存放公共属性\nimport { Matrix, pi2 } from '@visactor/vutils';\nimport { CustomPath2D } from '../common';\nimport {\n  IArcGraphicAttribute,\n  IAreaGraphicAttribute,\n  IGraphicAttribute,\n  ICircleGraphicAttribute,\n  IFillStyle,\n  IGlyphGraphicAttribute,\n  IGroupGraphicAttribute,\n  IImageGraphicAttribute,\n  ILineGraphicAttribute,\n  IPathGraphicAttribute,\n  IPolygonGraphicAttribute,\n  IRect3dGraphicAttribute,\n  IRectGraphicAttribute,\n  IStrokeStyle,\n  IGraphicStyle,\n  ISymbolGraphicAttribute,\n  ITextAttribute,\n  ITextGraphicAttribute,\n  IRichTextGraphicAttribute,\n  ITransform,\n  RichTextWordBreak,\n  RichTextVerticalDirection,\n  RichTextGlobalAlignType,\n  RichTextGlobalBaselineType,\n  IRichTextIconGraphicAttribute\n} from '../interface';\n\nexport const DefaultTransform: ITransform = {\n  x: 0,\n  y: 0,\n  z: 0,\n  dx: 0,\n  dy: 0,\n  dz: 0,\n  scrollX: 0,\n  scrollY: 0,\n  scaleX: 1,\n  scaleY: 1,\n  scaleZ: 1,\n  angle: 0,\n  alpha: 0,\n  beta: 0,\n  anchor: [0, 0],\n  anchor3d: [0, 0],\n  postMatrix: new Matrix()\n};\n\nexport const DefaultFillStyle: IFillStyle = {\n  fillColor: 'black',\n  fillOpacity: 1,\n  fill: null,\n  shadowBlur: 0,\n  shadowColor: 'black',\n  shadowOffsetX: 0,\n  shadowOffsetY: 0\n};\n\nconst commonStroke: Omit<IStrokeStyle, 'outerBorder' | 'innerBorder'> = {\n  strokeColor: 'black',\n  strokeOpacity: 1,\n  lineDash: [],\n  lineDashOffset: 0,\n  lineWidth: 1,\n  lineCap: 'butt',\n  lineJoin: 'miter',\n  miterLimit: 10,\n  strokeBoundsBuffer: 2,\n  stroke: null\n};\n\nexport const DefaultStrokeStyle: IStrokeStyle = {\n  outerBorder: { ...commonStroke, distance: 0 },\n  innerBorder: { ...commonStroke, distance: 0 },\n  ...commonStroke\n};\n\nexport const DefaultTextStyle: Required<ITextAttribute> = {\n  text: '',\n  maxLineWidth: Infinity,\n  textAlign: 'left',\n  textBaseline: 'alphabetic',\n  fontSize: 16,\n  // @ts-ignore\n  fontFamily: `PingFang SC,Microsoft Yahei,system-ui,-apple-system,segoe ui,\n    Roboto,Helvetica,Arial,sans-serif, apple color emoji,segoe ui emoji,segoe ui symbol`,\n  fontWeight: '',\n  ellipsis: '…',\n  fontVariant: '',\n  fontStyle: '',\n  lineHeight: 16,\n  underline: 0,\n  lineThrough: 0\n};\n\nexport const DefaultStyle: IGraphicStyle = {\n  opacity: 1,\n  background: null,\n  texture: null,\n  textureColor: 'black',\n  textureSize: 10,\n  texturePadding: 2,\n  backgroundMode: 0,\n  blur: 0,\n  cursor: null,\n  ...DefaultFillStyle,\n  ...DefaultStrokeStyle\n};\n\nexport const DefaultAttribute: Required<IGraphicAttribute> = {\n  strokeSeg: null,\n  pickable: true,\n  childrenPickable: true,\n  visible: true,\n  zIndex: 0,\n  layout: null,\n  boundsPadding: 0,\n  pickMode: 'accurate',\n  customPickShape: null,\n  boundsMode: 'accurate',\n  keepDirIn3d: true,\n  ...DefaultStyle,\n  ...DefaultTransform\n};\n\nexport function addAttributeToPrototype(obj: Record<string, any>, c: any, keys: string[]) {\n  keys.forEach(key => {\n    c.prototype[key] = obj[key];\n  });\n}\nexport function rewriteProto(obj: Record<string, any>, c: Record<string, any>) {\n  Object.setPrototypeOf(obj, c);\n}\n\nexport const DefaultArcAttribute: Required<IArcGraphicAttribute> = {\n  ...DefaultAttribute,\n  startAngle: 0,\n  endAngle: pi2,\n  innerRadius: 0,\n  outerRadius: 1,\n  cornerRadius: 0,\n  padRadius: 0,\n  padAngle: 0,\n  cap: false,\n  forceShowCap: false\n};\n\nexport const DefaultAreaAttribute: Required<IAreaGraphicAttribute> = {\n  ...DefaultAttribute,\n  points: [],\n  segments: [],\n  curveType: 'linear',\n  clipRange: 1\n};\n\nexport const DefaultCircleAttribute: Required<ICircleGraphicAttribute> = {\n  ...DefaultAttribute,\n  radius: 1,\n  startAngle: 0,\n  endAngle: pi2\n};\n\nexport const DefaultGroupAttribute: Required<IGroupGraphicAttribute> = {\n  ...DefaultAttribute,\n  width: 0,\n  height: 0,\n  borderRadius: 0,\n  path: [],\n  clip: false,\n  visibleAll: true\n};\n\nexport const DefaultGlyphAttribute: Required<IGlyphGraphicAttribute> = {\n  ...DefaultAttribute,\n  path: '',\n  width: 0,\n  height: 0,\n  borderRadius: 0,\n  clip: false\n};\n\nexport const DefaultLineAttribute: Required<ILineGraphicAttribute> = {\n  ...DefaultAttribute,\n  points: [],\n  segments: [],\n  curveType: 'linear',\n  clipRange: 1,\n  clipRangeByDimension: 'default'\n};\n\nexport const DefaultPathAttribute: Required<IPathGraphicAttribute> = {\n  ...DefaultAttribute,\n  path: new CustomPath2D(),\n  customPath: () => {\n    console.warn('空函数');\n  }\n};\n\nexport const DefaultPolygonAttribute: Required<IPolygonGraphicAttribute> = {\n  ...DefaultAttribute,\n  points: [],\n  borderRadius: 0\n};\n\nexport const DefaultRectAttribute: Required<IRectGraphicAttribute> = {\n  ...DefaultAttribute,\n  width: 0,\n  height: 0,\n  borderRadius: 0\n};\n\nexport const DefaultRect3dAttribute: Required<IRect3dGraphicAttribute> = {\n  ...DefaultAttribute,\n  width: 0,\n  height: 0,\n  borderRadius: 0,\n  length: 0\n};\n\nexport const DefaultSymbolAttribute: Required<ISymbolGraphicAttribute> = {\n  ...DefaultAttribute,\n  symbolType: 'circle',\n  size: 10, // 外接**正方形**的边长\n  keepDirIn3d: true\n};\n\nexport const DefaultTextAttribute: Required<ITextGraphicAttribute> = {\n  ...DefaultAttribute,\n  ...DefaultTextStyle,\n  strokeBoundsBuffer: 0,\n  keepDirIn3d: true\n};\n\nexport const DefaultRichTextAttribute: Required<IRichTextGraphicAttribute> = {\n  ...DefaultAttribute,\n  width: 300,\n  height: 300,\n  ellipsis: true,\n  wordBreak: 'break-word' as RichTextWordBreak,\n  verticalDirection: 'top' as RichTextVerticalDirection,\n  textAlign: 'left' as RichTextGlobalAlignType,\n  textBaseline: 'top' as RichTextGlobalBaselineType,\n  layoutDirection: 'horizontal',\n  textConfig: [],\n  maxHeight: undefined,\n  maxWidth: undefined,\n  singleLine: false\n};\n\nexport const DefaultImageAttribute: Required<IImageGraphicAttribute> = {\n  repeatX: 'stretch',\n  repeatY: 'stretch',\n  image: '',\n  width: 0,\n  height: 0,\n  ...DefaultAttribute,\n  fill: true\n};\n\nexport const DefaultRichTextIconAttribute: Required<IRichTextIconGraphicAttribute> = {\n  ...DefaultImageAttribute,\n  backgroundShowMode: 'never',\n  backgroundWidth: 0,\n  backgroundHeight: 0,\n  textAlign: 'left',\n  textBaseline: 'middle',\n  direction: 'horizontal',\n  margin: 0,\n  id: '',\n\n  width: 20,\n  height: 20,\n  backgroundFill: true,\n  backgroundFillColor: 'rgba(101, 117, 168, 0.1)',\n  backgroundFillOpacity: 1,\n  backgroundStroke: false,\n  backgroundStrokeColor: '#000',\n  backgroundStrokeOpacity: 1,\n  backgroundRadius: 4,\n  opacity: 1\n};\n"]}
+{"version":3,"sources":["../../src/graphic/config.ts"],"names":[],"mappings":"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","file":"config.js","sourcesContent":["// 存放公共属性\nimport { Matrix, pi2 } from '@visactor/vutils';\nimport { CustomPath2D } from '../common/custom-path2d';\nimport {\n  IArcGraphicAttribute,\n  IAreaGraphicAttribute,\n  IGraphicAttribute,\n  ICircleGraphicAttribute,\n  IFillStyle,\n  IGlyphGraphicAttribute,\n  IGroupGraphicAttribute,\n  IImageGraphicAttribute,\n  ILineGraphicAttribute,\n  IPathGraphicAttribute,\n  IPolygonGraphicAttribute,\n  IRect3dGraphicAttribute,\n  IRectGraphicAttribute,\n  IStrokeStyle,\n  IGraphicStyle,\n  ISymbolGraphicAttribute,\n  ITextAttribute,\n  ITextGraphicAttribute,\n  IRichTextGraphicAttribute,\n  ITransform,\n  RichTextWordBreak,\n  RichTextVerticalDirection,\n  RichTextGlobalAlignType,\n  RichTextGlobalBaselineType,\n  IRichTextIconGraphicAttribute\n} from '../interface';\n\nexport const DefaultTransform: ITransform = {\n  x: 0,\n  y: 0,\n  z: 0,\n  dx: 0,\n  dy: 0,\n  dz: 0,\n  scrollX: 0,\n  scrollY: 0,\n  scaleX: 1,\n  scaleY: 1,\n  scaleZ: 1,\n  angle: 0,\n  alpha: 0,\n  beta: 0,\n  anchor: [0, 0],\n  anchor3d: [0, 0],\n  postMatrix: new Matrix()\n};\n\nexport const DefaultFillStyle: IFillStyle = {\n  fillOpacity: 1,\n  fill: false,\n  shadowBlur: 0,\n  shadowColor: 'black',\n  shadowOffsetX: 0,\n  shadowOffsetY: 0\n};\n\nconst commonStroke: Omit<IStrokeStyle, 'outerBorder' | 'innerBorder'> = {\n  strokeOpacity: 1,\n  lineDash: [],\n  lineDashOffset: 0,\n  lineWidth: 1,\n  lineCap: 'butt',\n  lineJoin: 'miter',\n  miterLimit: 10,\n  strokeBoundsBuffer: 2,\n  stroke: false\n};\n\nexport const DefaultStrokeStyle: IStrokeStyle = {\n  outerBorder: { ...commonStroke, distance: 0 },\n  innerBorder: { ...commonStroke, distance: 0 },\n  ...commonStroke\n};\n\nexport const DefaultTextStyle: Required<ITextAttribute> = {\n  text: '',\n  maxLineWidth: Infinity,\n  textAlign: 'left',\n  textBaseline: 'alphabetic',\n  fontSize: 16,\n  // @ts-ignore\n  fontFamily: `PingFang SC,Microsoft Yahei,system-ui,-apple-system,segoe ui,\n    Roboto,Helvetica,Arial,sans-serif, apple color emoji,segoe ui emoji,segoe ui symbol`,\n  fontWeight: '',\n  ellipsis: '…',\n  fontVariant: '',\n  fontStyle: '',\n  lineHeight: 16,\n  underline: 0,\n  lineThrough: 0\n};\n\nexport const DefaultStyle: IGraphicStyle = {\n  opacity: 1,\n  background: null,\n  texture: null,\n  textureColor: 'black',\n  textureSize: 10,\n  texturePadding: 2,\n  backgroundMode: 0,\n  blur: 0,\n  cursor: null,\n  ...DefaultFillStyle,\n  ...DefaultStrokeStyle\n};\n\nexport const DefaultAttribute: Required<IGraphicAttribute> = {\n  strokeSeg: null,\n  pickable: true,\n  childrenPickable: true,\n  visible: true,\n  zIndex: 0,\n  layout: null,\n  boundsPadding: 0,\n  pickMode: 'accurate',\n  customPickShape: null,\n  boundsMode: 'accurate',\n  keepDirIn3d: true,\n  ...DefaultStyle,\n  ...DefaultTransform\n};\n\nexport function addAttributeToPrototype(obj: Record<string, any>, c: any, keys: string[]) {\n  keys.forEach(key => {\n    c.prototype[key] = obj[key];\n  });\n}\nexport function rewriteProto(obj: Record<string, any>, c: Record<string, any>) {\n  Object.setPrototypeOf(obj, c);\n}\n\nexport const DefaultArcAttribute: Required<IArcGraphicAttribute> = {\n  ...DefaultAttribute,\n  startAngle: 0,\n  endAngle: pi2,\n  innerRadius: 0,\n  outerRadius: 1,\n  cornerRadius: 0,\n  padRadius: 0,\n  padAngle: 0,\n  cap: false,\n  forceShowCap: false\n};\n\nexport const DefaultAreaAttribute: Required<IAreaGraphicAttribute> = {\n  ...DefaultAttribute,\n  points: [],\n  segments: [],\n  curveType: 'linear',\n  clipRange: 1\n};\n\nexport const DefaultCircleAttribute: Required<ICircleGraphicAttribute> = {\n  ...DefaultAttribute,\n  radius: 1,\n  startAngle: 0,\n  endAngle: pi2\n};\n\nexport const DefaultGroupAttribute: Required<IGroupGraphicAttribute> = {\n  ...DefaultAttribute,\n  width: 0,\n  height: 0,\n  borderRadius: 0,\n  path: [],\n  clip: false,\n  visibleAll: true\n};\n\nexport const DefaultGlyphAttribute: Required<IGlyphGraphicAttribute> = {\n  ...DefaultAttribute,\n  path: '',\n  width: 0,\n  height: 0,\n  borderRadius: 0,\n  clip: false\n};\n\nexport const DefaultLineAttribute: Required<ILineGraphicAttribute> = {\n  ...DefaultAttribute,\n  points: [],\n  segments: [],\n  curveType: 'linear',\n  clipRange: 1,\n  clipRangeByDimension: 'default'\n};\n\nexport const DefaultPathAttribute: Required<IPathGraphicAttribute> = {\n  ...DefaultAttribute,\n  path: new CustomPath2D(),\n  customPath: () => {\n    console.warn('空函数');\n  }\n};\n\nexport const DefaultPolygonAttribute: Required<IPolygonGraphicAttribute> = {\n  ...DefaultAttribute,\n  points: [],\n  borderRadius: 0\n};\n\nexport const DefaultRectAttribute: Required<IRectGraphicAttribute> = {\n  ...DefaultAttribute,\n  width: 0,\n  height: 0,\n  borderRadius: 0\n};\n\nexport const DefaultRect3dAttribute: Required<IRect3dGraphicAttribute> = {\n  ...DefaultAttribute,\n  width: 0,\n  height: 0,\n  borderRadius: 0,\n  length: 0\n};\n\nexport const DefaultSymbolAttribute: Required<ISymbolGraphicAttribute> = {\n  ...DefaultAttribute,\n  symbolType: 'circle',\n  size: 10, // 外接**正方形**的边长\n  keepDirIn3d: true\n};\n\nexport const DefaultTextAttribute: Required<ITextGraphicAttribute> = {\n  ...DefaultAttribute,\n  ...DefaultTextStyle,\n  strokeBoundsBuffer: 0,\n  keepDirIn3d: true\n};\n\nexport const DefaultRichTextAttribute: Required<IRichTextGraphicAttribute> = {\n  ...DefaultAttribute,\n  width: 300,\n  height: 300,\n  ellipsis: true,\n  wordBreak: 'break-word' as RichTextWordBreak,\n  verticalDirection: 'top' as RichTextVerticalDirection,\n  textAlign: 'left' as RichTextGlobalAlignType,\n  textBaseline: 'top' as RichTextGlobalBaselineType,\n  layoutDirection: 'horizontal',\n  textConfig: [],\n  maxHeight: undefined,\n  maxWidth: undefined,\n  singleLine: false\n};\n\nexport const DefaultImageAttribute: Required<IImageGraphicAttribute> = {\n  repeatX: 'stretch',\n  repeatY: 'stretch',\n  image: '',\n  width: 0,\n  height: 0,\n  ...DefaultAttribute,\n  fill: true\n};\n\nexport const DefaultRichTextIconAttribute: Required<IRichTextIconGraphicAttribute> = {\n  ...DefaultImageAttribute,\n  backgroundShowMode: 'never',\n  backgroundWidth: 0,\n  backgroundHeight: 0,\n  textAlign: 'left',\n  textBaseline: 'middle',\n  direction: 'horizontal',\n  margin: 0,\n  id: '',\n\n  width: 20,\n  height: 20,\n  backgroundFill: true,\n  backgroundFillColor: 'rgba(101, 117, 168, 0.1)',\n  backgroundFillOpacity: 1,\n  backgroundStroke: false,\n  backgroundStrokeColor: '#000',\n  backgroundStrokeOpacity: 1,\n  backgroundRadius: 4,\n  opacity: 1\n};\n"]}

package/{cjs/graphic/constant.d.ts → es/graphic/constants.d.ts}

@@ -1,4 +1,3 @@
-export declare function genNumberType(): number;
 export declare const ARC_NUMBER_TYPE: number;
 export declare const ARC3D_NUMBER_TYPE: number;
 export declare const AREA_NUMBER_TYPE: number;
@@ -15,3 +14,5 @@ export declare const RECT3D_NUMBER_TYPE: number;
 export declare const RICHTEXT_NUMBER_TYPE: number;
 export declare const SYMBOL_NUMBER_TYPE: number;
 export declare const TEXT_NUMBER_TYPE: number;
+export declare const GraphicService: unique symbol;
+export declare const GraphicCreator: unique symbol;

package/es/graphic/{constant.js → constants.js}

@@ -1,8 +1,4 @@
-let NUMBER_TYPE = 0;
-
-export function genNumberType() {
-    return NUMBER_TYPE++;
-}
+import { genNumberType } from "./tools";
 
 export const ARC_NUMBER_TYPE = genNumberType();
 
@@ -35,4 +31,8 @@ export const RICHTEXT_NUMBER_TYPE = genNumberType();
 export const SYMBOL_NUMBER_TYPE = genNumberType();
 
 export const TEXT_NUMBER_TYPE = genNumberType();
-//# sourceMappingURL=constant.js.map
+
+export const GraphicService = Symbol.for("GraphicService");
+
+export const GraphicCreator = Symbol.for("GraphicCreator");
+//# sourceMappingURL=constants.js.map

package/es/graphic/constants.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/graphic/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,MAAM,CAAC,MAAM,eAAe,GAAG,aAAa,EAAE,CAAC;AAC/C,MAAM,CAAC,MAAM,iBAAiB,GAAG,aAAa,EAAE,CAAC;AACjD,MAAM,CAAC,MAAM,gBAAgB,GAAG,aAAa,EAAE,CAAC;AAChD,MAAM,CAAC,MAAM,kBAAkB,GAAG,aAAa,EAAE,CAAC;AAClD,MAAM,CAAC,MAAM,iBAAiB,GAAG,aAAa,EAAE,CAAC;AACjD,MAAM,CAAC,MAAM,iBAAiB,GAAG,aAAa,EAAE,CAAC;AACjD,MAAM,CAAC,MAAM,iBAAiB,GAAG,aAAa,EAAE,CAAC;AACjD,MAAM,CAAC,MAAM,gBAAgB,GAAG,aAAa,EAAE,CAAC;AAChD,MAAM,CAAC,MAAM,gBAAgB,GAAG,aAAa,EAAE,CAAC;AAChD,MAAM,CAAC,MAAM,mBAAmB,GAAG,aAAa,EAAE,CAAC;AACnD,MAAM,CAAC,MAAM,qBAAqB,GAAG,aAAa,EAAE,CAAC;AACrD,MAAM,CAAC,MAAM,gBAAgB,GAAG,aAAa,EAAE,CAAC;AAChD,MAAM,CAAC,MAAM,kBAAkB,GAAG,aAAa,EAAE,CAAC;AAClD,MAAM,CAAC,MAAM,oBAAoB,GAAG,aAAa,EAAE,CAAC;AACpD,MAAM,CAAC,MAAM,kBAAkB,GAAG,aAAa,EAAE,CAAC;AAClD,MAAM,CAAC,MAAM,gBAAgB,GAAG,aAAa,EAAE,CAAC;AAEhD,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;AAC3D,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC","file":"constants.js","sourcesContent":["import { genNumberType } from './tools';\n\nexport const ARC_NUMBER_TYPE = genNumberType();\nexport const ARC3D_NUMBER_TYPE = genNumberType();\nexport const AREA_NUMBER_TYPE = genNumberType();\nexport const CIRCLE_NUMBER_TYPE = genNumberType();\nexport const GLYPH_NUMBER_TYPE = genNumberType();\nexport const GROUP_NUMBER_TYPE = genNumberType();\nexport const IMAGE_NUMBER_TYPE = genNumberType();\nexport const LINE_NUMBER_TYPE = genNumberType();\nexport const PATH_NUMBER_TYPE = genNumberType();\nexport const POLYGON_NUMBER_TYPE = genNumberType();\nexport const PYRAMID3D_NUMBER_TYPE = genNumberType();\nexport const RECT_NUMBER_TYPE = genNumberType();\nexport const RECT3D_NUMBER_TYPE = genNumberType();\nexport const RICHTEXT_NUMBER_TYPE = genNumberType();\nexport const SYMBOL_NUMBER_TYPE = genNumberType();\nexport const TEXT_NUMBER_TYPE = genNumberType();\n\nexport const GraphicService = Symbol.for('GraphicService');\nexport const GraphicCreator = Symbol.for('GraphicCreator');\n"]}

package/es/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/es/graphic/glyph.js

@@ -1,10 +1,10 @@
-import { Graphic, genNumberType } from "./graphic";
+import { Graphic } from "./graphic";
 
 import { getTheme } from "./theme";
 
-import { graphicService } from "../modules";
+import { application } from "../application";
 
-export const GLYPH_NUMBER_TYPE = genNumberType();
+import { GLYPH_NUMBER_TYPE } from "./constants";
 
 export class Glyph extends Graphic {
     constructor(params) {
@@ -75,7 +75,7 @@ export class Glyph extends Graphic {
     }
     doUpdateAABBBounds() {
         this._AABBBounds.setValue(1 / 0, 1 / 0, -1 / 0, -1 / 0);
-        const bounds = graphicService.updateGlyphAABBBounds(this.attribute, getTheme(this).glyph, this._AABBBounds, this);
+        const bounds = application.graphicService.updateGlyphAABBBounds(this.attribute, getTheme(this).glyph, this._AABBBounds, this);
         return this.clearUpdateBoundTag(), bounds;
     }
     tryUpdateOBBBounds() {

package/es/graphic/glyph.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/graphic/glyph.ts"],"names":[],"mappings":"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","file":"glyph.js","sourcesContent":["import { 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/es/graphic/graphic-service/graphic-module.js

@@ -1,12 +1,12 @@
 import { ContainerModule } from "inversify";
 
-import { bindContributionProvider } from "../../common";
+import { bindContributionProvider } from "../../common/contribution-provider";
 
 import { ArcBoundsContribution, DefaultArcOuterBorderBoundsContribution } from "./arc-contribution";
 
 import { CircleBoundsContribution, DefaultCircleOuterBorderBoundsContribution } from "./circle-contribution";
 
-import { DefaultGraphicService, GraphicService } from "./graphic-service";
+import { DefaultGraphicService } from "./graphic-service";
 
 import { DefaultPathOuterBorderBoundsContribution, PathBoundsContribution } from "./path-contribution";
 
@@ -14,6 +14,10 @@ import { RectBoundsContribution, DefaultRectOuterBorderBoundsContribution } from
 
 import { DefaultSymbolOuterBorderBoundsContribution, SymbolBoundsContribution } from "./symbol-contribution";
 
+import { GraphicCreator, GraphicService } from "../constants";
+
+import { graphicCreator } from "../graphic-creator";
+
 export default new ContainerModule((bind => {
     bind(DefaultGraphicService).toSelf().inSingletonScope(), bind(GraphicService).toService(DefaultGraphicService), 
     bind(DefaultRectOuterBorderBoundsContribution).toSelf().inSingletonScope(), bind(RectBoundsContribution).toService(DefaultRectOuterBorderBoundsContribution), 
@@ -25,6 +29,6 @@ export default new ContainerModule((bind => {
     bind(ArcBoundsContribution).toService(DefaultArcOuterBorderBoundsContribution), 
     bindContributionProvider(bind, ArcBoundsContribution), bind(DefaultPathOuterBorderBoundsContribution).toSelf().inSingletonScope(), 
     bind(PathBoundsContribution).toService(DefaultPathOuterBorderBoundsContribution), 
-    bindContributionProvider(bind, PathBoundsContribution);
+    bindContributionProvider(bind, PathBoundsContribution), bind(GraphicCreator).toConstantValue(graphicCreator);
 }));
 //# sourceMappingURL=graphic-module.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/graphic/graphic-service/graphic-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,uCAAuC,EAAE,MAAM,oBAAoB,CAAC;AACpG,OAAO,EAAE,wBAAwB,EAAE,0CAA0C,EAAE,MAAM,uBAAuB,CAAC;AAE7G,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,EAAE,wCAAwC,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AACvG,OAAO,EAAE,sBAAsB,EAAE,wCAAwC,EAAE,MAAM,qBAAqB,CAAC;AACvG,OAAO,EAAE,0CAA0C,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAG7G,eAAe,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE;IACxC,IAAI,CAAC,qBAAqB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACxD,IAAI,CAAC,cAAc,CAAC,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC;IAGtD,IAAI,CAAC,wCAAwC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC3E,IAAI,CAAC,sBAAsB,CAAC,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAC;IACjF,wBAAwB,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;IAGvD,IAAI,CAAC,0CAA0C,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC7E,IAAI,CAAC,wBAAwB,CAAC,CAAC,SAAS,CAAC,0CAA0C,CAAC,CAAC;IACrF,wBAAwB,CAAC,IAAI,EAAE,wBAAwB,CAAC,CAAC;IAGzD,IAAI,CAAC,0CAA0C,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC7E,IAAI,CAAC,wBAAwB,CAAC,CAAC,SAAS,CAAC,0CAA0C,CAAC,CAAC;IACrF,wBAAwB,CAAC,IAAI,EAAE,wBAAwB,CAAC,CAAC;IAGzD,IAAI,CAAC,uCAAuC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1E,IAAI,CAAC,qBAAqB,CAAC,CAAC,SAAS,CAAC,uCAAuC,CAAC,CAAC;IAC/E,wBAAwB,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;IAGtD,IAAI,CAAC,wCAAwC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC3E,IAAI,CAAC,sBAAsB,CAAC,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAC;IACjF,wBAAwB,CAAC,IAAI,EAAE,sBAAsB,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,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,wBAAwB,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,EAAE,qBAAqB,EAAE,uCAAuC,EAAE,MAAM,oBAAoB,CAAC;AACpG,OAAO,EAAE,wBAAwB,EAAE,0CAA0C,EAAE,MAAM,uBAAuB,CAAC;AAE7G,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,wCAAwC,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AACvG,OAAO,EAAE,sBAAsB,EAAE,wCAAwC,EAAE,MAAM,qBAAqB,CAAC;AACvG,OAAO,EAAE,0CAA0C,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAC7G,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGpD,eAAe,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE;IACxC,IAAI,CAAC,qBAAqB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACxD,IAAI,CAAC,cAAc,CAAC,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC;IAGtD,IAAI,CAAC,wCAAwC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC3E,IAAI,CAAC,sBAAsB,CAAC,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAC;IACjF,wBAAwB,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;IAGvD,IAAI,CAAC,0CAA0C,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC7E,IAAI,CAAC,wBAAwB,CAAC,CAAC,SAAS,CAAC,0CAA0C,CAAC,CAAC;IACrF,wBAAwB,CAAC,IAAI,EAAE,wBAAwB,CAAC,CAAC;IAGzD,IAAI,CAAC,0CAA0C,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC7E,IAAI,CAAC,wBAAwB,CAAC,CAAC,SAAS,CAAC,0CAA0C,CAAC,CAAC;IACrF,wBAAwB,CAAC,IAAI,EAAE,wBAAwB,CAAC,CAAC;IAGzD,IAAI,CAAC,uCAAuC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1E,IAAI,CAAC,qBAAqB,CAAC,CAAC,SAAS,CAAC,uCAAuC,CAAC,CAAC;IAC/E,wBAAwB,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;IAGtD,IAAI,CAAC,wCAAwC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC3E,IAAI,CAAC,sBAAsB,CAAC,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAC;IACjF,wBAAwB,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;IAEvD,IAAI,CAAC,cAAc,CAAC,CAAC,eAAe,CAAC,cAAc,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/es/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/es/graphic/graphic-service/graphic-service.js

@@ -16,11 +16,9 @@ import { AABBBounds, epsilon, isArray, pi2, transformBoundsWithMatrix } from "@v
 
 import { SyncHook } from "../../tapable";
 
-import { graphicCreator } from "../graphic-creator";
-
 import { RectBoundsContribution } from "./rect-contribution";
 
-import { BoundsContext, circleBounds, ContributionProvider, renderCommandList, textDrawOffsetX } from "../../common";
+import { textDrawOffsetX } from "../../common/text";
 
 import { SymbolBoundsContribution } from "./symbol-contribution";
 
@@ -32,7 +30,17 @@ import { ArcBoundsContribution } from "./arc-contribution";
 
 import { PathBoundsContribution } from "./path-contribution";
 
-import { mat4Allocate } from "../../modules";
+import { mat4Allocate } from "../../allocator/matrix-allocate";
+
+import { ContributionProvider } from "../../common/contribution-provider";
+
+import { BoundsContext } from "../../common/bounds-context";
+
+import { renderCommandList } from "../../common/render-command-list";
+
+import { circleBounds } from "../../common/utils";
+
+import { GraphicCreator } from "../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, 
@@ -187,13 +195,11 @@ export function shouldUseMat4(graphic) {
     return alpha || beta;
 }
 
-export const GraphicService = Symbol.for("GraphicService");
-
 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 = 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 SyncHook([ "graphic" ]),
             onSetStage: new SyncHook([ "graphic", "stage" ]),
@@ -241,19 +247,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) {
@@ -300,8 +305,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;
@@ -309,8 +314,8 @@ 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), 
-        transformBoundsWithMatrix(aabbBounds, aabbBounds, graphic.transMatrix), aabbBounds;
+        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), transformBoundsWithMatrix(aabbBounds, aabbBounds, graphic.transMatrix), 
+        aabbBounds;
     }
     updatePathAABBBounds(attribute, pathTheme, aabbBounds, graphic) {
         this.updatePathProxyAABBBounds(aabbBounds, graphic) || this.updatePathAABBBoundsImprecise(attribute, pathTheme, aabbBounds, graphic);
@@ -319,8 +324,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;
@@ -337,8 +341,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;
@@ -348,15 +352,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;
@@ -368,8 +372,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;
@@ -389,8 +393,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;
@@ -415,8 +419,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;
@@ -434,8 +437,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;
@@ -475,8 +477,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) {
@@ -485,7 +487,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);
             boundStroke(tb1, scaledHalfLineWidth, "miter" === lineJoin, strokeBoundsBuffer), 
@@ -500,7 +502,7 @@ let DefaultGraphicService = class {
     }
 };
 
-DefaultGraphicService = __decorate([ injectable(), __param(0, inject(ContributionProvider)), __param(0, named(RectBoundsContribution)), __param(1, inject(ContributionProvider)), __param(1, named(SymbolBoundsContribution)), __param(2, inject(ContributionProvider)), __param(2, named(CircleBoundsContribution)), __param(3, inject(ContributionProvider)), __param(3, named(ArcBoundsContribution)), __param(4, inject(ContributionProvider)), __param(4, named(PathBoundsContribution)), __metadata("design:paramtypes", [ Object, Object, Object, Object, Object ]) ], DefaultGraphicService);
+DefaultGraphicService = __decorate([ injectable(), __param(0, inject(GraphicCreator)), __param(1, inject(ContributionProvider)), __param(1, named(RectBoundsContribution)), __param(2, inject(ContributionProvider)), __param(2, named(SymbolBoundsContribution)), __param(3, inject(ContributionProvider)), __param(3, named(CircleBoundsContribution)), __param(4, inject(ContributionProvider)), __param(4, named(ArcBoundsContribution)), __param(5, inject(ContributionProvider)), __param(5, named(PathBoundsContribution)), __metadata("design:paramtypes", [ Object, Object, Object, Object, Object, Object ]) ], DefaultGraphicService);
 
 export { DefaultGraphicService };
 //# sourceMappingURL=graphic-service.js.map