@visactor/vrender-core 0.17.0-alpha.7 → 0.17.0

package/es/graphic/graphic-service/area-contribution.js

@@ -1,2 +1,3 @@
-export const AreaBoundsContribution = Symbol.for("AreaBoundsContribution");
+
+
 //# sourceMappingURL=area-contribution.js.map

package/es/graphic/graphic-service/area-contribution.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graphic/graphic-service/area-contribution.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,sBAAsB,GAAG,MAAM,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC","file":"area-contribution.js","sourcesContent":["export const AreaBoundsContribution = Symbol.for('AreaBoundsContribution');\n\n// @injectable()\n// export class DefaultArcOuterBorderBoundsContribution\n//   extends DefaultOuterBorderBoundsContribution\n//   implements IArcBoundsContribution {}\n"]}
+{"version":3,"sources":["../src/graphic/graphic-service/area-contribution.ts"],"names":[],"mappings":"","file":"area-contribution.js","sourcesContent":["// export const AreaBoundsContribution = Symbol.for('AreaBoundsContribution');\n\n// // @injectable()\n// // export class DefaultArcOuterBorderBoundsContribution\n// //   extends DefaultOuterBorderBoundsContribution\n// //   implements IArcBoundsContribution {}\n"]}

package/es/graphic/graphic-service/circle-contribution.d.ts

@@ -1,5 +1 @@
-import type { ICircleBoundsContribution } from '../../interface';
-import { DefaultOuterBorderBoundsContribution } from './common-contribution';
-export declare const CircleBoundsContribution: unique symbol;
-export declare class DefaultCircleOuterBorderBoundsContribution extends DefaultOuterBorderBoundsContribution implements ICircleBoundsContribution {
-}
+

package/es/graphic/graphic-service/circle-contribution.js

@@ -1,18 +1,3 @@
-var __decorate = this && this.__decorate || function(decorators, target, key, desc) {
-    var d, c = arguments.length, r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
-    if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc); else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
 
-import { injectable } from "../../common/inversify-lite";
 
-import { DefaultOuterBorderBoundsContribution } from "./common-contribution";
-
-export const CircleBoundsContribution = Symbol.for("CircleBoundsContribution");
-
-let DefaultCircleOuterBorderBoundsContribution = class extends DefaultOuterBorderBoundsContribution {};
-
-DefaultCircleOuterBorderBoundsContribution = __decorate([ injectable() ], DefaultCircleOuterBorderBoundsContribution);
-
-export { DefaultCircleOuterBorderBoundsContribution };
 //# sourceMappingURL=circle-contribution.js.map

package/es/graphic/graphic-service/circle-contribution.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graphic/graphic-service/circle-contribution.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAEzD,OAAO,EAAE,oCAAoC,EAAE,MAAM,uBAAuB,CAAC;AAE7E,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;AAGxE,IAAM,0CAA0C,GAAhD,MAAM,0CACX,SAAQ,oCAAoC;CACL,CAAA;AAF5B,0CAA0C;IADtD,UAAU,EAAE;GACA,0CAA0C,CAEd;SAF5B,0CAA0C","file":"circle-contribution.js","sourcesContent":["import { injectable } from '../../common/inversify-lite';\nimport type { ICircleBoundsContribution } from '../../interface';\nimport { DefaultOuterBorderBoundsContribution } from './common-contribution';\n\nexport const CircleBoundsContribution = Symbol.for('CircleBoundsContribution');\n\n@injectable()\nexport class DefaultCircleOuterBorderBoundsContribution\n  extends DefaultOuterBorderBoundsContribution\n  implements ICircleBoundsContribution {}\n"]}
+{"version":3,"sources":["../src/graphic/graphic-service/circle-contribution.ts"],"names":[],"mappings":"","file":"circle-contribution.js","sourcesContent":["// import { injectable } from '../../common/inversify-lite';\n// import type { ICircleBoundsContribution } from '../../interface';\n// import { DefaultOuterBorderBoundsContribution } from './common-contribution';\n\n// export const CircleBoundsContribution = Symbol.for('CircleBoundsContribution');\n\n// @injectable()\n// export class DefaultCircleOuterBorderBoundsContribution\n//   extends DefaultOuterBorderBoundsContribution\n//   implements ICircleBoundsContribution {}\n"]}

