@visactor/vrender-core 0.16.0-alpha.0 → 0.16.0-alpha.2

package/es/graphic/text.d.ts

@@ -53,6 +53,18 @@ export declare class Text extends Graphic<ITextGraphicAttribute> implements ITex
     updateSingallineAABBBounds(text: number | string): AABBBounds;
     updateMultilineAABBBounds(text: (number | string)[]): AABBBounds;
     updateHorizontalSinglelineAABBBounds(text: number | string): AABBBounds;
+    getBaselineMapAlign(): Record<string, string>;
+    getAlignMapBaseline(): Record<string, string>;
+    static baselineMapAlign: {
+        top: string;
+        bottom: string;
+        middle: string;
+    };
+    static alignMapBaseline: {
+        left: string;
+        right: string;
+        center: string;
+    };
     updateVerticalSinglelineAABBBounds(text: number | string): AABBBounds;
     updateHorizontalMultilineAABBBounds(text: (number | string)[]): AABBBounds;
     updateVerticalMultilineAABBBounds(text: (number | string)[]): AABBBounds;

package/es/graphic/text.js

@@ -111,11 +111,23 @@ export class Text extends Graphic {
         return this._AABBBounds.set(dx, dy, dx + width, dy + lh), stroke && this._AABBBounds.expand(lineWidth / 2), 
         this._AABBBounds;
     }
