@visactor/vrender-kits 1.0.47-alpha.0 → 1.1.0-alpha.1

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

@@ -1,27 +1,11 @@
-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 { RICHTEXT_NUMBER_TYPE } from "@visactor/vrender-core";
 
-import { inject, injectable, RICHTEXT_NUMBER_TYPE, RichTextRender } from "@visactor/vrender-core";
-
-let DefaultCanvasRichTextPicker = class {
+export class DefaultCanvasRichTextPicker {
     constructor(canvasRenderer) {
         this.canvasRenderer = canvasRenderer, this.type = "richtext", this.numberType = RICHTEXT_NUMBER_TYPE;
     }
     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,EACL,oBAAoB,EAKrB,MAAM,wBAAwB,CAAC;AAChC,MAAM,OAAO,2BAA2B;IAItC,YAA4B,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAH1D,SAAI,GAAW,UAAU,CAAC;QAC1B,eAAU,GAAW,oBAAoB,CAAC;IAEmB,CAAC;IAE9D,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 {\n  RICHTEXT_NUMBER_TYPE,\n  type IGraphicPicker,\n  type IGraphicRender,\n  type IPickParams,\n  type IRichText\n} from '@visactor/vrender-core';\nexport class DefaultCanvasRichTextPicker implements IGraphicPicker {\n  type: string = 'richtext';\n  numberType: number = RICHTEXT_NUMBER_TYPE;\n\n  constructor(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"]}

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 bindStarCanvasPickerContribution(container: any): void;

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

@@ -1,4 +1,6 @@
-import { ContainerModule } from "@visactor/vrender-core";
+import { StarRender } from "@visactor/vrender-core";
+
+import { resolveContainerBinding } from "../../../common/explicit-binding";
 
 import { CanvasPickerContribution, CanvasStarPicker } from "../constants";
 
@@ -6,8 +8,10 @@ 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 bindStarCanvasPickerContribution(container) {
+    var _a;
+    loadStarPick || (null === (_a = container.isBound) || void 0 === _a ? void 0 : _a.call(container, StarRender)) && (loadStarPick = !0, 
+    container.bind(CanvasStarPicker).toDynamicValue((() => new DefaultCanvasStarPicker(resolveContainerBinding(container, StarRender)))).inSingletonScope(), 
+    container.bind(CanvasPickerContribution).toService(CanvasStarPicker));
+}
 //# 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,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,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,UAAU,gCAAgC,CAAC,SAAc;;IAC7D,IAAI,YAAY,EAAE;QAChB,OAAO;KACR;IACD,IAAI,CAAC,CAAA,MAAA,SAAS,CAAC,OAAO,0DAAG,UAAU,CAAC,CAAA,EAAE;QACpC,OAAO;KACR;IACD,YAAY,GAAG,IAAI,CAAC;IACpB,SAAS;SACN,IAAI,CAAC,gBAAgB,CAAC;SACtB,cAAc,CAAC,GAAG,EAAE,CAAC,IAAI,uBAAuB,CAAC,uBAAuB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;SACjG,gBAAgB,EAAE,CAAC;IACtB,SAAS,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;AACvE,CAAC","file":"star-module.js","sourcesContent":["import { StarRender } from '@visactor/vrender-core';\nimport { resolveContainerBinding } from '../../../common/explicit-binding';\nimport { CanvasPickerContribution, CanvasStarPicker } from '../constants';\nimport { DefaultCanvasStarPicker } from './star-picker';\n\nlet loadStarPick = false;\nexport function bindStarCanvasPickerContribution(container: any) {\n  if (loadStarPick) {\n    return;\n  }\n  if (!container.isBound?.(StarRender)) {\n    return;\n  }\n  loadStarPick = true;\n  container\n    .bind(CanvasStarPicker)\n    .toDynamicValue(() => new DefaultCanvasStarPicker(resolveContainerBinding(container, StarRender)))\n    .inSingletonScope();\n  container.bind(CanvasPickerContribution).toService(CanvasStarPicker);\n}\n"]}

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

@@ -1,4 +1,4 @@
-import type { IGraphicPicker, IGraphicRender } from '@visactor/vrender-core';
+import { type IGraphicPicker, type IGraphicRender } from '@visactor/vrender-core';
 import { PickerBase } from '../common/base';
 export declare class DefaultCanvasStarPicker extends PickerBase implements IGraphicPicker {
     readonly canvasRenderer: IGraphicRender;

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

@@ -1,26 +1,10 @@
-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 { STAR_NUMBER_TYPE } from "@visactor/vrender-core";
 
 import { PickerBase } from "../common/base";
 
-let DefaultCanvasStarPicker = class extends PickerBase {
+export class DefaultCanvasStarPicker extends PickerBase {
     constructor(canvasRenderer) {
         super(), this.canvasRenderer = canvasRenderer, this.type = "star", this.numberType = STAR_NUMBER_TYPE;
     }
-};
-
-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,gBAAgB,EAA4C,MAAM,wBAAwB,CAAC;AACpG,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,MAAM,OAAO,uBAAwB,SAAQ,UAAU;IAIrD,YAA4B,cAA8B;QACxD,KAAK,EAAE,CAAC;QADkB,mBAAc,GAAd,cAAc,CAAgB;QAH1D,SAAI,GAAW,MAAM,CAAC;QACtB,eAAU,GAAW,gBAAgB,CAAC;IAItC,CAAC;CACF","file":"star-picker.js","sourcesContent":["import { STAR_NUMBER_TYPE, type IGraphicPicker, type 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(public readonly canvasRenderer: IGraphicRender) {\n    super();\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 bindSymbolCanvasPickerContribution(container: any): void;

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

@@ -1,4 +1,6 @@
-import { ContainerModule } from "@visactor/vrender-core";
+import { SymbolRender } from "@visactor/vrender-core";
+
+import { resolveContainerBinding } from "../../../common/explicit-binding";
 
 import { CanvasPickerContribution, CanvasSymbolPicker } from "../constants";
 
@@ -6,8 +8,8 @@ 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 bindSymbolCanvasPickerContribution(container) {
+    loadSymbolPick || (loadSymbolPick = !0, container.bind(CanvasSymbolPicker).toDynamicValue((() => new DefaultCanvasSymbolPicker(resolveContainerBinding(container, SymbolRender)))).inSingletonScope(), 
+    container.bind(CanvasPickerContribution).toService(CanvasSymbolPicker));
+}
 //# 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,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,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,UAAU,kCAAkC,CAAC,SAAc;IAC/D,IAAI,cAAc,EAAE;QAClB,OAAO;KACR;IACD,cAAc,GAAG,IAAI,CAAC;IACtB,SAAS;SACN,IAAI,CAAC,kBAAkB,CAAC;SACxB,cAAc,CAAC,GAAG,EAAE,CAAC,IAAI,yBAAyB,CAAC,uBAAuB,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC;SACrG,gBAAgB,EAAE,CAAC;IACtB,SAAS,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;AACzE,CAAC","file":"symbol-module.js","sourcesContent":["import { SymbolRender } from '@visactor/vrender-core';\nimport { resolveContainerBinding } from '../../../common/explicit-binding';\nimport { CanvasPickerContribution, CanvasSymbolPicker } from '../constants';\nimport { DefaultCanvasSymbolPicker } from './symbol-picker';\n\nlet loadSymbolPick = false;\nexport function bindSymbolCanvasPickerContribution(container: any) {\n  if (loadSymbolPick) {\n    return;\n  }\n  loadSymbolPick = true;\n  container\n    .bind(CanvasSymbolPicker)\n    .toDynamicValue(() => new DefaultCanvasSymbolPicker(resolveContainerBinding(container, SymbolRender)))\n    .inSingletonScope();\n  container.bind(CanvasPickerContribution).toService(CanvasSymbolPicker);\n}\n"]}

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

@@ -1,5 +1,5 @@
+import { type ISymbol, type IGraphicPicker, type IGraphicRender, type IPickParams } from '@visactor/vrender-core';
 import type { IPoint } from '@visactor/vutils';
-import type { ISymbol, IGraphicPicker, IGraphicRender, IPickParams } from '@visactor/vrender-core';
 import { Base3dPicker } from '../common/base-3d-picker';
 export declare class DefaultCanvasSymbolPicker extends Base3dPicker<ISymbol> implements IGraphicPicker {
     readonly canvasRenderer: IGraphicRender;

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

@@ -1,20 +1,8 @@
-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 { mat4Allocate, getScaledStroke, SYMBOL_NUMBER_TYPE } from "@visactor/vrender-core";
 
 import { Base3dPicker } from "../common/base-3d-picker";
 
-let DefaultCanvasSymbolPicker = class extends Base3dPicker {
+export class DefaultCanvasSymbolPicker extends Base3dPicker {
     constructor(canvasRenderer) {
         super(), this.canvasRenderer = canvasRenderer, this.type = "symbol", this.numberType = SYMBOL_NUMBER_TYPE;
     }
@@ -47,9 +35,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  mat4Allocate,\n  getScaledStroke,\n  SYMBOL_NUMBER_TYPE,\n  type IGraphicAttribute,\n  type IContext2d,\n  type IMarkAttribute,\n  type ISymbol,\n  type IThemeAttribute,\n  type IGraphicPicker,\n  type IGraphicRender,\n  type IPickParams\n} from '@visactor/vrender-core';\nimport type { IPoint } from '@visactor/vutils';\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(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"]}

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 bindTextCanvasPickerContribution(container: any): void;

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

@@ -1,4 +1,6 @@
-import { ContainerModule } from "@visactor/vrender-core";
+import { TextRender } from "@visactor/vrender-core";
+
+import { resolveContainerBinding } from "../../../common/explicit-binding";
 
 import { CanvasPickerContribution, CanvasTextPicker } from "../constants";
 
@@ -6,8 +8,8 @@ import { DefaultCanvasTextPicker } from "./text-picker";
 
 let loadTextPick = !1;
 
-export const textCanvasPickModule = new ContainerModule(((bind, unbind, isBound, rebind) => {
-    loadTextPick || (loadTextPick = !0, bind(CanvasTextPicker).to(DefaultCanvasTextPicker).inSingletonScope(), 
-    bind(CanvasPickerContribution).toService(CanvasTextPicker));
-}));
+export function bindTextCanvasPickerContribution(container) {
+    loadTextPick || (loadTextPick = !0, container.bind(CanvasTextPicker).toDynamicValue((() => new DefaultCanvasTextPicker(resolveContainerBinding(container, TextRender)))).inSingletonScope(), 
+    container.bind(CanvasPickerContribution).toService(CanvasTextPicker));
+}
 //# 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,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,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,UAAU,gCAAgC,CAAC,SAAc;IAC7D,IAAI,YAAY,EAAE;QAChB,OAAO;KACR;IACD,YAAY,GAAG,IAAI,CAAC;IACpB,SAAS;SACN,IAAI,CAAC,gBAAgB,CAAC;SACtB,cAAc,CAAC,GAAG,EAAE,CAAC,IAAI,uBAAuB,CAAC,uBAAuB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;SACjG,gBAAgB,EAAE,CAAC;IACtB,SAAS,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;AACvE,CAAC","file":"text-module.js","sourcesContent":["import { TextRender } from '@visactor/vrender-core';\nimport { resolveContainerBinding } from '../../../common/explicit-binding';\nimport { CanvasPickerContribution, CanvasTextPicker } from '../constants';\nimport { DefaultCanvasTextPicker } from './text-picker';\n\nlet loadTextPick = false;\nexport function bindTextCanvasPickerContribution(container: any) {\n  if (loadTextPick) {\n    return;\n  }\n  loadTextPick = true;\n  container\n    .bind(CanvasTextPicker)\n    .toDynamicValue(() => new DefaultCanvasTextPicker(resolveContainerBinding(container, TextRender)))\n    .inSingletonScope();\n  container.bind(CanvasPickerContribution).toService(CanvasTextPicker);\n}\n"]}

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

@@ -1,5 +1,5 @@
+import { type IText, type IGraphicPicker, type IGraphicRender, type IPickParams } from '@visactor/vrender-core';
 import type { IPoint } from '@visactor/vutils';
-import type { IText, IGraphicPicker, IGraphicRender, IPickParams } from '@visactor/vrender-core';
 import { Base3dPicker } from '../common/base-3d-picker';
 export declare class DefaultCanvasTextPicker extends Base3dPicker<IText> implements IGraphicPicker {
     readonly canvasRenderer: IGraphicRender;

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

@@ -1,20 +1,8 @@
-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 { textDrawOffsetX, textLayoutOffsetY, mat4Allocate, TEXT_NUMBER_TYPE } from "@visactor/vrender-core";
 
 import { Base3dPicker } from "../common/base-3d-picker";
 
-let DefaultCanvasTextPicker = class extends Base3dPicker {
+export class DefaultCanvasTextPicker extends Base3dPicker {
     constructor(canvasRenderer) {
         super(), this.canvasRenderer = canvasRenderer, this.type = "text", this.numberType = TEXT_NUMBER_TYPE;
     }
@@ -44,9 +32,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  textDrawOffsetX,\n  textLayoutOffsetY,\n  mat4Allocate,\n  TEXT_NUMBER_TYPE,\n  type IGraphicAttribute,\n  type IContext2d,\n  type IMarkAttribute,\n  type IText,\n  type IThemeAttribute,\n  type IGraphicPicker,\n  type IGraphicRender,\n  type IPickParams\n} from '@visactor/vrender-core';\nimport type { IPoint } from '@visactor/vutils';\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(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"]}

package/es/picker/contributions/constants.d.ts

@@ -10,6 +10,7 @@ export declare const MathSymbolPicker: unique symbol;
 export declare const MathTextPicker: unique symbol;
 export declare const MathPolygonPicker: unique symbol;
 export declare const MathGlyphPicker: unique symbol;
+export declare const MathRichTextPicker: unique symbol;
 export declare const CanvasArcPicker: unique symbol;
 export declare const CanvasArc3dPicker: unique symbol;
 export declare const CanvasAreaPicker: unique symbol;

package/es/picker/contributions/constants.js

@@ -22,6 +22,8 @@ export const MathPolygonPicker = Symbol.for("MathPolygonPicker");
 
 export const MathGlyphPicker = Symbol.for("MathGlyphPicker");
 
+export const MathRichTextPicker = Symbol.for("MathRichTextPicker");
+
 export const CanvasArcPicker = Symbol.for("CanvasArcPicker");
 
 export const CanvasArc3dPicker = Symbol.for("CanvasArc3dPicker");

package/es/picker/contributions/constants.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/contributions/constants.ts"],"names":[],"mappings":"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","file":"constants.js","sourcesContent":["export const MathPickerContribution = Symbol.for('MathPickerContribution');\n\n// math\nexport const MathArcPicker = Symbol.for('MathArcPicker');\nexport const MathAreaPicker = Symbol.for('MathAreaPicker');\nexport const MathCirclePicker = Symbol.for('MathCirclePicker');\nexport const MathImagePicker = Symbol.for('MathImagePicker');\nexport const MathLinePicker = Symbol.for('MathLinePicker');\nexport const MathPathPicker = Symbol.for('MathPathPicker');\nexport const MathRectPicker = Symbol.for('MathRectPicker');\nexport const MathSymbolPicker = Symbol.for('MathSymbolPicker');\nexport const MathTextPicker = Symbol.for('MathTextPicker');\nexport const MathPolygonPicker = Symbol.for('MathPolygonPicker');\nexport const MathGlyphPicker = Symbol.for('MathGlyphPicker');\n\n// canvas\nexport const CanvasArcPicker = Symbol.for('CanvasArcPicker');\nexport const CanvasArc3dPicker = Symbol.for('CanvasArc3dPicker');\nexport const CanvasAreaPicker = Symbol.for('CanvasAreaPicker');\nexport const CanvasCirclePicker = Symbol.for('CanvasCirclePicker');\nexport const CanvasImagePicker = Symbol.for('CanvasImagePicker');\nexport const CanvasGifImagePicker = Symbol.for('CanvasGifImagePicker');\nexport const CanvasLinePicker = Symbol.for('CanvasLinePicker');\nexport const CanvasLottiePicker = Symbol.for('CanvasLottiePicker');\nexport const CanvasPathPicker = Symbol.for('CanvasPathPicker');\nexport const CanvasRectPicker = Symbol.for('CanvasRectPicker');\nexport const CanvasRect3dPicker = Symbol.for('CanvasRect3dPicker');\nexport const CanvasSymbolPicker = Symbol.for('CanvasSymbolPicker');\nexport const CanvasTextPicker = Symbol.for('CanvasTextPicker');\nexport const CanvasPolygonPicker = Symbol.for('CanvasPolygonPicker');\nexport const CanvasPyramid3dPicker = Symbol.for('CanvasPyramid3dPicker');\nexport const CanvasRichTextPicker = Symbol.for('CanvasRichTextPicker');\nexport const CanvasGlyphPicker = Symbol.for('CanvasGlyphPicker');\nexport const CanvasGroupPicker = Symbol.for('CanvasGroupPicker');\nexport const CanvasStarPicker = Symbol.for('CanvasStarPicker');\nexport const CanvasPickerContribution = Symbol.for('CanvasPickerContribution');\n"]}
+{"version":3,"sources":["../src/picker/contributions/constants.ts"],"names":[],"mappings":"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","file":"constants.js","sourcesContent":["export const MathPickerContribution = Symbol.for('MathPickerContribution');\n\n// math\nexport const MathArcPicker = Symbol.for('MathArcPicker');\nexport const MathAreaPicker = Symbol.for('MathAreaPicker');\nexport const MathCirclePicker = Symbol.for('MathCirclePicker');\nexport const MathImagePicker = Symbol.for('MathImagePicker');\nexport const MathLinePicker = Symbol.for('MathLinePicker');\nexport const MathPathPicker = Symbol.for('MathPathPicker');\nexport const MathRectPicker = Symbol.for('MathRectPicker');\nexport const MathSymbolPicker = Symbol.for('MathSymbolPicker');\nexport const MathTextPicker = Symbol.for('MathTextPicker');\nexport const MathPolygonPicker = Symbol.for('MathPolygonPicker');\nexport const MathGlyphPicker = Symbol.for('MathGlyphPicker');\nexport const MathRichTextPicker = Symbol.for('MathRichTextPicker');\n\n// canvas\nexport const CanvasArcPicker = Symbol.for('CanvasArcPicker');\nexport const CanvasArc3dPicker = Symbol.for('CanvasArc3dPicker');\nexport const CanvasAreaPicker = Symbol.for('CanvasAreaPicker');\nexport const CanvasCirclePicker = Symbol.for('CanvasCirclePicker');\nexport const CanvasImagePicker = Symbol.for('CanvasImagePicker');\nexport const CanvasGifImagePicker = Symbol.for('CanvasGifImagePicker');\nexport const CanvasLinePicker = Symbol.for('CanvasLinePicker');\nexport const CanvasLottiePicker = Symbol.for('CanvasLottiePicker');\nexport const CanvasPathPicker = Symbol.for('CanvasPathPicker');\nexport const CanvasRectPicker = Symbol.for('CanvasRectPicker');\nexport const CanvasRect3dPicker = Symbol.for('CanvasRect3dPicker');\nexport const CanvasSymbolPicker = Symbol.for('CanvasSymbolPicker');\nexport const CanvasTextPicker = Symbol.for('CanvasTextPicker');\nexport const CanvasPolygonPicker = Symbol.for('CanvasPolygonPicker');\nexport const CanvasPyramid3dPicker = Symbol.for('CanvasPyramid3dPicker');\nexport const CanvasRichTextPicker = Symbol.for('CanvasRichTextPicker');\nexport const CanvasGlyphPicker = Symbol.for('CanvasGlyphPicker');\nexport const CanvasGroupPicker = Symbol.for('CanvasGroupPicker');\nexport const CanvasStarPicker = Symbol.for('CanvasStarPicker');\nexport const CanvasPickerContribution = Symbol.for('CanvasPickerContribution');\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 bindArcMathPickerContribution(container: any): void;

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

@@ -1,13 +1,15 @@
-import { ContainerModule } from "@visactor/vrender-core";
+import { ArcRender } from "@visactor/vrender-core";
 
-import { DefaultMathArcPicker } from "./arc-picker";
+import { resolveContainerBinding } from "../../../common/explicit-binding";
 
 import { MathArcPicker, MathPickerContribution } from "../constants";
 
+import { DefaultMathArcPicker } from "./arc-picker";
+
 let loadArcPick = !1;
 
-export const arcMathPickModule = new ContainerModule(((bind, unbind, isBound, rebind) => {
-    loadArcPick || (loadArcPick = !0, bind(MathArcPicker).to(DefaultMathArcPicker).inSingletonScope(), 
-    bind(MathPickerContribution).toService(MathArcPicker));
-}));
+export function bindArcMathPickerContribution(container) {
+    loadArcPick || (loadArcPick = !0, container.bind(MathArcPicker).toDynamicValue((() => new DefaultMathArcPicker(resolveContainerBinding(container, ArcRender)))).inSingletonScope(), 
+    container.bind(MathPickerContribution).toService(MathArcPicker));
+}
 //# 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,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAEpD,IAAI,WAAW,GAAG,KAAK,CAAC;AACxB,MAAM,UAAU,6BAA6B,CAAC,SAAc;IAC1D,IAAI,WAAW,EAAE;QACf,OAAO;KACR;IACD,WAAW,GAAG,IAAI,CAAC;IACnB,SAAS;SACN,IAAI,CAAC,aAAa,CAAC;SACnB,cAAc,CAAC,GAAG,EAAE,CAAC,IAAI,oBAAoB,CAAC,uBAAuB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;SAC7F,gBAAgB,EAAE,CAAC;IACtB,SAAS,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;AAClE,CAAC","file":"arc-module.js","sourcesContent":["import { ArcRender } from '@visactor/vrender-core';\nimport { resolveContainerBinding } from '../../../common/explicit-binding';\nimport { MathArcPicker, MathPickerContribution } from '../constants';\nimport { DefaultMathArcPicker } from './arc-picker';\n\nlet loadArcPick = false;\nexport function bindArcMathPickerContribution(container: any) {\n  if (loadArcPick) {\n    return;\n  }\n  loadArcPick = true;\n  container\n    .bind(MathArcPicker)\n    .toDynamicValue(() => new DefaultMathArcPicker(resolveContainerBinding(container, ArcRender)))\n    .inSingletonScope();\n  container.bind(MathPickerContribution).toService(MathArcPicker);\n}\n"]}

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

@@ -1,4 +1,4 @@
-import type { IGraphicPicker, IGraphicRender } from '@visactor/vrender-core';
+import { type IGraphicPicker, type IGraphicRender } from '@visactor/vrender-core';
 import { PickerBase } from '../common/base';
 export declare class DefaultMathArcPicker extends PickerBase implements IGraphicPicker {
     readonly canvasRenderer: IGraphicRender;

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

@@ -1,26 +1,10 @@
-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, ArcRender, ARC_NUMBER_TYPE } from "@visactor/vrender-core";
+import { ARC_NUMBER_TYPE } from "@visactor/vrender-core";
 
 import { PickerBase } from "../common/base";
 
-let DefaultMathArcPicker = class extends PickerBase {
+export class DefaultMathArcPicker extends PickerBase {
     constructor(canvasRenderer) {
         super(), this.canvasRenderer = canvasRenderer, this.type = "arc", this.numberType = ARC_NUMBER_TYPE;
     }
-};
-
-DefaultMathArcPicker = __decorate([ injectable(), __param(0, inject(ArcRender)), __metadata("design:paramtypes", [ Object ]) ], DefaultMathArcPicker);
-
-export { DefaultMathArcPicker };
+}
 //# sourceMappingURL=arc-picker.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/contributions/math-picker/arc-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAExF,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAGrC,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,UAAU;IAIlD,YAA+C,cAA8B;QAC3E,KAAK,EAAE,CAAC;QADqC,mBAAc,GAAd,cAAc,CAAgB;QAH7E,SAAI,GAAW,KAAK,CAAC;QACrB,eAAU,GAAW,eAAe,CAAC;IAIrC,CAAC;CACF,CAAA;AAPY,oBAAoB;IADhC,UAAU,EAAE;IAKE,WAAA,MAAM,CAAC,SAAS,CAAC,CAAA;;GAJnB,oBAAoB,CAOhC;SAPY,oBAAoB","file":"arc-picker.js","sourcesContent":["import { inject, injectable, ArcRender, ARC_NUMBER_TYPE } from '@visactor/vrender-core';\nimport type { IGraphicPicker, IGraphicRender } from '@visactor/vrender-core';\nimport { PickerBase } from '../common/base';\n\n@injectable()\nexport class DefaultMathArcPicker extends PickerBase implements IGraphicPicker {\n  type: string = 'arc';\n  numberType: number = ARC_NUMBER_TYPE;\n\n  constructor(@inject(ArcRender) public readonly canvasRenderer: IGraphicRender) {\n    super();\n  }\n}\n"]}
+{"version":3,"sources":["../src/picker/contributions/math-picker/arc-picker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAA4C,MAAM,wBAAwB,CAAC;AACnG,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,MAAM,OAAO,oBAAqB,SAAQ,UAAU;IAIlD,YAA4B,cAA8B;QACxD,KAAK,EAAE,CAAC;QADkB,mBAAc,GAAd,cAAc,CAAgB;QAH1D,SAAI,GAAW,KAAK,CAAC;QACrB,eAAU,GAAW,eAAe,CAAC;IAIrC,CAAC;CACF","file":"arc-picker.js","sourcesContent":["import { ARC_NUMBER_TYPE, type IGraphicPicker, type IGraphicRender } from '@visactor/vrender-core';\nimport { PickerBase } from '../common/base';\n\nexport class DefaultMathArcPicker extends PickerBase implements IGraphicPicker {\n  type: string = 'arc';\n  numberType: number = ARC_NUMBER_TYPE;\n\n  constructor(public readonly canvasRenderer: IGraphicRender) {\n    super();\n  }\n}\n"]}

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

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

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

@@ -1,4 +1,6 @@
-import { ContainerModule } from "@visactor/vrender-core";
+import { AreaRender } from "@visactor/vrender-core";
+
+import { resolveContainerBinding } from "../../../common/explicit-binding";
 
 import { MathAreaPicker, MathPickerContribution } from "../constants";
 
@@ -6,8 +8,8 @@ import { DefaultMathAreaPicker } from "./area-picker";
 
 let loadAreaPick = !1;
 
-export const areaMathPickModule = new ContainerModule(((bind, unbind, isBound, rebind) => {
-    loadAreaPick || (loadAreaPick = !0, bind(MathAreaPicker).to(DefaultMathAreaPicker).inSingletonScope(), 
-    bind(MathPickerContribution).toService(MathAreaPicker));
-}));
+export function bindAreaMathPickerContribution(container) {
+    loadAreaPick || (loadAreaPick = !0, container.bind(MathAreaPicker).toDynamicValue((() => new DefaultMathAreaPicker(resolveContainerBinding(container, AreaRender)))).inSingletonScope(), 
+    container.bind(MathPickerContribution).toService(MathAreaPicker));
+}
 //# sourceMappingURL=area-module.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/contributions/math-picker/area-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAkB,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAEtF,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAEtD,IAAI,YAAY,GAAG,KAAK,CAAC;AACzB,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,eAAe,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IACtF,IAAI,YAAY,EAAE;QAChB,OAAO;KACR;IACD,YAAY,GAAG,IAAI,CAAC;IAEpB,IAAI,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,qBAAqB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAClE,IAAI,CAAC,sBAAsB,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;AACzD,CAAC,CAAC,CAAC","file":"area-module.js","sourcesContent":["import { ContainerModule } from '@visactor/vrender-core';\nimport { MathAreaPicker, MathLinePicker, MathPickerContribution } from '../constants';\nimport { DefaultMathLinePicker } from './line-picker';\nimport { DefaultMathAreaPicker } from './area-picker';\n\nlet loadAreaPick = false;\nexport const areaMathPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {\n  if (loadAreaPick) {\n    return;\n  }\n  loadAreaPick = true;\n  // area picker\n  bind(MathAreaPicker).to(DefaultMathAreaPicker).inSingletonScope();\n  bind(MathPickerContribution).toService(MathAreaPicker);\n});\n"]}
+{"version":3,"sources":["../src/picker/contributions/math-picker/area-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAEtD,IAAI,YAAY,GAAG,KAAK,CAAC;AACzB,MAAM,UAAU,8BAA8B,CAAC,SAAc;IAC3D,IAAI,YAAY,EAAE;QAChB,OAAO;KACR;IACD,YAAY,GAAG,IAAI,CAAC;IACpB,SAAS;SACN,IAAI,CAAC,cAAc,CAAC;SACpB,cAAc,CAAC,GAAG,EAAE,CAAC,IAAI,qBAAqB,CAAC,uBAAuB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;SAC/F,gBAAgB,EAAE,CAAC;IACtB,SAAS,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;AACnE,CAAC","file":"area-module.js","sourcesContent":["import { AreaRender } from '@visactor/vrender-core';\nimport { resolveContainerBinding } from '../../../common/explicit-binding';\nimport { MathAreaPicker, MathPickerContribution } from '../constants';\nimport { DefaultMathAreaPicker } from './area-picker';\n\nlet loadAreaPick = false;\nexport function bindAreaMathPickerContribution(container: any) {\n  if (loadAreaPick) {\n    return;\n  }\n  loadAreaPick = true;\n  container\n    .bind(MathAreaPicker)\n    .toDynamicValue(() => new DefaultMathAreaPicker(resolveContainerBinding(container, AreaRender)))\n    .inSingletonScope();\n  container.bind(MathPickerContribution).toService(MathAreaPicker);\n}\n"]}

package/es/picker/contributions/math-picker/area-picker.d.ts

@@ -1,4 +1,4 @@
-import type { IGraphicPicker, IGraphicRender } from '@visactor/vrender-core';
+import { type IGraphicPicker, type IGraphicRender } from '@visactor/vrender-core';
 import { PickerBase } from '../common/base';
 export declare class DefaultMathAreaPicker extends PickerBase implements IGraphicPicker {
     readonly canvasRenderer: IGraphicRender;

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

@@ -1,26 +1,10 @@
-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, AreaRender, AREA_NUMBER_TYPE } from "@visactor/vrender-core";
+import { AREA_NUMBER_TYPE } from "@visactor/vrender-core";
 
 import { PickerBase } from "../common/base";
 
-let DefaultMathAreaPicker = class extends PickerBase {
+export class DefaultMathAreaPicker extends PickerBase {
     constructor(canvasRenderer) {
         super(), this.canvasRenderer = canvasRenderer, this.type = "area", this.numberType = AREA_NUMBER_TYPE;
     }
-};
-
-DefaultMathAreaPicker = __decorate([ injectable(), __param(0, inject(AreaRender)), __metadata("design:paramtypes", [ Object ]) ], DefaultMathAreaPicker);
-
-export { DefaultMathAreaPicker };
+}
 //# sourceMappingURL=area-picker.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/contributions/math-picker/area-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAG1F,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAGrC,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,UAAU;IAInD,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,qBAAqB;IADjC,UAAU,EAAE;IAKE,WAAA,MAAM,CAAC,UAAU,CAAC,CAAA;;GAJpB,qBAAqB,CAOjC;SAPY,qBAAqB","file":"area-picker.js","sourcesContent":["import { inject, injectable, AreaRender, AREA_NUMBER_TYPE } from '@visactor/vrender-core';\n\nimport type { IGraphicPicker, IGraphicRender } from '@visactor/vrender-core';\nimport { PickerBase } from '../common/base';\n\n@injectable()\nexport class DefaultMathAreaPicker extends PickerBase implements IGraphicPicker {\n  type: string = 'area';\n  numberType: number = AREA_NUMBER_TYPE;\n\n  constructor(@inject(AreaRender) public readonly canvasRenderer: IGraphicRender) {\n    super();\n  }\n}\n"]}
+{"version":3,"sources":["../src/picker/contributions/math-picker/area-picker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAA4C,MAAM,wBAAwB,CAAC;AACpG,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,MAAM,OAAO,qBAAsB,SAAQ,UAAU;IAInD,YAA4B,cAA8B;QACxD,KAAK,EAAE,CAAC;QADkB,mBAAc,GAAd,cAAc,CAAgB;QAH1D,SAAI,GAAW,MAAM,CAAC;QACtB,eAAU,GAAW,gBAAgB,CAAC;IAItC,CAAC;CACF","file":"area-picker.js","sourcesContent":["import { AREA_NUMBER_TYPE, type IGraphicPicker, type IGraphicRender } from '@visactor/vrender-core';\nimport { PickerBase } from '../common/base';\n\nexport class DefaultMathAreaPicker extends PickerBase implements IGraphicPicker {\n  type: string = 'area';\n  numberType: number = AREA_NUMBER_TYPE;\n\n  constructor(public readonly canvasRenderer: IGraphicRender) {\n    super();\n  }\n}\n"]}

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

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