@visactor/vrender 0.15.0-alpha.16 → 0.15.0-alpha.18

package/cjs/jsx/index.js

@@ -0,0 +1,21 @@
+"use strict";
+
+var __createBinding = this && this.__createBinding || (Object.create ? function(o, m, k, k2) {
+    void 0 === k2 && (k2 = k);
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    desc && !("get" in desc ? !m.__esModule : desc.writable || desc.configurable) || (desc = {
+        enumerable: !0,
+        get: function() {
+            return m[k];
+        }
+    }), Object.defineProperty(o, k2, desc);
+} : function(o, m, k, k2) {
+    void 0 === k2 && (k2 = k), o[k2] = m[k];
+}), __exportStar = this && this.__exportStar || function(m, exports) {
+    for (var p in m) "default" === p || Object.prototype.hasOwnProperty.call(exports, p) || __createBinding(exports, m, p);
+};
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), __exportStar(require("./jsx-classic"), exports), __exportStar(require("./graphicType"), exports);
+//# sourceMappingURL=index.js.map

package/cjs/jsx/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/jsx/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,gDAA8B","file":"index.js","sourcesContent":["export * from './jsx-classic';\nexport * from './graphicType';\n"]}

package/cjs/jsx/jsx-classic.d.ts

@@ -0,0 +1,3 @@
+import { Group } from '../graphic';
+export declare function jsx(type: string | any, config: Record<string, any>, ...children: any): any;
+export declare const Fragment: typeof Group;

package/cjs/jsx/jsx-classic.js

@@ -0,0 +1,58 @@
+"use strict";
+
+var __rest = this && this.__rest || function(s, e) {
+    var t = {};
+    for (var p in s) Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0 && (t[p] = s[p]);
+    if (null != s && "function" == typeof Object.getOwnPropertySymbols) {
+        var i = 0;
+        for (p = Object.getOwnPropertySymbols(s); i < p.length; i++) e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]) && (t[p[i]] = s[p[i]]);
+    }
+    return t;
+};
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.Fragment = exports.jsx = void 0;
+
+const vutils_1 = require("@visactor/vutils"), graphic_1 = require("../graphic"), graphicType_1 = require("./graphicType");
+
+function flatten(list, out) {
+    if ((0, vutils_1.isArray)(list)) return list.forEach((i => flatten(i, out)));
+    out.push(list);
+}
+
+function jsx(type, config, ...children) {
+    const _a = config || {}, {key: key, attribute: attribute, stateProxy: stateProxy} = _a, props = __rest(_a, [ "key", "attribute", "stateProxy" ]);
+    let c = type;
+    (0, vutils_1.isString)(type) && (c = graphic_1.graphicCreator[type]);
+    const childrenList = [];
+    children.length && flatten(1 === children.length ? children[0] : children, childrenList);
+    const g = "Group" === c.name ? new c(attribute) : c(config);
+    return parseToGraphic(g, childrenList, props), stateProxy && (g.stateProxy = stateProxy), 
+    g;
+}
+
+function parseToGraphic(g, childrenList, props) {
+    let out, isGraphic = !1;
+    switch (g.type) {
+      case "richtext":
+      case "rich/image":
+        break;
+
+      case "rich/text":
+        out = g.attribute || {}, childrenList[0] && (out.text = childrenList[0]);
+        break;
+
+      default:
+        isGraphic = !0;
+    }
+    isGraphic ? (childrenList.forEach((c => {
+        c && g.add(c);
+    })), Object.keys(props).forEach((k => {
+        const en = graphicType_1.REACT_TO_CANOPUS_EVENTS[k];
+        en && g.on(en, props[k]);
+    }))) : "richtext" === g.type && (g.attribute.textConfig = childrenList.map((item => item.attribute)).filter((item => item)));
+}
+
+exports.jsx = jsx, exports.Fragment = graphic_1.Group;
+//# sourceMappingURL=jsx-classic.js.map

package/cjs/jsx/jsx-classic.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/jsx/jsx-classic.ts"],"names":[],"mappings":"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","file":"jsx-classic.js","sourcesContent":["import { isArray, isString } from '@visactor/vutils';\nimport { Group, graphicCreator } from '../graphic';\nimport { REACT_TO_CANOPUS_EVENTS } from './graphicType';\n\nfunction flatten(list: any, out: any[]): void {\n  if (isArray(list)) {\n    return list.forEach(i => flatten(i, out));\n  }\n  out.push(list);\n}\n\nexport function jsx(type: string | any, config: Record<string, any>, ...children: any) {\n  const { key, attribute, stateProxy, ...props } = config || {};\n\n  let c = type;\n  if (isString(type)) {\n    c = graphicCreator[type];\n  }\n\n  const childrenList: any[] = [];\n  if (children.length) {\n    flatten(children.length === 1 ? children[0] : children, childrenList);\n  }\n\n  const g = c.name === 'Group' ? new c(attribute) : c(config);\n  parseToGraphic(g, childrenList, props);\n\n  if (stateProxy) {\n    g.stateProxy = stateProxy;\n  }\n\n  return g;\n}\n\nfunction parseToGraphic(g: any, childrenList: any[], props: any) {\n  let isGraphic: boolean = false;\n  let out: any;\n  switch (g.type) {\n    case 'richtext':\n      break;\n    case 'rich/text':\n      out = g.attribute || {};\n      childrenList[0] && (out.text = childrenList[0]);\n      break;\n    case 'rich/image':\n      break;\n    default:\n      isGraphic = true;\n  }\n\n  if (isGraphic) {\n    childrenList.forEach((c: any) => {\n      c && g.add(c);\n    });\n\n    Object.keys(props).forEach(k => {\n      const en = REACT_TO_CANOPUS_EVENTS[k];\n      if (en) {\n        g.on(en, props[k]);\n      }\n    });\n  } else {\n    if (g.type === 'richtext') {\n      g.attribute.textConfig = childrenList.map(item => item.attribute).filter(item => item);\n    }\n  }\n}\n\nexport const Fragment = Group;\n"]}

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

@@ -1,4 +1,4 @@
-import type { IPointLike } from '@visactor/vutils';
+import type { IMatrix, IPointLike } from '@visactor/vutils';
 import type { ICanvas, IContext2d, IGraphic, EnvType, IGlobal, IGraphicPicker, IPickerService, IDrawContribution, IContributionProvider, IPickItemInterceptorContribution, IPickParams } from '../interface';
 import { DefaultPickService } from './picker-service';
 export declare class DefaultCanvasPickerService extends DefaultPickService implements IPickerService {
@@ -24,5 +24,5 @@ export declare class DefaultCanvasPickerService extends DefaultPickService imple
     constructor(contributions: IContributionProvider<IGraphicPicker>, circlePicker: IGraphicPicker, rectPicker: IGraphicPicker, arcPicker: IGraphicPicker, areaPicker: IGraphicPicker, imagePicker: IGraphicPicker, linePicker: IGraphicPicker, pathPicker: IGraphicPicker, symbolPicker: IGraphicPicker, textPicker: IGraphicPicker, polygonPicker: IGraphicPicker, richtextPicker: IGraphicPicker, drawContribution: IDrawContribution, global: IGlobal, pickItemInterceptorContributions: IContributionProvider<IPickItemInterceptorContribution>);
     init(): void;
     configure(global: IGlobal, env: EnvType): void;
-    pickItem(graphic: IGraphic, point: IPointLike, params: IPickParams): IGraphic | null;
+    pickItem(graphic: IGraphic, point: IPointLike, parentMatrix: IMatrix | null, params: IPickParams): IGraphic | null;
 }

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

