npm - @visactor/vrender-kits - Versions diffs - 0.19.19 → 0.20.0-alpha.1 - Mend

@visactor/vrender-kits 0.19.19 → 0.20.0-alpha.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (226) hide show

package/cjs/picker/contributions/canvas-picker/arc3d-picker.js CHANGED Viewed

@@ -16,31 +16,12 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasArc3dPicker = void 0;
-const vrender_core_1 = require("@visactor/vrender-core"), base_picker_1 = require("./base-picker");
+const vrender_core_1 = require("@visactor/vrender-core"), base_3d_picker_1 = require("../common/base-3d-picker");
-let DefaultCanvasArc3dPicker = class extends base_picker_1.BasePicker {
+let DefaultCanvasArc3dPicker = class extends base_3d_picker_1.Base3dPicker {
     constructor(canvasRenderer) {
-        super(), this.canvasRenderer = canvasRenderer, this.type = "arc3d", this.numberType = vrender_core_1.ARC3D_NUMBER_TYPE;
-    }
-    contains(arc3d, point, params) {
-        const {pickContext: pickContext} = null != params ? params : {};
-        if (!pickContext) return !1;
-        const arc3dAttribute = (0, vrender_core_1.getTheme)(arc3d).arc;
-        pickContext.highPerformanceSave();
-        const data = this.transform(arc3d, arc3dAttribute, pickContext), {x: x, y: y, z: z, lastModelMatrix: lastModelMatrix} = data;
-        let pickPoint = point;
-        if (pickContext.camera) {
-            pickPoint = point.clone();
-            const globalMatrix = arc3d.parent.globalTransMatrix;
-            pickPoint.x = globalMatrix.a * point.x + globalMatrix.c * point.y + globalMatrix.e,
-            pickPoint.y = globalMatrix.b * point.x + globalMatrix.d * point.y + globalMatrix.f;
-        }
-        this.canvasRenderer.z = z;
-        let picked = !1;
-        return this.canvasRenderer.drawShape(arc3d, pickContext, x, y, params, null, ((context, arc3dAttribute, themeAttribute) => !!picked || (picked = context.isPointInPath(pickPoint.x, pickPoint.y),
-        picked))), this.canvasRenderer.z = 0, pickContext.modelMatrix !== lastModelMatrix && vrender_core_1.mat4Allocate.free(pickContext.modelMatrix),
-        pickContext.modelMatrix = lastModelMatrix, pickContext.highPerformanceRestore(),
-        picked;
+        super(), this.canvasRenderer = canvasRenderer, this.type = "arc3d", this.numberType = vrender_core_1.ARC3D_NUMBER_TYPE,
+        this.themeType = "arc";
     }
 };

package/cjs/picker/contributions/canvas-picker/arc3d-picker.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/picker/contributions/canvas-picker/arc3d-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;~~AAEA~~,~~yDAAoH~~;~~AAWpH,+CAA2C~~;~~AAGpC~~,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,~~wBAAkB~~;~~IAI9D~~,YAAiD,cAA8B;QAC7E,KAAK,EAAE,CAAC;QADuC,mBAAc,GAAd,cAAc,CAAgB;~~QAH~~/E,SAAI,GAAW,OAAO,CAAC;QACvB,eAAU,GAAW,gCAAiB,CAAC;~~IAIvC~~,~~CAAC;IAED~~,~~QAAQ~~,~~CAAC,KAAa,EAAE,KAAa,EAAE,MAAoB;QACzD,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;QACrC,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,~~KAAK,CAAC;~~SACd;QACD~~,~~MAAM,cAAc,GAAG,IAAA,uBAAQ,EAAC,KAAK,~~CAAC~~,CAAC,GAAG,CAAC~~;QAE3C,WAAW,CAAC,mBAAmB,EAAE,CAAC;QAClC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC;QAChE,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;QAE1C,IAAI,SAAS,GAAG,KAAK,CAAC;QACtB,IAAI,WAAW,CAAC,MAAM,EAAE;YACtB,SAAS,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;YAC1B,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAAC,iBAAiB,CAAC;YACpD,SAAS,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;YACnF,SAAS,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;SACpF;QAED,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC;QAE1B,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,cAAc,CAAC,SAAS,CAC3B,KAAK,EACL,WAAW,EACX,CAAC,EACD,CAAC,EACD,MAAa,EACb,IAAI,EACJ,CACE,OAAmB,EACnB,cAA2D,EAC3D,cAA+B,EAC/B,EAAE;YAEF,IAAI,MAAM,EAAE;gBACV,OAAO,IAAI,CAAC;aACb;YACD,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;YACzD,OAAO,MAAM,CAAC;QAChB,CAAC,CACF,CAAC;QACF,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC;QAG1B,IAAI,WAAW,CAAC,WAAW,KAAK,eAAe,EAAE;YAC/C,2BAAY,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;SAC5C;QACD,WAAW,CAAC,WAAW,GAAG,eAAe,CAAC;QAE1C,WAAW,CAAC,sBAAsB,EAAE,CAAC;QACrC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;~~AA7DY~~,wBAAwB;IADpC,IAAA,yBAAU,GAAE;~~IAKE~~,WAAA,IAAA,qBAAM,EAAC,0BAAW,CAAC,CAAA;;~~GAJrB~~,wBAAwB,~~CA6DpC~~;~~AA7DY~~,4DAAwB","file":"arc3d-picker.js","sourcesContent":["import ~~type~~ { ~~IPoint } from '@visactor/vutils';\nimport { AABBBounds } from '@visactor/vutils';\nimport {~~ inject, injectable, ~~getTheme,~~ Arc3dRender, ~~mat4Allocate,~~ ARC3D_NUMBER_TYPE } from '@visactor/vrender-core';\nimport type {~~\n IGraphicAttribute,\n IContext2d,\n IMarkAttribute,\n~~ IArc3d~~,\n IThemeAttribute,\n~~ IGraphicPicker~~,\n~~ IGraphicRender~~,\n IPickParams\n~~} from '@visactor/vrender-core';\nimport { ~~BasePicker~~ } from './base-picker';\n\n@injectable()\nexport class DefaultCanvasArc3dPicker extends ~~BasePicker~~<IArc3d> implements IGraphicPicker {\n type: string = 'arc3d';\n numberType: number = ARC3D_NUMBER_TYPE;\n\n constructor(@inject(Arc3dRender) public readonly canvasRenderer: IGraphicRender) {\n super();\n }\n~~\n contains(arc3d: IArc3d, point: IPoint, params?: IPickParams): boolean {\n const { pickContext~~ } ~~= params ?? {};\n if (!pickContext) {~~\n return false;\n }\n const arc3dAttribute = getTheme(arc3d).arc;\n\n pickContext.highPerformanceSave();\n const data = this.transform(arc3d, arc3dAttribute, pickContext);\n const { x, y, z, lastModelMatrix } = data;\n\n let pickPoint = point;\n if (pickContext.camera) {\n pickPoint = point.clone();\n const globalMatrix = arc3d.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 arc3d,\n pickContext,\n x,\n y,\n params as any,\n null,\n (\n context: IContext2d,\n arc3dAttribute: 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 this.canvasRenderer.z = 0;\n\n // mat4Allocate.free(pickContext.modelMatrix);\n if (pickContext.modelMatrix !== lastModelMatrix) {\n mat4Allocate.free(pickContext.modelMatrix);\n }\n pickContext.modelMatrix = lastModelMatrix;\n\n pickContext.highPerformanceRestore();\n return picked;\n }\n}\n"]}
1	+ {"version":3,"sources":["../src/picker/contributions/canvas-picker/arc3d-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yDAA4F;AAE5F,6DAAwD;AAGjD,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,6BAAoB;IAKhE,YAAiD,cAA8B;QAC7E,KAAK,EAAE,CAAC;QADuC,mBAAc,GAAd,cAAc,CAAgB;QAJ/E,SAAI,GAAW,OAAO,CAAC;QACvB,eAAU,GAAW,gCAAiB,CAAC;QACvC,cAAS,GAAW,KAAK,CAAC;IAI1B,CAAC;CACF,CAAA;AARY,wBAAwB;IADpC,IAAA,yBAAU,GAAE;IAME,WAAA,IAAA,qBAAM,EAAC,0BAAW,CAAC,CAAA;;GALrB,wBAAwB,CAQpC;AARY,4DAAwB","file":"arc3d-picker.js","sourcesContent":["import { inject, injectable, Arc3dRender, ARC3D_NUMBER_TYPE } from '@visactor/vrender-core';\nimport type { IArc3d, IGraphicPicker, IGraphicRender } from '@visactor/vrender-core';\nimport { Base3dPicker } from '../common/base-3d-picker';\n\n@injectable()\nexport class DefaultCanvasArc3dPicker extends Base3dPicker<IArc3d> implements IGraphicPicker {\n type: string = 'arc3d';\n numberType: number = ARC3D_NUMBER_TYPE;\n themeType: string = 'arc';\n\n constructor(@inject(Arc3dRender) public readonly canvasRenderer: IGraphicRender) {\n super();\n }\n}\n"]}

package/cjs/picker/contributions/canvas-picker/area-picker.d.ts CHANGED Viewed

@@ -1,9 +1,8 @@
-import type { IPoint } from '@visactor/vutils';
-import type { IArea, IGraphicPicker, IGraphicRender, IPickParams } from '@visactor/vrender-core';
-export declare class DefaultCanvasAreaPicker implements IGraphicPicker {
+import type { IGraphicPicker, IGraphicRender } from '@visactor/vrender-core';
+import { PickerBase } from '../common/base';
+export declare class DefaultCanvasAreaPicker extends PickerBase implements IGraphicPicker {
     readonly canvasRenderer: IGraphicRender;
     type: string;
     numberType: number;
     constructor(canvasRenderer: IGraphicRender);
-    contains(area: IArea, point: IPoint, params?: IPickParams): boolean;
 }

package/cjs/picker/contributions/canvas-picker/area-picker.js CHANGED Viewed

@@ -16,33 +16,11 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasAreaPicker = void 0;
-const vrender_core_1 = require("@visactor/vrender-core");
+const vrender_core_1 = require("@visactor/vrender-core"), base_1 = require("../common/base");
-let DefaultCanvasAreaPicker = class {
+let DefaultCanvasAreaPicker = class extends base_1.PickerBase {
     constructor(canvasRenderer) {
-        this.canvasRenderer = canvasRenderer, this.type = "area", this.numberType = vrender_core_1.AREA_NUMBER_TYPE;
-    }
-    contains(area, point, params) {
-        if (!area.AABBBounds.containsPoint(point)) return !1;
-        if ("imprecise" === area.attribute.pickMode) return !0;
-        const {pickContext: pickContext} = null != params ? params : {};
-        if (!pickContext) return !1;
-        const areaAttribute = (0, vrender_core_1.getTheme)(area).area;
-        let {x: x = areaAttribute.x, y: y = areaAttribute.y} = area.attribute;
-        const {fillPickable: fillPickable = areaAttribute.fillPickable, strokePickable: strokePickable = areaAttribute.strokePickable} = area.attribute;
-        if (pickContext.highPerformanceSave(), area.transMatrix.onlyTranslate()) {
-            const point = area.getOffsetXY(areaAttribute);
-            x += point.x, y += point.y, pickContext.setTransformForCurrent();
-        } else x = 0, y = 0, pickContext.transformFromMatrix(area.transMatrix, !0);
-        let picked = !1;
-        return this.canvasRenderer.drawShape(area, pickContext, x, y, {}, null, (context => !!picked || !!fillPickable && (picked = context.isPointInPath(point.x, point.y),
-        picked)), ((context, areaAttribute, themeAttribute) => {
-            if (picked) return !0;
-            if (!strokePickable) return !1;
-            const lineWidth = areaAttribute.lineWidth || themeAttribute.lineWidth, pickStrokeBuffer = areaAttribute.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;
+        super(), this.canvasRenderer = canvasRenderer, this.type = "area", this.numberType = vrender_core_1.AREA_NUMBER_TYPE;
     }
 };

package/cjs/picker/contributions/canvas-picker/area-picker.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/picker/contributions/canvas-picker/area-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,~~yDAAqH~~;~~AAc9G~~,IAAM,uBAAuB,GAA7B,MAAM,~~uBAAuB~~;~~IAIlC~~,YAAgD,cAA8B;~~QAA9B~~,mBAAc,GAAd,cAAc,CAAgB;QAH9E,SAAI,GAAW,MAAM,CAAC;QACtB,eAAU,GAAW,+BAAgB,CAAC;~~IAE2C~~,CAAC;IAElF,QAAQ,CAAC,IAAW,EAAE,KAAa,EAAE,MAAoB;QACvD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;YACzC,OAAO,KAAK,CAAC;SACd;QACD,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,KAAK,WAAW,EAAE;YAC3C,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,aAAa,GAAG,IAAA,uBAAQ,EAAC,IAAI,CAAC,CAAC,IAAI,CAAC;QAC1C,IAAI,EAAE,CAAC,GAAG,aAAa,CAAC,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;QAClE,MAAM,EAAE,YAAY,GAAG,aAAa,CAAC,YAAY,EAAE,cAAc,GAAG,aAAa,CAAC,cAAc,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;QAEpH,WAAW,CAAC,mBAAmB,EAAE,CAAC;QAClC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,EAAE;YAErC,CAAC,GAAG,CAAC,CAAC;YACN,CAAC,GAAG,CAAC,CAAC;YACN,WAAW,CAAC,mBAAmB,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;SACzD;aAAM;YACL,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;YAC9C,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,IAAI,EACJ,WAAW,EACX,CAAC,EACD,CAAC,EACD,EAAS,EACT,IAAI,EACJ,OAAO,CAAC,EAAE;YAER,IAAI,MAAM,EAAE;gBACV,OAAO,IAAI,CAAC;aACb;YACD,IAAI,CAAC,YAAY,EAAE;gBACjB,OAAO,KAAK,CAAC;aACd;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,IAAI,CAAC,cAAc,EAAE;gBACnB,OAAO,KAAK,CAAC;aACd;YACD,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,IAAI,cAAc,CAAC,SAAS,CAAC;YACtE,MAAM,gBAAgB,GAAG,aAAa,CAAC,gBAAgB,IAAI,cAAc,CAAC,gBAAgB,CAAC;YAC3F,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;QAErC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,~~CAAA;~~AAlFY~~,uBAAuB;IADnC,IAAA,yBAAU,GAAE;IAKE,WAAA,IAAA,qBAAM,EAAC,yBAAU,CAAC,CAAA;;GAJpB,uBAAuB,~~CAkFnC~~;~~AAlFY~~,0DAAuB","file":"area-picker.js","sourcesContent":["import { inject, injectable, ~~getTheme,~~ AreaRender, AREA_NUMBER_TYPE, ~~getScaledStroke~~ } from '@visactor/vrender-core';\nimport type { ~~IPoint~~ } from '@visactor/~~vutils~~';\nimport ~~type~~ ~~{\n IArea,\n IContext2d,\n IGraphicAttribute,\n IGraphicPicker,\n IGraphicRender,\n IMarkAttribute,\n IPickParams,\n IThemeAttribute\n~~} from '~~@visactor~~/~~vrender-core~~';\n\n@injectable()\nexport class DefaultCanvasAreaPicker implements IGraphicPicker {\n type: string = 'area';\n numberType: number = AREA_NUMBER_TYPE;\n\n constructor(@inject(AreaRender) public readonly canvasRenderer: IGraphicRender) {}\n~~\n contains(area: IArea, point: IPoint, params?: IPickParams): boolean {\n~~ if (~~!area.AABBBounds.containsPoint(point~~)~~) {\n return false~~;\n }\n if (area.attribute.pickMode === 'imprecise') {\n return true;\n }\n\n const { pickContext } = params ?? {};\n if (!pickContext) {\n return false;\n }\n\n // const areaAttribute = graphicService.themeService.getCurrentTheme().areaAttribute;\n const areaAttribute = getTheme(area).area;\n let { x = areaAttribute.x, y = areaAttribute.y } = area.attribute;\n const { fillPickable = areaAttribute.fillPickable, strokePickable = areaAttribute.strokePickable } = area.attribute;\n\n pickContext.highPerformanceSave();\n if (!area.transMatrix.onlyTranslate()) {\n // 性能较差\n x = 0;\n y = 0;\n pickContext.transformFromMatrix(area.transMatrix, true);\n } else {\n const point = area.getOffsetXY(areaAttribute);\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 area,\n pickContext,\n x,\n y,\n {} as any,\n null,\n context => {\n // 选中后面就不需要再走逻辑了\n if (picked) {\n return true;\n }\n if (!fillPickable) {\n return false;\n }\n picked = context.isPointInPath(point.x, point.y);\n return picked;\n },\n (\n context: IContext2d,\n areaAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n themeAttribute: IThemeAttribute\n ) => {\n // 选中后面就不需要再走逻辑了\n if (picked) {\n return true;\n }\n if (!strokePickable) {\n return false;\n }\n const lineWidth = areaAttribute.lineWidth \|\| themeAttribute.lineWidth;\n const pickStrokeBuffer = areaAttribute.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 // area没有stroke pick\n return picked;\n }\n}\n"]}
1	+ {"version":3,"sources":["../src/picker/contributions/canvas-picker/area-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yDAA0F;AAE1F,yCAA4C;AAGrC,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,iBAAU;IAIrD,YAAgD,cAA8B;QAC5E,KAAK,EAAE,CAAC;QADsC,mBAAc,GAAd,cAAc,CAAgB;QAH9E,SAAI,GAAW,MAAM,CAAC;QACtB,eAAU,GAAW,+BAAgB,CAAC;IAItC,CAAC;CACF,CAAA;AAPY,uBAAuB;IADnC,IAAA,yBAAU,GAAE;IAKE,WAAA,IAAA,qBAAM,EAAC,yBAAU,CAAC,CAAA;;GAJpB,uBAAuB,CAOnC;AAPY,0DAAuB","file":"area-picker.js","sourcesContent":["import { inject, injectable, AreaRender, AREA_NUMBER_TYPE } from '@visactor/vrender-core';\nimport type { IGraphicPicker, IGraphicRender } from '@visactor/vrender-core';\nimport { PickerBase } from '../common/base';\n\n@injectable()\nexport class DefaultCanvasAreaPicker extends PickerBase implements IGraphicPicker {\n type: string = 'area';\n numberType: number = AREA_NUMBER_TYPE;\n\n constructor(@inject(AreaRender) public readonly canvasRenderer: IGraphicRender) {\n super();\n }\n}\n"]}

package/cjs/picker/contributions/canvas-picker/circle-picker.d.ts CHANGED Viewed

@@ -1,9 +1,8 @@
-import type { IPoint } from '@visactor/vutils';
-import type { ICircle, IGraphicPicker, IGraphicRender, IPickParams } from '@visactor/vrender-core';
-export declare class DefaultCanvasCirclePicker implements IGraphicPicker {
+import type { IGraphicPicker, IGraphicRender } from '@visactor/vrender-core';
+import { PickerBase } from '../common/base';
+export declare class DefaultCanvasCirclePicker extends PickerBase implements IGraphicPicker {
     readonly canvasRenderer: IGraphicRender;
     type: string;
     numberType: number;
     constructor(canvasRenderer: IGraphicRender);
-    contains(circle: ICircle, point: IPoint, params?: IPickParams): boolean;
 }

package/cjs/picker/contributions/canvas-picker/circle-picker.js CHANGED Viewed

@@ -16,31 +16,11 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasCirclePicker = void 0;
-const vrender_core_1 = require("@visactor/vrender-core");
+const vrender_core_1 = require("@visactor/vrender-core"), base_1 = require("../common/base");
-let DefaultCanvasCirclePicker = class {
+let DefaultCanvasCirclePicker = class extends base_1.PickerBase {
     constructor(canvasRenderer) {
-        this.canvasRenderer = canvasRenderer, this.type = "circle", this.numberType = vrender_core_1.CIRCLE_NUMBER_TYPE;
-    }
-    contains(circle, point, params) {
-        if (!circle.AABBBounds.containsPoint(point)) return !1;
-        if ("imprecise" === circle.attribute.pickMode) return !0;
-        const {pickContext: pickContext} = null != params ? params : {};
-        if (!pickContext) return !1;
-        const circleAttribute = (0, vrender_core_1.getTheme)(circle).circle;
-        let {x: x = circleAttribute.x, y: y = circleAttribute.y} = circle.attribute;
-        if (pickContext.highPerformanceSave(), circle.transMatrix.onlyTranslate()) {
-            const point = circle.getOffsetXY(circleAttribute);
-            x += point.x, y += point.y, pickContext.setTransformForCurrent();
-        } else x = 0, y = 0, pickContext.transformFromMatrix(circle.transMatrix, !0);
-        let picked = !1;
-        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, 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;
+        super(), this.canvasRenderer = canvasRenderer, this.type = "circle", this.numberType = vrender_core_1.CIRCLE_NUMBER_TYPE;
     }
 };

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

	@@ -1 +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,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"]}
1	+ {"version":3,"sources":["../src/picker/contributions/canvas-picker/circle-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yDAA8F;AAE9F,yCAA4C;AAGrC,IAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,iBAAU;IAIvD,YAAkD,cAA8B;QAC9E,KAAK,EAAE,CAAC;QADwC,mBAAc,GAAd,cAAc,CAAgB;QAHhF,SAAI,GAAW,QAAQ,CAAC;QACxB,eAAU,GAAW,iCAAkB,CAAC;IAIxC,CAAC;CACF,CAAA;AAPY,yBAAyB;IADrC,IAAA,yBAAU,GAAE;IAKE,WAAA,IAAA,qBAAM,EAAC,2BAAY,CAAC,CAAA;;GAJtB,yBAAyB,CAOrC;AAPY,8DAAyB","file":"circle-picker.js","sourcesContent":["import { inject, injectable, CircleRender, CIRCLE_NUMBER_TYPE } from '@visactor/vrender-core';\nimport type { IGraphicPicker, IGraphicRender } from '@visactor/vrender-core';\nimport { PickerBase } from '../common/base';\n\n@injectable()\nexport class DefaultCanvasCirclePicker extends PickerBase implements IGraphicPicker {\n type: string = 'circle';\n numberType: number = CIRCLE_NUMBER_TYPE;\n\n constructor(@inject(CircleRender) public readonly canvasRenderer: IGraphicRender) {\n super();\n }\n}\n"]}

package/cjs/picker/contributions/canvas-picker/glyph-picker.d.ts CHANGED Viewed

@@ -1,9 +1,6 @@
-import type { IPoint } from '@visactor/vutils';
-import type { IGlyph, IGraphicPicker, IGraphicRender, IPickParams } from '@visactor/vrender-core';
-export declare class DefaultCanvasGlyphPicker implements IGraphicPicker {
+import type { IGraphicPicker, IGraphicRender } from '@visactor/vrender-core';
+import { GlyphPickerBase } from '../common/glyph-picker-base';
+export declare class DefaultCanvasGlyphPicker extends GlyphPickerBase implements IGraphicPicker {
     readonly canvasRenderer: IGraphicRender;
-    type: string;
-    numberType: number;
     constructor(canvasRenderer: IGraphicRender);
-    contains(glyph: IGlyph, point: IPoint, params?: IPickParams): boolean;
 }

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

@@ -16,27 +16,11 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasGlyphPicker = void 0;
-const vrender_core_1 = require("@visactor/vrender-core");
+const vrender_core_1 = require("@visactor/vrender-core"), glyph_picker_base_1 = require("../common/glyph-picker-base");
-let DefaultCanvasGlyphPicker = class {
+let DefaultCanvasGlyphPicker = class extends glyph_picker_base_1.GlyphPickerBase {
     constructor(canvasRenderer) {
-        this.canvasRenderer = canvasRenderer, this.type = "glyph", this.numberType = vrender_core_1.GLYPH_NUMBER_TYPE;
-    }
-    contains(glyph, point, params) {
-        if (!glyph.AABBBounds.containsPoint(point)) return !1;
-        if ("imprecise" === glyph.attribute.pickMode) return !0;
-        const {pickContext: pickContext} = null != params ? params : {};
-        if (!pickContext) return !1;
-        const pickerService = null == params ? void 0 : params.pickerService;
-        if (pickerService) {
-            let picked = !1;
-            return glyph.getSubGraphic().forEach((g => {
-                if (picked) return;
-                const data = pickerService.pickItem(g, point, null, params);
-                picked = !(!data || !data.graphic);
-            })), picked;
-        }
-        return !1;
+        super(), this.canvasRenderer = canvasRenderer;
     }
 };

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

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/picker/contributions/canvas-picker/glyph-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;~~AACA~~,~~yDAA4F~~;~~AAIrF~~,IAAM,wBAAwB,GAA9B,MAAM,~~wBAAwB~~;~~IAInC~~,YAAiD,cAA8B;~~QAA9B~~,~~mBAAc,GAAd,cAAc,CAAgB;QAH/E,SAAI,GAAW,OAAO,CAAC;QACvB,eAAU,GAAW,gCAAiB,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,IAAI,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;gBAC5D,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;YACpC,CAAC,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IA0Cf,CAAC;CACF,CAAA;~~AA3EY~~,wBAAwB;IADpC,IAAA,yBAAU,GAAE;~~IAKE~~,WAAA,IAAA,qBAAM,EAAC,0BAAW,CAAC,CAAA;;~~GAJrB~~,wBAAwB,~~CA2EpC~~;~~AA3EY~~,4DAAwB","file":"glyph-picker.js","sourcesContent":["import ~~type~~ { ~~IPoint } from '@visactor/vutils';\nimport {~~ inject, injectable, ~~GLYPH_NUMBER_TYPE,~~ GlyphRender } from '@visactor/vrender-core';\nimport type { ~~IGlyph,~~ IGraphicPicker, IGraphicRender, ~~IPickParams~~ } from '@visactor/vrender-core';\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 const data = pickerService.pickItem(g, point, null, params);\n picked = !!(data && data.graphic);\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"]}
1	+ {"version":3,"sources":["../src/picker/contributions/canvas-picker/glyph-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yDAAyE;AAEzE,mEAA8D;AAGvD,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,mCAAe;IAC3D,YAAiD,cAA8B;QAC7E,KAAK,EAAE,CAAC;QADuC,mBAAc,GAAd,cAAc,CAAgB;IAE/E,CAAC;CACF,CAAA;AAJY,wBAAwB;IADpC,IAAA,yBAAU,GAAE;IAEE,WAAA,IAAA,qBAAM,EAAC,0BAAW,CAAC,CAAA;;GADrB,wBAAwB,CAIpC;AAJY,4DAAwB","file":"glyph-picker.js","sourcesContent":["import { inject, injectable, GlyphRender } from '@visactor/vrender-core';\nimport type { IGraphicPicker, IGraphicRender } from '@visactor/vrender-core';\nimport { GlyphPickerBase } from '../common/glyph-picker-base';\n\n@injectable()\nexport class DefaultCanvasGlyphPicker extends GlyphPickerBase implements IGraphicPicker {\n constructor(@inject(GlyphRender) public readonly canvasRenderer: IGraphicRender) {\n super();\n }\n}\n"]}

package/cjs/picker/contributions/canvas-picker/line-picker.d.ts CHANGED Viewed

@@ -1,10 +1,8 @@
-import type { IPoint } from '@visactor/vutils';
-import type { ILine, IGraphicPicker, IGraphicRender, IPickParams } from '@visactor/vrender-core';
-import { BasePicker } from './base-picker';
-export declare class DefaultCanvasLinePicker extends BasePicker<ILine> implements IGraphicPicker {
+import type { ILine, IGraphicPicker, IGraphicRender } from '@visactor/vrender-core';
+import { BaseLinePicker } from '../common/base-line-picker';
+export declare class DefaultCanvasLinePicker extends BaseLinePicker<ILine> implements IGraphicPicker {
     readonly canvasRenderer: IGraphicRender;
     type: string;
     numberType: number;
     constructor(canvasRenderer: IGraphicRender);
-    contains(line: ILine, point: IPoint, params?: IPickParams): boolean;
 }

package/cjs/picker/contributions/canvas-picker/line-picker.js CHANGED Viewed

@@ -16,38 +16,12 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasLinePicker = void 0;
-const vrender_core_1 = require("@visactor/vrender-core"), base_picker_1 = require("./base-picker");
+const vrender_core_1 = require("@visactor/vrender-core"), base_line_picker_1 = require("../common/base-line-picker");
-let DefaultCanvasLinePicker = class extends base_picker_1.BasePicker {
+let DefaultCanvasLinePicker = class extends base_line_picker_1.BaseLinePicker {
     constructor(canvasRenderer) {
         super(), this.canvasRenderer = canvasRenderer, this.type = "line", this.numberType = vrender_core_1.LINE_NUMBER_TYPE;
     }
-    contains(line, point, params) {
-        if (!line.AABBBounds.containsPoint(point)) return !1;
-        if ("imprecise" === line.attribute.pickMode) return !0;
-        const {pickContext: pickContext} = null != params ? params : {};
-        if (!pickContext) return !1;
-        pickContext.highPerformanceSave();
-        const lineAttribute = (0, vrender_core_1.getTheme)(line).line, data = this.transform(line, lineAttribute, pickContext), {x: x, y: y, z: z, lastModelMatrix: lastModelMatrix} = data;
-        let pickPoint = point;
-        if (pickContext.camera) {
-            pickPoint = point.clone();
-            const globalMatrix = line.parent.globalTransMatrix;
-            pickPoint.x = globalMatrix.a * point.x + globalMatrix.c * point.y + globalMatrix.e,
-            pickPoint.y = globalMatrix.b * point.x + globalMatrix.d * point.y + globalMatrix.f;
-        }
-        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, lineAttribute, themeAttribute) => {
-            if (picked) return !0;
-            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(),
-        picked;
-    }
 };
 DefaultCanvasLinePicker = __decorate([ (0, vrender_core_1.injectable)(), __param(0, (0,

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

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/picker/contributions/canvas-picker/line-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,~~yDAQgC~~;~~AAYhC,+CAA2C~~;~~AAGpC~~,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,~~wBAAiB~~;~~IAI5D~~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~~AAhFY~~,uBAAuB;IADnC,IAAA,yBAAU,GAAE;IAKE,WAAA,IAAA,qBAAM,EAAC,yBAAU,CAAC,CAAA;;GAJpB,uBAAuB,~~CAgFnC~~;~~AAhFY~~,0DAAuB","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"]}
1	+ {"version":3,"sources":["../src/picker/contributions/canvas-picker/line-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yDAA0F;AAE1F,iEAA4D;AAGrD,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,iCAAqB;IAIhE,YAAgD,cAA8B;QAC5E,KAAK,EAAE,CAAC;QADsC,mBAAc,GAAd,cAAc,CAAgB;QAH9E,SAAI,GAAW,MAAM,CAAC;QACtB,eAAU,GAAW,+BAAgB,CAAC;IAItC,CAAC;CACF,CAAA;AAPY,uBAAuB;IADnC,IAAA,yBAAU,GAAE;IAKE,WAAA,IAAA,qBAAM,EAAC,yBAAU,CAAC,CAAA;;GAJpB,uBAAuB,CAOnC;AAPY,0DAAuB","file":"line-picker.js","sourcesContent":["import { inject, injectable, LineRender, LINE_NUMBER_TYPE } from '@visactor/vrender-core';\nimport type { ILine, IGraphicPicker, IGraphicRender } from '@visactor/vrender-core';\nimport { BaseLinePicker } from '../common/base-line-picker';\n\n@injectable()\nexport class DefaultCanvasLinePicker extends BaseLinePicker<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}\n"]}

package/cjs/picker/contributions/canvas-picker/path-picker.d.ts CHANGED Viewed

@@ -1,10 +1,8 @@
-import type { IPoint } from '@visactor/vutils';
-import type { IPath, IGraphicRender, IGraphicPicker, IPickParams } from '@visactor/vrender-core';
-import { BasePicker } from './base-picker';
-export declare class DefaultCanvasPathPicker extends BasePicker<IPath> implements IGraphicPicker {
+import type { IPath, IGraphicRender, IGraphicPicker } from '@visactor/vrender-core';
+import { BaseLinePicker } from '../common/base-line-picker';
+export declare class DefaultCanvasPathPicker extends BaseLinePicker<IPath> implements IGraphicPicker {
     readonly canvasRenderer: IGraphicRender;
     type: string;
     numberType: number;
     constructor(canvasRenderer: IGraphicRender);
-    contains(path: IPath, point: IPoint, params?: IPickParams): boolean;
 }

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

@@ -16,39 +16,12 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasPathPicker = void 0;
-const vrender_core_1 = require("@visactor/vrender-core"), base_picker_1 = require("./base-picker");
+const vrender_core_1 = require("@visactor/vrender-core"), base_line_picker_1 = require("../common/base-line-picker");
-let DefaultCanvasPathPicker = class extends base_picker_1.BasePicker {
+let DefaultCanvasPathPicker = class extends base_line_picker_1.BaseLinePicker {
     constructor(canvasRenderer) {
         super(), this.canvasRenderer = canvasRenderer, this.type = "path", this.numberType = vrender_core_1.PATH_NUMBER_TYPE;
     }
-    contains(path, point, params) {
-        if (!path.AABBBounds.containsPoint(point)) return !1;
-        if ("imprecise" === path.attribute.pickMode) return !0;
-        const {pickContext: pickContext} = null != params ? params : {};
-        if (!pickContext) return !1;
-        const pathAttribute = (0, vrender_core_1.getTheme)(path).path;
-        pickContext.highPerformanceSave();
-        const data = this.transform(path, pathAttribute, pickContext), {x: x, y: y, z: z, lastModelMatrix: lastModelMatrix} = data;
-        let pickPoint = point;
-        if (pickContext.camera) {
-            pickPoint = point.clone();
-            const globalMatrix = path.parent.globalTransMatrix;
-            pickPoint.x = globalMatrix.a * point.x + globalMatrix.c * point.y + globalMatrix.e,
-            pickPoint.y = globalMatrix.b * point.x + globalMatrix.d * point.y + globalMatrix.f;
-        }
-        this.canvasRenderer.z = z;
-        let picked = !1;
-        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, 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(),
-        picked;
-    }
 };
 DefaultCanvasPathPicker = __decorate([ (0, vrender_core_1.injectable)(), __param(0, (0,

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

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/picker/contributions/canvas-picker/path-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,~~yDAQgC~~;~~AAYhC,+CAA2C~~;~~AAGpC~~,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,~~wBAAiB~~;~~IAI5D~~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~~AArFY~~,uBAAuB;IADnC,IAAA,yBAAU,GAAE;IAKE,WAAA,IAAA,qBAAM,EAAC,yBAAU,CAAC,CAAA;;GAJpB,uBAAuB,~~CAqFnC~~;~~AArFY~~,0DAAuB","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"]}
1	+ {"version":3,"sources":["../src/picker/contributions/canvas-picker/path-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yDAA0F;AAE1F,iEAA4D;AAGrD,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,iCAAqB;IAIhE,YAAgD,cAA8B;QAC5E,KAAK,EAAE,CAAC;QADsC,mBAAc,GAAd,cAAc,CAAgB;QAH9E,SAAI,GAAW,MAAM,CAAC;QACtB,eAAU,GAAW,+BAAgB,CAAC;IAItC,CAAC;CACF,CAAA;AAPY,uBAAuB;IADnC,IAAA,yBAAU,GAAE;IAKE,WAAA,IAAA,qBAAM,EAAC,yBAAU,CAAC,CAAA;;GAJpB,uBAAuB,CAOnC;AAPY,0DAAuB","file":"path-picker.js","sourcesContent":["import { inject, injectable, PathRender, PATH_NUMBER_TYPE } from '@visactor/vrender-core';\nimport type { IPath, IGraphicRender, IGraphicPicker } from '@visactor/vrender-core';\nimport { BaseLinePicker } from '../common/base-line-picker';\n\n@injectable()\nexport class DefaultCanvasPathPicker extends BaseLinePicker<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"]}

package/cjs/picker/contributions/canvas-picker/polygon-picker.d.ts CHANGED Viewed

@@ -1,9 +1,8 @@
-import type { IPoint } from '@visactor/vutils';
-import type { IPolygon, IGraphicPicker, IGraphicRender, IPickParams } from '@visactor/vrender-core';
-export declare class DefaultCanvasPolygonPicker implements IGraphicPicker {
+import type { IGraphicPicker, IGraphicRender } from '@visactor/vrender-core';
+import { PickerBase } from '../common/base';
+export declare class DefaultCanvasPolygonPicker extends PickerBase implements IGraphicPicker {
     readonly canvasRenderer: IGraphicRender;
     type: string;
     numberType: number;
     constructor(canvasRenderer: IGraphicRender);
-    contains(polygon: IPolygon, point: IPoint, params?: IPickParams): boolean;
 }

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

@@ -16,31 +16,11 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasPolygonPicker = void 0;
-const vrender_core_1 = require("@visactor/vrender-core");
+const vrender_core_1 = require("@visactor/vrender-core"), base_1 = require("../common/base");
-let DefaultCanvasPolygonPicker = class {
+let DefaultCanvasPolygonPicker = class extends base_1.PickerBase {
     constructor(canvasRenderer) {
-        this.canvasRenderer = canvasRenderer, this.type = "polygon", this.numberType = vrender_core_1.POLYGON_NUMBER_TYPE;
-    }
-    contains(polygon, point, params) {
-        if (!polygon.AABBBounds.contains(point.x, point.y)) return !1;
-        if ("imprecise" === polygon.attribute.pickMode) return !0;
-        const {pickContext: pickContext} = null != params ? params : {};
-        if (!pickContext) return !1;
-        const polygonAttribute = (0, vrender_core_1.getTheme)(polygon).polygon;
-        let {x: x = polygonAttribute.x, y: y = polygonAttribute.y} = polygon.attribute;
-        if (pickContext.highPerformanceSave(), polygon.transMatrix.onlyTranslate()) {
-            const point = polygon.getOffsetXY(polygonAttribute);
-            x += point.x, y += point.y, pickContext.setTransformForCurrent();
-        } else x = 0, y = 0, pickContext.transformFromMatrix(polygon.transMatrix, !0);
-        let picked = !1;
-        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, 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;
+        super(), this.canvasRenderer = canvasRenderer, this.type = "polygon", this.numberType = vrender_core_1.POLYGON_NUMBER_TYPE;
     }
 };

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

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/picker/contributions/canvas-picker/polygon-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,~~yDAOgC~~;~~AAczB~~,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,MAAM,gBAAgB,GAAG,aAAa,CAAC,gBAAgB,IAAI,cAAc,CAAC,gBAAgB,CAAC;YAC3F,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;QAErC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,~~CAAA;~~AAhFY~~,0BAA0B;IADtC,IAAA,yBAAU,GAAE;IAKE,WAAA,IAAA,qBAAM,EAAC,4BAAa,CAAC,CAAA;;GAJvB,0BAA0B,~~CAgFtC~~;~~AAhFY~~,gEAA0B","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"]}
1	+ {"version":3,"sources":["../src/picker/contributions/canvas-picker/polygon-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yDAAgG;AAEhG,yCAA4C;AAGrC,IAAM,0BAA0B,GAAhC,MAAM,0BAA2B,SAAQ,iBAAU;IAIxD,YAAmD,cAA8B;QAC/E,KAAK,EAAE,CAAC;QADyC,mBAAc,GAAd,cAAc,CAAgB;QAHjF,SAAI,GAAW,SAAS,CAAC;QACzB,eAAU,GAAW,kCAAmB,CAAC;IAIzC,CAAC;CACF,CAAA;AAPY,0BAA0B;IADtC,IAAA,yBAAU,GAAE;IAKE,WAAA,IAAA,qBAAM,EAAC,4BAAa,CAAC,CAAA;;GAJvB,0BAA0B,CAOtC;AAPY,gEAA0B","file":"polygon-picker.js","sourcesContent":["import { inject, injectable, PolygonRender, POLYGON_NUMBER_TYPE } from '@visactor/vrender-core';\nimport type { IGraphicPicker, IGraphicRender } from '@visactor/vrender-core';\nimport { PickerBase } from '../common/base';\n\n@injectable()\nexport class DefaultCanvasPolygonPicker extends PickerBase implements IGraphicPicker {\n type: string = 'polygon';\n numberType: number = POLYGON_NUMBER_TYPE;\n\n constructor(@inject(PolygonRender) public readonly canvasRenderer: IGraphicRender) {\n super();\n }\n}\n"]}

package/cjs/picker/contributions/canvas-picker/pyramid3d-picker.d.ts CHANGED Viewed

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

package/cjs/picker/contributions/canvas-picker/pyramid3d-picker.js CHANGED Viewed

@@ -16,32 +16,12 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasPyramid3dPicker = void 0;
-const vrender_core_1 = require("@visactor/vrender-core"), base_picker_1 = require("./base-picker");
+const vrender_core_1 = require("@visactor/vrender-core"), base_3d_picker_1 = require("../common/base-3d-picker");
-let DefaultCanvasPyramid3dPicker = class extends base_picker_1.BasePicker {
+let DefaultCanvasPyramid3dPicker = class extends base_3d_picker_1.Base3dPicker {
     constructor(canvasRenderer) {
-        super(), this.canvasRenderer = canvasRenderer, this.type = "pyramid3d", this.numberType = vrender_core_1.PYRAMID3D_NUMBER_TYPE;
-    }
-    contains(pyramid3d, point, params) {
-        const {pickContext: pickContext} = null != params ? params : {};
-        if (!pickContext) return !1;
-        const pyramid3dAttribute = (0, vrender_core_1.getTheme)(pyramid3d).polygon;
-        pickContext.highPerformanceSave();
-        const data = this.transform(pyramid3d, pyramid3dAttribute, pickContext), {x: x, y: y, z: z, lastModelMatrix: lastModelMatrix} = data;
-        let pickPoint = point;
-        if (pickContext.camera) {
-            pickPoint = point.clone();
-            const globalMatrix = pyramid3d.parent.globalTransMatrix;
-            pickPoint.x = globalMatrix.a * point.x + globalMatrix.c * point.y + globalMatrix.e,
-            pickPoint.y = globalMatrix.b * point.x + globalMatrix.d * point.y + globalMatrix.f;
-        }
-        this.canvasRenderer.z = z;
-        let picked = !1;
-        return this.canvasRenderer.drawShape(pyramid3d, pickContext, x, y, {}, null, ((context, pyramid3dAttribute, themeAttribute) => !!picked || (picked = context.isPointInPath(pickPoint.x, pickPoint.y),
-        picked)), ((context, pyramid3dAttribute, themeAttribute) => !1)), this.canvasRenderer.z = 0,
-        pickContext.modelMatrix !== lastModelMatrix && vrender_core_1.mat4Allocate.free(pickContext.modelMatrix),
-        pickContext.modelMatrix = lastModelMatrix, pickContext.highPerformanceRestore(),
-        picked;
+        super(), this.canvasRenderer = canvasRenderer, this.type = "pyramid3d", this.numberType = vrender_core_1.PYRAMID3D_NUMBER_TYPE,
+        this.themeType = "polygon";
     }
 };

package/cjs/picker/contributions/canvas-picker/pyramid3d-picker.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/picker/contributions/canvas-picker/pyramid3d-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;~~AAEA~~,~~yDAOgC~~;~~AAWhC,+CAA2C~~;~~AAGpC~~,IAAM,4BAA4B,GAAlC,MAAM,4BAA6B,SAAQ,~~wBAAsB~~;~~IAItE~~,YAAqD,cAA8B;QACjF,KAAK,EAAE,CAAC;QAD2C,mBAAc,GAAd,cAAc,CAAgB;~~QAHnF~~,SAAI,GAAW,WAAW,CAAC;QAC3B,eAAU,GAAW,oCAAqB,CAAC;~~IAI3C~~,~~CAAC;IAED~~,~~QAAQ~~,~~CAAC,SAAqB,EAAE,KAAa,EAAE,MAAoB;QACjE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;QACrC,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,KAAK,CAAC;SACd;QACD,MAAM,kBAAkB,GAAG,IAAA,uBAAQ,EAAC,~~SAAS,CAAC~~,CAAC,OAAO,CAAC~~;~~QAEvD~~,~~WAAW,~~CAAC~~,mBAAmB,EAAE,CAAC~~;QAClC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,kBAAkB,EAAE,WAAW,CAAC,CAAC;QACxE,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;QAE1C,IAAI,SAAS,GAAG,KAAK,CAAC;QACtB,IAAI,WAAW,CAAC,MAAM,EAAE;YACtB,SAAS,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;YAC1B,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAAC,iBAAiB,CAAC;YACxD,SAAS,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;YACnF,SAAS,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;SACpF;QAED,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC;QAE1B,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,cAAc,CAAC,SAAS,CAC3B,SAAS,EACT,WAAW,EACX,CAAC,EACD,CAAC,EACD,EAAS,EACT,IAAI,EACJ,CACE,OAAmB,EACnB,kBAA+D,EAC/D,cAA+B,EAC/B,EAAE;YAEF,IAAI,MAAM,EAAE;gBACV,OAAO,IAAI,CAAC;aACb;YACD,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;YACzD,OAAO,MAAM,CAAC;QAChB,CAAC,EACD,CACE,OAAmB,EACnB,kBAA+D,EAC/D,cAA+B,EAC/B,EAAE;YASF,OAAO,KAAK,CAAC;QACf,CAAC,CACF,CAAC;QACF,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC;QAE1B,IAAI,WAAW,CAAC,WAAW,KAAK,eAAe,EAAE;YAC/C,2BAAY,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;SAC5C;QACD,WAAW,CAAC,WAAW,GAAG,eAAe,CAAC;QAC1C,WAAW,CAAC,sBAAsB,EAAE,CAAC;QACrC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;~~AA1EY~~,4BAA4B;IADxC,IAAA,yBAAU,GAAE;~~IAKE~~,WAAA,IAAA,qBAAM,EAAC,8BAAe,CAAC,CAAA;;~~GAJzB~~,4BAA4B,~~CA0ExC~~;~~AA1EY~~,oEAA4B","file":"pyramid3d-picker.js","sourcesContent":["import ~~type~~ { ~~IPoint~~ } ~~from~~ ~~'@visactor/vutils';\nimport~~ ~~{ AABBBounds~~ } from '@visactor/~~vutils';\nimport {\n inject,\n injectable,\n getTheme,\n Pyramid3dRender,\n mat4Allocate,\n PYRAMID3D_NUMBER_TYPE\n} from '@visactor/~~vrender-core';\nimport type {~~\n IGraphicAttribute,\n IContext2d,\n IMarkAttribute,\n~~ IPyramid3d~~,\n IThemeAttribute,\n~~ IGraphicRender~~,\n~~ IGraphicPicker~~,\n IPickParams\n~~} from '@visactor/vrender-core';\nimport { ~~BasePicker~~ } from './base-picker';\n\n@injectable()\nexport class DefaultCanvasPyramid3dPicker extends ~~BasePicker~~<IPyramid3d> implements IGraphicPicker {\n type: string = 'pyramid3d';\n numberType: number = PYRAMID3D_NUMBER_TYPE;\n\n ~~constructor(@inject(Pyramid3dRender) public readonly canvasRenderer~~: ~~IGraphicRender)~~ ~~{\n super();\n }\n\n contains(pyramid3d: IPyramid3d, point: IPoint, params?: IPickParams): boolean {\n const { pickContext }~~ = ~~params ?? {};\n if (!pickContext) {\n return false;\n }\n const pyramid3dAttribute = getTheme(pyramid3d).~~polygon;\n\n ~~pickContext.highPerformanceSave~~(~~);\n const data = this.transform~~(~~pyramid3d, pyramid3dAttribute, pickContext~~)~~;\n const~~ { x, y, z, lastModelMatrix } = data;\n\n let pickPoint = point;\n if (pickContext.camera) {\n pickPoint = point.clone();\n const globalMatrix = pyramid3d.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 pyramid3d,\n pickContext,\n x,\n y,\n {} as any,\n null,\n (\n context: ~~IContext2d,\n pyramid3dAttribute: 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 pyramid3dAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n themeAttribute: IThemeAttribute\n ) => {\n // // 选中后面就不需要再走逻辑了\n // if (picked) {\n // return true;\n // }\n // const lineWidth = pyramid3dAttribute.lineWidth \|\| themeAttribute.lineWidth;\n // pickContext.lineWidth = getScaledStroke(pickContext, lineWidth, pickContext.dpr);\n // picked = context.isPointInStroke(point.x, point.y);\n // return picked;\n return false;\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"]}
1	+ {"version":3,"sources":["../src/picker/contributions/canvas-picker/pyramid3d-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yDAAoG;AAEpG,6DAAwD;AAGjD,IAAM,4BAA4B,GAAlC,MAAM,4BAA6B,SAAQ,6BAAwB;IAMxE,YAAqD,cAA8B;QACjF,KAAK,EAAE,CAAC;QAD2C,mBAAc,GAAd,cAAc,CAAgB;QALnF,SAAI,GAAW,WAAW,CAAC;QAC3B,eAAU,GAAW,oCAAqB,CAAC;QAE3C,cAAS,GAAW,SAAS,CAAC;IAI9B,CAAC;CACF,CAAA;AATY,4BAA4B;IADxC,IAAA,yBAAU,GAAE;IAOE,WAAA,IAAA,qBAAM,EAAC,8BAAe,CAAC,CAAA;;GANzB,4BAA4B,CASxC;AATY,oEAA4B","file":"pyramid3d-picker.js","sourcesContent":["import { inject, injectable, Pyramid3dRender, PYRAMID3D_NUMBER_TYPE } from '@visactor/vrender-core';\nimport type { IPyramid3d, IGraphicRender, IGraphicPicker } from '@visactor/vrender-core';\nimport { Base3dPicker } from '../common/base-3d-picker';\n\n@injectable()\nexport class DefaultCanvasPyramid3dPicker extends Base3dPicker<IPyramid3d> implements IGraphicPicker {\n type: string = 'pyramid3d';\n numberType: number = PYRAMID3D_NUMBER_TYPE;\n\n themeType: string = 'polygon';\n\n constructor(@inject(Pyramid3dRender) public readonly canvasRenderer: IGraphicRender) {\n super();\n }\n}\n"]}

package/cjs/picker/contributions/canvas-picker/rect-picker.d.ts CHANGED Viewed

@@ -1,9 +1,6 @@
-import type { IPoint } from '@visactor/vutils';
-import type { IRect, IGraphicPicker, IGraphicRender, IPickParams } from '@visactor/vrender-core';
-export declare class DefaultCanvasRectPicker implements IGraphicPicker {
+import type { IGraphicPicker, IGraphicRender } from '@visactor/vrender-core';
+import { RectPickerBase } from '../common/rect-picker-base';
+export declare class DefaultCanvasRectPicker extends RectPickerBase implements IGraphicPicker {
     readonly canvasRenderer: IGraphicRender;
-    type: string;
-    numberType: number;
     constructor(canvasRenderer: IGraphicRender);
-    contains(rect: IRect, point: IPoint, params?: IPickParams): boolean;
 }