@visactor/vrender-components 0.12.1 → 0.12.3-alpha.6

package/cjs/pager/pager.js

@@ -73,7 +73,8 @@ class Pager extends base_1.AbstractComponent {
         let {preShape: preShape, nextShape: nextShape} = handler;
         preShape || (preShape = isHorizontal ? "triangleLeft" : "triangleUp"), nextShape || (nextShape = isHorizontal ? "triangleRight" : "triangleDown");
         const preHandler = (0, vrender_1.createSymbol)(Object.assign(Object.assign({
-            strokeBoundsBuffer: 0
+            strokeBoundsBuffer: 0,
+            pickMode: "imprecise"
         }, handlerStyle), {
             x: 0,
             y: 0,
@@ -96,7 +97,8 @@ class Pager extends base_1.AbstractComponent {
         }, textStyle));
         this.text = text, container.add(text);
         const nextHandler = (0, vrender_1.createSymbol)(Object.assign(Object.assign({
-            strokeBoundsBuffer: 0
+            strokeBoundsBuffer: 0,
+            pickMode: "imprecise"
         }, handlerStyle), {
             x: isHorizontal ? handlerSizeX + 2 * handlerSpace + maxTextWidth : 0,
             y: isHorizontal ? 0 : handlerSizeY + 2 * handlerSpace + maxTextHeight,

package/cjs/pager/pager.js.map

@@ -1 +1 @@
-{"version":3,"sources":["pager/pager.ts"],"names":[],"mappings":";;;AAGA,+CAQ2B;AAC3B,6CAA0E;AAC1E,uCAAiD;AACjD,kCAA0C;AAG1C,MAAM,qBAAqB,GAA+B;IACxD,KAAK,EAAE,CAAC;IACR,KAAK,EAAE;QACL,IAAI,EAAE,iBAAiB;QACvB,MAAM,EAAE,SAAS;QACjB,IAAI,EAAE,EAAE;KACT;IACD,KAAK,EAAE;QACL,OAAO,EAAE;YACP,IAAI,EAAE,oBAAoB;YAC1B,MAAM,EAAE,aAAa;SACtB;QACD,KAAK,EAAE,EAAE;KACV;CACF,CAAC;AAEF,MAAa,KAAM,SAAQ,wBAA4C;IAIrE,UAAU;QACR,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAeD,YAAY,UAA2B;QACrC,KAAK,CAAC,IAAA,cAAK,EAAC,EAAE,EAAE,KAAK,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC,CAAC;QArBxD,SAAI,GAAG,OAAO,CAAC;QAEP,aAAQ,GAAG,CAAC,CAAC;QA4Ib,aAAQ,GAAG,CAAC,CAAwB,EAAE,EAAE;YAC9C,MAAM,MAAM,GAAG,CAAC,CAAC,MAA4B,CAAC;YAC9C,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;gBAC/B,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;aAC1B;QACH,CAAC,CAAC;QAEM,eAAU,GAAG,CAAC,CAAwB,EAAE,EAAE;YAChD,MAAM,MAAM,GAAG,CAAC,CAAC,MAA4B,CAAC;YAC9C,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC9B,CAAC,CAAC;QAEM,aAAQ,GAAG,CAAC,CAAwB,EAAE,EAAE;;YAC9C,MAAM,MAAM,GAAG,CAAC,CAAC,MAA4B,CAAC;YAC9C,IAAI,MAAM,CAAC,IAAI,KAAK,YAAY,EAAE;gBAChC,IAAI,IAAI,CAAC,QAAQ,KAAK,CAAC,EAAE;oBACvB,OAAO;iBACR;gBACD,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC;gBACnB,IAAI,IAAI,CAAC,QAAQ,KAAK,CAAC,EAAE;oBACvB,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;iBAC5B;qBAAM;oBACL,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;iBAC/B;gBACD,MAAM,WAAW,GAAG,IAAI,qBAAW,CAAC,QAAQ,EAAE;oBAC5C,OAAO,EAAE,IAAI,CAAC,QAAQ;oBACtB,KAAK,EAAE,IAAI,CAAC,MAAM;oBAClB,SAAS,EAAE,KAAK;iBACjB,CAAC,CAAC;gBAGH,WAAW,CAAC,OAAO,GAAG,MAAA,IAAI,CAAC,KAAK,0CAAE,WAAW,CAAC,OAAO,CAAC;gBACtD,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;aACjC;YAED,IAAI,MAAM,CAAC,IAAI,KAAK,aAAa,EAAE;gBACjC,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,MAAM,EAAE;oBACjC,OAAO;iBACR;gBACD,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC;gBAEnB,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,MAAM,EAAE;oBACjC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;iBAC5B;qBAAM;oBACL,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;iBAC/B;gBAED,MAAM,WAAW,GAAG,IAAI,qBAAW,CAAC,QAAQ,EAAE;oBAC5C,OAAO,EAAE,IAAI,CAAC,QAAQ;oBACtB,KAAK,EAAE,IAAI,CAAC,MAAM;oBAClB,SAAS,EAAE,MAAM;iBAClB,CAAC,CAAC;gBAGH,WAAW,CAAC,OAAO,GAAG,MAAA,IAAI,CAAC,KAAK,0CAAE,WAAW,CAAC,OAAO,CAAC;gBACtD,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;aACjC;YAED,IAAI,IAAI,CAAC,QAAQ,GAAG,CAAC,EAAE;gBACpB,IAAI,CAAC,UAAsB,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;aACrD;YACD,IAAI,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE;gBAC9B,IAAI,CAAC,WAAuB,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;aACtD;YAEA,IAAI,CAAC,IAAc,CAAC,YAAY,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QAC/E,CAAC,CAAC;IA1LF,CAAC;IAES,MAAM;;QACd,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,MAAM,EACJ,MAAM,GAAG,YAAY,EACrB,OAAO,GAAG,qBAAqB,EAC/B,KAAK,EACL,cAAc,GAAG,CAAC,EAClB,SAAS,EACT,OAAO,GAAG,CAAC,EACZ,GAAG,IAAI,CAAC,SAAS,CAAC;QAEnB,IAAI,CAAC,QAAQ,GAAG,cAAc,CAAC;QAC/B,MAAM,aAAa,GAAG,IAAA,yBAAgB,EAAC,OAAO,CAAC,CAAC;QAChD,MAAM,YAAY,GAAG,MAAM,KAAK,YAAY,CAAC;QAE7C,MAAM,SAAS,GAAG,IAAA,qBAAW,EAAC;YAC5B,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,CAAC;SACL,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC;QACzC,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,IAAI,EAAE,CAAC;QAC5C,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,KAAK,mCAAI,CAAC,CAAC;QACxC,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC;QAEzC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;QACtC,IAAI,CAAC,QAAQ,EAAE;YACb,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,YAAY,CAAC;SACzD;QACD,IAAI,CAAC,SAAS,EAAE;YACd,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,cAAc,CAAC;SAC7D;QAED,MAAM,UAAU,GAAG,IAAA,sBAAY,gCAC7B,kBAAkB,EAAE,CAAC,IAClB,YAAY,KACf,CAAC,EAAE,CAAC,EACJ,CAAC,EAAE,CAAC,EACJ,UAAU,EAAE,QAAQ,EACpB,IAAI,EAAE,WAAW,IACjB,CAAC;QACH,UAAU,CAAC,MAAM,GAAG,YAAY,CAAC;QACjC,UAAU,CAAC,IAAI,GAAG,YAAY,CAAC;QAC/B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAG1B,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,IAAA,sBAAe,EAAC,GAAG,KAAK,IAAI,KAAK,EAAE,kBACxF,SAAS,EAAE,QAAQ,EACnB,YAAY,EAAE,QAAQ,IACnB,SAAS,EACZ,CAAC;QAEH,MAAM,YAAY,GAAG,IAAA,iBAAQ,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAC1E,MAAM,YAAY,GAAG,IAAA,iBAAQ,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAE1E,MAAM,IAAI,GAAG,IAAA,oBAAU,kBACrB,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,YAAY,GAAG,CAAC,GAAG,YAAY,GAAG,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EACxE,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,GAAG,CAAC,GAAG,YAAY,GAAG,aAAa,GAAG,CAAC,EACzE,IAAI,EAAE,GAAG,cAAc,IAAI,KAAK,EAAE,EAClC,SAAS,EAAE,QAAQ,EACnB,YAAY,EAAE,QAAQ,EACtB,UAAU,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,IAC5B,SAAS,EACZ,CAAC;QACH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAEpB,MAAM,WAAW,GAAG,IAAA,sBAAY,gCAC9B,kBAAkB,EAAE,CAAC,IAClB,YAAY,KACf,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,YAAY,GAAG,YAAY,GAAG,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,EACpE,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,GAAG,YAAY,GAAG,CAAC,GAAG,aAAa,EACrE,UAAU,EAAE,SAAS,EACrB,IAAI,EAAE,WAAW,IACjB,CAAC;QACH,WAAW,CAAC,IAAI,GAAG,aAAa,CAAC;QACjC,WAAW,CAAC,MAAM,GAAG,YAAY,CAAC;QAClC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAE/B,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAE3B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACrB,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YAC/B,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;SACjC;aAAM,IAAI,IAAI,CAAC,QAAQ,KAAK,CAAC,EAAE;YAC9B,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;SAChC;aAAM,IAAI,IAAI,CAAC,QAAQ,KAAK,KAAK,EAAE;YAClC,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;SACjC;QAED,MAAM,eAAe,GAAG,SAAS,CAAC,UAAU,CAAC;QAC7C,MAAM,KAAK,GAAG,eAAe,CAAC,KAAK,EAAE,CAAC;QACtC,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC;QAExC,SAAS,CAAC,WAAW,CAAC,CAAC,GAAG,eAAe,CAAC,EAAE,GAAG,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,EAAE,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5G,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAEpB,IAAI,CAAC,SAAS,CAAC,KAAK,GAAG,KAAK,GAAG,aAAa,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QACnE,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QAErE,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAEO,WAAW;QACjB,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,cAAc,EAAE,IAAI,CAAC,QAA8C,CAAC,CAAC;YACtG,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,cAAc,EAAE,IAAI,CAAC,UAAgD,CAAC,CAAC;YACxG,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,aAAa,EAAE,IAAI,CAAC,QAA8C,CAAC,CAAC;SACtG;QAED,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,cAAc,EAAE,IAAI,CAAC,QAA8C,CAAC,CAAC;YACvG,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,cAAc,EAAE,IAAI,CAAC,UAAgD,CAAC,CAAC;YACzG,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,aAAa,EAAE,IAAI,CAAC,QAA8C,CAAC,CAAC;SACvG;IACH,CAAC;IAsEO,MAAM;QACZ,IAAI,CAAC,cAAc,EAAE,CAAC;QACtB,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;QAClB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,KAAe,CAAC;QAC7C,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACxD,CAAC;;AAxNH,sBAyNC;AA5MQ,uBAAiB,GAA6B;IACnD,OAAO,EAAE,qBAAqB;IAC9B,SAAS,EAAE;QACT,IAAI,EAAE,iBAAiB;QACvB,QAAQ,EAAE,EAAE;KACb;CACF,CAAC","file":"pager.js","sourcesContent":["/**\n * @description 翻页器\n */\nimport {\n  createGroup,\n  createSymbol,\n  createText,\n  ISymbol,\n  IText,\n  FederatedPointerEvent,\n  CustomEvent\n} from '@visactor/vrender';\nimport { merge, normalizePadding, get, isNumber } from '@visactor/vutils';\nimport { AbstractComponent } from '../core/base';\nimport { measureTextSize } from '../util';\nimport { PagerAttributes } from './type';\n\nconst DEFAULT_HANDLER_STYLE: PagerAttributes['handler'] = {\n  space: 8,\n  style: {\n    fill: 'rgb(47, 69, 84)',\n    cursor: 'pointer',\n    size: 15\n  },\n  state: {\n    disable: {\n      fill: 'rgb(170, 170, 170)',\n      cursor: 'not-allowed'\n    },\n    hover: {}\n  }\n};\n\nexport class Pager extends AbstractComponent<Required<PagerAttributes>> {\n  name = 'pager';\n\n  private _current = 1;\n  getCurrent() {\n    return this._current;\n  }\n\n  private _total!: number;\n  preHandler!: ISymbol | null;\n  nextHandler!: ISymbol | null;\n  text!: IText | null;\n\n  static defaultAttributes: Partial<PagerAttributes> = {\n    handler: DEFAULT_HANDLER_STYLE,\n    textStyle: {\n      fill: 'rgb(51, 51, 51)',\n      fontSize: 12\n    }\n  };\n\n  constructor(attributes: PagerAttributes) {\n    super(merge({}, Pager.defaultAttributes, attributes));\n  }\n\n  protected render() {\n    this._reset();\n    const {\n      layout = 'horizontal',\n      handler = DEFAULT_HANDLER_STYLE,\n      total,\n      defaultCurrent = 1,\n      textStyle,\n      padding = 0\n    } = this.attribute;\n\n    this._current = defaultCurrent;\n    const parsedPadding = normalizePadding(padding);\n    const isHorizontal = layout === 'horizontal';\n\n    const container = createGroup({\n      x: 0,\n      y: 0\n    });\n\n    const handlerStyle = handler.style || {};\n    const handlerSize = handlerStyle.size || 15;\n    const handlerSpace = handler.space ?? 8;\n    const handlerState = handler.state || {};\n\n    let { preShape, nextShape } = handler;\n    if (!preShape) {\n      preShape = isHorizontal ? 'triangleLeft' : 'triangleUp';\n    }\n    if (!nextShape) {\n      nextShape = isHorizontal ? 'triangleRight' : 'triangleDown';\n    }\n\n    const preHandler = createSymbol({\n      strokeBoundsBuffer: 0,\n      ...handlerStyle,\n      x: 0,\n      y: 0,\n      symbolType: preShape,\n      size: handlerSize\n    });\n    preHandler.states = handlerState;\n    preHandler.name = 'preHandler';\n    this.preHandler = preHandler;\n    container.add(preHandler);\n\n    // 获取文本的最大长度，如果不固定的话随着文本的变化整体会发生抖动\n    const { width: maxTextWidth, height: maxTextHeight } = measureTextSize(`${total}/${total}`, {\n      textAlign: 'center',\n      textBaseline: 'middle',\n      ...textStyle\n    });\n\n    const handlerSizeX = isNumber(handlerSize) ? handlerSize : handlerSize[0];\n    const handlerSizeY = isNumber(handlerSize) ? handlerSize : handlerSize[1];\n\n    const text = createText({\n      x: isHorizontal ? handlerSizeX / 2 + handlerSpace + maxTextWidth / 2 : 0,\n      y: isHorizontal ? 0 : handlerSizeY / 2 + handlerSpace + maxTextHeight / 2,\n      text: `${defaultCurrent}/${total}`,\n      textAlign: 'center',\n      textBaseline: 'middle',\n      lineHeight: textStyle?.fontSize,\n      ...textStyle\n    });\n    this.text = text;\n    container.add(text);\n\n    const nextHandler = createSymbol({\n      strokeBoundsBuffer: 0,\n      ...handlerStyle,\n      x: isHorizontal ? handlerSizeX + handlerSpace * 2 + maxTextWidth : 0,\n      y: isHorizontal ? 0 : handlerSizeY + handlerSpace * 2 + maxTextHeight,\n      symbolType: nextShape,\n      size: handlerSize\n    });\n    nextHandler.name = 'nextHandler';\n    nextHandler.states = handlerState;\n    this.nextHandler = nextHandler;\n\n    container.add(nextHandler);\n\n    if (this._total === 1) {\n      preHandler.addState('disable');\n      nextHandler.addState('disable');\n    } else if (this._current === 1) {\n      preHandler.addState('disable');\n    } else if (this._current === total) {\n      nextHandler.addState('disable');\n    }\n\n    const containerBounds = container.AABBBounds;\n    const width = containerBounds.width();\n    const height = containerBounds.height();\n\n    container.translateTo(0 - containerBounds.x1 + parsedPadding[3], 0 - containerBounds.y1 + parsedPadding[0]);\n    this.add(container);\n\n    this.attribute.width = width + parsedPadding[1] + parsedPadding[3];\n    this.attribute.height = height + parsedPadding[0] + parsedPadding[2];\n\n    this._bindEvents();\n  }\n\n  private _bindEvents(): void {\n    if (this.preHandler) {\n      this.preHandler.addEventListener('pointerenter', this._onHover as EventListenerOrEventListenerObject);\n      this.preHandler.addEventListener('pointerleave', this._onUnHover as EventListenerOrEventListenerObject);\n      this.preHandler.addEventListener('pointerdown', this._onClick as EventListenerOrEventListenerObject);\n    }\n\n    if (this.nextHandler) {\n      this.nextHandler.addEventListener('pointerenter', this._onHover as EventListenerOrEventListenerObject);\n      this.nextHandler.addEventListener('pointerleave', this._onUnHover as EventListenerOrEventListenerObject);\n      this.nextHandler.addEventListener('pointerdown', this._onClick as EventListenerOrEventListenerObject);\n    }\n  }\n\n  private _onHover = (e: FederatedPointerEvent) => {\n    const target = e.target as unknown as ISymbol;\n    if (!target.hasState('disable')) {\n      target.addState('hover');\n    }\n  };\n\n  private _onUnHover = (e: FederatedPointerEvent) => {\n    const target = e.target as unknown as ISymbol;\n    target.removeState('hover');\n  };\n\n  private _onClick = (e: FederatedPointerEvent) => {\n    const target = e.target as unknown as ISymbol;\n    if (target.name === 'preHandler') {\n      if (this._current === 1) {\n        return;\n      }\n      this._current -= 1;\n      if (this._current === 1) {\n        target.addState('disable');\n      } else {\n        target.removeState('disable');\n      }\n      const changeEvent = new CustomEvent('toPrev', {\n        current: this._current,\n        total: this._total,\n        direction: 'pre'\n      });\n      // FIXME: 需要在 vrender 的事件系统支持\n      // @ts-ignore\n      changeEvent.manager = this.stage?.eventSystem.manager;\n      this.dispatchEvent(changeEvent);\n    }\n\n    if (target.name === 'nextHandler') {\n      if (this._current === this._total) {\n        return;\n      }\n      this._current += 1;\n\n      if (this._current === this._total) {\n        target.addState('disable');\n      } else {\n        target.removeState('disable');\n      }\n\n      const changeEvent = new CustomEvent('toNext', {\n        current: this._current,\n        total: this._total,\n        direction: 'next'\n      });\n      // FIXME: 需要在 vrender 的事件系统支持\n      // @ts-ignore\n      changeEvent.manager = this.stage?.eventSystem.manager;\n      this.dispatchEvent(changeEvent);\n    }\n\n    if (this._current > 1) {\n      (this.preHandler as ISymbol).removeState('disable');\n    }\n    if (this._current < this._total) {\n      (this.nextHandler as ISymbol).removeState('disable');\n    }\n\n    (this.text as IText).setAttribute('text', `${this._current}/${this._total}`);\n  };\n\n  private _reset() {\n    this.removeAllChild();\n    this._current = 1;\n    this._total = this.attribute.total as number;\n    this.preHandler = this.nextHandler = this.text = null;\n  }\n}\n"]}
+{"version":3,"sources":["pager/pager.ts"],"names":[],"mappings":";;;AAKA,+CAAuF;AACvF,6CAAqE;AACrE,uCAAiD;AACjD,kCAA0C;AAG1C,MAAM,qBAAqB,GAA+B;IACxD,KAAK,EAAE,CAAC;IACR,KAAK,EAAE;QACL,IAAI,EAAE,iBAAiB;QACvB,MAAM,EAAE,SAAS;QACjB,IAAI,EAAE,EAAE;KACT;IACD,KAAK,EAAE;QACL,OAAO,EAAE;YACP,IAAI,EAAE,oBAAoB;YAC1B,MAAM,EAAE,aAAa;SACtB;QACD,KAAK,EAAE,EAAE;KACV;CACF,CAAC;AAEF,MAAa,KAAM,SAAQ,wBAA4C;IAIrE,UAAU;QACR,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAeD,YAAY,UAA2B;QACrC,KAAK,CAAC,IAAA,cAAK,EAAC,EAAE,EAAE,KAAK,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC,CAAC;QArBxD,SAAI,GAAG,OAAO,CAAC;QAEP,aAAQ,GAAG,CAAC,CAAC;QA8Ib,aAAQ,GAAG,CAAC,CAAwB,EAAE,EAAE;YAC9C,MAAM,MAAM,GAAG,CAAC,CAAC,MAA4B,CAAC;YAC9C,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;gBAC/B,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;aAC1B;QACH,CAAC,CAAC;QAEM,eAAU,GAAG,CAAC,CAAwB,EAAE,EAAE;YAChD,MAAM,MAAM,GAAG,CAAC,CAAC,MAA4B,CAAC;YAC9C,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC9B,CAAC,CAAC;QAEM,aAAQ,GAAG,CAAC,CAAwB,EAAE,EAAE;;YAC9C,MAAM,MAAM,GAAG,CAAC,CAAC,MAA4B,CAAC;YAC9C,IAAI,MAAM,CAAC,IAAI,KAAK,YAAY,EAAE;gBAChC,IAAI,IAAI,CAAC,QAAQ,KAAK,CAAC,EAAE;oBACvB,OAAO;iBACR;gBACD,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC;gBACnB,IAAI,IAAI,CAAC,QAAQ,KAAK,CAAC,EAAE;oBACvB,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;iBAC5B;qBAAM;oBACL,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;iBAC/B;gBACD,MAAM,WAAW,GAAG,IAAI,qBAAW,CAAC,QAAQ,EAAE;oBAC5C,OAAO,EAAE,IAAI,CAAC,QAAQ;oBACtB,KAAK,EAAE,IAAI,CAAC,MAAM;oBAClB,SAAS,EAAE,KAAK;iBACjB,CAAC,CAAC;gBAGH,WAAW,CAAC,OAAO,GAAG,MAAA,IAAI,CAAC,KAAK,0CAAE,WAAW,CAAC,OAAO,CAAC;gBACtD,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;aACjC;YAED,IAAI,MAAM,CAAC,IAAI,KAAK,aAAa,EAAE;gBACjC,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,MAAM,EAAE;oBACjC,OAAO;iBACR;gBACD,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC;gBAEnB,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,MAAM,EAAE;oBACjC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;iBAC5B;qBAAM;oBACL,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;iBAC/B;gBAED,MAAM,WAAW,GAAG,IAAI,qBAAW,CAAC,QAAQ,EAAE;oBAC5C,OAAO,EAAE,IAAI,CAAC,QAAQ;oBACtB,KAAK,EAAE,IAAI,CAAC,MAAM;oBAClB,SAAS,EAAE,MAAM;iBAClB,CAAC,CAAC;gBAGH,WAAW,CAAC,OAAO,GAAG,MAAA,IAAI,CAAC,KAAK,0CAAE,WAAW,CAAC,OAAO,CAAC;gBACtD,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;aACjC;YAED,IAAI,IAAI,CAAC,QAAQ,GAAG,CAAC,EAAE;gBACpB,IAAI,CAAC,UAAsB,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;aACrD;YACD,IAAI,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE;gBAC9B,IAAI,CAAC,WAAuB,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;aACtD;YAEA,IAAI,CAAC,IAAc,CAAC,YAAY,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QAC/E,CAAC,CAAC;IA5LF,CAAC;IAES,MAAM;;QACd,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,MAAM,EACJ,MAAM,GAAG,YAAY,EACrB,OAAO,GAAG,qBAAqB,EAC/B,KAAK,EACL,cAAc,GAAG,CAAC,EAClB,SAAS,EACT,OAAO,GAAG,CAAC,EACZ,GAAG,IAAI,CAAC,SAAS,CAAC;QAEnB,IAAI,CAAC,QAAQ,GAAG,cAAc,CAAC;QAC/B,MAAM,aAAa,GAAG,IAAA,yBAAgB,EAAC,OAAO,CAAC,CAAC;QAChD,MAAM,YAAY,GAAG,MAAM,KAAK,YAAY,CAAC;QAE7C,MAAM,SAAS,GAAG,IAAA,qBAAW,EAAC;YAC5B,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,CAAC;SACL,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC;QACzC,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,IAAI,EAAE,CAAC;QAC5C,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,KAAK,mCAAI,CAAC,CAAC;QACxC,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC;QAEzC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;QACtC,IAAI,CAAC,QAAQ,EAAE;YACb,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,YAAY,CAAC;SACzD;QACD,IAAI,CAAC,SAAS,EAAE;YACd,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,cAAc,CAAC;SAC7D;QAED,MAAM,UAAU,GAAG,IAAA,sBAAY,gCAC7B,kBAAkB,EAAE,CAAC,EACrB,QAAQ,EAAE,WAAW,IAClB,YAAY,KACf,CAAC,EAAE,CAAC,EACJ,CAAC,EAAE,CAAC,EACJ,UAAU,EAAE,QAAQ,EACpB,IAAI,EAAE,WAAW,IACjB,CAAC;QACH,UAAU,CAAC,MAAM,GAAG,YAAY,CAAC;QACjC,UAAU,CAAC,IAAI,GAAG,YAAY,CAAC;QAC/B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAG1B,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,IAAA,sBAAe,EAAC,GAAG,KAAK,IAAI,KAAK,EAAE,kBACxF,SAAS,EAAE,QAAQ,EACnB,YAAY,EAAE,QAAQ,IACnB,SAAS,EACZ,CAAC;QAEH,MAAM,YAAY,GAAG,IAAA,iBAAQ,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAC1E,MAAM,YAAY,GAAG,IAAA,iBAAQ,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAE1E,MAAM,IAAI,GAAG,IAAA,oBAAU,kBACrB,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,YAAY,GAAG,CAAC,GAAG,YAAY,GAAG,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EACxE,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,GAAG,CAAC,GAAG,YAAY,GAAG,aAAa,GAAG,CAAC,EACzE,IAAI,EAAE,GAAG,cAAc,IAAI,KAAK,EAAE,EAClC,SAAS,EAAE,QAAQ,EACnB,YAAY,EAAE,QAAQ,EACtB,UAAU,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,IAC5B,SAAS,EACZ,CAAC;QACH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAEpB,MAAM,WAAW,GAAG,IAAA,sBAAY,gCAC9B,kBAAkB,EAAE,CAAC,EACrB,QAAQ,EAAE,WAAW,IAClB,YAAY,KACf,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,YAAY,GAAG,YAAY,GAAG,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,EACpE,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,GAAG,YAAY,GAAG,CAAC,GAAG,aAAa,EACrE,UAAU,EAAE,SAAS,EACrB,IAAI,EAAE,WAAW,IACjB,CAAC;QACH,WAAW,CAAC,IAAI,GAAG,aAAa,CAAC;QACjC,WAAW,CAAC,MAAM,GAAG,YAAY,CAAC;QAClC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAE/B,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAE3B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACrB,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YAC/B,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;SACjC;aAAM,IAAI,IAAI,CAAC,QAAQ,KAAK,CAAC,EAAE;YAC9B,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;SAChC;aAAM,IAAI,IAAI,CAAC,QAAQ,KAAK,KAAK,EAAE;YAClC,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;SACjC;QAED,MAAM,eAAe,GAAG,SAAS,CAAC,UAAU,CAAC;QAC7C,MAAM,KAAK,GAAG,eAAe,CAAC,KAAK,EAAE,CAAC;QACtC,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC;QAExC,SAAS,CAAC,WAAW,CAAC,CAAC,GAAG,eAAe,CAAC,EAAE,GAAG,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,EAAE,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5G,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAEpB,IAAI,CAAC,SAAS,CAAC,KAAK,GAAG,KAAK,GAAG,aAAa,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QACnE,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QAErE,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAEO,WAAW;QACjB,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,cAAc,EAAE,IAAI,CAAC,QAA8C,CAAC,CAAC;YACtG,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,cAAc,EAAE,IAAI,CAAC,UAAgD,CAAC,CAAC;YACxG,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,aAAa,EAAE,IAAI,CAAC,QAA8C,CAAC,CAAC;SACtG;QAED,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,cAAc,EAAE,IAAI,CAAC,QAA8C,CAAC,CAAC;YACvG,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,cAAc,EAAE,IAAI,CAAC,UAAgD,CAAC,CAAC;YACzG,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,aAAa,EAAE,IAAI,CAAC,QAA8C,CAAC,CAAC;SACvG;IACH,CAAC;IAsEO,MAAM;QACZ,IAAI,CAAC,cAAc,EAAE,CAAC;QACtB,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;QAClB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,KAAe,CAAC;QAC7C,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACxD,CAAC;;AA1NH,sBA2NC;AA9MQ,uBAAiB,GAA6B;IACnD,OAAO,EAAE,qBAAqB;IAC9B,SAAS,EAAE;QACT,IAAI,EAAE,iBAAiB;QACvB,QAAQ,EAAE,EAAE;KACb;CACF,CAAC","file":"pager.js","sourcesContent":["/**\n * @description 翻页器\n */\nimport type { ISymbol, IText, FederatedPointerEvent } from '@visactor/vrender';\n// eslint-disable-next-line no-duplicate-imports\nimport { createGroup, createSymbol, createText, CustomEvent } from '@visactor/vrender';\nimport { merge, normalizePadding, isNumber } from '@visactor/vutils';\nimport { AbstractComponent } from '../core/base';\nimport { measureTextSize } from '../util';\nimport type { PagerAttributes } from './type';\n\nconst DEFAULT_HANDLER_STYLE: PagerAttributes['handler'] = {\n  space: 8,\n  style: {\n    fill: 'rgb(47, 69, 84)',\n    cursor: 'pointer',\n    size: 15\n  },\n  state: {\n    disable: {\n      fill: 'rgb(170, 170, 170)',\n      cursor: 'not-allowed'\n    },\n    hover: {}\n  }\n};\n\nexport class Pager extends AbstractComponent<Required<PagerAttributes>> {\n  name = 'pager';\n\n  private _current = 1;\n  getCurrent() {\n    return this._current;\n  }\n\n  private _total!: number;\n  preHandler!: ISymbol | null;\n  nextHandler!: ISymbol | null;\n  text!: IText | null;\n\n  static defaultAttributes: Partial<PagerAttributes> = {\n    handler: DEFAULT_HANDLER_STYLE,\n    textStyle: {\n      fill: 'rgb(51, 51, 51)',\n      fontSize: 12\n    }\n  };\n\n  constructor(attributes: PagerAttributes) {\n    super(merge({}, Pager.defaultAttributes, attributes));\n  }\n\n  protected render() {\n    this._reset();\n    const {\n      layout = 'horizontal',\n      handler = DEFAULT_HANDLER_STYLE,\n      total,\n      defaultCurrent = 1,\n      textStyle,\n      padding = 0\n    } = this.attribute;\n\n    this._current = defaultCurrent;\n    const parsedPadding = normalizePadding(padding);\n    const isHorizontal = layout === 'horizontal';\n\n    const container = createGroup({\n      x: 0,\n      y: 0\n    });\n\n    const handlerStyle = handler.style || {};\n    const handlerSize = handlerStyle.size || 15;\n    const handlerSpace = handler.space ?? 8;\n    const handlerState = handler.state || {};\n\n    let { preShape, nextShape } = handler;\n    if (!preShape) {\n      preShape = isHorizontal ? 'triangleLeft' : 'triangleUp';\n    }\n    if (!nextShape) {\n      nextShape = isHorizontal ? 'triangleRight' : 'triangleDown';\n    }\n\n    const preHandler = createSymbol({\n      strokeBoundsBuffer: 0,\n      pickMode: 'imprecise',\n      ...handlerStyle,\n      x: 0,\n      y: 0,\n      symbolType: preShape,\n      size: handlerSize\n    });\n    preHandler.states = handlerState;\n    preHandler.name = 'preHandler';\n    this.preHandler = preHandler;\n    container.add(preHandler);\n\n    // 获取文本的最大长度，如果不固定的话随着文本的变化整体会发生抖动\n    const { width: maxTextWidth, height: maxTextHeight } = measureTextSize(`${total}/${total}`, {\n      textAlign: 'center',\n      textBaseline: 'middle',\n      ...textStyle\n    });\n\n    const handlerSizeX = isNumber(handlerSize) ? handlerSize : handlerSize[0];\n    const handlerSizeY = isNumber(handlerSize) ? handlerSize : handlerSize[1];\n\n    const text = createText({\n      x: isHorizontal ? handlerSizeX / 2 + handlerSpace + maxTextWidth / 2 : 0,\n      y: isHorizontal ? 0 : handlerSizeY / 2 + handlerSpace + maxTextHeight / 2,\n      text: `${defaultCurrent}/${total}`,\n      textAlign: 'center',\n      textBaseline: 'middle',\n      lineHeight: textStyle?.fontSize,\n      ...textStyle\n    });\n    this.text = text;\n    container.add(text);\n\n    const nextHandler = createSymbol({\n      strokeBoundsBuffer: 0,\n      pickMode: 'imprecise',\n      ...handlerStyle,\n      x: isHorizontal ? handlerSizeX + handlerSpace * 2 + maxTextWidth : 0,\n      y: isHorizontal ? 0 : handlerSizeY + handlerSpace * 2 + maxTextHeight,\n      symbolType: nextShape,\n      size: handlerSize\n    });\n    nextHandler.name = 'nextHandler';\n    nextHandler.states = handlerState;\n    this.nextHandler = nextHandler;\n\n    container.add(nextHandler);\n\n    if (this._total === 1) {\n      preHandler.addState('disable');\n      nextHandler.addState('disable');\n    } else if (this._current === 1) {\n      preHandler.addState('disable');\n    } else if (this._current === total) {\n      nextHandler.addState('disable');\n    }\n\n    const containerBounds = container.AABBBounds;\n    const width = containerBounds.width();\n    const height = containerBounds.height();\n\n    container.translateTo(0 - containerBounds.x1 + parsedPadding[3], 0 - containerBounds.y1 + parsedPadding[0]);\n    this.add(container);\n\n    this.attribute.width = width + parsedPadding[1] + parsedPadding[3];\n    this.attribute.height = height + parsedPadding[0] + parsedPadding[2];\n\n    this._bindEvents();\n  }\n\n  private _bindEvents(): void {\n    if (this.preHandler) {\n      this.preHandler.addEventListener('pointerenter', this._onHover as EventListenerOrEventListenerObject);\n      this.preHandler.addEventListener('pointerleave', this._onUnHover as EventListenerOrEventListenerObject);\n      this.preHandler.addEventListener('pointerdown', this._onClick as EventListenerOrEventListenerObject);\n    }\n\n    if (this.nextHandler) {\n      this.nextHandler.addEventListener('pointerenter', this._onHover as EventListenerOrEventListenerObject);\n      this.nextHandler.addEventListener('pointerleave', this._onUnHover as EventListenerOrEventListenerObject);\n      this.nextHandler.addEventListener('pointerdown', this._onClick as EventListenerOrEventListenerObject);\n    }\n  }\n\n  private _onHover = (e: FederatedPointerEvent) => {\n    const target = e.target as unknown as ISymbol;\n    if (!target.hasState('disable')) {\n      target.addState('hover');\n    }\n  };\n\n  private _onUnHover = (e: FederatedPointerEvent) => {\n    const target = e.target as unknown as ISymbol;\n    target.removeState('hover');\n  };\n\n  private _onClick = (e: FederatedPointerEvent) => {\n    const target = e.target as unknown as ISymbol;\n    if (target.name === 'preHandler') {\n      if (this._current === 1) {\n        return;\n      }\n      this._current -= 1;\n      if (this._current === 1) {\n        target.addState('disable');\n      } else {\n        target.removeState('disable');\n      }\n      const changeEvent = new CustomEvent('toPrev', {\n        current: this._current,\n        total: this._total,\n        direction: 'pre'\n      });\n      // FIXME: 需要在 vrender 的事件系统支持\n      // @ts-ignore\n      changeEvent.manager = this.stage?.eventSystem.manager;\n      this.dispatchEvent(changeEvent);\n    }\n\n    if (target.name === 'nextHandler') {\n      if (this._current === this._total) {\n        return;\n      }\n      this._current += 1;\n\n      if (this._current === this._total) {\n        target.addState('disable');\n      } else {\n        target.removeState('disable');\n      }\n\n      const changeEvent = new CustomEvent('toNext', {\n        current: this._current,\n        total: this._total,\n        direction: 'next'\n      });\n      // FIXME: 需要在 vrender 的事件系统支持\n      // @ts-ignore\n      changeEvent.manager = this.stage?.eventSystem.manager;\n      this.dispatchEvent(changeEvent);\n    }\n\n    if (this._current > 1) {\n      (this.preHandler as ISymbol).removeState('disable');\n    }\n    if (this._current < this._total) {\n      (this.nextHandler as ISymbol).removeState('disable');\n    }\n\n    (this.text as IText).setAttribute('text', `${this._current}/${this._total}`);\n  };\n\n  private _reset() {\n    this.removeAllChild();\n    this._current = 1;\n    this._total = this.attribute.total as number;\n    this.preHandler = this.nextHandler = this.text = null;\n  }\n}\n"]}

package/cjs/util/matrix.d.ts

@@ -1,4 +1,7 @@
-import { vec2 } from 'gl-matrix';
-export { vec2 };
+export type Vector2 = [number, number];
+export declare function scale(vector: Vector2, scale: number): number[];
+export declare function length(vector: Vector2): number;
+export declare function normalize(vector: Vector2): number[];
+export declare function angle(vector1: Vector2, vector2: Vector2): number;
 export declare function direction(v1: number[], v2: number[]): number;
 export declare function angleTo(v1: [number, number], v2: [number, number], direct: boolean): number;

package/cjs/util/matrix.js

@@ -1,24 +1,37 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-    value: !0
-}), exports.angleTo = exports.direction = exports.vec2 = void 0;
+function scale(vector, scale) {
+    return [ vector[0] * scale, vector[1] * scale ];
+}
+
+function length(vector) {
+    const [x, y] = vector;
+    return Math.sqrt(x * x + y * y);
+}
 
-const gl_matrix_1 = require("gl-matrix");
+function normalize(vector) {
+    const [x, y] = vector;
+    let len = x * x + y * y;
+    return len > 0 && (len = 1 / Math.sqrt(len)), [ vector[0] * len, vector[1] * len ];
+}
+
+function angle(vector1, vector2) {
+    const [x1, y1] = vector1, [x2, y2] = vector2, mag = Math.sqrt((x1 * x1 + y1 * y1) * (x2 * x2 + y2 * y2)), cosine = mag && (x1 * x2 + y1 * y2) / mag;
+    return Math.acos(Math.min(Math.max(cosine, -1), 1));
+}
 
 function direction(v1, v2) {
     return v1[0] * v2[1] - v2[0] * v1[1];
 }
 
 function angleTo(v1, v2, direct) {
-    const ang = gl_matrix_1.vec2.angle(v1, v2), angleLargeThanPI = direction(v1, v2) >= 0;
+    const ang = angle(v1, v2), angleLargeThanPI = direction(v1, v2) >= 0;
     return direct ? angleLargeThanPI ? 2 * Math.PI - ang : ang : angleLargeThanPI ? ang : 2 * Math.PI - ang;
 }
 
-Object.defineProperty(exports, "vec2", {
-    enumerable: !0,
-    get: function() {
-        return gl_matrix_1.vec2;
-    }
-}), exports.direction = direction, exports.angleTo = angleTo;
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.angleTo = exports.direction = exports.angle = exports.normalize = exports.length = exports.scale = void 0, 
+exports.scale = scale, exports.length = length, exports.normalize = normalize, exports.angle = angle, 
+exports.direction = direction, exports.angleTo = angleTo;
 //# sourceMappingURL=matrix.js.map

package/cjs/util/matrix.js.map

@@ -1 +1 @@
-{"version":3,"sources":["util/matrix.ts"],"names":[],"mappings":";;;AAAA,yCAAiC;AAExB,qFAFA,gBAAI,OAEA;AAQb,SAAgB,SAAS,CAAC,EAAY,EAAE,EAAY;IAClD,OAAO,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;AACvC,CAAC;AAFD,8BAEC;AAQD,SAAgB,OAAO,CAAC,EAAoB,EAAE,EAAoB,EAAE,MAAe;IACjF,MAAM,GAAG,GAAG,gBAAI,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAC/B,MAAM,gBAAgB,GAAG,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IAChD,IAAI,MAAM,EAAE;QACV,IAAI,gBAAgB,EAAE;YACpB,OAAO,IAAI,CAAC,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC;SAC1B;QACD,OAAO,GAAG,CAAC;KACZ;IAED,IAAI,gBAAgB,EAAE;QACpB,OAAO,GAAG,CAAC;KACZ;IACD,OAAO,IAAI,CAAC,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC;AAC3B,CAAC;AAdD,0BAcC","file":"matrix.js","sourcesContent":["import { vec2 } from 'gl-matrix';\n\nexport { vec2 };\n\n/**\n * 向量 v1 到 向量 v2 夹角的方向\n * @param  {Array} v1 向量\n * @param  {Array} v2 向量\n * @return {Boolean} >= 0 顺时针 < 0 逆时针\n */\nexport function direction(v1: number[], v2: number[]): number {\n  return v1[0] * v2[1] - v2[0] * v1[1];\n}\n\n/**\n * 二维向量 v1 到 v2 的夹角\n * @param v1\n * @param v2\n * @param direct\n */\nexport function angleTo(v1: [number, number], v2: [number, number], direct: boolean): number {\n  const ang = vec2.angle(v1, v2);\n  const angleLargeThanPI = direction(v1, v2) >= 0;\n  if (direct) {\n    if (angleLargeThanPI) {\n      return Math.PI * 2 - ang;\n    }\n    return ang;\n  }\n\n  if (angleLargeThanPI) {\n    return ang;\n  }\n  return Math.PI * 2 - ang;\n}\n"]}
+{"version":3,"sources":["util/matrix.ts"],"names":[],"mappings":";;;AAKA,SAAgB,KAAK,CAAC,MAAe,EAAE,KAAa;IAClD,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC;AAChD,CAAC;AAFD,sBAEC;AAKD,SAAgB,MAAM,CAAC,MAAe;IACpC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC;IACtB,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;AAClC,CAAC;AAHD,wBAGC;AAKD,SAAgB,SAAS,CAAC,MAAe;IACvC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC;IACtB,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACxB,IAAI,GAAG,GAAG,CAAC,EAAE;QACX,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KAC1B;IACD,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;AAC5C,CAAC;AAPD,8BAOC;AAKD,SAAgB,KAAK,CAAC,OAAgB,EAAE,OAAgB;IACtD,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC;IACzB,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC;IACzB,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IACjE,MAAM,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,GAAG,CAAC;IAChD,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACtD,CAAC;AAND,sBAMC;AAQD,SAAgB,SAAS,CAAC,EAAY,EAAE,EAAY;IAClD,OAAO,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;AACvC,CAAC;AAFD,8BAEC;AAQD,SAAgB,OAAO,CAAC,EAAoB,EAAE,EAAoB,EAAE,MAAe;IACjF,MAAM,GAAG,GAAG,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAC1B,MAAM,gBAAgB,GAAG,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IAChD,IAAI,MAAM,EAAE;QACV,IAAI,gBAAgB,EAAE;YACpB,OAAO,IAAI,CAAC,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC;SAC1B;QACD,OAAO,GAAG,CAAC;KACZ;IAED,IAAI,gBAAgB,EAAE;QACpB,OAAO,GAAG,CAAC;KACZ;IACD,OAAO,IAAI,CAAC,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC;AAC3B,CAAC;AAdD,0BAcC","file":"matrix.js","sourcesContent":["export type Vector2 = [number, number];\n\n/**\n * Scales a vec2 by a scalar number\n */\nexport function scale(vector: Vector2, scale: number) {\n  return [vector[0] * scale, vector[1] * scale];\n}\n\n/**\n * Calculates the length of a vec2\n */\nexport function length(vector: Vector2) {\n  const [x, y] = vector;\n  return Math.sqrt(x * x + y * y);\n}\n\n/**\n * Normalize a vec2\n */\nexport function normalize(vector: Vector2) {\n  const [x, y] = vector;\n  let len = x * x + y * y;\n  if (len > 0) {\n    len = 1 / Math.sqrt(len);\n  }\n  return [vector[0] * len, vector[1] * len];\n}\n\n/**\n * Get the angle between two 2D vectors\n */\nexport function angle(vector1: Vector2, vector2: Vector2) {\n  const [x1, y1] = vector1;\n  const [x2, y2] = vector2;\n  const mag = Math.sqrt((x1 * x1 + y1 * y1) * (x2 * x2 + y2 * y2));\n  const cosine = mag && (x1 * x2 + y1 * y2) / mag;\n  return Math.acos(Math.min(Math.max(cosine, -1), 1));\n}\n\n/**\n * 向量 v1 到 向量 v2 夹角的方向\n * @param  {Array} v1 向量\n * @param  {Array} v2 向量\n * @return {Boolean} >= 0 顺时针 < 0 逆时针\n */\nexport function direction(v1: number[], v2: number[]): number {\n  return v1[0] * v2[1] - v2[0] * v1[1];\n}\n\n/**\n * 二维向量 v1 到 v2 的夹角\n * @param v1\n * @param v2\n * @param direct\n */\nexport function angleTo(v1: [number, number], v2: [number, number], direct: boolean): number {\n  const ang = angle(v1, v2);\n  const angleLargeThanPI = direction(v1, v2) >= 0;\n  if (direct) {\n    if (angleLargeThanPI) {\n      return Math.PI * 2 - ang;\n    }\n    return ang;\n  }\n\n  if (angleLargeThanPI) {\n    return ang;\n  }\n  return Math.PI * 2 - ang;\n}\n"]}

package/dist/index.js

@@ -436,143 +436,28 @@
         return '#' + vutils.ColorUtil.rgbToHex(r, g, b);
     }
 
-    /**
-     * Common utilities
-     * @module glMatrix
-     */
-    var ARRAY_TYPE = typeof Float32Array !== 'undefined' ? Float32Array : Array;
-    if (!Math.hypot) Math.hypot = function () {
-      var y = 0,
-        i = arguments.length;
-      while (i--) {
-        y += arguments[i] * arguments[i];
-      }
-      return Math.sqrt(y);
-    };
-
-    /**
-     * 2 Dimensional Vector
-     * @module vec2
-     */
-
-    /**
-     * Creates a new, empty vec2
-     *
-     * @returns {vec2} a new 2D vector
-     */
-
-    function create() {
-      var out = new ARRAY_TYPE(2);
-      if (ARRAY_TYPE != Float32Array) {
-        out[0] = 0;
-        out[1] = 0;
-      }
-      return out;
+    function scale(vector, scale) {
+        return [vector[0] * scale, vector[1] * scale];
     }
-    /**
-     * Scales a vec2 by a scalar number
-     *
-     * @param {vec2} out the receiving vector
-     * @param {ReadonlyVec2} a the vector to scale
-     * @param {Number} b amount to scale the vector by
-     * @returns {vec2} out
-     */
-
-    function scale(out, a, b) {
-      out[0] = a[0] * b;
-      out[1] = a[1] * b;
-      return out;
+    function length(vector) {
+        const [x, y] = vector;
+        return Math.sqrt(x * x + y * y);
     }
-    /**
-     * Calculates the length of a vec2
-     *
-     * @param {ReadonlyVec2} a vector to calculate length of
-     * @returns {Number} length of a
-     */
-
-    function length(a) {
-      var x = a[0],
-        y = a[1];
-      return Math.hypot(x, y);
-    }
-    /**
-     * Normalize a vec2
-     *
-     * @param {vec2} out the receiving vector
-     * @param {ReadonlyVec2} a vector to normalize
-     * @returns {vec2} out
-     */
-
-    function normalize(out, a) {
-      var x = a[0],
-        y = a[1];
-      var len = x * x + y * y;
-      if (len > 0) {
-        //TODO: evaluate use of glm_invsqrt here?
-        len = 1 / Math.sqrt(len);
-      }
-      out[0] = a[0] * len;
-      out[1] = a[1] * len;
-      return out;
+    function normalize(vector) {
+        const [x, y] = vector;
+        let len = x * x + y * y;
+        if (len > 0) {
+            len = 1 / Math.sqrt(len);
+        }
+        return [vector[0] * len, vector[1] * len];
     }
-    /**
-     * Get the angle between two 2D vectors
-     * @param {ReadonlyVec2} a The first operand
-     * @param {ReadonlyVec2} b The second operand
-     * @returns {Number} The angle in radians
-     */
-
-    function angle(a, b) {
-      var x1 = a[0],
-        y1 = a[1],
-        x2 = b[0],
-        y2 = b[1],
-        // mag is the product of the magnitudes of a and b
-        mag = Math.sqrt(x1 * x1 + y1 * y1) * Math.sqrt(x2 * x2 + y2 * y2),
-        // mag &&.. short circuits if mag == 0
-        cosine = mag && (x1 * x2 + y1 * y2) / mag; // Math.min(Math.max(cosine, -1), 1) clamps the cosine between -1 and 1
-
-      return Math.acos(Math.min(Math.max(cosine, -1), 1));
+    function angle(vector1, vector2) {
+        const [x1, y1] = vector1;
+        const [x2, y2] = vector2;
+        const mag = Math.sqrt((x1 * x1 + y1 * y1) * (x2 * x2 + y2 * y2));
+        const cosine = mag && (x1 * x2 + y1 * y2) / mag;
+        return Math.acos(Math.min(Math.max(cosine, -1), 1));
     }
-    /**
-     * Perform some operation over an array of vec2s.
-     *
-     * @param {Array} a the array of vectors to iterate over
-     * @param {Number} stride Number of elements between the start of each vec2. If 0 assumes tightly packed
-     * @param {Number} offset Number of elements to skip at the beginning of the array
-     * @param {Number} count Number of vec2s to iterate over. If 0 iterates over entire array
-     * @param {Function} fn Function to call for each vector in the array
-     * @param {Object} [arg] additional argument to pass to fn
-     * @returns {Array} a
-     * @function
-     */
-
-    (function () {
-      var vec = create();
-      return function (a, stride, offset, count, fn, arg) {
-        var i, l;
-        if (!stride) {
-          stride = 2;
-        }
-        if (!offset) {
-          offset = 0;
-        }
-        if (count) {
-          l = Math.min(count * stride + offset, a.length);
-        } else {
-          l = a.length;
-        }
-        for (i = offset; i < l; i += stride) {
-          vec[0] = a[i];
-          vec[1] = a[i + 1];
-          fn(vec, vec, arg);
-          a[i] = vec[0];
-          a[i + 1] = vec[1];
-        }
-        return a;
-      };
-    })();
-
     function direction(v1, v2) {
         return v1[0] * v2[1] - v2[0] * v1[1];
     }
@@ -2525,11 +2410,11 @@
             container.add(axisTitle);
         }
         renderGrid(container) {
-            this._renderGridByType('grid', container);
             const { visible } = this.attribute.subGrid || {};
             if (visible) {
                 this._renderGridByType('subGrid', container);
             }
+            this._renderGridByType('grid', container);
         }
         getVerticalCoord(point, offset, inside) {
             const vector = this.getVerticalVector(offset, inside, point);
@@ -2773,9 +2658,9 @@
         getVerticalVector(offset, inside = false) {
             const { verticalFactor = 1 } = this.attribute;
             const axisVector = this.getRelativeVector();
-            const normalize$1 = normalize([0, 0], axisVector);
-            const verticalVector = [normalize$1[1], normalize$1[0] * -1];
-            return scale([0, 0], verticalVector, offset * (inside ? 1 : -1) * verticalFactor);
+            const normalizedAxisVector = normalize(axisVector);
+            const verticalVector = [normalizedAxisVector[1], normalizedAxisVector[0] * -1];
+            return scale(verticalVector, offset * (inside ? 1 : -1) * verticalFactor);
         }
         getTitleAttribute() {
             const { position = 'middle', space = 4, textStyle = {}, autoRotate = true, shape, background, state, ...restAttrs } = this.attribute.title;
@@ -3072,8 +2957,7 @@
             const { inside: axisInside = false } = this.attribute;
             const { center } = this.attribute;
             const vector = [point.x - center.x, point.y - center.y];
-            scale(vector, vector, ((inside ? -1 : 1) * (axisInside ? -1 : 1) * offset) / length(vector));
-            return vector;
+            return scale(vector, ((inside ? -1 : 1) * (axisInside ? -1 : 1) * offset) / length(vector));
         }
         getRelativeVector(point) {
             const { center } = this.attribute;
@@ -4930,6 +4814,7 @@
             }
             const preHandler = vrender.createSymbol({
                 strokeBoundsBuffer: 0,
+                pickMode: 'imprecise',
                 ...handlerStyle,
                 x: 0,
                 y: 0,
@@ -4960,6 +4845,7 @@
             container.add(text);
             const nextHandler = vrender.createSymbol({
                 strokeBoundsBuffer: 0,
+                pickMode: 'imprecise',
                 ...handlerStyle,
                 x: isHorizontal ? handlerSizeX + handlerSpace * 2 + maxTextWidth : 0,
                 y: isHorizontal ? 0 : handlerSizeY + handlerSpace * 2 + maxTextHeight,
@@ -5343,11 +5229,21 @@
                 this._itemMaxWidth = Math.max(itemWidth, this._itemMaxWidth);
                 if (isHorizontal) {
                     maxPages = maxRow;
-                    if (vutils.isValid(maxWidth) && maxWidth < startX + itemWidth) {
-                        doWrap = true;
-                        startX = 0;
-                        startY += itemHeight + spaceRow;
-                        pages += 1;
+                    if (vutils.isValid(maxWidth)) {
+                        if (itemWidth >= maxWidth) {
+                            doWrap = true;
+                            if (index > 0) {
+                                startX = 0;
+                                startY += itemHeight + spaceRow;
+                                pages += 1;
+                            }
+                        }
+                        else if (maxWidth < startX + itemWidth) {
+                            doWrap = true;
+                            startX = 0;
+                            startY += itemHeight + spaceRow;
+                            pages += 1;
+                        }
                     }
                     if (index > 0) {
                         itemGroup.setAttributes({
@@ -5376,10 +5272,11 @@
                 }
                 itemsContainer.add(itemGroup);
             });
+            let pagerRendered = false;
             if (doWrap && autoPage && pages > maxPages) {
-                this._renderPager(isHorizontal);
+                pagerRendered = this._renderPager(isHorizontal);
             }
-            else {
+            if (!pagerRendered) {
                 itemsContainer.setAttribute('y', this._title ? this._title.AABBBounds.height() + vutils.get(this.attribute, 'title.space', 8) : 0);
                 this._innerView.add(itemsContainer);
             }
@@ -5555,6 +5452,10 @@
                 this._innerView.add(pagerComp);
                 pageHeight = (maxRow - 1) * spaceRow + this._itemHeight * maxRow;
                 pageWidth = maxWidth - pagerComp.AABBBounds.width() - pagerSpace;
+                if (pageWidth <= 0) {
+                    this._innerView.removeChild(pagerComp);
+                    return false;
+                }
                 itemsContainer.getChildren().forEach((item, index) => {
                     const { width, height } = item.attribute;
                     if (pageWidth < startX + width) {
@@ -5586,6 +5487,10 @@
                 this._innerView.add(pagerComp);
                 pageWidth = this._itemMaxWidth * maxCol + (maxCol - 1) * spaceCol;
                 pageHeight = maxHeight - pagerComp.AABBBounds.height() - pagerSpace - renderStartY;
+                if (pageHeight <= 0) {
+                    this._innerView.removeChild(pagerComp);
+                    return false;
+                }
                 itemsContainer.getChildren().forEach((item, index) => {
                     const { height } = item.attribute;
                     if (pageHeight < startY + height) {
@@ -5645,6 +5550,7 @@
             };
             this._pager.addEventListener('toPrev', onPaging);
             this._pager.addEventListener('toNext', onPaging);
+            return true;
         }
         _onHover = (e) => {
             const target = e.target;
@@ -8060,6 +7966,17 @@
         }
     }
 
+    exports.IOperateType = void 0;
+    (function (IOperateType) {
+        IOperateType["drawStart"] = "drawStart";
+        IOperateType["drawEnd"] = "drawEnd";
+        IOperateType["drawing"] = "drawing";
+        IOperateType["moving"] = "moving";
+        IOperateType["moveStart"] = "moveStart";
+        IOperateType["moveEnd"] = "moveEnd";
+        IOperateType["brushClear"] = "brushClear";
+    })(exports.IOperateType || (exports.IOperateType = {}));
+
     const DEFAULT_BRUSH_ATTRIBUTES = {
         brushMode: 'single',
         brushType: 'rect',
@@ -8091,6 +8008,8 @@
         _container;
         _activeDrawState = false;
         _cacheDrawPoints = [];
+        _cacheStartTime;
+        _activeClearState = false;
         _activeMoveState = false;
         _operatingMaskMoveDx = 0;
         _operatingMaskMoveDy = 0;
@@ -8146,12 +8065,12 @@
             this._activeMoveState && this._moving(e);
         };
         _onBrushEnd = (e) => {
-            if (this._outOfInteractiveRange(e)) {
+            if (this._activeClearState) {
                 return;
             }
             this._updateDragMaskCallback &&
                 this._updateDragMaskCallback({
-                    operateType: this._activeDrawState ? 'brushEnd' : 'brushMaskUp',
+                    operateType: this._activeDrawState ? exports.IOperateType.drawEnd : exports.IOperateType.moveEnd,
                     operateMask: this._operatingMask,
                     operatedMaskAABBBounds: this._brushMaskAABBBoundsDict
                 });
@@ -8160,25 +8079,34 @@
             this._operatingMask.setAttribute('pickable', false);
         };
         _initDraw(e) {
-            const { brushMode, removeOnClick } = this.attribute;
+            const { removeOnClick } = this.attribute;
             const pos = this.eventPosToStagePos(e);
             this._cacheDrawPoints = [pos];
+            const nowTime = Date.now();
             if (!this._operatingMask) {
                 this._addBrushMask();
             }
-            if (brushMode === 'single' && removeOnClick) {
+            if (nowTime - this._cacheStartTime < 200 && removeOnClick) {
+                this._activeClearState = true;
                 this._container.incrementalClearChild();
-                this._addBrushMask();
+                this._updateDragMaskCallback &&
+                    this._updateDragMaskCallback({
+                        operateType: exports.IOperateType.brushClear,
+                        operateMask: this._operatingMask,
+                        operatedMaskAABBBounds: this._brushMaskAABBBoundsDict
+                    });
             }
-            else if (brushMode === 'multiple') {
+            else {
+                this._activeClearState = false;
                 this._addBrushMask();
+                this._updateDragMaskCallback &&
+                    this._updateDragMaskCallback({
+                        operateType: exports.IOperateType.drawStart,
+                        operateMask: this._operatingMask,
+                        operatedMaskAABBBounds: this._brushMaskAABBBoundsDict
+                    });
             }
-            this._updateDragMaskCallback &&
-                this._updateDragMaskCallback({
-                    operateType: 'brushStart',
-                    operateMask: this._operatingMask,
-                    operatedMaskAABBBounds: this._brushMaskAABBBoundsDict
-                });
+            this._cacheStartTime = nowTime;
         }
         _initMove(e) {
             this._cacheMovePoint = this.eventPosToStagePos(e);
@@ -8196,7 +8124,7 @@
             this._operatingMask.setAttribute('pickable', true);
             this._updateDragMaskCallback &&
                 this._updateDragMaskCallback({
-                    operateType: 'brushMaskDown',
+                    operateType: exports.IOperateType.moveStart,
                     operateMask: this._operatingMask,
                     operatedMaskAABBBounds: this._brushMaskAABBBoundsDict
                 });
@@ -8215,7 +8143,7 @@
             this._brushMaskAABBBoundsDict[this._operatingMask.name] = this._operatingMask.AABBBounds;
             this._updateDragMaskCallback &&
                 this._updateDragMaskCallback({
-                    operateType: 'brushing',
+                    operateType: exports.IOperateType.drawing,
                     operateMask: this._operatingMask,
                     operatedMaskAABBBounds: this._brushMaskAABBBoundsDict
                 });
@@ -8239,7 +8167,7 @@
             this._brushMaskAABBBoundsDict[this._operatingMask.name] = this._operatingMask.AABBBounds;
             this._updateDragMaskCallback &&
                 this._updateDragMaskCallback({
-                    operateType: 'brushMaskMove',
+                    operateType: exports.IOperateType.moving,
                     operateMask: this._operatingMask,
                     operatedMaskAABBBounds: this._brushMaskAABBBoundsDict
                 });
@@ -8718,7 +8646,7 @@
         }
     }
 
-    const version = "0.12.1";
+    const version = "0.12.3-alpha.6";
 
     exports.AbstractComponent = AbstractComponent;
     exports.BasePlayer = BasePlayer;