@visactor/vrender-kits 1.0.37 → 1.1.0-alpha.0

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/contributions/canvas-picker/rect3d-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EAAmB,wBAAwB,EAAE,kBAAkB,EAAoB,MAAM,cAAc,CAAC;AAE/G,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAE5D,IAAI,cAAc,GAAG,KAAK,CAAC;AAC3B,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,eAAe,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IAC1F,IAAI,cAAc,EAAE;QAClB,OAAO;KACR;IACD,cAAc,GAAG,IAAI,CAAC;IAEtB,IAAI,CAAC,kBAAkB,CAAC,CAAC,EAAE,CAAC,yBAAyB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC1E,IAAI,CAAC,wBAAwB,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;AAC/D,CAAC,CAAC,CAAC","file":"rect3d-module.js","sourcesContent":["import { ContainerModule } from '@visactor/vrender-core';\nimport { DefaultCanvasArcPicker } from './arc-picker';\nimport { CanvasArcPicker, CanvasPickerContribution, CanvasRect3dPicker, CanvasRectPicker } from '../constants';\nimport { DefaultCanvasRectPicker } from './rect-picker';\nimport { DefaultCanvasRect3dPicker } from './rect3d-picker';\n\nlet loadRect3dPick = false;\nexport const rect3dCanvasPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {\n  if (loadRect3dPick) {\n    return;\n  }\n  loadRect3dPick = true;\n  // reat3d picker\n  bind(CanvasRect3dPicker).to(DefaultCanvasRect3dPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasRect3dPicker);\n});\n"]}
+{"version":3,"sources":["../src/picker/contributions/canvas-picker/rect3d-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAE5D,IAAI,iBAAiB,GAAG,KAAK,CAAC;AAC9B,MAAM,UAAU,0BAA0B;IACxC,IAAI,iBAAiB,EAAE;QACrB,OAAO;KACR;IACD,iBAAiB,GAAG,IAAI,CAAC;IACzB,oBAAoB,CAAC,QAAQ,CAAC,wBAAwB,EAAE,IAAI,yBAAyB,EAAE,CAAC,CAAC;AAC3F,CAAC","file":"rect3d-module.js","sourcesContent":["import { contributionRegistry } from '@visactor/vrender-core';\nimport { CanvasPickerContribution } from '../constants';\nimport { DefaultCanvasRect3dPicker } from './rect3d-picker';\n\nlet _registeredRect3d = false;\nexport function registerCanvasRect3dPicker() {\n  if (_registeredRect3d) {\n    return;\n  }\n  _registeredRect3d = true;\n  contributionRegistry.register(CanvasPickerContribution, new DefaultCanvasRect3dPicker());\n}\n"]}

package/es/picker/contributions/canvas-picker/rect3d-picker.d.ts

@@ -1,9 +1,8 @@
-import type { IRect3d, IGraphicPicker, IGraphicRender } from '@visactor/vrender-core';
+import type { IRect3d, IGraphicPicker } from '@visactor/vrender-core';
 import { Base3dPicker } from '../common/base-3d-picker';
 export declare class DefaultCanvasRect3dPicker extends Base3dPicker<IRect3d> implements IGraphicPicker {
-    readonly canvasRenderer: IGraphicRender;
     type: string;
     numberType: number;
     themeType: string;
-    constructor(canvasRenderer: IGraphicRender);
+    constructor();
 }

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

@@ -1,27 +1,15 @@
-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;
-}, __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, Rect3DRender, RECT3D_NUMBER_TYPE } from "@visactor/vrender-core";
+import { serviceRegistry, contributionRegistry, Rect3DRender, RECT3D_NUMBER_TYPE } from "@visactor/vrender-core";
 
 import { Base3dPicker } from "../common/base-3d-picker";
 