@@ -47,14 +47,31 @@ let DefaultCanvasPickerService = class extends picker_service_1.DefaultPickServi
         };
         this.pickCanvas = new browser_1.BrowserCanvas(options), this.pickContext = this.pickCanvas.getContext("2d");
     }
-    pickItem(graphic, point, params) {
+    pickItem(graphic, point, parentMatrix, params) {
         if (!1 === graphic.attribute.pickable) return null;
         if (this.InterceptorContributions.length) for (let i = 0; i < this.InterceptorContributions.length; i++) {
             const drawContribution = this.InterceptorContributions[i];
-            if (drawContribution.beforePickItem && drawContribution.beforePickItem(graphic, this, point, params)) return graphic;
+            if (drawContribution.beforePickItem) {
+                const ret = drawContribution.beforePickItem(graphic, this, point, params, {
+                    parentMatrix: parentMatrix
+                });
+                if (ret) return !0 === ret ? graphic : ret.graphic;
+            }
         }
         const picker = this.pickerMap.get(graphic.numberType);
-        return picker && picker.contains(graphic, point, params) ? graphic : null;
+        if (!picker) return null;
+        const data = picker.contains(graphic, point, params) ? graphic : null;
+        if (data) return data;
+        if (this.InterceptorContributions.length) for (let i = 0; i < this.InterceptorContributions.length; i++) {
+            const drawContribution = this.InterceptorContributions[i];
+            if (drawContribution.afterPickItem) {
+                const ret = drawContribution.afterPickItem(graphic, this, point, params, {
+                    parentMatrix: parentMatrix
+                });
+                if (ret) return !0 === ret ? graphic : ret.graphic;
+            }
+        }
+        return data;
     }
 };
 

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

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

package/cjs/picker/contributions/canvas-picker/glyph-picker.js

@@ -31,7 +31,7 @@ let DefaultCanvasGlyphPicker = class {
         if (pickerService) {
             let picked = !1;
             return glyph.getSubGraphic().forEach((g => {
-                picked || (picked = !!pickerService.pickItem(g, point, params));
+                picked || (picked = !!pickerService.pickItem(g, point, null, params));
             })), picked;
         }
         return !1;

package/cjs/picker/contributions/canvas-picker/glyph-picker.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/contributions/canvas-picker/glyph-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,yCAA+C;AAC/C,0DAA+D;AAE/D,4CAA8C;AAGvC,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAInC,YAAiD,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAH/E,SAAI,GAAW,OAAO,CAAC;QACvB,eAAU,GAAW,6BAAiB,CAAC;IAE2C,CAAC;IAEnF,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,GAAG,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;YACtD,CAAC,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IA0Cf,CAAC;CACF,CAAA;AA1EY,wBAAwB;IADpC,IAAA,sBAAU,GAAE;IAKE,WAAA,IAAA,kBAAM,EAAC,oBAAW,CAAC,CAAA;;GAJrB,wBAAwB,CA0EpC;AA1EY,4DAAwB","file":"glyph-picker.js","sourcesContent":["import type { IPoint } from '@visactor/vutils';\nimport { inject, injectable } from 'inversify';\nimport { GLYPH_NUMBER_TYPE } from '../../../graphic/constants';\nimport type { IGlyph, IGraphicPicker, IGraphicRender, IPickParams } from '../../../interface';\nimport { GlyphRender } from '../../../render';\n\n@injectable()\nexport class DefaultCanvasGlyphPicker implements IGraphicPicker {\n  type: string = 'glyph';\n  numberType: number = GLYPH_NUMBER_TYPE;\n\n  constructor(@inject(GlyphRender) public readonly canvasRenderer: IGraphicRender) {}\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        picked = !!pickerService.pickItem(g, point, params);\n      });\n      return picked;\n    }\n    return false;\n\n    // const { rectAttribute } = graphicService.themeService.getCurrentTheme();\n    // const glyphAttribute = getTheme(glyph).glyph;\n    // let { x = glyphAttribute.x, y = glyphAttribute.y } = glyph.attribute;\n\n    // pickContext.highPerformanceSave();\n    // if (!glyph.transMatrix.onlyTranslate()) {\n    //   // 性能较差\n    //   x = 0;\n    //   y = 0;\n    //   pickContext.transformFromMatrix(glyph.transMatrix, true);\n    // } else {\n    //   const { dx = glyphAttribute.dx, dy = glyphAttribute.dy } = glyph.attribute;\n    //   x += dx;\n    //   y += dy;\n    //   // 当前context有rotate/scale，重置matrix\n    //   pickContext.setTransformForCurrent();\n    // }\n    // // 详细形状判断\n    // let picked = false;\n    // this.canvasRenderer.drawShape(\n    //   glyph,\n    //   pickContext,\n    //   x,\n    //   y,\n    //   {\n    //     drawContribution: params.pickerService?.drawContribution\n    //   } as any,\n    //   null,\n    //   context => {\n    //     // 选中后面就不需要再走逻辑了\n    //     if (picked) {\n    //       return true;\n    //     }\n    //     picked = context.isPointInPath(point.x, point.y);\n    //     return picked;\n    //   }\n    // );\n\n    // pickContext.highPerformanceRestore();\n    // return picked; // 无圆角形状判断通过\n  }\n}\n"]}
+{"version":3,"sources":["../src/picker/contributions/canvas-picker/glyph-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,yCAA+C;AAC/C,0DAA+D;AAE/D,4CAA8C;AAGvC,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAInC,YAAiD,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAH/E,SAAI,GAAW,OAAO,CAAC;QACvB,eAAU,GAAW,6BAAiB,CAAC;IAE2C,CAAC;IAEnF,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,GAAG,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;YAC5D,CAAC,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IA0Cf,CAAC;CACF,CAAA;AA1EY,wBAAwB;IADpC,IAAA,sBAAU,GAAE;IAKE,WAAA,IAAA,kBAAM,EAAC,oBAAW,CAAC,CAAA;;GAJrB,wBAAwB,CA0EpC;AA1EY,4DAAwB","file":"glyph-picker.js","sourcesContent":["import type { IPoint } from '@visactor/vutils';\nimport { inject, injectable } from 'inversify';\nimport { GLYPH_NUMBER_TYPE } from '../../../graphic/constants';\nimport type { IGlyph, IGraphicPicker, IGraphicRender, IPickParams } from '../../../interface';\nimport { GlyphRender } from '../../../render';\n\n@injectable()\nexport class DefaultCanvasGlyphPicker implements IGraphicPicker {\n  type: string = 'glyph';\n  numberType: number = GLYPH_NUMBER_TYPE;\n\n  constructor(@inject(GlyphRender) public readonly canvasRenderer: IGraphicRender) {}\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        picked = !!pickerService.pickItem(g, point, null, params);\n      });\n      return picked;\n    }\n    return false;\n\n    // const { rectAttribute } = graphicService.themeService.getCurrentTheme();\n    // const glyphAttribute = getTheme(glyph).glyph;\n    // let { x = glyphAttribute.x, y = glyphAttribute.y } = glyph.attribute;\n\n    // pickContext.highPerformanceSave();\n    // if (!glyph.transMatrix.onlyTranslate()) {\n    //   // 性能较差\n    //   x = 0;\n    //   y = 0;\n    //   pickContext.transformFromMatrix(glyph.transMatrix, true);\n    // } else {\n    //   const { dx = glyphAttribute.dx, dy = glyphAttribute.dy } = glyph.attribute;\n    //   x += dx;\n    //   y += dy;\n    //   // 当前context有rotate/scale，重置matrix\n    //   pickContext.setTransformForCurrent();\n    // }\n    // // 详细形状判断\n    // let picked = false;\n    // this.canvasRenderer.drawShape(\n    //   glyph,\n    //   pickContext,\n    //   x,\n    //   y,\n    //   {\n    //     drawContribution: params.pickerService?.drawContribution\n    //   } as any,\n    //   null,\n    //   context => {\n    //     // 选中后面就不需要再走逻辑了\n    //     if (picked) {\n    //       return true;\n    //     }\n    //     picked = context.isPointInPath(point.x, point.y);\n    //     return picked;\n    //   }\n    // );\n\n    // pickContext.highPerformanceRestore();\n    // return picked; // 无圆角形状判断通过\n  }\n}\n"]}

package/cjs/picker/contributions/canvas-picker/group-picker.d.ts

@@ -0,0 +1,7 @@
+import type { IPoint } from '@visactor/vutils';
+import type { IGraphicPicker, IPickParams, IGroup } from '../../../interface';
+export declare class DefaultCanvasGroupPicker implements IGraphicPicker {
+    type: string;
+    numberType: number;
+    contains(group: IGroup, point: IPoint, params?: IPickParams): boolean;
+}

package/cjs/picker/contributions/canvas-picker/group-picker.js

@@ -0,0 +1,26 @@
+"use strict";
+
+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;
+};
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.DefaultCanvasGroupPicker = void 0;
+
+const inversify_1 = require("inversify"), constants_1 = require("../../../graphic/constants");
+
+let DefaultCanvasGroupPicker = class {
+    constructor() {
+        this.type = "group", this.numberType = constants_1.GROUP_NUMBER_TYPE;
+    }
+    contains(group, point, params) {
+        return !1;
+    }
+};
+
+DefaultCanvasGroupPicker = __decorate([ (0, inversify_1.injectable)() ], DefaultCanvasGroupPicker), 
+exports.DefaultCanvasGroupPicker = DefaultCanvasGroupPicker;
+//# sourceMappingURL=group-picker.js.map

