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

package/es/picker/canvas-picker-service.d.ts

@@ -3,25 +3,13 @@ import { DefaultPickService } from '@visactor/vrender-core';
 import type { ICanvas, IContext2d, IGraphic, EnvType, IGlobal, IGraphicPicker, IPickerService, IDrawContribution, IContributionProvider, IPickItemInterceptorContribution, IPickParams, PickResult } from '@visactor/vrender-core';
 export declare class DefaultCanvasPickerService extends DefaultPickService implements IPickerService {
     protected readonly contributions: IContributionProvider<IGraphicPicker>;
-    private readonly circlePicker;
-    private readonly rectPicker;
-    private readonly arcPicker;
-    private readonly areaPicker;
-    private readonly imagePicker;
-    private readonly linePicker;
-    private readonly pathPicker;
-    private readonly symbolPicker;
-    private readonly textPicker;
-    private readonly polygonPicker;
-    private readonly richtextPicker;
     readonly drawContribution: IDrawContribution;
-    readonly global: IGlobal;
     protected readonly pickItemInterceptorContributions: IContributionProvider<IPickItemInterceptorContribution>;
     type: 'default';
     pickCanvas: ICanvas;
     pickContext: IContext2d;
     pickerMap: Map<number, IGraphicPicker>;
-    constructor(contributions: IContributionProvider<IGraphicPicker>, circlePicker: IGraphicPicker, rectPicker: IGraphicPicker, arcPicker: IGraphicPicker, areaPicker: IGraphicPicker, imagePicker: IGraphicPicker, linePicker: IGraphicPicker, pathPicker: IGraphicPicker, symbolPicker: IGraphicPicker, textPicker: IGraphicPicker, polygonPicker: IGraphicPicker, richtextPicker: IGraphicPicker, drawContribution: IDrawContribution, global: IGlobal, pickItemInterceptorContributions: IContributionProvider<IPickItemInterceptorContribution>);
+    constructor(contributions: IContributionProvider<IGraphicPicker>, drawContribution: IDrawContribution, pickItemInterceptorContributions: IContributionProvider<IPickItemInterceptorContribution>);
     init(): void;
     configure(global: IGlobal, env: EnvType): void;
     pickItem(graphic: IGraphic, point: IPointLike, parentMatrix: IMatrix | null, params: IPickParams): PickResult | null;

package/es/picker/canvas-picker-service.js

@@ -10,21 +10,16 @@ var __decorate = this && this.__decorate || function(decorators, target, key, de
     };
 };
 
-import { ContributionProvider, inject, injectable, named, postConstruct, DefaultPickService, DrawContribution, PickItemInterceptor, VGlobal, wrapCanvas } from "@visactor/vrender-core";
+import { ContributionProvider, inject, injectable, named, DefaultPickService, DrawContribution, PickItemInterceptor, canvasAllocate } from "@visactor/vrender-core";
 
