@visactor/vrender 0.9.0 → 0.9.1-circular.0

package/es/interface/path.d.ts

@@ -1,6 +1,6 @@
-import { IAABBBounds, IPoint, IPointLike } from '@visactor/vutils';
-import { Direction } from '../common';
-import { Releaseable } from './common';
+import type { IAABBBounds, IPoint, IPointLike } from '@visactor/vutils';
+import type { Releaseable, IDirection } from './common';
+import { CurveTypeEnum } from '../common/enums';
 export declare const strCommandMap: string[];
 export type CommandType = [
     number,
@@ -24,14 +24,6 @@ export type CommandStrType = [
     (number | boolean)?,
     (number | boolean)?
 ];
-export declare enum ICurveTypeEnum {
-    CubicBezierCurve = 0,
-    QuadraticBezierCurve = 1,
-    ArcCurve = 2,
-    LineCurve = 3,
-    EllipseCurve = 4,
-    MoveCurve = 5
-}
 export interface ICurve<T> {
     type: number;
     defined: boolean;
@@ -41,30 +33,30 @@ export interface ICurve<T> {
     readonly p3?: T;
     getPointAt: (t: number) => IPointLike;
     getAngleAt: (t: number) => number;
-    getLength: (direction?: Direction) => number;
+    getLength: (direction?: IDirection) => number;
 }
 export interface ICubicBezierCurve extends ICurve<IPoint> {
-    type: ICurveTypeEnum.CubicBezierCurve;
+    type: CurveTypeEnum.CubicBezierCurve;
     readonly p1: IPoint;
     readonly p2: IPoint;
     readonly p3: IPoint;
 }
 export interface IQuadraticBezierCurve extends ICurve<IPoint> {
-    type: ICurveTypeEnum.QuadraticBezierCurve;
+    type: CurveTypeEnum.QuadraticBezierCurve;
     readonly p1: IPoint;
     readonly p2: IPoint;
 }
 export interface IArcCurve extends ICurve<IPoint> {
-    type: ICurveTypeEnum.ArcCurve;
+    type: CurveTypeEnum.ArcCurve;
     readonly p1: IPoint;
     radius: number;
 }
 export interface ILineCurve extends ICurve<IPoint> {
-    type: ICurveTypeEnum.LineCurve;
+    type: CurveTypeEnum.LineCurve;
     readonly p1: IPoint;
 }
 export interface IEllipseCurve extends ICurve<IPoint> {
-    type: ICurveTypeEnum.EllipseCurve;
+    type: CurveTypeEnum.EllipseCurve;
     radiusX: number;
     radiusY: number;
     rotation: number;
@@ -73,7 +65,7 @@ export interface IEllipseCurve extends ICurve<IPoint> {
     anticlockwise?: boolean;
 }
 export interface IMoveCurve extends ICurve<IPoint> {
-    type: ICurveTypeEnum.MoveCurve;
+    type: CurveTypeEnum.MoveCurve;
     readonly p1: IPoint;
 }
 export interface ICurvePath<T> {
@@ -81,7 +73,7 @@ export interface ICurvePath<T> {
     bounds?: IAABBBounds;
     getPointAt: (t: number) => IPointLike;
     getCurveLengths: () => number[];
-    getLength: (direction?: Direction) => number;
+    getLength: (direction?: IDirection) => number;
     getBounds?: () => IAABBBounds;
 }
 export interface IPath2D {

package/es/interface/path.js

@@ -1,10 +1,2 @@
 export const strCommandMap = [ "arc", "arcTo", "bezierCurveTo", "closePath", "ellipse", "lineTo", "moveTo", "quadraticCurveTo", "rect" ];
-
-export var ICurveTypeEnum;
-
-!function(ICurveTypeEnum) {
-    ICurveTypeEnum[ICurveTypeEnum.CubicBezierCurve = 0] = "CubicBezierCurve", ICurveTypeEnum[ICurveTypeEnum.QuadraticBezierCurve = 1] = "QuadraticBezierCurve", 
-    ICurveTypeEnum[ICurveTypeEnum.ArcCurve = 2] = "ArcCurve", ICurveTypeEnum[ICurveTypeEnum.LineCurve = 3] = "LineCurve", 
-    ICurveTypeEnum[ICurveTypeEnum.EllipseCurve = 4] = "EllipseCurve", ICurveTypeEnum[ICurveTypeEnum.MoveCurve = 5] = "MoveCurve";
-}(ICurveTypeEnum || (ICurveTypeEnum = {}));
 //# sourceMappingURL=path.js.map

package/es/interface/path.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/interface/path.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,KAAK;IACL,OAAO;IACP,eAAe;IACf,WAAW;IACX,SAAS;IACT,QAAQ;IACR,QAAQ;IACR,kBAAkB;IAClB,MAAM;CACP,CAAC;AA0BF,MAAM,CAAN,IAAY,cAOX;AAPD,WAAY,cAAc;IACxB,2EAAoB,CAAA;IACpB,mFAAwB,CAAA;IACxB,2DAAY,CAAA;IACZ,6DAAa,CAAA;IACb,mEAAgB,CAAA;IAChB,6DAAa,CAAA;AACf,CAAC,EAPW,cAAc,KAAd,cAAc,QAOzB","file":"path.js","sourcesContent":["import { IAABBBounds, IPoint, IPointLike } from '@visactor/vutils';\nimport { Direction } from '../common';\nimport { Releaseable } from './common';\n\nexport const strCommandMap = [\n  'arc',\n  'arcTo',\n  'bezierCurveTo',\n  'closePath',\n  'ellipse',\n  'lineTo',\n  'moveTo',\n  'quadraticCurveTo',\n  'rect'\n];\n\nexport type CommandType = [\n  number,\n  (number | boolean)?,\n  (number | boolean)?,\n  (number | boolean)?,\n  (number | boolean)?,\n  (number | boolean)?,\n  (number | boolean)?,\n  (number | boolean)?,\n  (number | boolean)?\n];\n\nexport type CommandStrType = [\n  string,\n  (number | boolean)?,\n  (number | boolean)?,\n  (number | boolean)?,\n  (number | boolean)?,\n  (number | boolean)?,\n  (number | boolean)?,\n  (number | boolean)?,\n  (number | boolean)?\n];\n\nexport enum ICurveTypeEnum {\n  CubicBezierCurve = 0,\n  QuadraticBezierCurve = 1,\n  ArcCurve = 2,\n  LineCurve = 3,\n  EllipseCurve = 4,\n  MoveCurve = 5\n}\n\nexport interface ICurve<T> {\n  type: number;\n  defined: boolean;\n  readonly p0: T;\n  readonly p1?: T;\n  readonly p2?: T;\n  readonly p3?: T;\n  getPointAt: (t: number) => IPointLike;\n  getAngleAt: (t: number) => number;\n  getLength: (direction?: Direction) => number;\n}\n\nexport interface ICubicBezierCurve extends ICurve<IPoint> {\n  type: ICurveTypeEnum.CubicBezierCurve;\n  // p0: IPoint;\n  readonly p1: IPoint;\n  readonly p2: IPoint;\n  readonly p3: IPoint;\n}\n\nexport interface IQuadraticBezierCurve extends ICurve<IPoint> {\n  type: ICurveTypeEnum.QuadraticBezierCurve;\n  // p0: IPoint;\n  readonly p1: IPoint;\n  readonly p2: IPoint;\n}\n\nexport interface IArcCurve extends ICurve<IPoint> {\n  type: ICurveTypeEnum.ArcCurve;\n  // p0: IPoint;\n  readonly p1: IPoint;\n  radius: number;\n}\n\nexport interface ILineCurve extends ICurve<IPoint> {\n  type: ICurveTypeEnum.LineCurve;\n  // p0: IPoint;\n  readonly p1: IPoint;\n}\n\nexport interface IEllipseCurve extends ICurve<IPoint> {\n  type: ICurveTypeEnum.EllipseCurve;\n  // p0: IPoint;\n  radiusX: number;\n  radiusY: number;\n  rotation: number;\n  startAngle: number;\n  endAngle: number;\n  anticlockwise?: boolean;\n}\n\nexport interface IMoveCurve extends ICurve<IPoint> {\n  type: ICurveTypeEnum.MoveCurve;\n  // p0: IPoint;\n  readonly p1: IPoint;\n}\n\nexport interface ICurvePath<T> {\n  curves: ICurve<T>[];\n  bounds?: IAABBBounds;\n  getPointAt: (t: number) => IPointLike;\n  getCurveLengths: () => number[];\n  getLength: (direction?: Direction) => number;\n  getBounds?: () => IAABBBounds;\n}\n\nexport interface IPath2D {\n  moveTo: (x: number, y: number, z?: number) => void;\n  lineTo: (x: number, y: number, z?: number) => void;\n  quadraticCurveTo: (aCPx: number, aCPy: number, aX: number, aY: number, z?: number) => void;\n  bezierCurveTo: (\n    aCP1x: number,\n    aCP1y: number,\n    aCP2x: number,\n    aCP2y: number,\n    aX: number,\n    aY: number,\n    z?: number\n  ) => void;\n  arcTo: (aX1: number, aY1: number, aX2: number, aY2: number, aRadius: number, z?: number) => void;\n  ellipse: (\n    aX: number,\n    aY: number,\n    xRadius: number,\n    yRadius: number,\n    aRotation: number,\n    aStartAngle: number,\n    aEndAngle: number,\n    aClockwise: boolean\n  ) => void;\n  rect: (x: number, y: number, w: number, h: number, z?: number) => void;\n  arc: (\n    x: number,\n    y: number,\n    radius: number,\n    startAngle: number,\n    endAngle: number,\n    counterclockwise?: boolean,\n    z?: number\n  ) => void;\n  closePath: () => void;\n}\n\n// 用户可以直接操作path2D\nexport interface ICustomPath2D extends ICurvePath<IPoint>, IPath2D, Releaseable {\n  commandList: CommandType[];\n\n  toString: () => string;\n  transform: (x: number, y: number, sx: number, sy: number) => void;\n  fromString: (pathStr: string, x?: number, y?: number, sX?: number, sY?: number) => ICustomPath2D;\n  fromCustomPath2D: (path: ICustomPath2D, x?: number, y?: number, sX?: number, sY?: number) => ICustomPath2D;\n  addCurve: (curve: ICurve<IPoint>) => void;\n  clear: () => void;\n}\n"]}
+{"version":3,"sources":["../../src/interface/path.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,KAAK;IACL,OAAO;IACP,eAAe;IACf,WAAW;IACX,SAAS;IACT,QAAQ;IACR,QAAQ;IACR,kBAAkB;IAClB,MAAM;CACP,CAAC","file":"path.js","sourcesContent":["import type { IAABBBounds, IPoint, IPointLike } from '@visactor/vutils';\nimport type { Releaseable, IDirection } from './common';\nimport { CurveTypeEnum } from '../common/enums';\n\nexport const strCommandMap = [\n  'arc',\n  'arcTo',\n  'bezierCurveTo',\n  'closePath',\n  'ellipse',\n  'lineTo',\n  'moveTo',\n  'quadraticCurveTo',\n  'rect'\n];\n\nexport type CommandType = [\n  number,\n  (number | boolean)?,\n  (number | boolean)?,\n  (number | boolean)?,\n  (number | boolean)?,\n  (number | boolean)?,\n  (number | boolean)?,\n  (number | boolean)?,\n  (number | boolean)?\n];\n\nexport type CommandStrType = [\n  string,\n  (number | boolean)?,\n  (number | boolean)?,\n  (number | boolean)?,\n  (number | boolean)?,\n  (number | boolean)?,\n  (number | boolean)?,\n  (number | boolean)?,\n  (number | boolean)?\n];\n\nexport interface ICurve<T> {\n  type: number;\n  defined: boolean;\n  readonly p0: T;\n  readonly p1?: T;\n  readonly p2?: T;\n  readonly p3?: T;\n  getPointAt: (t: number) => IPointLike;\n  getAngleAt: (t: number) => number;\n  getLength: (direction?: IDirection) => number;\n}\n\nexport interface ICubicBezierCurve extends ICurve<IPoint> {\n  type: CurveTypeEnum.CubicBezierCurve;\n  // p0: IPoint;\n  readonly p1: IPoint;\n  readonly p2: IPoint;\n  readonly p3: IPoint;\n}\n\nexport interface IQuadraticBezierCurve extends ICurve<IPoint> {\n  type: CurveTypeEnum.QuadraticBezierCurve;\n  // p0: IPoint;\n  readonly p1: IPoint;\n  readonly p2: IPoint;\n}\n\nexport interface IArcCurve extends ICurve<IPoint> {\n  type: CurveTypeEnum.ArcCurve;\n  // p0: IPoint;\n  readonly p1: IPoint;\n  radius: number;\n}\n\nexport interface ILineCurve extends ICurve<IPoint> {\n  type: CurveTypeEnum.LineCurve;\n  // p0: IPoint;\n  readonly p1: IPoint;\n}\n\nexport interface IEllipseCurve extends ICurve<IPoint> {\n  type: CurveTypeEnum.EllipseCurve;\n  // p0: IPoint;\n  radiusX: number;\n  radiusY: number;\n  rotation: number;\n  startAngle: number;\n  endAngle: number;\n  anticlockwise?: boolean;\n}\n\nexport interface IMoveCurve extends ICurve<IPoint> {\n  type: CurveTypeEnum.MoveCurve;\n  // p0: IPoint;\n  readonly p1: IPoint;\n}\n\nexport interface ICurvePath<T> {\n  curves: ICurve<T>[];\n  bounds?: IAABBBounds;\n  getPointAt: (t: number) => IPointLike;\n  getCurveLengths: () => number[];\n  getLength: (direction?: IDirection) => number;\n  getBounds?: () => IAABBBounds;\n}\n\nexport interface IPath2D {\n  moveTo: (x: number, y: number, z?: number) => void;\n  lineTo: (x: number, y: number, z?: number) => void;\n  quadraticCurveTo: (aCPx: number, aCPy: number, aX: number, aY: number, z?: number) => void;\n  bezierCurveTo: (\n    aCP1x: number,\n    aCP1y: number,\n    aCP2x: number,\n    aCP2y: number,\n    aX: number,\n    aY: number,\n    z?: number\n  ) => void;\n  arcTo: (aX1: number, aY1: number, aX2: number, aY2: number, aRadius: number, z?: number) => void;\n  ellipse: (\n    aX: number,\n    aY: number,\n    xRadius: number,\n    yRadius: number,\n    aRotation: number,\n    aStartAngle: number,\n    aEndAngle: number,\n    aClockwise: boolean\n  ) => void;\n  rect: (x: number, y: number, w: number, h: number, z?: number) => void;\n  arc: (\n    x: number,\n    y: number,\n    radius: number,\n    startAngle: number,\n    endAngle: number,\n    counterclockwise?: boolean,\n    z?: number\n  ) => void;\n  closePath: () => void;\n}\n\n// 用户可以直接操作path2D\nexport interface ICustomPath2D extends ICurvePath<IPoint>, IPath2D, Releaseable {\n  commandList: CommandType[];\n\n  toString: () => string;\n  transform: (x: number, y: number, sx: number, sy: number) => void;\n  fromString: (pathStr: string, x?: number, y?: number, sX?: number, sY?: number) => ICustomPath2D;\n  fromCustomPath2D: (path: ICustomPath2D, x?: number, y?: number, sX?: number, sY?: number) => ICustomPath2D;\n  addCurve: (curve: ICurve<IPoint>) => void;\n  clear: () => void;\n}\n"]}

package/es/kits/env.js

@@ -1,4 +1,4 @@
-import { container } from "../modules";
+import { container } from "../container";
 
 import { DefaultMathPickerService, PickerService } from "../picker";
 

package/es/kits/env.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/kits/env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,wBAAwB,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAGpE,MAAM,UAAU,uBAAuB;IACrC,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,wBAAwB,CAAC,CAAC;AACtE,CAAC;AAED,MAAM,UAAU,qBAAqB;IACnC,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,wBAAwB,CAAC,CAAC;AACtE,CAAC","file":"env.js","sourcesContent":["import { container } from '../modules';\nimport { DefaultMathPickerService, PickerService } from '../picker';\n\n// 兼容环境\nexport function loadFeishuContributions() {\n  container.rebind(PickerService).toService(DefaultMathPickerService);\n}\n\nexport function loadTaroContributions() {\n  container.rebind(PickerService).toService(DefaultMathPickerService);\n}\n"]}
+{"version":3,"sources":["../../src/kits/env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,wBAAwB,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAGpE,MAAM,UAAU,uBAAuB;IACrC,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,wBAAwB,CAAC,CAAC;AACtE,CAAC;AAED,MAAM,UAAU,qBAAqB;IACnC,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,wBAAwB,CAAC,CAAC;AACtE,CAAC","file":"env.js","sourcesContent":["import { container } from '../container';\nimport { DefaultMathPickerService, PickerService } from '../picker';\n\n// 兼容环境\nexport function loadFeishuContributions() {\n  container.rebind(PickerService).toService(DefaultMathPickerService);\n}\n\nexport function loadTaroContributions() {\n  container.rebind(PickerService).toService(DefaultMathPickerService);\n}\n"]}

package/es/modules.d.ts

@@ -1,26 +1,9 @@
-import { Container } from 'inversify';
-import { IGraphicUtil, ILayerService, ITransformUtil } from './core';
-import { IGraphicService } from './graphic';
-import { IMat4Allocate, IMatrixAllocate } from './allocator/matrix-allocate';
 import { IPickerService } from './picker';
-import { ILineAllocate, IPathAllocate, IRectAllocate, ISymbolAllocate, ITextAllocate, IArcAllocate, IAreaAllocate, ICircleAllocate } from './allocator/graphic-allocate';
-import { IGlobal } from './interface';
-import { ICanvasAllocate } from './allocator/canvas-allocate';
-export declare const container: Container;
+import { IGlobal, IGraphicService } from './interface';
+import { IGraphicUtil, ILayerService, ITransformUtil } from './core/interface';
 export declare const global: IGlobal;
 export declare const graphicUtil: IGraphicUtil;
 export declare const transformUtil: ITransformUtil;
 export declare const graphicService: IGraphicService;
-export declare const matrixAllocate: IMatrixAllocate;
-export declare const mat4Allocate: IMat4Allocate;
-export declare const canvasAllocate: ICanvasAllocate;
-export declare const arcAllocate: IArcAllocate;
-export declare const areaAllocate: IAreaAllocate;
-export declare const circleAllocate: ICircleAllocate;
-export declare const lineAllocate: ILineAllocate;
-export declare const pathAllocate: IPathAllocate;
-export declare const rectAllocate: IRectAllocate;
-export declare const symbolAllocate: ISymbolAllocate;
-export declare const textAllocate: ITextAllocate;
 export declare const pickerService: IPickerService;
 export declare const layerService: ILayerService;

package/es/modules.js

@@ -1,13 +1,9 @@
-import { Container } from "inversify";
-
 import coreModule from "./core/core-modules";
 
 import renderModule from "./render/render-modules";
 
 import pickModule from "./picker/pick-modules";
 
-import allocatorModule from "./allocator/allocator-modules";
-
 import graphicModule from "./graphic/graphic-service/graphic-module";
 
 import pluginModule from "./plugins/plugin-modules";
@@ -20,58 +16,43 @@ import loadPickContributions from "./picker/contributions/modules";
 
 import loadCanvasContributions from "./canvas/contributions/modules";
 
-import { GraphicUtil, LayerService, TransformUtil } from "./core";
-
-import { GraphicService } from "./graphic";
-
-import { Mat4Allocate, MatrixAllocate } from "./allocator/matrix-allocate";
+import { LayerService } from "./core/constants";
 
 import { GlobalPickerService } from "./picker/global-picker-service";
 
-import { ArcAllocate, AreaAllocate, CircleAllocate, LineAllocate, PathAllocate, RectAllocate, SymbolAllocate, TextAllocate } from "./allocator/graphic-allocate";
-
 import { Global } from "./interface";
 
-import { CanvasAllocate } from "./allocator/canvas-allocate";
+import { application } from "./application";
 
-export const container = new Container;
+import { GraphicService } from "./graphic/constants";
 
-container.load(coreModule), container.load(graphicModule), container.load(renderModule), 
-container.load(pickModule), container.load(allocatorModule), container.load(pluginModule), 
-loadBuiltinContributions(container), loadRenderContributions(container), loadPickContributions(container), 
-loadCanvasContributions(container);
+import { GraphicUtil, TransformUtil } from "./core/constants";
 
-export const global = container.get(Global);
-
-export const graphicUtil = container.get(GraphicUtil);
-
-export const transformUtil = container.get(TransformUtil);
+import { container } from "./container";
 
-export const graphicService = container.get(GraphicService);
-
-export const matrixAllocate = container.get(MatrixAllocate);
-
-export const mat4Allocate = container.get(Mat4Allocate);
-
-export const canvasAllocate = container.get(CanvasAllocate);
+container.load(coreModule), container.load(graphicModule), container.load(renderModule), 
+container.load(pickModule), container.load(pluginModule), loadBuiltinContributions(container), 
+loadRenderContributions(container), loadPickContributions(container), loadCanvasContributions(container);
 
-export const arcAllocate = container.get(ArcAllocate);
+export const global = container.get(Global);
 
-export const areaAllocate = container.get(AreaAllocate);
+application.global = global;
 
-export const circleAllocate = container.get(CircleAllocate);
+export const graphicUtil = container.get(GraphicUtil);
 
-export const lineAllocate = container.get(LineAllocate);
+application.graphicUtil = graphicUtil;
 
-export const pathAllocate = container.get(PathAllocate);
+export const transformUtil = container.get(TransformUtil);
 
-export const rectAllocate = container.get(RectAllocate);
+application.transformUtil = transformUtil;
 
-export const symbolAllocate = container.get(SymbolAllocate);
+export const graphicService = container.get(GraphicService);
 
-export const textAllocate = container.get(TextAllocate);
+application.graphicService = graphicService;
 
 export const pickerService = container.get(GlobalPickerService);
 
 export const layerService = container.get(LayerService);
+
+application.layerService = layerService;
 //# sourceMappingURL=modules.js.map

package/es/modules.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/modules.ts"],"names":[],"mappings":"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","file":"modules.js","sourcesContent":["import { Container } from 'inversify';\nimport coreModule from './core/core-modules';\nimport renderModule from './render/render-modules';\nimport pickModule from './picker/pick-modules';\nimport allocatorModule from './allocator/allocator-modules';\nimport graphicModule from './graphic/graphic-service/graphic-module';\nimport pluginModule from './plugins/plugin-modules';\nimport loadBuiltinContributions from './core/contributions/modules';\nimport loadRenderContributions from './render/contributions/modules';\nimport loadPickContributions from './picker/contributions/modules';\nimport loadCanvasContributions from './canvas/contributions/modules';\nimport { GraphicUtil, IGraphicUtil, ILayerService, ITransformUtil, LayerService, TransformUtil } from './core';\nimport { GraphicService, IGraphicService } from './graphic';\nimport { IMat4Allocate, IMatrixAllocate, Mat4Allocate, MatrixAllocate } from './allocator/matrix-allocate';\nimport { GlobalPickerService } from './picker/global-picker-service';\nimport { IPickerService } from './picker';\nimport {\n  ArcAllocate,\n  AreaAllocate,\n  CircleAllocate,\n  LineAllocate,\n  PathAllocate,\n  RectAllocate,\n  SymbolAllocate,\n  TextAllocate,\n  ILineAllocate,\n  IPathAllocate,\n  IRectAllocate,\n  ISymbolAllocate,\n  ITextAllocate,\n  IArcAllocate,\n  IAreaAllocate,\n  ICircleAllocate\n} from './allocator/graphic-allocate';\nimport { Global, IGlobal } from './interface';\nimport { CanvasAllocate, ICanvasAllocate } from './allocator/canvas-allocate';\n\nexport const container = new Container();\ncontainer.load(coreModule);\ncontainer.load(graphicModule);\ncontainer.load(renderModule);\ncontainer.load(pickModule);\ncontainer.load(allocatorModule);\ncontainer.load(pluginModule);\nloadBuiltinContributions(container);\nloadRenderContributions(container);\nloadPickContributions(container);\nloadCanvasContributions(container);\n\n// 全局变量\nexport const global = container.get<IGlobal>(Global);\nexport const graphicUtil = container.get<IGraphicUtil>(GraphicUtil);\nexport const transformUtil = container.get<ITransformUtil>(TransformUtil);\nexport const graphicService = container.get<IGraphicService>(GraphicService);\nexport const matrixAllocate = container.get<IMatrixAllocate>(MatrixAllocate);\nexport const mat4Allocate = container.get<IMat4Allocate>(Mat4Allocate);\nexport const canvasAllocate = container.get<ICanvasAllocate>(CanvasAllocate);\nexport const arcAllocate = container.get<IArcAllocate>(ArcAllocate);\nexport const areaAllocate = container.get<IAreaAllocate>(AreaAllocate);\nexport const circleAllocate = container.get<ICircleAllocate>(CircleAllocate);\nexport const lineAllocate = container.get<ILineAllocate>(LineAllocate);\nexport const pathAllocate = container.get<IPathAllocate>(PathAllocate);\nexport const rectAllocate = container.get<IRectAllocate>(RectAllocate);\nexport const symbolAllocate = container.get<ISymbolAllocate>(SymbolAllocate);\nexport const textAllocate = container.get<ITextAllocate>(TextAllocate);\nexport const pickerService = container.get<IPickerService>(GlobalPickerService);\nexport const layerService = container.get<ILayerService>(LayerService);\n"]}
+{"version":3,"sources":["../../src/modules.ts"],"names":[],"mappings":"AACA,OAAO,UAAU,MAAM,qBAAqB,CAAC;AAC7C,OAAO,YAAY,MAAM,yBAAyB,CAAC;AACnD,OAAO,UAAU,MAAM,uBAAuB,CAAC;AAE/C,OAAO,aAAa,MAAM,0CAA0C,CAAC;AACrE,OAAO,YAAY,MAAM,0BAA0B,CAAC;AACpD,OAAO,wBAAwB,MAAM,8BAA8B,CAAC;AACpE,OAAO,uBAAuB,MAAM,gCAAgC,CAAC;AACrE,OAAO,qBAAqB,MAAM,gCAAgC,CAAC;AACnE,OAAO,uBAAuB,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAwBrE,OAAO,EAAE,MAAM,EAA4B,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AAC3B,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;AAC9B,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AAC7B,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AAE3B,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AAC7B,wBAAwB,CAAC,SAAS,CAAC,CAAC;AACpC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AACnC,qBAAqB,CAAC,SAAS,CAAC,CAAC;AACjC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAGnC,MAAM,CAAC,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAU,MAAM,CAAC,CAAC;AACrD,WAAW,CAAC,MAAM,GAAG,MAAM,CAAC;AAC5B,MAAM,CAAC,MAAM,WAAW,GAAG,SAAS,CAAC,GAAG,CAAe,WAAW,CAAC,CAAC;AACpE,WAAW,CAAC,WAAW,GAAG,WAAW,CAAC;AACtC,MAAM,CAAC,MAAM,aAAa,GAAG,SAAS,CAAC,GAAG,CAAiB,aAAa,CAAC,CAAC;AAC1E,WAAW,CAAC,aAAa,GAAG,aAAa,CAAC;AAC1C,MAAM,CAAC,MAAM,cAAc,GAAG,SAAS,CAAC,GAAG,CAAkB,cAAc,CAAC,CAAC;AAC7E,WAAW,CAAC,cAAc,GAAG,cAAc,CAAC;AAY5C,MAAM,CAAC,MAAM,aAAa,GAAG,SAAS,CAAC,GAAG,CAAiB,mBAAmB,CAAC,CAAC;AAChF,MAAM,CAAC,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAAgB,YAAY,CAAC,CAAC;AACvE,WAAW,CAAC,YAAY,GAAG,YAAY,CAAC","file":"modules.js","sourcesContent":["import { Container } from 'inversify';\nimport coreModule from './core/core-modules';\nimport renderModule from './render/render-modules';\nimport pickModule from './picker/pick-modules';\n// import allocatorModule from './allocator/allocator-modules';\nimport graphicModule from './graphic/graphic-service/graphic-module';\nimport pluginModule from './plugins/plugin-modules';\nimport loadBuiltinContributions from './core/contributions/modules';\nimport loadRenderContributions from './render/contributions/modules';\nimport loadPickContributions from './picker/contributions/modules';\nimport loadCanvasContributions from './canvas/contributions/modules';\nimport { LayerService } from './core/constants';\n// import { IMat4Allocate, IMatrixAllocate, Mat4Allocate, MatrixAllocate } from './allocator/matrix-allocate';\nimport { GlobalPickerService } from './picker/global-picker-service';\nimport { IPickerService } from './picker';\nimport {\n  ArcAllocate,\n  AreaAllocate,\n  CircleAllocate,\n  LineAllocate,\n  PathAllocate,\n  RectAllocate,\n  SymbolAllocate,\n  TextAllocate,\n  CanvasAllocate\n} from './allocator/constants';\nimport {\n  ILineAllocate,\n  IPathAllocate,\n  IRectAllocate,\n  ISymbolAllocate,\n  ITextAllocate,\n  IArcAllocate,\n  IAreaAllocate,\n  ICircleAllocate,\n  ICanvasAllocate\n} from './allocator/interface';\nimport { Global, IGlobal, IGraphicService } from './interface';\nimport { application } from './application';\nimport { IGraphicUtil, ILayerService, ITransformUtil } from './core/interface';\nimport { GraphicService } from './graphic/constants';\nimport { GraphicUtil, TransformUtil } from './core/constants';\nimport { container } from './container';\n\ncontainer.load(coreModule);\ncontainer.load(graphicModule);\ncontainer.load(renderModule);\ncontainer.load(pickModule);\n// container.load(allocatorModule);\ncontainer.load(pluginModule);\nloadBuiltinContributions(container);\nloadRenderContributions(container);\nloadPickContributions(container);\nloadCanvasContributions(container);\n\n// 全局变量\nexport const global = container.get<IGlobal>(Global);\napplication.global = global;\nexport const graphicUtil = container.get<IGraphicUtil>(GraphicUtil);\napplication.graphicUtil = graphicUtil;\nexport const transformUtil = container.get<ITransformUtil>(TransformUtil);\napplication.transformUtil = transformUtil;\nexport const graphicService = container.get<IGraphicService>(GraphicService);\napplication.graphicService = graphicService;\n// export const matrixAllocate = container.get<IMatrixAllocate>(MatrixAllocate);\n// export const mat4Allocate = container.get<IMat4Allocate>(Mat4Allocate);\n// export const canvasAllocate = container.get<ICanvasAllocate>(CanvasAllocate);\n// export const arcAllocate = container.get<IArcAllocate>(ArcAllocate);\n// export const areaAllocate = container.get<IAreaAllocate>(AreaAllocate);\n// export const circleAllocate = container.get<ICircleAllocate>(CircleAllocate);\n// export const lineAllocate = container.get<ILineAllocate>(LineAllocate);\n// export const pathAllocate = container.get<IPathAllocate>(PathAllocate);\n// export const rectAllocate = container.get<IRectAllocate>(RectAllocate);\n// export const symbolAllocate = container.get<ISymbolAllocate>(SymbolAllocate);\n// export const textAllocate = container.get<ITextAllocate>(TextAllocate);\nexport const pickerService = container.get<IPickerService>(GlobalPickerService);\nexport const layerService = container.get<ILayerService>(LayerService);\napplication.layerService = layerService;\n"]}

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

@@ -1,5 +1,5 @@
 import { IPointLike } from '@visactor/vutils';
-import { ContributionProvider } from '../common';
+import { ContributionProvider } from '../common/contribution-provider';
 import { ICanvas, IContext2d, IGraphic, EnvType, IGlobal } from '../interface';
 import { DefaultPickService, IGraphicPicker, IPickerService, IPickParams } from './picker-service';
 import { IDrawContribution } from '../render';

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

@@ -10,7 +10,7 @@ var __decorate = this && this.__decorate || function(decorators, target, key, de
     };
 };
 
-import { ContributionProvider } from "../common";
+import { ContributionProvider } from "../common/contribution-provider";
 
 import { inject, injectable, named, postConstruct } from "inversify";
 

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

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

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

@@ -12,11 +12,13 @@ var __decorate = this && this.__decorate || function(decorators, target, key, de
 
 import { inject, injectable } from "inversify";
 
-import { ARC_NUMBER_TYPE, getTheme } from "../../../graphic";
+import { getTheme } from "../../../graphic/theme";
 
 import { ArcRender } from "../../../render";
 
-import { getScaledStroke } from "../../../common";
+import { getScaledStroke } from "../../../common/canvas-utils";
+
+import { ARC_NUMBER_TYPE } from "../../../graphic/constants";
 
 let DefaultCanvasArcPicker = class {
     constructor(canvasRenderer) {

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

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

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

@@ -14,14 +14,16 @@ import { AABBBounds } from "@visactor/vutils";
 
 import { inject, injectable } from "inversify";
 
-import { getTheme, ARC3D_NUMBER_TYPE } from "../../../graphic";
+import { getTheme } from "../../../graphic/theme";
 
 import { Arc3dRender } from "../../../render";
 
-import { mat4Allocate } from "../../../modules";
+import { mat4Allocate } from "../../../allocator/matrix-allocate";
 
 import { BasePicker } from "./base-picker";
 
+import { ARC3D_NUMBER_TYPE } from "../../../graphic/constants";
+
 const _bounds = new AABBBounds;
 
 let DefaultCanvasArc3dPicker = class extends BasePicker {

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/picker/contributions/canvas-picker/arc3d-picker.ts"],"names":[],"mappings":"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","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":"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","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/es/picker/contributions/canvas-picker/area-picker.js

@@ -12,10 +12,12 @@ var __decorate = this && this.__decorate || function(decorators, target, key, de
 
 import { inject, injectable } from "inversify";
 
-import { AREA_NUMBER_TYPE, getTheme } from "../../../graphic";
+import { getTheme } from "../../../graphic/theme";
 
 import { AreaRender } from "../../../render";
 
+import { AREA_NUMBER_TYPE } from "../../../graphic/constants";
+
 let DefaultCanvasAreaPicker = class {
     constructor(canvasRenderer) {
         this.canvasRenderer = canvasRenderer, this.type = "area", this.numberType = AREA_NUMBER_TYPE;

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/picker/contributions/canvas-picker/area-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAE/C,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG9D,OAAO,EAAE,UAAU,EAAkB,MAAM,iBAAiB,CAAC;AAGtD,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAIlC,YAAgD,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAH9E,SAAI,GAAW,MAAM,CAAC;QACtB,eAAU,GAAW,gBAAgB,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,QAAQ,CAAC,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,UAAU,EAAE;IAKE,WAAA,MAAM,CAAC,UAAU,CAAC,CAAA;;GAJpB,uBAAuB,CAoDnC;SApDY,uBAAuB","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,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAE/C,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAGlD,OAAO,EAAE,UAAU,EAAkB,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAGvD,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAIlC,YAAgD,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAH9E,SAAI,GAAW,MAAM,CAAC;QACtB,eAAU,GAAW,gBAAgB,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,QAAQ,CAAC,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,UAAU,EAAE;IAKE,WAAA,MAAM,CAAC,UAAU,CAAC,CAAA;;GAJpB,uBAAuB,CAoDnC;SApDY,uBAAuB","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/es/picker/contributions/canvas-picker/circle-picker.js

@@ -12,11 +12,13 @@ var __decorate = this && this.__decorate || function(decorators, target, key, de
 
 import { inject, injectable } from "inversify";
 
-import { CIRCLE_NUMBER_TYPE, getTheme } from "../../../graphic";
+import { getTheme } from "../../../graphic/theme";
 
 import { CircleRender } from "../../../render";
 
-import { getScaledStroke } from "../../../common";
+import { getScaledStroke } from "../../../common/canvas-utils";
+
+import { CIRCLE_NUMBER_TYPE } from "../../../graphic/constants";
 
 let DefaultCanvasCirclePicker = class {
     constructor(canvasRenderer) {

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/picker/contributions/canvas-picker/circle-picker.ts"],"names":[],"mappings":"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","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":"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","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/es/picker/contributions/canvas-picker/glyph-picker.js

@@ -12,7 +12,7 @@ var __decorate = this && this.__decorate || function(decorators, target, key, de
 
 import { inject, injectable } from "inversify";
 
-import { GLYPH_NUMBER_TYPE } from "../../../graphic";
+import { GLYPH_NUMBER_TYPE } from "../../../graphic/constants";
 
 import { GlyphRender } from "../../../render";
 

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/picker/contributions/canvas-picker/glyph-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAY,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAE/D,OAAO,EAAE,WAAW,EAA8B,MAAM,iBAAiB,CAAC;AAInE,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAInC,YAAiD,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAH/E,SAAI,GAAW,OAAO,CAAC;QACvB,eAAU,GAAW,iBAAiB,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,UAAU,EAAE;IAKE,WAAA,MAAM,CAAC,WAAW,CAAC,CAAA;;GAJrB,wBAAwB,CA0EpC;SA1EY,wBAAwB","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,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE/D,OAAO,EAAE,WAAW,EAA8B,MAAM,iBAAiB,CAAC;AAInE,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAInC,YAAiD,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAH/E,SAAI,GAAW,OAAO,CAAC;QACvB,eAAU,GAAW,iBAAiB,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,UAAU,EAAE;IAKE,WAAA,MAAM,CAAC,WAAW,CAAC,CAAA;;GAJrB,wBAAwB,CA0EpC;SA1EY,wBAAwB","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/es/picker/contributions/canvas-picker/image-picker.js

@@ -6,7 +6,7 @@ var __decorate = this && this.__decorate || function(decorators, target, key, de
 
 import { injectable } from "inversify";
 
-import { IMAGE_NUMBER_TYPE } from "../../../graphic";
+import { IMAGE_NUMBER_TYPE } from "../../../graphic/constants";
 
 let DefaultCanvasImagePicker = class {
     constructor() {

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/picker/contributions/canvas-picker/image-picker.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAK9C,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAA9B;QACL,SAAI,GAAW,OAAO,CAAC;QACvB,eAAU,GAAW,iBAAiB,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,UAAU,EAAE;GACA,wBAAwB,CAuBpC;SAvBY,wBAAwB","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,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAKxD,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAA9B;QACL,SAAI,GAAW,OAAO,CAAC;QACvB,eAAU,GAAW,iBAAiB,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,UAAU,EAAE;GACA,wBAAwB,CAuBpC;SAvBY,wBAAwB","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/es/picker/contributions/canvas-picker/line-picker.js

@@ -14,14 +14,16 @@ import { inject, injectable } from "inversify";
 
 import { LineRender } from "../../../render";
 
-import { getTheme, LINE_NUMBER_TYPE } from "../../../graphic";
+import { getTheme } from "../../../graphic/theme";
 
-import { mat4Allocate } from "../../../modules";
+import { mat4Allocate } from "../../../allocator/matrix-allocate";
 
-import { getScaledStroke } from "../../../common";
+import { getScaledStroke } from "../../../common/canvas-utils";
 
 import { BasePicker } from "./base-picker";
 
+import { LINE_NUMBER_TYPE } from "../../../graphic/constants";
+
 let DefaultCanvasLinePicker = class extends BasePicker {
     constructor(canvasRenderer) {
         super(), this.canvasRenderer = canvasRenderer, this.type = "line", this.numberType = LINE_NUMBER_TYPE;