+    getBaselineMapAlign() {
+        return Text.baselineMapAlign;
+    }
+    getAlignMapBaseline() {
+        return Text.alignMapBaseline;
+    }
     updateVerticalSinglelineAABBBounds(text) {
-        var _a;
+        var _a, _b, _c;
         const textTheme = getTheme(this).text, textMeasure = application.graphicUtil.textMeasure;
         let width;
-        const attribute = this.attribute, {ignoreBuf: ignoreBuf = textTheme.ignoreBuf} = attribute, buf = ignoreBuf ? 0 : 2, {maxLineWidth: maxLineWidth = textTheme.maxLineWidth, ellipsis: ellipsis = textTheme.ellipsis, textAlign: textAlign = textTheme.textAlign, textBaseline: textBaseline = textTheme.textBaseline, fontSize: fontSize = textTheme.fontSize, fontWeight: fontWeight = textTheme.fontWeight, fontFamily: fontFamily = textTheme.fontFamily, stroke: stroke = textTheme.stroke, lineHeight: lineHeight = (null !== (_a = attribute.lineHeight) && void 0 !== _a ? _a : (attribute.fontSize || textTheme.fontSize) + buf), lineWidth: lineWidth = textTheme.lineWidth, wordBreak: wordBreak = textTheme.wordBreak} = attribute;
+        const attribute = this.attribute, {ignoreBuf: ignoreBuf = textTheme.ignoreBuf} = attribute, buf = ignoreBuf ? 0 : 2, {maxLineWidth: maxLineWidth = textTheme.maxLineWidth, ellipsis: ellipsis = textTheme.ellipsis, fontSize: fontSize = textTheme.fontSize, fontWeight: fontWeight = textTheme.fontWeight, fontFamily: fontFamily = textTheme.fontFamily, stroke: stroke = textTheme.stroke, lineHeight: lineHeight = (null !== (_a = attribute.lineHeight) && void 0 !== _a ? _a : (attribute.fontSize || textTheme.fontSize) + buf), lineWidth: lineWidth = textTheme.lineWidth, verticalMode: verticalMode = textTheme.verticalMode} = attribute;
+        let {textAlign: textAlign = textTheme.textAlign, textBaseline: textBaseline = textTheme.textBaseline} = attribute;
+        if (!verticalMode) {
+            const t = textAlign;
+            textAlign = null !== (_b = Text.baselineMapAlign[textBaseline]) && void 0 !== _b ? _b : "left", 
+            textBaseline = null !== (_c = Text.alignMapBaseline[t]) && void 0 !== _c ? _c : "top";
+        }
         if (!this.shouldUpdateShape() && this.cache) {
             width = this.cache.clipedWidth;
             const dx = textDrawOffsetX(textAlign, width), dy = textLayoutOffsetY(textBaseline, lineHeight, fontSize);
@@ -170,10 +182,16 @@ export class Text extends Graphic {
         stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;
     }
     updateVerticalMultilineAABBBounds(text) {
-        var _a;
+        var _a, _b, _c;
         const textTheme = getTheme(this).text, textMeasure = application.graphicUtil.textMeasure;
         let width;
-        const attribute = this.attribute, {ignoreBuf: ignoreBuf = textTheme.ignoreBuf} = attribute, buf = ignoreBuf ? 0 : 2, {maxLineWidth: maxLineWidth = textTheme.maxLineWidth, ellipsis: ellipsis = textTheme.ellipsis, textAlign: textAlign = textTheme.textAlign, textBaseline: textBaseline = textTheme.textBaseline, fontFamily: fontFamily = textTheme.fontFamily, fontSize: fontSize = textTheme.fontSize, fontWeight: fontWeight = textTheme.fontWeight, stroke: stroke = textTheme.stroke, lineHeight: lineHeight = (null !== (_a = attribute.lineHeight) && void 0 !== _a ? _a : (attribute.fontSize || textTheme.fontSize) + buf), lineWidth: lineWidth = textTheme.lineWidth, wordBreak: wordBreak = textTheme.wordBreak} = attribute;
+        const attribute = this.attribute, {ignoreBuf: ignoreBuf = textTheme.ignoreBuf} = attribute, buf = ignoreBuf ? 0 : 2, {maxLineWidth: maxLineWidth = textTheme.maxLineWidth, ellipsis: ellipsis = textTheme.ellipsis, fontFamily: fontFamily = textTheme.fontFamily, fontSize: fontSize = textTheme.fontSize, fontWeight: fontWeight = textTheme.fontWeight, stroke: stroke = textTheme.stroke, lineHeight: lineHeight = (null !== (_a = attribute.lineHeight) && void 0 !== _a ? _a : (attribute.fontSize || textTheme.fontSize) + buf), lineWidth: lineWidth = textTheme.lineWidth, verticalMode: verticalMode = textTheme.verticalMode} = attribute;
+        let {textAlign: textAlign = textTheme.textAlign, textBaseline: textBaseline = textTheme.textBaseline} = attribute;
+        if (!verticalMode) {
+            const t = textAlign;
+            textAlign = null !== (_b = Text.baselineMapAlign[textBaseline]) && void 0 !== _b ? _b : "left", 
+            textBaseline = null !== (_c = Text.alignMapBaseline[t]) && void 0 !== _c ? _c : "top";
+        }
         if (width = 0, !this.shouldUpdateShape() && this.cache) {
             this.cache.verticalList.forEach((item => {
                 const w = item.reduce(((a, b) => a + b.width), 0);
@@ -243,5 +261,13 @@ Text.NOWORK_ANIMATE_ATTR = Object.assign({
     textBaseline: 1,
     fontFamily: 1,
     fontWeight: 1
-}, NOWORK_ANIMATE_ATTR);
+}, NOWORK_ANIMATE_ATTR), Text.baselineMapAlign = {
+    top: "left",
+    bottom: "right",
+    middle: "center"
+}, Text.alignMapBaseline = {
+    left: "top",
+    right: "bottom",
+    center: "middle"
+};
 //# sourceMappingURL=text.js.map

package/es/graphic/text.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graphic/text.ts"],"names":[],"mappings":"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","file":"text.js","sourcesContent":["import { max, type AABBBounds, type OBBBounds } from '@visactor/vutils';\nimport { getContextFont, textDrawOffsetX, textLayoutOffsetY } from '../common/text';\nimport { CanvasTextLayout } from '../core/contributions/textMeasure/layout';\nimport { application } from '../application';\nimport type { IText, ITextCache, ITextGraphicAttribute, LayoutType } from '../interface';\nimport { Graphic, GRAPHIC_UPDATE_TAG_KEY, NOWORK_ANIMATE_ATTR } from './graphic';\nimport { getTheme } from './theme';\nimport { parsePadding } from '../common/utils';\nimport { TEXT_NUMBER_TYPE } from './constants';\nimport { TextDirection, verticalLayout } from './tools';\n\nconst TEXT_UPDATE_TAG_KEY = [\n  'text',\n  'maxLineWidth',\n  // 'textAlign',\n  // 'textBaseline',\n  'fontSize',\n  'fontFamily',\n  'fontWeight',\n  'ellipsis',\n  'lineHeight',\n  'direction',\n  'wordBreak',\n  ...GRAPHIC_UPDATE_TAG_KEY\n];\n\nexport class Text extends Graphic<ITextGraphicAttribute> implements IText {\n  type: 'text' = 'text';\n\n  static NOWORK_ANIMATE_ATTR = {\n    ellipsis: 1,\n    wordBreak: 1,\n    direction: 1,\n    textAlign: 1,\n    textBaseline: 1,\n    fontFamily: 1,\n    fontWeight: 1,\n    ...NOWORK_ANIMATE_ATTR\n  };\n\n  cache: ITextCache;\n  _font: string;\n\n  get font(): string {\n    const textTheme = getTheme(this).text;\n    if (!this._font) {\n      this._font = getContextFont(this.attribute, textTheme);\n    }\n    return this._font as string;\n  }\n\n  get clipedText(): string | undefined {\n    const attribute = this.attribute;\n    const textTheme = getTheme(this).text;\n    if (Array.isArray(attribute.text)) {\n      return undefined;\n    }\n    const { maxLineWidth = textTheme.maxLineWidth } = attribute;\n    if (!Number.isFinite(maxLineWidth)) {\n      return (attribute.text ?? textTheme.text).toString();\n    }\n    this.tryUpdateAABBBounds();\n    return this.cache.clipedText;\n  }\n  get clipedWidth(): number | undefined {\n    if (Array.isArray(this.attribute.text)) {\n      return undefined;\n    }\n    this.tryUpdateAABBBounds();\n    return this.cache.clipedWidth;\n  }\n  get cliped(): boolean | undefined {\n    const textTheme = getTheme(this).text;\n    const attribute = this.attribute;\n    if (Array.isArray(attribute.text)) {\n      return undefined;\n    }\n    const { maxLineWidth = textTheme.maxLineWidth } = attribute;\n    if (!Number.isFinite(maxLineWidth)) {\n      return false;\n    }\n    this.tryUpdateAABBBounds();\n    return this.clipedText !== attribute.text.toString();\n  }\n  get multilineLayout(): LayoutType | undefined {\n    if (!Array.isArray(this.attribute.text)) {\n      return undefined;\n    }\n    this.tryUpdateAABBBounds();\n    return this.cache.layoutData;\n  }\n\n  constructor(params: ITextGraphicAttribute = { text: '', fontSize: 16 }) {\n    super(params);\n    this.numberType = TEXT_NUMBER_TYPE;\n    this.cache = {};\n  }\n\n  isValid(): boolean {\n    return super.isValid() && this._isValid();\n  }\n  protected _isValid(): boolean {\n    const { text } = this.attribute;\n    return text != null && text !== '';\n  }\n\n  protected doUpdateAABBBounds(): AABBBounds {\n    const textTheme = getTheme(this).text;\n    this._AABBBounds.setValue(Infinity, Infinity, -Infinity, -Infinity);\n    const attribute = this.attribute;\n    const bounds = application.graphicService.updateTextAABBBounds(\n      attribute,\n      textTheme,\n      this._AABBBounds,\n      this\n    ) as AABBBounds;\n\n    const { boundsPadding = textTheme.boundsPadding } = this.attribute;\n    const paddingArray = parsePadding(boundsPadding);\n    if (paddingArray) {\n      bounds.expand(paddingArray);\n    }\n\n    this.clearUpdateBoundTag();\n    return bounds;\n  }\n\n  /**\n   * 计算单行文字的bounds，可以缓存长度以及截取的文字\n   * @param text\n   */\n  updateSingallineAABBBounds(text: number | string): AABBBounds {\n    const textTheme = getTheme(this).text;\n    const { direction = textTheme.direction } = this.attribute;\n\n    return direction === 'horizontal'\n      ? this.updateHorizontalSinglelineAABBBounds(text)\n      : this.updateVerticalSinglelineAABBBounds(text);\n  }\n\n  /**\n   * 计算单行文字的bounds，可以缓存长度以及截取的文字\n   * @param text\n   */\n  updateMultilineAABBBounds(text: (number | string)[]): AABBBounds {\n    const textTheme = getTheme(this).text;\n    const { direction = textTheme.direction } = this.attribute;\n\n    return direction === 'horizontal'\n      ? this.updateHorizontalMultilineAABBBounds(text)\n      : this.updateVerticalMultilineAABBBounds(text);\n  }\n\n  /**\n   * 计算单行文字的bounds，可以缓存长度以及截取的文字\n   * @param text\n   */\n  updateHorizontalSinglelineAABBBounds(text: number | string): AABBBounds {\n    const textTheme = getTheme(this).text;\n    const textMeasure = application.graphicUtil.textMeasure;\n    let width: number;\n    let str: string;\n    const attribute = this.attribute;\n    const {\n      maxLineWidth = textTheme.maxLineWidth,\n      ellipsis = textTheme.ellipsis,\n      textAlign = textTheme.textAlign,\n      textBaseline = textTheme.textBaseline,\n      fontFamily = textTheme.fontFamily,\n      fontSize = textTheme.fontSize,\n      fontWeight = textTheme.fontWeight,\n      stroke = textTheme.stroke,\n      lineWidth = textTheme.lineWidth,\n      wordBreak = textTheme.wordBreak,\n      ignoreBuf = textTheme.ignoreBuf\n    } = attribute;\n    const buf = ignoreBuf ? 0 : Math.max(2, fontSize * 0.075);\n    const { lineHeight = attribute.lineHeight ?? (attribute.fontSize || textTheme.fontSize) + buf } = attribute;\n    if (!this.shouldUpdateShape() && this.cache) {\n      width = this.cache.clipedWidth ?? 0;\n      const dx = textDrawOffsetX(textAlign, width);\n      const dy = textLayoutOffsetY(textBaseline, lineHeight, fontSize);\n      this._AABBBounds.set(dx, dy, dx + width, dy + lineHeight);\n      if (stroke) {\n        this._AABBBounds.expand(lineWidth / 2);\n      }\n      return this._AABBBounds;\n    }\n\n    if (Number.isFinite(maxLineWidth)) {\n      if (ellipsis) {\n        const strEllipsis = (ellipsis === true ? textTheme.ellipsis : ellipsis) as string;\n        const data = textMeasure.clipTextWithSuffix(\n          text.toString(),\n          { fontSize, fontWeight, fontFamily },\n          maxLineWidth,\n          strEllipsis,\n          false\n        );\n        str = data.str;\n        width = data.width;\n      } else {\n        const data = textMeasure.clipText(text.toString(), { fontSize, fontWeight, fontFamily }, maxLineWidth, false);\n        str = data.str;\n        width = data.width;\n      }\n      this.cache.clipedText = str;\n      this.cache.clipedWidth = width;\n      // todo 计算原本的宽度\n    } else {\n      width = textMeasure.measureTextWidth(text.toString(), { fontSize, fontWeight, fontFamily });\n      this.cache.clipedText = text.toString();\n      this.cache.clipedWidth = width;\n    }\n    this.clearUpdateShapeTag();\n\n    const dx = textDrawOffsetX(textAlign, width);\n    let lh = lineHeight;\n    if (application.global && application.global.isSafari()) {\n      // 如果是safari，那么需要额外增加高度\n      lh += fontSize * 0.2;\n    }\n    const dy = textLayoutOffsetY(textBaseline, lh, fontSize, buf);\n    this._AABBBounds.set(dx, dy, dx + width, dy + lh);\n\n    if (stroke) {\n      this._AABBBounds.expand(lineWidth / 2);\n    }\n\n    return this._AABBBounds;\n  }\n\n  /**\n   * 计算垂直布局的单行文字的bounds，可以缓存长度以及截取的文字\n   * @param text\n   */\n  updateVerticalSinglelineAABBBounds(text: number | string): AABBBounds {\n    const textTheme = getTheme(this).text;\n    const textMeasure = application.graphicUtil.textMeasure;\n    let width: number;\n    let str: string;\n    const attribute = this.attribute;\n    const { ignoreBuf = textTheme.ignoreBuf } = attribute;\n    const buf = ignoreBuf ? 0 : 2;\n    const {\n      maxLineWidth = textTheme.maxLineWidth,\n      ellipsis = textTheme.ellipsis,\n      textAlign = textTheme.textAlign,\n      textBaseline = textTheme.textBaseline,\n      fontSize = textTheme.fontSize,\n      fontWeight = textTheme.fontWeight,\n      fontFamily = textTheme.fontFamily,\n      stroke = textTheme.stroke,\n      lineHeight = attribute.lineHeight ?? (attribute.fontSize || textTheme.fontSize) + buf,\n      lineWidth = textTheme.lineWidth,\n      wordBreak = textTheme.wordBreak\n    } = attribute;\n    if (!this.shouldUpdateShape() && this.cache) {\n      width = this.cache.clipedWidth;\n      const dx = textDrawOffsetX(textAlign, width);\n      const dy = textLayoutOffsetY(textBaseline, lineHeight, fontSize);\n      this._AABBBounds.set(dy, dx, dy + lineHeight, dx + width);\n      if (stroke) {\n        this._AABBBounds.expand(lineWidth / 2);\n      }\n      return this._AABBBounds;\n    }\n\n    let verticalList: { text: string; width?: number; direction: TextDirection }[][] = [\n      verticalLayout(text.toString())\n    ];\n    if (Number.isFinite(maxLineWidth)) {\n      if (ellipsis) {\n        const strEllipsis = (ellipsis === true ? textTheme.ellipsis : ellipsis) as string;\n        const data = textMeasure.clipTextWithSuffixVertical(\n          verticalList[0],\n          { fontSize, fontWeight, fontFamily },\n          maxLineWidth,\n          strEllipsis,\n          false\n        );\n        verticalList = [data.verticalList];\n        width = data.width;\n      } else {\n        const data = textMeasure.clipTextVertical(\n          verticalList[0],\n          { fontSize, fontWeight, fontFamily },\n          maxLineWidth,\n          false\n        );\n        verticalList = [data.verticalList];\n        width = data.width;\n      }\n      this.cache.verticalList = verticalList;\n      this.cache.clipedWidth = width;\n      // todo 计算原本的宽度\n    } else {\n      width = 0;\n      verticalList[0].forEach(t => {\n        const w =\n          t.direction === TextDirection.HORIZONTAL\n            ? fontSize\n            : textMeasure.measureTextWidth(t.text, { fontSize, fontWeight, fontFamily });\n\n        width += w;\n        t.width = w;\n      });\n      this.cache.verticalList = verticalList;\n      this.cache.clipedWidth = width;\n    }\n    this.clearUpdateShapeTag();\n\n    const dx = textDrawOffsetX(textAlign, width);\n    const dy = textLayoutOffsetY(textBaseline, lineHeight, fontSize);\n    this._AABBBounds.set(dy, dx, dy + lineHeight, dx + width);\n\n    if (stroke) {\n      this._AABBBounds.expand(lineWidth / 2);\n    }\n\n    return this._AABBBounds;\n  }\n\n  /**\n   * 计算多行文字的bounds，缓存每行文字的布局位置\n   * @param text\n   */\n  updateHorizontalMultilineAABBBounds(text: (number | string)[]): AABBBounds {\n    const textTheme = getTheme(this).text;\n    const attribute = this.attribute;\n    const {\n      fontFamily = textTheme.fontFamily,\n      textAlign = textTheme.textAlign,\n      textBaseline = textTheme.textBaseline,\n      fontSize = textTheme.fontSize,\n      fontWeight = textTheme.fontWeight,\n      lineHeight = attribute.lineHeight || attribute.fontSize || textTheme.fontSize,\n      ellipsis = textTheme.ellipsis,\n      maxLineWidth,\n      stroke = textTheme.stroke,\n      lineWidth = textTheme.lineWidth,\n      wordBreak = textTheme.wordBreak\n    } = attribute;\n\n    if (!this.shouldUpdateShape() && this.cache?.layoutData) {\n      const bbox = this.cache.layoutData.bbox;\n      this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height);\n      if (stroke) {\n        this._AABBBounds.expand(lineWidth / 2);\n      }\n      return this._AABBBounds;\n    }\n    const textMeasure = application.graphicUtil.textMeasure;\n    const layoutObj = new CanvasTextLayout(fontFamily, { fontSize, fontWeight, fontFamily }, textMeasure);\n    const layoutData = layoutObj.GetLayoutByLines(\n      text,\n      textAlign,\n      textBaseline as any,\n      lineHeight,\n      ellipsis === true ? (textTheme.ellipsis as string) : ellipsis || undefined,\n      false,\n      maxLineWidth\n    );\n    const { bbox } = layoutData;\n    this.cache.layoutData = layoutData;\n    this.clearUpdateShapeTag();\n\n    this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height);\n\n    if (stroke) {\n      this._AABBBounds.expand(lineWidth / 2);\n    }\n\n    return this._AABBBounds;\n  }\n\n  /**\n   * 计算垂直布局的多行文字的bounds，可以缓存长度以及截取的文字\n   * @param text\n   */\n  updateVerticalMultilineAABBBounds(text: (number | string)[]): AABBBounds {\n    const textTheme = getTheme(this).text;\n    const textMeasure = application.graphicUtil.textMeasure;\n    let width: number;\n    const attribute = this.attribute;\n    const { ignoreBuf = textTheme.ignoreBuf } = attribute;\n    const buf = ignoreBuf ? 0 : 2;\n    const {\n      maxLineWidth = textTheme.maxLineWidth,\n      ellipsis = textTheme.ellipsis,\n      textAlign = textTheme.textAlign,\n      textBaseline = textTheme.textBaseline,\n      fontFamily = textTheme.fontFamily,\n      fontSize = textTheme.fontSize,\n      fontWeight = textTheme.fontWeight,\n      stroke = textTheme.stroke,\n      lineHeight = attribute.lineHeight ?? (attribute.fontSize || textTheme.fontSize) + buf,\n      lineWidth = textTheme.lineWidth,\n      wordBreak = textTheme.wordBreak\n    } = attribute;\n    width = 0;\n    if (!this.shouldUpdateShape() && this.cache) {\n      this.cache.verticalList.forEach(item => {\n        const w = item.reduce((a, b) => a + b.width, 0);\n        width = max(w, width);\n      });\n      const dx = textDrawOffsetX(textAlign, width);\n      const height = this.cache.verticalList.length * lineHeight;\n      const dy = textLayoutOffsetY(textBaseline, height, fontSize);\n      this._AABBBounds.set(dy, dx, dy + height, dx + width);\n      if (stroke) {\n        this._AABBBounds.expand(lineWidth / 2);\n      }\n      return this._AABBBounds;\n    }\n\n    const verticalLists: { text: string; width?: number; direction: TextDirection }[][] = text.map(str => {\n      return verticalLayout(str.toString());\n    });\n    verticalLists.forEach((verticalData, i) => {\n      if (Number.isFinite(maxLineWidth)) {\n        if (ellipsis) {\n          const strEllipsis = (ellipsis === true ? textTheme.ellipsis : ellipsis) as string;\n          const data = textMeasure.clipTextWithSuffixVertical(\n            verticalData,\n            { fontSize, fontWeight, fontFamily },\n            maxLineWidth,\n            strEllipsis,\n            false\n          );\n          verticalLists[i] = data.verticalList;\n          width = data.width;\n        } else {\n          const data = textMeasure.clipTextVertical(\n            verticalData,\n            { fontSize, fontWeight, fontFamily },\n            maxLineWidth,\n            false\n          );\n          verticalLists[i] = data.verticalList;\n          width = data.width;\n        }\n        // this.cache.clipedWidth = width;\n        // todo 计算原本的宽度\n      } else {\n        width = 0;\n        verticalData.forEach(t => {\n          const w =\n            t.direction === TextDirection.HORIZONTAL\n              ? fontSize\n              : textMeasure.measureTextWidth(t.text, { fontSize, fontWeight, fontFamily });\n\n          width += w;\n          t.width = w;\n        });\n      }\n    });\n    this.cache.verticalList = verticalLists;\n    this.clearUpdateShapeTag();\n\n    this.cache.verticalList.forEach(item => {\n      const w = item.reduce((a, b) => a + b.width, 0);\n      width = max(w, width);\n    });\n\n    const dx = textDrawOffsetX(textAlign, width);\n    const height = this.cache.verticalList.length * lineHeight;\n    const dy = textLayoutOffsetY(textBaseline, height, fontSize);\n    this._AABBBounds.set(dy, dx, dy + height, dx + width);\n\n    if (stroke) {\n      this._AABBBounds.expand(lineWidth / 2);\n    }\n\n    return this._AABBBounds;\n  }\n\n  protected tryUpdateOBBBounds(): OBBBounds {\n    throw new Error('暂不支持');\n  }\n\n  getDefaultAttribute(name: string) {\n    const textTheme = getTheme(this).text;\n    return textTheme[name];\n  }\n\n  protected needUpdateTags(keys: string[], k = TEXT_UPDATE_TAG_KEY): boolean {\n    return super.needUpdateTags(keys, k);\n  }\n  protected needUpdateTag(key: string, k = TEXT_UPDATE_TAG_KEY): boolean {\n    return super.needUpdateTag(key, k);\n  }\n\n  clone(): Text {\n    return new Text({ ...this.attribute });\n  }\n\n  getNoWorkAnimateAttr(): Record<string, number> {\n    return Text.NOWORK_ANIMATE_ATTR;\n  }\n}\n\n// addAttributeToPrototype(DefaultLineStyle, Text, PURE_STYLE_KEY);\n"]}
+{"version":3,"sources":["../src/graphic/text.ts"],"names":[],"mappings":"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","file":"text.js","sourcesContent":["import { max, type AABBBounds, type OBBBounds } from '@visactor/vutils';\nimport { getContextFont, textDrawOffsetX, textLayoutOffsetY } from '../common/text';\nimport { CanvasTextLayout } from '../core/contributions/textMeasure/layout';\nimport { application } from '../application';\nimport type { IText, ITextCache, ITextGraphicAttribute, LayoutType } from '../interface';\nimport { Graphic, GRAPHIC_UPDATE_TAG_KEY, NOWORK_ANIMATE_ATTR } from './graphic';\nimport { getTheme } from './theme';\nimport { parsePadding } from '../common/utils';\nimport { TEXT_NUMBER_TYPE } from './constants';\nimport { TextDirection, verticalLayout } from './tools';\n\nconst TEXT_UPDATE_TAG_KEY = [\n  'text',\n  'maxLineWidth',\n  // 'textAlign',\n  // 'textBaseline',\n  'fontSize',\n  'fontFamily',\n  'fontWeight',\n  'ellipsis',\n  'lineHeight',\n  'direction',\n  'wordBreak',\n  ...GRAPHIC_UPDATE_TAG_KEY\n];\n\nexport class Text extends Graphic<ITextGraphicAttribute> implements IText {\n  type: 'text' = 'text';\n\n  static NOWORK_ANIMATE_ATTR = {\n    ellipsis: 1,\n    wordBreak: 1,\n    direction: 1,\n    textAlign: 1,\n    textBaseline: 1,\n    fontFamily: 1,\n    fontWeight: 1,\n    ...NOWORK_ANIMATE_ATTR\n  };\n\n  cache: ITextCache;\n  _font: string;\n\n  get font(): string {\n    const textTheme = getTheme(this).text;\n    if (!this._font) {\n      this._font = getContextFont(this.attribute, textTheme);\n    }\n    return this._font as string;\n  }\n\n  get clipedText(): string | undefined {\n    const attribute = this.attribute;\n    const textTheme = getTheme(this).text;\n    if (Array.isArray(attribute.text)) {\n      return undefined;\n    }\n    const { maxLineWidth = textTheme.maxLineWidth } = attribute;\n    if (!Number.isFinite(maxLineWidth)) {\n      return (attribute.text ?? textTheme.text).toString();\n    }\n    this.tryUpdateAABBBounds();\n    return this.cache.clipedText;\n  }\n  get clipedWidth(): number | undefined {\n    if (Array.isArray(this.attribute.text)) {\n      return undefined;\n    }\n    this.tryUpdateAABBBounds();\n    return this.cache.clipedWidth;\n  }\n  get cliped(): boolean | undefined {\n    const textTheme = getTheme(this).text;\n    const attribute = this.attribute;\n    if (Array.isArray(attribute.text)) {\n      return undefined;\n    }\n    const { maxLineWidth = textTheme.maxLineWidth } = attribute;\n    if (!Number.isFinite(maxLineWidth)) {\n      return false;\n    }\n    this.tryUpdateAABBBounds();\n    return this.clipedText !== attribute.text.toString();\n  }\n  get multilineLayout(): LayoutType | undefined {\n    if (!Array.isArray(this.attribute.text)) {\n      return undefined;\n    }\n    this.tryUpdateAABBBounds();\n    return this.cache.layoutData;\n  }\n\n  constructor(params: ITextGraphicAttribute = { text: '', fontSize: 16 }) {\n    super(params);\n    this.numberType = TEXT_NUMBER_TYPE;\n    this.cache = {};\n  }\n\n  isValid(): boolean {\n    return super.isValid() && this._isValid();\n  }\n  protected _isValid(): boolean {\n    const { text } = this.attribute;\n    return text != null && text !== '';\n  }\n\n  protected doUpdateAABBBounds(): AABBBounds {\n    const textTheme = getTheme(this).text;\n    this._AABBBounds.setValue(Infinity, Infinity, -Infinity, -Infinity);\n    const attribute = this.attribute;\n    const bounds = application.graphicService.updateTextAABBBounds(\n      attribute,\n      textTheme,\n      this._AABBBounds,\n      this\n    ) as AABBBounds;\n\n    const { boundsPadding = textTheme.boundsPadding } = this.attribute;\n    const paddingArray = parsePadding(boundsPadding);\n    if (paddingArray) {\n      bounds.expand(paddingArray);\n    }\n\n    this.clearUpdateBoundTag();\n    return bounds;\n  }\n\n  /**\n   * 计算单行文字的bounds，可以缓存长度以及截取的文字\n   * @param text\n   */\n  updateSingallineAABBBounds(text: number | string): AABBBounds {\n    const textTheme = getTheme(this).text;\n    const { direction = textTheme.direction } = this.attribute;\n\n    return direction === 'horizontal'\n      ? this.updateHorizontalSinglelineAABBBounds(text)\n      : this.updateVerticalSinglelineAABBBounds(text);\n  }\n\n  /**\n   * 计算单行文字的bounds，可以缓存长度以及截取的文字\n   * @param text\n   */\n  updateMultilineAABBBounds(text: (number | string)[]): AABBBounds {\n    const textTheme = getTheme(this).text;\n    const { direction = textTheme.direction } = this.attribute;\n\n    return direction === 'horizontal'\n      ? this.updateHorizontalMultilineAABBBounds(text)\n      : this.updateVerticalMultilineAABBBounds(text);\n  }\n\n  /**\n   * 计算单行文字的bounds，可以缓存长度以及截取的文字\n   * @param text\n   */\n  updateHorizontalSinglelineAABBBounds(text: number | string): AABBBounds {\n    const textTheme = getTheme(this).text;\n    const textMeasure = application.graphicUtil.textMeasure;\n    let width: number;\n    let str: string;\n    const attribute = this.attribute;\n    const {\n      maxLineWidth = textTheme.maxLineWidth,\n      ellipsis = textTheme.ellipsis,\n      textAlign = textTheme.textAlign,\n      textBaseline = textTheme.textBaseline,\n      fontFamily = textTheme.fontFamily,\n      fontSize = textTheme.fontSize,\n      fontWeight = textTheme.fontWeight,\n      stroke = textTheme.stroke,\n      lineWidth = textTheme.lineWidth,\n      wordBreak = textTheme.wordBreak,\n      ignoreBuf = textTheme.ignoreBuf\n    } = attribute;\n    const buf = ignoreBuf ? 0 : Math.max(2, fontSize * 0.075);\n    const { lineHeight = attribute.lineHeight ?? (attribute.fontSize || textTheme.fontSize) + buf } = attribute;\n    if (!this.shouldUpdateShape() && this.cache) {\n      width = this.cache.clipedWidth ?? 0;\n      const dx = textDrawOffsetX(textAlign, width);\n      const dy = textLayoutOffsetY(textBaseline, lineHeight, fontSize);\n      this._AABBBounds.set(dx, dy, dx + width, dy + lineHeight);\n      if (stroke) {\n        this._AABBBounds.expand(lineWidth / 2);\n      }\n      return this._AABBBounds;\n    }\n\n    if (Number.isFinite(maxLineWidth)) {\n      if (ellipsis) {\n        const strEllipsis = (ellipsis === true ? textTheme.ellipsis : ellipsis) as string;\n        const data = textMeasure.clipTextWithSuffix(\n          text.toString(),\n          { fontSize, fontWeight, fontFamily },\n          maxLineWidth,\n          strEllipsis,\n          false\n        );\n        str = data.str;\n        width = data.width;\n      } else {\n        const data = textMeasure.clipText(text.toString(), { fontSize, fontWeight, fontFamily }, maxLineWidth, false);\n        str = data.str;\n        width = data.width;\n      }\n      this.cache.clipedText = str;\n      this.cache.clipedWidth = width;\n      // todo 计算原本的宽度\n    } else {\n      width = textMeasure.measureTextWidth(text.toString(), { fontSize, fontWeight, fontFamily });\n      this.cache.clipedText = text.toString();\n      this.cache.clipedWidth = width;\n    }\n    this.clearUpdateShapeTag();\n\n    const dx = textDrawOffsetX(textAlign, width);\n    let lh = lineHeight;\n    if (application.global && application.global.isSafari()) {\n      // 如果是safari，那么需要额外增加高度\n      lh += fontSize * 0.2;\n    }\n    const dy = textLayoutOffsetY(textBaseline, lh, fontSize, buf);\n    this._AABBBounds.set(dx, dy, dx + width, dy + lh);\n\n    if (stroke) {\n      this._AABBBounds.expand(lineWidth / 2);\n    }\n\n    return this._AABBBounds;\n  }\n\n  getBaselineMapAlign(): Record<string, string> {\n    return Text.baselineMapAlign;\n  }\n\n  getAlignMapBaseline(): Record<string, string> {\n    return Text.alignMapBaseline;\n  }\n\n  static baselineMapAlign = {\n    top: 'left',\n    bottom: 'right',\n    middle: 'center'\n  };\n\n  static alignMapBaseline = {\n    left: 'top',\n    right: 'bottom',\n    center: 'middle'\n  };\n\n  /**\n   * 计算垂直布局的单行文字的bounds，可以缓存长度以及截取的文字\n   * @param text\n   */\n  updateVerticalSinglelineAABBBounds(text: number | string): AABBBounds {\n    const textTheme = getTheme(this).text;\n    const textMeasure = application.graphicUtil.textMeasure;\n    let width: number;\n    let str: string;\n    const attribute = this.attribute;\n    const { ignoreBuf = textTheme.ignoreBuf } = attribute;\n    const buf = ignoreBuf ? 0 : 2;\n    const {\n      maxLineWidth = textTheme.maxLineWidth,\n      ellipsis = textTheme.ellipsis,\n      fontSize = textTheme.fontSize,\n      fontWeight = textTheme.fontWeight,\n      fontFamily = textTheme.fontFamily,\n      stroke = textTheme.stroke,\n      lineHeight = attribute.lineHeight ?? (attribute.fontSize || textTheme.fontSize) + buf,\n      lineWidth = textTheme.lineWidth,\n      verticalMode = textTheme.verticalMode\n    } = attribute;\n\n    let { textAlign = textTheme.textAlign, textBaseline = textTheme.textBaseline } = attribute;\n    if (!verticalMode) {\n      const t = textAlign;\n      textAlign = Text.baselineMapAlign[textBaseline] ?? 'left';\n      textBaseline = Text.alignMapBaseline[t] ?? 'top';\n    }\n    if (!this.shouldUpdateShape() && this.cache) {\n      width = this.cache.clipedWidth;\n      const dx = textDrawOffsetX(textAlign, width);\n      const dy = textLayoutOffsetY(textBaseline, lineHeight, fontSize);\n      this._AABBBounds.set(dy, dx, dy + lineHeight, dx + width);\n      if (stroke) {\n        this._AABBBounds.expand(lineWidth / 2);\n      }\n      return this._AABBBounds;\n    }\n\n    let verticalList: { text: string; width?: number; direction: TextDirection }[][] = [\n      verticalLayout(text.toString())\n    ];\n    if (Number.isFinite(maxLineWidth)) {\n      if (ellipsis) {\n        const strEllipsis = (ellipsis === true ? textTheme.ellipsis : ellipsis) as string;\n        const data = textMeasure.clipTextWithSuffixVertical(\n          verticalList[0],\n          { fontSize, fontWeight, fontFamily },\n          maxLineWidth,\n          strEllipsis,\n          false\n        );\n        verticalList = [data.verticalList];\n        width = data.width;\n      } else {\n        const data = textMeasure.clipTextVertical(\n          verticalList[0],\n          { fontSize, fontWeight, fontFamily },\n          maxLineWidth,\n          false\n        );\n        verticalList = [data.verticalList];\n        width = data.width;\n      }\n      this.cache.verticalList = verticalList;\n      this.cache.clipedWidth = width;\n      // todo 计算原本的宽度\n    } else {\n      width = 0;\n      verticalList[0].forEach(t => {\n        const w =\n          t.direction === TextDirection.HORIZONTAL\n            ? fontSize\n            : textMeasure.measureTextWidth(t.text, { fontSize, fontWeight, fontFamily });\n\n        width += w;\n        t.width = w;\n      });\n      this.cache.verticalList = verticalList;\n      this.cache.clipedWidth = width;\n    }\n    this.clearUpdateShapeTag();\n\n    const dx = textDrawOffsetX(textAlign, width);\n    const dy = textLayoutOffsetY(textBaseline, lineHeight, fontSize);\n    this._AABBBounds.set(dy, dx, dy + lineHeight, dx + width);\n\n    if (stroke) {\n      this._AABBBounds.expand(lineWidth / 2);\n    }\n\n    return this._AABBBounds;\n  }\n\n  /**\n   * 计算多行文字的bounds，缓存每行文字的布局位置\n   * @param text\n   */\n  updateHorizontalMultilineAABBBounds(text: (number | string)[]): AABBBounds {\n    const textTheme = getTheme(this).text;\n    const attribute = this.attribute;\n    const {\n      fontFamily = textTheme.fontFamily,\n      textAlign = textTheme.textAlign,\n      textBaseline = textTheme.textBaseline,\n      fontSize = textTheme.fontSize,\n      fontWeight = textTheme.fontWeight,\n      lineHeight = attribute.lineHeight || attribute.fontSize || textTheme.fontSize,\n      ellipsis = textTheme.ellipsis,\n      maxLineWidth,\n      stroke = textTheme.stroke,\n      lineWidth = textTheme.lineWidth,\n      wordBreak = textTheme.wordBreak\n    } = attribute;\n\n    if (!this.shouldUpdateShape() && this.cache?.layoutData) {\n      const bbox = this.cache.layoutData.bbox;\n      this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height);\n      if (stroke) {\n        this._AABBBounds.expand(lineWidth / 2);\n      }\n      return this._AABBBounds;\n    }\n    const textMeasure = application.graphicUtil.textMeasure;\n    const layoutObj = new CanvasTextLayout(fontFamily, { fontSize, fontWeight, fontFamily }, textMeasure);\n    const layoutData = layoutObj.GetLayoutByLines(\n      text,\n      textAlign,\n      textBaseline as any,\n      lineHeight,\n      ellipsis === true ? (textTheme.ellipsis as string) : ellipsis || undefined,\n      false,\n      maxLineWidth\n    );\n    const { bbox } = layoutData;\n    this.cache.layoutData = layoutData;\n    this.clearUpdateShapeTag();\n\n    this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height);\n\n    if (stroke) {\n      this._AABBBounds.expand(lineWidth / 2);\n    }\n\n    return this._AABBBounds;\n  }\n\n  /**\n   * 计算垂直布局的多行文字的bounds，可以缓存长度以及截取的文字\n   * @param text\n   */\n  updateVerticalMultilineAABBBounds(text: (number | string)[]): AABBBounds {\n    const textTheme = getTheme(this).text;\n    const textMeasure = application.graphicUtil.textMeasure;\n    let width: number;\n    const attribute = this.attribute;\n    const { ignoreBuf = textTheme.ignoreBuf } = attribute;\n    const buf = ignoreBuf ? 0 : 2;\n    const {\n      maxLineWidth = textTheme.maxLineWidth,\n      ellipsis = textTheme.ellipsis,\n      fontFamily = textTheme.fontFamily,\n      fontSize = textTheme.fontSize,\n      fontWeight = textTheme.fontWeight,\n      stroke = textTheme.stroke,\n      lineHeight = attribute.lineHeight ?? (attribute.fontSize || textTheme.fontSize) + buf,\n      lineWidth = textTheme.lineWidth,\n      // wordBreak = textTheme.wordBreak,\n      verticalMode = textTheme.verticalMode\n    } = attribute;\n    let { textAlign = textTheme.textAlign, textBaseline = textTheme.textBaseline } = attribute;\n    if (!verticalMode) {\n      const t = textAlign;\n      textAlign = Text.baselineMapAlign[textBaseline] ?? 'left';\n      textBaseline = Text.alignMapBaseline[t] ?? 'top';\n    }\n    width = 0;\n    if (!this.shouldUpdateShape() && this.cache) {\n      this.cache.verticalList.forEach(item => {\n        const w = item.reduce((a, b) => a + b.width, 0);\n        width = max(w, width);\n      });\n      const dx = textDrawOffsetX(textAlign, width);\n      const height = this.cache.verticalList.length * lineHeight;\n      const dy = textLayoutOffsetY(textBaseline, height, fontSize);\n      this._AABBBounds.set(dy, dx, dy + height, dx + width);\n      if (stroke) {\n        this._AABBBounds.expand(lineWidth / 2);\n      }\n      return this._AABBBounds;\n    }\n\n    const verticalLists: { text: string; width?: number; direction: TextDirection }[][] = text.map(str => {\n      return verticalLayout(str.toString());\n    });\n    verticalLists.forEach((verticalData, i) => {\n      if (Number.isFinite(maxLineWidth)) {\n        if (ellipsis) {\n          const strEllipsis = (ellipsis === true ? textTheme.ellipsis : ellipsis) as string;\n          const data = textMeasure.clipTextWithSuffixVertical(\n            verticalData,\n            { fontSize, fontWeight, fontFamily },\n            maxLineWidth,\n            strEllipsis,\n            false\n          );\n          verticalLists[i] = data.verticalList;\n          width = data.width;\n        } else {\n          const data = textMeasure.clipTextVertical(\n            verticalData,\n            { fontSize, fontWeight, fontFamily },\n            maxLineWidth,\n            false\n          );\n          verticalLists[i] = data.verticalList;\n          width = data.width;\n        }\n        // this.cache.clipedWidth = width;\n        // todo 计算原本的宽度\n      } else {\n        width = 0;\n        verticalData.forEach(t => {\n          const w =\n            t.direction === TextDirection.HORIZONTAL\n              ? fontSize\n              : textMeasure.measureTextWidth(t.text, { fontSize, fontWeight, fontFamily });\n\n          width += w;\n          t.width = w;\n        });\n      }\n    });\n    this.cache.verticalList = verticalLists;\n    this.clearUpdateShapeTag();\n\n    this.cache.verticalList.forEach(item => {\n      const w = item.reduce((a, b) => a + b.width, 0);\n      width = max(w, width);\n    });\n\n    const dx = textDrawOffsetX(textAlign, width);\n    const height = this.cache.verticalList.length * lineHeight;\n    const dy = textLayoutOffsetY(textBaseline, height, fontSize);\n    this._AABBBounds.set(dy, dx, dy + height, dx + width);\n\n    if (stroke) {\n      this._AABBBounds.expand(lineWidth / 2);\n    }\n\n    return this._AABBBounds;\n  }\n\n  protected tryUpdateOBBBounds(): OBBBounds {\n    throw new Error('暂不支持');\n  }\n\n  getDefaultAttribute(name: string) {\n    const textTheme = getTheme(this).text;\n    return textTheme[name];\n  }\n\n  protected needUpdateTags(keys: string[], k = TEXT_UPDATE_TAG_KEY): boolean {\n    return super.needUpdateTags(keys, k);\n  }\n  protected needUpdateTag(key: string, k = TEXT_UPDATE_TAG_KEY): boolean {\n    return super.needUpdateTag(key, k);\n  }\n\n  clone(): Text {\n    return new Text({ ...this.attribute });\n  }\n\n  getNoWorkAnimateAttr(): Record<string, number> {\n    return Text.NOWORK_ANIMATE_ATTR;\n  }\n}\n\n// addAttributeToPrototype(DefaultLineStyle, Text, PURE_STYLE_KEY);\n"]}

package/es/interface/core.d.ts

@@ -28,7 +28,8 @@ export interface ITransformUtil {
     translate: (dx: number, dy: number) => ITransformUtil;
 }
 export interface ILayerService {
-    createLayer: (stage: IStage, options?: ILayerParams) => ILayer;
+    createLayer: (stage: IStage, options?: Partial<ILayerParams>) => ILayer;
+    prepareStageLayer: (stage: IStage) => void;
     releaseLayer: (stage: IStage, layer: ILayer) => void;
     restLayerCount: (stage: IStage) => number;
     getStageLayer: (stage: IStage) => ILayer[];

package/es/interface/core.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/interface/core.ts"],"names":[],"mappings":"","file":"core.js","sourcesContent":["import type { ICanvas } from './canvas';\nimport type { IContext2d } from './context';\nimport type { IGraphicAttribute } from './graphic';\nimport type { ITextAttribute } from './graphic/text';\nimport type { ILayer, ILayerParams } from './layer';\nimport type { IStage } from './stage';\nimport type { ITextMeasure, TextOptionsType } from './text';\nimport type { IMatrix, IPointLike, ITextMeasureOption, TextMeasure } from '@visactor/vutils';\n\nexport interface IGraphicUtil {\n  canvas?: ICanvas;\n  context?: IContext2d | null;\n  textMeasure: ITextMeasure;\n  measureText: (text: string, tc: TextOptionsType) => { width: number; height: number };\n  bindTextMeasure: (tm: ITextMeasure) => void;\n  createTextMeasureInstance: (\n    textSpec?: Partial<ITextAttribute>,\n    option?: Partial<ITextMeasureOption>,\n    getCanvasForMeasure?: () => any\n  ) => TextMeasure<ITextAttribute>;\n}\n\nexport type TransformType = Pick<IGraphicAttribute, 'x' | 'y' | 'scaleX' | 'scaleY' | 'angle' | 'dx' | 'dy'> & {\n  anchor?: IGraphicAttribute['anchor'];\n};\nexport interface ITransformUtil {\n  init: (origin: TransformType) => ITransformUtil;\n  fromMatrix: (source: IMatrix, target: IMatrix) => ITransformUtil;\n  scale: (sx: number, sy: number, center?: IPointLike) => ITransformUtil;\n  rotate: (angle: number, center?: IPointLike) => ITransformUtil;\n  translate: (dx: number, dy: number) => ITransformUtil;\n}\n\nexport interface ILayerService {\n  createLayer: (stage: IStage, options?: ILayerParams) => ILayer;\n  releaseLayer: (stage: IStage, layer: ILayer) => void;\n  restLayerCount: (stage: IStage) => number;\n  getStageLayer: (stage: IStage) => ILayer[];\n  layerCount: (stage: IStage) => number;\n}\n"]}
+{"version":3,"sources":["../src/interface/core.ts"],"names":[],"mappings":"","file":"core.js","sourcesContent":["import type { ICanvas } from './canvas';\nimport type { IContext2d } from './context';\nimport type { IGraphicAttribute } from './graphic';\nimport type { ITextAttribute } from './graphic/text';\nimport type { ILayer, ILayerParams } from './layer';\nimport type { IStage } from './stage';\nimport type { ITextMeasure, TextOptionsType } from './text';\nimport type { IMatrix, IPointLike, ITextMeasureOption, TextMeasure } from '@visactor/vutils';\n\nexport interface IGraphicUtil {\n  canvas?: ICanvas;\n  context?: IContext2d | null;\n  textMeasure: ITextMeasure;\n  measureText: (text: string, tc: TextOptionsType) => { width: number; height: number };\n  bindTextMeasure: (tm: ITextMeasure) => void;\n  createTextMeasureInstance: (\n    textSpec?: Partial<ITextAttribute>,\n    option?: Partial<ITextMeasureOption>,\n    getCanvasForMeasure?: () => any\n  ) => TextMeasure<ITextAttribute>;\n}\n\nexport type TransformType = Pick<IGraphicAttribute, 'x' | 'y' | 'scaleX' | 'scaleY' | 'angle' | 'dx' | 'dy'> & {\n  anchor?: IGraphicAttribute['anchor'];\n};\nexport interface ITransformUtil {\n  init: (origin: TransformType) => ITransformUtil;\n  fromMatrix: (source: IMatrix, target: IMatrix) => ITransformUtil;\n  scale: (sx: number, sy: number, center?: IPointLike) => ITransformUtil;\n  rotate: (angle: number, center?: IPointLike) => ITransformUtil;\n  translate: (dx: number, dy: number) => ITransformUtil;\n}\n\nexport interface ILayerService {\n  createLayer: (stage: IStage, options?: Partial<ILayerParams>) => ILayer;\n  // stage绘制前调用\n  prepareStageLayer: (stage: IStage) => void;\n  releaseLayer: (stage: IStage, layer: ILayer) => void;\n  restLayerCount: (stage: IStage) => number;\n  getStageLayer: (stage: IStage) => ILayer[];\n  layerCount: (stage: IStage) => number;\n}\n"]}

package/es/interface/graphic/text.d.ts

@@ -41,6 +41,7 @@ export type ITextAttribute = {
     lineThrough: number;
     scaleIn3d: boolean;
     direction: 'horizontal' | 'vertical';
+    verticalMode: number;
     wordBreak: 'break-word' | 'break-all';
     ignoreBuf: boolean;
 };
@@ -66,6 +67,8 @@ export interface IText extends IGraphic<ITextGraphicAttribute> {
     multilineLayout?: LayoutType;
     font?: string;
     cache?: ITextCache;
+    getBaselineMapAlign: () => Record<string, string>;
+    getAlignMapBaseline: () => Record<string, string>;
     updateMultilineAABBBounds: (text: (number | string)[]) => IAABBBounds;
     updateSingallineAABBBounds: (text: number | string) => IAABBBounds;
 }

package/es/interface/graphic/text.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/interface/graphic/text.ts"],"names":[],"mappings":"","file":"text.js","sourcesContent":["import type { IAABBBounds } from '@visactor/vutils';\nimport type { IGraphicAttribute, IGraphic } from '../graphic';\n\nexport interface TextLayoutBBox {\n  width: number; // 包围盒的宽度\n  height: number; // 包围盒的高度\n  xOffset: number;\n  yOffset: number;\n}\n\nexport interface LayoutItemType {\n  str: string; // 这行的字符串\n  leftOffset?: number; // 该行距离左侧的偏移\n  topOffset?: number; // 该行距离右侧的偏移\n  width: number;\n}\n\nexport interface SimplifyLayoutType {\n  lines: LayoutItemType[];\n}\n\nexport interface LayoutType {\n  bbox: TextLayoutBBox;\n  lines: LayoutItemType[];\n  fontFamily: string;\n  fontSize: number;\n  fontWeight?: string | number;\n  lineHeight: number;\n  textAlign: TextAlignType;\n  textBaseline: TextBaselineType;\n}\n\nexport type ITextAttribute = {\n  text: string | number | string[] | number[];\n  maxLineWidth: number;\n  textAlign: TextAlignType;\n  textBaseline: TextBaselineType;\n  fontSize: number;\n  fontFamily: string;\n  fontWeight: string | number;\n  ellipsis: boolean | string;\n  fontVariant: string;\n  fontStyle: string;\n  lineHeight: number;\n  underline: number;\n  lineThrough: number;\n  scaleIn3d: boolean;\n  direction: 'horizontal' | 'vertical';\n  wordBreak: 'break-word' | 'break-all';\n  ignoreBuf: boolean;\n  // textDecoration: number;\n  // textDecorationWidth: number;\n  // padding?: number | number[];\n};\nexport type ITextCache = {\n  // 单行文本的时候缓存用\n  clipedText?: string;\n  clipedWidth?: number;\n  // 多行文本的布局缓存\n  layoutData?: LayoutType;\n  verticalList?: { text: string; width?: number; direction: number }[][];\n};\n\nexport type ITextGraphicAttribute = Partial<IGraphicAttribute> & Partial<ITextAttribute>;\n\nexport type IWrapTextGraphicAttribute = ITextGraphicAttribute & {\n  heightLimit?: number;\n  lineClamp?: number;\n};\n\nexport interface IText extends IGraphic<ITextGraphicAttribute> {\n  // 判断是否被ellipisised\n  clipedText?: string;\n  clipedWidth?: number;\n  cliped?: boolean;\n  multilineLayout?: LayoutType;\n  font?: string;\n  cache?: ITextCache;\n\n  updateMultilineAABBBounds: (text: (number | string)[]) => IAABBBounds;\n  updateSingallineAABBBounds: (text: number | string) => IAABBBounds;\n}\n\nexport type TextAlignType = 'left' | 'right' | 'center' | 'start' | 'end';\nexport type TextBaselineType = 'top' | 'middle' | 'bottom' | 'alphabetic';\n"]}
+{"version":3,"sources":["../src/interface/graphic/text.ts"],"names":[],"mappings":"","file":"text.js","sourcesContent":["import type { IAABBBounds } from '@visactor/vutils';\nimport type { IGraphicAttribute, IGraphic } from '../graphic';\n\nexport interface TextLayoutBBox {\n  width: number; // 包围盒的宽度\n  height: number; // 包围盒的高度\n  xOffset: number;\n  yOffset: number;\n}\n\nexport interface LayoutItemType {\n  str: string; // 这行的字符串\n  leftOffset?: number; // 该行距离左侧的偏移\n  topOffset?: number; // 该行距离右侧的偏移\n  width: number;\n}\n\nexport interface SimplifyLayoutType {\n  lines: LayoutItemType[];\n}\n\nexport interface LayoutType {\n  bbox: TextLayoutBBox;\n  lines: LayoutItemType[];\n  fontFamily: string;\n  fontSize: number;\n  fontWeight?: string | number;\n  lineHeight: number;\n  textAlign: TextAlignType;\n  textBaseline: TextBaselineType;\n}\n\nexport type ITextAttribute = {\n  text: string | number | string[] | number[];\n  maxLineWidth: number;\n  textAlign: TextAlignType;\n  textBaseline: TextBaselineType;\n  fontSize: number;\n  fontFamily: string;\n  fontWeight: string | number;\n  ellipsis: boolean | string;\n  fontVariant: string;\n  fontStyle: string;\n  lineHeight: number;\n  underline: number;\n  lineThrough: number;\n  scaleIn3d: boolean;\n  direction: 'horizontal' | 'vertical';\n  verticalMode: number; // 垂直布局的模式，0代表默认（横向textAlign，纵向textBaseline），1代表特殊（横向textBaseline，纵向textAlign）\n  wordBreak: 'break-word' | 'break-all';\n  ignoreBuf: boolean;\n  // textDecoration: number;\n  // textDecorationWidth: number;\n  // padding?: number | number[];\n};\nexport type ITextCache = {\n  // 单行文本的时候缓存用\n  clipedText?: string;\n  clipedWidth?: number;\n  // 多行文本的布局缓存\n  layoutData?: LayoutType;\n  verticalList?: { text: string; width?: number; direction: number }[][];\n};\n\nexport type ITextGraphicAttribute = Partial<IGraphicAttribute> & Partial<ITextAttribute>;\n\nexport type IWrapTextGraphicAttribute = ITextGraphicAttribute & {\n  heightLimit?: number;\n  lineClamp?: number;\n};\n\nexport interface IText extends IGraphic<ITextGraphicAttribute> {\n  // 判断是否被ellipisised\n  clipedText?: string;\n  clipedWidth?: number;\n  cliped?: boolean;\n  multilineLayout?: LayoutType;\n  font?: string;\n  cache?: ITextCache;\n\n  getBaselineMapAlign: () => Record<string, string>;\n  getAlignMapBaseline: () => Record<string, string>;\n\n  updateMultilineAABBBounds: (text: (number | string)[]) => IAABBBounds;\n  updateSingallineAABBBounds: (text: number | string) => IAABBBounds;\n}\n\nexport type TextAlignType = 'left' | 'right' | 'center' | 'start' | 'end';\nexport type TextBaselineType = 'top' | 'middle' | 'bottom' | 'alphabetic';\n"]}

package/es/interface/graphic-service.d.ts

@@ -7,12 +7,14 @@ export interface IGraphicService {
     onAttributeUpdate: (graphic: IGraphic) => void;
     onSetStage: (graphic: IGraphic, stage: IStage) => void;
     onRemove: (graphic: IGraphic) => void;
+    onRelease: (graphic: IGraphic) => void;
     onAddIncremental: (graphic: IGraphic, group: IGroup, stage: IStage) => void;
     onClearIncremental: (group: IGroup, stage: IStage) => void;
     hooks: {
         onAttributeUpdate: ISyncHook<[IGraphic]>;
         onSetStage: ISyncHook<[IGraphic, IStage]>;
         onRemove: ISyncHook<[IGraphic]>;
+        onRelease: ISyncHook<[IGraphic]>;
         onAddIncremental: ISyncHook<[IGraphic, IGroup, IStage]>;
         onClearIncremental: ISyncHook<[IGroup, IStage]>;
         beforeUpdateAABBBounds: ISyncHook<[IGraphic, IStage, boolean, IAABBBounds]>;

package/es/interface/graphic-service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/interface/graphic-service.ts"],"names":[],"mappings":"","file":"graphic-service.js","sourcesContent":["import type { IAABBBounds } from '@visactor/vutils';\n\nimport type { ISyncHook } from './sync-hook';\nimport type { IGraphic } from './graphic';\nimport type { IStage } from './stage';\nimport type {\n  IRectGraphicAttribute,\n  IGroup,\n  IGroupGraphicAttribute,\n  IGlyphGraphicAttribute,\n  ISymbolGraphicAttribute,\n  ICircleGraphicAttribute,\n  ICircle,\n  IGlyph,\n  ISymbol,\n  IArcGraphicAttribute,\n  IArc,\n  IArc3dGraphicAttribute,\n  IAreaGraphicAttribute,\n  IArc3d,\n  IArea,\n  ILineGraphicAttribute,\n  IPathGraphicAttribute,\n  ILine,\n  IPath,\n  IPolygonGraphicAttribute,\n  IPolygon,\n  IPyramid3dGraphicAttribute,\n  IPyramid3d,\n  ITextGraphicAttribute,\n  IText,\n  IRichTextGraphicAttribute,\n  IRichText,\n  IImageGraphicAttribute,\n  IImage,\n  IRect3dGraphicAttribute,\n  IRect,\n  IRect3d,\n  IShadowRoot,\n  IWrapTextGraphicAttribute\n} from './graphic/index';\n\nexport interface IGraphicService {\n  // themeService: IThemeService;\n  onAttributeUpdate: (graphic: IGraphic) => void;\n  onSetStage: (graphic: IGraphic, stage: IStage) => void;\n  onRemove: (graphic: IGraphic) => void;\n  onAddIncremental: (graphic: IGraphic, group: IGroup, stage: IStage) => void;\n  onClearIncremental: (group: IGroup, stage: IStage) => void;\n  hooks: {\n    onAttributeUpdate: ISyncHook<[IGraphic]>;\n    onSetStage: ISyncHook<[IGraphic, IStage]>;\n    onRemove: ISyncHook<[IGraphic]>;\n    onAddIncremental: ISyncHook<[IGraphic, IGroup, IStage]>;\n    onClearIncremental: ISyncHook<[IGroup, IStage]>;\n    beforeUpdateAABBBounds: ISyncHook<[IGraphic, IStage, boolean, IAABBBounds]>;\n    afterUpdateAABBBounds: ISyncHook<[IGraphic, IStage, IAABBBounds, { globalAABBBounds: IAABBBounds }, boolean]>;\n  };\n  beforeUpdateAABBBounds: (graphic: IGraphic, stage: IStage, willUpdate: boolean, bounds: IAABBBounds) => void;\n  afterUpdateAABBBounds: (\n    graphic: IGraphic,\n    stage: IStage,\n    bounds: IAABBBounds,\n    params: { globalAABBBounds: IAABBBounds },\n    selfChange: boolean\n  ) => void;\n\n  creator: IGraphicCreator;\n\n  updateRectAABBBounds: (\n    attribute: IRectGraphicAttribute,\n    rectTheme: Required<IRectGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IGraphic\n  ) => IAABBBounds;\n\n  updateGroupAABBBounds: (\n    attribute: IGroupGraphicAttribute,\n    groupTheme: Required<IGroupGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IGroup\n  ) => IAABBBounds;\n\n  updateGlyphAABBBounds: (\n    attribute: IGlyphGraphicAttribute,\n    groupTheme: Required<IGlyphGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IGlyph\n  ) => IAABBBounds;\n\n  updateSymbolAABBBounds: (\n    attribute: ISymbolGraphicAttribute,\n    symbolTheme: Required<ISymbolGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    full?: boolean,\n    graphic?: ISymbol\n  ) => IAABBBounds;\n\n  updateCircleAABBBounds: (\n    attribute: ICircleGraphicAttribute,\n    circleTheme: Required<ICircleGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    full?: boolean,\n    graphic?: ICircle\n  ) => IAABBBounds;\n\n  updateArcAABBBounds: (\n    attribute: IArcGraphicAttribute,\n    arcTheme: Required<IArcGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    full?: boolean,\n    graphic?: IArc\n  ) => IAABBBounds;\n\n  updateArc3dAABBBounds: (\n    attribute: IArc3dGraphicAttribute,\n    arcTheme: Required<IArc3dGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IArc3d\n  ) => IAABBBounds;\n\n  updateAreaAABBBounds: (\n    attribute: IAreaGraphicAttribute,\n    areaTheme: Required<IAreaGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IArea\n  ) => IAABBBounds;\n\n  updateLineAABBBounds: (\n    attribute: ILineGraphicAttribute,\n    lineTheme: Required<ILineGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: ILine\n  ) => IAABBBounds;\n\n  updatePathAABBBounds: (\n    attribute: IPathGraphicAttribute,\n    pathTheme: Required<IPathGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IPath\n  ) => IAABBBounds;\n\n  updatePolygonAABBBounds: (\n    attribute: IPolygonGraphicAttribute,\n    polygonTheme: Required<IPolygonGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IPolygon\n  ) => IAABBBounds;\n\n  updatePyramid3dAABBBounds: (\n    attribute: IPyramid3dGraphicAttribute,\n    polygonTheme: Required<IPyramid3dGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IPyramid3d\n  ) => IAABBBounds;\n\n  updateTextAABBBounds: (\n    attribute: ITextGraphicAttribute,\n    textTheme: Required<ITextGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IText\n  ) => IAABBBounds;\n\n  updateRichTextAABBBounds: (\n    attribute: IRichTextGraphicAttribute,\n    textTheme: Required<IRichTextGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IRichText\n  ) => IAABBBounds;\n\n  updateImageAABBBounds: (\n    attribute: IImageGraphicAttribute,\n    textTheme: Required<IImageGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IImage\n  ) => IAABBBounds;\n}\n\nexport type IGraphicCreator = {\n  arc: (attributes: IArcGraphicAttribute) => IArc;\n  area: (attributes: IAreaGraphicAttribute) => IArea;\n  circle: (attributes: ICircleGraphicAttribute) => ICircle;\n  group: (attributes: IGroupGraphicAttribute) => IGroup;\n  image: (attributes: IImageGraphicAttribute) => IImage;\n  line: (attributes: ILineGraphicAttribute) => ILine;\n  path: (attributes: IPathGraphicAttribute) => IPath;\n  rect: (attributes: IRectGraphicAttribute) => IRect;\n  rect3d: (attributes: IRect3dGraphicAttribute) => IRect3d;\n  symbol: (attributes: ISymbolGraphicAttribute) => ISymbol;\n  text: (attributes: ITextGraphicAttribute) => IText;\n  richtext: (attributes: IRichTextGraphicAttribute) => IRichText;\n  polygon: (attributes: IPolygonGraphicAttribute) => IPolygon;\n  shadowRoot: (graphic?: IGraphic) => IShadowRoot;\n  wrapText: (attributes: IWrapTextGraphicAttribute) => IText;\n};\n\nexport interface IArcBoundsContribution {\n  updateBounds: (\n    attribute: IArcGraphicAttribute,\n    arcTheme: Required<IArcGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IGraphic\n  ) => IAABBBounds;\n}\n\nexport interface IAreaBoundsContribution {\n  updateBounds: (\n    attribute: IAreaGraphicAttribute,\n    arcTheme: Required<IAreaGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IGraphic\n  ) => IAABBBounds;\n}\n\nexport interface ICircleBoundsContribution {\n  updateBounds: (\n    attribute: ICircleGraphicAttribute,\n    circleTheme: Required<ICircleGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IGraphic\n  ) => IAABBBounds;\n}\n\nexport interface IPathBoundsContribution {\n  updateBounds: (\n    attribute: IPathGraphicAttribute,\n    pathTheme: Required<IPathGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IGraphic\n  ) => IAABBBounds;\n}\n\nexport interface IRectBoundsContribution {\n  updateBounds: (\n    attribute: IRectGraphicAttribute,\n    rectTheme: Required<IRectGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IGraphic\n  ) => IAABBBounds;\n}\n\nexport interface ISymbolBoundsContribution {\n  updateBounds: (\n    attribute: ISymbolGraphicAttribute,\n    SymbolTheme: Required<ISymbolGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IGraphic\n  ) => IAABBBounds;\n}\n"]}
+{"version":3,"sources":["../src/interface/graphic-service.ts"],"names":[],"mappings":"","file":"graphic-service.js","sourcesContent":["import type { IAABBBounds } from '@visactor/vutils';\n\nimport type { ISyncHook } from './sync-hook';\nimport type { IGraphic } from './graphic';\nimport type { IStage } from './stage';\nimport type {\n  IRectGraphicAttribute,\n  IGroup,\n  IGroupGraphicAttribute,\n  IGlyphGraphicAttribute,\n  ISymbolGraphicAttribute,\n  ICircleGraphicAttribute,\n  ICircle,\n  IGlyph,\n  ISymbol,\n  IArcGraphicAttribute,\n  IArc,\n  IArc3dGraphicAttribute,\n  IAreaGraphicAttribute,\n  IArc3d,\n  IArea,\n  ILineGraphicAttribute,\n  IPathGraphicAttribute,\n  ILine,\n  IPath,\n  IPolygonGraphicAttribute,\n  IPolygon,\n  IPyramid3dGraphicAttribute,\n  IPyramid3d,\n  ITextGraphicAttribute,\n  IText,\n  IRichTextGraphicAttribute,\n  IRichText,\n  IImageGraphicAttribute,\n  IImage,\n  IRect3dGraphicAttribute,\n  IRect,\n  IRect3d,\n  IShadowRoot,\n  IWrapTextGraphicAttribute\n} from './graphic/index';\n\nexport interface IGraphicService {\n  // themeService: IThemeService;\n  onAttributeUpdate: (graphic: IGraphic) => void;\n  onSetStage: (graphic: IGraphic, stage: IStage) => void;\n  onRemove: (graphic: IGraphic) => void;\n  onRelease: (graphic: IGraphic) => void;\n  onAddIncremental: (graphic: IGraphic, group: IGroup, stage: IStage) => void;\n  onClearIncremental: (group: IGroup, stage: IStage) => void;\n  hooks: {\n    onAttributeUpdate: ISyncHook<[IGraphic]>;\n    onSetStage: ISyncHook<[IGraphic, IStage]>;\n    onRemove: ISyncHook<[IGraphic]>;\n    onRelease: ISyncHook<[IGraphic]>;\n    onAddIncremental: ISyncHook<[IGraphic, IGroup, IStage]>;\n    onClearIncremental: ISyncHook<[IGroup, IStage]>;\n    beforeUpdateAABBBounds: ISyncHook<[IGraphic, IStage, boolean, IAABBBounds]>;\n    afterUpdateAABBBounds: ISyncHook<[IGraphic, IStage, IAABBBounds, { globalAABBBounds: IAABBBounds }, boolean]>;\n  };\n  beforeUpdateAABBBounds: (graphic: IGraphic, stage: IStage, willUpdate: boolean, bounds: IAABBBounds) => void;\n  afterUpdateAABBBounds: (\n    graphic: IGraphic,\n    stage: IStage,\n    bounds: IAABBBounds,\n    params: { globalAABBBounds: IAABBBounds },\n    selfChange: boolean\n  ) => void;\n\n  creator: IGraphicCreator;\n\n  updateRectAABBBounds: (\n    attribute: IRectGraphicAttribute,\n    rectTheme: Required<IRectGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IGraphic\n  ) => IAABBBounds;\n\n  updateGroupAABBBounds: (\n    attribute: IGroupGraphicAttribute,\n    groupTheme: Required<IGroupGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IGroup\n  ) => IAABBBounds;\n\n  updateGlyphAABBBounds: (\n    attribute: IGlyphGraphicAttribute,\n    groupTheme: Required<IGlyphGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IGlyph\n  ) => IAABBBounds;\n\n  updateSymbolAABBBounds: (\n    attribute: ISymbolGraphicAttribute,\n    symbolTheme: Required<ISymbolGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    full?: boolean,\n    graphic?: ISymbol\n  ) => IAABBBounds;\n\n  updateCircleAABBBounds: (\n    attribute: ICircleGraphicAttribute,\n    circleTheme: Required<ICircleGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    full?: boolean,\n    graphic?: ICircle\n  ) => IAABBBounds;\n\n  updateArcAABBBounds: (\n    attribute: IArcGraphicAttribute,\n    arcTheme: Required<IArcGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    full?: boolean,\n    graphic?: IArc\n  ) => IAABBBounds;\n\n  updateArc3dAABBBounds: (\n    attribute: IArc3dGraphicAttribute,\n    arcTheme: Required<IArc3dGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IArc3d\n  ) => IAABBBounds;\n\n  updateAreaAABBBounds: (\n    attribute: IAreaGraphicAttribute,\n    areaTheme: Required<IAreaGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IArea\n  ) => IAABBBounds;\n\n  updateLineAABBBounds: (\n    attribute: ILineGraphicAttribute,\n    lineTheme: Required<ILineGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: ILine\n  ) => IAABBBounds;\n\n  updatePathAABBBounds: (\n    attribute: IPathGraphicAttribute,\n    pathTheme: Required<IPathGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IPath\n  ) => IAABBBounds;\n\n  updatePolygonAABBBounds: (\n    attribute: IPolygonGraphicAttribute,\n    polygonTheme: Required<IPolygonGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IPolygon\n  ) => IAABBBounds;\n\n  updatePyramid3dAABBBounds: (\n    attribute: IPyramid3dGraphicAttribute,\n    polygonTheme: Required<IPyramid3dGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IPyramid3d\n  ) => IAABBBounds;\n\n  updateTextAABBBounds: (\n    attribute: ITextGraphicAttribute,\n    textTheme: Required<ITextGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IText\n  ) => IAABBBounds;\n\n  updateRichTextAABBBounds: (\n    attribute: IRichTextGraphicAttribute,\n    textTheme: Required<IRichTextGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IRichText\n  ) => IAABBBounds;\n\n  updateImageAABBBounds: (\n    attribute: IImageGraphicAttribute,\n    textTheme: Required<IImageGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IImage\n  ) => IAABBBounds;\n}\n\nexport type IGraphicCreator = {\n  arc: (attributes: IArcGraphicAttribute) => IArc;\n  area: (attributes: IAreaGraphicAttribute) => IArea;\n  circle: (attributes: ICircleGraphicAttribute) => ICircle;\n  group: (attributes: IGroupGraphicAttribute) => IGroup;\n  image: (attributes: IImageGraphicAttribute) => IImage;\n  line: (attributes: ILineGraphicAttribute) => ILine;\n  path: (attributes: IPathGraphicAttribute) => IPath;\n  rect: (attributes: IRectGraphicAttribute) => IRect;\n  rect3d: (attributes: IRect3dGraphicAttribute) => IRect3d;\n  symbol: (attributes: ISymbolGraphicAttribute) => ISymbol;\n  text: (attributes: ITextGraphicAttribute) => IText;\n  richtext: (attributes: IRichTextGraphicAttribute) => IRichText;\n  polygon: (attributes: IPolygonGraphicAttribute) => IPolygon;\n  shadowRoot: (graphic?: IGraphic) => IShadowRoot;\n  wrapText: (attributes: IWrapTextGraphicAttribute) => IText;\n};\n\nexport interface IArcBoundsContribution {\n  updateBounds: (\n    attribute: IArcGraphicAttribute,\n    arcTheme: Required<IArcGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IGraphic\n  ) => IAABBBounds;\n}\n\nexport interface IAreaBoundsContribution {\n  updateBounds: (\n    attribute: IAreaGraphicAttribute,\n    arcTheme: Required<IAreaGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IGraphic\n  ) => IAABBBounds;\n}\n\nexport interface ICircleBoundsContribution {\n  updateBounds: (\n    attribute: ICircleGraphicAttribute,\n    circleTheme: Required<ICircleGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IGraphic\n  ) => IAABBBounds;\n}\n\nexport interface IPathBoundsContribution {\n  updateBounds: (\n    attribute: IPathGraphicAttribute,\n    pathTheme: Required<IPathGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IGraphic\n  ) => IAABBBounds;\n}\n\nexport interface IRectBoundsContribution {\n  updateBounds: (\n    attribute: IRectGraphicAttribute,\n    rectTheme: Required<IRectGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IGraphic\n  ) => IAABBBounds;\n}\n\nexport interface ISymbolBoundsContribution {\n  updateBounds: (\n    attribute: ISymbolGraphicAttribute,\n    SymbolTheme: Required<ISymbolGraphicAttribute>,\n    aabbBounds: IAABBBounds,\n    graphic?: IGraphic\n  ) => IAABBBounds;\n}\n"]}

package/es/interface/graphic.d.ts

@@ -112,7 +112,10 @@ export type IGraphicStyle = IFillStyle & IStrokeStyle & {
         anchorType?: 'position' | 'boundsLeftTop';
     } | null;
 };
-export type IGraphicAttribute = IGraphicStyle & ITransform & {
+export type IDebugType = {
+    _debug_bounds: boolean | ((c: any, g: any) => void);
+};
+export type IGraphicAttribute = IDebugType & IGraphicStyle & ITransform & {
     strokeSeg: IStrokeSeg | null;
     boundsPadding: number | number[];
     pickMode: 'accurate' | 'imprecise' | 'custom';
@@ -125,6 +128,7 @@ export type IGraphicAttribute = IGraphicStyle & ITransform & {
     layout: any;
     keepDirIn3d?: boolean;
     shadowRootIdx: number;
+    interactive: boolean;
 };
 export interface IGraphicJson<T extends Partial<IGraphicAttribute> = Partial<IGraphicAttribute>> {
     attribute: Partial<T>;
@@ -141,6 +145,7 @@ export type ISetAttributeContext = {
         ratio?: number;
         end?: boolean;
     };
+    skipUpdateCallback?: boolean;
 };
 export type IGraphicAnimateParams = {
     id?: number | string;

package/es/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  scaleCenter: [number, 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 ILayout = {\n  alignSelf: 'auto' | 'flex-start' | 'flex-end' | 'center' | 'baseline' | 'stretch';\n};\n\nexport type IBorderStyle = Omit<IStrokeStyle, 'outerBorder' | 'innerBorder'> & {\n  distance: number | string;\n  visible?: boolean;\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 IConnectedStyle = {\n  // 连接，取零或者断开\n  connectedType: 'connect' | 'zero' | 'none';\n  connectedStyle: {\n    stroke: IStrokeStyle['stroke'];\n    strokeOpacity: IStrokeStyle['strokeOpacity'];\n    lineDash: IStrokeStyle['lineDash'];\n    lineDashOffset: IStrokeStyle['lineDashOffset'];\n    lineCap: IStrokeStyle['lineCap'];\n    lineJoin: IStrokeStyle['lineJoin'];\n    lineWidth: IStrokeStyle['lineWidth'];\n    fill: IFillStyle['fill'];\n    fillOpacity: IFillStyle['fillOpacity'];\n  };\n  connectedX: number;\n  connectedY: number;\n};\n\nexport type IBackgroundConfig = {\n  stroke?: string | boolean;\n  fill?: string | boolean;\n  lineWidth?: number;\n  cornerRadius?: number;\n  expandX?: number;\n  expandY?: number;\n};\n\nexport type IGraphicStyle = IFillStyle &\n  IStrokeStyle & {\n    opacity: number;\n    backgroundMode: number; // 填充模式（与具体图元有关）\n    background: string | HTMLImageElement | HTMLCanvasElement | IBackgroundConfig | null; // 背景，可以与fill同时存在\n    texture: TextureType | string; // 纹理\n    textureColor: string; // 纹理颜色\n    textureSize: number; // 纹理大小\n    texturePadding: number; // 纹理间隙\n    blur: number;\n    cursor: Cursor | null; // 鼠标样式\n    // HTML的dom或者string\n    html: {\n      dom: string | HTMLElement; // dom字符串或者dom\n      container: string | HTMLElement | null; // id或者dom\n      width: number; // 容器的宽度\n      height: number; // 容器的高度\n      style: string | Record<string, any>; // 容器的样式\n      visible?: boolean;\n      anchorType?: 'position' | 'boundsLeftTop';\n    } | 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    shadowRootIdx: number;\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  bindDom?: Map<string | HTMLElement, { container: HTMLElement | string; dom: HTMLElement; wrapGroup: HTMLDivElement }>;\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, rotateCenter?: IPointLike) => this;\n  rotateTo: (angle: number) => this;\n  skewTo: (b: number, c: number) => this;\n  addUpdateBoundTag: () => void;\n  addUpdateShapeAndBoundsTag: () => void;\n  addUpdateLayoutTag: () => 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 | IBackgroundConfig,\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  stopAnimates: (stopChildren?: boolean) => void;\n  getNoWorkAnimateAttr: () => Record<string, number>;\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\nexport type GraphicReleaseStatus = 'released' | 'willRelease';\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  scaleCenter: [number, 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 ILayout = {\n  alignSelf: 'auto' | 'flex-start' | 'flex-end' | 'center' | 'baseline' | 'stretch';\n};\n\nexport type IBorderStyle = Omit<IStrokeStyle, 'outerBorder' | 'innerBorder'> & {\n  distance: number | string;\n  visible?: boolean;\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 IConnectedStyle = {\n  // 连接，取零或者断开\n  connectedType: 'connect' | 'zero' | 'none';\n  connectedStyle: {\n    stroke: IStrokeStyle['stroke'];\n    strokeOpacity: IStrokeStyle['strokeOpacity'];\n    lineDash: IStrokeStyle['lineDash'];\n    lineDashOffset: IStrokeStyle['lineDashOffset'];\n    lineCap: IStrokeStyle['lineCap'];\n    lineJoin: IStrokeStyle['lineJoin'];\n    lineWidth: IStrokeStyle['lineWidth'];\n    fill: IFillStyle['fill'];\n    fillOpacity: IFillStyle['fillOpacity'];\n  };\n  connectedX: number;\n  connectedY: number;\n};\n\nexport type IBackgroundConfig = {\n  stroke?: string | boolean;\n  fill?: string | boolean;\n  lineWidth?: number;\n  cornerRadius?: number;\n  expandX?: number;\n  expandY?: number;\n};\n\nexport type IGraphicStyle = IFillStyle &\n  IStrokeStyle & {\n    opacity: number;\n    backgroundMode: number; // 填充模式（与具体图元有关）\n    background: string | HTMLImageElement | HTMLCanvasElement | IBackgroundConfig | null; // 背景，可以与fill同时存在\n    texture: TextureType | string; // 纹理\n    textureColor: string; // 纹理颜色\n    textureSize: number; // 纹理大小\n    texturePadding: number; // 纹理间隙\n    blur: number;\n    cursor: Cursor | null; // 鼠标样式\n    // HTML的dom或者string\n    html: {\n      dom: string | HTMLElement; // dom字符串或者dom\n      container: string | HTMLElement | null; // id或者dom\n      width: number; // 容器的宽度\n      height: number; // 容器的高度\n      style: string | Record<string, any>; // 容器的样式\n      visible?: boolean;\n      anchorType?: 'position' | 'boundsLeftTop';\n    } | null;\n  };\n\nexport type IDebugType = {\n  _debug_bounds: boolean | ((c: any, g: any) => void);\n};\nexport type IGraphicAttribute = IDebugType &\n  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    shadowRootIdx: number;\n    interactive: 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  skipUpdateCallback?: boolean;\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  bindDom?: Map<string | HTMLElement, { container: HTMLElement | string; dom: HTMLElement; wrapGroup: HTMLDivElement }>;\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, rotateCenter?: IPointLike) => this;\n  rotateTo: (angle: number) => this;\n  skewTo: (b: number, c: number) => this;\n  addUpdateBoundTag: () => void;\n  addUpdateShapeAndBoundsTag: () => void;\n  addUpdateLayoutTag: () => 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 | IBackgroundConfig,\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  stopAnimates: (stopChildren?: boolean) => void;\n  getNoWorkAnimateAttr: () => Record<string, number>;\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\nexport type GraphicReleaseStatus = 'released' | 'willRelease';\n"]}

package/es/interface/layer.d.ts

@@ -7,11 +7,13 @@ import type { IStage } from './stage';
 import type { Releaseable } from './common';
 import type { IContext2d } from './context';
 import type { IWindow } from './window';
+export type LayerMode = 'static' | 'dynamic' | 'virtual';
 export interface ILayerParams {
     main: boolean;
     zIndex?: number;
+    layerMode: LayerMode;
+    layerHandler: ILayerHandlerContribution;
     canvasId?: string;
-    virtual?: boolean;
 }
 export interface ILayerDrawParams {
     renderService: IRenderService;
@@ -35,7 +37,8 @@ export interface ILayer extends IGroup {
     height: number;
     viewWidth: number;
     viewHeight: number;
-    readonly virtual: boolean;
+    readonly layerMode: LayerMode;
+    renderCount: number;
     offscreen: boolean;
     subLayers: Map<number, {
         layer: ILayer;
@@ -86,6 +89,9 @@ export interface ILayerHandlerInitParams {
     dpr?: number;
 }
 export interface ILayerHandlerContribution extends Releaseable {
+    secondaryHandlers?: ILayerHandlerContribution[];
+    mainHandler?: ILayerHandlerContribution;
+    type: LayerMode;
     init: (layer: ILayer, window: IWindow, params: ILayerHandlerInitParams) => void;
     resize: (w: number, h: number) => void;
     resizeView: (w: number, h: number) => void;
@@ -96,4 +102,5 @@ export interface ILayerHandlerContribution extends Releaseable {
     merge: (layerHandlers: ILayerHandlerContribution[]) => void;
     getContext: () => IContext2d;
     offscreen: boolean;
+    layer: ILayer;
 }

package/es/interface/layer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/interface/layer.ts"],"names":[],"mappings":"","file":"layer.js","sourcesContent":["import type { IAABBBounds, IBounds, IBoundsLike } from '@visactor/vutils';\nimport type { IGraphic } from './graphic';\nimport type { IGroup } from './graphic/group';\nimport type { IColor } from './color';\nimport type { IDrawContext, IDrawContribution, IRenderService, IRenderServiceDrawParams } from './render';\nimport type { IStage } from './stage';\nimport type { Releaseable } from './common';\nimport type { IContext2d } from './context';\nimport type { IWindow } from './window';\n\nexport interface ILayerParams {\n  main: boolean;\n  zIndex?: number;\n  canvasId?: string;\n  virtual?: boolean;\n}\n\nexport interface ILayerDrawParams {\n  renderService: IRenderService;\n  background?: string | IColor;\n  updateBounds: boolean;\n}\n\nexport interface IDrawToParams {\n  x?: number;\n  y?: number;\n  width?: number;\n  height?: number;\n  clear?: boolean;\n  renderService: IRenderService;\n  background?: string | IColor;\n  updateBounds: boolean;\n}\n\n// 不建议用户操作layer，尽量都通过stage实现\nexport interface ILayer extends IGroup {\n  parent: any;\n  // rootNode: IStage;\n  main: boolean;\n  width: number;\n  height: number;\n  viewWidth: number;\n  viewHeight: number;\n\n  readonly virtual: boolean;\n\n  offscreen: boolean;\n  subLayers: Map<number, { layer: ILayer; group?: IGroup; zIndex: number; drawContribution?: IDrawContribution }>;\n\n  // mode: 'dynamic' | 'static';\n  readonly dirtyBound: IAABBBounds;\n  background: string;\n  dpr: number;\n  opacity: number;\n  canvasId?: string;\n  imageData?: ImageData;\n  blendMode?: string;\n  // TODO: getElementById\n  pickable: boolean;\n  pick: (x: number, y: number) => { graphic?: IGraphic; group?: IGroup } | false;\n  render: (params: ILayerDrawParams, userParams?: Partial<IDrawContext>) => void;\n  afterDraw: (cb: (l: this) => void) => void;\n\n  resize: (w: number, h: number) => void;\n  resizeView: (w: number, h: number) => void;\n  setDpr: (dpr: number) => void;\n  getNativeHandler: () => ILayerHandlerContribution;\n  combineSubLayer: (removeIncrementalKey?: boolean) => void;\n\n  // 动画相关\n  startAnimate: (t: number) => void;\n  setToFrame: (t: number) => void;\n  prepare: (dirtyBounds: IBounds, params: ILayerHandlerDrawParams) => void;\n  drawTo: (target: IWindow, params: IDrawToParams) => void;\n  combineTo: (target: IWindow, params: IDrawToParams) => void;\n  // 考虑操作回放\n}\n\nexport interface ILayerHandlerDrawParams extends ILayerDrawParams {\n  x: number;\n  y: number;\n  width: number;\n  height: number;\n  layer: ILayer;\n  stage: IStage;\n  updateBounds: boolean;\n}\n\nexport interface ILayerHandlerInitParams {\n  main: boolean;\n  canvasId?: string;\n  width: number;\n  height: number;\n  zIndex: number;\n  dpr?: number;\n}\n\n// TODO: layer在resize的时候需要判断是否需要resize window对应的canvas\n\n// 具体的Layer实现\n// Canvas2d的Layer可以对应一个Canvas或者ImageData\nexport interface ILayerHandlerContribution extends Releaseable {\n  init: (layer: ILayer, window: IWindow, params: ILayerHandlerInitParams) => void;\n  resize: (w: number, h: number) => void;\n  resizeView: (w: number, h: number) => void;\n  setDpr: (dpr: number) => void;\n  render: (group: IGroup[], params: ILayerHandlerDrawParams, userParams?: Partial<IDrawContext>) => void;\n  prepare: (dirtyBounds: IBoundsLike, params: IRenderServiceDrawParams) => void;\n  drawTo: (target: IWindow, group: IGroup[], params: IDrawToParams & ILayerHandlerDrawParams) => void;\n  merge: (layerHandlers: ILayerHandlerContribution[]) => void;\n  getContext: () => IContext2d;\n  offscreen: boolean;\n}\n"]}
+{"version":3,"sources":["../src/interface/layer.ts"],"names":[],"mappings":"","file":"layer.js","sourcesContent":["import type { IAABBBounds, IBounds, IBoundsLike } from '@visactor/vutils';\nimport type { IGraphic } from './graphic';\nimport type { IGroup } from './graphic/group';\nimport type { IColor } from './color';\nimport type { IDrawContext, IDrawContribution, IRenderService, IRenderServiceDrawParams } from './render';\nimport type { IStage } from './stage';\nimport type { Releaseable } from './common';\nimport type { IContext2d } from './context';\nimport type { IWindow } from './window';\nimport { ICanvasLike } from './canvas';\n\nexport type LayerMode = 'static' | 'dynamic' | 'virtual';\nexport interface ILayerParams {\n  main: boolean;\n  zIndex?: number;\n  layerMode: LayerMode;\n  layerHandler: ILayerHandlerContribution;\n  canvasId?: string;\n}\n\nexport interface ILayerDrawParams {\n  renderService: IRenderService;\n  background?: string | IColor;\n  updateBounds: boolean;\n}\n\nexport interface IDrawToParams {\n  x?: number;\n  y?: number;\n  width?: number;\n  height?: number;\n  clear?: boolean;\n  renderService: IRenderService;\n  background?: string | IColor;\n  updateBounds: boolean;\n}\n\n// 不建议用户操作layer，尽量都通过stage实现\nexport interface ILayer extends IGroup {\n  parent: any;\n  // rootNode: IStage;\n  main: boolean;\n  width: number;\n  height: number;\n  viewWidth: number;\n  viewHeight: number;\n\n  readonly layerMode: LayerMode;\n  renderCount: number;\n\n  offscreen: boolean;\n  subLayers: Map<number, { layer: ILayer; group?: IGroup; zIndex: number; drawContribution?: IDrawContribution }>;\n\n  // mode: 'dynamic' | 'static';\n  readonly dirtyBound: IAABBBounds;\n  background: string;\n  dpr: number;\n  opacity: number;\n  canvasId?: string;\n  imageData?: ImageData;\n  blendMode?: string;\n  // TODO: getElementById\n  pickable: boolean;\n  pick: (x: number, y: number) => { graphic?: IGraphic; group?: IGroup } | false;\n  render: (params: ILayerDrawParams, userParams?: Partial<IDrawContext>) => void;\n  afterDraw: (cb: (l: this) => void) => void;\n\n  resize: (w: number, h: number) => void;\n  resizeView: (w: number, h: number) => void;\n  setDpr: (dpr: number) => void;\n  getNativeHandler: () => ILayerHandlerContribution;\n  combineSubLayer: (removeIncrementalKey?: boolean) => void;\n\n  // 动画相关\n  startAnimate: (t: number) => void;\n  setToFrame: (t: number) => void;\n  prepare: (dirtyBounds: IBounds, params: ILayerHandlerDrawParams) => void;\n  drawTo: (target: IWindow, params: IDrawToParams) => void;\n  combineTo: (target: IWindow, params: IDrawToParams) => void;\n  // 考虑操作回放\n}\n\nexport interface ILayerHandlerDrawParams extends ILayerDrawParams {\n  x: number;\n  y: number;\n  width: number;\n  height: number;\n  layer: ILayer;\n  stage: IStage;\n  updateBounds: boolean;\n}\n\nexport interface ILayerHandlerInitParams {\n  main: boolean;\n  canvasId?: string;\n  width: number;\n  height: number;\n  zIndex: number;\n  dpr?: number;\n}\n\n// TODO: layer在resize的时候需要判断是否需要resize window对应的canvas\n\n// 具体的Layer实现\n// Canvas2d的Layer可以对应一个Canvas或者ImageData\nexport interface ILayerHandlerContribution extends Releaseable {\n  // 所绑定的副layer handler\n  secondaryHandlers?: ILayerHandlerContribution[];\n  // 所依赖的主layer handler\n  mainHandler?: ILayerHandlerContribution;\n  type: LayerMode;\n  init: (layer: ILayer, window: IWindow, params: ILayerHandlerInitParams) => void;\n  resize: (w: number, h: number) => void;\n  resizeView: (w: number, h: number) => void;\n  setDpr: (dpr: number) => void;\n  render: (group: IGroup[], params: ILayerHandlerDrawParams, userParams?: Partial<IDrawContext>) => void;\n  prepare: (dirtyBounds: IBoundsLike, params: IRenderServiceDrawParams) => void;\n  drawTo: (target: IWindow, group: IGroup[], params: IDrawToParams & ILayerHandlerDrawParams) => void;\n  merge: (layerHandlers: ILayerHandlerContribution[]) => void;\n  getContext: () => IContext2d;\n  offscreen: boolean;\n  layer: ILayer;\n}\n"]}

package/es/interface/picker.d.ts

@@ -5,8 +5,8 @@ import type { EnvType, IGlobal } from './global';
 import type { IGroup } from './graphic/group';
 import type { IDrawContribution } from './render';
 export type PickResult = {
-    graphic: IGraphic | null;
-    group: IGroup | null;
+    graphic?: IGraphic | null;
+    group?: IGroup | null;
     params?: {
         shadowTarget?: IGraphic;
     };
@@ -32,7 +32,7 @@ export interface IPickerService {
     configure: (global: IGlobal, env: EnvType) => void;
     pick: (group: IGraphic[], point: IPoint, params?: IPickParams) => PickResult;
     pickGroup: (group: IGroup, point: IPointLike, parentMatrix: IMatrix, params: IPickParams) => PickResult;
-    pickItem: (graphic: IGraphic, point: IPointLike, parentMatrix: IMatrix | null, params?: IPickParams) => IGraphic | null;
+    pickItem: (graphic: IGraphic, point: IPointLike, parentMatrix: IMatrix | null, params?: IPickParams) => PickResult | null;
     containsPoint: (graphic: IGraphic, point: IPointLike, params?: IPickParams) => boolean;
     drawContribution?: IDrawContribution;
 }
@@ -42,12 +42,12 @@ export interface IPickItemInterceptorContribution {
         in3dInterceptor?: boolean;
     }, params?: {
         parentMatrix: IMatrix;
-    }) => boolean | PickResult | null;
+    }) => PickResult | null;
     afterPickItem?: (graphic: IGraphic, pickerService: IPickerService, point: IPointLike, drawContext: {
         in3dInterceptor?: boolean;
     }, params?: {
         parentMatrix: IMatrix;
-    }) => boolean | PickResult | null;
+    }) => PickResult | null;
 }
 export interface IBoundsPicker {
     type: string;

package/es/interface/picker.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/interface/picker.ts"],"names":[],"mappings":"","file":"picker.js","sourcesContent":["import type { IBounds, IMatrix, IPoint, IPointLike } from '@visactor/vutils';\nimport type { IGraphic } from './graphic';\nimport type { IContext2d } from './context';\nimport type { EnvType, IGlobal } from './global';\nimport type { IGroup } from './graphic/group';\nimport type { IDrawContribution } from './render';\n\nexport type PickResult = {\n  graphic: IGraphic | null;\n  group: IGroup | null;\n  params?: {\n    shadowTarget?: IGraphic;\n  };\n};\n\nexport interface IGraphicPicker {\n  type: string;\n  numberType: number;\n\n  contains: (graphic: IGraphic, point: IPointLike, params?: IPickParams) => boolean;\n}\n\nexport interface IPickParams {\n  group?: boolean;\n  graphic?: boolean;\n  bounds?: IBounds;\n  pickContext?: IContext2d;\n  pickerService?: IPickerService;\n  // 内部设置\n  in3dInterceptor?: boolean;\n  hack_pieFace?: string;\n}\n\nexport interface IPickerService {\n  type: string;\n\n  pickContext?: IContext2d;\n  pickerMap: Map<number, IGraphicPicker>;\n  configure: (global: IGlobal, env: EnvType) => void;\n  pick: (group: IGraphic[], point: IPoint, params?: IPickParams) => PickResult;\n  pickGroup: (group: IGroup, point: IPointLike, parentMatrix: IMatrix, params: IPickParams) => PickResult;\n  pickItem: (\n    graphic: IGraphic,\n    point: IPointLike,\n    parentMatrix: IMatrix | null,\n    params?: IPickParams\n  ) => IGraphic | null;\n  containsPoint: (graphic: IGraphic, point: IPointLike, params?: IPickParams) => boolean;\n  drawContribution?: IDrawContribution;\n}\n\nexport interface IPickItemInterceptorContribution {\n  order: number;\n  // null代表没匹配到，boolean代表是否pick中\n  beforePickItem?: (\n    graphic: IGraphic,\n    pickerService: IPickerService,\n    point: IPointLike,\n    drawContext: {\n      in3dInterceptor?: boolean;\n    },\n    params?: {\n      parentMatrix: IMatrix;\n    }\n  ) => boolean | PickResult | null;\n\n  afterPickItem?: (\n    graphic: IGraphic,\n    pickerService: IPickerService,\n    point: IPointLike,\n    drawContext: {\n      in3dInterceptor?: boolean;\n    },\n    params?: {\n      parentMatrix: IMatrix;\n    }\n  ) => boolean | PickResult | null;\n  // afterPickItem?: (\n  //   graphic: IGraphic,\n  //   pickerService: IPickerService,\n  // ) => boolean;\n}\n\nexport interface IBoundsPicker {\n  type: string;\n  numberType?: number;\n\n  contains: (graphic: IGraphic, point: IPointLike, params?: IPickParams) => boolean;\n}\n"]}
+{"version":3,"sources":["../src/interface/picker.ts"],"names":[],"mappings":"","file":"picker.js","sourcesContent":["import type { IBounds, IMatrix, IPoint, IPointLike } from '@visactor/vutils';\nimport type { IGraphic } from './graphic';\nimport type { IContext2d } from './context';\nimport type { EnvType, IGlobal } from './global';\nimport type { IGroup } from './graphic/group';\nimport type { IDrawContribution } from './render';\n\nexport type PickResult = {\n  graphic?: IGraphic | null;\n  group?: IGroup | null;\n  params?: {\n    shadowTarget?: IGraphic;\n  };\n};\n\nexport interface IGraphicPicker {\n  type: string;\n  numberType: number;\n\n  contains: (graphic: IGraphic, point: IPointLike, params?: IPickParams) => boolean;\n}\n\nexport interface IPickParams {\n  group?: boolean;\n  graphic?: boolean;\n  bounds?: IBounds;\n  pickContext?: IContext2d;\n  pickerService?: IPickerService;\n  // 内部设置\n  in3dInterceptor?: boolean;\n  hack_pieFace?: string;\n}\n\nexport interface IPickerService {\n  type: string;\n\n  pickContext?: IContext2d;\n  pickerMap: Map<number, IGraphicPicker>;\n  configure: (global: IGlobal, env: EnvType) => void;\n  pick: (group: IGraphic[], point: IPoint, params?: IPickParams) => PickResult;\n  pickGroup: (group: IGroup, point: IPointLike, parentMatrix: IMatrix, params: IPickParams) => PickResult;\n  pickItem: (\n    graphic: IGraphic,\n    point: IPointLike,\n    parentMatrix: IMatrix | null,\n    params?: IPickParams\n  ) => PickResult | null;\n  containsPoint: (graphic: IGraphic, point: IPointLike, params?: IPickParams) => boolean;\n  drawContribution?: IDrawContribution;\n}\n\nexport interface IPickItemInterceptorContribution {\n  order: number;\n  // null代表没匹配到，boolean代表是否pick中\n  beforePickItem?: (\n    graphic: IGraphic,\n    pickerService: IPickerService,\n    point: IPointLike,\n    drawContext: {\n      in3dInterceptor?: boolean;\n    },\n    params?: {\n      parentMatrix: IMatrix;\n    }\n  ) => PickResult | null;\n\n  afterPickItem?: (\n    graphic: IGraphic,\n    pickerService: IPickerService,\n    point: IPointLike,\n    drawContext: {\n      in3dInterceptor?: boolean;\n    },\n    params?: {\n      parentMatrix: IMatrix;\n    }\n  ) => PickResult | null;\n  // afterPickItem?: (\n  //   graphic: IGraphic,\n  //   pickerService: IPickerService,\n  // ) => boolean;\n}\n\nexport interface IBoundsPicker {\n  type: string;\n  numberType?: number;\n\n  contains: (graphic: IGraphic, point: IPointLike, params?: IPickParams) => boolean;\n}\n"]}

package/es/interface/render.d.ts

@@ -11,7 +11,7 @@ import type { MaybePromise } from './common';
 import type { ISyncHook } from './sync-hook';
 export interface IRenderServiceDrawParams {
     context?: IContext2d;
-    clear?: string | IColor;
+    clear?: string | IColor | boolean;
     width: number;
     height: number;
     x: number;