-import { CanvasArcPicker, CanvasAreaPicker, CanvasCirclePicker, CanvasImagePicker, CanvasLinePicker, CanvasPathPicker, CanvasPickerContribution, CanvasPolygonPicker, CanvasRectPicker, CanvasSymbolPicker, CanvasTextPicker, CanvasRichTextPicker } from "./contributions/constants";
+import { CanvasPickerContribution } from "./contributions/constants";
 
 let DefaultCanvasPickerService = class extends DefaultPickService {
-    constructor(contributions, circlePicker, rectPicker, arcPicker, areaPicker, imagePicker, linePicker, pathPicker, symbolPicker, textPicker, polygonPicker, richtextPicker, drawContribution, global, pickItemInterceptorContributions) {
-        super(global, pickItemInterceptorContributions), this.contributions = contributions, 
-        this.circlePicker = circlePicker, this.rectPicker = rectPicker, this.arcPicker = arcPicker, 
-        this.areaPicker = areaPicker, this.imagePicker = imagePicker, this.linePicker = linePicker, 
-        this.pathPicker = pathPicker, this.symbolPicker = symbolPicker, this.textPicker = textPicker, 
-        this.polygonPicker = polygonPicker, this.richtextPicker = richtextPicker, this.drawContribution = drawContribution, 
-        this.global = global, this.pickItemInterceptorContributions = pickItemInterceptorContributions, 
-        this.global.hooks.onSetEnv.tap("canvas-picker-service", ((_, env, global) => {
+    constructor(contributions, drawContribution, pickItemInterceptorContributions) {
+        super(pickItemInterceptorContributions), this.contributions = contributions, this.drawContribution = drawContribution, 
+        this.pickItemInterceptorContributions = pickItemInterceptorContributions, this.global.hooks.onSetEnv.tap("canvas-picker-service", ((_, env, global) => {
             this.configure(global, env);
-        })), this.configure(this.global, this.global.env), this.pickerMap = new Map;
+        })), this.configure(this.global, this.global.env), this.pickerMap = new Map, this.init();
     }
     init() {
         this.contributions.getContributions().forEach((item => {
@@ -32,16 +27,7 @@ let DefaultCanvasPickerService = class extends DefaultPickService {
         })), super._init();
     }
     configure(global, env) {
-        const options = {
-            width: 100,
-            height: 100,
-            nativeCanvas: global.createCanvas({
-                width: 100,
-                height: 100
-            }),
-            id: "for-pick"
-        };
-        this.pickCanvas = wrapCanvas(options), this.pickContext = this.pickCanvas.getContext("2d");
+        this.pickCanvas = canvasAllocate.shareCanvas(), this.pickContext = this.pickCanvas.getContext("2d");
     }
     pickItem(graphic, point, parentMatrix, params) {
         if (!1 === graphic.attribute.pickable) return null;
@@ -73,7 +59,6 @@ let DefaultCanvasPickerService = class extends DefaultPickService {
     }
 };
 
-__decorate([ postConstruct(), __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", void 0) ], DefaultCanvasPickerService.prototype, "init", null), 
-DefaultCanvasPickerService = __decorate([ injectable(), __param(0, inject(ContributionProvider)), __param(0, named(CanvasPickerContribution)), __param(1, inject(CanvasCirclePicker)), __param(2, inject(CanvasRectPicker)), __param(3, inject(CanvasArcPicker)), __param(4, inject(CanvasAreaPicker)), __param(5, inject(CanvasImagePicker)), __param(6, inject(CanvasLinePicker)), __param(7, inject(CanvasPathPicker)), __param(8, inject(CanvasSymbolPicker)), __param(9, inject(CanvasTextPicker)), __param(10, inject(CanvasPolygonPicker)), __param(11, inject(CanvasRichTextPicker)), __param(12, inject(DrawContribution)), __param(13, inject(VGlobal)), __param(14, inject(ContributionProvider)), __param(14, named(PickItemInterceptor)), __metadata("design:paramtypes", [ Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object ]) ], DefaultCanvasPickerService);
+DefaultCanvasPickerService = __decorate([ injectable(), __param(0, inject(ContributionProvider)), __param(0, named(CanvasPickerContribution)), __param(1, inject(DrawContribution)), __param(2, inject(ContributionProvider)), __param(2, named(PickItemInterceptor)), __metadata("design:paramtypes", [ Object, Object, Object ]) ], DefaultCanvasPickerService);
 
 export { DefaultCanvasPickerService };

package/es/picker/canvas-picker-service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/canvas-picker-service.ts"],"names":[],"mappings":"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","file":"canvas-picker-service.js","sourcesContent":["import type { IMatrix, IPointLike } from '@visactor/vutils';\n// eslint-disable-next-line\nimport {\n  ContributionProvider,\n  inject,\n  injectable,\n  named,\n  postConstruct,\n  DefaultPickService,\n  DrawContribution,\n  PickItemInterceptor,\n  VGlobal,\n  wrapCanvas\n} from '@visactor/vrender-core';\nimport type {\n  ICanvas,\n  IContext2d,\n  IGraphic,\n  EnvType,\n  IGlobal,\n  IGraphicPicker,\n  IPickerService,\n  IDrawContribution,\n  IContributionProvider,\n  IPickItemInterceptorContribution,\n  IPickParams,\n  PickResult\n} from '@visactor/vrender-core';\nimport {\n  CanvasArcPicker,\n  CanvasAreaPicker,\n  CanvasCirclePicker,\n  CanvasImagePicker,\n  CanvasLinePicker,\n  CanvasPathPicker,\n  CanvasPickerContribution,\n  CanvasPolygonPicker,\n  CanvasRectPicker,\n  CanvasSymbolPicker,\n  CanvasTextPicker,\n  CanvasRichTextPicker\n} from './contributions/constants';\n\n// 默认的pick-service，提供基本的最优选中策略，尽量不需要用户自己实现contribution\n// 用户可以写plugin\n@injectable()\nexport class DefaultCanvasPickerService extends DefaultPickService implements IPickerService {\n  declare type: 'default';\n  // pcik canvas\n  declare pickCanvas: ICanvas;\n  declare pickContext: IContext2d;\n  declare pickerMap: Map<number, IGraphicPicker>;\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(CanvasPickerContribution)\n    protected readonly contributions: IContributionProvider<IGraphicPicker>,\n    @inject(CanvasCirclePicker) private readonly circlePicker: IGraphicPicker, // 默认的circlePicker\n    @inject(CanvasRectPicker) private readonly rectPicker: IGraphicPicker, // 默认的rectPicker\n    @inject(CanvasArcPicker) private readonly arcPicker: IGraphicPicker, // 默认的arcPicker\n    @inject(CanvasAreaPicker) private readonly areaPicker: IGraphicPicker, // 默认的areaPicker\n    @inject(CanvasImagePicker) private readonly imagePicker: IGraphicPicker, // 默认的imagePicker\n    @inject(CanvasLinePicker) private readonly linePicker: IGraphicPicker, // 默认的linePicker\n    @inject(CanvasPathPicker) private readonly pathPicker: IGraphicPicker, // 默认的pathPicker\n    @inject(CanvasSymbolPicker) private readonly symbolPicker: IGraphicPicker, // 默认的symbolPicker\n    @inject(CanvasTextPicker) private readonly textPicker: IGraphicPicker, // 默认的textPicker\n    @inject(CanvasPolygonPicker) private readonly polygonPicker: IGraphicPicker, // 默认的polygonPicker\n    @inject(CanvasRichTextPicker) private readonly richtextPicker: IGraphicPicker, // 默认的richtextPicker\n\n    @inject(DrawContribution)\n    public readonly drawContribution: IDrawContribution,\n    @inject(VGlobal) public readonly global: IGlobal,\n    // 拦截器\n    @inject(ContributionProvider)\n    @named(PickItemInterceptor)\n    protected readonly pickItemInterceptorContributions: IContributionProvider<IPickItemInterceptorContribution>\n  ) {\n    super(global, pickItemInterceptorContributions);\n    this.global.hooks.onSetEnv.tap('canvas-picker-service', (_, env, global) => {\n      this.configure(global, env);\n    });\n    this.configure(this.global, this.global.env);\n    this.pickerMap = new Map();\n  }\n\n  @postConstruct()\n  init() {\n    this.contributions.getContributions().forEach(item => {\n      this.pickerMap.set(item.numberType, item);\n    });\n    super._init();\n  }\n\n  configure(global: IGlobal, env: EnvType) {\n    // if (!this.global.env) return;\n    // this.contributions.getContributions().forEach(handlerContribution => {\n    //   handlerContribution.configure(this, this.global);\n    // });\n\n    // 创建pick canvas\n    const options = {\n      width: 100,\n      height: 100,\n      nativeCanvas: global.createCanvas({ width: 100, height: 100 }),\n      id: 'for-pick'\n    };\n\n    this.pickCanvas = wrapCanvas(options);\n    this.pickContext = this.pickCanvas.getContext('2d');\n  }\n\n  // todo: switch统一改为数字map\n  pickItem(graphic: IGraphic, point: IPointLike, parentMatrix: IMatrix | null, params: IPickParams): PickResult | null {\n    if (graphic.attribute.pickable === false) {\n      return null;\n    }\n    // 添加拦截器\n    if (this.InterceptorContributions.length) {\n      for (let i = 0; i < this.InterceptorContributions.length; i++) {\n        const drawContribution = this.InterceptorContributions[i];\n        if (drawContribution.beforePickItem) {\n          const ret = drawContribution.beforePickItem(graphic, this, point, params, { parentMatrix });\n          if (ret) {\n            return ret;\n          }\n        }\n      }\n    }\n    const picker = this.pickerMap.get(graphic.numberType);\n    if (!picker) {\n      return null;\n    }\n    const g = picker.contains(graphic, point, params) ? graphic : null;\n\n    const data = {\n      graphic: g\n    };\n    if (g) {\n      return data;\n    }\n    // 添加拦截器\n    if (this.InterceptorContributions.length) {\n      for (let i = 0; i < this.InterceptorContributions.length; i++) {\n        const drawContribution = this.InterceptorContributions[i];\n        if (drawContribution.afterPickItem) {\n          const ret = drawContribution.afterPickItem(graphic, this, point, params, { parentMatrix });\n          if (ret) {\n            return ret;\n          }\n        }\n      }\n    }\n    return data;\n  }\n}\n"]}
+{"version":3,"sources":["../src/picker/canvas-picker-service.ts"],"names":[],"mappings":"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","file":"canvas-picker-service.js","sourcesContent":["import type { IMatrix, IPointLike } from '@visactor/vutils';\n// eslint-disable-next-line\nimport {\n  ContributionProvider,\n  inject,\n  injectable,\n  named,\n  DefaultPickService,\n  DrawContribution,\n  PickItemInterceptor,\n  canvasAllocate,\n  application\n} from '@visactor/vrender-core';\nimport type {\n  ICanvas,\n  IContext2d,\n  IGraphic,\n  EnvType,\n  IGlobal,\n  IGraphicPicker,\n  IPickerService,\n  IDrawContribution,\n  IContributionProvider,\n  IPickItemInterceptorContribution,\n  IPickParams,\n  PickResult\n} from '@visactor/vrender-core';\nimport {\n  CanvasArcPicker,\n  CanvasAreaPicker,\n  CanvasCirclePicker,\n  CanvasImagePicker,\n  CanvasLinePicker,\n  CanvasPathPicker,\n  CanvasPickerContribution,\n  CanvasPolygonPicker,\n  CanvasRectPicker,\n  CanvasSymbolPicker,\n  CanvasTextPicker,\n  CanvasRichTextPicker\n} from './contributions/constants';\n\n// 默认的pick-service，提供基本的最优选中策略，尽量不需要用户自己实现contribution\n// 用户可以写plugin\n@injectable()\nexport class DefaultCanvasPickerService extends DefaultPickService implements IPickerService {\n  declare type: 'default';\n  // pcik canvas\n  declare pickCanvas: ICanvas;\n  declare pickContext: IContext2d;\n  declare pickerMap: Map<number, IGraphicPicker>;\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(CanvasPickerContribution)\n    protected readonly contributions: IContributionProvider<IGraphicPicker>,\n\n    @inject(DrawContribution)\n    public readonly drawContribution: IDrawContribution,\n    // 拦截器\n    @inject(ContributionProvider)\n    @named(PickItemInterceptor)\n    protected readonly pickItemInterceptorContributions: IContributionProvider<IPickItemInterceptorContribution>\n  ) {\n    super(pickItemInterceptorContributions);\n    this.global.hooks.onSetEnv.tap('canvas-picker-service', (_, env, global) => {\n      this.configure(global, env);\n    });\n    this.configure(this.global, this.global.env);\n    this.pickerMap = new Map();\n    this.init();\n  }\n\n  init() {\n    this.contributions.getContributions().forEach(item => {\n      this.pickerMap.set(item.numberType, item);\n    });\n    super._init();\n  }\n\n  configure(global: IGlobal, env: EnvType) {\n    // if (!this.global.env) return;\n    // this.contributions.getContributions().forEach(handlerContribution => {\n    //   handlerContribution.configure(this, this.global);\n    // });\n\n    // 创建pick canvas\n    this.pickCanvas = canvasAllocate.shareCanvas();\n    this.pickContext = this.pickCanvas.getContext('2d');\n  }\n\n  // todo: switch统一改为数字map\n  pickItem(graphic: IGraphic, point: IPointLike, parentMatrix: IMatrix | null, params: IPickParams): PickResult | null {\n    if (graphic.attribute.pickable === false) {\n      return null;\n    }\n    // 添加拦截器\n    if (this.InterceptorContributions.length) {\n      for (let i = 0; i < this.InterceptorContributions.length; i++) {\n        const drawContribution = this.InterceptorContributions[i];\n        if (drawContribution.beforePickItem) {\n          const ret = drawContribution.beforePickItem(graphic, this, point, params, { parentMatrix });\n          if (ret) {\n            return ret;\n          }\n        }\n      }\n    }\n    const picker = this.pickerMap.get(graphic.numberType);\n    if (!picker) {\n      return null;\n    }\n    const g = picker.contains(graphic, point, params) ? graphic : null;\n\n    const data = {\n      graphic: g\n    };\n    if (g) {\n      return data;\n    }\n    // 添加拦截器\n    if (this.InterceptorContributions.length) {\n      for (let i = 0; i < this.InterceptorContributions.length; i++) {\n        const drawContribution = this.InterceptorContributions[i];\n        if (drawContribution.afterPickItem) {\n          const ret = drawContribution.afterPickItem(graphic, this, point, params, { parentMatrix });\n          if (ret) {\n            return ret;\n          }\n        }\n      }\n    }\n    return data;\n  }\n}\n"]}

package/es/picker/contributions/canvas-picker/module.js

@@ -35,30 +35,22 @@ import { DefaultCanvasArc3dPicker } from "./arc3d-picker";
 import { DefaultCanvasGroupPicker } from "./group-picker";
 
 export default new ContainerModule(((bind, unbind, isBound, rebind) => {
-    bind(DefaultCanvasCirclePicker).toSelf().inSingletonScope(), bind(CanvasCirclePicker).toService(DefaultCanvasCirclePicker), 
-    bind(CanvasPickerContribution).toService(CanvasCirclePicker), bind(DefaultCanvasRectPicker).toSelf().inSingletonScope(), 
-    bind(CanvasRectPicker).toService(DefaultCanvasRectPicker), bind(CanvasPickerContribution).toService(CanvasRectPicker), 
-    bind(DefaultCanvasRect3dPicker).toSelf().inSingletonScope(), bind(CanvasRect3dPicker).toService(DefaultCanvasRect3dPicker), 
-    bind(CanvasPickerContribution).toService(CanvasRect3dPicker), bind(DefaultCanvasArcPicker).toSelf().inSingletonScope(), 
-    bind(CanvasArcPicker).toService(DefaultCanvasArcPicker), bind(CanvasPickerContribution).toService(CanvasArcPicker), 
-    bind(DefaultCanvasAreaPicker).toSelf().inSingletonScope(), bind(CanvasAreaPicker).toService(DefaultCanvasAreaPicker), 
-    bind(CanvasPickerContribution).toService(CanvasAreaPicker), bind(DefaultCanvasImagePicker).toSelf().inSingletonScope(), 
-    bind(CanvasImagePicker).toService(DefaultCanvasImagePicker), bind(CanvasPickerContribution).toService(CanvasImagePicker), 
-    bind(DefaultCanvasLinePicker).toSelf().inSingletonScope(), bind(CanvasLinePicker).toService(DefaultCanvasLinePicker), 
-    bind(CanvasPickerContribution).toService(CanvasLinePicker), bind(DefaultCanvasPathPicker).toSelf().inSingletonScope(), 
-    bind(CanvasPathPicker).toService(DefaultCanvasPathPicker), bind(CanvasPickerContribution).toService(CanvasPathPicker), 
-    bind(DefaultCanvasSymbolPicker).toSelf().inSingletonScope(), bind(CanvasSymbolPicker).toService(DefaultCanvasSymbolPicker), 
-    bind(CanvasPickerContribution).toService(CanvasSymbolPicker), bind(DefaultCanvasTextPicker).toSelf().inSingletonScope(), 
-    bind(CanvasTextPicker).toService(DefaultCanvasTextPicker), bind(CanvasPickerContribution).toService(CanvasTextPicker), 
-    bind(DefaultCanvasPolygonPicker).toSelf().inSingletonScope(), bind(CanvasPolygonPicker).toService(DefaultCanvasPolygonPicker), 
-    bind(CanvasPickerContribution).toService(CanvasPolygonPicker), bind(DefaultCanvasPyramid3dPicker).toSelf().inSingletonScope(), 
-    bind(CanvasPyramid3dPicker).toService(DefaultCanvasPyramid3dPicker), bind(CanvasPickerContribution).toService(CanvasPyramid3dPicker), 
-    bind(DefaultCanvasArc3dPicker).toSelf().inSingletonScope(), bind(CanvasArc3dPicker).toService(DefaultCanvasArc3dPicker), 
-    bind(CanvasPickerContribution).toService(CanvasArc3dPicker), bind(DefaultCanvasRichTextPicker).toSelf().inSingletonScope(), 
-    bind(CanvasRichTextPicker).toService(DefaultCanvasRichTextPicker), bind(CanvasPickerContribution).toService(CanvasRichTextPicker), 
-    bind(DefaultCanvasGlyphPicker).toSelf().inSingletonScope(), bind(CanvasGlyphPicker).toService(DefaultCanvasGlyphPicker), 
-    bind(CanvasPickerContribution).toService(CanvasGlyphPicker), bind(DefaultCanvasGroupPicker).toSelf().inSingletonScope(), 
-    bind(CanvasGroupPicker).toService(DefaultCanvasGroupPicker), bind(CanvasPickerContribution).toService(CanvasGroupPicker), 
-    bindContributionProvider(bind, CanvasPickerContribution);
+    bind(CanvasCirclePicker).to(DefaultCanvasCirclePicker).inSingletonScope(), bind(CanvasPickerContribution).toService(CanvasCirclePicker), 
+    bind(CanvasRectPicker).to(DefaultCanvasRectPicker).inSingletonScope(), bind(CanvasPickerContribution).toService(CanvasRectPicker), 
+    bind(CanvasRect3dPicker).to(DefaultCanvasRect3dPicker).inSingletonScope(), bind(CanvasPickerContribution).toService(CanvasRect3dPicker), 
+    bind(CanvasArcPicker).to(DefaultCanvasArcPicker).inSingletonScope(), bind(CanvasPickerContribution).toService(CanvasArcPicker), 
+    bind(CanvasAreaPicker).to(DefaultCanvasAreaPicker).inSingletonScope(), bind(CanvasPickerContribution).toService(CanvasAreaPicker), 
+    bind(CanvasImagePicker).to(DefaultCanvasImagePicker).inSingletonScope(), bind(CanvasPickerContribution).toService(CanvasImagePicker), 
+    bind(CanvasLinePicker).to(DefaultCanvasLinePicker).inSingletonScope(), bind(CanvasPickerContribution).toService(CanvasLinePicker), 
+    bind(CanvasPathPicker).to(DefaultCanvasPathPicker).inSingletonScope(), bind(CanvasPickerContribution).toService(CanvasPathPicker), 
+    bind(CanvasSymbolPicker).to(DefaultCanvasSymbolPicker).inSingletonScope(), bind(CanvasPickerContribution).toService(CanvasSymbolPicker), 
+    bind(CanvasTextPicker).to(DefaultCanvasTextPicker).inSingletonScope(), bind(CanvasPickerContribution).toService(CanvasTextPicker), 
+    bind(CanvasPolygonPicker).to(DefaultCanvasPolygonPicker).inSingletonScope(), bind(CanvasPickerContribution).toService(CanvasPolygonPicker), 
+    bind(CanvasPyramid3dPicker).to(DefaultCanvasPyramid3dPicker).inSingletonScope(), 
+    bind(CanvasPickerContribution).toService(CanvasPyramid3dPicker), bind(CanvasArc3dPicker).to(DefaultCanvasArc3dPicker).inSingletonScope(), 
+    bind(CanvasPickerContribution).toService(CanvasArc3dPicker), bind(CanvasRichTextPicker).to(DefaultCanvasRichTextPicker).inSingletonScope(), 
+    bind(CanvasPickerContribution).toService(CanvasRichTextPicker), bind(CanvasGlyphPicker).to(DefaultCanvasGlyphPicker).inSingletonScope(), 
+    bind(CanvasPickerContribution).toService(CanvasGlyphPicker), bind(CanvasGroupPicker).to(DefaultCanvasGroupPicker).inSingletonScope(), 
+    bind(CanvasPickerContribution).toService(CanvasGroupPicker), bindContributionProvider(bind, CanvasPickerContribution);
 }));
 //# sourceMappingURL=module.js.map

package/es/picker/contributions/canvas-picker/module.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/contributions/canvas-picker/module.ts"],"names":[],"mappings":"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","file":"module.js","sourcesContent":["import { ContainerModule, bindContributionProvider } from '@visactor/vrender-core';\nimport { DefaultCanvasCirclePicker } from './circle-picker';\nimport { DefaultCanvasRectPicker } from './rect-picker';\nimport { DefaultCanvasArcPicker } from './arc-picker';\nimport { DefaultCanvasAreaPicker } from './area-picker';\nimport { DefaultCanvasImagePicker } from './image-picker';\nimport { DefaultCanvasLinePicker } from './line-picker';\nimport { DefaultCanvasPathPicker } from './path-picker';\nimport { DefaultCanvasSymbolPicker } from './symbol-picker';\nimport { DefaultCanvasTextPicker } from './text-picker';\nimport {\n  CanvasArc3dPicker,\n  CanvasArcPicker,\n  CanvasAreaPicker,\n  CanvasCirclePicker,\n  CanvasGlyphPicker,\n  CanvasGroupPicker,\n  CanvasImagePicker,\n  CanvasLinePicker,\n  CanvasPathPicker,\n  CanvasPickerContribution,\n  CanvasPolygonPicker,\n  CanvasPyramid3dPicker,\n  CanvasRect3dPicker,\n  CanvasRectPicker,\n  CanvasRichTextPicker,\n  CanvasSymbolPicker,\n  CanvasTextPicker\n} from '../constants';\nimport { DefaultCanvasPolygonPicker } from './polygon-picker';\nimport { DefaultCanvasRichTextPicker } from './richtext-picker';\nimport { DefaultCanvasGlyphPicker } from './glyph-picker';\nimport { DefaultCanvasRect3dPicker } from './rect3d-picker';\nimport { DefaultCanvasPyramid3dPicker } from './pyramid3d-picker';\nimport { DefaultCanvasArc3dPicker } from './arc3d-picker';\nimport { DefaultCanvasGroupPicker } from './group-picker';\n\nexport default new ContainerModule((bind, unbind, isBound, rebind) => {\n  // circle picker\n  bind(DefaultCanvasCirclePicker).toSelf().inSingletonScope();\n  bind(CanvasCirclePicker).toService(DefaultCanvasCirclePicker);\n  bind(CanvasPickerContribution).toService(CanvasCirclePicker);\n\n  // reat picker\n  bind(DefaultCanvasRectPicker).toSelf().inSingletonScope();\n  bind(CanvasRectPicker).toService(DefaultCanvasRectPicker);\n  bind(CanvasPickerContribution).toService(CanvasRectPicker);\n\n  // reat3d picker\n  bind(DefaultCanvasRect3dPicker).toSelf().inSingletonScope();\n  bind(CanvasRect3dPicker).toService(DefaultCanvasRect3dPicker);\n  bind(CanvasPickerContribution).toService(CanvasRect3dPicker);\n\n  // arc picker\n  bind(DefaultCanvasArcPicker).toSelf().inSingletonScope();\n  bind(CanvasArcPicker).toService(DefaultCanvasArcPicker);\n  bind(CanvasPickerContribution).toService(CanvasArcPicker);\n\n  // area picker\n  bind(DefaultCanvasAreaPicker).toSelf().inSingletonScope();\n  bind(CanvasAreaPicker).toService(DefaultCanvasAreaPicker);\n  bind(CanvasPickerContribution).toService(CanvasAreaPicker);\n\n  // image picker\n  bind(DefaultCanvasImagePicker).toSelf().inSingletonScope();\n  bind(CanvasImagePicker).toService(DefaultCanvasImagePicker);\n  bind(CanvasPickerContribution).toService(CanvasImagePicker);\n\n  // line picker\n  bind(DefaultCanvasLinePicker).toSelf().inSingletonScope();\n  bind(CanvasLinePicker).toService(DefaultCanvasLinePicker);\n  bind(CanvasPickerContribution).toService(CanvasLinePicker);\n\n  // path picker\n  bind(DefaultCanvasPathPicker).toSelf().inSingletonScope();\n  bind(CanvasPathPicker).toService(DefaultCanvasPathPicker);\n  bind(CanvasPickerContribution).toService(CanvasPathPicker);\n\n  // symbol picker\n  bind(DefaultCanvasSymbolPicker).toSelf().inSingletonScope();\n  bind(CanvasSymbolPicker).toService(DefaultCanvasSymbolPicker);\n  bind(CanvasPickerContribution).toService(CanvasSymbolPicker);\n\n  // text picker\n  bind(DefaultCanvasTextPicker).toSelf().inSingletonScope();\n  bind(CanvasTextPicker).toService(DefaultCanvasTextPicker);\n  bind(CanvasPickerContribution).toService(CanvasTextPicker);\n\n  // polygon picker\n  bind(DefaultCanvasPolygonPicker).toSelf().inSingletonScope();\n  bind(CanvasPolygonPicker).toService(DefaultCanvasPolygonPicker);\n  bind(CanvasPickerContribution).toService(CanvasPolygonPicker);\n\n  // pyramid3d picker\n  bind(DefaultCanvasPyramid3dPicker).toSelf().inSingletonScope();\n  bind(CanvasPyramid3dPicker).toService(DefaultCanvasPyramid3dPicker);\n  bind(CanvasPickerContribution).toService(CanvasPyramid3dPicker);\n\n  // arc3d picker\n  bind(DefaultCanvasArc3dPicker).toSelf().inSingletonScope();\n  bind(CanvasArc3dPicker).toService(DefaultCanvasArc3dPicker);\n  bind(CanvasPickerContribution).toService(CanvasArc3dPicker);\n\n  // richtext picker\n  bind(DefaultCanvasRichTextPicker).toSelf().inSingletonScope();\n  bind(CanvasRichTextPicker).toService(DefaultCanvasRichTextPicker);\n  bind(CanvasPickerContribution).toService(CanvasRichTextPicker);\n  // glyph picker\n  bind(DefaultCanvasGlyphPicker).toSelf().inSingletonScope();\n  bind(CanvasGlyphPicker).toService(DefaultCanvasGlyphPicker);\n  bind(CanvasPickerContribution).toService(CanvasGlyphPicker);\n  // group picker\n  bind(DefaultCanvasGroupPicker).toSelf().inSingletonScope();\n  bind(CanvasGroupPicker).toService(DefaultCanvasGroupPicker);\n  bind(CanvasPickerContribution).toService(CanvasGroupPicker);\n\n  bindContributionProvider(bind, CanvasPickerContribution);\n});\n"]}
+{"version":3,"sources":["../src/picker/contributions/canvas-picker/module.ts"],"names":[],"mappings":"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","file":"module.js","sourcesContent":["import { ContainerModule, bindContributionProvider } from '@visactor/vrender-core';\nimport { DefaultCanvasCirclePicker } from './circle-picker';\nimport { DefaultCanvasRectPicker } from './rect-picker';\nimport { DefaultCanvasArcPicker } from './arc-picker';\nimport { DefaultCanvasAreaPicker } from './area-picker';\nimport { DefaultCanvasImagePicker } from './image-picker';\nimport { DefaultCanvasLinePicker } from './line-picker';\nimport { DefaultCanvasPathPicker } from './path-picker';\nimport { DefaultCanvasSymbolPicker } from './symbol-picker';\nimport { DefaultCanvasTextPicker } from './text-picker';\nimport {\n  CanvasArc3dPicker,\n  CanvasArcPicker,\n  CanvasAreaPicker,\n  CanvasCirclePicker,\n  CanvasGlyphPicker,\n  CanvasGroupPicker,\n  CanvasImagePicker,\n  CanvasLinePicker,\n  CanvasPathPicker,\n  CanvasPickerContribution,\n  CanvasPolygonPicker,\n  CanvasPyramid3dPicker,\n  CanvasRect3dPicker,\n  CanvasRectPicker,\n  CanvasRichTextPicker,\n  CanvasSymbolPicker,\n  CanvasTextPicker\n} from '../constants';\nimport { DefaultCanvasPolygonPicker } from './polygon-picker';\nimport { DefaultCanvasRichTextPicker } from './richtext-picker';\nimport { DefaultCanvasGlyphPicker } from './glyph-picker';\nimport { DefaultCanvasRect3dPicker } from './rect3d-picker';\nimport { DefaultCanvasPyramid3dPicker } from './pyramid3d-picker';\nimport { DefaultCanvasArc3dPicker } from './arc3d-picker';\nimport { DefaultCanvasGroupPicker } from './group-picker';\n\nexport default new ContainerModule((bind, unbind, isBound, rebind) => {\n  // circle picker\n  bind(CanvasCirclePicker).to(DefaultCanvasCirclePicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasCirclePicker);\n\n  // reat picker\n  bind(CanvasRectPicker).to(DefaultCanvasRectPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasRectPicker);\n\n  // reat3d picker\n  bind(CanvasRect3dPicker).to(DefaultCanvasRect3dPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasRect3dPicker);\n\n  // arc picker\n  bind(CanvasArcPicker).to(DefaultCanvasArcPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasArcPicker);\n\n  // area picker\n  bind(CanvasAreaPicker).to(DefaultCanvasAreaPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasAreaPicker);\n\n  // image picker\n  bind(CanvasImagePicker).to(DefaultCanvasImagePicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasImagePicker);\n\n  // line picker\n  bind(CanvasLinePicker).to(DefaultCanvasLinePicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasLinePicker);\n\n  // path picker\n  bind(CanvasPathPicker).to(DefaultCanvasPathPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasPathPicker);\n\n  // symbol picker\n  bind(CanvasSymbolPicker).to(DefaultCanvasSymbolPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasSymbolPicker);\n\n  // text picker\n  bind(CanvasTextPicker).to(DefaultCanvasTextPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasTextPicker);\n\n  // polygon picker\n  bind(CanvasPolygonPicker).to(DefaultCanvasPolygonPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasPolygonPicker);\n\n  // pyramid3d picker\n  bind(CanvasPyramid3dPicker).to(DefaultCanvasPyramid3dPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasPyramid3dPicker);\n\n  // arc3d picker\n  bind(CanvasArc3dPicker).to(DefaultCanvasArc3dPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasArc3dPicker);\n\n  // richtext picker\n  bind(CanvasRichTextPicker).to(DefaultCanvasRichTextPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasRichTextPicker);\n  // glyph picker\n  bind(CanvasGlyphPicker).to(DefaultCanvasGlyphPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasGlyphPicker);\n  // group picker\n  bind(CanvasGroupPicker).to(DefaultCanvasGroupPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasGroupPicker);\n\n  bindContributionProvider(bind, CanvasPickerContribution);\n});\n"]}

package/es/picker/contributions/canvas-picker/polygon-picker.js

@@ -18,6 +18,7 @@ let DefaultCanvasPolygonPicker = class {
     }
     contains(polygon, point, params) {
         if (!polygon.AABBBounds.contains(point.x, point.y)) return !1;
+        if ("imprecise" === polygon.attribute.pickMode) return !0;
         const {pickContext: pickContext} = null != params ? params : {};
         if (!pickContext) return !1;
         const polygonAttribute = getTheme(polygon).polygon;

package/es/picker/contributions/canvas-picker/polygon-picker.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/contributions/canvas-picker/polygon-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAcnG,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IAIrC,YAAmD,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAHjF,SAAI,GAAW,SAAS,CAAC;QACzB,eAAU,GAAW,mBAAmB,CAAC;IAE2C,CAAC;IAErF,QAAQ,CAAC,OAAiB,EAAE,KAAa,EAAE,MAAoB;QAC7D,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE;YAClD,OAAO,KAAK,CAAC;SACd;QAED,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;QACrC,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,KAAK,CAAC;SACd;QAGD,MAAM,gBAAgB,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;QACnD,IAAI,EAAE,CAAC,GAAG,gBAAgB,CAAC,CAAC,EAAE,CAAC,GAAG,gBAAgB,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC;QAE3E,WAAW,CAAC,mBAAmB,EAAE,CAAC;QAClC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,EAAE;YAExC,CAAC,GAAG,CAAC,CAAC;YACN,CAAC,GAAG,CAAC,CAAC;YACN,WAAW,CAAC,mBAAmB,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;SAC5D;aAAM;YACL,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;YACpD,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YACb,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YAEb,WAAW,CAAC,sBAAsB,EAAE,CAAC;SACtC;QAGD,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,cAAc,CAAC,SAAS,CAC3B,OAAO,EACP,WAAW,EACX,CAAC,EACD,CAAC,EACD,EAAS,EACT,IAAI,EACJ,CACE,OAAmB,EACnB,aAA0D,EAC1D,cAA+B,EAC/B,EAAE;YAEF,IAAI,MAAM,EAAE;gBACV,OAAO,IAAI,CAAC;aACb;YACD,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;YACjD,OAAO,MAAM,CAAC;QAChB,CAAC,EACD,CACE,OAAmB,EACnB,aAA0D,EAC1D,cAA+B,EAC/B,EAAE;YAEF,IAAI,MAAM,EAAE;gBACV,OAAO,IAAI,CAAC;aACb;YACD,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,IAAI,cAAc,CAAC,SAAS,CAAC;YACtE,WAAW,CAAC,SAAS,GAAG,SAAS,CAAC;YAClC,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;YACnD,OAAO,MAAM,CAAC;QAChB,CAAC,CACF,CAAC;QAEF,WAAW,CAAC,sBAAsB,EAAE,CAAC;QAErC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AA3EY,0BAA0B;IADtC,UAAU,EAAE;IAKE,WAAA,MAAM,CAAC,aAAa,CAAC,CAAA;;GAJvB,0BAA0B,CA2EtC;SA3EY,0BAA0B","file":"polygon-picker.js","sourcesContent":["import { inject, injectable, getTheme, PolygonRender, POLYGON_NUMBER_TYPE } from '@visactor/vrender-core';\nimport type { IPoint } from '@visactor/vutils';\nimport type {\n  IContext2d,\n  IMarkAttribute,\n  IGraphicAttribute,\n  IThemeAttribute,\n  IPolygon,\n  IGraphicPicker,\n  IGraphicRender,\n  IPickParams\n} from '@visactor/vrender-core';\n\n@injectable()\nexport class DefaultCanvasPolygonPicker implements IGraphicPicker {\n  type: string = 'polygon';\n  numberType: number = POLYGON_NUMBER_TYPE;\n\n  constructor(@inject(PolygonRender) public readonly canvasRenderer: IGraphicRender) {}\n\n  contains(polygon: IPolygon, point: IPoint, params?: IPickParams): boolean {\n    if (!polygon.AABBBounds.contains(point.x, point.y)) {\n      return false;\n    }\n\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    // const polygonAttribute = graphicService.themeService.getCurrentTheme().pathAttribute;\n    const polygonAttribute = getTheme(polygon).polygon;\n    let { x = polygonAttribute.x, y = polygonAttribute.y } = polygon.attribute;\n\n    pickContext.highPerformanceSave();\n    if (!polygon.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      pickContext.transformFromMatrix(polygon.transMatrix, true);\n    } else {\n      const point = polygon.getOffsetXY(polygonAttribute);\n      x += point.x;\n      y += point.y;\n      // 当前context有rotate/scale，重置matrix\n      pickContext.setTransformForCurrent();\n    }\n\n    // 详细形状判断\n    let picked = false;\n    this.canvasRenderer.drawShape(\n      polygon,\n      pickContext,\n      x,\n      y,\n      {} as any,\n      null,\n      (\n        context: IContext2d,\n        pathAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        picked = context.isPointInPath(point.x, point.y);\n        return picked;\n      },\n      (\n        context: IContext2d,\n        pathAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        const lineWidth = pathAttribute.lineWidth || themeAttribute.lineWidth;\n        pickContext.lineWidth = lineWidth;\n        picked = context.isPointInStroke(point.x, point.y);\n        return picked;\n      }\n    );\n\n    pickContext.highPerformanceRestore();\n\n    return picked;\n  }\n}\n"]}
+{"version":3,"sources":["../src/picker/contributions/canvas-picker/polygon-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAcnG,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IAIrC,YAAmD,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAHjF,SAAI,GAAW,SAAS,CAAC;QACzB,eAAU,GAAW,mBAAmB,CAAC;IAE2C,CAAC;IAErF,QAAQ,CAAC,OAAiB,EAAE,KAAa,EAAE,MAAoB;QAC7D,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE;YAClD,OAAO,KAAK,CAAC;SACd;QAED,IAAI,OAAO,CAAC,SAAS,CAAC,QAAQ,KAAK,WAAW,EAAE;YAC9C,OAAO,IAAI,CAAC;SACb;QAED,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;QACrC,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,KAAK,CAAC;SACd;QAGD,MAAM,gBAAgB,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;QACnD,IAAI,EAAE,CAAC,GAAG,gBAAgB,CAAC,CAAC,EAAE,CAAC,GAAG,gBAAgB,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC;QAE3E,WAAW,CAAC,mBAAmB,EAAE,CAAC;QAClC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,EAAE;YAExC,CAAC,GAAG,CAAC,CAAC;YACN,CAAC,GAAG,CAAC,CAAC;YACN,WAAW,CAAC,mBAAmB,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;SAC5D;aAAM;YACL,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;YACpD,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YACb,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YAEb,WAAW,CAAC,sBAAsB,EAAE,CAAC;SACtC;QAGD,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,cAAc,CAAC,SAAS,CAC3B,OAAO,EACP,WAAW,EACX,CAAC,EACD,CAAC,EACD,EAAS,EACT,IAAI,EACJ,CACE,OAAmB,EACnB,aAA0D,EAC1D,cAA+B,EAC/B,EAAE;YAEF,IAAI,MAAM,EAAE;gBACV,OAAO,IAAI,CAAC;aACb;YACD,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;YACjD,OAAO,MAAM,CAAC;QAChB,CAAC,EACD,CACE,OAAmB,EACnB,aAA0D,EAC1D,cAA+B,EAC/B,EAAE;YAEF,IAAI,MAAM,EAAE;gBACV,OAAO,IAAI,CAAC;aACb;YACD,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,IAAI,cAAc,CAAC,SAAS,CAAC;YACtE,WAAW,CAAC,SAAS,GAAG,SAAS,CAAC;YAClC,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;YACnD,OAAO,MAAM,CAAC;QAChB,CAAC,CACF,CAAC;QAEF,WAAW,CAAC,sBAAsB,EAAE,CAAC;QAErC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AA/EY,0BAA0B;IADtC,UAAU,EAAE;IAKE,WAAA,MAAM,CAAC,aAAa,CAAC,CAAA;;GAJvB,0BAA0B,CA+EtC;SA/EY,0BAA0B","file":"polygon-picker.js","sourcesContent":["import { inject, injectable, getTheme, PolygonRender, POLYGON_NUMBER_TYPE } from '@visactor/vrender-core';\nimport type { IPoint } from '@visactor/vutils';\nimport type {\n  IContext2d,\n  IMarkAttribute,\n  IGraphicAttribute,\n  IThemeAttribute,\n  IPolygon,\n  IGraphicPicker,\n  IGraphicRender,\n  IPickParams\n} from '@visactor/vrender-core';\n\n@injectable()\nexport class DefaultCanvasPolygonPicker implements IGraphicPicker {\n  type: string = 'polygon';\n  numberType: number = POLYGON_NUMBER_TYPE;\n\n  constructor(@inject(PolygonRender) public readonly canvasRenderer: IGraphicRender) {}\n\n  contains(polygon: IPolygon, point: IPoint, params?: IPickParams): boolean {\n    if (!polygon.AABBBounds.contains(point.x, point.y)) {\n      return false;\n    }\n\n    if (polygon.attribute.pickMode === 'imprecise') {\n      return true;\n    }\n\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    // const polygonAttribute = graphicService.themeService.getCurrentTheme().pathAttribute;\n    const polygonAttribute = getTheme(polygon).polygon;\n    let { x = polygonAttribute.x, y = polygonAttribute.y } = polygon.attribute;\n\n    pickContext.highPerformanceSave();\n    if (!polygon.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      pickContext.transformFromMatrix(polygon.transMatrix, true);\n    } else {\n      const point = polygon.getOffsetXY(polygonAttribute);\n      x += point.x;\n      y += point.y;\n      // 当前context有rotate/scale，重置matrix\n      pickContext.setTransformForCurrent();\n    }\n\n    // 详细形状判断\n    let picked = false;\n    this.canvasRenderer.drawShape(\n      polygon,\n      pickContext,\n      x,\n      y,\n      {} as any,\n      null,\n      (\n        context: IContext2d,\n        pathAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        picked = context.isPointInPath(point.x, point.y);\n        return picked;\n      },\n      (\n        context: IContext2d,\n        pathAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        const lineWidth = pathAttribute.lineWidth || themeAttribute.lineWidth;\n        pickContext.lineWidth = lineWidth;\n        picked = context.isPointInStroke(point.x, point.y);\n        return picked;\n      }\n    );\n\n    pickContext.highPerformanceRestore();\n\n    return picked;\n  }\n}\n"]}

package/es/picker/contributions/math-picker/module.js

@@ -23,21 +23,16 @@ import { DefaultMathPolygonPicker } from "./polygon-picker";
 import { DefaultMathGlyphPicker } from "./glyph-picker";
 
 export default new ContainerModule((bind => {
-    bind(DefaultMathCirclePicker).toSelf().inSingletonScope(), bind(MathCirclePicker).toService(DefaultMathCirclePicker), 
-    bind(MathPickerContribution).toService(MathCirclePicker), bind(DefaultMathRectPicker).toSelf().inSingletonScope(), 
-    bind(MathRectPicker).toService(DefaultMathRectPicker), bind(MathPickerContribution).toService(MathRectPicker), 
-    bind(DefaultMathArcPicker).toSelf().inSingletonScope(), bind(MathArcPicker).toService(DefaultMathArcPicker), 
-    bind(MathPickerContribution).toService(MathArcPicker), bind(DefaultMathAreaPicker).toSelf().inSingletonScope(), 
-    bind(MathAreaPicker).toService(DefaultMathAreaPicker), bind(MathPickerContribution).toService(MathAreaPicker), 
-    bind(DefaultMathLinePicker).toSelf().inSingletonScope(), bind(MathLinePicker).toService(DefaultMathLinePicker), 
-    bind(MathPickerContribution).toService(MathLinePicker), bind(DefaultMathPathPicker).toSelf().inSingletonScope(), 
-    bind(MathPathPicker).toService(DefaultMathPathPicker), bind(MathPickerContribution).toService(MathPathPicker), 
-    bind(DefaultMathSymbolPicker).toSelf().inSingletonScope(), bind(MathSymbolPicker).toService(DefaultMathSymbolPicker), 
-    bind(MathPickerContribution).toService(MathSymbolPicker), bind(DefaultMathTextPicker).toSelf().inSingletonScope(), 
-    bind(MathTextPicker).toService(DefaultMathTextPicker), bind(MathPickerContribution).toService(MathTextPicker), 
-    bind(DefaultMathPolygonPicker).toSelf().inSingletonScope(), bind(MathPolygonPicker).toService(DefaultMathPolygonPicker), 
-    bind(MathPickerContribution).toService(MathPolygonPicker), bind(DefaultMathGlyphPicker).toSelf().inSingletonScope(), 
-    bind(MathGlyphPicker).toService(DefaultMathGlyphPicker), bind(DefaultMathGlyphPicker).toService(MathGlyphPicker), 
+    bind(MathCirclePicker).to(DefaultMathCirclePicker).inSingletonScope(), bind(MathPickerContribution).toService(MathCirclePicker), 
+    bind(MathRectPicker).to(DefaultMathRectPicker).inSingletonScope(), bind(MathPickerContribution).toService(MathRectPicker), 
+    bind(MathArcPicker).to(DefaultMathArcPicker).inSingletonScope(), bind(MathPickerContribution).toService(MathArcPicker), 
+    bind(MathAreaPicker).to(DefaultMathAreaPicker).inSingletonScope(), bind(MathPickerContribution).toService(MathAreaPicker), 
+    bind(MathLinePicker).to(DefaultMathLinePicker).inSingletonScope(), bind(MathPickerContribution).toService(MathLinePicker), 
+    bind(MathPathPicker).to(DefaultMathPathPicker).inSingletonScope(), bind(MathPickerContribution).toService(MathPathPicker), 
+    bind(MathSymbolPicker).to(DefaultMathSymbolPicker).inSingletonScope(), bind(MathPickerContribution).toService(MathSymbolPicker), 
+    bind(MathTextPicker).to(DefaultMathTextPicker).inSingletonScope(), bind(MathPickerContribution).toService(MathTextPicker), 
+    bind(MathPolygonPicker).to(DefaultMathPolygonPicker).inSingletonScope(), bind(MathPickerContribution).toService(MathPolygonPicker), 
+    bind(MathGlyphPicker).to(DefaultMathGlyphPicker).inSingletonScope(), bind(DefaultMathGlyphPicker).toService(MathGlyphPicker), 
     bindContributionProvider(bind, MathPickerContribution);
 }));
 //# sourceMappingURL=module.js.map

package/es/picker/contributions/math-picker/module.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/contributions/math-picker/module.ts"],"names":[],"mappings":"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","file":"module.js","sourcesContent":["import { ContainerModule, bindContributionProvider } from '@visactor/vrender-core';\nimport { DefaultMathPathPicker } from './path-picker';\nimport {\n  MathArcPicker,\n  MathAreaPicker,\n  MathCirclePicker,\n  MathGlyphPicker,\n  MathLinePicker,\n  MathPathPicker,\n  MathPickerContribution,\n  MathPolygonPicker,\n  MathRectPicker,\n  MathSymbolPicker,\n  MathTextPicker\n} from '../constants';\nimport { DefaultMathCirclePicker } from './circle-picker';\nimport { DefaultMathRectPicker } from './rect-picker';\nimport { DefaultMathArcPicker } from './arc-picker';\nimport { DefaultMathAreaPicker } from './area-picker';\nimport { DefaultMathLinePicker } from './line-picker';\nimport { DefaultMathSymbolPicker } from './symbol-picker';\nimport { DefaultMathTextPicker } from './text-picker';\nimport { DefaultMathPolygonPicker } from './polygon-picker';\nimport { DefaultMathGlyphPicker } from './glyph-picker';\n\nexport default new ContainerModule(bind => {\n  // circle picker\n  bind(DefaultMathCirclePicker).toSelf().inSingletonScope();\n  bind(MathCirclePicker).toService(DefaultMathCirclePicker);\n  bind(MathPickerContribution).toService(MathCirclePicker);\n\n  // rect picker\n  bind(DefaultMathRectPicker).toSelf().inSingletonScope();\n  bind(MathRectPicker).toService(DefaultMathRectPicker);\n  bind(MathPickerContribution).toService(MathRectPicker);\n\n  // arc picker\n  bind(DefaultMathArcPicker).toSelf().inSingletonScope();\n  bind(MathArcPicker).toService(DefaultMathArcPicker);\n  bind(MathPickerContribution).toService(MathArcPicker);\n\n  // area picker\n  bind(DefaultMathAreaPicker).toSelf().inSingletonScope();\n  bind(MathAreaPicker).toService(DefaultMathAreaPicker);\n  bind(MathPickerContribution).toService(MathAreaPicker);\n\n  // // image picker\n  // bind(DefaultCanvasImagePicker).toSelf().inSingletonScope();\n  // bind(ImagePicker).toService(DefaultCanvasImagePicker);\n  // bind(PickerContribution).toService(ImagePicker);\n\n  // line picker\n  bind(DefaultMathLinePicker).toSelf().inSingletonScope();\n  bind(MathLinePicker).toService(DefaultMathLinePicker);\n  bind(MathPickerContribution).toService(MathLinePicker);\n\n  // path picker\n  bind(DefaultMathPathPicker).toSelf().inSingletonScope();\n  bind(MathPathPicker).toService(DefaultMathPathPicker);\n  bind(MathPickerContribution).toService(MathPathPicker);\n\n  // symbol picker\n  bind(DefaultMathSymbolPicker).toSelf().inSingletonScope();\n  bind(MathSymbolPicker).toService(DefaultMathSymbolPicker);\n  bind(MathPickerContribution).toService(MathSymbolPicker);\n\n  // text picker\n  bind(DefaultMathTextPicker).toSelf().inSingletonScope();\n  bind(MathTextPicker).toService(DefaultMathTextPicker);\n  bind(MathPickerContribution).toService(MathTextPicker);\n\n  // polygon picker\n  bind(DefaultMathPolygonPicker).toSelf().inSingletonScope();\n  bind(MathPolygonPicker).toService(DefaultMathPolygonPicker);\n  bind(MathPickerContribution).toService(MathPolygonPicker);\n\n  // glyph picker\n  bind(DefaultMathGlyphPicker).toSelf().inSingletonScope();\n  bind(MathGlyphPicker).toService(DefaultMathGlyphPicker);\n  bind(DefaultMathGlyphPicker).toService(MathGlyphPicker);\n\n  bindContributionProvider(bind, MathPickerContribution);\n});\n"]}
+{"version":3,"sources":["../src/picker/contributions/math-picker/module.ts"],"names":[],"mappings":"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","file":"module.js","sourcesContent":["import { ContainerModule, bindContributionProvider } from '@visactor/vrender-core';\nimport { DefaultMathPathPicker } from './path-picker';\nimport {\n  MathArcPicker,\n  MathAreaPicker,\n  MathCirclePicker,\n  MathGlyphPicker,\n  MathLinePicker,\n  MathPathPicker,\n  MathPickerContribution,\n  MathPolygonPicker,\n  MathRectPicker,\n  MathSymbolPicker,\n  MathTextPicker\n} from '../constants';\nimport { DefaultMathCirclePicker } from './circle-picker';\nimport { DefaultMathRectPicker } from './rect-picker';\nimport { DefaultMathArcPicker } from './arc-picker';\nimport { DefaultMathAreaPicker } from './area-picker';\nimport { DefaultMathLinePicker } from './line-picker';\nimport { DefaultMathSymbolPicker } from './symbol-picker';\nimport { DefaultMathTextPicker } from './text-picker';\nimport { DefaultMathPolygonPicker } from './polygon-picker';\nimport { DefaultMathGlyphPicker } from './glyph-picker';\n\nexport default new ContainerModule(bind => {\n  // circle picker\n  bind(MathCirclePicker).to(DefaultMathCirclePicker).inSingletonScope();\n  bind(MathPickerContribution).toService(MathCirclePicker);\n\n  // rect picker\n  bind(MathRectPicker).to(DefaultMathRectPicker).inSingletonScope();\n  bind(MathPickerContribution).toService(MathRectPicker);\n\n  // arc picker\n  bind(MathArcPicker).to(DefaultMathArcPicker).inSingletonScope();\n  bind(MathPickerContribution).toService(MathArcPicker);\n\n  // area picker\n  bind(MathAreaPicker).to(DefaultMathAreaPicker).inSingletonScope();\n  bind(MathPickerContribution).toService(MathAreaPicker);\n\n  // // image picker\n  // bind(DefaultCanvasImagePicker).toSelf().inSingletonScope();\n  // bind(ImagePicker).toService(DefaultCanvasImagePicker);\n  // bind(PickerContribution).toService(ImagePicker);\n\n  // line picker\n  bind(MathLinePicker).to(DefaultMathLinePicker).inSingletonScope();\n  bind(MathPickerContribution).toService(MathLinePicker);\n\n  // path picker\n  bind(MathPathPicker).to(DefaultMathPathPicker).inSingletonScope();\n  bind(MathPickerContribution).toService(MathPathPicker);\n\n  // symbol picker\n  bind(MathSymbolPicker).to(DefaultMathSymbolPicker).inSingletonScope();\n  bind(MathPickerContribution).toService(MathSymbolPicker);\n\n  // text picker\n  bind(MathTextPicker).to(DefaultMathTextPicker).inSingletonScope();\n  bind(MathPickerContribution).toService(MathTextPicker);\n\n  // polygon picker\n  bind(MathPolygonPicker).to(DefaultMathPolygonPicker).inSingletonScope();\n  bind(MathPickerContribution).toService(MathPolygonPicker);\n\n  // glyph picker\n  bind(MathGlyphPicker).to(DefaultMathGlyphPicker).inSingletonScope();\n  bind(DefaultMathGlyphPicker).toService(MathGlyphPicker);\n\n  bindContributionProvider(bind, MathPickerContribution);\n});\n"]}

package/es/picker/index.d.ts

@@ -1 +1 @@
-export * from './module';
+

package/es/picker/index.js

@@ -1,2 +1 @@
-export * from "./module";
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/es/picker/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC","file":"index.js","sourcesContent":["export * from './module';\n"]}
+{"version":3,"sources":["../src/picker/index.ts"],"names":[],"mappings":"","file":"index.js","sourcesContent":["// export * from './canvas-module';\n// export * from './math-module';\n"]}

package/es/picker/math-picker-service.d.ts

@@ -3,13 +3,12 @@ import { DefaultPickService } from '@visactor/vrender-core';
 import type { ICanvas, IContext2d, IGraphic, EnvType, IGlobal, IGraphicPicker, IPickerService, IContributionProvider, IPickItemInterceptorContribution, IPickParams, PickResult } from '@visactor/vrender-core';
 export declare class DefaultMathPickerService extends DefaultPickService implements IPickerService {
     protected readonly contributions: IContributionProvider<IGraphicPicker>;
-    readonly global: IGlobal;
     protected readonly pickItemInterceptorContributions: IContributionProvider<IPickItemInterceptorContribution>;
     type: 'default';
     pickCanvas: ICanvas;
     pickContext: IContext2d;
     pickerMap: Map<number, IGraphicPicker>;
-    constructor(contributions: IContributionProvider<IGraphicPicker>, global: IGlobal, pickItemInterceptorContributions: IContributionProvider<IPickItemInterceptorContribution>);
+    constructor(contributions: IContributionProvider<IGraphicPicker>, pickItemInterceptorContributions: IContributionProvider<IPickItemInterceptorContribution>);
     init(): void;
     configure(global: IGlobal, env: EnvType): void;
     pickItem(graphic: IGraphic, point: IPointLike, parentMatrix: IMatrix | null, params?: IPickParams): PickResult | null;

package/es/picker/math-picker-service.js

@@ -10,17 +10,16 @@ var __decorate = this && this.__decorate || function(decorators, target, key, de
     };
 };
 
-import { ContributionProvider, inject, injectable, named, postConstruct, DefaultPickService, EmptyContext2d, VGlobal, PickItemInterceptor } from "@visactor/vrender-core";
+import { ContributionProvider, inject, injectable, named, DefaultPickService, EmptyContext2d, PickItemInterceptor } from "@visactor/vrender-core";
 
 import { MathPickerContribution } from "./contributions/constants";
 
 let DefaultMathPickerService = class extends DefaultPickService {
-    constructor(contributions, global, pickItemInterceptorContributions) {
-        super(global, pickItemInterceptorContributions), this.contributions = contributions, 
-        this.global = global, this.pickItemInterceptorContributions = pickItemInterceptorContributions, 
+    constructor(contributions, pickItemInterceptorContributions) {
+        super(pickItemInterceptorContributions), this.contributions = contributions, this.pickItemInterceptorContributions = pickItemInterceptorContributions, 
         this.global.hooks.onSetEnv.tap("math-picker-service", ((lastEnv, env, global) => {
             this.configure(global, env);
-        })), this.configure(this.global, this.global.env), this.pickerMap = new Map;
+        })), this.configure(this.global, this.global.env), this.pickerMap = new Map, this.init();
     }
     init() {
         this.contributions.getContributions().forEach((item => {
@@ -41,8 +40,7 @@ let DefaultMathPickerService = class extends DefaultPickService {
     }
 };
 
-__decorate([ postConstruct(), __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", void 0) ], DefaultMathPickerService.prototype, "init", null), 
-DefaultMathPickerService = __decorate([ injectable(), __param(0, inject(ContributionProvider)), __param(0, named(MathPickerContribution)), __param(1, inject(VGlobal)), __param(2, inject(ContributionProvider)), __param(2, named(PickItemInterceptor)), __metadata("design:paramtypes", [ Object, Object, Object ]) ], DefaultMathPickerService);
+DefaultMathPickerService = __decorate([ injectable(), __param(0, inject(ContributionProvider)), __param(0, named(MathPickerContribution)), __param(1, inject(ContributionProvider)), __param(1, named(PickItemInterceptor)), __metadata("design:paramtypes", [ Object, Object ]) ], DefaultMathPickerService);
 
 export { DefaultMathPickerService };
 //# sourceMappingURL=math-picker-service.js.map

package/es/picker/math-picker-service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/math-picker-service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,OAAO,EACL,oBAAoB,EACpB,MAAM,EACN,UAAU,EACV,KAAK,EACL,aAAa,EACb,kBAAkB,EAClB,cAAc,EACd,OAAO,EACP,mBAAmB,EACpB,MAAM,wBAAwB,CAAC;AAchC,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAK5D,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,kBAAkB;IAO9D,YAGqB,aAAoD,EACtC,MAAe,EAI7B,gCAAyF;QAE5G,KAAK,CAAC,MAAM,EAAE,gCAAgC,CAAC,CAAC;QAP7B,kBAAa,GAAb,aAAa,CAAuC;QACtC,WAAM,GAAN,MAAM,CAAS;QAI7B,qCAAgC,GAAhC,gCAAgC,CAAyD;QAG5G,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;YAC7E,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7C,IAAI,CAAC,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;IAC7B,CAAC;IAGD,IAAI;QACF,IAAI,CAAC,aAAa,CAAC,gBAAgB,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACnD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,KAAK,EAAE,CAAC;IAChB,CAAC;IAED,SAAS,CAAC,MAAe,EAAE,GAAY;QACrC,IAAI,CAAC,WAAW,GAAG,IAAI,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACjD,CAAC;IAGD,QAAQ,CACN,OAAiB,EACjB,KAAiB,EACjB,YAA4B,EAC5B,MAAoB;QAEpB,IAAI,OAAO,CAAC,SAAS,CAAC,QAAQ,KAAK,KAAK,EAAE;YACxC,OAAO,IAAI,CAAC;SACb;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACtD,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,IAAI,CAAC;SACb;QACD,MAAM,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;QACnE,IAAI,CAAC,EAAE;YACL,OAAO;gBACL,OAAO,EAAE,CAAC;aACX,CAAC;SACH;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AAlCC;IAAC,aAAa,EAAE;;;;oDAMf;AA/BU,wBAAwB;IADpC,UAAU,EAAE;IASR,WAAA,MAAM,CAAC,oBAAoB,CAAC,CAAA;IAC5B,WAAA,KAAK,CAAC,sBAAsB,CAAC,CAAA;IAE7B,WAAA,MAAM,CAAC,OAAO,CAAC,CAAA;IAEf,WAAA,MAAM,CAAC,oBAAoB,CAAC,CAAA;IAC5B,WAAA,KAAK,CAAC,mBAAmB,CAAC,CAAA;;GAdlB,wBAAwB,CA2DpC;SA3DY,wBAAwB","file":"math-picker-service.js","sourcesContent":["import type { IMatrix, IPointLike } from '@visactor/vutils';\n// eslint-disable-next-line\nimport {\n  ContributionProvider,\n  inject,\n  injectable,\n  named,\n  postConstruct,\n  DefaultPickService,\n  EmptyContext2d,\n  VGlobal,\n  PickItemInterceptor\n} from '@visactor/vrender-core';\nimport type {\n  ICanvas,\n  IContext2d,\n  IGraphic,\n  EnvType,\n  IGlobal,\n  IGraphicPicker,\n  IPickerService,\n  IContributionProvider,\n  IPickItemInterceptorContribution,\n  IPickParams,\n  PickResult\n} from '@visactor/vrender-core';\nimport { MathPickerContribution } from './contributions/constants';\n\n// 默认的pick-service，提供基本的最优选中策略，尽量不需要用户自己实现contribution\n// 用户可以写plugin\n@injectable()\nexport class DefaultMathPickerService extends DefaultPickService implements IPickerService {\n  declare type: 'default';\n  // pcik canvas\n  declare pickCanvas: ICanvas;\n  declare pickContext: IContext2d;\n  declare pickerMap: Map<number, IGraphicPicker>;\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(MathPickerContribution)\n    protected readonly contributions: IContributionProvider<IGraphicPicker>,\n    @inject(VGlobal) public readonly global: IGlobal,\n    // 拦截器\n    @inject(ContributionProvider)\n    @named(PickItemInterceptor)\n    protected readonly pickItemInterceptorContributions: IContributionProvider<IPickItemInterceptorContribution>\n  ) {\n    super(global, pickItemInterceptorContributions);\n    this.global.hooks.onSetEnv.tap('math-picker-service', (lastEnv, env, global) => {\n      this.configure(global, env);\n    });\n    this.configure(this.global, this.global.env);\n    this.pickerMap = new Map();\n  }\n\n  @postConstruct()\n  init() {\n    this.contributions.getContributions().forEach(item => {\n      this.pickerMap.set(item.numberType, item);\n    });\n    super._init();\n  }\n\n  configure(global: IGlobal, env: EnvType) {\n    this.pickContext = new EmptyContext2d(null, 1);\n  }\n\n  // todo: switch统一改为数字map\n  pickItem(\n    graphic: IGraphic,\n    point: IPointLike,\n    parentMatrix: IMatrix | null,\n    params?: IPickParams\n  ): PickResult | null {\n    if (graphic.attribute.pickable === false) {\n      return null;\n    }\n    const picker = this.pickerMap.get(graphic.numberType);\n    if (!picker) {\n      return null;\n    }\n    const g = picker.contains(graphic, point, params) ? graphic : null;\n    if (g) {\n      return {\n        graphic: g\n      };\n    }\n    return null;\n  }\n}\n"]}
+{"version":3,"sources":["../src/picker/math-picker-service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,OAAO,EACL,oBAAoB,EACpB,MAAM,EACN,UAAU,EACV,KAAK,EACL,kBAAkB,EAClB,cAAc,EACd,mBAAmB,EACpB,MAAM,wBAAwB,CAAC;AAchC,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAK5D,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,kBAAkB;IAO9D,YAGqB,aAAoD,EAIpD,gCAAyF;QAE5G,KAAK,CAAC,gCAAgC,CAAC,CAAC;QANrB,kBAAa,GAAb,aAAa,CAAuC;QAIpD,qCAAgC,GAAhC,gCAAgC,CAAyD;QAG5G,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;YAC7E,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7C,IAAI,CAAC,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI,EAAE,CAAC;IACd,CAAC;IAED,IAAI;QACF,IAAI,CAAC,aAAa,CAAC,gBAAgB,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACnD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,KAAK,EAAE,CAAC;IAChB,CAAC;IAED,SAAS,CAAC,MAAe,EAAE,GAAY;QACrC,IAAI,CAAC,WAAW,GAAG,IAAI,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACjD,CAAC;IAGD,QAAQ,CACN,OAAiB,EACjB,KAAiB,EACjB,YAA4B,EAC5B,MAAoB;QAEpB,IAAI,OAAO,CAAC,SAAS,CAAC,QAAQ,KAAK,KAAK,EAAE;YACxC,OAAO,IAAI,CAAC;SACb;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACtD,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,IAAI,CAAC;SACb;QACD,MAAM,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;QACnE,IAAI,CAAC,EAAE;YACL,OAAO;gBACL,OAAO,EAAE,CAAC;aACX,CAAC;SACH;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AA1DY,wBAAwB;IADpC,UAAU,EAAE;IASR,WAAA,MAAM,CAAC,oBAAoB,CAAC,CAAA;IAC5B,WAAA,KAAK,CAAC,sBAAsB,CAAC,CAAA;IAG7B,WAAA,MAAM,CAAC,oBAAoB,CAAC,CAAA;IAC5B,WAAA,KAAK,CAAC,mBAAmB,CAAC,CAAA;;GAblB,wBAAwB,CA0DpC;SA1DY,wBAAwB","file":"math-picker-service.js","sourcesContent":["import type { IMatrix, IPointLike } from '@visactor/vutils';\n// eslint-disable-next-line\nimport {\n  ContributionProvider,\n  inject,\n  injectable,\n  named,\n  DefaultPickService,\n  EmptyContext2d,\n  PickItemInterceptor\n} from '@visactor/vrender-core';\nimport type {\n  ICanvas,\n  IContext2d,\n  IGraphic,\n  EnvType,\n  IGlobal,\n  IGraphicPicker,\n  IPickerService,\n  IContributionProvider,\n  IPickItemInterceptorContribution,\n  IPickParams,\n  PickResult\n} from '@visactor/vrender-core';\nimport { MathPickerContribution } from './contributions/constants';\n\n// 默认的pick-service，提供基本的最优选中策略，尽量不需要用户自己实现contribution\n// 用户可以写plugin\n@injectable()\nexport class DefaultMathPickerService extends DefaultPickService implements IPickerService {\n  declare type: 'default';\n  // pcik canvas\n  declare pickCanvas: ICanvas;\n  declare pickContext: IContext2d;\n  declare pickerMap: Map<number, IGraphicPicker>;\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(MathPickerContribution)\n    protected readonly contributions: IContributionProvider<IGraphicPicker>,\n    // 拦截器\n    @inject(ContributionProvider)\n    @named(PickItemInterceptor)\n    protected readonly pickItemInterceptorContributions: IContributionProvider<IPickItemInterceptorContribution>\n  ) {\n    super(pickItemInterceptorContributions);\n    this.global.hooks.onSetEnv.tap('math-picker-service', (lastEnv, env, global) => {\n      this.configure(global, env);\n    });\n    this.configure(this.global, this.global.env);\n    this.pickerMap = new Map();\n    this.init();\n  }\n\n  init() {\n    this.contributions.getContributions().forEach(item => {\n      this.pickerMap.set(item.numberType, item);\n    });\n    super._init();\n  }\n\n  configure(global: IGlobal, env: EnvType) {\n    this.pickContext = new EmptyContext2d(null, 1);\n  }\n\n  // todo: switch统一改为数字map\n  pickItem(\n    graphic: IGraphic,\n    point: IPointLike,\n    parentMatrix: IMatrix | null,\n    params?: IPickParams\n  ): PickResult | null {\n    if (graphic.attribute.pickable === false) {\n      return null;\n    }\n    const picker = this.pickerMap.get(graphic.numberType);\n    if (!picker) {\n      return null;\n    }\n    const g = picker.contains(graphic, point, params) ? graphic : null;\n    if (g) {\n      return {\n        graphic: g\n      };\n    }\n    return null;\n  }\n}\n"]}

package/es/render/contributions/rough/rough-rect.js

@@ -32,7 +32,9 @@ let RoughCanvasRectRender = class {
             const {dx: dx = rectAttribute.dx, dy: dy = rectAttribute.dy} = rect.attribute;
             x += dx, y += dy, context.setTransformForCurrent();
         } else x = 0, y = 0, context.transformFromMatrix(rect.transMatrix, !0);
-        const {fill: fill = rectAttribute.fill, stroke: stroke = rectAttribute.stroke, fillColor: fillColor = rectAttribute.fill, strokeColor: strokeColor = rectAttribute.stroke, width: width = rectAttribute.width, height: height = rectAttribute.height, lineWidth: lineWidth = rectAttribute.lineWidth, maxRandomnessOffset: maxRandomnessOffset = defaultRouthThemeSpec.maxRandomnessOffset, roughness: roughness = defaultRouthThemeSpec.roughness, bowing: bowing = defaultRouthThemeSpec.bowing, curveFitting: curveFitting = defaultRouthThemeSpec.curveFitting, curveTightness: curveTightness = defaultRouthThemeSpec.curveTightness, curveStepCount: curveStepCount = defaultRouthThemeSpec.curveStepCount, fillStyle: fillStyle = defaultRouthThemeSpec.fillStyle, fillWeight: fillWeight = defaultRouthThemeSpec.fillWeight, hachureAngle: hachureAngle = defaultRouthThemeSpec.hachureAngle, hachureGap: hachureGap = defaultRouthThemeSpec.hachureGap, simplification: simplification = defaultRouthThemeSpec.simplification, dashOffset: dashOffset = defaultRouthThemeSpec.dashOffset, dashGap: dashGap = defaultRouthThemeSpec.dashGap, zigzagOffset: zigzagOffset = defaultRouthThemeSpec.zigzagOffset, seed: seed = defaultRouthThemeSpec.seed, fillLineDash: fillLineDash = defaultRouthThemeSpec.fillLineDash, fillLineDashOffset: fillLineDashOffset = defaultRouthThemeSpec.fillLineDashOffset, disableMultiStroke: disableMultiStroke = defaultRouthThemeSpec.disableMultiStroke, disableMultiStrokeFill: disableMultiStrokeFill = defaultRouthThemeSpec.disableMultiStrokeFill, preserveVertices: preserveVertices = defaultRouthThemeSpec.preserveVertices, fixedDecimalPlaceDigits: fixedDecimalPlaceDigits = defaultRouthThemeSpec.fixedDecimalPlaceDigits} = rect.attribute;
+        const {fill: fill = rectAttribute.fill, stroke: stroke = rectAttribute.stroke, fillColor: fillColor = rectAttribute.fill, strokeColor: strokeColor = rectAttribute.stroke, x1: x1, y1: y1, lineWidth: lineWidth = rectAttribute.lineWidth, maxRandomnessOffset: maxRandomnessOffset = defaultRouthThemeSpec.maxRandomnessOffset, roughness: roughness = defaultRouthThemeSpec.roughness, bowing: bowing = defaultRouthThemeSpec.bowing, curveFitting: curveFitting = defaultRouthThemeSpec.curveFitting, curveTightness: curveTightness = defaultRouthThemeSpec.curveTightness, curveStepCount: curveStepCount = defaultRouthThemeSpec.curveStepCount, fillStyle: fillStyle = defaultRouthThemeSpec.fillStyle, fillWeight: fillWeight = defaultRouthThemeSpec.fillWeight, hachureAngle: hachureAngle = defaultRouthThemeSpec.hachureAngle, hachureGap: hachureGap = defaultRouthThemeSpec.hachureGap, simplification: simplification = defaultRouthThemeSpec.simplification, dashOffset: dashOffset = defaultRouthThemeSpec.dashOffset, dashGap: dashGap = defaultRouthThemeSpec.dashGap, zigzagOffset: zigzagOffset = defaultRouthThemeSpec.zigzagOffset, seed: seed = defaultRouthThemeSpec.seed, fillLineDash: fillLineDash = defaultRouthThemeSpec.fillLineDash, fillLineDashOffset: fillLineDashOffset = defaultRouthThemeSpec.fillLineDashOffset, disableMultiStroke: disableMultiStroke = defaultRouthThemeSpec.disableMultiStroke, disableMultiStrokeFill: disableMultiStrokeFill = defaultRouthThemeSpec.disableMultiStrokeFill, preserveVertices: preserveVertices = defaultRouthThemeSpec.preserveVertices, fixedDecimalPlaceDigits: fixedDecimalPlaceDigits = defaultRouthThemeSpec.fixedDecimalPlaceDigits} = rect.attribute;
+        let {width: width = rectAttribute.width, height: height = rectAttribute.height} = rect.attribute;
+        width = (null != width ? width : x1 - x) || 0, height = (null != height ? height : y1 - y) || 0, 
         rc.rectangle(x, y, width, height, {
             fill: fill ? fillColor : void 0,
             stroke: stroke ? strokeColor : void 0,

package/es/render/contributions/rough/rough-rect.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/rough/rough-rect.ts"],"names":[],"mappings":"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","file":"rough-rect.js","sourcesContent":["import type {\n  IGraphicRender,\n  IRenderService,\n  IRect,\n  IGraphicAttribute,\n  IContext2d,\n  IGraphic,\n  IMarkAttribute,\n  IThemeAttribute,\n  IDrawContext,\n  IGraphicRenderDrawParams\n} from '@visactor/vrender-core';\nimport { RECT_NUMBER_TYPE, DefaultCanvasRectRender, getTheme, inject, injectable } from '@visactor/vrender-core';\nimport rough from 'roughjs';\nimport { defaultRouthThemeSpec } from './config';\n\n@injectable()\nexport class RoughCanvasRectRender implements IGraphicRender {\n  type: 'rect';\n  numberType: number;\n  style: 'rough' = 'rough';\n\n  constructor(\n    @inject(DefaultCanvasRectRender)\n    public readonly canvasRenderer: IGraphicRender\n  ) {\n    this.type = 'rect';\n    this.numberType = RECT_NUMBER_TYPE;\n  }\n\n  draw(rect: IRect, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n    // 获取到原生canvas\n    const canvas = context.canvas.nativeCanvas;\n    const rc = rough.canvas(canvas);\n\n    context.highPerformanceSave();\n\n    // const rectAttribute = graphicService.themeService.getCurrentTheme().rectAttribute;\n    const rectAttribute = getTheme(rect).rect;\n    let { x = rectAttribute.x, y = rectAttribute.y } = rect.attribute;\n    if (!rect.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      context.transformFromMatrix(rect.transMatrix, true);\n    } else {\n      const { dx = rectAttribute.dx, dy = rectAttribute.dy } = rect.attribute;\n      x += dx;\n      y += dy;\n      // 当前context有rotate/scale，重置matrix\n      context.setTransformForCurrent();\n    }\n\n    const {\n      fill = rectAttribute.fill,\n      stroke = rectAttribute.stroke,\n      fillColor = rectAttribute.fill,\n      strokeColor = rectAttribute.stroke,\n      width = rectAttribute.width,\n      height = rectAttribute.height,\n      lineWidth = rectAttribute.lineWidth,\n      maxRandomnessOffset = defaultRouthThemeSpec.maxRandomnessOffset,\n      roughness = defaultRouthThemeSpec.roughness,\n      bowing = defaultRouthThemeSpec.bowing,\n      curveFitting = defaultRouthThemeSpec.curveFitting,\n      curveTightness = defaultRouthThemeSpec.curveTightness,\n      curveStepCount = defaultRouthThemeSpec.curveStepCount,\n      fillStyle = defaultRouthThemeSpec.fillStyle,\n      fillWeight = defaultRouthThemeSpec.fillWeight,\n      hachureAngle = defaultRouthThemeSpec.hachureAngle,\n      hachureGap = defaultRouthThemeSpec.hachureGap,\n      simplification = defaultRouthThemeSpec.simplification,\n      dashOffset = defaultRouthThemeSpec.dashOffset,\n      dashGap = defaultRouthThemeSpec.dashGap,\n      zigzagOffset = defaultRouthThemeSpec.zigzagOffset,\n      seed = defaultRouthThemeSpec.seed,\n      fillLineDash = defaultRouthThemeSpec.fillLineDash,\n      fillLineDashOffset = defaultRouthThemeSpec.fillLineDashOffset,\n      disableMultiStroke = defaultRouthThemeSpec.disableMultiStroke,\n      disableMultiStrokeFill = defaultRouthThemeSpec.disableMultiStrokeFill,\n      preserveVertices = defaultRouthThemeSpec.preserveVertices,\n      fixedDecimalPlaceDigits = defaultRouthThemeSpec.fixedDecimalPlaceDigits\n    } = rect.attribute as any;\n    rc.rectangle(x, y, width, height, {\n      fill: fill ? (fillColor as string) : undefined,\n      stroke: stroke ? (strokeColor as string) : undefined,\n      strokeWidth: lineWidth,\n      maxRandomnessOffset,\n      roughness,\n      bowing,\n      curveFitting,\n      curveTightness,\n      curveStepCount,\n      fillStyle,\n      fillWeight,\n      hachureAngle,\n      hachureGap,\n      simplification,\n      dashOffset,\n      dashGap,\n      zigzagOffset,\n      seed,\n      fillLineDash,\n      fillLineDashOffset,\n      disableMultiStroke,\n      disableMultiStrokeFill,\n      preserveVertices,\n      fixedDecimalPlaceDigits\n    });\n\n    context.highPerformanceRestore();\n  }\n\n  drawShape(\n    graphic: IGraphic,\n    ctx: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ): void {\n    if (this.canvasRenderer.drawShape) {\n      return this.canvasRenderer.drawShape(graphic, ctx, x, y, drawContext, params, fillCb, strokeCb);\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../src/render/contributions/rough/rough-rect.ts"],"names":[],"mappings":"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","file":"rough-rect.js","sourcesContent":["import type {\n  IGraphicRender,\n  IRenderService,\n  IRect,\n  IGraphicAttribute,\n  IContext2d,\n  IGraphic,\n  IMarkAttribute,\n  IThemeAttribute,\n  IDrawContext,\n  IGraphicRenderDrawParams\n} from '@visactor/vrender-core';\nimport { RECT_NUMBER_TYPE, DefaultCanvasRectRender, getTheme, inject, injectable } from '@visactor/vrender-core';\nimport rough from 'roughjs';\nimport { defaultRouthThemeSpec } from './config';\n\n@injectable()\nexport class RoughCanvasRectRender implements IGraphicRender {\n  type: 'rect';\n  numberType: number;\n  style: 'rough' = 'rough';\n\n  constructor(\n    @inject(DefaultCanvasRectRender)\n    public readonly canvasRenderer: IGraphicRender\n  ) {\n    this.type = 'rect';\n    this.numberType = RECT_NUMBER_TYPE;\n  }\n\n  draw(rect: IRect, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n    // 获取到原生canvas\n    const canvas = context.canvas.nativeCanvas;\n    const rc = rough.canvas(canvas);\n\n    context.highPerformanceSave();\n\n    // const rectAttribute = graphicService.themeService.getCurrentTheme().rectAttribute;\n    const rectAttribute = getTheme(rect).rect;\n    let { x = rectAttribute.x, y = rectAttribute.y } = rect.attribute;\n    if (!rect.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      context.transformFromMatrix(rect.transMatrix, true);\n    } else {\n      const { dx = rectAttribute.dx, dy = rectAttribute.dy } = rect.attribute;\n      x += dx;\n      y += dy;\n      // 当前context有rotate/scale，重置matrix\n      context.setTransformForCurrent();\n    }\n\n    const {\n      fill = rectAttribute.fill,\n      stroke = rectAttribute.stroke,\n      fillColor = rectAttribute.fill,\n      strokeColor = rectAttribute.stroke,\n      x1,\n      y1,\n      lineWidth = rectAttribute.lineWidth,\n      maxRandomnessOffset = defaultRouthThemeSpec.maxRandomnessOffset,\n      roughness = defaultRouthThemeSpec.roughness,\n      bowing = defaultRouthThemeSpec.bowing,\n      curveFitting = defaultRouthThemeSpec.curveFitting,\n      curveTightness = defaultRouthThemeSpec.curveTightness,\n      curveStepCount = defaultRouthThemeSpec.curveStepCount,\n      fillStyle = defaultRouthThemeSpec.fillStyle,\n      fillWeight = defaultRouthThemeSpec.fillWeight,\n      hachureAngle = defaultRouthThemeSpec.hachureAngle,\n      hachureGap = defaultRouthThemeSpec.hachureGap,\n      simplification = defaultRouthThemeSpec.simplification,\n      dashOffset = defaultRouthThemeSpec.dashOffset,\n      dashGap = defaultRouthThemeSpec.dashGap,\n      zigzagOffset = defaultRouthThemeSpec.zigzagOffset,\n      seed = defaultRouthThemeSpec.seed,\n      fillLineDash = defaultRouthThemeSpec.fillLineDash,\n      fillLineDashOffset = defaultRouthThemeSpec.fillLineDashOffset,\n      disableMultiStroke = defaultRouthThemeSpec.disableMultiStroke,\n      disableMultiStrokeFill = defaultRouthThemeSpec.disableMultiStrokeFill,\n      preserveVertices = defaultRouthThemeSpec.preserveVertices,\n      fixedDecimalPlaceDigits = defaultRouthThemeSpec.fixedDecimalPlaceDigits\n    } = rect.attribute as any;\n\n    let { width = rectAttribute.width, height = rectAttribute.height } = rect.attribute;\n\n    width = (width ?? x1 - x) || 0;\n    height = (height ?? y1 - y) || 0;\n\n    rc.rectangle(x, y, width, height, {\n      fill: fill ? (fillColor as string) : undefined,\n      stroke: stroke ? (strokeColor as string) : undefined,\n      strokeWidth: lineWidth,\n      maxRandomnessOffset,\n      roughness,\n      bowing,\n      curveFitting,\n      curveTightness,\n      curveStepCount,\n      fillStyle,\n      fillWeight,\n      hachureAngle,\n      hachureGap,\n      simplification,\n      dashOffset,\n      dashGap,\n      zigzagOffset,\n      seed,\n      fillLineDash,\n      fillLineDashOffset,\n      disableMultiStroke,\n      disableMultiStrokeFill,\n      preserveVertices,\n      fixedDecimalPlaceDigits\n    });\n\n    context.highPerformanceRestore();\n  }\n\n  drawShape(\n    graphic: IGraphic,\n    ctx: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ): void {\n    if (this.canvasRenderer.drawShape) {\n      return this.canvasRenderer.drawShape(graphic, ctx, x, y, drawContext, params, fillCb, strokeCb);\n    }\n  }\n}\n"]}

package/es/window/contributions/browser-contribution.d.ts

@@ -1,16 +1,19 @@
 import { BaseWindowHandlerContribution, ContainerModule } from '@visactor/vrender-core';
-import type { IContext2d, ICanvas, IDomRectLike, EnvType, IGlobal, IWindowHandlerContribution, IWindowParams } from '@visactor/vrender-core';
+import type { IContext2d, ICanvas, IDomRectLike, EnvType, IWindowHandlerContribution, IWindowParams } from '@visactor/vrender-core';
 import type { IBoundsLike } from '@visactor/vutils';
 export declare class BrowserWindowHandlerContribution extends BaseWindowHandlerContribution implements IWindowHandlerContribution {
-    private readonly global;
     static env: EnvType;
     type: EnvType;
     canvas: ICanvas;
     observer?: MutationObserver;
     protected _canvasIsIntersecting: boolean;
     protected _onVisibleChangeCb: (currentVisible: boolean) => void;
+    private readonly global;
     get container(): HTMLElement | null;
-    constructor(global: IGlobal);
+    static idprefix: string;
+    static prefix_count: number;
+    static GenerateCanvasId(): string;
+    constructor();
     getTitle(): string;
     getWH(): {
         width: number;

package/es/window/contributions/browser-contribution.js

@@ -1,25 +1,24 @@
-var __decorate = this && this.__decorate || function(decorators, target, key, desc) {
+var BrowserWindowHandlerContribution_1, __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;
 }, __metadata = this && this.__metadata || function(k, v) {
     if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
-}, __param = this && this.__param || function(paramIndex, decorator) {
-    return function(target, key) {
-        decorator(target, key, paramIndex);
-    };
 };
 
-import { inject, injectable, Generator, BaseWindowHandlerContribution, VGlobal, ContainerModule, WindowHandlerContribution } from "@visactor/vrender-core";
+import { injectable, BaseWindowHandlerContribution, ContainerModule, WindowHandlerContribution, application } from "@visactor/vrender-core";
 
 import { BrowserCanvas } from "../../canvas/contributions/browser";
 
-let BrowserWindowHandlerContribution = class extends BaseWindowHandlerContribution {
+let BrowserWindowHandlerContribution = BrowserWindowHandlerContribution_1 = class extends BaseWindowHandlerContribution {
     get container() {
         return this.canvas.nativeCanvas.parentElement;
     }
-    constructor(global) {
-        super(), this.global = global, this.type = "browser", this._canvasIsIntersecting = !0;
+    static GenerateCanvasId() {
+        return `${BrowserWindowHandlerContribution_1.idprefix}_${BrowserWindowHandlerContribution_1.prefix_count++}`;
+    }
+    constructor() {
+        super(), this.type = "browser", this._canvasIsIntersecting = !0, this.global = application.global;
     }
     getTitle() {
         return this.canvas.id.toString();
@@ -38,7 +37,7 @@ let BrowserWindowHandlerContribution = class extends BaseWindowHandlerContributi
         this.postInit();
     }
     postInit() {
-        try {
+        if (this.global.optimizeVisible) try {
             this.observerCanvas();
         } catch (err) {
             console.error("发生错误，该环境不存在IntersectionObserver");
@@ -73,7 +72,7 @@ let BrowserWindowHandlerContribution = class extends BaseWindowHandlerContributi
             dpr: params.dpr,
             nativeCanvas: nativeCanvas,
             container: container,
-            id: Generator.GenAutoIncrementId().toString(),
+            id: BrowserWindowHandlerContribution_1.GenerateCanvasId(),
             canvasControled: !0
         };
         this.canvas = new BrowserCanvas(options);
@@ -165,7 +164,8 @@ let BrowserWindowHandlerContribution = class extends BaseWindowHandlerContributi
     }
 };
 
-BrowserWindowHandlerContribution.env = "browser", BrowserWindowHandlerContribution = __decorate([ injectable(), __param(0, inject(VGlobal)), __metadata("design:paramtypes", [ Object ]) ], BrowserWindowHandlerContribution);
+BrowserWindowHandlerContribution.env = "browser", BrowserWindowHandlerContribution.idprefix = "visactor_window", 
+BrowserWindowHandlerContribution.prefix_count = 0, BrowserWindowHandlerContribution = BrowserWindowHandlerContribution_1 = __decorate([ injectable(), __metadata("design:paramtypes", []) ], BrowserWindowHandlerContribution);
 
 export { BrowserWindowHandlerContribution };