-let DefaultCanvasRect3dPicker = class extends Base3dPicker {
-    constructor(canvasRenderer) {
-        super(), this.canvasRenderer = canvasRenderer, this.type = "rect3d", this.numberType = RECT3D_NUMBER_TYPE, 
-        this.themeType = "rect";
+export class DefaultCanvasRect3dPicker extends Base3dPicker {
+    constructor() {
+        super(), this.type = "rect3d", this.numberType = RECT3D_NUMBER_TYPE, this.themeType = "rect";
+        try {
+            this.canvasRenderer = serviceRegistry.get(Rect3DRender);
+        } catch (_) {
+            this.canvasRenderer = contributionRegistry.get(Rect3DRender)[0];
+        }
     }
-};
-
-DefaultCanvasRect3dPicker = __decorate([ injectable(), __param(0, inject(Rect3DRender)), __metadata("design:paramtypes", [ Object ]) ], DefaultCanvasRect3dPicker);
-
-export { DefaultCanvasRect3dPicker };
+}
 //# sourceMappingURL=rect3d-picker.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/contributions/canvas-picker/rect3d-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE9F,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAGjD,IAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,YAAqB;IAKlE,YAAkD,cAA8B;QAC9E,KAAK,EAAE,CAAC;QADwC,mBAAc,GAAd,cAAc,CAAgB;QAJhF,SAAI,GAAW,QAAQ,CAAC;QACxB,eAAU,GAAW,kBAAkB,CAAC;QACxC,cAAS,GAAW,MAAM,CAAC;IAI3B,CAAC;CACF,CAAA;AARY,yBAAyB;IADrC,UAAU,EAAE;IAME,WAAA,MAAM,CAAC,YAAY,CAAC,CAAA;;GALtB,yBAAyB,CAQrC;SARY,yBAAyB","file":"rect3d-picker.js","sourcesContent":["import { inject, injectable, Rect3DRender, RECT3D_NUMBER_TYPE } from '@visactor/vrender-core';\nimport type { IRect3d, IGraphicPicker, IGraphicRender } from '@visactor/vrender-core';\nimport { Base3dPicker } from '../common/base-3d-picker';\n\n@injectable()\nexport class DefaultCanvasRect3dPicker extends Base3dPicker<IRect3d> implements IGraphicPicker {\n  type: string = 'rect3d';\n  numberType: number = RECT3D_NUMBER_TYPE;\n  themeType: string = 'rect';\n\n  constructor(@inject(Rect3DRender) public readonly canvasRenderer: IGraphicRender) {\n    super();\n  }\n}\n"]}
+{"version":3,"sources":["../src/picker/contributions/canvas-picker/rect3d-picker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAEjH,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,MAAM,OAAO,yBAA0B,SAAQ,YAAqB;IAKlE;QACE,KAAK,EAAE,CAAC;QALV,SAAI,GAAW,QAAQ,CAAC;QACxB,eAAU,GAAW,kBAAkB,CAAC;QACxC,cAAS,GAAW,MAAM,CAAC;QAIzB,IAAI;YACF,IAAI,CAAC,cAAc,GAAG,eAAe,CAAC,GAAG,CAAC,YAAY,CAAmB,CAAC;SAC3E;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,cAAc,GAAG,oBAAoB,CAAC,GAAG,CAAiB,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;SACjF;IACH,CAAC;CACF","file":"rect3d-picker.js","sourcesContent":["import { serviceRegistry, contributionRegistry, Rect3DRender, RECT3D_NUMBER_TYPE } from '@visactor/vrender-core';\nimport type { IRect3d, IGraphicPicker, IGraphicRender } from '@visactor/vrender-core';\nimport { Base3dPicker } from '../common/base-3d-picker';\n\nexport class DefaultCanvasRect3dPicker extends Base3dPicker<IRect3d> implements IGraphicPicker {\n  type: string = 'rect3d';\n  numberType: number = RECT3D_NUMBER_TYPE;\n  themeType: string = 'rect';\n\n  constructor() {\n    super();\n    try {\n      this.canvasRenderer = serviceRegistry.get(Rect3DRender) as IGraphicRender;\n    } catch (_) {\n      this.canvasRenderer = contributionRegistry.get<IGraphicRender>(Rect3DRender)[0];\n    }\n  }\n}\n"]}

package/es/picker/contributions/canvas-picker/richtext-module.d.ts

@@ -1,2 +1 @@
-import { ContainerModule } from '@visactor/vrender-core';
-export declare const richtextCanvasPickModule: ContainerModule;
+export declare function registerCanvasRichtextPicker(): void;

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

@@ -1,13 +1,12 @@
-import { ContainerModule } from "@visactor/vrender-core";
+import { contributionRegistry } from "@visactor/vrender-core";
 
-import { CanvasPickerContribution, CanvasRichTextPicker } from "../constants";
+import { CanvasPickerContribution } from "../constants";
 
 import { DefaultCanvasRichTextPicker } from "./richtext-picker";
 
 let loadRichtextPick = !1;
 
-export const richtextCanvasPickModule = new ContainerModule(((bind, unbind, isBound, rebind) => {
-    loadRichtextPick || (loadRichtextPick = !0, bind(CanvasRichTextPicker).to(DefaultCanvasRichTextPicker).inSingletonScope(), 
-    bind(CanvasPickerContribution).toService(CanvasRichTextPicker));
-}));
+export function registerCanvasRichtextPicker() {
+    loadRichtextPick || (loadRichtextPick = !0, contributionRegistry.register(CanvasPickerContribution, new DefaultCanvasRichTextPicker));
+}
 //# sourceMappingURL=richtext-module.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/contributions/canvas-picker/richtext-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,wBAAwB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAC9E,OAAO,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAEhE,IAAI,gBAAgB,GAAG,KAAK,CAAC;AAC7B,MAAM,CAAC,MAAM,wBAAwB,GAAG,IAAI,eAAe,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IAC5F,IAAI,gBAAgB,EAAE;QACpB,OAAO;KACR;IACD,gBAAgB,GAAG,IAAI,CAAC;IAExB,IAAI,CAAC,oBAAoB,CAAC,CAAC,EAAE,CAAC,2BAA2B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC9E,IAAI,CAAC,wBAAwB,CAAC,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;AACjE,CAAC,CAAC,CAAC","file":"richtext-module.js","sourcesContent":["import { ContainerModule } from '@visactor/vrender-core';\nimport { CanvasPickerContribution, CanvasRichTextPicker } from '../constants';\nimport { DefaultCanvasRichTextPicker } from './richtext-picker';\n\nlet loadRichtextPick = false;\nexport const richtextCanvasPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {\n  if (loadRichtextPick) {\n    return;\n  }\n  loadRichtextPick = true;\n  // richtext picker\n  bind(CanvasRichTextPicker).to(DefaultCanvasRichTextPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasRichTextPicker);\n});\n"]}
+{"version":3,"sources":["../src/picker/contributions/canvas-picker/richtext-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAwB,MAAM,cAAc,CAAC;AAC9E,OAAO,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAEhE,IAAI,gBAAgB,GAAG,KAAK,CAAC;AAC7B,MAAM,UAAU,4BAA4B;IAC1C,IAAI,gBAAgB,EAAE;QACpB,OAAO;KACR;IACD,gBAAgB,GAAG,IAAI,CAAC;IACxB,oBAAoB,CAAC,QAAQ,CAAC,wBAAwB,EAAE,IAAI,2BAA2B,EAAE,CAAC,CAAC;AAC7F,CAAC","file":"richtext-module.js","sourcesContent":["import { contributionRegistry } from '@visactor/vrender-core';\nimport { CanvasPickerContribution, CanvasRichTextPicker } from '../constants';\nimport { DefaultCanvasRichTextPicker } from './richtext-picker';\n\nlet loadRichtextPick = false;\nexport function registerCanvasRichtextPicker() {\n  if (loadRichtextPick) {\n    return;\n  }\n  loadRichtextPick = true;\n  contributionRegistry.register(CanvasPickerContribution, new DefaultCanvasRichTextPicker());\n}\n"]}

package/es/picker/contributions/canvas-picker/richtext-picker.d.ts

@@ -1,9 +1,8 @@
 import type { IPoint } from '@visactor/vutils';
-import type { IGraphicPicker, IGraphicRender, IPickParams, IRichText } from '@visactor/vrender-core';
+import type { IGraphicPicker, IPickParams, IRichText } from '@visactor/vrender-core';
 export declare class DefaultCanvasRichTextPicker implements IGraphicPicker {
-    readonly canvasRenderer: IGraphicRender;
     type: string;
     numberType: number;
-    constructor(canvasRenderer: IGraphicRender);
+    constructor();
     contains(richtext: IRichText, point: IPoint, params?: IPickParams): boolean;
 }

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

@@ -1,27 +1,16 @@
-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;
-}, __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 { serviceRegistry, contributionRegistry, RICHTEXT_NUMBER_TYPE, RichTextRender } from "@visactor/vrender-core";
 
-import { inject, injectable, RICHTEXT_NUMBER_TYPE, RichTextRender } from "@visactor/vrender-core";
-
-let DefaultCanvasRichTextPicker = class {
-    constructor(canvasRenderer) {
-        this.canvasRenderer = canvasRenderer, this.type = "richtext", this.numberType = RICHTEXT_NUMBER_TYPE;
+export class DefaultCanvasRichTextPicker {
+    constructor() {
+        this.type = "richtext", this.numberType = RICHTEXT_NUMBER_TYPE;
+        try {
+            this.canvasRenderer = serviceRegistry.get(RichTextRender);
+        } catch (_) {
+            this.canvasRenderer = contributionRegistry.get(RichTextRender)[0];
+        }
     }
     contains(richtext, point, params) {
         return !!richtext.AABBBounds.containsPoint(point);
     }
-};
-
-DefaultCanvasRichTextPicker = __decorate([ injectable(), __param(0, inject(RichTextRender)), __metadata("design:paramtypes", [ Object ]) ], DefaultCanvasRichTextPicker);
-
-export { DefaultCanvasRichTextPicker };
+}
 //# sourceMappingURL=richtext-picker.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/contributions/canvas-picker/richtext-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAG3F,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IAItC,YAAoD,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAHlF,SAAI,GAAW,UAAU,CAAC;QAC1B,eAAU,GAAW,oBAAoB,CAAC;IAE2C,CAAC;IAEtF,QAAQ,CAAC,QAAmB,EAAE,KAAa,EAAE,MAAoB;QAC/D,IAAI,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;YAC5C,OAAO,IAAI,CAAC;SACb;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF,CAAA;AAZY,2BAA2B;IADvC,UAAU,EAAE;IAKE,WAAA,MAAM,CAAC,cAAc,CAAC,CAAA;;GAJxB,2BAA2B,CAYvC;SAZY,2BAA2B","file":"richtext-picker.js","sourcesContent":["import type { IPoint } from '@visactor/vutils';\nimport { inject, injectable, RICHTEXT_NUMBER_TYPE, RichTextRender } from '@visactor/vrender-core';\nimport type { IGraphicPicker, IGraphicRender, IPickParams, IRichText } from '@visactor/vrender-core';\n@injectable()\nexport class DefaultCanvasRichTextPicker implements IGraphicPicker {\n  type: string = 'richtext';\n  numberType: number = RICHTEXT_NUMBER_TYPE;\n\n  constructor(@inject(RichTextRender) public readonly canvasRenderer: IGraphicRender) {}\n\n  contains(richtext: IRichText, point: IPoint, params?: IPickParams): boolean {\n    if (richtext.AABBBounds.containsPoint(point)) {\n      return true;\n    }\n    return false;\n  }\n}\n"]}
+{"version":3,"sources":["../src/picker/contributions/canvas-picker/richtext-picker.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAErH,MAAM,OAAO,2BAA2B;IAItC;QAHA,SAAI,GAAW,UAAU,CAAC;QAC1B,eAAU,GAAW,oBAAoB,CAAC;QAGxC,IAAI;YACD,IAAY,CAAC,cAAc,GAAG,eAAe,CAAC,GAAG,CAAC,cAAc,CAAmB,CAAC;SACtF;QAAC,OAAO,CAAC,EAAE;YACT,IAAY,CAAC,cAAc,GAAG,oBAAoB,CAAC,GAAG,CAAiB,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;SAC5F;IACH,CAAC;IAED,QAAQ,CAAC,QAAmB,EAAE,KAAa,EAAE,MAAoB;QAC/D,IAAI,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;YAC5C,OAAO,IAAI,CAAC;SACb;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF","file":"richtext-picker.js","sourcesContent":["import type { IPoint } from '@visactor/vutils';\nimport { serviceRegistry, contributionRegistry, RICHTEXT_NUMBER_TYPE, RichTextRender } from '@visactor/vrender-core';\nimport type { IGraphicPicker, IGraphicRender, IPickParams, IRichText } from '@visactor/vrender-core';\nexport class DefaultCanvasRichTextPicker implements IGraphicPicker {\n  type: string = 'richtext';\n  numberType: number = RICHTEXT_NUMBER_TYPE;\n\n  constructor() {\n    try {\n      (this as any).canvasRenderer = serviceRegistry.get(RichTextRender) as IGraphicRender;\n    } catch (_) {\n      (this as any).canvasRenderer = contributionRegistry.get<IGraphicRender>(RichTextRender)[0];\n    }\n  }\n\n  contains(richtext: IRichText, point: IPoint, params?: IPickParams): boolean {\n    if (richtext.AABBBounds.containsPoint(point)) {\n      return true;\n    }\n    return false;\n  }\n}\n"]}

package/es/picker/contributions/canvas-picker/star-module.d.ts

@@ -1,2 +1 @@
-import { ContainerModule } from '@visactor/vrender-core';
-export declare const starCanvasPickModule: ContainerModule;
+export declare function registerCanvasStarPicker(): void;

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

@@ -1,13 +1,12 @@
-import { ContainerModule } from "@visactor/vrender-core";
+import { contributionRegistry } from "@visactor/vrender-core";
 
-import { CanvasPickerContribution, CanvasStarPicker } from "../constants";
+import { CanvasPickerContribution } from "../constants";
 
 import { DefaultCanvasStarPicker } from "./star-picker";
 
 let loadStarPick = !1;
 
-export const starCanvasPickModule = new ContainerModule(((bind, unbind, isBound, rebind) => {
-    loadStarPick || (loadStarPick = !0, bind(CanvasStarPicker).to(DefaultCanvasStarPicker).inSingletonScope(), 
-    bind(CanvasPickerContribution).toService(CanvasStarPicker));
-}));
+export function registerCanvasStarPicker() {
+    loadStarPick || (loadStarPick = !0, contributionRegistry.register(CanvasPickerContribution, new DefaultCanvasStarPicker));
+}
 //# sourceMappingURL=star-module.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/contributions/canvas-picker/star-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAExD,IAAI,YAAY,GAAG,KAAK,CAAC;AACzB,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,eAAe,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IACxF,IAAI,YAAY,EAAE;QAChB,OAAO;KACR;IACD,YAAY,GAAG,IAAI,CAAC;IAEpB,IAAI,CAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC,uBAAuB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtE,IAAI,CAAC,wBAAwB,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;AAC7D,CAAC,CAAC,CAAC","file":"star-module.js","sourcesContent":["import { ContainerModule } from '@visactor/vrender-core';\nimport { CanvasPickerContribution, CanvasStarPicker } from '../constants';\nimport { DefaultCanvasStarPicker } from './star-picker';\n\nlet loadStarPick = false;\nexport const starCanvasPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {\n  if (loadStarPick) {\n    return;\n  }\n  loadStarPick = true;\n  // star picker\n  bind(CanvasStarPicker).to(DefaultCanvasStarPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasStarPicker);\n});\n"]}
+{"version":3,"sources":["../src/picker/contributions/canvas-picker/star-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAoB,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAExD,IAAI,YAAY,GAAG,KAAK,CAAC;AACzB,MAAM,UAAU,wBAAwB;IACtC,IAAI,YAAY,EAAE;QAChB,OAAO;KACR;IACD,YAAY,GAAG,IAAI,CAAC;IACpB,oBAAoB,CAAC,QAAQ,CAAC,wBAAwB,EAAE,IAAI,uBAAuB,EAAE,CAAC,CAAC;AACzF,CAAC","file":"star-module.js","sourcesContent":["import { contributionRegistry } from '@visactor/vrender-core';\nimport { CanvasPickerContribution, CanvasStarPicker } from '../constants';\nimport { DefaultCanvasStarPicker } from './star-picker';\n\nlet loadStarPick = false;\nexport function registerCanvasStarPicker() {\n  if (loadStarPick) {\n    return;\n  }\n  loadStarPick = true;\n  contributionRegistry.register(CanvasPickerContribution, new DefaultCanvasStarPicker());\n}\n"]}

package/es/picker/contributions/canvas-picker/star-picker.d.ts

@@ -1,8 +1,7 @@
-import type { IGraphicPicker, IGraphicRender } from '@visactor/vrender-core';
+import type { IGraphicPicker } from '@visactor/vrender-core';
 import { PickerBase } from '../common/base';
 export declare class DefaultCanvasStarPicker extends PickerBase implements IGraphicPicker {
-    readonly canvasRenderer: IGraphicRender;
     type: string;
     numberType: number;
-    constructor(canvasRenderer: IGraphicRender);
+    constructor();
 }

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

@@ -1,26 +1,15 @@
-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;
-}, __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, StarRender, STAR_NUMBER_TYPE } from "@visactor/vrender-core";
+import { serviceRegistry, StarRender, STAR_NUMBER_TYPE, contributionRegistry } from "@visactor/vrender-core";
 
 import { PickerBase } from "../common/base";
 
-let DefaultCanvasStarPicker = class extends PickerBase {
-    constructor(canvasRenderer) {
-        super(), this.canvasRenderer = canvasRenderer, this.type = "star", this.numberType = STAR_NUMBER_TYPE;
+export class DefaultCanvasStarPicker extends PickerBase {
+    constructor() {
+        super(), this.type = "star", this.numberType = STAR_NUMBER_TYPE;
+        try {
+            this.canvasRenderer = serviceRegistry.get(StarRender);
+        } catch (_) {
+            this.canvasRenderer = contributionRegistry.get(StarRender)[0];
+        }
     }
-};
-
-DefaultCanvasStarPicker = __decorate([ injectable(), __param(0, inject(StarRender)), __metadata("design:paramtypes", [ Object ]) ], DefaultCanvasStarPicker);
-
-export { DefaultCanvasStarPicker };
+}
 //# sourceMappingURL=star-picker.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/contributions/canvas-picker/star-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1F,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAGrC,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,UAAU;IAIrD,YAAgD,cAA8B;QAC5E,KAAK,EAAE,CAAC;QADsC,mBAAc,GAAd,cAAc,CAAgB;QAH9E,SAAI,GAAW,MAAM,CAAC;QACtB,eAAU,GAAW,gBAAgB,CAAC;IAItC,CAAC;CACF,CAAA;AAPY,uBAAuB;IADnC,UAAU,EAAE;IAKE,WAAA,MAAM,CAAC,UAAU,CAAC,CAAA;;GAJpB,uBAAuB,CAOnC;SAPY,uBAAuB","file":"star-picker.js","sourcesContent":["import { inject, injectable, StarRender, STAR_NUMBER_TYPE } from '@visactor/vrender-core';\nimport type { IGraphicPicker, IGraphicRender } from '@visactor/vrender-core';\nimport { PickerBase } from '../common/base';\n\n@injectable()\nexport class DefaultCanvasStarPicker extends PickerBase implements IGraphicPicker {\n  type: string = 'star';\n  numberType: number = STAR_NUMBER_TYPE;\n\n  constructor(@inject(StarRender) public readonly canvasRenderer: IGraphicRender) {\n    super();\n  }\n}\n"]}
+{"version":3,"sources":["../src/picker/contributions/canvas-picker/star-picker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE7G,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,MAAM,OAAO,uBAAwB,SAAQ,UAAU;IAIrD;QACE,KAAK,EAAE,CAAC;QAJV,SAAI,GAAW,MAAM,CAAC;QACtB,eAAU,GAAW,gBAAgB,CAAC;QAIpC,IAAI;YACF,IAAI,CAAC,cAAc,GAAG,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;SACvD;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,cAAc,GAAG,oBAAoB,CAAC,GAAG,CAAiB,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;SAC/E;IACH,CAAC;CACF","file":"star-picker.js","sourcesContent":["import { serviceRegistry, StarRender, STAR_NUMBER_TYPE, contributionRegistry } from '@visactor/vrender-core';\nimport type { IGraphicPicker, IGraphicRender } from '@visactor/vrender-core';\nimport { PickerBase } from '../common/base';\n\nexport class DefaultCanvasStarPicker extends PickerBase implements IGraphicPicker {\n  type: string = 'star';\n  numberType: number = STAR_NUMBER_TYPE;\n\n  constructor() {\n    super();\n    try {\n      this.canvasRenderer = serviceRegistry.get(StarRender);\n    } catch (_) {\n      this.canvasRenderer = contributionRegistry.get<IGraphicRender>(StarRender)[0];\n    }\n  }\n}\n"]}

package/es/picker/contributions/canvas-picker/symbol-module.d.ts

@@ -1,2 +1 @@
-import { ContainerModule } from '@visactor/vrender-core';
-export declare const symbolCanvasPickModule: ContainerModule;
+export declare function registerCanvasSymbolPicker(): void;

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

@@ -1,13 +1,12 @@
-import { ContainerModule } from "@visactor/vrender-core";
+import { contributionRegistry } from "@visactor/vrender-core";
 
-import { CanvasPickerContribution, CanvasSymbolPicker } from "../constants";
+import { CanvasPickerContribution } from "../constants";
 
 import { DefaultCanvasSymbolPicker } from "./symbol-picker";
 
 let loadSymbolPick = !1;
 
-export const symbolCanvasPickModule = new ContainerModule(((bind, unbind, isBound, rebind) => {
-    loadSymbolPick || (loadSymbolPick = !0, bind(CanvasSymbolPicker).to(DefaultCanvasSymbolPicker).inSingletonScope(), 
-    bind(CanvasPickerContribution).toService(CanvasSymbolPicker));
-}));
+export function registerCanvasSymbolPicker() {
+    loadSymbolPick || (loadSymbolPick = !0, contributionRegistry.register(CanvasPickerContribution, new DefaultCanvasSymbolPicker));
+}
 //# sourceMappingURL=symbol-module.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/contributions/canvas-picker/symbol-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAC5E,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAE5D,IAAI,cAAc,GAAG,KAAK,CAAC;AAC3B,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,eAAe,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IAC1F,IAAI,cAAc,EAAE;QAClB,OAAO;KACR;IACD,cAAc,GAAG,IAAI,CAAC;IAEtB,IAAI,CAAC,kBAAkB,CAAC,CAAC,EAAE,CAAC,yBAAyB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC1E,IAAI,CAAC,wBAAwB,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;AAC/D,CAAC,CAAC,CAAC","file":"symbol-module.js","sourcesContent":["import { ContainerModule } from '@visactor/vrender-core';\nimport { CanvasPickerContribution, CanvasSymbolPicker } from '../constants';\nimport { DefaultCanvasSymbolPicker } from './symbol-picker';\n\nlet loadSymbolPick = false;\nexport const symbolCanvasPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {\n  if (loadSymbolPick) {\n    return;\n  }\n  loadSymbolPick = true;\n  // symbol picker\n  bind(CanvasSymbolPicker).to(DefaultCanvasSymbolPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasSymbolPicker);\n});\n"]}
+{"version":3,"sources":["../src/picker/contributions/canvas-picker/symbol-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAsB,MAAM,cAAc,CAAC;AAC5E,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAE5D,IAAI,cAAc,GAAG,KAAK,CAAC;AAC3B,MAAM,UAAU,0BAA0B;IACxC,IAAI,cAAc,EAAE;QAClB,OAAO;KACR;IACD,cAAc,GAAG,IAAI,CAAC;IACtB,oBAAoB,CAAC,QAAQ,CAAC,wBAAwB,EAAE,IAAI,yBAAyB,EAAE,CAAC,CAAC;AAC3F,CAAC","file":"symbol-module.js","sourcesContent":["import { contributionRegistry } from '@visactor/vrender-core';\nimport { CanvasPickerContribution, CanvasSymbolPicker } from '../constants';\nimport { DefaultCanvasSymbolPicker } from './symbol-picker';\n\nlet loadSymbolPick = false;\nexport function registerCanvasSymbolPicker() {\n  if (loadSymbolPick) {\n    return;\n  }\n  loadSymbolPick = true;\n  contributionRegistry.register(CanvasPickerContribution, new DefaultCanvasSymbolPicker());\n}\n"]}

package/es/picker/contributions/canvas-picker/symbol-picker.d.ts

@@ -1,10 +1,9 @@
 import type { IPoint } from '@visactor/vutils';
-import type { ISymbol, IGraphicPicker, IGraphicRender, IPickParams } from '@visactor/vrender-core';
+import type { ISymbol, IGraphicPicker, IPickParams } from '@visactor/vrender-core';
 import { Base3dPicker } from '../common/base-3d-picker';
 export declare class DefaultCanvasSymbolPicker extends Base3dPicker<ISymbol> implements IGraphicPicker {
-    readonly canvasRenderer: IGraphicRender;
     type: string;
     numberType: number;
-    constructor(canvasRenderer: IGraphicRender);
+    constructor();
     contains(symbol: ISymbol, point: IPoint, params?: IPickParams): boolean;
 }

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

@@ -1,22 +1,15 @@
-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;
-}, __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, SymbolRender, mat4Allocate, getScaledStroke, SYMBOL_NUMBER_TYPE } from "@visactor/vrender-core";
+import { serviceRegistry, SymbolRender, mat4Allocate, getScaledStroke, SYMBOL_NUMBER_TYPE, contributionRegistry } from "@visactor/vrender-core";
 
 import { Base3dPicker } from "../common/base-3d-picker";
 
-let DefaultCanvasSymbolPicker = class extends Base3dPicker {
-    constructor(canvasRenderer) {
-        super(), this.canvasRenderer = canvasRenderer, this.type = "symbol", this.numberType = SYMBOL_NUMBER_TYPE;
+export class DefaultCanvasSymbolPicker extends Base3dPicker {
+    constructor() {
+        super(), this.type = "symbol", this.numberType = SYMBOL_NUMBER_TYPE;
+        try {
+            this.canvasRenderer = serviceRegistry.get(SymbolRender);
+        } catch (_) {
+            this.canvasRenderer = contributionRegistry.get(SymbolRender)[0];
+        }
     }
     contains(symbol, point, params) {
         const {pickContext: pickContext} = null != params ? params : {};
@@ -47,9 +40,5 @@ let DefaultCanvasSymbolPicker = class extends Base3dPicker {
         pickContext.modelMatrix = lastModelMatrix, pickContext.highPerformanceRestore(), 
         picked;
     }
-};
-
-DefaultCanvasSymbolPicker = __decorate([ injectable(), __param(0, inject(SymbolRender)), __metadata("design:paramtypes", [ Object ]) ], DefaultCanvasSymbolPicker);
-
-export { DefaultCanvasSymbolPicker };
+}
 //# sourceMappingURL=symbol-picker.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/contributions/canvas-picker/symbol-picker.ts"],"names":[],"mappings":"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","file":"symbol-picker.js","sourcesContent":["import {\n  inject,\n  injectable,\n  SymbolRender,\n  mat4Allocate,\n  getScaledStroke,\n  SYMBOL_NUMBER_TYPE\n} from '@visactor/vrender-core';\nimport type { IPoint } from '@visactor/vutils';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  ISymbol,\n  IThemeAttribute,\n  IGraphicPicker,\n  IGraphicRender,\n  IPickParams\n} from '@visactor/vrender-core';\nimport { Base3dPicker } from '../common/base-3d-picker';\n\n@injectable()\nexport class DefaultCanvasSymbolPicker extends Base3dPicker<ISymbol> implements IGraphicPicker {\n  type: string = 'symbol';\n  numberType: number = SYMBOL_NUMBER_TYPE;\n\n  constructor(@inject(SymbolRender) public readonly canvasRenderer: IGraphicRender) {\n    super();\n  }\n\n  contains(symbol: ISymbol, point: IPoint, params?: IPickParams): boolean {\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    const parsedPath = symbol.getParsedPath();\n    if (!pickContext.camera) {\n      if (!symbol.AABBBounds.containsPoint(point)) {\n        return false;\n      }\n      if (parsedPath.isSvg || symbol.attribute.pickMode === 'imprecise') {\n        return true;\n      }\n    }\n\n    pickContext.highPerformanceSave();\n    // const symbolAttribute = graphicService.themeService.getCurrentTheme().symbolAttribute;\n    const symbolAttribute = symbol.getGraphicTheme();\n\n    const data = this.transform(symbol, symbolAttribute, pickContext);\n    const { x, y, z, lastModelMatrix } = data;\n    // let { x = symbolAttribute.x, y = symbolAttribute.y } = symbol.attribute;\n\n    // pickContext.highPerformanceSave();\n    // if (!symbol.transMatrix.onlyTranslate()) {\n    //   // 性能较差\n    //   x = 0;\n    //   y = 0;\n    //   pickContext.transformFromMatrix(symbol.transMatrix, true);\n    // } else {\n    //   const point = symbol.getOffsetXY(symbolAttribute);\n    //   x += point.x;\n    //   y += point.y;\n    //   // 当前context有rotate/scale，重置matrix\n    //   pickContext.setTransformForCurrent();\n    // }\n\n    let pickPoint = point;\n    if (pickContext.camera) {\n      pickPoint = point.clone();\n      const globalMatrix = symbol.parent.globalTransMatrix;\n      pickPoint.x = globalMatrix.a * point.x + globalMatrix.c * point.y + globalMatrix.e;\n      pickPoint.y = globalMatrix.b * point.x + globalMatrix.d * point.y + globalMatrix.f;\n    }\n\n    this.canvasRenderer.z = z;\n    // 详细形状判断\n    let picked = false;\n    this.canvasRenderer.drawShape(\n      symbol,\n      pickContext,\n      x,\n      y,\n      {} as any,\n      null,\n      (\n        context: IContext2d,\n        symbolAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        picked = context.isPointInPath(pickPoint.x, pickPoint.y);\n        return picked;\n      },\n      (\n        context: IContext2d,\n        symbolAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        const lineWidth = symbolAttribute.lineWidth || themeAttribute.lineWidth;\n        const pickStrokeBuffer = symbolAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;\n        const keepStrokeScale = symbolAttribute.keepStrokeScale || themeAttribute.keepStrokeScale;\n        pickContext.lineWidth = keepStrokeScale\n          ? lineWidth + pickStrokeBuffer\n          : getScaledStroke(pickContext, lineWidth + pickStrokeBuffer, pickContext.dpr);\n        picked = context.isPointInStroke(pickPoint.x, pickPoint.y);\n        return picked;\n      }\n    );\n\n    this.canvasRenderer.z = 0;\n\n    if (pickContext.modelMatrix !== lastModelMatrix) {\n      mat4Allocate.free(pickContext.modelMatrix);\n    }\n    pickContext.modelMatrix = lastModelMatrix;\n    pickContext.highPerformanceRestore();\n    return picked;\n  }\n}\n"]}
+{"version":3,"sources":["../src/picker/contributions/canvas-picker/symbol-picker.ts"],"names":[],"mappings":"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","file":"symbol-picker.js","sourcesContent":["import {\n  serviceRegistry,\n  SymbolRender,\n  mat4Allocate,\n  getScaledStroke,\n  SYMBOL_NUMBER_TYPE,\n  contributionRegistry\n} from '@visactor/vrender-core';\nimport type { IPoint } from '@visactor/vutils';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  ISymbol,\n  IThemeAttribute,\n  IGraphicPicker,\n  IGraphicRender,\n  IPickParams\n} from '@visactor/vrender-core';\nimport { Base3dPicker } from '../common/base-3d-picker';\n\nexport class DefaultCanvasSymbolPicker extends Base3dPicker<ISymbol> implements IGraphicPicker {\n  type: string = 'symbol';\n  numberType: number = SYMBOL_NUMBER_TYPE;\n\n  constructor() {\n    super();\n    try {\n      this.canvasRenderer = serviceRegistry.get(SymbolRender);\n    } catch (_) {\n      this.canvasRenderer = contributionRegistry.get<IGraphicRender>(SymbolRender)[0];\n    }\n  }\n\n  contains(symbol: ISymbol, point: IPoint, params?: IPickParams): boolean {\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    const parsedPath = symbol.getParsedPath();\n    if (!pickContext.camera) {\n      if (!symbol.AABBBounds.containsPoint(point)) {\n        return false;\n      }\n      if (parsedPath.isSvg || symbol.attribute.pickMode === 'imprecise') {\n        return true;\n      }\n    }\n\n    pickContext.highPerformanceSave();\n    // const symbolAttribute = graphicService.themeService.getCurrentTheme().symbolAttribute;\n    const symbolAttribute = symbol.getGraphicTheme();\n\n    const data = this.transform(symbol, symbolAttribute, pickContext);\n    const { x, y, z, lastModelMatrix } = data;\n    // let { x = symbolAttribute.x, y = symbolAttribute.y } = symbol.attribute;\n\n    // pickContext.highPerformanceSave();\n    // if (!symbol.transMatrix.onlyTranslate()) {\n    //   // 性能较差\n    //   x = 0;\n    //   y = 0;\n    //   pickContext.transformFromMatrix(symbol.transMatrix, true);\n    // } else {\n    //   const point = symbol.getOffsetXY(symbolAttribute);\n    //   x += point.x;\n    //   y += point.y;\n    //   // 当前context有rotate/scale，重置matrix\n    //   pickContext.setTransformForCurrent();\n    // }\n\n    let pickPoint = point;\n    if (pickContext.camera) {\n      pickPoint = point.clone();\n      const globalMatrix = symbol.parent.globalTransMatrix;\n      pickPoint.x = globalMatrix.a * point.x + globalMatrix.c * point.y + globalMatrix.e;\n      pickPoint.y = globalMatrix.b * point.x + globalMatrix.d * point.y + globalMatrix.f;\n    }\n\n    this.canvasRenderer.z = z;\n    // 详细形状判断\n    let picked = false;\n    this.canvasRenderer.drawShape(\n      symbol,\n      pickContext,\n      x,\n      y,\n      {} as any,\n      null,\n      (\n        context: IContext2d,\n        symbolAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        picked = context.isPointInPath(pickPoint.x, pickPoint.y);\n        return picked;\n      },\n      (\n        context: IContext2d,\n        symbolAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        const lineWidth = symbolAttribute.lineWidth || themeAttribute.lineWidth;\n        const pickStrokeBuffer = symbolAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;\n        const keepStrokeScale = symbolAttribute.keepStrokeScale || themeAttribute.keepStrokeScale;\n        pickContext.lineWidth = keepStrokeScale\n          ? lineWidth + pickStrokeBuffer\n          : getScaledStroke(pickContext, lineWidth + pickStrokeBuffer, pickContext.dpr);\n        picked = context.isPointInStroke(pickPoint.x, pickPoint.y);\n        return picked;\n      }\n    );\n\n    this.canvasRenderer.z = 0;\n\n    if (pickContext.modelMatrix !== lastModelMatrix) {\n      mat4Allocate.free(pickContext.modelMatrix);\n    }\n    pickContext.modelMatrix = lastModelMatrix;\n    pickContext.highPerformanceRestore();\n    return picked;\n  }\n}\n"]}

package/es/picker/contributions/canvas-picker/text-module.d.ts

@@ -1,2 +1 @@
-import { ContainerModule } from '@visactor/vrender-core';
-export declare const textCanvasPickModule: ContainerModule;
+export declare function registerCanvasTextPicker(): void;

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

@@ -1,13 +1,12 @@
-import { ContainerModule } from "@visactor/vrender-core";
+import { contributionRegistry } from "@visactor/vrender-core";
 
-import { CanvasPickerContribution, CanvasTextPicker } from "../constants";
+import { CanvasPickerContribution } from "../constants";
 
 import { DefaultCanvasTextPicker } from "./text-picker";
 
-let loadTextPick = !1;
+let _registeredText = !1;
 
-export const textCanvasPickModule = new ContainerModule(((bind, unbind, isBound, rebind) => {
-    loadTextPick || (loadTextPick = !0, bind(CanvasTextPicker).to(DefaultCanvasTextPicker).inSingletonScope(), 
-    bind(CanvasPickerContribution).toService(CanvasTextPicker));
-}));
+export function registerCanvasTextPicker() {
+    _registeredText || (_registeredText = !0, contributionRegistry.register(CanvasPickerContribution, new DefaultCanvasTextPicker));
+}
 //# sourceMappingURL=text-module.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/contributions/canvas-picker/text-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAoB,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAE5F,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAExD,IAAI,YAAY,GAAG,KAAK,CAAC;AACzB,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,eAAe,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IACxF,IAAI,YAAY,EAAE;QAChB,OAAO;KACR;IACD,YAAY,GAAG,IAAI,CAAC;IAEpB,IAAI,CAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC,uBAAuB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtE,IAAI,CAAC,wBAAwB,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;AAC7D,CAAC,CAAC,CAAC","file":"text-module.js","sourcesContent":["import { ContainerModule } from '@visactor/vrender-core';\nimport { CanvasLinePicker, CanvasPickerContribution, CanvasTextPicker } from '../constants';\nimport { DefaultCanvasLinePicker } from './line-picker';\nimport { DefaultCanvasTextPicker } from './text-picker';\n\nlet loadTextPick = false;\nexport const textCanvasPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {\n  if (loadTextPick) {\n    return;\n  }\n  loadTextPick = true;\n  // text picker\n  bind(CanvasTextPicker).to(DefaultCanvasTextPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasTextPicker);\n});\n"]}
+{"version":3,"sources":["../src/picker/contributions/canvas-picker/text-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAoB,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAExD,IAAI,eAAe,GAAG,KAAK,CAAC;AAC5B,MAAM,UAAU,wBAAwB;IACtC,IAAI,eAAe,EAAE;QACnB,OAAO;KACR;IACD,eAAe,GAAG,IAAI,CAAC;IAEvB,oBAAoB,CAAC,QAAQ,CAAC,wBAAwB,EAAE,IAAI,uBAAuB,EAAE,CAAC,CAAC;AACzF,CAAC","file":"text-module.js","sourcesContent":["import { contributionRegistry } from '@visactor/vrender-core';\nimport { CanvasPickerContribution, CanvasTextPicker } from '../constants';\nimport { DefaultCanvasTextPicker } from './text-picker';\n\nlet _registeredText = false;\nexport function registerCanvasTextPicker() {\n  if (_registeredText) {\n    return;\n  }\n  _registeredText = true;\n  // Register picker implementation in contribution registry\n  contributionRegistry.register(CanvasPickerContribution, new DefaultCanvasTextPicker());\n}\n"]}

package/es/picker/contributions/canvas-picker/text-picker.d.ts

@@ -1,10 +1,9 @@
 import type { IPoint } from '@visactor/vutils';
-import type { IText, IGraphicPicker, IGraphicRender, IPickParams } from '@visactor/vrender-core';
+import type { IText, IGraphicPicker, IPickParams } from '@visactor/vrender-core';
 import { Base3dPicker } from '../common/base-3d-picker';
 export declare class DefaultCanvasTextPicker extends Base3dPicker<IText> implements IGraphicPicker {
-    readonly canvasRenderer: IGraphicRender;
     type: string;
     numberType: number;
-    constructor(canvasRenderer: IGraphicRender);
+    constructor();
     contains(text: IText, point: IPoint, params?: IPickParams): boolean;
 }

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

@@ -1,22 +1,12 @@
-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;
-}, __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, TextRender, textDrawOffsetX, textLayoutOffsetY, mat4Allocate, TEXT_NUMBER_TYPE } from "@visactor/vrender-core";
+import { TextRender, textDrawOffsetX, textLayoutOffsetY, mat4Allocate, TEXT_NUMBER_TYPE, contributionRegistry } from "@visactor/vrender-core";
 
 import { Base3dPicker } from "../common/base-3d-picker";
 
-let DefaultCanvasTextPicker = class extends Base3dPicker {
-    constructor(canvasRenderer) {
-        super(), this.canvasRenderer = canvasRenderer, this.type = "text", this.numberType = TEXT_NUMBER_TYPE;
+export class DefaultCanvasTextPicker extends Base3dPicker {
+    constructor() {
+        super(), this.type = "text", this.numberType = TEXT_NUMBER_TYPE;
+        const render = contributionRegistry.get(TextRender)[0];
+        this.canvasRenderer = render;
     }
     contains(text, point, params) {
         const {pickContext: pickContext} = null != params ? params : {};
@@ -44,9 +34,5 @@ let DefaultCanvasTextPicker = class extends Base3dPicker {
         pickContext.modelMatrix = lastModelMatrix, pickContext.highPerformanceRestore(), 
         picked;
     }
-};
-
-DefaultCanvasTextPicker = __decorate([ injectable(), __param(0, inject(TextRender)), __metadata("design:paramtypes", [ Object ]) ], DefaultCanvasTextPicker);
-
-export { DefaultCanvasTextPicker };
+}
 //# sourceMappingURL=text-picker.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/contributions/canvas-picker/text-picker.ts"],"names":[],"mappings":"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","file":"text-picker.js","sourcesContent":["import {\n  inject,\n  injectable,\n  getTheme,\n  TextRender,\n  textDrawOffsetX,\n  textLayoutOffsetY,\n  mat4Allocate,\n  TEXT_NUMBER_TYPE\n} from '@visactor/vrender-core';\nimport type { IPoint } from '@visactor/vutils';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  IText,\n  IThemeAttribute,\n  IGraphicPicker,\n  IGraphicRender,\n  IPickParams\n} from '@visactor/vrender-core';\nimport { Base3dPicker } from '../common/base-3d-picker';\n\n@injectable()\nexport class DefaultCanvasTextPicker extends Base3dPicker<IText> implements IGraphicPicker {\n  type: string = 'text';\n  numberType: number = TEXT_NUMBER_TYPE;\n\n  constructor(@inject(TextRender) public readonly canvasRenderer: IGraphicRender) {\n    super();\n  }\n\n  contains(text: IText, point: IPoint, params?: IPickParams): boolean {\n    // const { textAttribute } = graphicService.themeService.getCurrentTheme();\n    // const {\n    //   x = textAttribute.x,\n    //   y = textAttribute.y,\n    // } = text.attribute;\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    const bounds = text.AABBBounds;\n\n    if (!pickContext.camera) {\n      if (!bounds.containsPoint(point)) {\n        return false;\n      }\n      return true;\n    }\n\n    // const symbolAttribute = graphicService.themeService.getCurrentTheme().symbolAttribute;\n    pickContext.highPerformanceSave();\n    const textAttribute = text.getGraphicTheme();\n\n    const { keepDirIn3d = textAttribute.keepDirIn3d } = text.attribute;\n    // 文字如果需要变换，那就一定要计算3d矩阵\n    const computed3dMatrix = !keepDirIn3d;\n\n    const data = this.transform(text, textAttribute, pickContext, computed3dMatrix);\n    const { x, y, z, lastModelMatrix } = data;\n\n    this.canvasRenderer.z = z;\n    let pickPoint = point;\n    if (pickContext.camera) {\n      pickPoint = point.clone();\n      const globalMatrix = text.parent.globalTransMatrix;\n      pickPoint.x = globalMatrix.a * point.x + globalMatrix.c * point.y + globalMatrix.e;\n      pickPoint.y = globalMatrix.b * point.x + globalMatrix.d * point.y + globalMatrix.f;\n    }\n\n    // 详细形状判断\n    let picked = false;\n    this.canvasRenderer.drawShape(\n      text,\n      pickContext,\n      x,\n      y,\n      {} as any,\n      null,\n      (\n        context: IContext2d,\n        symbolAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        const {\n          fontSize = textAttribute.fontSize,\n          textBaseline = textAttribute.textBaseline,\n          textAlign = textAttribute.textAlign\n        } = text.attribute;\n        // 拾取基于xy的rect\n        const bounds = text.AABBBounds;\n        const height = bounds.height();\n        const width = bounds.width();\n        const offsetY = textLayoutOffsetY(textBaseline, height, fontSize);\n        const offsetX = textDrawOffsetX(textAlign, width);\n        context.rect(offsetX + x, offsetY + y, width, height, z);\n        picked = context.isPointInPath(pickPoint.x, pickPoint.y);\n        return picked;\n      },\n      (\n        context: IContext2d,\n        symbolAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        // if (picked) {\n        //   return true;\n        // }\n        // const lineWidth = symbolAttribute.lineWidth || themeAttribute.lineWidth;\n        // pickContext.lineWidth = getScaledStroke(pickContext, lineWidth, pickContext.dpr);\n        // picked = context.isPointInStroke(pickPoint.x, pickPoint.y);\n        return picked;\n      }\n    );\n\n    this.canvasRenderer.z = 0;\n    if (pickContext.modelMatrix !== lastModelMatrix) {\n      mat4Allocate.free(pickContext.modelMatrix);\n    }\n    pickContext.modelMatrix = lastModelMatrix;\n    pickContext.highPerformanceRestore();\n\n    return picked;\n  }\n}\n"]}
+{"version":3,"sources":["../src/picker/contributions/canvas-picker/text-picker.ts"],"names":[],"mappings":"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","file":"text-picker.js","sourcesContent":["import {\n  getTheme,\n  TextRender,\n  textDrawOffsetX,\n  textLayoutOffsetY,\n  mat4Allocate,\n  TEXT_NUMBER_TYPE,\n  contributionRegistry\n} from '@visactor/vrender-core';\nimport type { IPoint } from '@visactor/vutils';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  IText,\n  IThemeAttribute,\n  IGraphicPicker,\n  IGraphicRender,\n  IPickParams\n} from '@visactor/vrender-core';\nimport { Base3dPicker } from '../common/base-3d-picker';\n\nexport class DefaultCanvasTextPicker extends Base3dPicker<IText> implements IGraphicPicker {\n  type: string = 'text';\n  numberType: number = TEXT_NUMBER_TYPE;\n\n  constructor() {\n    super();\n    // text picker depends on TextRender via registry\n    // TextRender is a token exported by core\n    // Select first registered contribution\n    const render = contributionRegistry.get<IGraphicRender>(TextRender)[0];\n    this.canvasRenderer = render;\n  }\n\n  contains(text: IText, point: IPoint, params?: IPickParams): boolean {\n    // const { textAttribute } = graphicService.themeService.getCurrentTheme();\n    // const {\n    //   x = textAttribute.x,\n    //   y = textAttribute.y,\n    // } = text.attribute;\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    const bounds = text.AABBBounds;\n\n    if (!pickContext.camera) {\n      if (!bounds.containsPoint(point)) {\n        return false;\n      }\n      return true;\n    }\n\n    // const symbolAttribute = graphicService.themeService.getCurrentTheme().symbolAttribute;\n    pickContext.highPerformanceSave();\n    const textAttribute = text.getGraphicTheme();\n\n    const { keepDirIn3d = textAttribute.keepDirIn3d } = text.attribute;\n    // 文字如果需要变换，那就一定要计算3d矩阵\n    const computed3dMatrix = !keepDirIn3d;\n\n    const data = this.transform(text, textAttribute, pickContext, computed3dMatrix);\n    const { x, y, z, lastModelMatrix } = data;\n\n    this.canvasRenderer.z = z;\n    let pickPoint = point;\n    if (pickContext.camera) {\n      pickPoint = point.clone();\n      const globalMatrix = text.parent.globalTransMatrix;\n      pickPoint.x = globalMatrix.a * point.x + globalMatrix.c * point.y + globalMatrix.e;\n      pickPoint.y = globalMatrix.b * point.x + globalMatrix.d * point.y + globalMatrix.f;\n    }\n\n    // 详细形状判断\n    let picked = false;\n    this.canvasRenderer.drawShape(\n      text,\n      pickContext,\n      x,\n      y,\n      {} as any,\n      null,\n      (\n        context: IContext2d,\n        symbolAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        const {\n          fontSize = textAttribute.fontSize,\n          textBaseline = textAttribute.textBaseline,\n          textAlign = textAttribute.textAlign\n        } = text.attribute;\n        // 拾取基于xy的rect\n        const bounds = text.AABBBounds;\n        const height = bounds.height();\n        const width = bounds.width();\n        const offsetY = textLayoutOffsetY(textBaseline, height, fontSize);\n        const offsetX = textDrawOffsetX(textAlign, width);\n        context.rect(offsetX + x, offsetY + y, width, height, z);\n        picked = context.isPointInPath(pickPoint.x, pickPoint.y);\n        return picked;\n      },\n      (\n        context: IContext2d,\n        symbolAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        // if (picked) {\n        //   return true;\n        // }\n        // const lineWidth = symbolAttribute.lineWidth || themeAttribute.lineWidth;\n        // pickContext.lineWidth = getScaledStroke(pickContext, lineWidth, pickContext.dpr);\n        // picked = context.isPointInStroke(pickPoint.x, pickPoint.y);\n        return picked;\n      }\n    );\n\n    this.canvasRenderer.z = 0;\n    if (pickContext.modelMatrix !== lastModelMatrix) {\n      mat4Allocate.free(pickContext.modelMatrix);\n    }\n    pickContext.modelMatrix = lastModelMatrix;\n    pickContext.highPerformanceRestore();\n\n    return picked;\n  }\n}\n"]}

package/es/picker/contributions/common/glyph-picker-base.d.ts

@@ -1,6 +1,8 @@
 import type { IPoint } from '@visactor/vutils';
+import type { IGraphicRender } from '@visactor/vrender-core';
 import type { IGlyph, IPickParams } from '@visactor/vrender-core';
 export declare class GlyphPickerBase {
+    protected canvasRenderer: IGraphicRender;
     type: string;
     numberType: number;
     contains(glyph: IGlyph, point: IPoint, params?: IPickParams): boolean;

package/es/picker/contributions/common/glyph-picker-base.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/contributions/common/glyph-picker-base.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAG3D,MAAM,OAAO,eAAe;IAA5B;QACE,SAAI,GAAW,OAAO,CAAC;QACvB,eAAU,GAAW,iBAAiB,CAAC;IA8BzC,CAAC;IA5BC,QAAQ,CAAC,KAAa,EAAE,KAAa,EAAE,MAAoB;QACzD,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;YAC1C,OAAO,KAAK,CAAC;SACd;QACD,IAAI,KAAK,CAAC,SAAS,CAAC,QAAQ,KAAK,WAAW,EAAE;YAC5C,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;QAED,MAAM,aAAa,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC;QAC5C,IAAI,aAAa,EAAE;YAEjB,IAAI,MAAM,GAAG,KAAK,CAAC;YACnB,KAAK,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBAChC,IAAI,MAAM,EAAE;oBACV,OAAO;iBACR;gBACD,MAAM,IAAI,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;gBAC5D,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;YACpC,CAAC,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF","file":"glyph-picker-base.js","sourcesContent":["import type { IPoint } from '@visactor/vutils';\nimport { GLYPH_NUMBER_TYPE } from '@visactor/vrender-core';\nimport type { IGlyph, IPickParams } from '@visactor/vrender-core';\n\nexport class GlyphPickerBase {\n  type: string = 'glyph';\n  numberType: number = GLYPH_NUMBER_TYPE;\n\n  contains(glyph: IGlyph, point: IPoint, params?: IPickParams): boolean {\n    if (!glyph.AABBBounds.containsPoint(point)) {\n      return false;\n    }\n    if (glyph.attribute.pickMode === 'imprecise') {\n      return true;\n    }\n\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    const pickerService = params?.pickerService;\n    if (pickerService) {\n      // 遍历所有的子元素pick\n      let picked = false;\n      glyph.getSubGraphic().forEach(g => {\n        if (picked) {\n          return;\n        }\n        const data = pickerService.pickItem(g, point, null, params);\n        picked = !!(data && data.graphic);\n      });\n      return picked;\n    }\n    return false;\n  }\n}\n"]}
+{"version":3,"sources":["../src/picker/contributions/common/glyph-picker-base.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAI3D,MAAM,OAAO,eAAe;IAA5B;QAEE,SAAI,GAAW,OAAO,CAAC;QACvB,eAAU,GAAW,iBAAiB,CAAC;IA8BzC,CAAC;IA5BC,QAAQ,CAAC,KAAa,EAAE,KAAa,EAAE,MAAoB;QACzD,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;YAC1C,OAAO,KAAK,CAAC;SACd;QACD,IAAI,KAAK,CAAC,SAAS,CAAC,QAAQ,KAAK,WAAW,EAAE;YAC5C,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;QAED,MAAM,aAAa,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC;QAC5C,IAAI,aAAa,EAAE;YAEjB,IAAI,MAAM,GAAG,KAAK,CAAC;YACnB,KAAK,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBAChC,IAAI,MAAM,EAAE;oBACV,OAAO;iBACR;gBACD,MAAM,IAAI,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;gBAC5D,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;YACpC,CAAC,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF","file":"glyph-picker-base.js","sourcesContent":["import type { IPoint } from '@visactor/vutils';\nimport { GLYPH_NUMBER_TYPE } from '@visactor/vrender-core';\nimport type { IGraphicRender } from '@visactor/vrender-core';\nimport type { IGlyph, IPickParams } from '@visactor/vrender-core';\n\nexport class GlyphPickerBase {\n  protected canvasRenderer!: IGraphicRender;\n  type: string = 'glyph';\n  numberType: number = GLYPH_NUMBER_TYPE;\n\n  contains(glyph: IGlyph, point: IPoint, params?: IPickParams): boolean {\n    if (!glyph.AABBBounds.containsPoint(point)) {\n      return false;\n    }\n    if (glyph.attribute.pickMode === 'imprecise') {\n      return true;\n    }\n\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    const pickerService = params?.pickerService;\n    if (pickerService) {\n      // 遍历所有的子元素pick\n      let picked = false;\n      glyph.getSubGraphic().forEach(g => {\n        if (picked) {\n          return;\n        }\n        const data = pickerService.pickItem(g, point, null, params);\n        picked = !!(data && data.graphic);\n      });\n      return picked;\n    }\n    return false;\n  }\n}\n"]}

package/es/picker/contributions/math-picker/arc-module.d.ts

@@ -1,2 +1 @@
-import { ContainerModule } from '@visactor/vrender-core';
-export declare const arcMathPickModule: ContainerModule;
+export declare function registerMathArcPicker(): void;

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

@@ -1,13 +1,12 @@
-import { ContainerModule } from "@visactor/vrender-core";
+import { contributionRegistry } from "@visactor/vrender-core";
 
 import { DefaultMathArcPicker } from "./arc-picker";
 
-import { MathArcPicker, MathPickerContribution } from "../constants";
+import { MathPickerContribution } from "../constants";
 
-let loadArcPick = !1;
+let _registered = !1;
 
-export const arcMathPickModule = new ContainerModule(((bind, unbind, isBound, rebind) => {
-    loadArcPick || (loadArcPick = !0, bind(MathArcPicker).to(DefaultMathArcPicker).inSingletonScope(), 
-    bind(MathPickerContribution).toService(MathArcPicker));
-}));
+export function registerMathArcPicker() {
+    _registered || (_registered = !0, contributionRegistry.register(MathPickerContribution, new DefaultMathArcPicker));
+}
 //# sourceMappingURL=arc-module.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/contributions/math-picker/arc-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAErE,IAAI,WAAW,GAAG,KAAK,CAAC;AACxB,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,eAAe,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IACrF,IAAI,WAAW,EAAE;QACf,OAAO;KACR;IACD,WAAW,GAAG,IAAI,CAAC;IAEnB,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAChE,IAAI,CAAC,sBAAsB,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;AACxD,CAAC,CAAC,CAAC","file":"arc-module.js","sourcesContent":["import { ContainerModule } from '@visactor/vrender-core';\nimport { DefaultMathArcPicker } from './arc-picker';\nimport { MathArcPicker, MathPickerContribution } from '../constants';\n\nlet loadArcPick = false;\nexport const arcMathPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {\n  if (loadArcPick) {\n    return;\n  }\n  loadArcPick = true;\n  // arc picker\n  bind(MathArcPicker).to(DefaultMathArcPicker).inSingletonScope();\n  bind(MathPickerContribution).toService(MathArcPicker);\n});\n"]}
+{"version":3,"sources":["../src/picker/contributions/math-picker/arc-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAEtD,IAAI,WAAW,GAAG,KAAK,CAAC;AACxB,MAAM,UAAU,qBAAqB;IACnC,IAAI,WAAW,EAAE;QACf,OAAO;KACR;IACD,WAAW,GAAG,IAAI,CAAC;IACnB,oBAAoB,CAAC,QAAQ,CAAC,sBAAsB,EAAE,IAAI,oBAAoB,EAAE,CAAC,CAAC;AACpF,CAAC","file":"arc-module.js","sourcesContent":["import { contributionRegistry } from '@visactor/vrender-core';\nimport { DefaultMathArcPicker } from './arc-picker';\nimport { MathPickerContribution } from '../constants';\n\nlet _registered = false;\nexport function registerMathArcPicker() {\n  if (_registered) {\n    return;\n  }\n  _registered = true;\n  contributionRegistry.register(MathPickerContribution, new DefaultMathArcPicker());\n}\n"]}