@visactor/vrender-kits 0.17.1-alpha.4 → 0.17.1

package/cjs/index.d.ts

@@ -2,30 +2,3 @@ export declare const roughModule: import("@visactor/vrender-core").ContainerModu
 export * from './jsx';
 export * from './event/extension';
 export * from './env';
-export * from './picker/contributions/canvas-picker/arc-module';
-export * from './picker/contributions/math-picker/arc-module';
-export * from './picker/contributions/canvas-picker/rect-module';
-export * from './picker/contributions/math-picker/rect-module';
-export * from './picker/contributions/canvas-picker/line-module';
-export * from './picker/contributions/math-picker/line-module';
-export * from './picker/contributions/canvas-picker/area-module';
-export * from './picker/contributions/math-picker/area-module';
-export * from './picker/contributions/canvas-picker/symbol-module';
-export * from './picker/contributions/math-picker/symbol-module';
-export * from './picker/contributions/canvas-picker/circle-module';
-export * from './picker/contributions/math-picker/circle-module';
-export * from './picker/contributions/canvas-picker/text-module';
-export * from './picker/contributions/math-picker/text-module';
-export * from './picker/contributions/canvas-picker/path-module';
-export * from './picker/contributions/math-picker/path-module';
-export * from './picker/contributions/canvas-picker/polygon-module';
-export * from './picker/contributions/math-picker/polygon-module';
-export * from './picker/contributions/canvas-picker/glyph-module';
-export * from './picker/contributions/math-picker/glyph-module';
-export * from './picker/contributions/canvas-picker/richtext-module';
-export * from './picker/contributions/math-picker/richtext-module';
-export * from './picker/contributions/canvas-picker/image-module';
-export * from './picker/contributions/math-picker/image-module';
-export * from './picker/contributions/canvas-picker/rect3d-module';
-export * from './picker/contributions/canvas-picker/arc3d-module';
-export * from './picker/contributions/canvas-picker/pyramid3d-module';

package/cjs/index.js