package/cjs/picker/contributions/canvas-picker/group-picker.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/picker/contributions/canvas-picker/group-picker.ts"],"names":[],"mappings":";;;;;;;;;AACA,yCAA+C;AAE/C,0DAA+D;AAGxD,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAA9B;QACL,SAAI,GAAW,OAAO,CAAC;QACvB,eAAU,GAAW,6BAAiB,CAAC;IAYzC,CAAC;IARC,QAAQ,CAAC,KAAa,EAAE,KAAa,EAAE,MAAoB;QAGzD,OAAO,KAAK,CAAC;IAIf,CAAC;CACF,CAAA;AAdY,wBAAwB;IADpC,IAAA,sBAAU,GAAE;GACA,wBAAwB,CAcpC;AAdY,4DAAwB","file":"group-picker.js","sourcesContent":["import type { IPoint } from '@visactor/vutils';\nimport { inject, injectable } from 'inversify';\nimport type { IGraphicPicker, IGraphicRender, IPickParams, IGroup } from '../../../interface';\nimport { GROUP_NUMBER_TYPE } from '../../../graphic/constants';\n\n@injectable()\nexport class DefaultCanvasGroupPicker implements IGraphicPicker {\n  type: string = 'group';\n  numberType: number = GROUP_NUMBER_TYPE;\n\n  // constructor(@inject(RectRender) public readonly canvasRenderer: IGraphicRender) {}\n\n  contains(group: IGroup, point: IPoint, params?: IPickParams): boolean {\n    // Group作为特殊节点，本身不支持被pick\n    // 存在shadowDOM的group，它的shadow可以被pick，但是不会冒泡到场景树中\n    return false;\n    // if (group.attribute.pickMode === 'imprecise') {\n    //   return true;\n    // }\n  }\n}\n"]}

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 });
 
