@visactor/vrender 0.9.0 → 0.9.1-circular.0

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/picker/contributions/canvas-picker/arc3d-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAsD;AAEtD,yCAA+C;AAC/C,8CAAwH;AAExH,4CAA8D;AAE9D,8CAAgD;AAChD,+CAA2C;AAE3C,MAAM,OAAO,GAAG,IAAI,mBAAU,EAAE,CAAC;AAG1B,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,2BAAiB,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,kBAAQ,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,sBAAY,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,sBAAU,GAAE;IAKE,WAAA,IAAA,kBAAM,EAAC,oBAAW,CAAC,CAAA;;GAJrB,wBAAwB,CA6DpC;AA7DY,4DAAwB","file":"arc3d-picker.js","sourcesContent":["import { IPoint, AABBBounds } from '@visactor/vutils';\nimport { getScaledStroke } from '../../../common';\nimport { inject, injectable } from 'inversify';\nimport { getTheme, ARC3D_NUMBER_TYPE, getExtraModelMatrix, multiplyMat4Mat3, multiplyMat4Mat4 } from '../../../graphic';\nimport { IGraphicAttribute, IContext2d, IMarkAttribute, IArc3d, IThemeAttribute } from '../../../interface';\nimport { IGraphicRender, Arc3dRender } from '../../../render';\nimport { IGraphicPicker, IPickParams } from '../../picker-service';\nimport { mat4Allocate } from '../../../modules';\nimport { BasePicker } from './base-picker';\n\nconst _bounds = new AABBBounds();\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"]}
+{"version":3,"sources":["../../src/picker/contributions/canvas-picker/arc3d-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAsD;AACtD,yCAA+C;AAC/C,kDAAkD;AAElD,4CAA8D;AAE9D,wEAAkE;AAClE,+CAA2C;AAC3C,0DAA+D;AAE/D,MAAM,OAAO,GAAG,IAAI,mBAAU,EAAE,CAAC;AAG1B,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,6BAAiB,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,gBAAQ,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,8BAAY,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,sBAAU,GAAE;IAKE,WAAA,IAAA,kBAAM,EAAC,oBAAW,CAAC,CAAA;;GAJrB,wBAAwB,CA6DpC;AA7DY,4DAAwB","file":"arc3d-picker.js","sourcesContent":["import { IPoint, AABBBounds } from '@visactor/vutils';\nimport { inject, injectable } from 'inversify';\nimport { getTheme } from '../../../graphic/theme';\nimport { IGraphicAttribute, IContext2d, IMarkAttribute, IArc3d, IThemeAttribute } from '../../../interface';\nimport { IGraphicRender, Arc3dRender } from '../../../render';\nimport { IGraphicPicker, IPickParams } from '../../picker-service';\nimport { mat4Allocate } from '../../../allocator/matrix-allocate';\nimport { BasePicker } from './base-picker';\nimport { ARC3D_NUMBER_TYPE } from '../../../graphic/constants';\n\nconst _bounds = new AABBBounds();\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"]}

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

@@ -16,18 +16,18 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasAreaPicker = void 0;
 
-const inversify_1 = require("inversify"), graphic_1 = require("../../../graphic"), render_1 = require("../../../render");
+const inversify_1 = require("inversify"), theme_1 = require("../../../graphic/theme"), render_1 = require("../../../render"), constants_1 = require("../../../graphic/constants");
 
 let DefaultCanvasAreaPicker = class {
     constructor(canvasRenderer) {
-        this.canvasRenderer = canvasRenderer, this.type = "area", this.numberType = graphic_1.AREA_NUMBER_TYPE;
+        this.canvasRenderer = canvasRenderer, this.type = "area", this.numberType = constants_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, graphic_1.getTheme)(area).area;
+        const areaAttribute = (0, theme_1.getTheme)(area).area;
         let {x: x = areaAttribute.x, y: y = areaAttribute.y} = area.attribute;
         if (pickContext.highPerformanceSave(), area.transMatrix.onlyTranslate()) {
             const point = area.getOffsetXY(areaAttribute);

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/picker/contributions/canvas-picker/area-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yCAA+C;AAE/C,8CAA8D;AAG9D,4CAA6D;AAGtD,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAIlC,YAAgD,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAH9E,SAAI,GAAW,MAAM,CAAC;QACtB,eAAU,GAAW,0BAAgB,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,kBAAQ,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;QAElE,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,CAAC,IAAI,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,EAAE,EAAS,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE;YAEhF,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,CAAC,CAAC;QAEH,WAAW,CAAC,sBAAsB,EAAE,CAAC;QAErC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AApDY,uBAAuB;IADnC,IAAA,sBAAU,GAAE;IAKE,WAAA,IAAA,kBAAM,EAAC,mBAAU,CAAC,CAAA;;GAJpB,uBAAuB,CAoDnC;AApDY,0DAAuB","file":"area-picker.js","sourcesContent":["import { inject, injectable } from 'inversify';\nimport { IPoint } from '@visactor/vutils';\nimport { AREA_NUMBER_TYPE, getTheme } from '../../../graphic';\nimport { IContext2d, IArea } from '../../../interface';\nimport { IGraphicPicker, IPickParams } from '../../picker-service';\nimport { AreaRender, IGraphicRender } from '../../../render';\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\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(area, pickContext, x, y, {} as any, null, context => {\n      // 选中后面就不需要再走逻辑了\n      if (picked) {\n        return true;\n      }\n      picked = context.isPointInPath(point.x, point.y);\n      return picked;\n    });\n\n    pickContext.highPerformanceRestore();\n    // area没有stroke pick\n    return picked;\n  }\n}\n"]}
+{"version":3,"sources":["../../src/picker/contributions/canvas-picker/area-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yCAA+C;AAE/C,kDAAkD;AAGlD,4CAA6D;AAC7D,0DAA8D;AAGvD,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAIlC,YAAgD,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAH9E,SAAI,GAAW,MAAM,CAAC;QACtB,eAAU,GAAW,4BAAgB,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,gBAAQ,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;QAElE,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,CAAC,IAAI,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,EAAE,EAAS,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE;YAEhF,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,CAAC,CAAC;QAEH,WAAW,CAAC,sBAAsB,EAAE,CAAC;QAErC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AApDY,uBAAuB;IADnC,IAAA,sBAAU,GAAE;IAKE,WAAA,IAAA,kBAAM,EAAC,mBAAU,CAAC,CAAA;;GAJpB,uBAAuB,CAoDnC;AApDY,0DAAuB","file":"area-picker.js","sourcesContent":["import { inject, injectable } from 'inversify';\nimport { IPoint } from '@visactor/vutils';\nimport { getTheme } from '../../../graphic/theme';\nimport { IArea } from '../../../interface';\nimport { IGraphicPicker, IPickParams } from '../../picker-service';\nimport { AreaRender, IGraphicRender } from '../../../render';\nimport { AREA_NUMBER_TYPE } from '../../../graphic/constants';\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\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(area, pickContext, x, y, {} as any, null, context => {\n      // 选中后面就不需要再走逻辑了\n      if (picked) {\n        return true;\n      }\n      picked = context.isPointInPath(point.x, point.y);\n      return picked;\n    });\n\n    pickContext.highPerformanceRestore();\n    // area没有stroke pick\n    return picked;\n  }\n}\n"]}

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

@@ -16,18 +16,18 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasCirclePicker = void 0;
 
-const inversify_1 = require("inversify"), graphic_1 = require("../../../graphic"), render_1 = require("../../../render"), common_1 = require("../../../common");
+const inversify_1 = require("inversify"), theme_1 = require("../../../graphic/theme"), render_1 = require("../../../render"), canvas_utils_1 = require("../../../common/canvas-utils"), constants_1 = require("../../../graphic/constants");
 
 let DefaultCanvasCirclePicker = class {
     constructor(canvasRenderer) {
-        this.canvasRenderer = canvasRenderer, this.type = "circle", this.numberType = graphic_1.CIRCLE_NUMBER_TYPE;
+        this.canvasRenderer = canvasRenderer, this.type = "circle", this.numberType = constants_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, graphic_1.getTheme)(circle).circle;
+        const circleAttribute = (0, theme_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);
@@ -38,7 +38,7 @@ let DefaultCanvasCirclePicker = class {
         picked)), ((context, circleAttribute, themeAttribute) => {
             if (picked) return !0;
             const lineWidth = circleAttribute.lineWidth || themeAttribute.lineWidth;
-            return pickContext.lineWidth = (0, common_1.getScaledStroke)(pickContext, lineWidth, pickContext.dpr), 
+            return pickContext.lineWidth = (0, canvas_utils_1.getScaledStroke)(pickContext, lineWidth, 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,yCAA+C;AAC/C,8CAAgE;AAEhE,4CAA+D;AAG/D,4CAAkD;AAG3C,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IAIpC,YAAkD,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAHhF,SAAI,GAAW,QAAQ,CAAC;QACxB,eAAU,GAAW,4BAAkB,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,kBAAQ,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,wBAAe,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,sBAAU,GAAE;IAKE,WAAA,IAAA,kBAAM,EAAC,qBAAY,CAAC,CAAA;;GAJtB,yBAAyB,CA6ErC;AA7EY,8DAAyB","file":"circle-picker.js","sourcesContent":["import { IPoint } from '@visactor/vutils';\nimport { inject, injectable } from 'inversify';\nimport { CIRCLE_NUMBER_TYPE, getTheme } from '../../../graphic';\nimport { IGraphicAttribute, ICircle, IContext2d, IMarkAttribute, IThemeAttribute } from '../../../interface';\nimport { CircleRender, IGraphicRender } from '../../../render';\nimport { IGraphicPicker, IPickParams } from '../../picker-service';\nimport { graphicService } from '../../../modules';\nimport { getScaledStroke } from '../../../common';\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,yCAA+C;AAC/C,kDAAkD;AAElD,4CAA+D;AAE/D,+DAA+D;AAC/D,0DAAgE;AAGzD,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IAIpC,YAAkD,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAHhF,SAAI,GAAW,QAAQ,CAAC;QACxB,eAAU,GAAW,8BAAkB,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,gBAAQ,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,sBAAU,GAAE;IAKE,WAAA,IAAA,kBAAM,EAAC,qBAAY,CAAC,CAAA;;GAJtB,yBAAyB,CA6ErC;AA7EY,8DAAyB","file":"circle-picker.js","sourcesContent":["import { IPoint } from '@visactor/vutils';\nimport { inject, injectable } from 'inversify';\nimport { getTheme } from '../../../graphic/theme';\nimport { IGraphicAttribute, ICircle, IContext2d, IMarkAttribute, IThemeAttribute } from '../../../interface';\nimport { CircleRender, IGraphicRender } from '../../../render';\nimport { IGraphicPicker, IPickParams } from '../../picker-service';\nimport { getScaledStroke } from '../../../common/canvas-utils';\nimport { CIRCLE_NUMBER_TYPE } from '../../../graphic/constants';\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"]}

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

@@ -16,11 +16,11 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasGlyphPicker = void 0;
 
-const inversify_1 = require("inversify"), graphic_1 = require("../../../graphic"), render_1 = require("../../../render");
+const inversify_1 = require("inversify"), constants_1 = require("../../../graphic/constants"), render_1 = require("../../../render");
 
 let DefaultCanvasGlyphPicker = class {
     constructor(canvasRenderer) {
-        this.canvasRenderer = canvasRenderer, this.type = "glyph", this.numberType = graphic_1.GLYPH_NUMBER_TYPE;
+        this.canvasRenderer = canvasRenderer, this.type = "glyph", this.numberType = constants_1.GLYPH_NUMBER_TYPE;
     }
     contains(glyph, point, params) {
         if (!glyph.AABBBounds.containsPoint(point)) return !1;

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/picker/contributions/canvas-picker/glyph-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,yCAA+C;AAC/C,8CAA+D;AAE/D,4CAA0E;AAInE,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAInC,YAAiD,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAH/E,SAAI,GAAW,OAAO,CAAC;QACvB,eAAU,GAAW,2BAAiB,CAAC;IAE2C,CAAC;IAEnF,QAAQ,CAAC,KAAa,EAAE,KAAa,EAAE,MAAoB;QACzD,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;YAC1C,OAAO,KAAK,CAAC;SACd;QACD,IAAI,KAAK,CAAC,SAAS,CAAC,QAAQ,KAAK,WAAW,EAAE;YAC5C,OAAO,IAAI,CAAC;SACb;QAED,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;QACrC,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,KAAK,CAAC;SACd;QAED,MAAM,aAAa,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC;QAC5C,IAAI,aAAa,EAAE;YAEjB,IAAI,MAAM,GAAG,KAAK,CAAC;YACnB,KAAK,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBAChC,IAAI,MAAM,EAAE;oBACV,OAAO;iBACR;gBACD,MAAM,GAAG,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;YACtD,CAAC,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IA0Cf,CAAC;CACF,CAAA;AA1EY,wBAAwB;IADpC,IAAA,sBAAU,GAAE;IAKE,WAAA,IAAA,kBAAM,EAAC,oBAAW,CAAC,CAAA;;GAJrB,wBAAwB,CA0EpC;AA1EY,4DAAwB","file":"glyph-picker.js","sourcesContent":["import { IPoint } from '@visactor/vutils';\nimport { inject, injectable } from 'inversify';\nimport { getTheme, GLYPH_NUMBER_TYPE } from '../../../graphic';\nimport { IGraphicAttribute, IContext2d, IGlyph, IMarkAttribute, IRect, IThemeAttribute } from '../../../interface';\nimport { GlyphRender, IGraphicRender, RectRender } from '../../../render';\nimport { IGraphicPicker, IPickParams } from '../../picker-service';\n\n@injectable()\nexport class DefaultCanvasGlyphPicker implements IGraphicPicker {\n  type: string = 'glyph';\n  numberType: number = GLYPH_NUMBER_TYPE;\n\n  constructor(@inject(GlyphRender) public readonly canvasRenderer: IGraphicRender) {}\n\n  contains(glyph: IGlyph, point: IPoint, params?: IPickParams): boolean {\n    if (!glyph.AABBBounds.containsPoint(point)) {\n      return false;\n    }\n    if (glyph.attribute.pickMode === 'imprecise') {\n      return true;\n    }\n\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    const pickerService = params?.pickerService;\n    if (pickerService) {\n      // 遍历所有的子元素pick\n      let picked = false;\n      glyph.getSubGraphic().forEach(g => {\n        if (picked) {\n          return;\n        }\n        picked = !!pickerService.pickItem(g, point, params);\n      });\n      return picked;\n    }\n    return false;\n\n    // const { rectAttribute } = graphicService.themeService.getCurrentTheme();\n    // const glyphAttribute = getTheme(glyph).glyph;\n    // let { x = glyphAttribute.x, y = glyphAttribute.y } = glyph.attribute;\n\n    // pickContext.highPerformanceSave();\n    // if (!glyph.transMatrix.onlyTranslate()) {\n    //   // 性能较差\n    //   x = 0;\n    //   y = 0;\n    //   pickContext.transformFromMatrix(glyph.transMatrix, true);\n    // } else {\n    //   const { dx = glyphAttribute.dx, dy = glyphAttribute.dy } = glyph.attribute;\n    //   x += dx;\n    //   y += dy;\n    //   // 当前context有rotate/scale，重置matrix\n    //   pickContext.setTransformForCurrent();\n    // }\n    // // 详细形状判断\n    // let picked = false;\n    // this.canvasRenderer.drawShape(\n    //   glyph,\n    //   pickContext,\n    //   x,\n    //   y,\n    //   {\n    //     drawContribution: params.pickerService?.drawContribution\n    //   } as any,\n    //   null,\n    //   context => {\n    //     // 选中后面就不需要再走逻辑了\n    //     if (picked) {\n    //       return true;\n    //     }\n    //     picked = context.isPointInPath(point.x, point.y);\n    //     return picked;\n    //   }\n    // );\n\n    // pickContext.highPerformanceRestore();\n    // return picked; // 无圆角形状判断通过\n  }\n}\n"]}
+{"version":3,"sources":["../../src/picker/contributions/canvas-picker/glyph-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,yCAA+C;AAC/C,0DAA+D;AAE/D,4CAA0E;AAInE,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAInC,YAAiD,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAH/E,SAAI,GAAW,OAAO,CAAC;QACvB,eAAU,GAAW,6BAAiB,CAAC;IAE2C,CAAC;IAEnF,QAAQ,CAAC,KAAa,EAAE,KAAa,EAAE,MAAoB;QACzD,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;YAC1C,OAAO,KAAK,CAAC;SACd;QACD,IAAI,KAAK,CAAC,SAAS,CAAC,QAAQ,KAAK,WAAW,EAAE;YAC5C,OAAO,IAAI,CAAC;SACb;QAED,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;QACrC,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,KAAK,CAAC;SACd;QAED,MAAM,aAAa,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC;QAC5C,IAAI,aAAa,EAAE;YAEjB,IAAI,MAAM,GAAG,KAAK,CAAC;YACnB,KAAK,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBAChC,IAAI,MAAM,EAAE;oBACV,OAAO;iBACR;gBACD,MAAM,GAAG,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;YACtD,CAAC,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IA0Cf,CAAC;CACF,CAAA;AA1EY,wBAAwB;IADpC,IAAA,sBAAU,GAAE;IAKE,WAAA,IAAA,kBAAM,EAAC,oBAAW,CAAC,CAAA;;GAJrB,wBAAwB,CA0EpC;AA1EY,4DAAwB","file":"glyph-picker.js","sourcesContent":["import { IPoint } from '@visactor/vutils';\nimport { inject, injectable } from 'inversify';\nimport { GLYPH_NUMBER_TYPE } from '../../../graphic/constants';\nimport { IGraphicAttribute, IContext2d, IGlyph, IMarkAttribute, IRect, IThemeAttribute } from '../../../interface';\nimport { GlyphRender, IGraphicRender, RectRender } from '../../../render';\nimport { IGraphicPicker, IPickParams } from '../../picker-service';\n\n@injectable()\nexport class DefaultCanvasGlyphPicker implements IGraphicPicker {\n  type: string = 'glyph';\n  numberType: number = GLYPH_NUMBER_TYPE;\n\n  constructor(@inject(GlyphRender) public readonly canvasRenderer: IGraphicRender) {}\n\n  contains(glyph: IGlyph, point: IPoint, params?: IPickParams): boolean {\n    if (!glyph.AABBBounds.containsPoint(point)) {\n      return false;\n    }\n    if (glyph.attribute.pickMode === 'imprecise') {\n      return true;\n    }\n\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    const pickerService = params?.pickerService;\n    if (pickerService) {\n      // 遍历所有的子元素pick\n      let picked = false;\n      glyph.getSubGraphic().forEach(g => {\n        if (picked) {\n          return;\n        }\n        picked = !!pickerService.pickItem(g, point, params);\n      });\n      return picked;\n    }\n    return false;\n\n    // const { rectAttribute } = graphicService.themeService.getCurrentTheme();\n    // const glyphAttribute = getTheme(glyph).glyph;\n    // let { x = glyphAttribute.x, y = glyphAttribute.y } = glyph.attribute;\n\n    // pickContext.highPerformanceSave();\n    // if (!glyph.transMatrix.onlyTranslate()) {\n    //   // 性能较差\n    //   x = 0;\n    //   y = 0;\n    //   pickContext.transformFromMatrix(glyph.transMatrix, true);\n    // } else {\n    //   const { dx = glyphAttribute.dx, dy = glyphAttribute.dy } = glyph.attribute;\n    //   x += dx;\n    //   y += dy;\n    //   // 当前context有rotate/scale，重置matrix\n    //   pickContext.setTransformForCurrent();\n    // }\n    // // 详细形状判断\n    // let picked = false;\n    // this.canvasRenderer.drawShape(\n    //   glyph,\n    //   pickContext,\n    //   x,\n    //   y,\n    //   {\n    //     drawContribution: params.pickerService?.drawContribution\n    //   } as any,\n    //   null,\n    //   context => {\n    //     // 选中后面就不需要再走逻辑了\n    //     if (picked) {\n    //       return true;\n    //     }\n    //     picked = context.isPointInPath(point.x, point.y);\n    //     return picked;\n    //   }\n    // );\n\n    // pickContext.highPerformanceRestore();\n    // return picked; // 无圆角形状判断通过\n  }\n}\n"]}

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

@@ -10,11 +10,11 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasImagePicker = void 0;
 
-const inversify_1 = require("inversify"), graphic_1 = require("../../../graphic");
+const inversify_1 = require("inversify"), constants_1 = require("../../../graphic/constants");
 
 let DefaultCanvasImagePicker = class {
     constructor() {
-        this.type = "image", this.numberType = graphic_1.IMAGE_NUMBER_TYPE;
+        this.type = "image", this.numberType = constants_1.IMAGE_NUMBER_TYPE;
     }
     contains(image, point, params) {
         const {pickContext: pickContext} = null != params ? params : {};

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/picker/contributions/canvas-picker/image-picker.ts"],"names":[],"mappings":";;;;;;;;;AAAA,yCAAuC;AAEvC,8CAAqD;AAK9C,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAA9B;QACL,SAAI,GAAW,OAAO,CAAC;QACvB,eAAU,GAAW,2BAAiB,CAAC;IAqBzC,CAAC;IAnBC,QAAQ,CAAC,KAAa,EAAE,KAAa,EAAE,MAAoB;QAOzD,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;QACrC,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,KAAK,CAAC;SACd;QAED,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;YAC1C,OAAO,KAAK,CAAC;SACd;QAGD,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AAvBY,wBAAwB;IADpC,IAAA,sBAAU,GAAE;GACA,wBAAwB,CAuBpC;AAvBY,4DAAwB","file":"image-picker.js","sourcesContent":["import { injectable } from 'inversify';\nimport { IPoint } from '@visactor/vutils';\nimport { IMAGE_NUMBER_TYPE } from '../../../graphic';\nimport { IImage, IContext2d } from '../../../interface';\nimport { IGraphicPicker, IPickParams } from '../../picker-service';\n\n@injectable()\nexport class DefaultCanvasImagePicker implements IGraphicPicker {\n  type: string = 'image';\n  numberType: number = IMAGE_NUMBER_TYPE;\n\n  contains(image: IImage, point: IPoint, params?: IPickParams): boolean {\n    // const { imageAttribute } = graphicService.themeService.getCurrentTheme();\n    // const {\n    //   x = imageAttribute.x,\n    //   y = imageAttribute.y,\n    // } = image.attribute;\n\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    if (!image.AABBBounds.containsPoint(point)) {\n      return false;\n    }\n\n    // TODO: 详细形状判断\n    return true;\n  }\n}\n"]}
+{"version":3,"sources":["../../src/picker/contributions/canvas-picker/image-picker.ts"],"names":[],"mappings":";;;;;;;;;AAAA,yCAAuC;AAEvC,0DAA+D;AAKxD,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAA9B;QACL,SAAI,GAAW,OAAO,CAAC;QACvB,eAAU,GAAW,6BAAiB,CAAC;IAqBzC,CAAC;IAnBC,QAAQ,CAAC,KAAa,EAAE,KAAa,EAAE,MAAoB;QAOzD,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;QACrC,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,KAAK,CAAC;SACd;QAED,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;YAC1C,OAAO,KAAK,CAAC;SACd;QAGD,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AAvBY,wBAAwB;IADpC,IAAA,sBAAU,GAAE;GACA,wBAAwB,CAuBpC;AAvBY,4DAAwB","file":"image-picker.js","sourcesContent":["import { injectable } from 'inversify';\nimport { IPoint } from '@visactor/vutils';\nimport { IMAGE_NUMBER_TYPE } from '../../../graphic/constants';\nimport { IImage, IContext2d } from '../../../interface';\nimport { IGraphicPicker, IPickParams } from '../../picker-service';\n\n@injectable()\nexport class DefaultCanvasImagePicker implements IGraphicPicker {\n  type: string = 'image';\n  numberType: number = IMAGE_NUMBER_TYPE;\n\n  contains(image: IImage, point: IPoint, params?: IPickParams): boolean {\n    // const { imageAttribute } = graphicService.themeService.getCurrentTheme();\n    // const {\n    //   x = imageAttribute.x,\n    //   y = imageAttribute.y,\n    // } = image.attribute;\n\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    if (!image.AABBBounds.containsPoint(point)) {\n      return false;\n    }\n\n    // TODO: 详细形状判断\n    return true;\n  }\n}\n"]}

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

@@ -16,11 +16,11 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasLinePicker = void 0;
 
-const inversify_1 = require("inversify"), render_1 = require("../../../render"), graphic_1 = require("../../../graphic"), modules_1 = require("../../../modules"), common_1 = require("../../../common"), base_picker_1 = require("./base-picker");
+const inversify_1 = require("inversify"), render_1 = require("../../../render"), theme_1 = require("../../../graphic/theme"), matrix_allocate_1 = require("../../../allocator/matrix-allocate"), canvas_utils_1 = require("../../../common/canvas-utils"), base_picker_1 = require("./base-picker"), constants_1 = require("../../../graphic/constants");
 
 let DefaultCanvasLinePicker = class extends base_picker_1.BasePicker {
     constructor(canvasRenderer) {
-        super(), this.canvasRenderer = canvasRenderer, this.type = "line", this.numberType = graphic_1.LINE_NUMBER_TYPE;
+        super(), this.canvasRenderer = canvasRenderer, this.type = "line", this.numberType = constants_1.LINE_NUMBER_TYPE;
     }
     contains(line, point, params) {
         if (!line.AABBBounds.containsPoint(point)) return !1;
@@ -28,7 +28,7 @@ let DefaultCanvasLinePicker = class extends base_picker_1.BasePicker {
         const {pickContext: pickContext} = null != params ? params : {};
         if (!pickContext) return !1;
         pickContext.highPerformanceSave();
-        const lineAttribute = (0, graphic_1.getTheme)(line).line, data = this.transform(line, lineAttribute, pickContext), {x: x, y: y, z: z, lastModelMatrix: lastModelMatrix} = data;
+        const lineAttribute = (0, theme_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();
@@ -42,9 +42,9 @@ let DefaultCanvasLinePicker = class extends base_picker_1.BasePicker {
         picked)), ((context, circleAttribute, themeAttribute) => {
             if (picked) return !0;
             const lineWidth = circleAttribute.lineWidth || themeAttribute.lineWidth;
-            return pickContext.lineWidth = (0, common_1.getScaledStroke)(pickContext, lineWidth, pickContext.dpr), 
+            return pickContext.lineWidth = (0, canvas_utils_1.getScaledStroke)(pickContext, lineWidth, pickContext.dpr), 
             picked = context.isPointInStroke(pickPoint.x, pickPoint.y), picked;
-        })), this.canvasRenderer.z = 0, pickContext.modelMatrix !== lastModelMatrix && modules_1.mat4Allocate.free(pickContext.modelMatrix), 
+        })), this.canvasRenderer.z = 0, pickContext.modelMatrix !== lastModelMatrix && matrix_allocate_1.mat4Allocate.free(pickContext.modelMatrix), 
         pickContext.modelMatrix = lastModelMatrix, pickContext.highPerformanceRestore(), 
         picked;
     }

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 { inject, injectable } from 'inversify';\nimport { IPoint } from '@visactor/vutils';\nimport { ILine, IContext2d, IMarkAttribute, IGraphicAttribute, IThemeAttribute } from '../../../interface';\nimport { IGraphicPicker, IPickParams } from '../../picker-service';\nimport { IGraphicRender, LineRender } from '../../../render';\nimport { getTheme, LINE_NUMBER_TYPE } from '../../../graphic';\nimport { graphicService, mat4Allocate } from '../../../modules';\nimport { getScaledStroke } from '../../../common';\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 { inject, injectable } from 'inversify';\nimport { IPoint } from '@visactor/vutils';\nimport { ILine, IContext2d, IMarkAttribute, IGraphicAttribute, IThemeAttribute } from '../../../interface';\nimport { IGraphicPicker, IPickParams } from '../../picker-service';\nimport { IGraphicRender, LineRender } from '../../../render';\nimport { getTheme } from '../../../graphic/theme';\nimport { mat4Allocate } from '../../../allocator/matrix-allocate';\nimport { getScaledStroke } from '../../../common/canvas-utils';\nimport { BasePicker } from './base-picker';\nimport { LINE_NUMBER_TYPE } from '../../../graphic/constants';\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"]}

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

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

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/picker/contributions/canvas-picker/module.ts"],"names":[],"mappings":";;AAAA,yCAA4C;AAC5C,mDAA4D;AAC5D,+CAAwD;AACxD,6CAAsD;AACtD,+CAAwD;AACxD,iDAA0D;AAC1D,+CAAwD;AACxD,+CAAwD;AACxD,mDAA4D;AAC5D,+CAAwD;AACxD,4CAiBsB;AACtB,4CAA2D;AAC3D,qDAA8D;AAC9D,uDAAgE;AAChE,iDAA0D;AAC1D,mDAA4D;AAC5D,yDAAkE;AAClE,iDAA0D;AAE1D,kBAAe,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IAEnE,IAAI,CAAC,yCAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC5D,IAAI,CAAC,8BAAkB,CAAC,CAAC,SAAS,CAAC,yCAAyB,CAAC,CAAC;IAC9D,IAAI,CAAC,oCAAwB,CAAC,CAAC,SAAS,CAAC,8BAAkB,CAAC,CAAC;IAG7D,IAAI,CAAC,qCAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1D,IAAI,CAAC,4BAAgB,CAAC,CAAC,SAAS,CAAC,qCAAuB,CAAC,CAAC;IAC1D,IAAI,CAAC,oCAAwB,CAAC,CAAC,SAAS,CAAC,4BAAgB,CAAC,CAAC;IAG3D,IAAI,CAAC,yCAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC5D,IAAI,CAAC,8BAAkB,CAAC,CAAC,SAAS,CAAC,yCAAyB,CAAC,CAAC;IAC9D,IAAI,CAAC,oCAAwB,CAAC,CAAC,SAAS,CAAC,8BAAkB,CAAC,CAAC;IAG7D,IAAI,CAAC,mCAAsB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACzD,IAAI,CAAC,2BAAe,CAAC,CAAC,SAAS,CAAC,mCAAsB,CAAC,CAAC;IACxD,IAAI,CAAC,oCAAwB,CAAC,CAAC,SAAS,CAAC,2BAAe,CAAC,CAAC;IAG1D,IAAI,CAAC,qCAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1D,IAAI,CAAC,4BAAgB,CAAC,CAAC,SAAS,CAAC,qCAAuB,CAAC,CAAC;IAC1D,IAAI,CAAC,oCAAwB,CAAC,CAAC,SAAS,CAAC,4BAAgB,CAAC,CAAC;IAG3D,IAAI,CAAC,uCAAwB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC3D,IAAI,CAAC,6BAAiB,CAAC,CAAC,SAAS,CAAC,uCAAwB,CAAC,CAAC;IAC5D,IAAI,CAAC,oCAAwB,CAAC,CAAC,SAAS,CAAC,6BAAiB,CAAC,CAAC;IAG5D,IAAI,CAAC,qCAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1D,IAAI,CAAC,4BAAgB,CAAC,CAAC,SAAS,CAAC,qCAAuB,CAAC,CAAC;IAC1D,IAAI,CAAC,oCAAwB,CAAC,CAAC,SAAS,CAAC,4BAAgB,CAAC,CAAC;IAG3D,IAAI,CAAC,qCAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1D,IAAI,CAAC,4BAAgB,CAAC,CAAC,SAAS,CAAC,qCAAuB,CAAC,CAAC;IAC1D,IAAI,CAAC,oCAAwB,CAAC,CAAC,SAAS,CAAC,4BAAgB,CAAC,CAAC;IAG3D,IAAI,CAAC,yCAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC5D,IAAI,CAAC,8BAAkB,CAAC,CAAC,SAAS,CAAC,yCAAyB,CAAC,CAAC;IAC9D,IAAI,CAAC,oCAAwB,CAAC,CAAC,SAAS,CAAC,8BAAkB,CAAC,CAAC;IAG7D,IAAI,CAAC,qCAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1D,IAAI,CAAC,4BAAgB,CAAC,CAAC,SAAS,CAAC,qCAAuB,CAAC,CAAC;IAC1D,IAAI,CAAC,oCAAwB,CAAC,CAAC,SAAS,CAAC,4BAAgB,CAAC,CAAC;IAG3D,IAAI,CAAC,2CAA0B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC7D,IAAI,CAAC,+BAAmB,CAAC,CAAC,SAAS,CAAC,2CAA0B,CAAC,CAAC;IAChE,IAAI,CAAC,oCAAwB,CAAC,CAAC,SAAS,CAAC,+BAAmB,CAAC,CAAC;IAG9D,IAAI,CAAC,+CAA4B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC/D,IAAI,CAAC,iCAAqB,CAAC,CAAC,SAAS,CAAC,+CAA4B,CAAC,CAAC;IACpE,IAAI,CAAC,oCAAwB,CAAC,CAAC,SAAS,CAAC,iCAAqB,CAAC,CAAC;IAGhE,IAAI,CAAC,uCAAwB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC3D,IAAI,CAAC,6BAAiB,CAAC,CAAC,SAAS,CAAC,uCAAwB,CAAC,CAAC;IAC5D,IAAI,CAAC,oCAAwB,CAAC,CAAC,SAAS,CAAC,6BAAiB,CAAC,CAAC;IAG5D,IAAI,CAAC,6CAA2B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC9D,IAAI,CAAC,gCAAoB,CAAC,CAAC,SAAS,CAAC,6CAA2B,CAAC,CAAC;IAClE,IAAI,CAAC,oCAAwB,CAAC,CAAC,SAAS,CAAC,gCAAoB,CAAC,CAAC;IAE/D,IAAI,CAAC,uCAAwB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC3D,IAAI,CAAC,6BAAiB,CAAC,CAAC,SAAS,CAAC,uCAAwB,CAAC,CAAC;IAC5D,IAAI,CAAC,oCAAwB,CAAC,CAAC,SAAS,CAAC,6BAAiB,CAAC,CAAC;IAE5D,IAAA,iCAAwB,EAAC,IAAI,EAAE,oCAAwB,CAAC,CAAC;AAC3D,CAAC,CAAC,CAAC","file":"module.js","sourcesContent":["import { ContainerModule } from 'inversify';\nimport { DefaultCanvasCirclePicker } from './circle-picker';\nimport { DefaultCanvasRectPicker } from './rect-picker';\nimport { DefaultCanvasArcPicker } from './arc-picker';\nimport { DefaultCanvasAreaPicker } from './area-picker';\nimport { DefaultCanvasImagePicker } from './image-picker';\nimport { DefaultCanvasLinePicker } from './line-picker';\nimport { DefaultCanvasPathPicker } from './path-picker';\nimport { DefaultCanvasSymbolPicker } from './symbol-picker';\nimport { DefaultCanvasTextPicker } from './text-picker';\nimport {\n  CanvasArc3dPicker,\n  CanvasArcPicker,\n  CanvasAreaPicker,\n  CanvasCirclePicker,\n  CanvasGlyphPicker,\n  CanvasImagePicker,\n  CanvasLinePicker,\n  CanvasPathPicker,\n  CanvasPickerContribution,\n  CanvasPolygonPicker,\n  CanvasPyramid3dPicker,\n  CanvasRect3dPicker,\n  CanvasRectPicker,\n  CanvasRichTextPicker,\n  CanvasSymbolPicker,\n  CanvasTextPicker\n} from '../constants';\nimport { bindContributionProvider } from '../../../common';\nimport { DefaultCanvasPolygonPicker } from './polygon-picker';\nimport { DefaultCanvasRichTextPicker } from './richtext-picker';\nimport { DefaultCanvasGlyphPicker } from './glyph-picker';\nimport { DefaultCanvasRect3dPicker } from './rect3d-picker';\nimport { DefaultCanvasPyramid3dPicker } from './pyramid3d-picker';\nimport { DefaultCanvasArc3dPicker } from './arc3d-picker';\n\nexport default new ContainerModule((bind, unbind, isBound, rebind) => {\n  // circle picker\n  bind(DefaultCanvasCirclePicker).toSelf().inSingletonScope();\n  bind(CanvasCirclePicker).toService(DefaultCanvasCirclePicker);\n  bind(CanvasPickerContribution).toService(CanvasCirclePicker);\n\n  // reat picker\n  bind(DefaultCanvasRectPicker).toSelf().inSingletonScope();\n  bind(CanvasRectPicker).toService(DefaultCanvasRectPicker);\n  bind(CanvasPickerContribution).toService(CanvasRectPicker);\n\n  // reat3d picker\n  bind(DefaultCanvasRect3dPicker).toSelf().inSingletonScope();\n  bind(CanvasRect3dPicker).toService(DefaultCanvasRect3dPicker);\n  bind(CanvasPickerContribution).toService(CanvasRect3dPicker);\n\n  // arc picker\n  bind(DefaultCanvasArcPicker).toSelf().inSingletonScope();\n  bind(CanvasArcPicker).toService(DefaultCanvasArcPicker);\n  bind(CanvasPickerContribution).toService(CanvasArcPicker);\n\n  // area picker\n  bind(DefaultCanvasAreaPicker).toSelf().inSingletonScope();\n  bind(CanvasAreaPicker).toService(DefaultCanvasAreaPicker);\n  bind(CanvasPickerContribution).toService(CanvasAreaPicker);\n\n  // image picker\n  bind(DefaultCanvasImagePicker).toSelf().inSingletonScope();\n  bind(CanvasImagePicker).toService(DefaultCanvasImagePicker);\n  bind(CanvasPickerContribution).toService(CanvasImagePicker);\n\n  // line picker\n  bind(DefaultCanvasLinePicker).toSelf().inSingletonScope();\n  bind(CanvasLinePicker).toService(DefaultCanvasLinePicker);\n  bind(CanvasPickerContribution).toService(CanvasLinePicker);\n\n  // path picker\n  bind(DefaultCanvasPathPicker).toSelf().inSingletonScope();\n  bind(CanvasPathPicker).toService(DefaultCanvasPathPicker);\n  bind(CanvasPickerContribution).toService(CanvasPathPicker);\n\n  // symbol picker\n  bind(DefaultCanvasSymbolPicker).toSelf().inSingletonScope();\n  bind(CanvasSymbolPicker).toService(DefaultCanvasSymbolPicker);\n  bind(CanvasPickerContribution).toService(CanvasSymbolPicker);\n\n  // text picker\n  bind(DefaultCanvasTextPicker).toSelf().inSingletonScope();\n  bind(CanvasTextPicker).toService(DefaultCanvasTextPicker);\n  bind(CanvasPickerContribution).toService(CanvasTextPicker);\n\n  // polygon picker\n  bind(DefaultCanvasPolygonPicker).toSelf().inSingletonScope();\n  bind(CanvasPolygonPicker).toService(DefaultCanvasPolygonPicker);\n  bind(CanvasPickerContribution).toService(CanvasPolygonPicker);\n\n  // pyramid3d picker\n  bind(DefaultCanvasPyramid3dPicker).toSelf().inSingletonScope();\n  bind(CanvasPyramid3dPicker).toService(DefaultCanvasPyramid3dPicker);\n  bind(CanvasPickerContribution).toService(CanvasPyramid3dPicker);\n\n  // arc3d picker\n  bind(DefaultCanvasArc3dPicker).toSelf().inSingletonScope();\n  bind(CanvasArc3dPicker).toService(DefaultCanvasArc3dPicker);\n  bind(CanvasPickerContribution).toService(CanvasArc3dPicker);\n\n  // richtext picker\n  bind(DefaultCanvasRichTextPicker).toSelf().inSingletonScope();\n  bind(CanvasRichTextPicker).toService(DefaultCanvasRichTextPicker);\n  bind(CanvasPickerContribution).toService(CanvasRichTextPicker);\n  // glyph picker\n  bind(DefaultCanvasGlyphPicker).toSelf().inSingletonScope();\n  bind(CanvasGlyphPicker).toService(DefaultCanvasGlyphPicker);\n  bind(CanvasPickerContribution).toService(CanvasGlyphPicker);\n\n  bindContributionProvider(bind, CanvasPickerContribution);\n});\n"]}
+{"version":3,"sources":["../../src/picker/contributions/canvas-picker/module.ts"],"names":[],"mappings":"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","file":"module.js","sourcesContent":["import { ContainerModule } from 'inversify';\nimport { DefaultCanvasCirclePicker } from './circle-picker';\nimport { DefaultCanvasRectPicker } from './rect-picker';\nimport { DefaultCanvasArcPicker } from './arc-picker';\nimport { DefaultCanvasAreaPicker } from './area-picker';\nimport { DefaultCanvasImagePicker } from './image-picker';\nimport { DefaultCanvasLinePicker } from './line-picker';\nimport { DefaultCanvasPathPicker } from './path-picker';\nimport { DefaultCanvasSymbolPicker } from './symbol-picker';\nimport { DefaultCanvasTextPicker } from './text-picker';\nimport {\n  CanvasArc3dPicker,\n  CanvasArcPicker,\n  CanvasAreaPicker,\n  CanvasCirclePicker,\n  CanvasGlyphPicker,\n  CanvasImagePicker,\n  CanvasLinePicker,\n  CanvasPathPicker,\n  CanvasPickerContribution,\n  CanvasPolygonPicker,\n  CanvasPyramid3dPicker,\n  CanvasRect3dPicker,\n  CanvasRectPicker,\n  CanvasRichTextPicker,\n  CanvasSymbolPicker,\n  CanvasTextPicker\n} from '../constants';\nimport { bindContributionProvider } from '../../../common/contribution-provider';\nimport { DefaultCanvasPolygonPicker } from './polygon-picker';\nimport { DefaultCanvasRichTextPicker } from './richtext-picker';\nimport { DefaultCanvasGlyphPicker } from './glyph-picker';\nimport { DefaultCanvasRect3dPicker } from './rect3d-picker';\nimport { DefaultCanvasPyramid3dPicker } from './pyramid3d-picker';\nimport { DefaultCanvasArc3dPicker } from './arc3d-picker';\n\nexport default new ContainerModule((bind, unbind, isBound, rebind) => {\n  // circle picker\n  bind(DefaultCanvasCirclePicker).toSelf().inSingletonScope();\n  bind(CanvasCirclePicker).toService(DefaultCanvasCirclePicker);\n  bind(CanvasPickerContribution).toService(CanvasCirclePicker);\n\n  // reat picker\n  bind(DefaultCanvasRectPicker).toSelf().inSingletonScope();\n  bind(CanvasRectPicker).toService(DefaultCanvasRectPicker);\n  bind(CanvasPickerContribution).toService(CanvasRectPicker);\n\n  // reat3d picker\n  bind(DefaultCanvasRect3dPicker).toSelf().inSingletonScope();\n  bind(CanvasRect3dPicker).toService(DefaultCanvasRect3dPicker);\n  bind(CanvasPickerContribution).toService(CanvasRect3dPicker);\n\n  // arc picker\n  bind(DefaultCanvasArcPicker).toSelf().inSingletonScope();\n  bind(CanvasArcPicker).toService(DefaultCanvasArcPicker);\n  bind(CanvasPickerContribution).toService(CanvasArcPicker);\n\n  // area picker\n  bind(DefaultCanvasAreaPicker).toSelf().inSingletonScope();\n  bind(CanvasAreaPicker).toService(DefaultCanvasAreaPicker);\n  bind(CanvasPickerContribution).toService(CanvasAreaPicker);\n\n  // image picker\n  bind(DefaultCanvasImagePicker).toSelf().inSingletonScope();\n  bind(CanvasImagePicker).toService(DefaultCanvasImagePicker);\n  bind(CanvasPickerContribution).toService(CanvasImagePicker);\n\n  // line picker\n  bind(DefaultCanvasLinePicker).toSelf().inSingletonScope();\n  bind(CanvasLinePicker).toService(DefaultCanvasLinePicker);\n  bind(CanvasPickerContribution).toService(CanvasLinePicker);\n\n  // path picker\n  bind(DefaultCanvasPathPicker).toSelf().inSingletonScope();\n  bind(CanvasPathPicker).toService(DefaultCanvasPathPicker);\n  bind(CanvasPickerContribution).toService(CanvasPathPicker);\n\n  // symbol picker\n  bind(DefaultCanvasSymbolPicker).toSelf().inSingletonScope();\n  bind(CanvasSymbolPicker).toService(DefaultCanvasSymbolPicker);\n  bind(CanvasPickerContribution).toService(CanvasSymbolPicker);\n\n  // text picker\n  bind(DefaultCanvasTextPicker).toSelf().inSingletonScope();\n  bind(CanvasTextPicker).toService(DefaultCanvasTextPicker);\n  bind(CanvasPickerContribution).toService(CanvasTextPicker);\n\n  // polygon picker\n  bind(DefaultCanvasPolygonPicker).toSelf().inSingletonScope();\n  bind(CanvasPolygonPicker).toService(DefaultCanvasPolygonPicker);\n  bind(CanvasPickerContribution).toService(CanvasPolygonPicker);\n\n  // pyramid3d picker\n  bind(DefaultCanvasPyramid3dPicker).toSelf().inSingletonScope();\n  bind(CanvasPyramid3dPicker).toService(DefaultCanvasPyramid3dPicker);\n  bind(CanvasPickerContribution).toService(CanvasPyramid3dPicker);\n\n  // arc3d picker\n  bind(DefaultCanvasArc3dPicker).toSelf().inSingletonScope();\n  bind(CanvasArc3dPicker).toService(DefaultCanvasArc3dPicker);\n  bind(CanvasPickerContribution).toService(CanvasArc3dPicker);\n\n  // richtext picker\n  bind(DefaultCanvasRichTextPicker).toSelf().inSingletonScope();\n  bind(CanvasRichTextPicker).toService(DefaultCanvasRichTextPicker);\n  bind(CanvasPickerContribution).toService(CanvasRichTextPicker);\n  // glyph picker\n  bind(DefaultCanvasGlyphPicker).toSelf().inSingletonScope();\n  bind(CanvasGlyphPicker).toService(DefaultCanvasGlyphPicker);\n  bind(CanvasPickerContribution).toService(CanvasGlyphPicker);\n\n  bindContributionProvider(bind, CanvasPickerContribution);\n});\n"]}

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

@@ -16,18 +16,18 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasPathPicker = void 0;
 
-const inversify_1 = require("inversify"), graphic_1 = require("../../../graphic"), render_1 = require("../../../render"), modules_1 = require("../../../modules"), common_1 = require("../../../common"), base_picker_1 = require("./base-picker");
+const inversify_1 = require("inversify"), theme_1 = require("../../../graphic/theme"), render_1 = require("../../../render"), matrix_allocate_1 = require("../../../allocator/matrix-allocate"), canvas_utils_1 = require("../../../common/canvas-utils"), base_picker_1 = require("./base-picker"), constants_1 = require("../../../graphic/constants");
 
 let DefaultCanvasPathPicker = class extends base_picker_1.BasePicker {
     constructor(canvasRenderer) {
-        super(), this.canvasRenderer = canvasRenderer, this.type = "path", this.numberType = graphic_1.PATH_NUMBER_TYPE;
+        super(), this.canvasRenderer = canvasRenderer, this.type = "path", this.numberType = constants_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, graphic_1.getTheme)(path).path, data = this.transform(path, pathAttribute, pickContext), {x: x, y: y, z: z, lastModelMatrix: lastModelMatrix} = data;
+        const pathAttribute = (0, theme_1.getTheme)(path).path, data = this.transform(path, pathAttribute, pickContext), {x: x, y: y, z: z, lastModelMatrix: lastModelMatrix} = data;
         let pickPoint = point;
         if (pickContext.camera) {
             pickPoint = point.clone();
@@ -41,9 +41,9 @@ let DefaultCanvasPathPicker = class extends base_picker_1.BasePicker {
         picked)), ((context, pathAttribute, themeAttribute) => {
             if (picked) return !0;
             const lineWidth = pathAttribute.lineWidth || themeAttribute.lineWidth;
-            return pickContext.lineWidth = (0, common_1.getScaledStroke)(pickContext, lineWidth, pickContext.dpr), 
+            return pickContext.lineWidth = (0, canvas_utils_1.getScaledStroke)(pickContext, lineWidth, pickContext.dpr), 
             picked = context.isPointInStroke(pickPoint.x, pickPoint.y), picked;
-        })), this.canvasRenderer.z = 0, pickContext.modelMatrix !== lastModelMatrix && modules_1.mat4Allocate.free(pickContext.modelMatrix), 
+        })), this.canvasRenderer.z = 0, pickContext.modelMatrix !== lastModelMatrix && matrix_allocate_1.mat4Allocate.free(pickContext.modelMatrix), 
         pickContext.modelMatrix = lastModelMatrix, pickContext.highPerformanceRestore(), 
         picked;
     }

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 { inject, injectable } from 'inversify';\nimport { IPoint } from '@visactor/vutils';\nimport { getTheme, PATH_NUMBER_TYPE } from '../../../graphic';\nimport { IContext2d, IPath, IMarkAttribute, IGraphicAttribute, IThemeAttribute } from '../../../interface';\nimport { IGraphicPicker, IPickParams } from '../../picker-service';\nimport { IGraphicRender, PathRender } from '../../../render';\nimport { graphicService, mat4Allocate } from '../../../modules';\nimport { getScaledStroke } from '../../../common';\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    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 { inject, injectable } from 'inversify';\nimport { IPoint } from '@visactor/vutils';\nimport { getTheme } from '../../../graphic/theme';\nimport { IContext2d, IPath, IMarkAttribute, IGraphicAttribute, IThemeAttribute } from '../../../interface';\nimport { IGraphicPicker, IPickParams } from '../../picker-service';\nimport { IGraphicRender, PathRender } from '../../../render';\nimport { mat4Allocate } from '../../../allocator/matrix-allocate';\nimport { getScaledStroke } from '../../../common/canvas-utils';\nimport { BasePicker } from './base-picker';\nimport { PATH_NUMBER_TYPE } from '../../../graphic/constants';\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    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"]}

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

@@ -16,17 +16,17 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasPolygonPicker = void 0;
 
-const inversify_1 = require("inversify"), graphic_1 = require("../../../graphic"), render_1 = require("../../../render");
+const inversify_1 = require("inversify"), theme_1 = require("../../../graphic/theme"), render_1 = require("../../../render"), constants_1 = require("../../../graphic/constants");
 
 let DefaultCanvasPolygonPicker = class {
     constructor(canvasRenderer) {
-        this.canvasRenderer = canvasRenderer, this.type = "polygon", this.numberType = graphic_1.POLYGON_NUMBER_TYPE;
+        this.canvasRenderer = canvasRenderer, this.type = "polygon", this.numberType = constants_1.POLYGON_NUMBER_TYPE;
     }
     contains(polygon, point, params) {
         if (!polygon.AABBBounds.contains(point.x, point.y)) return !1;
         const {pickContext: pickContext} = null != params ? params : {};
         if (!pickContext) return !1;
-        const polygonAttribute = (0, graphic_1.getTheme)(polygon).polygon;
+        const polygonAttribute = (0, theme_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);

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,yCAA+C;AAE/C,8CAAiE;AAGjE,4CAAgE;AAIzD,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IAIrC,YAAmD,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAHjF,SAAI,GAAW,SAAS,CAAC;QACzB,eAAU,GAAW,6BAAmB,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,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,kBAAQ,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;AA3EY,0BAA0B;IADtC,IAAA,sBAAU,GAAE;IAKE,WAAA,IAAA,kBAAM,EAAC,sBAAa,CAAC,CAAA;;GAJvB,0BAA0B,CA2EtC;AA3EY,gEAA0B","file":"polygon-picker.js","sourcesContent":["import { inject, injectable } from 'inversify';\nimport { IPoint } from '@visactor/vutils';\nimport { getTheme, POLYGON_NUMBER_TYPE } from '../../../graphic';\nimport { IContext2d, IMarkAttribute, IGraphicAttribute, IThemeAttribute, IPolygon } from '../../../interface';\nimport { IGraphicPicker, IPickParams } from '../../picker-service';\nimport { IGraphicRender, PolygonRender } from '../../../render';\nimport { graphicService } from '../../../modules';\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    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":";;;;;;;;;;;;;;;AAAA,yCAA+C;AAE/C,kDAAkD;AAGlD,4CAAgE;AAChE,0DAAiE;AAG1D,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IAIrC,YAAmD,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAHjF,SAAI,GAAW,SAAS,CAAC;QACzB,eAAU,GAAW,+BAAmB,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,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,gBAAQ,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;AA3EY,0BAA0B;IADtC,IAAA,sBAAU,GAAE;IAKE,WAAA,IAAA,kBAAM,EAAC,sBAAa,CAAC,CAAA;;GAJvB,0BAA0B,CA2EtC;AA3EY,gEAA0B","file":"polygon-picker.js","sourcesContent":["import { inject, injectable } from 'inversify';\nimport { IPoint } from '@visactor/vutils';\nimport { getTheme } from '../../../graphic/theme';\nimport { IContext2d, IMarkAttribute, IGraphicAttribute, IThemeAttribute, IPolygon } from '../../../interface';\nimport { IGraphicPicker, IPickParams } from '../../picker-service';\nimport { IGraphicRender, PolygonRender } from '../../../render';\nimport { POLYGON_NUMBER_TYPE } from '../../../graphic/constants';\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    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"]}

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

@@ -16,16 +16,16 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasPyramid3dPicker = void 0;
 
-const vutils_1 = require("@visactor/vutils"), inversify_1 = require("inversify"), graphic_1 = require("../../../graphic"), render_1 = require("../../../render"), modules_1 = require("../../../modules"), base_picker_1 = require("./base-picker"), _bounds = new vutils_1.AABBBounds;
+const vutils_1 = require("@visactor/vutils"), inversify_1 = require("inversify"), theme_1 = require("../../../graphic/theme"), render_1 = require("../../../render"), matrix_allocate_1 = require("../../../allocator/matrix-allocate"), base_picker_1 = require("./base-picker"), constants_1 = require("../../../graphic/constants"), _bounds = new vutils_1.AABBBounds;
 
 let DefaultCanvasPyramid3dPicker = class extends base_picker_1.BasePicker {
     constructor(canvasRenderer) {
-        super(), this.canvasRenderer = canvasRenderer, this.type = "pyramid3d", this.numberType = graphic_1.PYRAMID3D_NUMBER_TYPE;
+        super(), this.canvasRenderer = canvasRenderer, this.type = "pyramid3d", this.numberType = constants_1.PYRAMID3D_NUMBER_TYPE;
     }
     contains(pyramid3d, point, params) {
         const {pickContext: pickContext} = null != params ? params : {};
         if (!pickContext) return !1;
-        const pyramid3dAttribute = (0, graphic_1.getTheme)(pyramid3d).polygon;
+        const pyramid3dAttribute = (0, theme_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;
@@ -39,7 +39,7 @@ let DefaultCanvasPyramid3dPicker = class extends base_picker_1.BasePicker {
         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 && modules_1.mat4Allocate.free(pickContext.modelMatrix), 
+        pickContext.modelMatrix !== lastModelMatrix && matrix_allocate_1.mat4Allocate.free(pickContext.modelMatrix), 
         pickContext.modelMatrix = lastModelMatrix, pickContext.highPerformanceRestore(), 
         picked;
     }

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/picker/contributions/canvas-picker/pyramid3d-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAsD;AAEtD,yCAA+C;AAC/C,8CAM0B;AAE1B,4CAAkE;AAElE,8CAAgD;AAChD,+CAA2C;AAE3C,MAAM,OAAO,GAAG,IAAI,mBAAU,EAAE,CAAC;AAG1B,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,+BAAqB,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,kBAAQ,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,sBAAY,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,sBAAU,GAAE;IAKE,WAAA,IAAA,kBAAM,EAAC,wBAAe,CAAC,CAAA;;GAJzB,4BAA4B,CA0ExC;AA1EY,oEAA4B","file":"pyramid3d-picker.js","sourcesContent":["import { IPoint, AABBBounds } from '@visactor/vutils';\nimport { getScaledStroke } from '../../../common';\nimport { inject, injectable } from 'inversify';\nimport {\n  getExtraModelMatrix,\n  getTheme,\n  multiplyMat4Mat3,\n  multiplyMat4Mat4,\n  PYRAMID3D_NUMBER_TYPE\n} from '../../../graphic';\nimport { IGraphicAttribute, IContext2d, IMarkAttribute, IPyramid3d, IThemeAttribute } from '../../../interface';\nimport { IGraphicRender, Pyramid3dRender } from '../../../render';\nimport { IGraphicPicker, IPickParams } from '../../picker-service';\nimport { mat4Allocate } from '../../../modules';\nimport { BasePicker } from './base-picker';\n\nconst _bounds = new AABBBounds();\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"]}
+{"version":3,"sources":["../../src/picker/contributions/canvas-picker/pyramid3d-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAsD;AACtD,yCAA+C;AAC/C,kDAAkD;AAElD,4CAAkE;AAElE,wEAAkE;AAClE,+CAA2C;AAC3C,0DAAmE;AAEnE,MAAM,OAAO,GAAG,IAAI,mBAAU,EAAE,CAAC;AAG1B,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,iCAAqB,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,gBAAQ,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,8BAAY,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,sBAAU,GAAE;IAKE,WAAA,IAAA,kBAAM,EAAC,wBAAe,CAAC,CAAA;;GAJzB,4BAA4B,CA0ExC;AA1EY,oEAA4B","file":"pyramid3d-picker.js","sourcesContent":["import { IPoint, AABBBounds } from '@visactor/vutils';\nimport { inject, injectable } from 'inversify';\nimport { getTheme } from '../../../graphic/theme';\nimport { IGraphicAttribute, IContext2d, IMarkAttribute, IPyramid3d, IThemeAttribute } from '../../../interface';\nimport { IGraphicRender, Pyramid3dRender } from '../../../render';\nimport { IGraphicPicker, IPickParams } from '../../picker-service';\nimport { mat4Allocate } from '../../../allocator/matrix-allocate';\nimport { BasePicker } from './base-picker';\nimport { PYRAMID3D_NUMBER_TYPE } from '../../../graphic/constants';\n\nconst _bounds = new AABBBounds();\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"]}

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

@@ -16,11 +16,11 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasRectPicker = void 0;
 
-const vutils_1 = require("@visactor/vutils"), common_1 = require("../../../common"), inversify_1 = require("inversify"), graphic_1 = require("../../../graphic"), render_1 = require("../../../render"), _bounds = new vutils_1.AABBBounds;
+const vutils_1 = require("@visactor/vutils"), canvas_utils_1 = require("../../../common/canvas-utils"), inversify_1 = require("inversify"), graphic_1 = require("../../../graphic"), render_1 = require("../../../render"), constants_1 = require("../../../graphic/constants"), _bounds = new vutils_1.AABBBounds;
 
 let DefaultCanvasRectPicker = class {
     constructor(canvasRenderer) {
-        this.canvasRenderer = canvasRenderer, this.type = "rect", this.numberType = graphic_1.RECT_NUMBER_TYPE;
+        this.canvasRenderer = canvasRenderer, this.type = "rect", this.numberType = constants_1.RECT_NUMBER_TYPE;
     }
     contains(rect, point, params) {
         if (!rect.AABBBounds.containsPoint(point)) return !1;
@@ -42,10 +42,10 @@ let DefaultCanvasRectPicker = class {
         picked)), ((context, rectAttribute, themeAttribute) => {
             if (picked) return !0;
             const lineWidth = rectAttribute.lineWidth || themeAttribute.lineWidth;
-            return pickContext.lineWidth = (0, common_1.getScaledStroke)(pickContext, lineWidth, pickContext.dpr), 
+            return pickContext.lineWidth = (0, canvas_utils_1.getScaledStroke)(pickContext, lineWidth, pickContext.dpr), 
             picked = context.isPointInStroke(point.x, point.y), picked;
         })); else if (picked) {
-            const {fill: fill = !!rect.attribute.fillColor, stroke: stroke = !!rect.attribute.strokeColor, lineWidth: lineWidth = rectAttribute.lineWidth} = rect.attribute;
+            const {fill: fill = rectAttribute.fill, stroke: stroke = rectAttribute.stroke, lineWidth: lineWidth = rectAttribute.lineWidth} = rect.attribute;
             if (fill) picked = !0; else if (stroke) {
                 const bounds = rect.AABBBounds;
                 _bounds.setValue(bounds.x1, bounds.y1, bounds.x2, bounds.y2), _bounds.expand(-lineWidth / 2), 

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/picker/contributions/canvas-picker/rect-picker.ts"],"names":[],"mappings":"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","file":"rect-picker.js","sourcesContent":["import { isArray, isNumber, IPoint, AABBBounds } from '@visactor/vutils';\nimport { getScaledStroke } from '../../../common';\nimport { inject, injectable } from 'inversify';\nimport { getTheme, RECT_NUMBER_TYPE } from '../../../graphic';\nimport { IGraphicAttribute, IContext2d, IMarkAttribute, IRect, IThemeAttribute } from '../../../interface';\nimport { IGraphicRender, RectRender } from '../../../render';\nimport { IGraphicPicker, IPickParams } from '../../picker-service';\n\nconst _bounds = new AABBBounds();\n\n@injectable()\nexport class DefaultCanvasRectPicker implements IGraphicPicker {\n  type: string = 'rect';\n  numberType: number = RECT_NUMBER_TYPE;\n\n  constructor(@inject(RectRender) public readonly canvasRenderer: IGraphicRender) {}\n\n  contains(rect: IRect, point: IPoint, params?: IPickParams): boolean {\n    if (!rect.AABBBounds.containsPoint(point)) {\n      return false;\n    }\n    if (rect.attribute.pickMode === 'imprecise') {\n      return true;\n    }\n\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    // const { rectAttribute } = graphicService.themeService.getCurrentTheme();\n    const rectAttribute = getTheme(rect).rect;\n    const { borderRadius = rectAttribute.borderRadius } = rect.attribute;\n    let { x = rectAttribute.x, y = rectAttribute.y } = rect.attribute;\n\n    pickContext.highPerformanceSave();\n    let onlyTranslate = true;\n    if (!rect.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      onlyTranslate = false;\n      pickContext.transformFromMatrix(rect.transMatrix, true);\n    } else {\n      const point = rect.getOffsetXY(rectAttribute);\n      x += point.x;\n      y += point.y;\n      // 当前context有rotate/scale，重置matrix\n      pickContext.setTransformForCurrent();\n    }\n\n    let picked = true;\n    // 处理圆角情况，无圆角直接使用bounds判断结果\n    if (\n      !onlyTranslate ||\n      (isNumber(borderRadius, true) && borderRadius !== 0) ||\n      (isArray(borderRadius) && (<number[]>borderRadius).some(num => num !== 0))\n    ) {\n      // 详细形状判断\n      picked = false;\n      this.canvasRenderer.drawShape(\n        rect,\n        pickContext,\n        x,\n        y,\n        {} as any,\n        null,\n        (\n          context: IContext2d,\n          rectAttribute: 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          rectAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n          themeAttribute: IThemeAttribute\n        ) => {\n          // 选中后面就不需要再走逻辑了\n          if (picked) {\n            return true;\n          }\n          const lineWidth = rectAttribute.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    } else if (picked) {\n      // 如果只有描边那需要测试描边\n      const {\n        fill = !!rect.attribute.fillColor,\n        stroke = !!rect.attribute.strokeColor,\n        lineWidth = rectAttribute.lineWidth\n      } = rect.attribute;\n      if (fill) {\n        picked = true;\n      } else if (stroke) {\n        const bounds = rect.AABBBounds;\n        _bounds.setValue(bounds.x1, bounds.y1, bounds.x2, bounds.y2);\n        _bounds.expand(-lineWidth / 2);\n        picked = !_bounds.containsPoint(point);\n      }\n    }\n\n    pickContext.highPerformanceRestore();\n    return picked; // 无圆角形状判断通过\n  }\n}\n"]}
+{"version":3,"sources":["../../src/picker/contributions/canvas-picker/rect-picker.ts"],"names":[],"mappings":"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","file":"rect-picker.js","sourcesContent":["import { isArray, isNumber, IPoint, AABBBounds } from '@visactor/vutils';\nimport { getScaledStroke } from '../../../common/canvas-utils';\nimport { inject, injectable } from 'inversify';\nimport { getTheme } from '../../../graphic';\nimport { IGraphicAttribute, IContext2d, IMarkAttribute, IRect, IThemeAttribute } from '../../../interface';\nimport { IGraphicRender, RectRender } from '../../../render';\nimport { IGraphicPicker, IPickParams } from '../../picker-service';\nimport { RECT_NUMBER_TYPE } from '../../../graphic/constants';\n\nconst _bounds = new AABBBounds();\n\n@injectable()\nexport class DefaultCanvasRectPicker implements IGraphicPicker {\n  type: string = 'rect';\n  numberType: number = RECT_NUMBER_TYPE;\n\n  constructor(@inject(RectRender) public readonly canvasRenderer: IGraphicRender) {}\n\n  contains(rect: IRect, point: IPoint, params?: IPickParams): boolean {\n    if (!rect.AABBBounds.containsPoint(point)) {\n      return false;\n    }\n    if (rect.attribute.pickMode === 'imprecise') {\n      return true;\n    }\n\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    // const { rectAttribute } = graphicService.themeService.getCurrentTheme();\n    const rectAttribute = getTheme(rect).rect;\n    const { borderRadius = rectAttribute.borderRadius } = rect.attribute;\n    let { x = rectAttribute.x, y = rectAttribute.y } = rect.attribute;\n\n    pickContext.highPerformanceSave();\n    let onlyTranslate = true;\n    if (!rect.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      onlyTranslate = false;\n      pickContext.transformFromMatrix(rect.transMatrix, true);\n    } else {\n      const point = rect.getOffsetXY(rectAttribute);\n      x += point.x;\n      y += point.y;\n      // 当前context有rotate/scale，重置matrix\n      pickContext.setTransformForCurrent();\n    }\n\n    let picked = true;\n    // 处理圆角情况，无圆角直接使用bounds判断结果\n    if (\n      !onlyTranslate ||\n      (isNumber(borderRadius, true) && borderRadius !== 0) ||\n      (isArray(borderRadius) && (<number[]>borderRadius).some(num => num !== 0))\n    ) {\n      // 详细形状判断\n      picked = false;\n      this.canvasRenderer.drawShape(\n        rect,\n        pickContext,\n        x,\n        y,\n        {} as any,\n        null,\n        (\n          context: IContext2d,\n          rectAttribute: 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          rectAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n          themeAttribute: IThemeAttribute\n        ) => {\n          // 选中后面就不需要再走逻辑了\n          if (picked) {\n            return true;\n          }\n          const lineWidth = rectAttribute.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    } else if (picked) {\n      // 如果只有描边那需要测试描边\n      const {\n        fill = rectAttribute.fill,\n        stroke = rectAttribute.stroke,\n        lineWidth = rectAttribute.lineWidth\n      } = rect.attribute;\n      if (fill) {\n        picked = true;\n      } else if (stroke) {\n        const bounds = rect.AABBBounds;\n        _bounds.setValue(bounds.x1, bounds.y1, bounds.x2, bounds.y2);\n        _bounds.expand(-lineWidth / 2);\n        picked = !_bounds.containsPoint(point);\n      }\n    }\n\n    pickContext.highPerformanceRestore();\n    return picked; // 无圆角形状判断通过\n  }\n}\n"]}