package/es/graphic/graphic-service/common-contribution.js

@@ -1,12 +1,4 @@
-var __decorate = this && this.__decorate || function(decorators, target, key, desc) {
-    var d, c = arguments.length, r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
-    if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc); else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-
-import { injectable } from "../../common/inversify-lite";
-
-let DefaultOuterBorderBoundsContribution = class {
+export class DefaultOuterBorderBoundsContribution {
     updateBounds(attribute, theme, aabbBounds, graphic) {
         const {outerBorder: outerBorder, shadowBlur: shadowBlur = theme.shadowBlur} = attribute;
         if (outerBorder) {
@@ -15,9 +7,5 @@ let DefaultOuterBorderBoundsContribution = class {
         }
         return aabbBounds;
     }
-};
-
-DefaultOuterBorderBoundsContribution = __decorate([ injectable() ], DefaultOuterBorderBoundsContribution);
-
-export { DefaultOuterBorderBoundsContribution };
+}
 //# sourceMappingURL=common-contribution.js.map

package/es/graphic/graphic-service/common-contribution.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graphic/graphic-service/common-contribution.ts"],"names":[],"mappings":";;;;;;AACA,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAIlD,IAAM,oCAAoC,GAA1C,MAAM,oCAAoC;IAC/C,YAAY,CACV,SAAqC,EACrC,KAAkC,EAClC,UAAuB,EACvB,OAAkB;QAElB,MAAM,EAAE,WAAW,EAAE,UAAU,GAAG,KAAK,CAAC,UAAU,EAAE,GAAG,SAAS,CAAC;QACjE,IAAI,WAAW,EAAE;YACf,MAAM,kBAAkB,GAAG,KAAK,CAAC,WAAW,CAAC;YAC7C,MAAM,EAAE,QAAQ,GAAG,kBAAkB,CAAC,QAAQ,EAAE,SAAS,GAAG,kBAAkB,CAAC,SAAS,EAAE,GAAG,WAAW,CAAC;YAGzG,UAAU,CAAC,MAAM,CAAE,QAAmB,GAAG,CAAC,UAAU,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;SACxE;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;CACF,CAAA;AAjBY,oCAAoC;IADhD,UAAU,EAAE;GACA,oCAAoC,CAiBhD;SAjBY,oCAAoC","file":"common-contribution.js","sourcesContent":["import type { IAABBBounds } from '@visactor/vutils';\nimport { injectable } from '../../common/inversify-lite';\nimport type { IGraphicAttribute, IGraphic } from '../../interface';\n\n@injectable()\nexport class DefaultOuterBorderBoundsContribution {\n  updateBounds(\n    attribute: Partial<IGraphicAttribute>,\n    theme: Required<IGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IGraphic\n  ): IAABBBounds {\n    const { outerBorder, shadowBlur = theme.shadowBlur } = attribute;\n    if (outerBorder) {\n      const defaultOuterBorder = theme.outerBorder;\n      const { distance = defaultOuterBorder.distance, lineWidth = defaultOuterBorder.lineWidth } = outerBorder;\n\n      // rect的distance一定是number\n      aabbBounds.expand((distance as number) + (shadowBlur + lineWidth) / 2);\n    }\n    return aabbBounds;\n  }\n}\n"]}
+{"version":3,"sources":["../src/graphic/graphic-service/common-contribution.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,oCAAoC;IAC/C,YAAY,CACV,SAAqC,EACrC,KAAkC,EAClC,UAAuB,EACvB,OAAkB;QAElB,MAAM,EAAE,WAAW,EAAE,UAAU,GAAG,KAAK,CAAC,UAAU,EAAE,GAAG,SAAS,CAAC;QACjE,IAAI,WAAW,EAAE;YACf,MAAM,kBAAkB,GAAG,KAAK,CAAC,WAAW,CAAC;YAC7C,MAAM,EAAE,QAAQ,GAAG,kBAAkB,CAAC,QAAQ,EAAE,SAAS,GAAG,kBAAkB,CAAC,SAAS,EAAE,GAAG,WAAW,CAAC;YAGzG,UAAU,CAAC,MAAM,CAAE,QAAmB,GAAG,CAAC,UAAU,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;SACxE;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;CACF","file":"common-contribution.js","sourcesContent":["import type { IAABBBounds } from '@visactor/vutils';\nimport type { IGraphicAttribute, IGraphic } from '../../interface';\n\nexport class DefaultOuterBorderBoundsContribution {\n  updateBounds(\n    attribute: Partial<IGraphicAttribute>,\n    theme: Required<IGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IGraphic\n  ): IAABBBounds {\n    const { outerBorder, shadowBlur = theme.shadowBlur } = attribute;\n    if (outerBorder) {\n      const defaultOuterBorder = theme.outerBorder;\n      const { distance = defaultOuterBorder.distance, lineWidth = defaultOuterBorder.lineWidth } = outerBorder;\n\n      // rect的distance一定是number\n      aabbBounds.expand((distance as number) + (shadowBlur + lineWidth) / 2);\n    }\n    return aabbBounds;\n  }\n}\n"]}

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

@@ -1,34 +1,12 @@
 import { ContainerModule } from "../../common/inversify-lite";
 
-import { bindContributionProvider } from "../../common/contribution-provider";
-
-import { ArcBoundsContribution, DefaultArcOuterBorderBoundsContribution } from "./arc-contribution";
-
-import { CircleBoundsContribution, DefaultCircleOuterBorderBoundsContribution } from "./circle-contribution";
-
 import { DefaultGraphicService } from "./graphic-service";
 
-import { DefaultPathOuterBorderBoundsContribution, PathBoundsContribution } from "./path-contribution";
-
-import { RectBoundsContribution, DefaultRectOuterBorderBoundsContribution } from "./rect-contribution";
-
-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), 
-    bindContributionProvider(bind, RectBoundsContribution), bind(DefaultSymbolOuterBorderBoundsContribution).toSelf().inSingletonScope(), 
-    bind(SymbolBoundsContribution).toService(DefaultSymbolOuterBorderBoundsContribution), 
-    bindContributionProvider(bind, SymbolBoundsContribution), bind(DefaultCircleOuterBorderBoundsContribution).toSelf().inSingletonScope(), 
-    bind(CircleBoundsContribution).toService(DefaultCircleOuterBorderBoundsContribution), 
-    bindContributionProvider(bind, CircleBoundsContribution), bind(DefaultArcOuterBorderBoundsContribution).toSelf().inSingletonScope(), 
-    bind(ArcBoundsContribution).toService(DefaultArcOuterBorderBoundsContribution), 
-    bindContributionProvider(bind, ArcBoundsContribution), bind(DefaultPathOuterBorderBoundsContribution).toSelf().inSingletonScope(), 
-    bind(PathBoundsContribution).toService(DefaultPathOuterBorderBoundsContribution), 
-    bindContributionProvider(bind, PathBoundsContribution), bind(GraphicCreator).toConstantValue(graphicCreator);
+    bind(GraphicService).to(DefaultGraphicService).inSingletonScope(), 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,6BAA6B,CAAC;AAC9D,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 '../../common/inversify-lite';\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"]}
+{"version":3,"sources":["../src/graphic/graphic-service/graphic-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,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,cAAc,CAAC,CAAC,EAAE,CAAC,qBAAqB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAElE,IAAI,CAAC,cAAc,CAAC,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;AACvD,CAAC,CAAC,CAAC","file":"graphic-module.js","sourcesContent":["import { ContainerModule } from '../../common/inversify-lite';\n// import { DefaultTheme } from './default-theme';\nimport { DefaultGraphicService } from './graphic-service';\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(GraphicService).to(DefaultGraphicService).inSingletonScope();\n\n  bind(GraphicCreator).toConstantValue(graphicCreator);\n});\n"]}

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

@@ -1,6 +1,6 @@
 import type { IAABBBounds, IBounds, IMatrix } from '@visactor/vutils';
 import { AABBBounds } from '@visactor/vutils';
-import type { 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, ISyncHook, IRectBoundsContribution, ISymbolBoundsContribution, ICircleBoundsContribution, IArcBoundsContribution, IPathBoundsContribution, IContributionProvider } from '../../interface';
+import type { 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, ISyncHook, IRectBoundsContribution, ISymbolBoundsContribution, ICircleBoundsContribution, IArcBoundsContribution, IPathBoundsContribution } from '../../interface';
 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;
@@ -12,11 +12,6 @@ export declare function getModelMatrix(out: mat4, graphic: IGraphic, theme: ITra
 export declare function shouldUseMat4(graphic: IGraphic): number;
 export declare class DefaultGraphicService implements IGraphicService {
     readonly creator: IGraphicCreator;
-    protected readonly rectBoundsContribitions: IContributionProvider<IRectBoundsContribution>;
-    protected readonly symbolBoundsContribitions: IContributionProvider<ISymbolBoundsContribution>;
-    protected readonly circleBoundsContribitions: IContributionProvider<ICircleBoundsContribution>;
-    protected readonly arcBoundsContribitions: IContributionProvider<IArcBoundsContribution>;
-    protected readonly pathBoundsContribitions: IContributionProvider<IPathBoundsContribution>;
     hooks: {
         onAttributeUpdate: ISyncHook<[IGraphic]>;
         onSetStage: ISyncHook<[IGraphic, IStage]>;
@@ -36,7 +31,7 @@ export declare class DefaultGraphicService implements IGraphicService {
     protected _pathBoundsContribitions: IPathBoundsContribution[];
     protected tempAABBBounds1: AABBBounds;
     protected tempAABBBounds2: AABBBounds;
-    constructor(creator: IGraphicCreator, rectBoundsContribitions: IContributionProvider<IRectBoundsContribution>, symbolBoundsContribitions: IContributionProvider<ISymbolBoundsContribution>, circleBoundsContribitions: IContributionProvider<ICircleBoundsContribution>, arcBoundsContribitions: IContributionProvider<IArcBoundsContribution>, pathBoundsContribitions: IContributionProvider<IPathBoundsContribution>);
+    constructor(creator: IGraphicCreator);
     onAttributeUpdate(graphic: IGraphic): void;
     onSetStage(graphic: IGraphic, stage: IStage): void;
     onRemove(graphic: IGraphic<Partial<IGraphicAttribute>>): void;
@@ -72,9 +67,10 @@ export declare class DefaultGraphicService implements IGraphicService {
     protected updateArcAABBBoundsImprecise(attribute: IArcGraphicAttribute, arcTheme: Required<IArcGraphicAttribute>, aabbBounds: IAABBBounds, graphic?: IGraphic): IAABBBounds;
     protected updateArcAABBBoundsAccurate(attribute: IArcGraphicAttribute, arcTheme: Required<IArcGraphicAttribute>, aabbBounds: IAABBBounds, graphic?: IGraphic): IAABBBounds;
     updateSymbolAABBBounds(attribute: ISymbolGraphicAttribute, symbolTheme: Required<ISymbolGraphicAttribute>, aabbBounds: IAABBBounds, full?: boolean, graphic?: ISymbol): IBounds;
-    updateSymbolAABBBoundsImprecise(attribute: ISymbolGraphicAttribute, symbolTheme: Required<ISymbolGraphicAttribute>, aabbBounds: IAABBBounds, graphic?: IGraphic): IAABBBounds;
-    updateSymbolAABBBoundsAccurate(attribute: ISymbolGraphicAttribute, symbolTheme: Required<ISymbolGraphicAttribute>, aabbBounds: IAABBBounds, graphic?: ISymbol): IAABBBounds;
+    protected updateSymbolAABBBoundsImprecise(attribute: ISymbolGraphicAttribute, symbolTheme: Required<ISymbolGraphicAttribute>, aabbBounds: IAABBBounds, graphic?: IGraphic): IAABBBounds;
+    protected updateSymbolAABBBoundsAccurate(attribute: ISymbolGraphicAttribute, symbolTheme: Required<ISymbolGraphicAttribute>, aabbBounds: IAABBBounds, graphic?: ISymbol): IAABBBounds;
     updateImageAABBBounds(attribute: IImageGraphicAttribute, imageTheme: Required<IImageGraphicAttribute>, aabbBounds: IAABBBounds, graphic?: IGraphic): IBounds;
     combindShadowAABBBounds(bounds: IAABBBounds, graphic?: IGraphic): void;
     transformAABBBounds(attribute: Partial<IGraphicAttribute>, aabbBounds: IAABBBounds, theme: Required<IGraphicAttribute>, miter: boolean, graphic?: IGraphic): void;
+    protected _validCheck(attribute: Partial<IGraphicAttribute>, theme: Required<IGraphicAttribute>, aabbBounds: IAABBBounds, graphic?: IGraphic): boolean;
 }

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

@@ -10,30 +10,20 @@ var __decorate = this && this.__decorate || function(decorators, target, key, de
     };
 };
 
-import { inject, injectable, named } from "../../common/inversify-lite";
+import { inject, injectable } from "../../common/inversify-lite";
 
 import { AABBBounds, epsilon, isArray, pi2, transformBoundsWithMatrix } from "@visactor/vutils";
 
 import { SyncHook } from "../../tapable";
 
-import { RectBoundsContribution } from "./rect-contribution";
-
 import { textDrawOffsetX } from "../../common/text";
 
-import { SymbolBoundsContribution } from "./symbol-contribution";
+import { DefaultSymbolOuterBorderBoundsContribution } from "./symbol-contribution";
 
 import { boundStroke } from "../tools";
 
-import { CircleBoundsContribution } from "./circle-contribution";
-
-import { ArcBoundsContribution } from "./arc-contribution";
-
-import { PathBoundsContribution } from "./path-contribution";
-
 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";
@@ -42,6 +32,8 @@ import { circleBounds } from "../../common/utils";
 
 import { GraphicCreator } from "../constants";
 
+import { DefaultOuterBorderBoundsContribution } from "./common-contribution";
+
 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, 
     out[7] = 0, out[8] = 0, out[9] = 0, out[10] = 1, out[11] = 0, out[12] = 0, out[13] = 0, 
@@ -196,11 +188,8 @@ export function shouldUseMat4(graphic) {
 }
 
 let DefaultGraphicService = class {
-    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 = {
+    constructor(creator) {
+        this.creator = creator, this.hooks = {
             onAttributeUpdate: new SyncHook([ "graphic" ]),
             onSetStage: new SyncHook([ "graphic", "stage" ]),
             onRemove: new SyncHook([ "graphic" ]),
@@ -209,7 +198,10 @@ let DefaultGraphicService = class {
             onClearIncremental: new SyncHook([ "graphic", "group", "stage" ]),
             beforeUpdateAABBBounds: new SyncHook([ "graphic", "stage", "willUpdate", "aabbBounds" ]),
             afterUpdateAABBBounds: new SyncHook([ "graphic", "stage", "aabbBounds", "globalAABBBounds", "selfChange" ])
-        }, this.tempAABBBounds1 = new AABBBounds, this.tempAABBBounds2 = new AABBBounds;
+        }, this.tempAABBBounds1 = new AABBBounds, this.tempAABBBounds2 = new AABBBounds, 
+        this._rectBoundsContribitions = [ new DefaultOuterBorderBoundsContribution ], this._symbolBoundsContribitions = [ new DefaultSymbolOuterBorderBoundsContribution ], 
+        this._circleBoundsContribitions = [ new DefaultOuterBorderBoundsContribution ], 
+        this._arcBoundsContribitions = [ new DefaultOuterBorderBoundsContribution ], this._pathBoundsContribitions = [ new DefaultOuterBorderBoundsContribution ];
     }
     onAttributeUpdate(graphic) {
         this.hooks.onAttributeUpdate.taps.length && this.hooks.onAttributeUpdate.call(graphic);
@@ -242,14 +234,16 @@ let DefaultGraphicService = class {
         return renderCommandList(path.commandList, boundsContext, 0, 0), !0;
     }
     updateRectAABBBounds(attribute, rectTheme, aabbBounds, graphic) {
+        if (!this._validCheck(attribute, rectTheme, aabbBounds, graphic)) return aabbBounds;
         if (!this.updatePathProxyAABBBounds(aabbBounds, graphic)) {
-            const {width: width = rectTheme.width, height: height = rectTheme.height} = attribute;
-            aabbBounds.set(0, 0, width, height);
+            let {width: width, height: height} = attribute;
+            const {x1: x1, y1: y1, x: x, y: y} = attribute;
+            width = null != width ? width : x1 - x, height = null != height ? height : y1 - y, 
+            aabbBounds.set(0, 0, width || 0, height || 0);
         }
         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._rectBoundsContribitions || (this._rectBoundsContribitions = this.rectBoundsContribitions.getContributions() || []), 
-        this._rectBoundsContribitions.length && this._rectBoundsContribitions.forEach((c => {
+        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), 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.transformAABBBounds(attribute, aabbBounds, rectTheme, !1, graphic), aabbBounds;
     }
@@ -266,11 +260,12 @@ let DefaultGraphicService = class {
         aabbBounds;
     }
     updateGlyphAABBBounds(attribute, theme, aabbBounds, graphic) {
-        return graphic.getSubGraphic().forEach((node => {
+        return this._validCheck(attribute, theme, aabbBounds, graphic) ? (graphic.getSubGraphic().forEach((node => {
             aabbBounds.union(node.AABBBounds);
-        })), aabbBounds;
+        })), aabbBounds) : aabbBounds;
     }
     updateRichTextAABBBounds(attribute, richtextTheme, aabbBounds, graphic) {
+        if (!this._validCheck(attribute, richtextTheme, aabbBounds, graphic)) return aabbBounds;
         if (!graphic) return aabbBounds;
         const {width: width = richtextTheme.width, height: height = richtextTheme.height, maxWidth: maxWidth = richtextTheme.maxWidth, maxHeight: maxHeight = richtextTheme.maxHeight, textAlign: textAlign = richtextTheme.textAlign, textBaseline: textBaseline = richtextTheme.textBaseline} = attribute;
         if (width > 0 && height > 0) aabbBounds.set(0, 0, width, height); else {
@@ -313,6 +308,7 @@ let DefaultGraphicService = class {
         aabbBounds;
     }
     updateTextAABBBounds(attribute, textTheme, aabbBounds, graphic) {
+        if (!this._validCheck(attribute, textTheme, aabbBounds, graphic)) return aabbBounds;
         if (!graphic) return aabbBounds;
         const {text: text = textTheme.text} = graphic.attribute;
         Array.isArray(text) ? graphic.updateMultilineAABBBounds(text) : graphic.updateSingallineAABBBounds(text);
@@ -327,10 +323,10 @@ let DefaultGraphicService = class {
         aabbBounds;
     }
     updatePathAABBBounds(attribute, pathTheme, aabbBounds, graphic) {
+        if (!this._validCheck(attribute, pathTheme, aabbBounds, graphic)) return aabbBounds;
         this.updatePathProxyAABBBounds(aabbBounds, graphic) || this.updatePathAABBBoundsImprecise(attribute, pathTheme, aabbBounds, graphic);
         const tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
         tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), 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);
         }));
@@ -368,6 +364,7 @@ let DefaultGraphicService = class {
         aabbBounds;
     }
     updatePolygonAABBBounds(attribute, polygonTheme, aabbBounds, graphic) {
+        if (!this._validCheck(attribute, polygonTheme, aabbBounds, graphic)) return aabbBounds;
         this.updatePathProxyAABBBounds(aabbBounds, graphic) || this.updatePolygonAABBBoundsImprecise(attribute, polygonTheme, aabbBounds, graphic);
         const tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
         tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2);
@@ -382,6 +379,7 @@ let DefaultGraphicService = class {
         })), aabbBounds;
     }
     updateLineAABBBounds(attribute, lineTheme, aabbBounds, graphic) {
+        if (!this._validCheck(attribute, lineTheme, aabbBounds, graphic)) return aabbBounds;
         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;
         tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2);
@@ -404,6 +402,7 @@ let DefaultGraphicService = class {
         })), b;
     }
     updateAreaAABBBounds(attribute, areaTheme, aabbBounds, graphic) {
+        if (!this._validCheck(attribute, areaTheme, aabbBounds, graphic)) return aabbBounds;
         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;
         tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2);
@@ -428,11 +427,11 @@ let DefaultGraphicService = class {
         })), b;
     }
     updateCircleAABBBounds(attribute, circleTheme, aabbBounds, full, graphic) {
+        if (!this._validCheck(attribute, circleTheme, aabbBounds, graphic)) return aabbBounds;
         this.updatePathProxyAABBBounds(aabbBounds, graphic) || (full ? this.updateCircleAABBBoundsImprecise(attribute, circleTheme, aabbBounds, graphic) : this.updateCircleAABBBoundsAccurate(attribute, circleTheme, 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._circleBoundsContribitions || (this._circleBoundsContribitions = this.circleBoundsContribitions.getContributions() || []), 
-        this._circleBoundsContribitions.length && this._circleBoundsContribitions.forEach((c => {
+        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), 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.transformAABBBounds(attribute, aabbBounds, circleTheme, !1, graphic), 
         aabbBounds;
@@ -447,10 +446,10 @@ let DefaultGraphicService = class {
         aabbBounds;
     }
     updateArcAABBBounds(attribute, arcTheme, aabbBounds, full, graphic) {
+        if (!this._validCheck(attribute, arcTheme, aabbBounds, graphic)) return aabbBounds;
         this.updatePathProxyAABBBounds(aabbBounds, graphic) || (full ? this.updateArcAABBBoundsImprecise(attribute, arcTheme, aabbBounds, graphic) : this.updateArcAABBBoundsAccurate(attribute, arcTheme, aabbBounds, graphic));
         const tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
         tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), 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);
         }));
@@ -477,10 +476,10 @@ let DefaultGraphicService = class {
         circleBounds(startAngle, endAngle, innerRadius, aabbBounds)), aabbBounds;
     }
     updateSymbolAABBBounds(attribute, symbolTheme, aabbBounds, full, graphic) {
+        if (!this._validCheck(attribute, symbolTheme, aabbBounds, graphic)) return aabbBounds;
         this.updatePathProxyAABBBounds(aabbBounds, graphic) || (full ? this.updateSymbolAABBBoundsImprecise(attribute, symbolTheme, aabbBounds, graphic) : this.updateSymbolAABBBoundsAccurate(attribute, symbolTheme, aabbBounds, graphic));
         const tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
         tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), 
-        this._symbolBoundsContribitions || (this._symbolBoundsContribitions = this.symbolBoundsContribitions.getContributions() || []), 
         this._symbolBoundsContribitions.length && this._symbolBoundsContribitions.forEach((c => {
             c.updateBounds(attribute, symbolTheme, tb1, graphic), aabbBounds.union(tb1), tb1.setValue(tb2.x1, tb2.y1, tb2.x2, tb2.y2);
         }));
@@ -502,6 +501,7 @@ let DefaultGraphicService = class {
         return graphic.getParsedPath().bounds(size, aabbBounds), aabbBounds;
     }
     updateImageAABBBounds(attribute, imageTheme, aabbBounds, graphic) {
+        if (!this._validCheck(attribute, imageTheme, aabbBounds, graphic)) return aabbBounds;
         if (!this.updatePathProxyAABBBounds(aabbBounds, graphic)) {
             const {width: width = imageTheme.width, height: height = imageTheme.height} = attribute;
             aabbBounds.set(0, 0, width, height);
@@ -519,20 +519,30 @@ let DefaultGraphicService = class {
     }
     transformAABBBounds(attribute, aabbBounds, theme, miter, graphic) {
         const {scaleX: scaleX = theme.scaleX, scaleY: scaleY = theme.scaleY, stroke: stroke = theme.stroke, shadowBlur: shadowBlur = theme.shadowBlur, lineWidth: lineWidth = theme.lineWidth, strokeBoundsBuffer: strokeBoundsBuffer = theme.strokeBoundsBuffer} = attribute, tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
-        if (stroke) {
+        if (stroke && lineWidth) {
             const scaledHalfLineWidth = lineWidth / Math.abs(scaleX + scaleY);
             boundStroke(tb1, scaledHalfLineWidth, miter, strokeBoundsBuffer), aabbBounds.union(tb1), 
             tb1.setValue(tb2.x1, tb2.y1, tb2.x2, tb2.y2);
         }
         if (shadowBlur) {
-            const shadowBlurHalfWidth = shadowBlur / Math.abs(scaleX + scaleY);
-            boundStroke(tb1, shadowBlurHalfWidth, miter, strokeBoundsBuffer), aabbBounds.union(tb1);
+            const {shadowOffsetX: shadowOffsetX = theme.shadowOffsetX, shadowOffsetY: shadowOffsetY = theme.shadowOffsetY} = attribute, shadowBlurWidth = shadowBlur / Math.abs(scaleX + scaleY) * 2 + Math.max(shadowOffsetX, shadowOffsetY);
+            boundStroke(tb1, shadowBlurWidth, miter, strokeBoundsBuffer + 1), aabbBounds.union(tb1);
         }
-        this.combindShadowAABBBounds(aabbBounds, graphic), transformBoundsWithMatrix(aabbBounds, aabbBounds, graphic.transMatrix);
+        this.combindShadowAABBBounds(aabbBounds, graphic);
+        let updateMatrix = !0;
+        const m = graphic.transMatrix;
+        graphic && graphic.isContainer && (updateMatrix = !(1 === m.a && 0 === m.b && 0 === m.c && 1 === m.d && 0 === m.e && 0 === m.f)), 
+        updateMatrix && transformBoundsWithMatrix(aabbBounds, aabbBounds, m);
+    }
+    _validCheck(attribute, theme, aabbBounds, graphic) {
+        if (!graphic) return !0;
+        if (!graphic.valid) return aabbBounds.clear(), !1;
+        const {visible: visible = theme.visible} = attribute;
+        return !!visible || (aabbBounds.clear(), !1);
     }
 };
 
-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);
+DefaultGraphicService = __decorate([ injectable(), __param(0, inject(GraphicCreator)), __metadata("design:paramtypes", [ Object ]) ], DefaultGraphicService);
 
 export { DefaultGraphicService };
 //# sourceMappingURL=graphic-service.js.map