-const inversify_1 = require("inversify"), circle_picker_1 = require("./circle-picker"), rect_picker_1 = require("./rect-picker"), arc_picker_1 = require("./arc-picker"), area_picker_1 = require("./area-picker"), image_picker_1 = require("./image-picker"), line_picker_1 = require("./line-picker"), path_picker_1 = require("./path-picker"), symbol_picker_1 = require("./symbol-picker"), text_picker_1 = require("./text-picker"), constants_1 = require("../constants"), contribution_provider_1 = require("../../../common/contribution-provider"), polygon_picker_1 = require("./polygon-picker"), richtext_picker_1 = require("./richtext-picker"), glyph_picker_1 = require("./glyph-picker"), rect3d_picker_1 = require("./rect3d-picker"), pyramid3d_picker_1 = require("./pyramid3d-picker"), arc3d_picker_1 = require("./arc3d-picker");
+const inversify_1 = require("inversify"), circle_picker_1 = require("./circle-picker"), rect_picker_1 = require("./rect-picker"), arc_picker_1 = require("./arc-picker"), area_picker_1 = require("./area-picker"), image_picker_1 = require("./image-picker"), line_picker_1 = require("./line-picker"), path_picker_1 = require("./path-picker"), symbol_picker_1 = require("./symbol-picker"), text_picker_1 = require("./text-picker"), constants_1 = require("../constants"), contribution_provider_1 = require("../../../common/contribution-provider"), polygon_picker_1 = require("./polygon-picker"), richtext_picker_1 = require("./richtext-picker"), glyph_picker_1 = require("./glyph-picker"), rect3d_picker_1 = require("./rect3d-picker"), pyramid3d_picker_1 = require("./pyramid3d-picker"), arc3d_picker_1 = require("./arc3d-picker"), group_picker_1 = require("./group-picker");
 
 exports.default = new inversify_1.ContainerModule(((bind, unbind, isBound, rebind) => {
     bind(circle_picker_1.DefaultCanvasCirclePicker).toSelf().inSingletonScope(), bind(constants_1.CanvasCirclePicker).toService(circle_picker_1.DefaultCanvasCirclePicker), 
@@ -39,6 +39,8 @@ exports.default = new inversify_1.ContainerModule(((bind, unbind, isBound, rebin
     bind(constants_1.CanvasPickerContribution).toService(constants_1.CanvasRichTextPicker), 
     bind(glyph_picker_1.DefaultCanvasGlyphPicker).toSelf().inSingletonScope(), bind(constants_1.CanvasGlyphPicker).toService(glyph_picker_1.DefaultCanvasGlyphPicker), 
     bind(constants_1.CanvasPickerContribution).toService(constants_1.CanvasGlyphPicker), 
+    bind(group_picker_1.DefaultCanvasGroupPicker).toSelf().inSingletonScope(), bind(constants_1.CanvasGroupPicker).toService(group_picker_1.DefaultCanvasGroupPicker), 
+    bind(constants_1.CanvasPickerContribution).toService(constants_1.CanvasGroupPicker), 
     (0, contribution_provider_1.bindContributionProvider)(bind, constants_1.CanvasPickerContribution);
 }));
 //# sourceMappingURL=module.js.map

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

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

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

@@ -16,7 +16,8 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasSymbolPicker = void 0;
 
-const inversify_1 = require("inversify"), theme_1 = require("../../../graphic/theme"), render_1 = require("../../../render"), matrix_allocate_1 = require("../../../allocator/matrix-allocate"), canvas_utils_1 = require("../../../common/canvas-utils"), base_picker_1 = require("./base-picker"), constants_1 = require("../../../graphic/constants");
+const inversify_1 = require("inversify"), theme_1 = require("../../../graphic/theme"), render_1 = require("../../../render"), matrix_allocate_1 = require("../../../allocator/matrix-allocate"), canvas_utils_1 = require("../../../common/canvas-utils"), base_picker_1 = require("./base-picker"), constants_1 = require("../../../graphic/constants"), graphic_1 = require("../../../graphic"), rect = (0, 
+graphic_1.createRect)({});
 
 let DefaultCanvasSymbolPicker = class extends base_picker_1.BasePicker {
     constructor(canvasRenderer) {
@@ -25,9 +26,10 @@ let DefaultCanvasSymbolPicker = class extends base_picker_1.BasePicker {
     contains(symbol, point, params) {
         const {pickContext: pickContext} = null != params ? params : {};
         if (!pickContext) return !1;
+        const parsedPath = symbol.getParsedPath();
         if (!pickContext.camera) {
             if (!symbol.AABBBounds.containsPoint(point)) return !1;
-            if ("imprecise" === symbol.attribute.pickMode) return !0;
+            if (parsedPath.isSvg || "imprecise" === symbol.attribute.pickMode) return !0;
         }
         pickContext.highPerformanceSave();
         const symbolAttribute = (0, theme_1.getTheme)(symbol).symbol, data = this.transform(symbol, symbolAttribute, pickContext), {x: x, y: y, z: z, lastModelMatrix: lastModelMatrix} = data;

package/cjs/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 { inject, injectable } from 'inversify';\nimport type { IPoint } from '@visactor/vutils';\nimport { getTheme } from '../../../graphic/theme';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  ISymbol,\n  IThemeAttribute,\n  IGraphicPicker,\n  IGraphicRender,\n  IPickParams\n} from '../../../interface';\nimport { SymbolRender } from '../../../render';\nimport { mat4Allocate } from '../../../allocator/matrix-allocate';\nimport { getScaledStroke } from '../../../common/canvas-utils';\nimport { BasePicker } from './base-picker';\nimport { SYMBOL_NUMBER_TYPE } from '../../../graphic/constants';\n\n@injectable()\nexport class DefaultCanvasSymbolPicker extends BasePicker<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    if (!pickContext.camera) {\n      if (!symbol.AABBBounds.containsPoint(point)) {\n        return false;\n      }\n      if (symbol.attribute.pickMode === 'imprecise') {\n        return true;\n      }\n    }\n\n    pickContext.highPerformanceSave();\n    // const symbolAttribute = graphicService.themeService.getCurrentTheme().symbolAttribute;\n    const symbolAttribute = getTheme(symbol).symbol;\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        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\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 { inject, injectable } from 'inversify';\nimport type { IPoint } from '@visactor/vutils';\nimport { getTheme } from '../../../graphic/theme';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  ISymbol,\n  IThemeAttribute,\n  IGraphicPicker,\n  IGraphicRender,\n  IPickParams\n} from '../../../interface';\nimport { SymbolRender } from '../../../render';\nimport { mat4Allocate } from '../../../allocator/matrix-allocate';\nimport { getScaledStroke } from '../../../common/canvas-utils';\nimport { BasePicker } from './base-picker';\nimport { SYMBOL_NUMBER_TYPE } from '../../../graphic/constants';\nimport { createRect } from '../../../graphic';\n\nconst rect = createRect({});\n\n@injectable()\nexport class DefaultCanvasSymbolPicker extends BasePicker<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 = getTheme(symbol).symbol;\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        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\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/cjs/picker/contributions/constants.d.ts

@@ -13,6 +13,7 @@ export declare const CanvasPolygonPicker: unique symbol;
 export declare const CanvasPyramid3dPicker: unique symbol;
 export declare const CanvasRichTextPicker: unique symbol;
 export declare const CanvasGlyphPicker: unique symbol;
+export declare const CanvasGroupPicker: unique symbol;
 export declare const CanvasPickerContribution: unique symbol;
 export declare const MathArcPicker: unique symbol;
 export declare const MathAreaPicker: unique symbol;

package/cjs/picker/contributions/constants.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.MathPickerContribution = exports.MathGlyphPicker = exports.MathPolygonPicker = exports.MathTextPicker = exports.MathSymbolPicker = exports.MathRectPicker = exports.MathPathPicker = exports.MathLinePicker = exports.MathImagePicker = exports.MathCirclePicker = exports.MathAreaPicker = exports.MathArcPicker = exports.CanvasPickerContribution = exports.CanvasGlyphPicker = exports.CanvasRichTextPicker = exports.CanvasPyramid3dPicker = exports.CanvasPolygonPicker = exports.CanvasTextPicker = exports.CanvasSymbolPicker = exports.CanvasRect3dPicker = exports.CanvasRectPicker = exports.CanvasPathPicker = exports.CanvasLinePicker = exports.CanvasImagePicker = exports.CanvasCirclePicker = exports.CanvasAreaPicker = exports.CanvasArc3dPicker = exports.CanvasArcPicker = void 0, 
+}), exports.MathPickerContribution = exports.MathGlyphPicker = exports.MathPolygonPicker = exports.MathTextPicker = exports.MathSymbolPicker = exports.MathRectPicker = exports.MathPathPicker = exports.MathLinePicker = exports.MathImagePicker = exports.MathCirclePicker = exports.MathAreaPicker = exports.MathArcPicker = exports.CanvasPickerContribution = exports.CanvasGroupPicker = exports.CanvasGlyphPicker = exports.CanvasRichTextPicker = exports.CanvasPyramid3dPicker = exports.CanvasPolygonPicker = exports.CanvasTextPicker = exports.CanvasSymbolPicker = exports.CanvasRect3dPicker = exports.CanvasRectPicker = exports.CanvasPathPicker = exports.CanvasLinePicker = exports.CanvasImagePicker = exports.CanvasCirclePicker = exports.CanvasAreaPicker = exports.CanvasArc3dPicker = exports.CanvasArcPicker = void 0, 
 exports.CanvasArcPicker = Symbol.for("CanvasArcPicker"), exports.CanvasArc3dPicker = Symbol.for("CanvasArc3dPicker"), 
 exports.CanvasAreaPicker = Symbol.for("CanvasAreaPicker"), exports.CanvasCirclePicker = Symbol.for("CanvasCirclePicker"), 
 exports.CanvasImagePicker = Symbol.for("CanvasImagePicker"), exports.CanvasLinePicker = Symbol.for("CanvasLinePicker"), 
@@ -10,11 +10,12 @@ exports.CanvasPathPicker = Symbol.for("CanvasPathPicker"), exports.CanvasRectPic
 exports.CanvasRect3dPicker = Symbol.for("CanvasRect3dPicker"), exports.CanvasSymbolPicker = Symbol.for("CanvasSymbolPicker"), 
 exports.CanvasTextPicker = Symbol.for("CanvasTextPicker"), exports.CanvasPolygonPicker = Symbol.for("CanvasPolygonPicker"), 
 exports.CanvasPyramid3dPicker = Symbol.for("CanvasPyramid3dPicker"), exports.CanvasRichTextPicker = Symbol.for("CanvasRichTextPicker"), 
-exports.CanvasGlyphPicker = Symbol.for("CanvasGlyphPicker"), exports.CanvasPickerContribution = Symbol.for("CanvasPickerContribution"), 
-exports.MathArcPicker = Symbol.for("MathArcPicker"), exports.MathAreaPicker = Symbol.for("MathAreaPicker"), 
-exports.MathCirclePicker = Symbol.for("MathCirclePicker"), exports.MathImagePicker = Symbol.for("MathImagePicker"), 
-exports.MathLinePicker = Symbol.for("MathLinePicker"), exports.MathPathPicker = Symbol.for("MathPathPicker"), 
-exports.MathRectPicker = Symbol.for("MathRectPicker"), exports.MathSymbolPicker = Symbol.for("MathSymbolPicker"), 
-exports.MathTextPicker = Symbol.for("MathTextPicker"), exports.MathPolygonPicker = Symbol.for("MathPolygonPicker"), 
-exports.MathGlyphPicker = Symbol.for("MathGlyphPicker"), exports.MathPickerContribution = Symbol.for("MathPickerContribution");
+exports.CanvasGlyphPicker = Symbol.for("CanvasGlyphPicker"), exports.CanvasGroupPicker = Symbol.for("CanvasGroupPicker"), 
+exports.CanvasPickerContribution = Symbol.for("CanvasPickerContribution"), exports.MathArcPicker = Symbol.for("MathArcPicker"), 
+exports.MathAreaPicker = Symbol.for("MathAreaPicker"), exports.MathCirclePicker = Symbol.for("MathCirclePicker"), 
+exports.MathImagePicker = Symbol.for("MathImagePicker"), exports.MathLinePicker = Symbol.for("MathLinePicker"), 
+exports.MathPathPicker = Symbol.for("MathPathPicker"), exports.MathRectPicker = Symbol.for("MathRectPicker"), 
+exports.MathSymbolPicker = Symbol.for("MathSymbolPicker"), exports.MathTextPicker = Symbol.for("MathTextPicker"), 
+exports.MathPolygonPicker = Symbol.for("MathPolygonPicker"), exports.MathGlyphPicker = Symbol.for("MathGlyphPicker"), 
+exports.MathPickerContribution = Symbol.for("MathPickerContribution");
 //# sourceMappingURL=constants.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/contributions/constants.ts"],"names":[],"mappings":";;;AAUa,QAAA,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAChD,QAAA,iBAAiB,GAAG,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;AACpD,QAAA,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAClD,QAAA,kBAAkB,GAAG,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;AACtD,QAAA,iBAAiB,GAAG,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;AACpD,QAAA,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAClD,QAAA,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAClD,QAAA,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAClD,QAAA,kBAAkB,GAAG,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;AACtD,QAAA,kBAAkB,GAAG,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;AACtD,QAAA,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAClD,QAAA,mBAAmB,GAAG,MAAM,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;AACxD,QAAA,qBAAqB,GAAG,MAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;AAC5D,QAAA,oBAAoB,GAAG,MAAM,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;AAC1D,QAAA,iBAAiB,GAAG,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;AACpD,QAAA,wBAAwB,GAAG,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;AAElE,QAAA,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AAC5C,QAAA,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;AAC9C,QAAA,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAClD,QAAA,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAChD,QAAA,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;AAC9C,QAAA,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;AAC9C,QAAA,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;AAC9C,QAAA,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAClD,QAAA,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;AAC9C,QAAA,iBAAiB,GAAG,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;AACpD,QAAA,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAChD,QAAA,sBAAsB,GAAG,MAAM,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC","file":"constants.js","sourcesContent":["// export const ArcPicker = Symbol.for('ArcPicker');\n// export const AreaPicker = Symbol.for('AreaPicker');\n// export const CirclePicker = Symbol.for('CirclePicker');\n// export const ImagePicker = Symbol.for('ImagePicker');\n// export const LinePicker = Symbol.for('LinePicker');\n// export const PathPicker = Symbol.for('PathPicker');\n// export const RectPicker = Symbol.for('RectPicker');\n// export const SymbolPicker = Symbol.for('SymbolPicker');\n// export const TextPicker = Symbol.for('TextPicker');\n\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 CanvasLinePicker = Symbol.for('CanvasLinePicker');\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 CanvasPickerContribution = Symbol.for('CanvasPickerContribution');\n\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 MathPickerContribution = Symbol.for('MathPickerContribution');\n"]}
+{"version":3,"sources":["../src/picker/contributions/constants.ts"],"names":[],"mappings":";;;AAUa,QAAA,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAChD,QAAA,iBAAiB,GAAG,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;AACpD,QAAA,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAClD,QAAA,kBAAkB,GAAG,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;AACtD,QAAA,iBAAiB,GAAG,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;AACpD,QAAA,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAClD,QAAA,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAClD,QAAA,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAClD,QAAA,kBAAkB,GAAG,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;AACtD,QAAA,kBAAkB,GAAG,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;AACtD,QAAA,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAClD,QAAA,mBAAmB,GAAG,MAAM,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;AACxD,QAAA,qBAAqB,GAAG,MAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;AAC5D,QAAA,oBAAoB,GAAG,MAAM,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;AAC1D,QAAA,iBAAiB,GAAG,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;AACpD,QAAA,iBAAiB,GAAG,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;AACpD,QAAA,wBAAwB,GAAG,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;AAElE,QAAA,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AAC5C,QAAA,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;AAC9C,QAAA,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAClD,QAAA,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAChD,QAAA,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;AAC9C,QAAA,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;AAC9C,QAAA,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;AAC9C,QAAA,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAClD,QAAA,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;AAC9C,QAAA,iBAAiB,GAAG,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;AACpD,QAAA,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAChD,QAAA,sBAAsB,GAAG,MAAM,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC","file":"constants.js","sourcesContent":["// export const ArcPicker = Symbol.for('ArcPicker');\n// export const AreaPicker = Symbol.for('AreaPicker');\n// export const CirclePicker = Symbol.for('CirclePicker');\n// export const ImagePicker = Symbol.for('ImagePicker');\n// export const LinePicker = Symbol.for('LinePicker');\n// export const PathPicker = Symbol.for('PathPicker');\n// export const RectPicker = Symbol.for('RectPicker');\n// export const SymbolPicker = Symbol.for('SymbolPicker');\n// export const TextPicker = Symbol.for('TextPicker');\n\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 CanvasLinePicker = Symbol.for('CanvasLinePicker');\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 CanvasPickerContribution = Symbol.for('CanvasPickerContribution');\n\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 MathPickerContribution = Symbol.for('MathPickerContribution');\n"]}

package/cjs/picker/contributions/math-picker/glyph-picker.js

@@ -31,7 +31,7 @@ let DefaultMathGlyphPicker = class {
         if (pickerService) {
             let picked = !1;
             return glyph.getSubGraphic().forEach((g => {
-                picked || (picked = !!pickerService.pickItem(g, point, params));
+                picked || (picked = !!pickerService.pickItem(g, point, null, params));
             })), picked;
         }
         return !1;

package/cjs/picker/contributions/math-picker/glyph-picker.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/contributions/math-picker/glyph-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,yCAA+C;AAC/C,0DAA+D;AAE/D,4CAA8C;AAGvC,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAIjC,YAAiD,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAH/E,SAAI,GAAW,OAAO,CAAC;QACvB,eAAU,GAAW,6BAAiB,CAAC;IAE2C,CAAC;IAEnF,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,GAAG,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;YACtD,CAAC,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IA0Cf,CAAC;CACF,CAAA;AA1EY,sBAAsB;IADlC,IAAA,sBAAU,GAAE;IAKE,WAAA,IAAA,kBAAM,EAAC,oBAAW,CAAC,CAAA;;GAJrB,sBAAsB,CA0ElC;AA1EY,wDAAsB","file":"glyph-picker.js","sourcesContent":["import type { IPoint } from '@visactor/vutils';\nimport { inject, injectable } from 'inversify';\nimport { GLYPH_NUMBER_TYPE } from '../../../graphic/constants';\nimport type { IGlyph, IGraphicPicker, IGraphicRender, IPickParams } from '../../../interface';\nimport { GlyphRender } from '../../../render';\n\n@injectable()\nexport class DefaultMathGlyphPicker implements IGraphicPicker {\n  type: string = 'glyph';\n  numberType: number = GLYPH_NUMBER_TYPE;\n\n  constructor(@inject(GlyphRender) public readonly canvasRenderer: IGraphicRender) {}\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        picked = !!pickerService.pickItem(g, point, params);\n      });\n      return picked;\n    }\n    return false;\n\n    // const { rectAttribute } = graphicService.themeService.getCurrentTheme();\n    // const glyphAttribute = getTheme(glyph).glyph;\n    // let { x = glyphAttribute.x, y = glyphAttribute.y } = glyph.attribute;\n\n    // pickContext.highPerformanceSave();\n    // if (!glyph.transMatrix.onlyTranslate()) {\n    //   // 性能较差\n    //   x = 0;\n    //   y = 0;\n    //   pickContext.transformFromMatrix(glyph.transMatrix, true);\n    // } else {\n    //   const { dx = glyphAttribute.dx, dy = glyphAttribute.dy } = glyph.attribute;\n    //   x += dx;\n    //   y += dy;\n    //   // 当前context有rotate/scale，重置matrix\n    //   pickContext.setTransformForCurrent();\n    // }\n    // // 详细形状判断\n    // let picked = false;\n    // this.canvasRenderer.drawShape(\n    //   glyph,\n    //   pickContext,\n    //   x,\n    //   y,\n    //   {\n    //     drawContribution: params.pickerService?.drawContribution\n    //   } as any,\n    //   null,\n    //   context => {\n    //     // 选中后面就不需要再走逻辑了\n    //     if (picked) {\n    //       return true;\n    //     }\n    //     picked = context.isPointInPath(point.x, point.y);\n    //     return picked;\n    //   }\n    // );\n\n    // pickContext.highPerformanceRestore();\n    // return picked; // 无圆角形状判断通过\n  }\n}\n"]}
+{"version":3,"sources":["../src/picker/contributions/math-picker/glyph-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,yCAA+C;AAC/C,0DAA+D;AAE/D,4CAA8C;AAGvC,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAIjC,YAAiD,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAH/E,SAAI,GAAW,OAAO,CAAC;QACvB,eAAU,GAAW,6BAAiB,CAAC;IAE2C,CAAC;IAEnF,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,GAAG,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;YAC5D,CAAC,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IA0Cf,CAAC;CACF,CAAA;AA1EY,sBAAsB;IADlC,IAAA,sBAAU,GAAE;IAKE,WAAA,IAAA,kBAAM,EAAC,oBAAW,CAAC,CAAA;;GAJrB,sBAAsB,CA0ElC;AA1EY,wDAAsB","file":"glyph-picker.js","sourcesContent":["import type { IPoint } from '@visactor/vutils';\nimport { inject, injectable } from 'inversify';\nimport { GLYPH_NUMBER_TYPE } from '../../../graphic/constants';\nimport type { IGlyph, IGraphicPicker, IGraphicRender, IPickParams } from '../../../interface';\nimport { GlyphRender } from '../../../render';\n\n@injectable()\nexport class DefaultMathGlyphPicker implements IGraphicPicker {\n  type: string = 'glyph';\n  numberType: number = GLYPH_NUMBER_TYPE;\n\n  constructor(@inject(GlyphRender) public readonly canvasRenderer: IGraphicRender) {}\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        picked = !!pickerService.pickItem(g, point, null, params);\n      });\n      return picked;\n    }\n    return false;\n\n    // const { rectAttribute } = graphicService.themeService.getCurrentTheme();\n    // const glyphAttribute = getTheme(glyph).glyph;\n    // let { x = glyphAttribute.x, y = glyphAttribute.y } = glyph.attribute;\n\n    // pickContext.highPerformanceSave();\n    // if (!glyph.transMatrix.onlyTranslate()) {\n    //   // 性能较差\n    //   x = 0;\n    //   y = 0;\n    //   pickContext.transformFromMatrix(glyph.transMatrix, true);\n    // } else {\n    //   const { dx = glyphAttribute.dx, dy = glyphAttribute.dy } = glyph.attribute;\n    //   x += dx;\n    //   y += dy;\n    //   // 当前context有rotate/scale，重置matrix\n    //   pickContext.setTransformForCurrent();\n    // }\n    // // 详细形状判断\n    // let picked = false;\n    // this.canvasRenderer.drawShape(\n    //   glyph,\n    //   pickContext,\n    //   x,\n    //   y,\n    //   {\n    //     drawContribution: params.pickerService?.drawContribution\n    //   } as any,\n    //   null,\n    //   context => {\n    //     // 选中后面就不需要再走逻辑了\n    //     if (picked) {\n    //       return true;\n    //     }\n    //     picked = context.isPointInPath(point.x, point.y);\n    //     return picked;\n    //   }\n    // );\n\n    // pickContext.highPerformanceRestore();\n    // return picked; // 无圆角形状判断通过\n  }\n}\n"]}

package/cjs/picker/global-picker-service.d.ts

@@ -11,5 +11,5 @@ export declare class DefaultGlobalPickerService implements IPickerService {
     pick(graphics: IGraphic[], point: IPointLike, params?: IPickParams): PickResult;
     containsPoint(graphic: IGraphic, point: IPointLike, params?: IPickParams): boolean;
     pickGroup(group: IGroup, point: IPointLike, parentMatrix: IMatrix, params?: IPickParams): PickResult;
-    pickItem(graphic: IGraphic, point: IPointLike, params?: IPickParams): IGraphic | null;
+    pickItem(graphic: IGraphic, point: IPointLike, parentMatrix: IMatrix | null, params?: IPickParams): IGraphic | null;
 }

package/cjs/picker/global-picker-service.js

@@ -34,12 +34,19 @@ let DefaultGlobalPickerService = class {
         };
         const parentMatrix = new vutils_1.Matrix(1, 0, 0, 1, 0, 0);
         let group;
-        for (let i = 0; i < graphics.length && (graphics[i].isContainer ? result = this.pickGroup(graphics[i], point, parentMatrix, params) : result.graphic = this.pickItem(graphics[i], point, params), 
+        for (let i = 0; i < graphics.length && (graphics[i].isContainer ? result = this.pickGroup(graphics[i], point, parentMatrix, params) : result.graphic = this.pickItem(graphics[i], point, parentMatrix, params), 
         !result.graphic); i++) group || (group = result.group);
-        return result.graphic || (result.group = group), result;
+        if (result.graphic || (result.group = group), result.graphic) {
+            let g = result.graphic;
+            for (;g.parent; ) g = g.parent;
+            g.shadowHost && (result.params = {
+                shadowTarget: result.graphic
+            }, result.graphic = g.shadowHost);
+        }
+        return result;
     }
     containsPoint(graphic, point, params) {
-        return !!this.pickItem(graphic, point, params);
+        return !!this.pickItem(graphic, point, null, params);
     }
     pickGroup(group, point, parentMatrix, params) {
         let result = {
@@ -56,12 +63,12 @@ let DefaultGlobalPickerService = class {
         !1 !== group.attribute.childrenPickable && group.forEachChildren((graphic => {
             if (graphic.isContainer) result = this.pickGroup(graphic, point, parentMatrix, params); else {
                 const newPoint = new vutils_1.Point(point.x, point.y);
-                parentMatrix.transformPoint(newPoint, newPoint), result.graphic = this.pickItem(graphic, newPoint, params);
+                parentMatrix.transformPoint(newPoint, newPoint), result.graphic = this.pickItem(graphic, newPoint, parentMatrix, params);
             }
             return !!result.graphic || !!result.group;
         })), result.graphic || result.group || !groupPicked || (result.group = group), result;
     }
-    pickItem(graphic, point, params) {
+    pickItem(graphic, point, parentMatrix, params) {
         return !1 === graphic.attribute.pickable ? null : graphic.AABBBounds.containsPoint(point) ? graphic : null;
     }
 };

package/cjs/picker/global-picker-service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/global-picker-service.ts"],"names":[],"mappings":"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","file":"global-picker-service.js","sourcesContent":["import type { IMatrix, IPoint, IPointLike } from '@visactor/vutils';\nimport { Matrix, Point } from '@visactor/vutils';\nimport { inject, injectable } from 'inversify';\nimport type {\n  IGraphic,\n  IGroup,\n  EnvType,\n  IGlobal,\n  IPickerService,\n  IGraphicPicker,\n  IPickParams,\n  PickResult\n} from '../interface';\nimport { VGlobal } from '../constants';\n\nexport const BoundsPicker = Symbol.for('BoundsPicker');\n\nexport const GlobalPickerService = Symbol.for('GlobalPickerService');\n\n// 默认的pick-service，提供基本的最优选中策略，尽量不需要用户自己实现contribution\n// 用户可以写plugin\n@injectable()\nexport class DefaultGlobalPickerService implements IPickerService {\n  type: 'global';\n\n  declare pickerMap: Map<number, IGraphicPicker>;\n\n  constructor(\n    // @inject(ContributionProvider)\n    // @named(PickerContribution)\n    // protected readonly contributions: ContributionProvider<IPickerContribution>,\n    @inject(VGlobal) public readonly global: IGlobal\n  ) {\n    this.global.hooks.onSetEnv.tap('global-picker-service', (lastEnv, env, global) => {\n      this.configure(global, env);\n    });\n    this.configure(this.global, this.global.env);\n  }\n\n  configure(global: IGlobal, env: EnvType) {\n    // if (!this.global.env) return;\n    // this.contributions.getContributions().forEach(handlerContribution => {\n    //   handlerContribution.configure(this, this.global);\n    // });\n  }\n\n  // todo: params支持\n  // todo: 性能优化\n  pick(graphics: IGraphic[], point: IPointLike, params?: IPickParams): PickResult {\n    let result: PickResult = {\n      graphic: null,\n      group: null\n    };\n    const parentMatrix = new Matrix(1, 0, 0, 1, 0, 0);\n    let group: IGroup;\n    for (let i = 0; i < graphics.length; i++) {\n      if (graphics[i].isContainer) {\n        result = this.pickGroup(graphics[i] as IGroup, point, parentMatrix, params);\n      } else {\n        result.graphic = this.pickItem(graphics[i], point, params);\n      }\n      if (result.graphic) {\n        break;\n      }\n      if (!group) {\n        group = result.group;\n      }\n    }\n    if (!result.graphic) {\n      result.group = group;\n    }\n    return result;\n  }\n\n  containsPoint(graphic: IGraphic, point: IPointLike, params?: IPickParams): boolean {\n    return !!this.pickItem(graphic, point, params);\n  }\n\n  pickGroup(group: IGroup, point: IPointLike, parentMatrix: IMatrix, params?: IPickParams): PickResult {\n    let result: PickResult = {\n      group: null,\n      graphic: null\n    };\n    if (group.attribute.visibleAll === false) {\n      return result;\n    }\n    // 转换坐标空间\n    const transMatrix = group.transMatrix;\n\n    const newPoint: IPoint = new Point(point.x, point.y);\n    parentMatrix.transformPoint(newPoint, newPoint);\n    const insideGroup = group.AABBBounds.containsPoint(newPoint);\n    // 如果group没有被选中，直接跳过\n    if (!insideGroup) {\n      return result;\n    }\n    // todo: 支持带有path的group的选中\n    const groupPicked = group.attribute.pickable !== false && insideGroup;\n\n    parentMatrix.multiply(transMatrix.a, transMatrix.b, transMatrix.c, transMatrix.d, transMatrix.e, transMatrix.f);\n\n    if (group.attribute.childrenPickable !== false) {\n      group.forEachChildren((graphic: IGraphic) => {\n        if (graphic.isContainer) {\n          result = this.pickGroup(graphic as IGroup, point, parentMatrix, params);\n        } else {\n          const newPoint: IPoint = new Point(point.x, point.y);\n          parentMatrix.transformPoint(newPoint, newPoint);\n          result.graphic = this.pickItem(graphic, newPoint, params);\n        }\n        return !!result.graphic || !!result.group;\n      });\n    }\n\n    if (!result.graphic && !result.group && groupPicked) {\n      result.group = group;\n    }\n\n    return result;\n  }\n\n  // todo: switch统一改为数字map\n  pickItem(graphic: IGraphic, point: IPointLike, params?: IPickParams): IGraphic | null {\n    if (graphic.attribute.pickable === false) {\n      return null;\n    }\n    if (graphic.AABBBounds.containsPoint(point)) {\n      return graphic;\n    }\n    return null;\n  }\n}\n"]}
+{"version":3,"sources":["../src/picker/global-picker-service.ts"],"names":[],"mappings":"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","file":"global-picker-service.js","sourcesContent":["import type { IMatrix, IPoint, IPointLike } from '@visactor/vutils';\nimport { Matrix, Point } from '@visactor/vutils';\nimport { inject, injectable } from 'inversify';\nimport type {\n  IGraphic,\n  IGroup,\n  EnvType,\n  IGlobal,\n  IPickerService,\n  IGraphicPicker,\n  IPickParams,\n  PickResult\n} from '../interface';\nimport { VGlobal } from '../constants';\n\nexport const BoundsPicker = Symbol.for('BoundsPicker');\n\nexport const GlobalPickerService = Symbol.for('GlobalPickerService');\n\n// 默认的pick-service，提供基本的最优选中策略，尽量不需要用户自己实现contribution\n// 用户可以写plugin\n@injectable()\nexport class DefaultGlobalPickerService implements IPickerService {\n  type: 'global';\n\n  declare pickerMap: Map<number, IGraphicPicker>;\n\n  constructor(\n    // @inject(ContributionProvider)\n    // @named(PickerContribution)\n    // protected readonly contributions: ContributionProvider<IPickerContribution>,\n    @inject(VGlobal) public readonly global: IGlobal\n  ) {\n    this.global.hooks.onSetEnv.tap('global-picker-service', (lastEnv, env, global) => {\n      this.configure(global, env);\n    });\n    this.configure(this.global, this.global.env);\n  }\n\n  configure(global: IGlobal, env: EnvType) {\n    // if (!this.global.env) return;\n    // this.contributions.getContributions().forEach(handlerContribution => {\n    //   handlerContribution.configure(this, this.global);\n    // });\n  }\n\n  // todo: params支持\n  // todo: 性能优化\n  pick(graphics: IGraphic[], point: IPointLike, params?: IPickParams): PickResult {\n    let result: PickResult = {\n      graphic: null,\n      group: null\n    };\n    const parentMatrix = new Matrix(1, 0, 0, 1, 0, 0);\n    let group: IGroup;\n    for (let i = 0; i < graphics.length; i++) {\n      if (graphics[i].isContainer) {\n        result = this.pickGroup(graphics[i] as IGroup, point, parentMatrix, params);\n      } else {\n        result.graphic = this.pickItem(graphics[i], point, parentMatrix, params);\n      }\n      if (result.graphic) {\n        break;\n      }\n      if (!group) {\n        group = result.group;\n      }\n    }\n    if (!result.graphic) {\n      result.group = group;\n    }\n    // 判断是否有shadow-dom\n    if (result.graphic) {\n      let g = result.graphic;\n      while (g.parent) {\n        g = g.parent;\n      }\n      if (g.shadowHost) {\n        result.params = {\n          shadowTarget: result.graphic\n        };\n        result.graphic = g.shadowHost;\n      }\n    }\n    return result;\n  }\n\n  containsPoint(graphic: IGraphic, point: IPointLike, params?: IPickParams): boolean {\n    return !!this.pickItem(graphic, point, null, params);\n  }\n\n  pickGroup(group: IGroup, point: IPointLike, parentMatrix: IMatrix, params?: IPickParams): PickResult {\n    let result: PickResult = {\n      group: null,\n      graphic: null\n    };\n    if (group.attribute.visibleAll === false) {\n      return result;\n    }\n    // 转换坐标空间\n    const transMatrix = group.transMatrix;\n\n    const newPoint: IPoint = new Point(point.x, point.y);\n    parentMatrix.transformPoint(newPoint, newPoint);\n    const insideGroup = group.AABBBounds.containsPoint(newPoint);\n    // 如果group没有被选中，直接跳过\n    if (!insideGroup) {\n      return result;\n    }\n    // todo: 支持带有path的group的选中\n    const groupPicked = group.attribute.pickable !== false && insideGroup;\n\n    parentMatrix.multiply(transMatrix.a, transMatrix.b, transMatrix.c, transMatrix.d, transMatrix.e, transMatrix.f);\n\n    if (group.attribute.childrenPickable !== false) {\n      group.forEachChildren((graphic: IGraphic) => {\n        if (graphic.isContainer) {\n          result = this.pickGroup(graphic as IGroup, point, parentMatrix, params);\n        } else {\n          const newPoint: IPoint = new Point(point.x, point.y);\n          parentMatrix.transformPoint(newPoint, newPoint);\n          result.graphic = this.pickItem(graphic, newPoint, parentMatrix, params);\n        }\n        return !!result.graphic || !!result.group;\n      });\n    }\n\n    if (!result.graphic && !result.group && groupPicked) {\n      result.group = group;\n    }\n\n    return result;\n  }\n\n  // todo: switch统一改为数字map\n  pickItem(graphic: IGraphic, point: IPointLike, parentMatrix: IMatrix | null, params?: IPickParams): IGraphic | null {\n    if (graphic.attribute.pickable === false) {\n      return null;\n    }\n    if (graphic.AABBBounds.containsPoint(point)) {\n      return graphic;\n    }\n    return null;\n  }\n}\n"]}