@@ -26,32 +26,5 @@ Object.defineProperty(exports, "__esModule", {
 const module_1 = __importDefault(require("./render/contributions/rough/module"));
 
 exports.roughModule = module_1.default, __exportStar(require("./jsx"), exports), 
-__exportStar(require("./event/extension"), exports), __exportStar(require("./env"), exports), 
-__exportStar(require("./picker/contributions/canvas-picker/arc-module"), exports), 
-__exportStar(require("./picker/contributions/math-picker/arc-module"), exports), 
-__exportStar(require("./picker/contributions/canvas-picker/rect-module"), exports), 
-__exportStar(require("./picker/contributions/math-picker/rect-module"), exports), 
-__exportStar(require("./picker/contributions/canvas-picker/line-module"), exports), 
-__exportStar(require("./picker/contributions/math-picker/line-module"), exports), 
-__exportStar(require("./picker/contributions/canvas-picker/area-module"), exports), 
-__exportStar(require("./picker/contributions/math-picker/area-module"), exports), 
-__exportStar(require("./picker/contributions/canvas-picker/symbol-module"), exports), 
-__exportStar(require("./picker/contributions/math-picker/symbol-module"), exports), 
-__exportStar(require("./picker/contributions/canvas-picker/circle-module"), exports), 
-__exportStar(require("./picker/contributions/math-picker/circle-module"), exports), 
-__exportStar(require("./picker/contributions/canvas-picker/text-module"), exports), 
-__exportStar(require("./picker/contributions/math-picker/text-module"), exports), 
-__exportStar(require("./picker/contributions/canvas-picker/path-module"), exports), 
-__exportStar(require("./picker/contributions/math-picker/path-module"), exports), 
-__exportStar(require("./picker/contributions/canvas-picker/polygon-module"), exports), 
-__exportStar(require("./picker/contributions/math-picker/polygon-module"), exports), 
-__exportStar(require("./picker/contributions/canvas-picker/glyph-module"), exports), 
-__exportStar(require("./picker/contributions/math-picker/glyph-module"), exports), 
-__exportStar(require("./picker/contributions/canvas-picker/richtext-module"), exports), 
-__exportStar(require("./picker/contributions/math-picker/richtext-module"), exports), 
-__exportStar(require("./picker/contributions/canvas-picker/image-module"), exports), 
-__exportStar(require("./picker/contributions/math-picker/image-module"), exports), 
-__exportStar(require("./picker/contributions/canvas-picker/rect3d-module"), exports), 
-__exportStar(require("./picker/contributions/canvas-picker/arc3d-module"), exports), 
-__exportStar(require("./picker/contributions/canvas-picker/pyramid3d-module"), exports);
+__exportStar(require("./event/extension"), exports), __exportStar(require("./env"), exports);
 //# sourceMappingURL=index.js.map

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,iFAA+D;AAGlD,QAAA,WAAW,GAAG,gBAAY,CAAC;AAExC,wCAAsB;AACtB,oDAAkC;AAElC,wCAAsB;AACtB,kFAAgE;AAChE,gFAA8D;AAE9D,mFAAiE;AACjE,iFAA+D;AAE/D,mFAAiE;AACjE,iFAA+D;AAE/D,mFAAiE;AACjE,iFAA+D;AAE/D,qFAAmE;AACnE,mFAAiE;AAEjE,qFAAmE;AACnE,mFAAiE;AAEjE,mFAAiE;AACjE,iFAA+D;AAE/D,mFAAiE;AACjE,iFAA+D;AAE/D,sFAAoE;AACpE,oFAAkE;AAElE,oFAAkE;AAClE,kFAAgE;AAEhE,uFAAqE;AACrE,qFAAmE;AAEnE,oFAAkE;AAClE,kFAAgE;AAEhE,qFAAmE;AAEnE,oFAAkE;AAElE,wFAAsE","file":"index.js","sourcesContent":["import _roughModule from './render/contributions/rough/module';\n// import _canvasModuleLoader from './canvas/contributions/canvas-module';\n\nexport const roughModule = _roughModule;\n\nexport * from './jsx';\nexport * from './event/extension';\n// export * from './env/browser';\nexport * from './env';\nexport * from './picker/contributions/canvas-picker/arc-module';\nexport * from './picker/contributions/math-picker/arc-module';\n\nexport * from './picker/contributions/canvas-picker/rect-module';\nexport * from './picker/contributions/math-picker/rect-module';\n\nexport * from './picker/contributions/canvas-picker/line-module';\nexport * from './picker/contributions/math-picker/line-module';\n\nexport * from './picker/contributions/canvas-picker/area-module';\nexport * from './picker/contributions/math-picker/area-module';\n\nexport * from './picker/contributions/canvas-picker/symbol-module';\nexport * from './picker/contributions/math-picker/symbol-module';\n\nexport * from './picker/contributions/canvas-picker/circle-module';\nexport * from './picker/contributions/math-picker/circle-module';\n\nexport * from './picker/contributions/canvas-picker/text-module';\nexport * from './picker/contributions/math-picker/text-module';\n\nexport * from './picker/contributions/canvas-picker/path-module';\nexport * from './picker/contributions/math-picker/path-module';\n\nexport * from './picker/contributions/canvas-picker/polygon-module';\nexport * from './picker/contributions/math-picker/polygon-module';\n\nexport * from './picker/contributions/canvas-picker/glyph-module';\nexport * from './picker/contributions/math-picker/glyph-module';\n\nexport * from './picker/contributions/canvas-picker/richtext-module';\nexport * from './picker/contributions/math-picker/richtext-module';\n\nexport * from './picker/contributions/canvas-picker/image-module';\nexport * from './picker/contributions/math-picker/image-module';\n\nexport * from './picker/contributions/canvas-picker/rect3d-module';\n\nexport * from './picker/contributions/canvas-picker/arc3d-module';\n\nexport * from './picker/contributions/canvas-picker/pyramid3d-module';\n// export const canvasModuleLoader = _canvasModuleLoader;\n// export { nodeLoader } from './node-bind'; // nodeLoader只在node入口暴露\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,iFAA+D;AAGlD,QAAA,WAAW,GAAG,gBAAY,CAAC;AAExC,wCAAsB;AACtB,oDAAkC;AAElC,wCAAsB","file":"index.js","sourcesContent":["import _roughModule from './render/contributions/rough/module';\n// import _canvasModuleLoader from './canvas/contributions/canvas-module';\n\nexport const roughModule = _roughModule;\n\nexport * from './jsx';\nexport * from './event/extension';\n// export * from './env/browser';\nexport * from './env';\n// export const canvasModuleLoader = _canvasModuleLoader;\n// export { nodeLoader } from './node-bind'; // nodeLoader只在node入口暴露\n"]}

package/cjs/jsx/graphicType.d.ts

@@ -1,4 +1,4 @@
-import { type IArc3dGraphicAttribute, type IArcGraphicAttribute, type IAreaGraphicAttribute, type ICircleGraphicAttribute, type IGlyphGraphicAttribute, type IGroupGraphicAttribute, type IImageGraphicAttribute, type ILineGraphicAttribute, type IPathGraphicAttribute, type IPolygonGraphicAttribute, type IPyramid3dGraphicAttribute, type IRect3dGraphicAttribute, type IRectGraphicAttribute, type IRichTextCharacter, type IRichTextGraphicAttribute, type IRichTextImageCharacter, type ISymbolGraphicAttribute, type ITextGraphicAttribute } from '@visactor/vrender-core';
+import type { IArc3dGraphicAttribute, IArcGraphicAttribute, IAreaGraphicAttribute, ICircleGraphicAttribute, IGlyphGraphicAttribute, IGroupGraphicAttribute, IImageGraphicAttribute, ILineGraphicAttribute, IPathGraphicAttribute, IPolygonGraphicAttribute, IPyramid3dGraphicAttribute, IRect3dGraphicAttribute, IRectGraphicAttribute, IRichTextCharacter, IRichTextGraphicAttribute, IRichTextImageCharacter, ISymbolGraphicAttribute, ITextGraphicAttribute } from '@visactor/vrender-core';
 export declare const REACT_TO_CANOPUS_EVENTS: {
     onPointerDown: string;
     onPointerUp: string;
@@ -53,22 +53,22 @@ export type IEventParamsType = {
 export type IDefaultGraphicParamsType<T> = {
     attribute?: T;
 } & IEventParamsType;
-export declare function VArc(params: IDefaultGraphicParamsType<IArcGraphicAttribute>): any;
-export declare function VArc3d(params: IDefaultGraphicParamsType<IArc3dGraphicAttribute>): any;
-export declare function VArea(params: IDefaultGraphicParamsType<IAreaGraphicAttribute>): any;
-export declare function VCircle(params: IDefaultGraphicParamsType<ICircleGraphicAttribute>): any;
-export declare function VGroup(params: IDefaultGraphicParamsType<IGroupGraphicAttribute>): any;
-export declare function VGlyph(params: IDefaultGraphicParamsType<IGlyphGraphicAttribute>): any;
-export declare function VImage(params: IDefaultGraphicParamsType<IImageGraphicAttribute>): any;
-export declare function VLine(params: IDefaultGraphicParamsType<ILineGraphicAttribute>): any;
-export declare function VPath(params: IDefaultGraphicParamsType<IPathGraphicAttribute>): any;
-export declare function VPolygon(params: IDefaultGraphicParamsType<IPolygonGraphicAttribute>): any;
-export declare function VPyramid3d(params: IDefaultGraphicParamsType<IPyramid3dGraphicAttribute>): any;
-export declare function VRect(params: IDefaultGraphicParamsType<IRectGraphicAttribute>): any;
-export declare function VRect3d(params: IDefaultGraphicParamsType<IRect3dGraphicAttribute>): any;
-export declare function VSymbol(params: IDefaultGraphicParamsType<ISymbolGraphicAttribute>): any;
-export declare function VText(params: IDefaultGraphicParamsType<ITextGraphicAttribute>): any;
-export declare function VRichText(params: IDefaultGraphicParamsType<IRichTextGraphicAttribute>): any;
+export declare function VArc(params: IDefaultGraphicParamsType<IArcGraphicAttribute>): import("@visactor/vrender-core").IArc;
+export declare function VArc3d(params: IDefaultGraphicParamsType<IArc3dGraphicAttribute>): import("@visactor/vrender-core").IArc;
+export declare function VArea(params: IDefaultGraphicParamsType<IAreaGraphicAttribute>): import("@visactor/vrender-core").IArea;
+export declare function VCircle(params: IDefaultGraphicParamsType<ICircleGraphicAttribute>): import("@visactor/vrender-core").ICircle;
+export declare function VGroup(params: IDefaultGraphicParamsType<IGroupGraphicAttribute>): import("@visactor/vrender-core").IGroup;
+export declare function VGlyph(params: IDefaultGraphicParamsType<IGlyphGraphicAttribute>): import("@visactor/vrender-core").IGlyph<Partial<import("@visactor/vrender-core").IGraphicAttribute>>;
+export declare function VImage(params: IDefaultGraphicParamsType<IImageGraphicAttribute>): import("@visactor/vrender-core").IImage;
+export declare function VLine(params: IDefaultGraphicParamsType<ILineGraphicAttribute>): import("@visactor/vrender-core").ILine;
+export declare function VPath(params: IDefaultGraphicParamsType<IPathGraphicAttribute>): import("@visactor/vrender-core").IPath;
+export declare function VPolygon(params: IDefaultGraphicParamsType<IPolygonGraphicAttribute>): import("@visactor/vrender-core").IPolygon;
+export declare function VPyramid3d(params: IDefaultGraphicParamsType<IPyramid3dGraphicAttribute>): import("@visactor/vrender-core").IPyramid3d;
+export declare function VRect(params: IDefaultGraphicParamsType<IRectGraphicAttribute>): import("@visactor/vrender-core").IRect;
+export declare function VRect3d(params: IDefaultGraphicParamsType<IRect3dGraphicAttribute>): import("@visactor/vrender-core").IRect3d;
+export declare function VSymbol(params: IDefaultGraphicParamsType<ISymbolGraphicAttribute>): import("@visactor/vrender-core").ISymbol;
+export declare function VText(params: IDefaultGraphicParamsType<ITextGraphicAttribute>): import("@visactor/vrender-core").IText;
+export declare function VRichText(params: IDefaultGraphicParamsType<IRichTextGraphicAttribute>): import("@visactor/vrender-core").IRichText;
 export declare namespace VRichText {
     var Text: (params: IDefaultGraphicParamsType<IRichTextCharacter>) => {
         attribute?: IRichTextCharacter;

package/cjs/jsx/graphicType.js

@@ -7,67 +7,67 @@ Object.defineProperty(exports, "__esModule", {
 const vrender_core_1 = require("@visactor/vrender-core");
 
 function VArc(params) {
-    return vrender_core_1.graphicCreator.arc(params ? params.attribute : {});
+    return (0, vrender_core_1.createArc)(params ? params.attribute : {});
 }
 
 function VArc3d(params) {
-    return vrender_core_1.graphicCreator.arc3d(params ? params.attribute : {});
+    return (0, vrender_core_1.createArc3d)(params ? params.attribute : {});
 }
 
 function VArea(params) {
-    return vrender_core_1.graphicCreator.area(params ? params.attribute : {});
+    return (0, vrender_core_1.createArea)(params ? params.attribute : {});
 }
 
 function VCircle(params) {
-    return vrender_core_1.graphicCreator.circle(params ? params.attribute : {});
+    return (0, vrender_core_1.createCircle)(params ? params.attribute : {});
 }
 
 function VGroup(params) {
-    return vrender_core_1.graphicCreator.group(params ? params.attribute : {});
+    return (0, vrender_core_1.createGroup)(params ? params.attribute : {});
 }
 
 function VGlyph(params) {
-    return vrender_core_1.graphicCreator.glyph(params ? params.attribute : {});
+    return (0, vrender_core_1.createGlyph)(params ? params.attribute : {});
 }
 
 function VImage(params) {
-    return vrender_core_1.graphicCreator.image(params ? params.attribute : {});
+    return (0, vrender_core_1.createImage)(params ? params.attribute : {});
 }
 
 function VLine(params) {
-    return vrender_core_1.graphicCreator.line(params ? params.attribute : {});
+    return (0, vrender_core_1.createLine)(params ? params.attribute : {});
 }
 
 function VPath(params) {
-    return vrender_core_1.graphicCreator.path(params ? params.attribute : {});
+    return (0, vrender_core_1.createPath)(params ? params.attribute : {});
 }
 
 function VPolygon(params) {
-    return vrender_core_1.graphicCreator.polygon(params ? params.attribute : {});
+    return (0, vrender_core_1.createPolygon)(params ? params.attribute : {});
 }
 
 function VPyramid3d(params) {
-    return vrender_core_1.graphicCreator.pyramid3d(params ? params.attribute : {});
+    return (0, vrender_core_1.createPyramid3d)(params ? params.attribute : {});
 }
 
 function VRect(params) {
-    return vrender_core_1.graphicCreator.rect(params ? params.attribute : {});
+    return (0, vrender_core_1.createRect)(params ? params.attribute : {});
 }
 
 function VRect3d(params) {
-    return vrender_core_1.graphicCreator.rect3d(params ? params.attribute : {});
+    return (0, vrender_core_1.createRect3d)(params ? params.attribute : {});
 }
 
 function VSymbol(params) {
-    return vrender_core_1.graphicCreator.symbol(params ? params.attribute : {});
+    return (0, vrender_core_1.createSymbol)(params ? params.attribute : {});
 }
 
 function VText(params) {
-    return vrender_core_1.graphicCreator.text(params ? params.attribute : {});
+    return (0, vrender_core_1.createText)(params ? params.attribute : {});
 }
 
 function VRichText(params) {
-    return vrender_core_1.graphicCreator.richtext(params ? params.attribute : {});
+    return (0, vrender_core_1.createRichText)(params ? params.attribute : {});
 }
 
 exports.REACT_TO_CANOPUS_EVENTS = {

package/cjs/jsx/graphicType.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/jsx/graphicType.ts"],"names":[],"mappings":"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","file":"graphicType.js","sourcesContent":["import {\n  graphicCreator,\n  type IArc3dGraphicAttribute,\n  type IArcGraphicAttribute,\n  type IAreaGraphicAttribute,\n  type ICircleGraphicAttribute,\n  type IGlyphGraphicAttribute,\n  type IGroupGraphicAttribute,\n  type IImageGraphicAttribute,\n  type ILineGraphicAttribute,\n  type IPathGraphicAttribute,\n  type IPolygonGraphicAttribute,\n  type IPyramid3dGraphicAttribute,\n  type IRect3dGraphicAttribute,\n  type IRectGraphicAttribute,\n  type IRichTextCharacter,\n  type IRichTextGraphicAttribute,\n  type IRichTextImageCharacter,\n  type ISymbolGraphicAttribute,\n  type ITextGraphicAttribute\n} from '@visactor/vrender-core';\n\nexport const REACT_TO_CANOPUS_EVENTS = {\n  onPointerDown: 'pointerdown',\n  onPointerUp: 'pointerup',\n  onPointerUpOutside: 'pointerupoutside',\n  onPointerTap: 'pointertap',\n  onPointerOver: 'pointerover',\n  onPointerMove: 'pointermove',\n  onPointerEnter: 'pointerenter',\n  onPointerLeave: 'pointerleave',\n  onPointerOut: 'pointerout',\n  onMouseDown: 'mousedown',\n  onMouseUp: 'mouseup',\n  onMouseUpOutside: 'mouseupoutside',\n  onMouseMove: 'mousemove',\n  onMouseOver: 'mouseover',\n  onMouseOut: 'mouseout',\n  onMouseEnter: 'mouseenter',\n  onMouseLeave: 'mouseleave',\n  onPinch: 'pinch',\n  onPinchStart: 'pinchstart',\n  onPinchEnd: 'pinchend',\n  onPan: 'pan',\n  onPanStart: 'panstart',\n  onPanEnd: 'panend',\n  onDrag: 'drag',\n  onDragStart: 'dragstart',\n  onDragEnter: 'dragenter',\n  onDragLeave: 'dragleave',\n  onDragOver: 'dragover',\n  onDragEnd: 'dragend',\n  onRightDown: 'rightdown',\n  onRightUp: 'rightup',\n  onRightUpOutside: 'rightupoutside',\n  onTouchStart: 'touchstart',\n  onTouchEnd: 'touchend',\n  onTouchEndOutside: 'touchendoutside',\n  onTouchMove: 'touchmove',\n  onTouchCancel: 'touchcancel',\n  onPress: 'press',\n  onPressUp: 'pressup',\n  onPressEnd: 'pressend',\n  onSwipe: 'swipe',\n  onDrop: 'drop',\n  onWeel: 'wheel',\n  onClick: 'click',\n  onDblClick: 'dblclick'\n};\n\nexport const REACT_TO_CANOPUS_EVENTS_LIST = Object.keys(REACT_TO_CANOPUS_EVENTS);\n\nexport type IEventParamsType = {\n  [t in keyof typeof REACT_TO_CANOPUS_EVENTS]?: (d: any) => void;\n};\n\nexport type IDefaultGraphicParamsType<T> = {\n  attribute?: T;\n} & IEventParamsType;\n\nexport function VArc(params: IDefaultGraphicParamsType<IArcGraphicAttribute>) {\n  return (graphicCreator as any).arc(params ? params.attribute : {});\n}\nexport function VArc3d(params: IDefaultGraphicParamsType<IArc3dGraphicAttribute>) {\n  return (graphicCreator as any).arc3d(params ? params.attribute : {});\n}\nexport function VArea(params: IDefaultGraphicParamsType<IAreaGraphicAttribute>) {\n  return (graphicCreator as any).area(params ? params.attribute : {});\n}\nexport function VCircle(params: IDefaultGraphicParamsType<ICircleGraphicAttribute>) {\n  return (graphicCreator as any).circle(params ? params.attribute : {});\n}\nexport function VGroup(params: IDefaultGraphicParamsType<IGroupGraphicAttribute>) {\n  return (graphicCreator as any).group(params ? params.attribute : {});\n}\nexport function VGlyph(params: IDefaultGraphicParamsType<IGlyphGraphicAttribute>) {\n  return (graphicCreator as any).glyph(params ? params.attribute : {});\n}\nexport function VImage(params: IDefaultGraphicParamsType<IImageGraphicAttribute>) {\n  return (graphicCreator as any).image(params ? params.attribute : {});\n}\nexport function VLine(params: IDefaultGraphicParamsType<ILineGraphicAttribute>) {\n  return (graphicCreator as any).line(params ? params.attribute : {});\n}\nexport function VPath(params: IDefaultGraphicParamsType<IPathGraphicAttribute>) {\n  return (graphicCreator as any).path(params ? params.attribute : {});\n}\nexport function VPolygon(params: IDefaultGraphicParamsType<IPolygonGraphicAttribute>) {\n  return (graphicCreator as any).polygon(params ? params.attribute : {});\n}\nexport function VPyramid3d(params: IDefaultGraphicParamsType<IPyramid3dGraphicAttribute>) {\n  return (graphicCreator as any).pyramid3d(params ? params.attribute : {});\n}\nexport function VRect(params: IDefaultGraphicParamsType<IRectGraphicAttribute>) {\n  return (graphicCreator as any).rect(params ? params.attribute : {});\n}\nexport function VRect3d(params: IDefaultGraphicParamsType<IRect3dGraphicAttribute>) {\n  return (graphicCreator as any).rect3d(params ? params.attribute : {});\n}\nexport function VSymbol(params: IDefaultGraphicParamsType<ISymbolGraphicAttribute>) {\n  return (graphicCreator as any).symbol(params ? params.attribute : {});\n}\nexport function VText(params: IDefaultGraphicParamsType<ITextGraphicAttribute>) {\n  return (graphicCreator as any).text(params ? params.attribute : {});\n}\nexport function VRichText(params: IDefaultGraphicParamsType<IRichTextGraphicAttribute>) {\n  return (graphicCreator as any).richtext(params ? params.attribute : {});\n}\n\nVRichText.Text = function (params: IDefaultGraphicParamsType<IRichTextCharacter>) {\n  return {\n    type: 'rich/text',\n    ...params\n  };\n};\n\nVRichText.Image = function (params: IDefaultGraphicParamsType<IRichTextImageCharacter>) {\n  return {\n    type: 'rich/image',\n    ...params\n  };\n};\n"]}
+{"version":3,"sources":["../src/jsx/graphicType.ts"],"names":[],"mappings":"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","file":"graphicType.js","sourcesContent":["import {\n  createArc,\n  createArc3d,\n  createArea,\n  createCircle,\n  createGlyph,\n  createGroup,\n  createImage,\n  createLine,\n  createPath,\n  createPolygon,\n  createPyramid3d,\n  createRect,\n  createRect3d,\n  createRichText,\n  createSymbol,\n  createText\n} from '@visactor/vrender-core';\nimport type {\n  IArc3dGraphicAttribute,\n  IArcGraphicAttribute,\n  IAreaGraphicAttribute,\n  ICircleGraphicAttribute,\n  IGlyphGraphicAttribute,\n  IGroupGraphicAttribute,\n  IImageGraphicAttribute,\n  ILineGraphicAttribute,\n  IPathGraphicAttribute,\n  IPolygonGraphicAttribute,\n  IPyramid3dGraphicAttribute,\n  IRect3dGraphicAttribute,\n  IRectGraphicAttribute,\n  IRichTextCharacter,\n  IRichTextGraphicAttribute,\n  IRichTextImageCharacter,\n  ISymbolGraphicAttribute,\n  ITextGraphicAttribute\n} from '@visactor/vrender-core';\n\nexport const REACT_TO_CANOPUS_EVENTS = {\n  onPointerDown: 'pointerdown',\n  onPointerUp: 'pointerup',\n  onPointerUpOutside: 'pointerupoutside',\n  onPointerTap: 'pointertap',\n  onPointerOver: 'pointerover',\n  onPointerMove: 'pointermove',\n  onPointerEnter: 'pointerenter',\n  onPointerLeave: 'pointerleave',\n  onPointerOut: 'pointerout',\n  onMouseDown: 'mousedown',\n  onMouseUp: 'mouseup',\n  onMouseUpOutside: 'mouseupoutside',\n  onMouseMove: 'mousemove',\n  onMouseOver: 'mouseover',\n  onMouseOut: 'mouseout',\n  onMouseEnter: 'mouseenter',\n  onMouseLeave: 'mouseleave',\n  onPinch: 'pinch',\n  onPinchStart: 'pinchstart',\n  onPinchEnd: 'pinchend',\n  onPan: 'pan',\n  onPanStart: 'panstart',\n  onPanEnd: 'panend',\n  onDrag: 'drag',\n  onDragStart: 'dragstart',\n  onDragEnter: 'dragenter',\n  onDragLeave: 'dragleave',\n  onDragOver: 'dragover',\n  onDragEnd: 'dragend',\n  onRightDown: 'rightdown',\n  onRightUp: 'rightup',\n  onRightUpOutside: 'rightupoutside',\n  onTouchStart: 'touchstart',\n  onTouchEnd: 'touchend',\n  onTouchEndOutside: 'touchendoutside',\n  onTouchMove: 'touchmove',\n  onTouchCancel: 'touchcancel',\n  onPress: 'press',\n  onPressUp: 'pressup',\n  onPressEnd: 'pressend',\n  onSwipe: 'swipe',\n  onDrop: 'drop',\n  onWeel: 'wheel',\n  onClick: 'click',\n  onDblClick: 'dblclick'\n};\n\nexport const REACT_TO_CANOPUS_EVENTS_LIST = Object.keys(REACT_TO_CANOPUS_EVENTS);\n\nexport type IEventParamsType = {\n  [t in keyof typeof REACT_TO_CANOPUS_EVENTS]?: (d: any) => void;\n};\n\nexport type IDefaultGraphicParamsType<T> = {\n  attribute?: T;\n} & IEventParamsType;\n\nexport function VArc(params: IDefaultGraphicParamsType<IArcGraphicAttribute>) {\n  return createArc(params ? params.attribute : {});\n}\nexport function VArc3d(params: IDefaultGraphicParamsType<IArc3dGraphicAttribute>) {\n  return createArc3d(params ? params.attribute : {});\n}\nexport function VArea(params: IDefaultGraphicParamsType<IAreaGraphicAttribute>) {\n  return createArea(params ? params.attribute : {});\n}\nexport function VCircle(params: IDefaultGraphicParamsType<ICircleGraphicAttribute>) {\n  return createCircle(params ? params.attribute : {});\n}\nexport function VGroup(params: IDefaultGraphicParamsType<IGroupGraphicAttribute>) {\n  return createGroup(params ? params.attribute : {});\n}\nexport function VGlyph(params: IDefaultGraphicParamsType<IGlyphGraphicAttribute>) {\n  return createGlyph(params ? params.attribute : {});\n}\nexport function VImage(params: IDefaultGraphicParamsType<IImageGraphicAttribute>) {\n  return createImage(params ? params.attribute : {});\n}\nexport function VLine(params: IDefaultGraphicParamsType<ILineGraphicAttribute>) {\n  return createLine(params ? params.attribute : {});\n}\nexport function VPath(params: IDefaultGraphicParamsType<IPathGraphicAttribute>) {\n  return createPath(params ? params.attribute : {});\n}\nexport function VPolygon(params: IDefaultGraphicParamsType<IPolygonGraphicAttribute>) {\n  return createPolygon(params ? params.attribute : {});\n}\nexport function VPyramid3d(params: IDefaultGraphicParamsType<IPyramid3dGraphicAttribute>) {\n  return createPyramid3d(params ? params.attribute : {});\n}\nexport function VRect(params: IDefaultGraphicParamsType<IRectGraphicAttribute>) {\n  return createRect(params ? params.attribute : {});\n}\nexport function VRect3d(params: IDefaultGraphicParamsType<IRect3dGraphicAttribute>) {\n  return createRect3d(params ? params.attribute : {});\n}\nexport function VSymbol(params: IDefaultGraphicParamsType<ISymbolGraphicAttribute>) {\n  return createSymbol(params ? params.attribute : {});\n}\nexport function VText(params: IDefaultGraphicParamsType<ITextGraphicAttribute>) {\n  return createText(params ? params.attribute : {});\n}\nexport function VRichText(params: IDefaultGraphicParamsType<IRichTextGraphicAttribute>) {\n  return createRichText(params ? params.attribute : {});\n}\n\nVRichText.Text = function (params: IDefaultGraphicParamsType<IRichTextCharacter>) {\n  return {\n    type: 'rich/text',\n    ...params\n  };\n};\n\nVRichText.Image = function (params: IDefaultGraphicParamsType<IRichTextImageCharacter>) {\n  return {\n    type: 'rich/image',\n    ...params\n  };\n};\n"]}

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

@@ -38,8 +38,8 @@ let DefaultCanvasArcPicker = class {
         return this.canvasRenderer.drawShape(arc, pickContext, x, y, {}, null, ((context, arcAttribute, themeAttribute) => !!picked || (picked = context.isPointInPath(point.x, point.y), 
         picked)), ((context, arcAttribute, themeAttribute) => {
             if (picked) return !0;
-            const lineWidth = arcAttribute.lineWidth || themeAttribute.lineWidth;
-            return pickContext.lineWidth = (0, vrender_core_1.getScaledStroke)(pickContext, lineWidth, pickContext.dpr), 
+            const lineWidth = arcAttribute.lineWidth || themeAttribute.lineWidth, pickStrokeBuffer = arcAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;
+            return pickContext.lineWidth = (0, vrender_core_1.getScaledStroke)(pickContext, lineWidth + pickStrokeBuffer, pickContext.dpr), 
             picked = context.isPointInStroke(point.x, point.y), picked;
         })), pickContext.highPerformanceRestore(), picked;
     }

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/contributions/canvas-picker/arc-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yDAAmH;AAc5G,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAIjC,YAA+C,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAH7E,SAAI,GAAW,KAAK,CAAC;QACrB,eAAU,GAAW,8BAAe,CAAC;IAE2C,CAAC;IAEjF,QAAQ,CAAC,GAAS,EAAE,KAAa,EAAE,MAAoB;QACrD,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;YACxC,OAAO,KAAK,CAAC;SACd;QACD,IAAI,GAAG,CAAC,SAAS,CAAC,QAAQ,KAAK,WAAW,EAAE;YAC1C,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,YAAY,GAAG,IAAA,uBAAQ,EAAC,GAAG,CAAC,CAAC,GAAG,CAAC;QAIvC,WAAW,CAAC,mBAAmB,EAAE,CAAC;QAClC,IAAI,EAAE,CAAC,GAAG,YAAY,CAAC,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,SAAS,CAAC;QAC/D,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,aAAa,EAAE,EAAE;YAEpC,CAAC,GAAG,CAAC,CAAC;YACN,CAAC,GAAG,CAAC,CAAC;YACN,WAAW,CAAC,mBAAmB,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;SACxD;aAAM;YACL,MAAM,KAAK,GAAG,GAAG,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;YAC5C,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YACb,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YAEb,WAAW,CAAC,sBAAsB,EAAE,CAAC;SACtC;QAGD,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,cAAc,CAAC,SAAS,CAC3B,GAAG,EACH,WAAW,EACX,CAAC,EACD,CAAC,EACD,EAAS,EACT,IAAI,EACJ,CACE,OAAmB,EACnB,YAAyD,EACzD,cAA+B,EAC/B,EAAE;YAEF,IAAI,MAAM,EAAE;gBACV,OAAO,IAAI,CAAC;aACb;YACD,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;YACjD,OAAO,MAAM,CAAC;QAChB,CAAC,EACD,CACE,OAAmB,EACnB,YAAyD,EACzD,cAA+B,EAC/B,EAAE;YAEF,IAAI,MAAM,EAAE;gBACV,OAAO,IAAI,CAAC;aACb;YACD,MAAM,SAAS,GAAG,YAAY,CAAC,SAAS,IAAI,cAAc,CAAC,SAAS,CAAC;YACrE,WAAW,CAAC,SAAS,GAAG,IAAA,8BAAe,EAAC,WAAW,EAAE,SAAS,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC;YACjF,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;YACnD,OAAO,MAAM,CAAC;QAChB,CAAC,CACF,CAAC;QAEF,WAAW,CAAC,sBAAsB,EAAE,CAAC;QACrC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AA9EY,sBAAsB;IADlC,IAAA,yBAAU,GAAE;IAKE,WAAA,IAAA,qBAAM,EAAC,wBAAS,CAAC,CAAA;;GAJnB,sBAAsB,CA8ElC;AA9EY,wDAAsB","file":"arc-picker.js","sourcesContent":["import { inject, injectable, getTheme, ArcRender, getScaledStroke, ARC_NUMBER_TYPE } from '@visactor/vrender-core';\nimport type { IPoint } from '@visactor/vutils';\nimport type {\n  IArc,\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  IThemeAttribute,\n  IGraphicPicker,\n  IGraphicRender,\n  IPickParams\n} from '@visactor/vrender-core';\n\n@injectable()\nexport class DefaultCanvasArcPicker implements IGraphicPicker {\n  type: string = 'arc';\n  numberType: number = ARC_NUMBER_TYPE;\n\n  constructor(@inject(ArcRender) public readonly canvasRenderer: IGraphicRender) {}\n\n  contains(arc: IArc, point: IPoint, params?: IPickParams): boolean {\n    if (!arc.AABBBounds.containsPoint(point)) {\n      return false;\n    }\n    if (arc.attribute.pickMode === 'imprecise') {\n      return true;\n    }\n\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    const arcAttribute = getTheme(arc).arc;\n\n    // const arcAttribute = graphicService.themeService.getCurrentTheme().arcAttribute;\n\n    pickContext.highPerformanceSave();\n    let { x = arcAttribute.x, y = arcAttribute.y } = arc.attribute;\n    if (!arc.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      pickContext.transformFromMatrix(arc.transMatrix, true);\n    } else {\n      const point = arc.getOffsetXY(arcAttribute);\n      x += point.x;\n      y += point.y;\n      // 当前context有rotate/scale，重置matrix\n      pickContext.setTransformForCurrent();\n    }\n\n    // 详细形状判断\n    let picked = false;\n    this.canvasRenderer.drawShape(\n      arc,\n      pickContext,\n      x,\n      y,\n      {} as any,\n      null,\n      (\n        context: IContext2d,\n        arcAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        picked = context.isPointInPath(point.x, point.y);\n        return picked;\n      },\n      (\n        context: IContext2d,\n        arcAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        const lineWidth = arcAttribute.lineWidth || themeAttribute.lineWidth;\n        pickContext.lineWidth = getScaledStroke(pickContext, lineWidth, pickContext.dpr);\n        picked = context.isPointInStroke(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/arc-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yDAAmH;AAc5G,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAIjC,YAA+C,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAH7E,SAAI,GAAW,KAAK,CAAC;QACrB,eAAU,GAAW,8BAAe,CAAC;IAE2C,CAAC;IAEjF,QAAQ,CAAC,GAAS,EAAE,KAAa,EAAE,MAAoB;QACrD,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;YACxC,OAAO,KAAK,CAAC;SACd;QACD,IAAI,GAAG,CAAC,SAAS,CAAC,QAAQ,KAAK,WAAW,EAAE;YAC1C,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,YAAY,GAAG,IAAA,uBAAQ,EAAC,GAAG,CAAC,CAAC,GAAG,CAAC;QAIvC,WAAW,CAAC,mBAAmB,EAAE,CAAC;QAClC,IAAI,EAAE,CAAC,GAAG,YAAY,CAAC,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,SAAS,CAAC;QAC/D,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,aAAa,EAAE,EAAE;YAEpC,CAAC,GAAG,CAAC,CAAC;YACN,CAAC,GAAG,CAAC,CAAC;YACN,WAAW,CAAC,mBAAmB,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;SACxD;aAAM;YACL,MAAM,KAAK,GAAG,GAAG,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;YAC5C,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YACb,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YAEb,WAAW,CAAC,sBAAsB,EAAE,CAAC;SACtC;QAGD,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,cAAc,CAAC,SAAS,CAC3B,GAAG,EACH,WAAW,EACX,CAAC,EACD,CAAC,EACD,EAAS,EACT,IAAI,EACJ,CACE,OAAmB,EACnB,YAAyD,EACzD,cAA+B,EAC/B,EAAE;YAEF,IAAI,MAAM,EAAE;gBACV,OAAO,IAAI,CAAC;aACb;YACD,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;YACjD,OAAO,MAAM,CAAC;QAChB,CAAC,EACD,CACE,OAAmB,EACnB,YAAyD,EACzD,cAA+B,EAC/B,EAAE;YAEF,IAAI,MAAM,EAAE;gBACV,OAAO,IAAI,CAAC;aACb;YACD,MAAM,SAAS,GAAG,YAAY,CAAC,SAAS,IAAI,cAAc,CAAC,SAAS,CAAC;YACrE,MAAM,gBAAgB,GAAG,YAAY,CAAC,gBAAgB,IAAI,cAAc,CAAC,gBAAgB,CAAC;YAC1F,WAAW,CAAC,SAAS,GAAG,IAAA,8BAAe,EAAC,WAAW,EAAE,SAAS,GAAG,gBAAgB,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC;YACpG,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;YACnD,OAAO,MAAM,CAAC;QAChB,CAAC,CACF,CAAC;QAEF,WAAW,CAAC,sBAAsB,EAAE,CAAC;QACrC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AA/EY,sBAAsB;IADlC,IAAA,yBAAU,GAAE;IAKE,WAAA,IAAA,qBAAM,EAAC,wBAAS,CAAC,CAAA;;GAJnB,sBAAsB,CA+ElC;AA/EY,wDAAsB","file":"arc-picker.js","sourcesContent":["import { inject, injectable, getTheme, ArcRender, getScaledStroke, ARC_NUMBER_TYPE } from '@visactor/vrender-core';\nimport type { IPoint } from '@visactor/vutils';\nimport type {\n  IArc,\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  IThemeAttribute,\n  IGraphicPicker,\n  IGraphicRender,\n  IPickParams\n} from '@visactor/vrender-core';\n\n@injectable()\nexport class DefaultCanvasArcPicker implements IGraphicPicker {\n  type: string = 'arc';\n  numberType: number = ARC_NUMBER_TYPE;\n\n  constructor(@inject(ArcRender) public readonly canvasRenderer: IGraphicRender) {}\n\n  contains(arc: IArc, point: IPoint, params?: IPickParams): boolean {\n    if (!arc.AABBBounds.containsPoint(point)) {\n      return false;\n    }\n    if (arc.attribute.pickMode === 'imprecise') {\n      return true;\n    }\n\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    const arcAttribute = getTheme(arc).arc;\n\n    // const arcAttribute = graphicService.themeService.getCurrentTheme().arcAttribute;\n\n    pickContext.highPerformanceSave();\n    let { x = arcAttribute.x, y = arcAttribute.y } = arc.attribute;\n    if (!arc.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      pickContext.transformFromMatrix(arc.transMatrix, true);\n    } else {\n      const point = arc.getOffsetXY(arcAttribute);\n      x += point.x;\n      y += point.y;\n      // 当前context有rotate/scale，重置matrix\n      pickContext.setTransformForCurrent();\n    }\n\n    // 详细形状判断\n    let picked = false;\n    this.canvasRenderer.drawShape(\n      arc,\n      pickContext,\n      x,\n      y,\n      {} as any,\n      null,\n      (\n        context: IContext2d,\n        arcAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        picked = context.isPointInPath(point.x, point.y);\n        return picked;\n      },\n      (\n        context: IContext2d,\n        arcAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        const lineWidth = arcAttribute.lineWidth || themeAttribute.lineWidth;\n        const pickStrokeBuffer = arcAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;\n        pickContext.lineWidth = getScaledStroke(pickContext, lineWidth + pickStrokeBuffer, pickContext.dpr);\n        picked = context.isPointInStroke(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/circle-picker.js

@@ -37,8 +37,8 @@ let DefaultCanvasCirclePicker = class {
         return this.canvasRenderer.drawShape(circle, pickContext, x, y, {}, null, ((context, circleAttribute, themeAttribute) => !!picked || (picked = context.isPointInPath(point.x, point.y), 
         picked)), ((context, circleAttribute, themeAttribute) => {
             if (picked) return !0;
-            const lineWidth = circleAttribute.lineWidth || themeAttribute.lineWidth;
-            return pickContext.lineWidth = (0, vrender_core_1.getScaledStroke)(pickContext, lineWidth, pickContext.dpr), 
+            const lineWidth = circleAttribute.lineWidth || themeAttribute.lineWidth, pickStrokeBuffer = circleAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;
+            return pickContext.lineWidth = (0, vrender_core_1.getScaledStroke)(pickContext, lineWidth + pickStrokeBuffer, pickContext.dpr), 
             picked = context.isPointInStroke(point.x, point.y), picked;
         })), pickContext.highPerformanceRestore(), picked;
     }

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/contributions/canvas-picker/circle-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,yDAOgC;AAazB,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IAIpC,YAAkD,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAHhF,SAAI,GAAW,QAAQ,CAAC;QACxB,eAAU,GAAW,iCAAkB,CAAC;IAE2C,CAAC;IAEpF,QAAQ,CAAC,MAAe,EAAE,KAAa,EAAE,MAAoB;QAC3D,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;YAC3C,OAAO,KAAK,CAAC;SACd;QACD,IAAI,MAAM,CAAC,SAAS,CAAC,QAAQ,KAAK,WAAW,EAAE;YAC7C,OAAO,IAAI,CAAC;SACb;QAED,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;QACrC,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,KAAK,CAAC;SACd;QAGD,MAAM,eAAe,GAAG,IAAA,uBAAQ,EAAC,MAAM,CAAC,CAAC,MAAM,CAAC;QAChD,IAAI,EAAE,CAAC,GAAG,eAAe,CAAC,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,SAAS,CAAC;QAExE,WAAW,CAAC,mBAAmB,EAAE,CAAC;QAClC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,EAAE,EAAE;YAEvC,CAAC,GAAG,CAAC,CAAC;YACN,CAAC,GAAG,CAAC,CAAC;YACN,WAAW,CAAC,mBAAmB,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;SAC3D;aAAM;YACL,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;YAClD,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YACb,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YAEb,WAAW,CAAC,sBAAsB,EAAE,CAAC;SACtC;QAGD,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,cAAc,CAAC,SAAS,CAC3B,MAAM,EACN,WAAW,EACX,CAAC,EACD,CAAC,EACD,EAAS,EACT,IAAI,EACJ,CACE,OAAmB,EACnB,eAA4D,EAC5D,cAA+B,EAC/B,EAAE;YAEF,IAAI,MAAM,EAAE;gBACV,OAAO,IAAI,CAAC;aACb;YACD,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;YACjD,OAAO,MAAM,CAAC;QAChB,CAAC,EACD,CACE,OAAmB,EACnB,eAA4D,EAC5D,cAA+B,EAC/B,EAAE;YAEF,IAAI,MAAM,EAAE;gBACV,OAAO,IAAI,CAAC;aACb;YACD,MAAM,SAAS,GAAG,eAAe,CAAC,SAAS,IAAI,cAAc,CAAC,SAAS,CAAC;YACxE,WAAW,CAAC,SAAS,GAAG,IAAA,8BAAe,EAAC,WAAW,EAAE,SAAS,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC;YACjF,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;YACnD,OAAO,MAAM,CAAC;QAChB,CAAC,CACF,CAAC;QAEF,WAAW,CAAC,sBAAsB,EAAE,CAAC;QACrC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AA7EY,yBAAyB;IADrC,IAAA,yBAAU,GAAE;IAKE,WAAA,IAAA,qBAAM,EAAC,2BAAY,CAAC,CAAA;;GAJtB,yBAAyB,CA6ErC;AA7EY,8DAAyB","file":"circle-picker.js","sourcesContent":["import type { IPoint } from '@visactor/vutils';\nimport {\n  inject,\n  injectable,\n  getTheme,\n  CircleRender,\n  getScaledStroke,\n  CIRCLE_NUMBER_TYPE\n} from '@visactor/vrender-core';\nimport type {\n  IGraphicAttribute,\n  ICircle,\n  IContext2d,\n  IMarkAttribute,\n  IThemeAttribute,\n  IGraphicPicker,\n  IGraphicRender,\n  IPickParams\n} from '@visactor/vrender-core';\n\n@injectable()\nexport class DefaultCanvasCirclePicker implements IGraphicPicker {\n  type: string = 'circle';\n  numberType: number = CIRCLE_NUMBER_TYPE;\n\n  constructor(@inject(CircleRender) public readonly canvasRenderer: IGraphicRender) {}\n\n  contains(circle: ICircle, point: IPoint, params?: IPickParams): boolean {\n    if (!circle.AABBBounds.containsPoint(point)) {\n      return false;\n    }\n    if (circle.attribute.pickMode === 'imprecise') {\n      return true;\n    }\n\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    // const circleAttribute = graphicService.themeService.getCurrentTheme().circleAttribute;\n    const circleAttribute = getTheme(circle).circle;\n    let { x = circleAttribute.x, y = circleAttribute.y } = circle.attribute;\n\n    pickContext.highPerformanceSave();\n    if (!circle.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      pickContext.transformFromMatrix(circle.transMatrix, true);\n    } else {\n      const point = circle.getOffsetXY(circleAttribute);\n      x += point.x;\n      y += point.y;\n      // 当前context有rotate/scale，重置matrix\n      pickContext.setTransformForCurrent();\n    }\n\n    // 详细形状判断\n    let picked = false;\n    this.canvasRenderer.drawShape(\n      circle,\n      pickContext,\n      x,\n      y,\n      {} as any,\n      null,\n      (\n        context: IContext2d,\n        circleAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        picked = context.isPointInPath(point.x, point.y);\n        return picked;\n      },\n      (\n        context: IContext2d,\n        circleAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        const lineWidth = circleAttribute.lineWidth || themeAttribute.lineWidth;\n        pickContext.lineWidth = getScaledStroke(pickContext, lineWidth, pickContext.dpr);\n        picked = context.isPointInStroke(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/circle-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,yDAOgC;AAazB,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IAIpC,YAAkD,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAHhF,SAAI,GAAW,QAAQ,CAAC;QACxB,eAAU,GAAW,iCAAkB,CAAC;IAE2C,CAAC;IAEpF,QAAQ,CAAC,MAAe,EAAE,KAAa,EAAE,MAAoB;QAC3D,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;YAC3C,OAAO,KAAK,CAAC;SACd;QACD,IAAI,MAAM,CAAC,SAAS,CAAC,QAAQ,KAAK,WAAW,EAAE;YAC7C,OAAO,IAAI,CAAC;SACb;QAED,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;QACrC,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,KAAK,CAAC;SACd;QAGD,MAAM,eAAe,GAAG,IAAA,uBAAQ,EAAC,MAAM,CAAC,CAAC,MAAM,CAAC;QAChD,IAAI,EAAE,CAAC,GAAG,eAAe,CAAC,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,SAAS,CAAC;QAExE,WAAW,CAAC,mBAAmB,EAAE,CAAC;QAClC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,EAAE,EAAE;YAEvC,CAAC,GAAG,CAAC,CAAC;YACN,CAAC,GAAG,CAAC,CAAC;YACN,WAAW,CAAC,mBAAmB,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;SAC3D;aAAM;YACL,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;YAClD,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YACb,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YAEb,WAAW,CAAC,sBAAsB,EAAE,CAAC;SACtC;QAGD,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,cAAc,CAAC,SAAS,CAC3B,MAAM,EACN,WAAW,EACX,CAAC,EACD,CAAC,EACD,EAAS,EACT,IAAI,EACJ,CACE,OAAmB,EACnB,eAA4D,EAC5D,cAA+B,EAC/B,EAAE;YAEF,IAAI,MAAM,EAAE;gBACV,OAAO,IAAI,CAAC;aACb;YACD,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;YACjD,OAAO,MAAM,CAAC;QAChB,CAAC,EACD,CACE,OAAmB,EACnB,eAA4D,EAC5D,cAA+B,EAC/B,EAAE;YAEF,IAAI,MAAM,EAAE;gBACV,OAAO,IAAI,CAAC;aACb;YACD,MAAM,SAAS,GAAG,eAAe,CAAC,SAAS,IAAI,cAAc,CAAC,SAAS,CAAC;YACxE,MAAM,gBAAgB,GAAG,eAAe,CAAC,gBAAgB,IAAI,cAAc,CAAC,gBAAgB,CAAC;YAC7F,WAAW,CAAC,SAAS,GAAG,IAAA,8BAAe,EAAC,WAAW,EAAE,SAAS,GAAG,gBAAgB,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC;YACpG,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;YACnD,OAAO,MAAM,CAAC;QAChB,CAAC,CACF,CAAC;QAEF,WAAW,CAAC,sBAAsB,EAAE,CAAC;QACrC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AA9EY,yBAAyB;IADrC,IAAA,yBAAU,GAAE;IAKE,WAAA,IAAA,qBAAM,EAAC,2BAAY,CAAC,CAAA;;GAJtB,yBAAyB,CA8ErC;AA9EY,8DAAyB","file":"circle-picker.js","sourcesContent":["import type { IPoint } from '@visactor/vutils';\nimport {\n  inject,\n  injectable,\n  getTheme,\n  CircleRender,\n  getScaledStroke,\n  CIRCLE_NUMBER_TYPE\n} from '@visactor/vrender-core';\nimport type {\n  IGraphicAttribute,\n  ICircle,\n  IContext2d,\n  IMarkAttribute,\n  IThemeAttribute,\n  IGraphicPicker,\n  IGraphicRender,\n  IPickParams\n} from '@visactor/vrender-core';\n\n@injectable()\nexport class DefaultCanvasCirclePicker implements IGraphicPicker {\n  type: string = 'circle';\n  numberType: number = CIRCLE_NUMBER_TYPE;\n\n  constructor(@inject(CircleRender) public readonly canvasRenderer: IGraphicRender) {}\n\n  contains(circle: ICircle, point: IPoint, params?: IPickParams): boolean {\n    if (!circle.AABBBounds.containsPoint(point)) {\n      return false;\n    }\n    if (circle.attribute.pickMode === 'imprecise') {\n      return true;\n    }\n\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    // const circleAttribute = graphicService.themeService.getCurrentTheme().circleAttribute;\n    const circleAttribute = getTheme(circle).circle;\n    let { x = circleAttribute.x, y = circleAttribute.y } = circle.attribute;\n\n    pickContext.highPerformanceSave();\n    if (!circle.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      pickContext.transformFromMatrix(circle.transMatrix, true);\n    } else {\n      const point = circle.getOffsetXY(circleAttribute);\n      x += point.x;\n      y += point.y;\n      // 当前context有rotate/scale，重置matrix\n      pickContext.setTransformForCurrent();\n    }\n\n    // 详细形状判断\n    let picked = false;\n    this.canvasRenderer.drawShape(\n      circle,\n      pickContext,\n      x,\n      y,\n      {} as any,\n      null,\n      (\n        context: IContext2d,\n        circleAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        picked = context.isPointInPath(point.x, point.y);\n        return picked;\n      },\n      (\n        context: IContext2d,\n        circleAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        const lineWidth = circleAttribute.lineWidth || themeAttribute.lineWidth;\n        const pickStrokeBuffer = circleAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;\n        pickContext.lineWidth = getScaledStroke(pickContext, lineWidth + pickStrokeBuffer, pickContext.dpr);\n        picked = context.isPointInStroke(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/line-picker.js

@@ -39,10 +39,10 @@ let DefaultCanvasLinePicker = class extends base_picker_1.BasePicker {
         this.canvasRenderer.z = z;
         let picked = !1;
         return this.canvasRenderer.drawShape(line, pickContext, x, y, {}, null, (context => !!picked || (picked = context.isPointInPath(pickPoint.x, pickPoint.y), 
-        picked)), ((context, circleAttribute, themeAttribute) => {
+        picked)), ((context, lineAttribute, themeAttribute) => {
             if (picked) return !0;
-            const lineWidth = circleAttribute.lineWidth || themeAttribute.lineWidth;
-            return pickContext.lineWidth = (0, vrender_core_1.getScaledStroke)(pickContext, lineWidth, pickContext.dpr), 
+            const lineWidth = lineAttribute.lineWidth || themeAttribute.lineWidth, pickStrokeBuffer = lineAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;
+            return pickContext.lineWidth = (0, vrender_core_1.getScaledStroke)(pickContext, lineWidth + pickStrokeBuffer, pickContext.dpr), 
             picked = context.isPointInStroke(pickPoint.x, pickPoint.y), picked;
         })), this.canvasRenderer.z = 0, pickContext.modelMatrix !== lastModelMatrix && vrender_core_1.mat4Allocate.free(pickContext.modelMatrix), 
         pickContext.modelMatrix = lastModelMatrix, pickContext.highPerformanceRestore(), 

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/contributions/canvas-picker/line-picker.ts"],"names":[],"mappings":"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","file":"line-picker.js","sourcesContent":["import {\n  inject,\n  injectable,\n  LineRender,\n  getTheme,\n  mat4Allocate,\n  getScaledStroke,\n  LINE_NUMBER_TYPE\n} from '@visactor/vrender-core';\nimport type { IPoint } from '@visactor/vutils';\nimport type {\n  ILine,\n  IContext2d,\n  IMarkAttribute,\n  IGraphicAttribute,\n  IThemeAttribute,\n  IGraphicPicker,\n  IGraphicRender,\n  IPickParams\n} from '@visactor/vrender-core';\nimport { BasePicker } from './base-picker';\n\n@injectable()\nexport class DefaultCanvasLinePicker extends BasePicker<ILine> implements IGraphicPicker {\n  type: string = 'line';\n  numberType: number = LINE_NUMBER_TYPE;\n\n  constructor(@inject(LineRender) public readonly canvasRenderer: IGraphicRender) {\n    super();\n  }\n  // numberType?: number = LINE_NUMBER_TYPE;\n\n  contains(line: ILine, point: IPoint, params?: IPickParams): boolean {\n    if (!line.AABBBounds.containsPoint(point)) {\n      return false;\n    }\n    if (line.attribute.pickMode === 'imprecise') {\n      return true;\n    }\n\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    // const lineAttribute = graphicService.themeService.getCurrentTheme().lineAttribute;\n    pickContext.highPerformanceSave();\n    const lineAttribute = getTheme(line).line;\n\n    const data = this.transform(line, lineAttribute, pickContext);\n    const { x, y, z, lastModelMatrix } = data;\n\n    let pickPoint = point;\n    if (pickContext.camera) {\n      pickPoint = point.clone();\n      const globalMatrix = line.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      line,\n      pickContext,\n      x,\n      y,\n      {} as any,\n      null,\n      context => {\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        circleAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        const lineWidth = circleAttribute.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    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/line-picker.ts"],"names":[],"mappings":"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","file":"line-picker.js","sourcesContent":["import {\n  inject,\n  injectable,\n  LineRender,\n  getTheme,\n  mat4Allocate,\n  getScaledStroke,\n  LINE_NUMBER_TYPE\n} from '@visactor/vrender-core';\nimport type { IPoint } from '@visactor/vutils';\nimport type {\n  ILine,\n  IContext2d,\n  IMarkAttribute,\n  IGraphicAttribute,\n  IThemeAttribute,\n  IGraphicPicker,\n  IGraphicRender,\n  IPickParams\n} from '@visactor/vrender-core';\nimport { BasePicker } from './base-picker';\n\n@injectable()\nexport class DefaultCanvasLinePicker extends BasePicker<ILine> implements IGraphicPicker {\n  type: string = 'line';\n  numberType: number = LINE_NUMBER_TYPE;\n\n  constructor(@inject(LineRender) public readonly canvasRenderer: IGraphicRender) {\n    super();\n  }\n  // numberType?: number = LINE_NUMBER_TYPE;\n\n  contains(line: ILine, point: IPoint, params?: IPickParams): boolean {\n    if (!line.AABBBounds.containsPoint(point)) {\n      return false;\n    }\n    if (line.attribute.pickMode === 'imprecise') {\n      return true;\n    }\n\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    // const lineAttribute = graphicService.themeService.getCurrentTheme().lineAttribute;\n    pickContext.highPerformanceSave();\n    const lineAttribute = getTheme(line).line;\n\n    const data = this.transform(line, lineAttribute, pickContext);\n    const { x, y, z, lastModelMatrix } = data;\n\n    let pickPoint = point;\n    if (pickContext.camera) {\n      pickPoint = point.clone();\n      const globalMatrix = line.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      line,\n      pickContext,\n      x,\n      y,\n      {} as any,\n      null,\n      context => {\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        lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        const lineWidth = lineAttribute.lineWidth || themeAttribute.lineWidth;\n        const pickStrokeBuffer = lineAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;\n        pickContext.lineWidth = getScaledStroke(pickContext, lineWidth + pickStrokeBuffer, pickContext.dpr);\n        picked = context.isPointInStroke(pickPoint.x, pickPoint.y);\n        return picked;\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/canvas-picker/module.js

@@ -4,11 +4,43 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 });
 
-const vrender_core_1 = require("@visactor/vrender-core"), constants_1 = require("../constants"), group_picker_1 = require("./group-picker");
+const vrender_core_1 = require("@visactor/vrender-core"), 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"), 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");
+
+let loaded = !1;
 
 exports.default = new vrender_core_1.ContainerModule(((bind, unbind, isBound, rebind) => {
+    loaded || (loaded = !0, bind(constants_1.CanvasCirclePicker).to(circle_picker_1.DefaultCanvasCirclePicker).inSingletonScope(), 
+    bind(constants_1.CanvasPickerContribution).toService(constants_1.CanvasCirclePicker), 
+    bind(constants_1.CanvasRectPicker).to(rect_picker_1.DefaultCanvasRectPicker).inSingletonScope(), 
+    bind(constants_1.CanvasPickerContribution).toService(constants_1.CanvasRectPicker), 
+    bind(constants_1.CanvasRect3dPicker).to(rect3d_picker_1.DefaultCanvasRect3dPicker).inSingletonScope(), 
+    bind(constants_1.CanvasPickerContribution).toService(constants_1.CanvasRect3dPicker), 
+    bind(constants_1.CanvasArcPicker).to(arc_picker_1.DefaultCanvasArcPicker).inSingletonScope(), 
+    bind(constants_1.CanvasPickerContribution).toService(constants_1.CanvasArcPicker), 
+    bind(constants_1.CanvasAreaPicker).to(area_picker_1.DefaultCanvasAreaPicker).inSingletonScope(), 
+    bind(constants_1.CanvasPickerContribution).toService(constants_1.CanvasAreaPicker), 
+    bind(constants_1.CanvasImagePicker).to(image_picker_1.DefaultCanvasImagePicker).inSingletonScope(), 
+    bind(constants_1.CanvasPickerContribution).toService(constants_1.CanvasImagePicker), 
+    bind(constants_1.CanvasLinePicker).to(line_picker_1.DefaultCanvasLinePicker).inSingletonScope(), 
+    bind(constants_1.CanvasPickerContribution).toService(constants_1.CanvasLinePicker), 
+    bind(constants_1.CanvasPathPicker).to(path_picker_1.DefaultCanvasPathPicker).inSingletonScope(), 
+    bind(constants_1.CanvasPickerContribution).toService(constants_1.CanvasPathPicker), 
+    bind(constants_1.CanvasSymbolPicker).to(symbol_picker_1.DefaultCanvasSymbolPicker).inSingletonScope(), 
+    bind(constants_1.CanvasPickerContribution).toService(constants_1.CanvasSymbolPicker), 
+    bind(constants_1.CanvasTextPicker).to(text_picker_1.DefaultCanvasTextPicker).inSingletonScope(), 
+    bind(constants_1.CanvasPickerContribution).toService(constants_1.CanvasTextPicker), 
+    bind(constants_1.CanvasPolygonPicker).to(polygon_picker_1.DefaultCanvasPolygonPicker).inSingletonScope(), 
+    bind(constants_1.CanvasPickerContribution).toService(constants_1.CanvasPolygonPicker), 
+    bind(constants_1.CanvasPyramid3dPicker).to(pyramid3d_picker_1.DefaultCanvasPyramid3dPicker).inSingletonScope(), 
+    bind(constants_1.CanvasPickerContribution).toService(constants_1.CanvasPyramid3dPicker), 
+    bind(constants_1.CanvasArc3dPicker).to(arc3d_picker_1.DefaultCanvasArc3dPicker).inSingletonScope(), 
+    bind(constants_1.CanvasPickerContribution).toService(constants_1.CanvasArc3dPicker), 
+    bind(constants_1.CanvasRichTextPicker).to(richtext_picker_1.DefaultCanvasRichTextPicker).inSingletonScope(), 
+    bind(constants_1.CanvasPickerContribution).toService(constants_1.CanvasRichTextPicker), 
+    bind(constants_1.CanvasGlyphPicker).to(glyph_picker_1.DefaultCanvasGlyphPicker).inSingletonScope(), 
+    bind(constants_1.CanvasPickerContribution).toService(constants_1.CanvasGlyphPicker), 
     bind(constants_1.CanvasGroupPicker).to(group_picker_1.DefaultCanvasGroupPicker).inSingletonScope(), 
     bind(constants_1.CanvasPickerContribution).toService(constants_1.CanvasGroupPicker), 
-    (0, vrender_core_1.bindContributionProvider)(bind, constants_1.CanvasPickerContribution);
+    (0, vrender_core_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":";;AAAA,yDAAmF;AAUnF,4CAkBsB;AAOtB,iDAA0D;AAE1D,kBAAe,IAAI,8BAAe,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IAEnE,IAAI,CAAC,6BAAiB,CAAC,CAAC,EAAE,CAAC,uCAAwB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACxE,IAAI,CAAC,oCAAwB,CAAC,CAAC,SAAS,CAAC,6BAAiB,CAAC,CAAC;IAE5D,IAAA,uCAAwB,EAAC,IAAI,EAAE,oCAAwB,CAAC,CAAC;AAC3D,CAAC,CAAC,CAAC","file":"module.js","sourcesContent":["import { ContainerModule, bindContributionProvider } from '@visactor/vrender-core';\nimport { DefaultCanvasCirclePicker } from './circle-picker';\nimport { DefaultCanvasRectPicker } from './rect-picker';\nimport { DefaultCanvasArcPicker } from './arc-picker';\nimport { DefaultCanvasAreaPicker } from './area-picker';\nimport { DefaultCanvasImagePicker } from './image-picker';\nimport { DefaultCanvasLinePicker } from './line-picker';\nimport { DefaultCanvasPathPicker } from './path-picker';\nimport { DefaultCanvasSymbolPicker } from './symbol-picker';\nimport { DefaultCanvasTextPicker } from './text-picker';\nimport {\n  CanvasArc3dPicker,\n  CanvasArcPicker,\n  CanvasAreaPicker,\n  CanvasCirclePicker,\n  CanvasGlyphPicker,\n  CanvasGroupPicker,\n  CanvasImagePicker,\n  CanvasLinePicker,\n  CanvasPathPicker,\n  CanvasPickerContribution,\n  CanvasPolygonPicker,\n  CanvasPyramid3dPicker,\n  CanvasRect3dPicker,\n  CanvasRectPicker,\n  CanvasRichTextPicker,\n  CanvasSymbolPicker,\n  CanvasTextPicker\n} from '../constants';\nimport { DefaultCanvasPolygonPicker } from './polygon-picker';\nimport { DefaultCanvasRichTextPicker } from './richtext-picker';\nimport { DefaultCanvasGlyphPicker } from './glyph-picker';\nimport { DefaultCanvasRect3dPicker } from './rect3d-picker';\nimport { DefaultCanvasPyramid3dPicker } from './pyramid3d-picker';\nimport { DefaultCanvasArc3dPicker } from './arc3d-picker';\nimport { DefaultCanvasGroupPicker } from './group-picker';\n\nexport default new ContainerModule((bind, unbind, isBound, rebind) => {\n  // group picker\n  bind(CanvasGroupPicker).to(DefaultCanvasGroupPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasGroupPicker);\n\n  bindContributionProvider(bind, CanvasPickerContribution);\n});\n"]}
+{"version":3,"sources":["../src/picker/contributions/canvas-picker/module.ts"],"names":[],"mappings":"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","file":"module.js","sourcesContent":["import { ContainerModule, bindContributionProvider } from '@visactor/vrender-core';\nimport { DefaultCanvasCirclePicker } from './circle-picker';\nimport { DefaultCanvasRectPicker } from './rect-picker';\nimport { DefaultCanvasArcPicker } from './arc-picker';\nimport { DefaultCanvasAreaPicker } from './area-picker';\nimport { DefaultCanvasImagePicker } from './image-picker';\nimport { DefaultCanvasLinePicker } from './line-picker';\nimport { DefaultCanvasPathPicker } from './path-picker';\nimport { DefaultCanvasSymbolPicker } from './symbol-picker';\nimport { DefaultCanvasTextPicker } from './text-picker';\nimport {\n  CanvasArc3dPicker,\n  CanvasArcPicker,\n  CanvasAreaPicker,\n  CanvasCirclePicker,\n  CanvasGlyphPicker,\n  CanvasGroupPicker,\n  CanvasImagePicker,\n  CanvasLinePicker,\n  CanvasPathPicker,\n  CanvasPickerContribution,\n  CanvasPolygonPicker,\n  CanvasPyramid3dPicker,\n  CanvasRect3dPicker,\n  CanvasRectPicker,\n  CanvasRichTextPicker,\n  CanvasSymbolPicker,\n  CanvasTextPicker\n} from '../constants';\nimport { DefaultCanvasPolygonPicker } from './polygon-picker';\nimport { DefaultCanvasRichTextPicker } from './richtext-picker';\nimport { DefaultCanvasGlyphPicker } from './glyph-picker';\nimport { DefaultCanvasRect3dPicker } from './rect3d-picker';\nimport { DefaultCanvasPyramid3dPicker } from './pyramid3d-picker';\nimport { DefaultCanvasArc3dPicker } from './arc3d-picker';\nimport { DefaultCanvasGroupPicker } from './group-picker';\n\nlet loaded = false;\nexport default new ContainerModule((bind, unbind, isBound, rebind) => {\n  if (loaded) {\n    return;\n  }\n  loaded = true;\n  // circle picker\n  bind(CanvasCirclePicker).to(DefaultCanvasCirclePicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasCirclePicker);\n\n  // reat picker\n  bind(CanvasRectPicker).to(DefaultCanvasRectPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasRectPicker);\n\n  // reat3d picker\n  bind(CanvasRect3dPicker).to(DefaultCanvasRect3dPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasRect3dPicker);\n\n  // arc picker\n  bind(CanvasArcPicker).to(DefaultCanvasArcPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasArcPicker);\n\n  // area picker\n  bind(CanvasAreaPicker).to(DefaultCanvasAreaPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasAreaPicker);\n\n  // image picker\n  bind(CanvasImagePicker).to(DefaultCanvasImagePicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasImagePicker);\n\n  // line picker\n  bind(CanvasLinePicker).to(DefaultCanvasLinePicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasLinePicker);\n\n  // path picker\n  bind(CanvasPathPicker).to(DefaultCanvasPathPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasPathPicker);\n\n  // symbol picker\n  bind(CanvasSymbolPicker).to(DefaultCanvasSymbolPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasSymbolPicker);\n\n  // text picker\n  bind(CanvasTextPicker).to(DefaultCanvasTextPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasTextPicker);\n\n  // polygon picker\n  bind(CanvasPolygonPicker).to(DefaultCanvasPolygonPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasPolygonPicker);\n\n  // pyramid3d picker\n  bind(CanvasPyramid3dPicker).to(DefaultCanvasPyramid3dPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasPyramid3dPicker);\n\n  // arc3d picker\n  bind(CanvasArc3dPicker).to(DefaultCanvasArc3dPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasArc3dPicker);\n\n  // richtext picker\n  bind(CanvasRichTextPicker).to(DefaultCanvasRichTextPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasRichTextPicker);\n  // glyph picker\n  bind(CanvasGlyphPicker).to(DefaultCanvasGlyphPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasGlyphPicker);\n  // group picker\n  bind(CanvasGroupPicker).to(DefaultCanvasGroupPicker).inSingletonScope();\n  bind(CanvasPickerContribution).toService(CanvasGroupPicker);\n\n  bindContributionProvider(bind, CanvasPickerContribution);\n});\n"]}

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

@@ -42,8 +42,8 @@ let DefaultCanvasPathPicker = class extends base_picker_1.BasePicker {
         return this.canvasRenderer.drawShape(path, pickContext, x, y, {}, null, ((context, pathAttribute, themeAttribute) => !!picked || (picked = context.isPointInPath(pickPoint.x, pickPoint.y), 
         picked)), ((context, pathAttribute, themeAttribute) => {
             if (picked) return !0;
-            const lineWidth = pathAttribute.lineWidth || themeAttribute.lineWidth;
-            return pickContext.lineWidth = (0, vrender_core_1.getScaledStroke)(pickContext, lineWidth, pickContext.dpr), 
+            const lineWidth = pathAttribute.lineWidth || themeAttribute.lineWidth, pickStrokeBuffer = pathAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;
+            return pickContext.lineWidth = (0, vrender_core_1.getScaledStroke)(pickContext, lineWidth + pickStrokeBuffer, pickContext.dpr), 
             picked = context.isPointInStroke(pickPoint.x, pickPoint.y), picked;
         })), this.canvasRenderer.z = 0, pickContext.modelMatrix !== lastModelMatrix && vrender_core_1.mat4Allocate.free(pickContext.modelMatrix), 
         pickContext.modelMatrix = lastModelMatrix, pickContext.highPerformanceRestore(), 

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/contributions/canvas-picker/path-picker.ts"],"names":[],"mappings":"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","file":"path-picker.js","sourcesContent":["import {\n  inject,\n  injectable,\n  getTheme,\n  PathRender,\n  mat4Allocate,\n  getScaledStroke,\n  PATH_NUMBER_TYPE\n} from '@visactor/vrender-core';\nimport type { IPoint } from '@visactor/vutils';\nimport type {\n  IContext2d,\n  IPath,\n  IMarkAttribute,\n  IGraphicAttribute,\n  IThemeAttribute,\n  IGraphicRender,\n  IGraphicPicker,\n  IPickParams\n} from '@visactor/vrender-core';\nimport { BasePicker } from './base-picker';\n\n@injectable()\nexport class DefaultCanvasPathPicker extends BasePicker<IPath> implements IGraphicPicker {\n  type: string = 'path';\n  numberType: number = PATH_NUMBER_TYPE;\n\n  constructor(@inject(PathRender) public readonly canvasRenderer: IGraphicRender) {\n    super();\n  }\n\n  contains(path: IPath, point: IPoint, params?: IPickParams): boolean {\n    if (!path.AABBBounds.containsPoint(point)) {\n      return false;\n    }\n    if (path.attribute.pickMode === 'imprecise') {\n      return true;\n    }\n\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    // const pathAttribute = graphicService.themeService.getCurrentTheme().pathAttribute;\n    const pathAttribute = getTheme(path).path;\n\n    pickContext.highPerformanceSave();\n    const data = this.transform(path, pathAttribute, pickContext);\n    const { x, y, z, lastModelMatrix } = data;\n\n    let pickPoint = point;\n    if (pickContext.camera) {\n      pickPoint = point.clone();\n      const globalMatrix = path.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      path,\n      pickContext,\n      x,\n      y,\n      {} as any,\n      null,\n      (\n        context: IContext2d,\n        pathAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        picked = context.isPointInPath(pickPoint.x, pickPoint.y);\n        return picked;\n      },\n      (\n        context: IContext2d,\n        pathAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        const lineWidth = pathAttribute.lineWidth || themeAttribute.lineWidth;\n        pickContext.lineWidth = getScaledStroke(pickContext, lineWidth, pickContext.dpr);\n        picked = context.isPointInStroke(pickPoint.x, pickPoint.y);\n        return picked;\n      }\n    );\n    this.canvasRenderer.z = 0;\n\n    if (pickContext.modelMatrix !== lastModelMatrix) {\n      mat4Allocate.free(pickContext.modelMatrix);\n    }\n    pickContext.modelMatrix = lastModelMatrix;\n\n    pickContext.highPerformanceRestore();\n\n    return picked;\n  }\n}\n"]}
+{"version":3,"sources":["../src/picker/contributions/canvas-picker/path-picker.ts"],"names":[],"mappings":"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","file":"path-picker.js","sourcesContent":["import {\n  inject,\n  injectable,\n  getTheme,\n  PathRender,\n  mat4Allocate,\n  getScaledStroke,\n  PATH_NUMBER_TYPE\n} from '@visactor/vrender-core';\nimport type { IPoint } from '@visactor/vutils';\nimport type {\n  IContext2d,\n  IPath,\n  IMarkAttribute,\n  IGraphicAttribute,\n  IThemeAttribute,\n  IGraphicRender,\n  IGraphicPicker,\n  IPickParams\n} from '@visactor/vrender-core';\nimport { BasePicker } from './base-picker';\n\n@injectable()\nexport class DefaultCanvasPathPicker extends BasePicker<IPath> implements IGraphicPicker {\n  type: string = 'path';\n  numberType: number = PATH_NUMBER_TYPE;\n\n  constructor(@inject(PathRender) public readonly canvasRenderer: IGraphicRender) {\n    super();\n  }\n\n  contains(path: IPath, point: IPoint, params?: IPickParams): boolean {\n    if (!path.AABBBounds.containsPoint(point)) {\n      return false;\n    }\n    if (path.attribute.pickMode === 'imprecise') {\n      return true;\n    }\n\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    // const pathAttribute = graphicService.themeService.getCurrentTheme().pathAttribute;\n    const pathAttribute = getTheme(path).path;\n\n    pickContext.highPerformanceSave();\n    const data = this.transform(path, pathAttribute, pickContext);\n    const { x, y, z, lastModelMatrix } = data;\n\n    let pickPoint = point;\n    if (pickContext.camera) {\n      pickPoint = point.clone();\n      const globalMatrix = path.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      path,\n      pickContext,\n      x,\n      y,\n      {} as any,\n      null,\n      (\n        context: IContext2d,\n        pathAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        picked = context.isPointInPath(pickPoint.x, pickPoint.y);\n        return picked;\n      },\n      (\n        context: IContext2d,\n        pathAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        const lineWidth = pathAttribute.lineWidth || themeAttribute.lineWidth;\n        const pickStrokeBuffer = pathAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;\n        pickContext.lineWidth = getScaledStroke(pickContext, lineWidth + pickStrokeBuffer, pickContext.dpr);\n        picked = context.isPointInStroke(pickPoint.x, pickPoint.y);\n        return picked;\n      }\n    );\n    this.canvasRenderer.z = 0;\n\n    if (pickContext.modelMatrix !== lastModelMatrix) {\n      mat4Allocate.free(pickContext.modelMatrix);\n    }\n    pickContext.modelMatrix = lastModelMatrix;\n\n    pickContext.highPerformanceRestore();\n\n    return picked;\n  }\n}\n"]}

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

@@ -37,9 +37,9 @@ let DefaultCanvasPolygonPicker = class {
         return this.canvasRenderer.drawShape(polygon, pickContext, x, y, {}, null, ((context, pathAttribute, themeAttribute) => !!picked || (picked = context.isPointInPath(point.x, point.y), 
         picked)), ((context, pathAttribute, themeAttribute) => {
             if (picked) return !0;
-            const lineWidth = pathAttribute.lineWidth || themeAttribute.lineWidth;
-            return pickContext.lineWidth = lineWidth, picked = context.isPointInStroke(point.x, point.y), 
-            picked;
+            const lineWidth = pathAttribute.lineWidth || themeAttribute.lineWidth, pickStrokeBuffer = pathAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;
+            return pickContext.lineWidth = (0, vrender_core_1.getScaledStroke)(pickContext, lineWidth + pickStrokeBuffer, pickContext.dpr), 
+            picked = context.isPointInStroke(point.x, point.y), picked;
         })), pickContext.highPerformanceRestore(), picked;
     }
 };

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

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

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

@@ -41,8 +41,8 @@ let DefaultCanvasRectPicker = class {
         this.canvasRenderer.drawShape(rect, pickContext, x, y, {}, null, ((context, rectAttribute, themeAttribute) => !!picked || (picked = context.isPointInPath(point.x, point.y), 
         picked)), ((context, rectAttribute, themeAttribute) => {
             if (picked) return !0;
-            const lineWidth = rectAttribute.lineWidth || themeAttribute.lineWidth;
-            return pickContext.lineWidth = (0, vrender_core_1.getScaledStroke)(pickContext, lineWidth, pickContext.dpr), 
+            const lineWidth = rectAttribute.lineWidth || themeAttribute.lineWidth, pickStrokeBuffer = rectAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;
+            return pickContext.lineWidth = (0, vrender_core_1.getScaledStroke)(pickContext, lineWidth + pickStrokeBuffer, pickContext.dpr), 
             picked = context.isPointInStroke(point.x, point.y), picked;
         })); else {
             const {fill: fill = rectAttribute.fill, stroke: stroke = rectAttribute.stroke, lineWidth: lineWidth = rectAttribute.lineWidth} = rect.attribute;