@visactor/vrender 0.9.0 → 0.9.1-circular.0

package/cjs/interface/graphic.d.ts

@@ -36,22 +36,22 @@ export type ITransform = {
     anchor3d: [number | string, number | string, number] | [number | string, number | string];
     postMatrix: IMatrix;
 };
+export type IFillType = boolean | string | IColor;
 export type IFillStyle = {
-    fillColor: string | IColor;
     fillOpacity: number;
     shadowBlur: number;
     shadowColor: string;
     shadowOffsetX: number;
     shadowOffsetY: number;
-    fill: boolean | null;
+    fill: IFillType;
 };
 export type IBorderStyle = Omit<IStrokeStyle, 'outerBorder' | 'innerBorder'> & {
     distance: number | string;
 };
+export type IStrokeType = boolean | string | IColor | null;
 export type IStrokeStyle = {
     outerBorder: Partial<IBorderStyle>;
     innerBorder: Partial<IBorderStyle>;
-    strokeColor: string | IColor;
     strokeOpacity: number;
     lineDash: number[];
     lineDashOffset: number;
@@ -60,7 +60,7 @@ export type IStrokeStyle = {
     lineJoin: CanvasLineJoin;
     miterLimit: number;
     strokeBoundsBuffer: number;
-    stroke: boolean[] | number | boolean | null;
+    stroke: IStrokeType[] | IStrokeType;
 };
 type TextureType = 'circle' | 'diamond' | 'rect' | 'vertical-line' | 'horizontal-line' | 'bias-lr' | 'bias-rl' | 'grid';
 export type IGraphicStyle = IFillStyle & IStrokeStyle & {

package/cjs/interface/graphic.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/interface/graphic.ts"],"names":[],"mappings":"","file":"graphic.js","sourcesContent":["import type { IAABBBounds, IOBBBounds, IMatrix, IPointLike, IPoint } from '@visactor/vutils';\nimport type { IAnimate, IStep, EasingType, IAnimateTarget } from './animate';\nimport type { IColor } from './color';\nimport type { IGroup } from './graphic/group';\nimport type { IShadowRoot } from './graphic/shadow-root';\nimport type { ILayer } from './layer';\nimport type { INode } from './node-tree';\nimport type { ICustomPath2D } from './path';\nimport type { IStage } from './stage';\nimport type { IGlyphGraphicAttribute } from './graphic/glyph';\nimport type { IContainPointMode } from '../common/enums';\nimport type { IFace3d } from './graphic/face3d';\n\ntype IStrokeSeg = {\n  start: number; // 百分比\n  // end和length二选一\n  end: number; // 百分比\n  length: number; // 像素长度\n};\n\n// TODO 最后加一个any\nexport type GraphicType =\n  | 'area'\n  | 'circle'\n  | 'ellipse'\n  | 'line'\n  | 'rect'\n  | 'rect3d'\n  | 'path'\n  | 'richtext'\n  | 'text'\n  | 'arc'\n  | 'arc3d'\n  | 'image'\n  | 'symbol'\n  | 'group'\n  | 'shadowroot'\n  | 'polygon'\n  | 'pyramid3d'\n  | 'glyph';\n\n// Cursor style\n// See: https://developer.mozilla.org/en-US/docs/Web/CSS/cursor\nexport type Cursor =\n  | 'auto'\n  | 'default'\n  | 'none'\n  | 'context-menu'\n  | 'help'\n  | 'pointer'\n  | 'progress'\n  | 'wait'\n  | 'cell'\n  | 'crosshair'\n  | 'text'\n  | 'vertical-text'\n  | 'alias'\n  | 'copy'\n  | 'move'\n  | 'no-drop'\n  | 'not-allowed'\n  | 'grab'\n  | 'grabbing'\n  | 'all-scroll'\n  | 'col-resize'\n  | 'row-resize'\n  | 'n-resize'\n  | 'e-resize'\n  | 's-resize'\n  | 'w-resize'\n  | 'ne-resize'\n  | 'nw-resize'\n  | 'se-resize'\n  | 'sw-resize'\n  | 'ew-resize'\n  | 'ns-resize'\n  | 'nesw-resize'\n  | 'nwse-resize'\n  | 'zoom-in'\n  | 'zoom-out';\n\nexport type ITransform = {\n  x: number;\n  y: number;\n  z: number;\n  dx: number;\n  dy: number;\n  dz: number;\n  scrollX: number;\n  scrollY: number;\n  scaleX: number;\n  scaleY: number;\n  scaleZ: number;\n  angle: number;\n  alpha: number;\n  beta: number;\n  anchor: [number | string, number | string]; // 基于AABB的锚点位置，用于简单的定位某些path\n  anchor3d: [number | string, number | string, number] | [number | string, number | string]; // 3d的锚点位置\n  postMatrix: IMatrix;\n};\n\nexport type IFillStyle = {\n  fillColor: string | IColor;\n  fillOpacity: number;\n  shadowBlur: number;\n  shadowColor: string;\n  shadowOffsetX: number;\n  shadowOffsetY: number;\n  fill: boolean | null;\n};\n\nexport type IBorderStyle = Omit<IStrokeStyle, 'outerBorder' | 'innerBorder'> & {\n  distance: number | string;\n};\n\nexport type IStrokeStyle = {\n  outerBorder: Partial<IBorderStyle>;\n  innerBorder: Partial<IBorderStyle>;\n  strokeColor: string | IColor;\n  strokeOpacity: number;\n  lineDash: number[];\n  lineDashOffset: number;\n  lineWidth: number;\n  lineCap: CanvasLineCap;\n  lineJoin: CanvasLineJoin;\n  miterLimit: number;\n  // 描边的boundsBuffer，用于控制bounds的buffer\n  strokeBoundsBuffer: number;\n  /**\n   * stroke - true 全描边\n   * stroke - false 不描边\n   * stroke 为数值类型，适用于rect\\arc等图形，用于配置部分描边的场景，其中\n   *\n   * 0b00000 - 不描边\n   * 0b000001 - top\n   * 0b000010 - right\n   * 0b000100 - bottom\n   * 0b001000 - left\n   * 相应的：\n   * 0b000011 - top + right\n   * 0b000111 - top + right + bottom\n   * 0b001111 - 全描边\n   *\n   * stroke - boolean[]，适用于rect\\arc等图形，用于配置部分描边的场景\n   */\n  stroke: boolean[] | number | boolean | null;\n};\n\ntype TextureType = 'circle' | 'diamond' | 'rect' | 'vertical-line' | 'horizontal-line' | 'bias-lr' | 'bias-rl' | 'grid';\n\nexport type IGraphicStyle = IFillStyle &\n  IStrokeStyle & {\n    opacity: number;\n    backgroundMode: number; // 填充模式（与具体图元有关）\n    background: string | HTMLImageElement | HTMLCanvasElement | null; // 背景，可以与fill同时存在\n    texture: TextureType | string; // 纹理\n    textureColor: string; // 纹理颜色\n    textureSize: number; // 纹理大小\n    texturePadding: number; // 纹理间隙\n    blur: number;\n    cursor: Cursor | null; // 鼠标样式\n  };\n\nexport type IGraphicAttribute = IGraphicStyle &\n  ITransform & {\n    /**\n     * stroke百分比\n     */\n    strokeSeg: IStrokeSeg | null;\n    // 包围盒的padding\n    boundsPadding: number | number[];\n    /**\n     * 选择模式，精确模式，粗糙模式（包围盒模式），自定义模式\n     */\n    pickMode: 'accurate' | 'imprecise' | 'custom';\n    boundsMode: 'accurate' | 'imprecise';\n    customPickShape: () => boolean | null;\n    /**\n     * 是否支持事件拾取，默认为 true。\n     * @default true\n     */\n    pickable: boolean;\n    /**\n     * 对于 group 节点，是否支持其子元素的事件拾取，默认为 true。\n     * 如果 group `pickable` 关闭，`childrenPickable` 开启，那么 group 的子节点仍参与事件拾取\n     * @default true\n     */\n    childrenPickable: boolean;\n    /**\n     * 元素是否可见。\n     * @default true\n     */\n    visible: boolean;\n    zIndex: number;\n    layout: any;\n    /**\n     * 是否在3d中控制方向\n     * false: 不控制方向\n     * true: 始终控制方向朝摄像机\n     */\n    keepDirIn3d?: boolean;\n  };\n\nexport interface IGraphicJson<T extends Partial<IGraphicAttribute> = Partial<IGraphicAttribute>> {\n  attribute: Partial<T>;\n  _uid: number;\n  type: string;\n  name: string;\n  children: IGraphicJson<T>[];\n}\n\n/** the context of setAttribute */\nexport type ISetAttributeContext = {\n  /** type of setAttribute */\n  type?: number;\n  animationState?: {\n    step?: IStep;\n    isFirstFrameOfStep?: boolean;\n    /** ratio of animation */\n    ratio?: number;\n    /** is animation end? */\n    end?: boolean;\n  };\n};\n\nexport type IGraphicAnimateParams = {\n  id?: number | string;\n  onStart?: () => void;\n  onFrame?: (step: IStep, ratio: number) => void;\n  onEnd?: () => void;\n  onRemove?: () => void;\n  interpolate?: (key: string, ratio: number, from: any, to: any, nextAttributes: any) => boolean;\n};\n\nexport interface IGraphic<T extends Partial<IGraphicAttribute> = Partial<IGraphicAttribute>>\n  extends INode,\n    IAnimateTarget {\n  type?: GraphicType;\n  numberType?: number;\n  stage?: IStage;\n  layer?: ILayer;\n  shadowRoot?: IShadowRoot;\n  glyphHost?: IGraphic<IGlyphGraphicAttribute>;\n  backgroundImg?: boolean;\n\n  valid: boolean;\n  parent: IGroup | null;\n  isContainer?: boolean;\n  // 是否是3d模式（是否应用3d视角）\n  in3dMode?: boolean;\n\n  // 上次更新的stamp\n  stamp?: number;\n  animationBackUps?: {\n    from: Record<string, any>;\n    to: Record<string, any>;\n  };\n\n  attribute: Partial<T>;\n\n  /** 用于实现morph动画场景，转换成bezier曲线渲染 */\n  pathProxy?: ICustomPath2D | ((attrs: T) => ICustomPath2D);\n  incremental?: number;\n  incrementalAt?: number;\n\n  /** 记录state对应的图形属性 */\n  states?: Record<string, Partial<T>>;\n  normalAttrs?: Partial<T>;\n  stateProxy?: (stateName: string, targetStates?: string[]) => Partial<T>;\n  findFace?: () => IFace3d;\n  toggleState: (stateName: string, hasAnimation?: boolean) => void;\n  removeState: (stateName: string, hasAnimation?: boolean) => void;\n  clearStates: (hasAnimation?: boolean) => void;\n  useStates: (states: string[], hasAnimation?: boolean) => void;\n  addState: (stateName: string, keepCurrentStates?: boolean, hasAnimation?: boolean) => void;\n  hasState: (stateName?: string) => boolean;\n  getState: (stateName: string) => Partial<T>;\n  onBeforeAttributeUpdate?: (\n    val: any,\n    attributes: Partial<T>,\n    key: null | string | string[],\n    context?: ISetAttributeContext\n  ) => T | undefined;\n  applyStateAttrs: (attrs: Partial<T>, stateNames: string[], hasAnimation?: boolean, isClear?: boolean) => void;\n  updateNormalAttrs: (stateAttrs: Partial<T>) => void;\n\n  // get\n  readonly AABBBounds: IAABBBounds; // 用于获取当前节点的AABB包围盒\n  readonly OBBBounds: IOBBBounds; // 获取OBB包围盒，旋转防重叠需要用\n  readonly globalAABBBounds: IAABBBounds; // 全局AABB包围盒\n  readonly transMatrix: IMatrix; // 变换矩阵，动态计算\n  readonly globalTransMatrix: IMatrix; // 变换矩阵，动态计算\n\n  getOffsetXY: (attr?: ITransform) => IPoint;\n\n  // function\n  containsPoint: (x: number, y: number, mode?: IContainPointMode) => boolean;\n\n  setMode: (mode: '3d' | '2d') => void;\n  isValid: () => boolean;\n\n  // TODO: transform API\n  // 基于当前transform的变换，普通用户尽量别用，拿捏不住的~\n  translate: (x: number, y: number) => this;\n  translateTo: (x: number, y: number) => this;\n  scale: (scaleX: number, scaleY: number, scaleCenter?: IPointLike) => this;\n  scaleTo: (scaleX: number, scaleY: number) => this;\n  rotate: (angle: number) => this;\n  rotateTo: (angle: number) => this;\n  skewTo: (b: number, c: number) => this;\n  addUpdateBoundTag: () => void;\n  addUpdateShapeAndBoundsTag: () => void;\n\n  update: (d?: { bounds: boolean; trans: boolean }) => void;\n\n  // animate\n  animate: (params?: IGraphicAnimateParams) => IAnimate;\n\n  // 语法糖，可有可无，有的为了首屏性能考虑做成get方法，有的由外界直接托管，内部不赋值\n  name?: string;\n\n  // 供render处理shape缓存tag\n  shouldUpdateShape: () => boolean;\n  clearUpdateShapeTag: () => void;\n\n  // // 供render缓存shape\n  // cacheShape?: ICustomPath2D;\n  // // 线段使用的path2D\n  // cacheLine?: ISegPath2D | ISegPath2D[];\n  // // 面积图使用的path2D\n  // cacheArea?: IAreaCacheItem | IAreaCacheItem[];\n\n  setAttributes: (params: Partial<T>, forceUpdateTag?: boolean, context?: ISetAttributeContext) => void;\n\n  initAttributes: (params: Partial<T>) => void;\n\n  setAttribute: (key: string, value: any, forceUpdateTag?: boolean, context?: ISetAttributeContext) => void;\n\n  setStage: (stage?: IStage, layer?: ILayer) => void;\n  onSetStage: (cb: (g: IGraphic, stage: IStage) => void) => void;\n\n  shouldUpdateAABBBounds: () => boolean;\n  shouldSelfChangeUpdateAABBBounds: () => boolean;\n  shouldUpdateGlobalMatrix: () => boolean;\n\n  addUpdatePositionTag: () => void;\n  addUpdateGlobalPositionTag: () => void;\n\n  attachShadow: () => IShadowRoot;\n  detachShadow: () => void;\n\n  toJson: () => IGraphicJson;\n\n  /** 创建pathProxy */\n  createPathProxy: (path?: string) => void;\n  /** 将图形转换成CustomPath2D */\n  toCustomPath?: () => ICustomPath2D;\n\n  resources?: Map<\n    string | HTMLImageElement | HTMLCanvasElement,\n    { state: 'init' | 'loading' | 'success' | 'fail'; data?: HTMLImageElement | HTMLCanvasElement }\n  >;\n  imageLoadSuccess: (url: string, data: HTMLImageElement) => void;\n  imageLoadFail: (url: string) => void;\n\n  clone: () => IGraphic;\n}\n\nexport interface IRoot extends IGraphic {\n  pick: (x: number, y: number) => IGraphic;\n}\n\n/**\n * 动画配置\n */\nexport type IAnimateConfig = {\n  duration?: number;\n  easing?: EasingType;\n};\n"]}
+{"version":3,"sources":["../../src/interface/graphic.ts"],"names":[],"mappings":"","file":"graphic.js","sourcesContent":["import type { IAABBBounds, IOBBBounds, IMatrix, IPointLike, IPoint } from '@visactor/vutils';\nimport type { IAnimate, IStep, EasingType, IAnimateTarget } from './animate';\nimport type { IColor } from './color';\nimport type { IGroup } from './graphic/group';\nimport type { IShadowRoot } from './graphic/shadow-root';\nimport type { ILayer } from './layer';\nimport type { INode } from './node-tree';\nimport type { ICustomPath2D } from './path';\nimport type { IStage } from './stage';\nimport type { IGlyphGraphicAttribute } from './graphic/glyph';\nimport type { IContainPointMode } from '../common/enums';\nimport type { IFace3d } from './graphic/face3d';\n\ntype IStrokeSeg = {\n  start: number; // 百分比\n  // end和length二选一\n  end: number; // 百分比\n  length: number; // 像素长度\n};\n\n// TODO 最后加一个any\nexport type GraphicType =\n  | 'area'\n  | 'circle'\n  | 'ellipse'\n  | 'line'\n  | 'rect'\n  | 'rect3d'\n  | 'path'\n  | 'richtext'\n  | 'text'\n  | 'arc'\n  | 'arc3d'\n  | 'image'\n  | 'symbol'\n  | 'group'\n  | 'shadowroot'\n  | 'polygon'\n  | 'pyramid3d'\n  | 'glyph';\n\n// Cursor style\n// See: https://developer.mozilla.org/en-US/docs/Web/CSS/cursor\nexport type Cursor =\n  | 'auto'\n  | 'default'\n  | 'none'\n  | 'context-menu'\n  | 'help'\n  | 'pointer'\n  | 'progress'\n  | 'wait'\n  | 'cell'\n  | 'crosshair'\n  | 'text'\n  | 'vertical-text'\n  | 'alias'\n  | 'copy'\n  | 'move'\n  | 'no-drop'\n  | 'not-allowed'\n  | 'grab'\n  | 'grabbing'\n  | 'all-scroll'\n  | 'col-resize'\n  | 'row-resize'\n  | 'n-resize'\n  | 'e-resize'\n  | 's-resize'\n  | 'w-resize'\n  | 'ne-resize'\n  | 'nw-resize'\n  | 'se-resize'\n  | 'sw-resize'\n  | 'ew-resize'\n  | 'ns-resize'\n  | 'nesw-resize'\n  | 'nwse-resize'\n  | 'zoom-in'\n  | 'zoom-out';\n\nexport type ITransform = {\n  x: number;\n  y: number;\n  z: number;\n  dx: number;\n  dy: number;\n  dz: number;\n  scrollX: number;\n  scrollY: number;\n  scaleX: number;\n  scaleY: number;\n  scaleZ: number;\n  angle: number;\n  alpha: number;\n  beta: number;\n  anchor: [number | string, number | string]; // 基于AABB的锚点位置，用于简单的定位某些path\n  anchor3d: [number | string, number | string, number] | [number | string, number | string]; // 3d的锚点位置\n  postMatrix: IMatrix;\n};\n\nexport type IFillType = boolean | string | IColor;\nexport type IFillStyle = {\n  fillOpacity: number;\n  shadowBlur: number;\n  shadowColor: string;\n  shadowOffsetX: number;\n  shadowOffsetY: number;\n  fill: IFillType;\n};\n\nexport type IBorderStyle = Omit<IStrokeStyle, 'outerBorder' | 'innerBorder'> & {\n  distance: number | string;\n};\n\nexport type IStrokeType = boolean | string | IColor | null;\nexport type IStrokeStyle = {\n  outerBorder: Partial<IBorderStyle>;\n  innerBorder: Partial<IBorderStyle>;\n  strokeOpacity: number;\n  lineDash: number[];\n  lineDashOffset: number;\n  lineWidth: number;\n  lineCap: CanvasLineCap;\n  lineJoin: CanvasLineJoin;\n  miterLimit: number;\n  // 描边的boundsBuffer，用于控制bounds的buffer\n  strokeBoundsBuffer: number;\n  /**\n   * stroke - true 全描边\n   * stroke - false 不描边\n   * stroke 为数值类型，适用于rect\\arc等图形，用于配置部分描边的场景，其中\n   *\n   * 0b00000 - 不描边\n   * 0b000001 - top\n   * 0b000010 - right\n   * 0b000100 - bottom\n   * 0b001000 - left\n   * 相应的：\n   * 0b000011 - top + right\n   * 0b000111 - top + right + bottom\n   * 0b001111 - 全描边\n   *\n   * stroke - boolean[]，适用于rect\\arc等图形，用于配置部分描边的场景\n   */\n  stroke: IStrokeType[] | IStrokeType;\n};\n\ntype TextureType = 'circle' | 'diamond' | 'rect' | 'vertical-line' | 'horizontal-line' | 'bias-lr' | 'bias-rl' | 'grid';\n\nexport type IGraphicStyle = IFillStyle &\n  IStrokeStyle & {\n    opacity: number;\n    backgroundMode: number; // 填充模式（与具体图元有关）\n    background: string | HTMLImageElement | HTMLCanvasElement | null; // 背景，可以与fill同时存在\n    texture: TextureType | string; // 纹理\n    textureColor: string; // 纹理颜色\n    textureSize: number; // 纹理大小\n    texturePadding: number; // 纹理间隙\n    blur: number;\n    cursor: Cursor | null; // 鼠标样式\n  };\n\nexport type IGraphicAttribute = IGraphicStyle &\n  ITransform & {\n    /**\n     * stroke百分比\n     */\n    strokeSeg: IStrokeSeg | null;\n    // 包围盒的padding\n    boundsPadding: number | number[];\n    /**\n     * 选择模式，精确模式，粗糙模式（包围盒模式），自定义模式\n     */\n    pickMode: 'accurate' | 'imprecise' | 'custom';\n    boundsMode: 'accurate' | 'imprecise';\n    customPickShape: () => boolean | null;\n    /**\n     * 是否支持事件拾取，默认为 true。\n     * @default true\n     */\n    pickable: boolean;\n    /**\n     * 对于 group 节点，是否支持其子元素的事件拾取，默认为 true。\n     * 如果 group `pickable` 关闭，`childrenPickable` 开启，那么 group 的子节点仍参与事件拾取\n     * @default true\n     */\n    childrenPickable: boolean;\n    /**\n     * 元素是否可见。\n     * @default true\n     */\n    visible: boolean;\n    zIndex: number;\n    layout: any;\n    /**\n     * 是否在3d中控制方向\n     * false: 不控制方向\n     * true: 始终控制方向朝摄像机\n     */\n    keepDirIn3d?: boolean;\n  };\n\nexport interface IGraphicJson<T extends Partial<IGraphicAttribute> = Partial<IGraphicAttribute>> {\n  attribute: Partial<T>;\n  _uid: number;\n  type: string;\n  name: string;\n  children: IGraphicJson<T>[];\n}\n\n/** the context of setAttribute */\nexport type ISetAttributeContext = {\n  /** type of setAttribute */\n  type?: number;\n  animationState?: {\n    step?: IStep;\n    isFirstFrameOfStep?: boolean;\n    /** ratio of animation */\n    ratio?: number;\n    /** is animation end? */\n    end?: boolean;\n  };\n};\n\nexport type IGraphicAnimateParams = {\n  id?: number | string;\n  onStart?: () => void;\n  onFrame?: (step: IStep, ratio: number) => void;\n  onEnd?: () => void;\n  onRemove?: () => void;\n  interpolate?: (key: string, ratio: number, from: any, to: any, nextAttributes: any) => boolean;\n};\n\nexport interface IGraphic<T extends Partial<IGraphicAttribute> = Partial<IGraphicAttribute>>\n  extends INode,\n    IAnimateTarget {\n  type?: GraphicType;\n  numberType?: number;\n  stage?: IStage;\n  layer?: ILayer;\n  shadowRoot?: IShadowRoot;\n  glyphHost?: IGraphic<IGlyphGraphicAttribute>;\n  backgroundImg?: boolean;\n\n  valid: boolean;\n  parent: IGroup | null;\n  isContainer?: boolean;\n  // 是否是3d模式（是否应用3d视角）\n  in3dMode?: boolean;\n\n  // 上次更新的stamp\n  stamp?: number;\n  animationBackUps?: {\n    from: Record<string, any>;\n    to: Record<string, any>;\n  };\n\n  attribute: Partial<T>;\n\n  /** 用于实现morph动画场景，转换成bezier曲线渲染 */\n  pathProxy?: ICustomPath2D | ((attrs: T) => ICustomPath2D);\n  incremental?: number;\n  incrementalAt?: number;\n\n  /** 记录state对应的图形属性 */\n  states?: Record<string, Partial<T>>;\n  normalAttrs?: Partial<T>;\n  stateProxy?: (stateName: string, targetStates?: string[]) => Partial<T>;\n  findFace?: () => IFace3d;\n  toggleState: (stateName: string, hasAnimation?: boolean) => void;\n  removeState: (stateName: string, hasAnimation?: boolean) => void;\n  clearStates: (hasAnimation?: boolean) => void;\n  useStates: (states: string[], hasAnimation?: boolean) => void;\n  addState: (stateName: string, keepCurrentStates?: boolean, hasAnimation?: boolean) => void;\n  hasState: (stateName?: string) => boolean;\n  getState: (stateName: string) => Partial<T>;\n  onBeforeAttributeUpdate?: (\n    val: any,\n    attributes: Partial<T>,\n    key: null | string | string[],\n    context?: ISetAttributeContext\n  ) => T | undefined;\n  applyStateAttrs: (attrs: Partial<T>, stateNames: string[], hasAnimation?: boolean, isClear?: boolean) => void;\n  updateNormalAttrs: (stateAttrs: Partial<T>) => void;\n\n  // get\n  readonly AABBBounds: IAABBBounds; // 用于获取当前节点的AABB包围盒\n  readonly OBBBounds: IOBBBounds; // 获取OBB包围盒，旋转防重叠需要用\n  readonly globalAABBBounds: IAABBBounds; // 全局AABB包围盒\n  readonly transMatrix: IMatrix; // 变换矩阵，动态计算\n  readonly globalTransMatrix: IMatrix; // 变换矩阵，动态计算\n\n  getOffsetXY: (attr?: ITransform) => IPoint;\n\n  // function\n  containsPoint: (x: number, y: number, mode?: IContainPointMode) => boolean;\n\n  setMode: (mode: '3d' | '2d') => void;\n  isValid: () => boolean;\n\n  // TODO: transform API\n  // 基于当前transform的变换，普通用户尽量别用，拿捏不住的~\n  translate: (x: number, y: number) => this;\n  translateTo: (x: number, y: number) => this;\n  scale: (scaleX: number, scaleY: number, scaleCenter?: IPointLike) => this;\n  scaleTo: (scaleX: number, scaleY: number) => this;\n  rotate: (angle: number) => this;\n  rotateTo: (angle: number) => this;\n  skewTo: (b: number, c: number) => this;\n  addUpdateBoundTag: () => void;\n  addUpdateShapeAndBoundsTag: () => void;\n\n  update: (d?: { bounds: boolean; trans: boolean }) => void;\n\n  // animate\n  animate: (params?: IGraphicAnimateParams) => IAnimate;\n\n  // 语法糖，可有可无，有的为了首屏性能考虑做成get方法，有的由外界直接托管，内部不赋值\n  name?: string;\n\n  // 供render处理shape缓存tag\n  shouldUpdateShape: () => boolean;\n  clearUpdateShapeTag: () => void;\n\n  // // 供render缓存shape\n  // cacheShape?: ICustomPath2D;\n  // // 线段使用的path2D\n  // cacheLine?: ISegPath2D | ISegPath2D[];\n  // // 面积图使用的path2D\n  // cacheArea?: IAreaCacheItem | IAreaCacheItem[];\n\n  setAttributes: (params: Partial<T>, forceUpdateTag?: boolean, context?: ISetAttributeContext) => void;\n\n  initAttributes: (params: Partial<T>) => void;\n\n  setAttribute: (key: string, value: any, forceUpdateTag?: boolean, context?: ISetAttributeContext) => void;\n\n  setStage: (stage?: IStage, layer?: ILayer) => void;\n  onSetStage: (cb: (g: IGraphic, stage: IStage) => void) => void;\n\n  shouldUpdateAABBBounds: () => boolean;\n  shouldSelfChangeUpdateAABBBounds: () => boolean;\n  shouldUpdateGlobalMatrix: () => boolean;\n\n  addUpdatePositionTag: () => void;\n  addUpdateGlobalPositionTag: () => void;\n\n  attachShadow: () => IShadowRoot;\n  detachShadow: () => void;\n\n  toJson: () => IGraphicJson;\n\n  /** 创建pathProxy */\n  createPathProxy: (path?: string) => void;\n  /** 将图形转换成CustomPath2D */\n  toCustomPath?: () => ICustomPath2D;\n\n  resources?: Map<\n    string | HTMLImageElement | HTMLCanvasElement,\n    { state: 'init' | 'loading' | 'success' | 'fail'; data?: HTMLImageElement | HTMLCanvasElement }\n  >;\n  imageLoadSuccess: (url: string, data: HTMLImageElement) => void;\n  imageLoadFail: (url: string) => void;\n\n  clone: () => IGraphic;\n}\n\nexport interface IRoot extends IGraphic {\n  pick: (x: number, y: number) => IGraphic;\n}\n\n/**\n * 动画配置\n */\nexport type IAnimateConfig = {\n  duration?: number;\n  easing?: EasingType;\n};\n"]}

package/cjs/interface/index.d.ts

@@ -32,3 +32,5 @@ export * from './animate';
 export * from './camera';
 export * from './matrix';
 export * from './light';
+export * from './curve';
+export * from './graphic-service';

package/cjs/interface/index.js

@@ -33,5 +33,6 @@ __exportStar(require("./stage"), exports), __exportStar(require("./canvas"), exp
 __exportStar(require("./context"), exports), __exportStar(require("./path"), exports), 
 __exportStar(require("./color"), exports), __exportStar(require("./common"), exports), 
 __exportStar(require("./animate"), exports), __exportStar(require("./camera"), exports), 
-__exportStar(require("./matrix"), exports), __exportStar(require("./light"), exports);
+__exportStar(require("./matrix"), exports), __exportStar(require("./light"), exports), 
+__exportStar(require("./curve"), exports), __exportStar(require("./graphic-service"), exports);
 //# sourceMappingURL=index.js.map

package/cjs/interface/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/interface/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AA+CA,2CAAyB;AACzB,2CAAyB;AACzB,8CAA4B;AAC5B,4CAA0B;AAC1B,kDAAgC;AAChC,gDAA8B;AAC9B,kDAAgC;AAChC,iDAA+B;AAC/B,mDAAiC;AACjC,kDAAgC;AAChC,kDAAgC;AAChC,iDAA+B;AAC/B,iDAA+B;AAC/B,iDAA+B;AAC/B,mDAAiC;AACjC,kDAAgC;AAChC,qDAAmC;AACnC,mDAAiC;AACjC,iDAA+B;AAC/B,oDAAkC;AAClC,sDAAoC;AACpC,wDAAsC;AACtC,mDAAiC;AACjC,0CAAwB;AACxB,0CAAwB;AACxB,2CAAyB;AACzB,4CAA0B;AAC1B,yCAAuB;AACvB,0CAAwB;AACxB,2CAAyB;AACzB,4CAA0B;AAC1B,2CAAyB;AACzB,2CAAyB;AACzB,0CAAwB","file":"index.js","sourcesContent":["// export type MaybePromise<T> = T | PromiseLike<T>;\n\n// // 所有的接口都应当继承这个，避免内存没有释放\n// export interface Disposable {\n//   dispose: (params?: any) => void;\n// }\n\n// export { INode } from './node-tree';\n// export { IGraphic, IGraphicAttribute, IFillStyle, IStrokeStyle, IStyle, ITransform } from './graphic';\n// export { IArc, IArcAttribute, IArcGraphicAttribute, IArcCache } from './graphic/arc';\n// export { IArea, IAreaAttribute, IAreaGraphicAttribute, IAreaCacheItem, IAreaSegment } from './graphic/area';\n// export { ICircle, ICircleAttribute, ICircleGraphicAttribute } from './graphic/circle';\n// export { IGroup, IGroupAttribute } from './graphic/group';\n// export { IImage, IImageAttribute, IImageGraphicAttribute, IRepeatType } from './graphic/image';\n// export { ILine, ILineAttribute, ILineGraphicAttribute, ISegment } from './graphic/line';\n// export { IPath, IPathAttribute, IPathGraphicAttribute } from './graphic/path';\n// export { IRect, IRectAttribute, IRectGraphicAttribute } from './graphic/rect';\n// export {\n//   IRichText,\n//   IRichTextAttribute,\n//   RichTextCharacter,\n//   RichTextFontStyle,\n//   RichTextGlobalAlignType,\n//   RichTextGlobalBaselineType,\n//   RichTextScript,\n//   RichTextTextAlign,\n//   RichTextTextDecoration,\n//   RichTextVerticalDirection,\n//   RichTextWordBreak,\n//   IRichTextGraphicAttribute\n// } from './graphic/richText';\n// export { ISymbol, ISymbolAttribute, ISymbolGraphicAttribute, SymbolType } from './graphic/symbol';\n// export { IText, ITextAttribute, ITextGraphicAttribute, ITextCache } from './graphic/text';\n// export { ILayer, ILayerDrawParams } from './layer';\n// export { IStage, IStageParams, IExportType } from './stage';\n\n// // export * from './graphic';\n// export { ICanvas, ICanvasLike } from './canvas';\n// export { IContext2d, IContextLike, ICommonStyleParams, IStrokeStyleParams, ITextStyleParams } from './context';\n\n// export { IPath2D, ICustomPath2D, CommandType, ICurvePath, ICurve } from './path';\n\n// export { IColor, IColorStop, IConicalGradient, ILinearGradient, IRadialGradient } from './color';\n\n// export { ICurveType } from './common';\n// // export { IAreaCacheItem } from './graphic';\n\nexport * from './global';\nexport * from './common';\nexport * from './node-tree';\nexport * from './graphic';\nexport * from './graphic/index';\nexport * from './graphic/arc';\nexport * from './graphic/arc3d';\nexport * from './graphic/area';\nexport * from './graphic/circle';\nexport * from './graphic/group';\nexport * from './graphic/image';\nexport * from './graphic/line';\nexport * from './graphic/path';\nexport * from './graphic/rect';\nexport * from './graphic/rect3d';\nexport * from './graphic/glyph';\nexport * from './graphic/richText';\nexport * from './graphic/symbol';\nexport * from './graphic/text';\nexport * from './graphic/polygon';\nexport * from './graphic/pyramid3d';\nexport * from './graphic/shadow-root';\nexport * from './graphic/face3d';\nexport * from './layer';\nexport * from './stage';\nexport * from './canvas';\nexport * from './context';\nexport * from './path';\nexport * from './color';\nexport * from './common';\nexport * from './animate';\nexport * from './camera';\nexport * from './matrix';\nexport * from './light';\n"]}
+{"version":3,"sources":["../../src/interface/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AA+CA,2CAAyB;AACzB,2CAAyB;AACzB,8CAA4B;AAC5B,4CAA0B;AAC1B,kDAAgC;AAChC,gDAA8B;AAC9B,kDAAgC;AAChC,iDAA+B;AAC/B,mDAAiC;AACjC,kDAAgC;AAChC,kDAAgC;AAChC,iDAA+B;AAC/B,iDAA+B;AAC/B,iDAA+B;AAC/B,mDAAiC;AACjC,kDAAgC;AAChC,qDAAmC;AACnC,mDAAiC;AACjC,iDAA+B;AAC/B,oDAAkC;AAClC,sDAAoC;AACpC,wDAAsC;AACtC,mDAAiC;AACjC,0CAAwB;AACxB,0CAAwB;AACxB,2CAAyB;AACzB,4CAA0B;AAC1B,yCAAuB;AACvB,0CAAwB;AACxB,2CAAyB;AACzB,4CAA0B;AAC1B,2CAAyB;AACzB,2CAAyB;AACzB,0CAAwB;AACxB,0CAAwB;AACxB,oDAAkC","file":"index.js","sourcesContent":["// export type MaybePromise<T> = T | PromiseLike<T>;\n\n// // 所有的接口都应当继承这个，避免内存没有释放\n// export interface Disposable {\n//   dispose: (params?: any) => void;\n// }\n\n// export { INode } from './node-tree';\n// export { IGraphic, IGraphicAttribute, IFillStyle, IStrokeStyle, IStyle, ITransform } from './graphic';\n// export { IArc, IArcAttribute, IArcGraphicAttribute, IArcCache } from './graphic/arc';\n// export { IArea, IAreaAttribute, IAreaGraphicAttribute, IAreaCacheItem, IAreaSegment } from './graphic/area';\n// export { ICircle, ICircleAttribute, ICircleGraphicAttribute } from './graphic/circle';\n// export { IGroup, IGroupAttribute } from './graphic/group';\n// export { IImage, IImageAttribute, IImageGraphicAttribute, IRepeatType } from './graphic/image';\n// export { ILine, ILineAttribute, ILineGraphicAttribute, ISegment } from './graphic/line';\n// export { IPath, IPathAttribute, IPathGraphicAttribute } from './graphic/path';\n// export { IRect, IRectAttribute, IRectGraphicAttribute } from './graphic/rect';\n// export {\n//   IRichText,\n//   IRichTextAttribute,\n//   RichTextCharacter,\n//   RichTextFontStyle,\n//   RichTextGlobalAlignType,\n//   RichTextGlobalBaselineType,\n//   RichTextScript,\n//   RichTextTextAlign,\n//   RichTextTextDecoration,\n//   RichTextVerticalDirection,\n//   RichTextWordBreak,\n//   IRichTextGraphicAttribute\n// } from './graphic/richText';\n// export { ISymbol, ISymbolAttribute, ISymbolGraphicAttribute, SymbolType } from './graphic/symbol';\n// export { IText, ITextAttribute, ITextGraphicAttribute, ITextCache } from './graphic/text';\n// export { ILayer, ILayerDrawParams } from './layer';\n// export { IStage, IStageParams, IExportType } from './stage';\n\n// // export * from './graphic';\n// export { ICanvas, ICanvasLike } from './canvas';\n// export { IContext2d, IContextLike, ICommonStyleParams, IStrokeStyleParams, ITextStyleParams } from './context';\n\n// export { IPath2D, ICustomPath2D, CommandType, ICurvePath, ICurve } from './path';\n\n// export { IColor, IColorStop, IConicalGradient, ILinearGradient, IRadialGradient } from './color';\n\n// export { ICurveType } from './common';\n// // export { IAreaCacheItem } from './graphic';\n\nexport * from './global';\nexport * from './common';\nexport * from './node-tree';\nexport * from './graphic';\nexport * from './graphic/index';\nexport * from './graphic/arc';\nexport * from './graphic/arc3d';\nexport * from './graphic/area';\nexport * from './graphic/circle';\nexport * from './graphic/group';\nexport * from './graphic/image';\nexport * from './graphic/line';\nexport * from './graphic/path';\nexport * from './graphic/rect';\nexport * from './graphic/rect3d';\nexport * from './graphic/glyph';\nexport * from './graphic/richText';\nexport * from './graphic/symbol';\nexport * from './graphic/text';\nexport * from './graphic/polygon';\nexport * from './graphic/pyramid3d';\nexport * from './graphic/shadow-root';\nexport * from './graphic/face3d';\nexport * from './layer';\nexport * from './stage';\nexport * from './canvas';\nexport * from './context';\nexport * from './path';\nexport * from './color';\nexport * from './common';\nexport * from './animate';\nexport * from './camera';\nexport * from './matrix';\nexport * from './light';\nexport * from './curve';\nexport * from './graphic-service';\n"]}

package/cjs/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/cjs/interface/path.js

@@ -1,13 +1,6 @@
 "use strict";
 
-var ICurveTypeEnum;
-
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.ICurveTypeEnum = exports.strCommandMap = void 0, exports.strCommandMap = [ "arc", "arcTo", "bezierCurveTo", "closePath", "ellipse", "lineTo", "moveTo", "quadraticCurveTo", "rect" ], 
-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 = exports.ICurveTypeEnum || (exports.ICurveTypeEnum = {}));
+}), exports.strCommandMap = void 0, exports.strCommandMap = [ "arc", "arcTo", "bezierCurveTo", "closePath", "ellipse", "lineTo", "moveTo", "quadraticCurveTo", "rect" ];
 //# sourceMappingURL=path.js.map

package/cjs/interface/path.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/interface/path.ts"],"names":[],"mappings":";;;AAIa,QAAA,aAAa,GAAG;IAC3B,KAAK;IACL,OAAO;IACP,eAAe;IACf,WAAW;IACX,SAAS;IACT,QAAQ;IACR,QAAQ;IACR,kBAAkB;IAClB,MAAM;CACP,CAAC;AA0BF,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,GAAd,sBAAc,KAAd,sBAAc,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,QAAA,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/cjs/kits/env.js

@@ -4,14 +4,14 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.loadTaroContributions = exports.loadFeishuContributions = void 0;
 
-const modules_1 = require("../modules"), picker_1 = require("../picker");
+const container_1 = require("../container"), picker_1 = require("../picker");
 
 function loadFeishuContributions() {
-    modules_1.container.rebind(picker_1.PickerService).toService(picker_1.DefaultMathPickerService);
+    container_1.container.rebind(picker_1.PickerService).toService(picker_1.DefaultMathPickerService);
 }
 
 function loadTaroContributions() {
-    modules_1.container.rebind(picker_1.PickerService).toService(picker_1.DefaultMathPickerService);
+    container_1.container.rebind(picker_1.PickerService).toService(picker_1.DefaultMathPickerService);
 }
 
 exports.loadFeishuContributions = loadFeishuContributions, exports.loadTaroContributions = loadTaroContributions;

package/cjs/kits/env.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/kits/env.ts"],"names":[],"mappings":";;;AAAA,wCAAuC;AACvC,sCAAoE;AAGpE,SAAgB,uBAAuB;IACrC,mBAAS,CAAC,MAAM,CAAC,sBAAa,CAAC,CAAC,SAAS,CAAC,iCAAwB,CAAC,CAAC;AACtE,CAAC;AAFD,0DAEC;AAED,SAAgB,qBAAqB;IACnC,mBAAS,CAAC,MAAM,CAAC,sBAAa,CAAC,CAAC,SAAS,CAAC,iCAAwB,CAAC,CAAC;AACtE,CAAC;AAFD,sDAEC","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,4CAAyC;AACzC,sCAAoE;AAGpE,SAAgB,uBAAuB;IACrC,qBAAS,CAAC,MAAM,CAAC,sBAAa,CAAC,CAAC,SAAS,CAAC,iCAAwB,CAAC,CAAC;AACtE,CAAC;AAFD,0DAEC;AAED,SAAgB,qBAAqB;IACnC,qBAAS,CAAC,MAAM,CAAC,sBAAa,CAAC,CAAC,SAAS,CAAC,iCAAwB,CAAC,CAAC;AACtE,CAAC;AAFD,sDAEC","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/cjs/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/cjs/modules.js

@@ -8,23 +8,18 @@ var __importDefault = this && this.__importDefault || function(mod) {
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.layerService = exports.pickerService = exports.textAllocate = exports.symbolAllocate = exports.rectAllocate = exports.pathAllocate = exports.lineAllocate = exports.circleAllocate = exports.areaAllocate = exports.arcAllocate = exports.canvasAllocate = exports.mat4Allocate = exports.matrixAllocate = exports.graphicService = exports.transformUtil = exports.graphicUtil = exports.global = exports.container = void 0;
+}), exports.layerService = exports.pickerService = exports.graphicService = exports.transformUtil = exports.graphicUtil = exports.global = void 0;
 
-const inversify_1 = require("inversify"), core_modules_1 = __importDefault(require("./core/core-modules")), render_modules_1 = __importDefault(require("./render/render-modules")), pick_modules_1 = __importDefault(require("./picker/pick-modules")), allocator_modules_1 = __importDefault(require("./allocator/allocator-modules")), graphic_module_1 = __importDefault(require("./graphic/graphic-service/graphic-module")), plugin_modules_1 = __importDefault(require("./plugins/plugin-modules")), modules_1 = __importDefault(require("./core/contributions/modules")), modules_2 = __importDefault(require("./render/contributions/modules")), modules_3 = __importDefault(require("./picker/contributions/modules")), modules_4 = __importDefault(require("./canvas/contributions/modules")), core_1 = require("./core"), graphic_1 = require("./graphic"), matrix_allocate_1 = require("./allocator/matrix-allocate"), global_picker_service_1 = require("./picker/global-picker-service"), graphic_allocate_1 = require("./allocator/graphic-allocate"), interface_1 = require("./interface"), canvas_allocate_1 = require("./allocator/canvas-allocate");
+const core_modules_1 = __importDefault(require("./core/core-modules")), render_modules_1 = __importDefault(require("./render/render-modules")), pick_modules_1 = __importDefault(require("./picker/pick-modules")), graphic_module_1 = __importDefault(require("./graphic/graphic-service/graphic-module")), plugin_modules_1 = __importDefault(require("./plugins/plugin-modules")), modules_1 = __importDefault(require("./core/contributions/modules")), modules_2 = __importDefault(require("./render/contributions/modules")), modules_3 = __importDefault(require("./picker/contributions/modules")), modules_4 = __importDefault(require("./canvas/contributions/modules")), constants_1 = require("./core/constants"), global_picker_service_1 = require("./picker/global-picker-service"), interface_1 = require("./interface"), application_1 = require("./application"), constants_2 = require("./graphic/constants"), constants_3 = require("./core/constants"), container_1 = require("./container");
 
-exports.container = new inversify_1.Container, exports.container.load(core_modules_1.default), 
-exports.container.load(graphic_module_1.default), exports.container.load(render_modules_1.default), 
-exports.container.load(pick_modules_1.default), exports.container.load(allocator_modules_1.default), 
-exports.container.load(plugin_modules_1.default), (0, modules_1.default)(exports.container), 
-(0, modules_2.default)(exports.container), (0, modules_3.default)(exports.container), 
-(0, modules_4.default)(exports.container), exports.global = exports.container.get(interface_1.Global), 
-exports.graphicUtil = exports.container.get(core_1.GraphicUtil), exports.transformUtil = exports.container.get(core_1.TransformUtil), 
-exports.graphicService = exports.container.get(graphic_1.GraphicService), exports.matrixAllocate = exports.container.get(matrix_allocate_1.MatrixAllocate), 
-exports.mat4Allocate = exports.container.get(matrix_allocate_1.Mat4Allocate), exports.canvasAllocate = exports.container.get(canvas_allocate_1.CanvasAllocate), 
-exports.arcAllocate = exports.container.get(graphic_allocate_1.ArcAllocate), exports.areaAllocate = exports.container.get(graphic_allocate_1.AreaAllocate), 
-exports.circleAllocate = exports.container.get(graphic_allocate_1.CircleAllocate), 
-exports.lineAllocate = exports.container.get(graphic_allocate_1.LineAllocate), exports.pathAllocate = exports.container.get(graphic_allocate_1.PathAllocate), 
-exports.rectAllocate = exports.container.get(graphic_allocate_1.RectAllocate), exports.symbolAllocate = exports.container.get(graphic_allocate_1.SymbolAllocate), 
-exports.textAllocate = exports.container.get(graphic_allocate_1.TextAllocate), exports.pickerService = exports.container.get(global_picker_service_1.GlobalPickerService), 
-exports.layerService = exports.container.get(core_1.LayerService);
+container_1.container.load(core_modules_1.default), container_1.container.load(graphic_module_1.default), 
+container_1.container.load(render_modules_1.default), container_1.container.load(pick_modules_1.default), 
+container_1.container.load(plugin_modules_1.default), (0, modules_1.default)(container_1.container), 
+(0, modules_2.default)(container_1.container), (0, modules_3.default)(container_1.container), 
+(0, modules_4.default)(container_1.container), exports.global = container_1.container.get(interface_1.Global), 
+application_1.application.global = exports.global, exports.graphicUtil = container_1.container.get(constants_3.GraphicUtil), 
+application_1.application.graphicUtil = exports.graphicUtil, exports.transformUtil = container_1.container.get(constants_3.TransformUtil), 
+application_1.application.transformUtil = exports.transformUtil, exports.graphicService = container_1.container.get(constants_2.GraphicService), 
+application_1.application.graphicService = exports.graphicService, exports.pickerService = container_1.container.get(global_picker_service_1.GlobalPickerService), 
+exports.layerService = container_1.container.get(constants_1.LayerService), application_1.application.layerService = exports.layerService;
 //# sourceMappingURL=modules.js.map

package/cjs/modules.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/modules.ts"],"names":[],"mappings":";;;;;;AAAA,yCAAsC;AACtC,uEAA6C;AAC7C,6EAAmD;AACnD,yEAA+C;AAC/C,sFAA4D;AAC5D,8FAAqE;AACrE,8EAAoD;AACpD,2EAAoE;AACpE,6EAAqE;AACrE,6EAAmE;AACnE,6EAAqE;AACrE,iCAA+G;AAC/G,uCAA4D;AAC5D,iEAA2G;AAC3G,0EAAqE;AAErE,mEAiBsC;AACtC,2CAA8C;AAC9C,iEAA8E;AAEjE,QAAA,SAAS,GAAG,IAAI,qBAAS,EAAE,CAAC;AACzC,iBAAS,CAAC,IAAI,CAAC,sBAAU,CAAC,CAAC;AAC3B,iBAAS,CAAC,IAAI,CAAC,wBAAa,CAAC,CAAC;AAC9B,iBAAS,CAAC,IAAI,CAAC,wBAAY,CAAC,CAAC;AAC7B,iBAAS,CAAC,IAAI,CAAC,sBAAU,CAAC,CAAC;AAC3B,iBAAS,CAAC,IAAI,CAAC,2BAAe,CAAC,CAAC;AAChC,iBAAS,CAAC,IAAI,CAAC,wBAAY,CAAC,CAAC;AAC7B,IAAA,iBAAwB,EAAC,iBAAS,CAAC,CAAC;AACpC,IAAA,iBAAuB,EAAC,iBAAS,CAAC,CAAC;AACnC,IAAA,iBAAqB,EAAC,iBAAS,CAAC,CAAC;AACjC,IAAA,iBAAuB,EAAC,iBAAS,CAAC,CAAC;AAGtB,QAAA,MAAM,GAAG,iBAAS,CAAC,GAAG,CAAU,kBAAM,CAAC,CAAC;AACxC,QAAA,WAAW,GAAG,iBAAS,CAAC,GAAG,CAAe,kBAAW,CAAC,CAAC;AACvD,QAAA,aAAa,GAAG,iBAAS,CAAC,GAAG,CAAiB,oBAAa,CAAC,CAAC;AAC7D,QAAA,cAAc,GAAG,iBAAS,CAAC,GAAG,CAAkB,wBAAc,CAAC,CAAC;AAChE,QAAA,cAAc,GAAG,iBAAS,CAAC,GAAG,CAAkB,gCAAc,CAAC,CAAC;AAChE,QAAA,YAAY,GAAG,iBAAS,CAAC,GAAG,CAAgB,8BAAY,CAAC,CAAC;AAC1D,QAAA,cAAc,GAAG,iBAAS,CAAC,GAAG,CAAkB,gCAAc,CAAC,CAAC;AAChE,QAAA,WAAW,GAAG,iBAAS,CAAC,GAAG,CAAe,8BAAW,CAAC,CAAC;AACvD,QAAA,YAAY,GAAG,iBAAS,CAAC,GAAG,CAAgB,+BAAY,CAAC,CAAC;AAC1D,QAAA,cAAc,GAAG,iBAAS,CAAC,GAAG,CAAkB,iCAAc,CAAC,CAAC;AAChE,QAAA,YAAY,GAAG,iBAAS,CAAC,GAAG,CAAgB,+BAAY,CAAC,CAAC;AAC1D,QAAA,YAAY,GAAG,iBAAS,CAAC,GAAG,CAAgB,+BAAY,CAAC,CAAC;AAC1D,QAAA,YAAY,GAAG,iBAAS,CAAC,GAAG,CAAgB,+BAAY,CAAC,CAAC;AAC1D,QAAA,cAAc,GAAG,iBAAS,CAAC,GAAG,CAAkB,iCAAc,CAAC,CAAC;AAChE,QAAA,YAAY,GAAG,iBAAS,CAAC,GAAG,CAAgB,+BAAY,CAAC,CAAC;AAC1D,QAAA,aAAa,GAAG,iBAAS,CAAC,GAAG,CAAiB,2CAAmB,CAAC,CAAC;AACnE,QAAA,YAAY,GAAG,iBAAS,CAAC,GAAG,CAAgB,mBAAY,CAAC,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';\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,uEAA6C;AAC7C,6EAAmD;AACnD,yEAA+C;AAE/C,8FAAqE;AACrE,8EAAoD;AACpD,2EAAoE;AACpE,6EAAqE;AACrE,6EAAmE;AACnE,6EAAqE;AACrE,gDAAgD;AAEhD,0EAAqE;AAwBrE,2CAA+D;AAC/D,+CAA4C;AAE5C,mDAAqD;AACrD,gDAA8D;AAC9D,2CAAwC;AAExC,qBAAS,CAAC,IAAI,CAAC,sBAAU,CAAC,CAAC;AAC3B,qBAAS,CAAC,IAAI,CAAC,wBAAa,CAAC,CAAC;AAC9B,qBAAS,CAAC,IAAI,CAAC,wBAAY,CAAC,CAAC;AAC7B,qBAAS,CAAC,IAAI,CAAC,sBAAU,CAAC,CAAC;AAE3B,qBAAS,CAAC,IAAI,CAAC,wBAAY,CAAC,CAAC;AAC7B,IAAA,iBAAwB,EAAC,qBAAS,CAAC,CAAC;AACpC,IAAA,iBAAuB,EAAC,qBAAS,CAAC,CAAC;AACnC,IAAA,iBAAqB,EAAC,qBAAS,CAAC,CAAC;AACjC,IAAA,iBAAuB,EAAC,qBAAS,CAAC,CAAC;AAGtB,QAAA,MAAM,GAAG,qBAAS,CAAC,GAAG,CAAU,kBAAM,CAAC,CAAC;AACrD,yBAAW,CAAC,MAAM,GAAG,cAAM,CAAC;AACf,QAAA,WAAW,GAAG,qBAAS,CAAC,GAAG,CAAe,uBAAW,CAAC,CAAC;AACpE,yBAAW,CAAC,WAAW,GAAG,mBAAW,CAAC;AACzB,QAAA,aAAa,GAAG,qBAAS,CAAC,GAAG,CAAiB,yBAAa,CAAC,CAAC;AAC1E,yBAAW,CAAC,aAAa,GAAG,qBAAa,CAAC;AAC7B,QAAA,cAAc,GAAG,qBAAS,CAAC,GAAG,CAAkB,0BAAc,CAAC,CAAC;AAC7E,yBAAW,CAAC,cAAc,GAAG,sBAAc,CAAC;AAY/B,QAAA,aAAa,GAAG,qBAAS,CAAC,GAAG,CAAiB,2CAAmB,CAAC,CAAC;AACnE,QAAA,YAAY,GAAG,qBAAS,CAAC,GAAG,CAAgB,wBAAY,CAAC,CAAC;AACvE,yBAAW,CAAC,YAAY,GAAG,oBAAY,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/cjs/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/cjs/picker/canvas-picker-service.js

@@ -16,7 +16,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasPickerService = void 0;
 
-const common_1 = require("../common"), inversify_1 = require("inversify"), browser_1 = require("../canvas/contributions/browser"), interface_1 = require("../interface"), constants_1 = require("./contributions/constants"), picker_service_1 = require("./picker-service"), render_1 = require("../render"), pick_interceptor_1 = require("./pick-interceptor");
+const contribution_provider_1 = require("../common/contribution-provider"), inversify_1 = require("inversify"), browser_1 = require("../canvas/contributions/browser"), interface_1 = require("../interface"), constants_1 = require("./contributions/constants"), picker_service_1 = require("./picker-service"), render_1 = require("../render"), pick_interceptor_1 = require("./pick-interceptor");
 
 let DefaultCanvasPickerService = class extends picker_service_1.DefaultPickService {
     constructor(contributions, circlePicker, rectPicker, arcPicker, areaPicker, imagePicker, linePicker, pathPicker, symbolPicker, textPicker, polygonPicker, richtextPicker, drawContribution, global, pickItemInterceptorContributions) {
@@ -60,14 +60,15 @@ let DefaultCanvasPickerService = class extends picker_service_1.DefaultPickServi
 
 __decorate([ (0, inversify_1.postConstruct)(), __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", void 0) ], DefaultCanvasPickerService.prototype, "init", null), 
 DefaultCanvasPickerService = __decorate([ (0, inversify_1.injectable)(), __param(0, (0, 
-inversify_1.inject)(common_1.ContributionProvider)), __param(0, (0, inversify_1.named)(constants_1.CanvasPickerContribution)), __param(1, (0, 
-inversify_1.inject)(constants_1.CanvasCirclePicker)), __param(2, (0, inversify_1.inject)(constants_1.CanvasRectPicker)), __param(3, (0, 
-inversify_1.inject)(constants_1.CanvasArcPicker)), __param(4, (0, inversify_1.inject)(constants_1.CanvasAreaPicker)), __param(5, (0, 
-inversify_1.inject)(constants_1.CanvasImagePicker)), __param(6, (0, inversify_1.inject)(constants_1.CanvasLinePicker)), __param(7, (0, 
-inversify_1.inject)(constants_1.CanvasPathPicker)), __param(8, (0, inversify_1.inject)(constants_1.CanvasSymbolPicker)), __param(9, (0, 
-inversify_1.inject)(constants_1.CanvasTextPicker)), __param(10, (0, inversify_1.inject)(constants_1.CanvasPolygonPicker)), __param(11, (0, 
-inversify_1.inject)(constants_1.CanvasRichTextPicker)), __param(12, (0, inversify_1.inject)(render_1.DrawContribution)), __param(13, (0, 
-inversify_1.inject)(interface_1.Global)), __param(14, (0, inversify_1.inject)(common_1.ContributionProvider)), __param(14, (0, 
+inversify_1.inject)(contribution_provider_1.ContributionProvider)), __param(0, (0, 
+inversify_1.named)(constants_1.CanvasPickerContribution)), __param(1, (0, inversify_1.inject)(constants_1.CanvasCirclePicker)), __param(2, (0, 
+inversify_1.inject)(constants_1.CanvasRectPicker)), __param(3, (0, inversify_1.inject)(constants_1.CanvasArcPicker)), __param(4, (0, 
+inversify_1.inject)(constants_1.CanvasAreaPicker)), __param(5, (0, inversify_1.inject)(constants_1.CanvasImagePicker)), __param(6, (0, 
+inversify_1.inject)(constants_1.CanvasLinePicker)), __param(7, (0, inversify_1.inject)(constants_1.CanvasPathPicker)), __param(8, (0, 
+inversify_1.inject)(constants_1.CanvasSymbolPicker)), __param(9, (0, inversify_1.inject)(constants_1.CanvasTextPicker)), __param(10, (0, 
+inversify_1.inject)(constants_1.CanvasPolygonPicker)), __param(11, (0, inversify_1.inject)(constants_1.CanvasRichTextPicker)), __param(12, (0, 
+inversify_1.inject)(render_1.DrawContribution)), __param(13, (0, inversify_1.inject)(interface_1.Global)), __param(14, (0, 
+inversify_1.inject)(contribution_provider_1.ContributionProvider)), __param(14, (0, 
 inversify_1.named)(pick_interceptor_1.PickItemInterceptor)), __metadata("design:paramtypes", [ Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object ]) ], DefaultCanvasPickerService), 
 exports.DefaultCanvasPickerService = DefaultCanvasPickerService;
 //# sourceMappingURL=canvas-picker-service.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/picker/canvas-picker-service.ts"],"names":[],"mappings":"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","file":"canvas-picker-service.js","sourcesContent":["import { 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/cjs/picker/contributions/canvas-picker/arc-picker.js

@@ -16,18 +16,18 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasArcPicker = 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 DefaultCanvasArcPicker = class {
     constructor(canvasRenderer) {
-        this.canvasRenderer = canvasRenderer, this.type = "arc", this.numberType = graphic_1.ARC_NUMBER_TYPE;
+        this.canvasRenderer = canvasRenderer, this.type = "arc", this.numberType = constants_1.ARC_NUMBER_TYPE;
     }
     contains(arc, point, params) {
         if (!arc.AABBBounds.containsPoint(point)) return !1;
         if ("imprecise" === arc.attribute.pickMode) return !0;
         const {pickContext: pickContext} = null != params ? params : {};
         if (!pickContext) return !1;
-        const arcAttribute = (0, graphic_1.getTheme)(arc).arc;
+        const arcAttribute = (0, theme_1.getTheme)(arc).arc;
         pickContext.highPerformanceSave();
         let {x: x = arcAttribute.x, y: y = arcAttribute.y} = arc.attribute;
         if (arc.transMatrix.onlyTranslate()) {
@@ -39,7 +39,7 @@ let DefaultCanvasArcPicker = class {
         picked)), ((context, arcAttribute, themeAttribute) => {
             if (picked) return !0;
             const lineWidth = arcAttribute.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/arc-picker.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/picker/contributions/canvas-picker/arc-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yCAA+C;AAE/C,8CAA6D;AAG7D,4CAA4D;AAE5D,4CAAkD;AAG3C,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAIjC,YAA+C,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAH7E,SAAI,GAAW,KAAK,CAAC;QACrB,eAAU,GAAW,yBAAe,CAAC;IAE2C,CAAC;IAEjF,QAAQ,CAAC,GAAS,EAAE,KAAa,EAAE,MAAoB;QACrD,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;YACxC,OAAO,KAAK,CAAC;SACd;QACD,IAAI,GAAG,CAAC,SAAS,CAAC,QAAQ,KAAK,WAAW,EAAE;YAC1C,OAAO,IAAI,CAAC;SACb;QAED,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;QACrC,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,KAAK,CAAC;SACd;QAED,MAAM,YAAY,GAAG,IAAA,kBAAQ,EAAC,GAAG,CAAC,CAAC,GAAG,CAAC;QAIvC,WAAW,CAAC,mBAAmB,EAAE,CAAC;QAClC,IAAI,EAAE,CAAC,GAAG,YAAY,CAAC,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,SAAS,CAAC;QAC/D,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,aAAa,EAAE,EAAE;YAEpC,CAAC,GAAG,CAAC,CAAC;YACN,CAAC,GAAG,CAAC,CAAC;YACN,WAAW,CAAC,mBAAmB,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;SACxD;aAAM;YACL,MAAM,KAAK,GAAG,GAAG,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;YAC5C,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YACb,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YAEb,WAAW,CAAC,sBAAsB,EAAE,CAAC;SACtC;QAGD,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,cAAc,CAAC,SAAS,CAC3B,GAAG,EACH,WAAW,EACX,CAAC,EACD,CAAC,EACD,EAAS,EACT,IAAI,EACJ,CACE,OAAmB,EACnB,YAAyD,EACzD,cAA+B,EAC/B,EAAE;YAEF,IAAI,MAAM,EAAE;gBACV,OAAO,IAAI,CAAC;aACb;YACD,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;YACjD,OAAO,MAAM,CAAC;QAChB,CAAC,EACD,CACE,OAAmB,EACnB,YAAyD,EACzD,cAA+B,EAC/B,EAAE;YAEF,IAAI,MAAM,EAAE;gBACV,OAAO,IAAI,CAAC;aACb;YACD,MAAM,SAAS,GAAG,YAAY,CAAC,SAAS,IAAI,cAAc,CAAC,SAAS,CAAC;YACrE,WAAW,CAAC,SAAS,GAAG,IAAA,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;AA9EY,sBAAsB;IADlC,IAAA,sBAAU,GAAE;IAKE,WAAA,IAAA,kBAAM,EAAC,kBAAS,CAAC,CAAA;;GAJnB,sBAAsB,CA8ElC;AA9EY,wDAAsB","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":";;;;;;;;;;;;;;;AAAA,yCAA+C;AAE/C,kDAAkD;AAGlD,4CAA4D;AAC5D,+DAA+D;AAC/D,0DAA6D;AAGtD,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAIjC,YAA+C,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAH7E,SAAI,GAAW,KAAK,CAAC;QACrB,eAAU,GAAW,2BAAe,CAAC;IAE2C,CAAC;IAEjF,QAAQ,CAAC,GAAS,EAAE,KAAa,EAAE,MAAoB;QACrD,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;YACxC,OAAO,KAAK,CAAC;SACd;QACD,IAAI,GAAG,CAAC,SAAS,CAAC,QAAQ,KAAK,WAAW,EAAE;YAC1C,OAAO,IAAI,CAAC;SACb;QAED,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;QACrC,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,KAAK,CAAC;SACd;QAED,MAAM,YAAY,GAAG,IAAA,gBAAQ,EAAC,GAAG,CAAC,CAAC,GAAG,CAAC;QAIvC,WAAW,CAAC,mBAAmB,EAAE,CAAC;QAClC,IAAI,EAAE,CAAC,GAAG,YAAY,CAAC,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,SAAS,CAAC;QAC/D,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,aAAa,EAAE,EAAE;YAEpC,CAAC,GAAG,CAAC,CAAC;YACN,CAAC,GAAG,CAAC,CAAC;YACN,WAAW,CAAC,mBAAmB,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;SACxD;aAAM;YACL,MAAM,KAAK,GAAG,GAAG,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;YAC5C,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YACb,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YAEb,WAAW,CAAC,sBAAsB,EAAE,CAAC;SACtC;QAGD,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,cAAc,CAAC,SAAS,CAC3B,GAAG,EACH,WAAW,EACX,CAAC,EACD,CAAC,EACD,EAAS,EACT,IAAI,EACJ,CACE,OAAmB,EACnB,YAAyD,EACzD,cAA+B,EAC/B,EAAE;YAEF,IAAI,MAAM,EAAE;gBACV,OAAO,IAAI,CAAC;aACb;YACD,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;YACjD,OAAO,MAAM,CAAC;QAChB,CAAC,EACD,CACE,OAAmB,EACnB,YAAyD,EACzD,cAA+B,EAC/B,EAAE;YAEF,IAAI,MAAM,EAAE;gBACV,OAAO,IAAI,CAAC;aACb;YACD,MAAM,SAAS,GAAG,YAAY,CAAC,SAAS,IAAI,cAAc,CAAC,SAAS,CAAC;YACrE,WAAW,CAAC,SAAS,GAAG,IAAA,8BAAe,EAAC,WAAW,EAAE,SAAS,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC;YACjF,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;YACnD,OAAO,MAAM,CAAC;QAChB,CAAC,CACF,CAAC;QAEF,WAAW,CAAC,sBAAsB,EAAE,CAAC;QACrC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AA9EY,sBAAsB;IADlC,IAAA,sBAAU,GAAE;IAKE,WAAA,IAAA,kBAAM,EAAC,kBAAS,CAAC,CAAA;;GAJnB,sBAAsB,CA8ElC;AA9EY,wDAAsB","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/cjs/picker/contributions/canvas-picker/arc3d-picker.js

@@ -16,16 +16,16 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultCanvasArc3dPicker = 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 DefaultCanvasArc3dPicker = class extends base_picker_1.BasePicker {
     constructor(canvasRenderer) {
-        super(), this.canvasRenderer = canvasRenderer, this.type = "arc3d", this.numberType = graphic_1.ARC3D_NUMBER_TYPE;
+        super(), this.canvasRenderer = canvasRenderer, this.type = "arc3d", this.numberType = constants_1.ARC3D_NUMBER_TYPE;
     }
     contains(arc3d, point, params) {
         const {pickContext: pickContext} = null != params ? params : {};
         if (!pickContext) return !1;
-        const arc3dAttribute = (0, graphic_1.getTheme)(arc3d).arc;
+        const arc3dAttribute = (0, theme_1.getTheme)(arc3d).arc;
         pickContext.highPerformanceSave();
         const data = this.transform(arc3d, arc3dAttribute, pickContext), {x: x, y: y, z: z, lastModelMatrix: lastModelMatrix} = data;
         let pickPoint = point;
@@ -38,7 +38,7 @@ let DefaultCanvasArc3dPicker = class extends base_picker_1.BasePicker {
         this.canvasRenderer.z = z;
         let picked = !1;
         return this.canvasRenderer.drawShape(arc3d, pickContext, x, y, params, null, ((context, arc3dAttribute, themeAttribute) => !!picked || (picked = context.isPointInPath(pickPoint.x, pickPoint.y), 
-        picked))), this.canvasRenderer.z = 0, pickContext.modelMatrix !== lastModelMatrix && modules_1.mat4Allocate.free(pickContext.modelMatrix), 
+        picked))), this.canvasRenderer.z = 0, pickContext.modelMatrix !== lastModelMatrix && matrix_allocate_1.mat4Allocate.free(pickContext.modelMatrix), 
         pickContext.modelMatrix = lastModelMatrix, pickContext.highPerformanceRestore(), 
         picked;
     }