@visactor/vrender 0.9.0-fillstroke.0 → 0.9.1-circular.0

package/cjs/graphic/shadow-root.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graphic/shadow-root.ts"],"names":[],"mappings":";;;AAEA,mCAAgC;AAEhC,MAAa,UAAW,SAAQ,aAAK;IAInC,YAAY,OAAkB;QAC5B,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAJxB,SAAI,GAAgB,YAAY,CAAC;QAK/B,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC;IAC5B,CAAC;IAEQ,iBAAiB;QACxB,KAAK,CAAC,iBAAiB,EAAE,CAAC;QAC1B,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,IAAI,CAAC,UAAU,CAAC,iBAAiB,EAAE,CAAC;SACrC;IACH,CAAC;IAEQ,0BAA0B;QACjC,KAAK,CAAC,0BAA0B,EAAE,CAAC;QACnC,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,IAAI,CAAC,UAAU,CAAC,iBAAiB,EAAE,CAAC;SACrC;IACH,CAAC;IAIS,0BAA0B,CAAC,WAAoB,IAAI;QAC3D,IAAI,IAAI,CAAC,wBAAwB,EAAE,EAAE;YACnC,MAAM,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC;YAC3B,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;gBAC5B,IAAI,CAAC,kBAAkB,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;aACrC;iBAAM;gBACL,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;aAChE;YACD,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC5B,QAAQ,IAAI,IAAI,CAAC,4BAA4B,EAAE,CAAC;SACjD;QACD,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IACS,oBAAoB;QAC5B,IAAI,IAAI,CAAC,UAAU,EAAE;YAEnB,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC;YACvD,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAC9B,YAAY,CAAC,CAAC,EACd,YAAY,CAAC,CAAC,EACd,YAAY,CAAC,CAAC,EACd,YAAY,CAAC,CAAC,EACd,YAAY,CAAC,CAAC,EACd,YAAY,CAAC,CAAC,CACf,CAAC;SACH;IACH,CAAC;IAGS,yBAAyB;QACjC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;YAC3B,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;SACnD;aAAM;YACL,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAC7B,IAAI,CAAC,WAAW,CAAC,EAAE,EACnB,IAAI,CAAC,WAAW,CAAC,EAAE,EACnB,IAAI,CAAC,WAAW,CAAC,EAAE,EACnB,IAAI,CAAC,WAAW,CAAC,EAAE,CACpB,CAAC;SACH;QAGD,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;SAC/E;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;CACF;AAxED,gCAwEC","file":"shadow-root.js","sourcesContent":["import { AABBBounds, Matrix } from '@visactor/vutils';\nimport { GraphicType, IGraphic } from '../interface';\nimport { Group } from './group';\n\nexport class ShadowRoot extends Group {\n  type: GraphicType = 'shadowroot';\n  declare shadowHost: IGraphic;\n\n  constructor(graphic?: IGraphic) {\n    super({ x: 0, y: 0 });\n    this.shadowHost = graphic;\n  }\n\n  override addUpdateBoundTag() {\n    super.addUpdateBoundTag();\n    if (this.shadowHost) {\n      this.shadowHost.addUpdateBoundTag();\n    }\n  }\n\n  override addUpdateShapeAndBoundsTag() {\n    super.addUpdateShapeAndBoundsTag();\n    if (this.shadowHost) {\n      this.shadowHost.addUpdateBoundTag();\n    }\n  }\n\n  // 计算localMatrix不受影响\n  // 计算globalMatrix需要用到shadowHost的globalMatrix\n  protected tryUpdateGlobalTransMatrix(clearTag: boolean = true): Matrix {\n    if (this.shouldUpdateGlobalMatrix()) {\n      const m = this.transMatrix;\n      if (!this._globalTransMatrix) {\n        this._globalTransMatrix = m.clone();\n      } else {\n        this._globalTransMatrix.setValue(m.a, m.b, m.c, m.d, m.e, m.f);\n      }\n      this.doUpdateGlobalMatrix();\n      clearTag && this.clearUpdateGlobalPositionTag();\n    }\n    return this._globalTransMatrix;\n  }\n  protected doUpdateGlobalMatrix() {\n    if (this.shadowHost) {\n      // 基于shadowHost的matrix修改\n      const parentMatrix = this.shadowHost.globalTransMatrix;\n      this._globalTransMatrix.multiply(\n        parentMatrix.a,\n        parentMatrix.b,\n        parentMatrix.c,\n        parentMatrix.d,\n        parentMatrix.e,\n        parentMatrix.f\n      );\n    }\n  }\n  // 计算AABBBounds不受影响\n  // 计算globalAABBBounds\n  protected tryUpdateGlobalAABBBounds(): AABBBounds {\n    if (!this._globalAABBBounds) {\n      this._globalAABBBounds = this._AABBBounds.clone();\n    } else {\n      this._globalAABBBounds.setValue(\n        this._AABBBounds.x1,\n        this._AABBBounds.y1,\n        this._AABBBounds.x2,\n        this._AABBBounds.y2\n      );\n    }\n    // 使用shadowHost的grloalAABBBounds\n    // todo: 考虑是否需要性能优化\n    if (this.shadowHost) {\n      this._globalAABBBounds.transformWithMatrix(this.shadowHost.globalTransMatrix);\n    }\n    return this._globalAABBBounds;\n  }\n}\n"]}
+{"version":3,"sources":["../../src/graphic/shadow-root.ts"],"names":[],"mappings":";;;AAEA,mCAAgC;AAEhC,MAAa,UAAW,SAAQ,aAAK;IAInC,YAAY,OAAkB;QAC5B,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAJxB,SAAI,GAAgB,YAAY,CAAC;QAK/B,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC;IAC5B,CAAC;IAEQ,iBAAiB;QACxB,KAAK,CAAC,iBAAiB,EAAE,CAAC;QAC1B,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,IAAI,CAAC,UAAU,CAAC,iBAAiB,EAAE,CAAC;SACrC;IACH,CAAC;IAEQ,0BAA0B;QACjC,KAAK,CAAC,0BAA0B,EAAE,CAAC;QACnC,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,IAAI,CAAC,UAAU,CAAC,iBAAiB,EAAE,CAAC;SACrC;IACH,CAAC;IAIS,0BAA0B,CAAC,WAAoB,IAAI;QAC3D,IAAI,IAAI,CAAC,wBAAwB,EAAE,EAAE;YACnC,MAAM,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC;YAC3B,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;gBAC5B,IAAI,CAAC,kBAAkB,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;aACrC;iBAAM;gBACL,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;aAChE;YACD,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC5B,QAAQ,IAAI,IAAI,CAAC,4BAA4B,EAAE,CAAC;SACjD;QACD,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IACS,oBAAoB;QAC5B,IAAI,IAAI,CAAC,UAAU,EAAE;YAEnB,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC;YACvD,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAC9B,YAAY,CAAC,CAAC,EACd,YAAY,CAAC,CAAC,EACd,YAAY,CAAC,CAAC,EACd,YAAY,CAAC,CAAC,EACd,YAAY,CAAC,CAAC,EACd,YAAY,CAAC,CAAC,CACf,CAAC;SACH;IACH,CAAC;IAGS,yBAAyB;QACjC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;YAC3B,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;SACnD;aAAM;YACL,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAC7B,IAAI,CAAC,WAAW,CAAC,EAAE,EACnB,IAAI,CAAC,WAAW,CAAC,EAAE,EACnB,IAAI,CAAC,WAAW,CAAC,EAAE,EACnB,IAAI,CAAC,WAAW,CAAC,EAAE,CACpB,CAAC;SACH;QAGD,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;SAC/E;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;CACF;AAxED,gCAwEC","file":"shadow-root.js","sourcesContent":["import { AABBBounds, Matrix } from '@visactor/vutils';\nimport { GraphicType, IGraphic } from '../interface';\nimport { Group } from './group';\n\nexport class ShadowRoot extends Group {\n  type: GraphicType = 'shadowroot';\n  declare shadowHost: IGraphic;\n\n  constructor(graphic?: IGraphic) {\n    super({ x: 0, y: 0 });\n    this.shadowHost = graphic;\n  }\n\n  override addUpdateBoundTag() {\n    super.addUpdateBoundTag();\n    if (this.shadowHost) {\n      this.shadowHost.addUpdateBoundTag();\n    }\n  }\n\n  override addUpdateShapeAndBoundsTag() {\n    super.addUpdateShapeAndBoundsTag();\n    if (this.shadowHost) {\n      this.shadowHost.addUpdateBoundTag();\n    }\n  }\n\n  // 计算localMatrix不受影响\n  // 计算globalMatrix需要用到shadowHost的globalMatrix\n  protected tryUpdateGlobalTransMatrix(clearTag: boolean = true): Matrix {\n    if (this.shouldUpdateGlobalMatrix()) {\n      const m = this.transMatrix;\n      if (!this._globalTransMatrix) {\n        this._globalTransMatrix = m.clone();\n      } else {\n        this._globalTransMatrix.setValue(m.a, m.b, m.c, m.d, m.e, m.f);\n      }\n      this.doUpdateGlobalMatrix();\n      clearTag && this.clearUpdateGlobalPositionTag();\n    }\n    return this._globalTransMatrix;\n  }\n  protected doUpdateGlobalMatrix() {\n    if (this.shadowHost) {\n      // 基于shadowHost的matrix修改\n      const parentMatrix = this.shadowHost.globalTransMatrix;\n      this._globalTransMatrix.multiply(\n        parentMatrix.a,\n        parentMatrix.b,\n        parentMatrix.c,\n        parentMatrix.d,\n        parentMatrix.e,\n        parentMatrix.f\n      );\n    }\n  }\n  // 计算AABBBounds不受影响\n  // 计算globalAABBBounds\n  protected tryUpdateGlobalAABBBounds(): AABBBounds {\n    if (!this._globalAABBBounds) {\n      this._globalAABBBounds = this._AABBBounds.clone();\n    } else {\n      this._globalAABBBounds.setValue(\n        this._AABBBounds.x1,\n        this._AABBBounds.y1,\n        this._AABBBounds.x2,\n        this._AABBBounds.y2\n      );\n    }\n    // 使用shadowHost的grloalAABBBounds\n    // todo: 考虑是否需要性能优化\n    if (this.shadowHost) {\n      this._globalAABBBounds.transformWithMatrix(this.shadowHost.globalTransMatrix);\n    }\n    return this._globalAABBBounds;\n  }\n}\n"]}

package/cjs/graphic/symbol.d.ts

@@ -2,8 +2,7 @@ import { AABBBounds, OBBBounds } from '@visactor/vutils';
 import { ISymbol, ISymbolGraphicAttribute } from '../interface';
 import { Graphic } from './graphic';
 import { ISymbolClass } from './builtin-symbol/interface';
-import { CustomPath2D } from '../common';
-export declare const SYMBOL_NUMBER_TYPE: number;
+import { CustomPath2D } from '../common/custom-path2d';
 export declare class Symbol extends Graphic<ISymbolGraphicAttribute> implements ISymbol {
     type: 'symbol';
     static userSymbolMap: Record<string, ISymbolClass>;

package/cjs/graphic/symbol.js

@@ -2,19 +2,15 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.Symbol = exports.SYMBOL_NUMBER_TYPE = void 0;
+}), exports.Symbol = void 0;
 
-const vutils_1 = require("@visactor/vutils"), builtin_symbol_1 = require("./builtin-symbol"), graphic_1 = require("./graphic"), common_1 = require("../common"), theme_1 = require("./theme"), modules_1 = require("../modules");
-
-exports.SYMBOL_NUMBER_TYPE = (0, graphic_1.genNumberType)();
-
-const SYMBOL_UPDATE_TAG_KEY = [ "symbolType", "size", ...graphic_1.GRAPHIC_UPDATE_TAG_KEY ];
+const vutils_1 = require("@visactor/vutils"), builtin_symbol_1 = require("./builtin-symbol"), graphic_1 = require("./graphic"), utils_1 = require("../common/utils"), theme_1 = require("./theme"), application_1 = require("../application"), custom_path2d_1 = require("../common/custom-path2d"), constants_1 = require("./constants"), SYMBOL_UPDATE_TAG_KEY = [ "symbolType", "size", ...graphic_1.GRAPHIC_UPDATE_TAG_KEY ];
 
 class Symbol extends graphic_1.Graphic {
     constructor(params = {
         symbolType: "circle"
     }) {
-        super(params), this.type = "symbol", this.numberType = exports.SYMBOL_NUMBER_TYPE;
+        super(params), this.type = "symbol", this.numberType = constants_1.SYMBOL_NUMBER_TYPE;
     }
     getParsedPath() {
         return this.shouldUpdateShape() && (this.doUpdateParsedPath(), this.clearUpdateShapeTag()), 
@@ -33,7 +29,7 @@ class Symbol extends graphic_1.Graphic {
         if (path) return this._parsedPath = path, path;
         if (path = Symbol.userSymbolMap[symbolType], path) return this._parsedPath = path, 
         path;
-        const cache = (new common_1.CustomPath2D).fromString(symbolType), width = cache.bounds.width(), height = cache.bounds.height(), scale = 1 / (0, 
+        const cache = (new custom_path2d_1.CustomPath2D).fromString(symbolType), width = cache.bounds.width(), height = cache.bounds.height(), scale = 1 / (0, 
         vutils_1.max)(width, height);
         return cache.transform(0, 0, scale, scale), this._parsedPath = new builtin_symbol_1.CustomSymbolClass(symbolType, cache), 
         Symbol.userSymbolMap[symbolType] = this._parsedPath, this._parsedPath;
@@ -41,9 +37,9 @@ class Symbol extends graphic_1.Graphic {
     doUpdateAABBBounds(full) {
         const symbolTheme = (0, theme_1.getTheme)(this).symbol;
         this._AABBBounds.setValue(1 / 0, 1 / 0, -1 / 0, -1 / 0);
-        const attribute = this.attribute, bounds = modules_1.graphicService.updateSymbolAABBBounds(attribute, (0, 
+        const attribute = this.attribute, bounds = application_1.application.graphicService.updateSymbolAABBBounds(attribute, (0, 
         theme_1.getTheme)(this).symbol, this._AABBBounds, full, this), {boundsPadding: boundsPadding = symbolTheme.boundsPadding} = attribute, paddingArray = (0, 
-        common_1.parsePadding)(boundsPadding);
+        utils_1.parsePadding)(boundsPadding);
         return paddingArray && bounds.expand(paddingArray), this.clearUpdateBoundTag(), 
         bounds;
     }
@@ -69,7 +65,7 @@ class Symbol extends graphic_1.Graphic {
     toCustomPath() {
         const symbolInstance = this.getParsedPath(), size = this.attribute.size, formattedSize = (0, 
         vutils_1.isArray)(size) ? size : [ size, size ];
-        return symbolInstance.path ? (new common_1.CustomPath2D).fromCustomPath2D(symbolInstance.path, 0, 0, formattedSize[0], formattedSize[1]) : (new common_1.CustomPath2D).fromString(symbolInstance.pathStr, 0, 0, formattedSize[0], formattedSize[1]);
+        return symbolInstance.path ? (new custom_path2d_1.CustomPath2D).fromCustomPath2D(symbolInstance.path, 0, 0, formattedSize[0], formattedSize[1]) : (new custom_path2d_1.CustomPath2D).fromString(symbolInstance.pathStr, 0, 0, formattedSize[0], formattedSize[1]);
     }
     clone() {
         return new Symbol(Object.assign({}, this.attribute));

package/cjs/graphic/symbol.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graphic/symbol.ts"],"names":[],"mappings":"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","file":"symbol.js","sourcesContent":["import { AABBBounds, OBBBounds, isArray, max } from '@visactor/vutils';\nimport { ISymbol, ISymbolGraphicAttribute } from '../interface';\nimport { builtinSymbolsMap, CustomSymbolClass } from './builtin-symbol';\nimport { Graphic, GRAPHIC_UPDATE_TAG_KEY, genNumberType } from './graphic';\nimport { ISymbolClass } from './builtin-symbol/interface';\nimport { CustomPath2D, parsePadding } from '../common';\nimport { getTheme } from './theme';\nimport { graphicService } from '../modules';\n\nexport const SYMBOL_NUMBER_TYPE = genNumberType();\n\nconst SYMBOL_UPDATE_TAG_KEY = ['symbolType', 'size', ...GRAPHIC_UPDATE_TAG_KEY];\n\n/**\n * symbol\n */\nexport class Symbol extends Graphic<ISymbolGraphicAttribute> implements ISymbol {\n  type: 'symbol' = 'symbol';\n\n  static userSymbolMap: Record<string, ISymbolClass> = {};\n\n  constructor(params: ISymbolGraphicAttribute = { symbolType: 'circle' }) {\n    super(params);\n    this.numberType = SYMBOL_NUMBER_TYPE;\n  }\n\n  protected _parsedPath?: ISymbolClass;\n\n  getParsedPath(): ISymbolClass {\n    if (this.shouldUpdateShape()) {\n      this.doUpdateParsedPath();\n      this.clearUpdateShapeTag();\n    }\n    return this._parsedPath as ISymbolClass;\n  }\n\n  isValid(): boolean {\n    return super.isValid() && this._isValid();\n  }\n  private _isValid(): boolean {\n    const { size } = this.attribute;\n    return isArray(size) ? size.length === 2 && size.every(this._validNumber) : this._validNumber(size);\n  }\n\n  protected doUpdateParsedPath(): ISymbolClass {\n    const symbolTheme = getTheme(this).symbol;\n    // 查找内置symbol\n    const { symbolType = symbolTheme.symbolType } = this.attribute;\n    let path = builtinSymbolsMap[symbolType];\n    if (path) {\n      this._parsedPath = path;\n      return path;\n    }\n    path = Symbol.userSymbolMap[symbolType];\n    if (path) {\n      this._parsedPath = path;\n      return path;\n    }\n    const cache = new CustomPath2D().fromString(symbolType);\n    const width = cache.bounds.width();\n    const height = cache.bounds.height();\n    // 规范化到1\n    const maxWH = max(width, height);\n    const scale = 1 / maxWH;\n    cache.transform(0, 0, scale, scale);\n    this._parsedPath = new CustomSymbolClass(symbolType, cache);\n    Symbol.userSymbolMap[symbolType] = this._parsedPath;\n    return this._parsedPath;\n  }\n\n  protected doUpdateAABBBounds(full?: boolean): AABBBounds {\n    const symbolTheme = getTheme(this).symbol;\n    this._AABBBounds.setValue(Infinity, Infinity, -Infinity, -Infinity);\n    const attribute = this.attribute;\n    const bounds = graphicService.updateSymbolAABBBounds(\n      attribute,\n      getTheme(this).symbol,\n      this._AABBBounds,\n      full,\n      this\n    );\n\n    const { boundsPadding = symbolTheme.boundsPadding } = attribute;\n    const paddingArray = parsePadding(boundsPadding);\n    if (paddingArray) {\n      (bounds as AABBBounds).expand(paddingArray);\n    }\n\n    this.clearUpdateBoundTag();\n    return bounds as AABBBounds;\n  }\n\n  protected tryUpdateOBBBounds(): OBBBounds {\n    throw new Error('暂不支持');\n  }\n\n  getDefaultAttribute(name: string) {\n    const symbolTheme = getTheme(this).symbol;\n    return symbolTheme[name];\n  }\n\n  needUpdateTags(keys: string[]): boolean {\n    for (let i = 0; i < SYMBOL_UPDATE_TAG_KEY.length; i++) {\n      const attrKey = SYMBOL_UPDATE_TAG_KEY[i];\n      if (keys.indexOf(attrKey) !== -1) {\n        return true;\n      }\n    }\n    return false;\n  }\n  needUpdateTag(key: string): boolean {\n    for (let i = 0; i < SYMBOL_UPDATE_TAG_KEY.length; i++) {\n      const attrKey = SYMBOL_UPDATE_TAG_KEY[i];\n      if (key === attrKey) {\n        return true;\n      }\n    }\n    return false;\n  }\n\n  toCustomPath() {\n    const symbolInstance = this.getParsedPath();\n    const size = this.attribute.size;\n    const x = 0;\n    const y = 0;\n    const formattedSize = isArray(size) ? size : [size, size];\n\n    return symbolInstance.path\n      ? new CustomPath2D().fromCustomPath2D(symbolInstance.path, x, y, formattedSize[0], formattedSize[1])\n      : new CustomPath2D().fromString(symbolInstance.pathStr, x, y, formattedSize[0], formattedSize[1]);\n  }\n\n  clone() {\n    return new Symbol({ ...this.attribute });\n  }\n}\n\n// addAttributeToPrototype(DefaultSymbolStyle, Symbol, PURE_STYLE_KEY);\n"]}
+{"version":3,"sources":["../../src/graphic/symbol.ts"],"names":[],"mappings":"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","file":"symbol.js","sourcesContent":["import { AABBBounds, OBBBounds, isArray, max } from '@visactor/vutils';\nimport { ISymbol, ISymbolGraphicAttribute } from '../interface';\nimport { builtinSymbolsMap, CustomSymbolClass } from './builtin-symbol';\nimport { Graphic, GRAPHIC_UPDATE_TAG_KEY } from './graphic';\nimport { ISymbolClass } from './builtin-symbol/interface';\nimport { parsePadding } from '../common/utils';\nimport { getTheme } from './theme';\nimport { application } from '../application';\nimport { CustomPath2D } from '../common/custom-path2d';\nimport { SYMBOL_NUMBER_TYPE } from './constants';\n\nconst SYMBOL_UPDATE_TAG_KEY = ['symbolType', 'size', ...GRAPHIC_UPDATE_TAG_KEY];\n\n/**\n * symbol\n */\nexport class Symbol extends Graphic<ISymbolGraphicAttribute> implements ISymbol {\n  type: 'symbol' = 'symbol';\n\n  static userSymbolMap: Record<string, ISymbolClass> = {};\n\n  constructor(params: ISymbolGraphicAttribute = { symbolType: 'circle' }) {\n    super(params);\n    this.numberType = SYMBOL_NUMBER_TYPE;\n  }\n\n  protected _parsedPath?: ISymbolClass;\n\n  getParsedPath(): ISymbolClass {\n    if (this.shouldUpdateShape()) {\n      this.doUpdateParsedPath();\n      this.clearUpdateShapeTag();\n    }\n    return this._parsedPath as ISymbolClass;\n  }\n\n  isValid(): boolean {\n    return super.isValid() && this._isValid();\n  }\n  private _isValid(): boolean {\n    const { size } = this.attribute;\n    return isArray(size) ? size.length === 2 && size.every(this._validNumber) : this._validNumber(size);\n  }\n\n  protected doUpdateParsedPath(): ISymbolClass {\n    const symbolTheme = getTheme(this).symbol;\n    // 查找内置symbol\n    const { symbolType = symbolTheme.symbolType } = this.attribute;\n    let path = builtinSymbolsMap[symbolType];\n    if (path) {\n      this._parsedPath = path;\n      return path;\n    }\n    path = Symbol.userSymbolMap[symbolType];\n    if (path) {\n      this._parsedPath = path;\n      return path;\n    }\n    const cache = new CustomPath2D().fromString(symbolType);\n    const width = cache.bounds.width();\n    const height = cache.bounds.height();\n    // 规范化到1\n    const maxWH = max(width, height);\n    const scale = 1 / maxWH;\n    cache.transform(0, 0, scale, scale);\n    this._parsedPath = new CustomSymbolClass(symbolType, cache);\n    Symbol.userSymbolMap[symbolType] = this._parsedPath;\n    return this._parsedPath;\n  }\n\n  protected doUpdateAABBBounds(full?: boolean): AABBBounds {\n    const symbolTheme = getTheme(this).symbol;\n    this._AABBBounds.setValue(Infinity, Infinity, -Infinity, -Infinity);\n    const attribute = this.attribute;\n    const bounds = application.graphicService.updateSymbolAABBBounds(\n      attribute,\n      getTheme(this).symbol,\n      this._AABBBounds,\n      full,\n      this\n    );\n\n    const { boundsPadding = symbolTheme.boundsPadding } = attribute;\n    const paddingArray = parsePadding(boundsPadding);\n    if (paddingArray) {\n      (bounds as AABBBounds).expand(paddingArray);\n    }\n\n    this.clearUpdateBoundTag();\n    return bounds as AABBBounds;\n  }\n\n  protected tryUpdateOBBBounds(): OBBBounds {\n    throw new Error('暂不支持');\n  }\n\n  getDefaultAttribute(name: string) {\n    const symbolTheme = getTheme(this).symbol;\n    return symbolTheme[name];\n  }\n\n  needUpdateTags(keys: string[]): boolean {\n    for (let i = 0; i < SYMBOL_UPDATE_TAG_KEY.length; i++) {\n      const attrKey = SYMBOL_UPDATE_TAG_KEY[i];\n      if (keys.indexOf(attrKey) !== -1) {\n        return true;\n      }\n    }\n    return false;\n  }\n  needUpdateTag(key: string): boolean {\n    for (let i = 0; i < SYMBOL_UPDATE_TAG_KEY.length; i++) {\n      const attrKey = SYMBOL_UPDATE_TAG_KEY[i];\n      if (key === attrKey) {\n        return true;\n      }\n    }\n    return false;\n  }\n\n  toCustomPath() {\n    const symbolInstance = this.getParsedPath();\n    const size = this.attribute.size;\n    const x = 0;\n    const y = 0;\n    const formattedSize = isArray(size) ? size : [size, size];\n\n    return symbolInstance.path\n      ? new CustomPath2D().fromCustomPath2D(symbolInstance.path, x, y, formattedSize[0], formattedSize[1])\n      : new CustomPath2D().fromString(symbolInstance.pathStr, x, y, formattedSize[0], formattedSize[1]);\n  }\n\n  clone() {\n    return new Symbol({ ...this.attribute });\n  }\n}\n\n// addAttributeToPrototype(DefaultSymbolStyle, Symbol, PURE_STYLE_KEY);\n"]}

package/cjs/graphic/text.d.ts

@@ -2,7 +2,6 @@ import { AABBBounds, OBBBounds } from '@visactor/vutils';
 import { LayoutType } from '../core/contributions/textMeasure/layout';
 import { IText, ITextCache, ITextGraphicAttribute } from '../interface';
 import { Graphic } from './graphic';
-export declare const TEXT_NUMBER_TYPE: number;
 export declare class Text extends Graphic<ITextGraphicAttribute> implements IText {
     type: 'text';
     cache: ITextCache;

package/cjs/graphic/text.js

@@ -2,18 +2,14 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.Text = exports.TEXT_NUMBER_TYPE = void 0;
+}), exports.Text = void 0;
 
-const common_1 = require("../common"), layout_1 = require("../core/contributions/textMeasure/layout"), modules_1 = require("../modules"), graphic_1 = require("./graphic"), theme_1 = require("./theme");
-
-exports.TEXT_NUMBER_TYPE = (0, graphic_1.genNumberType)();
-
-const TEXT_UPDATE_TAG_KEY = [ "text", "maxLineWidth", "fontSize", "fontFamily", "fontWeight", "ellipsis", "lineHeight", ...graphic_1.GRAPHIC_UPDATE_TAG_KEY ];
+const text_1 = require("../common/text"), layout_1 = require("../core/contributions/textMeasure/layout"), application_1 = require("../application"), graphic_1 = require("./graphic"), theme_1 = require("./theme"), utils_1 = require("../common/utils"), constants_1 = require("./constants"), TEXT_UPDATE_TAG_KEY = [ "text", "maxLineWidth", "fontSize", "fontFamily", "fontWeight", "ellipsis", "lineHeight", ...graphic_1.GRAPHIC_UPDATE_TAG_KEY ];
 
 class Text extends graphic_1.Graphic {
     get font() {
         const textTheme = (0, theme_1.getTheme)(this).text;
-        return this._font || (this._font = (0, common_1.getContextFont)(this.attribute, textTheme)), 
+        return this._font || (this._font = (0, text_1.getContextFont)(this.attribute, textTheme)), 
         this._font;
     }
     get clipedText() {
@@ -39,7 +35,8 @@ class Text extends graphic_1.Graphic {
         text: "",
         fontSize: 16
     }) {
-        super(params), this.type = "text", this.numberType = exports.TEXT_NUMBER_TYPE, this.cache = {};
+        super(params), this.type = "text", this.numberType = constants_1.TEXT_NUMBER_TYPE, 
+        this.cache = {};
     }
     isValid() {
         return super.isValid() && this._isValid();
@@ -51,24 +48,24 @@ class Text extends graphic_1.Graphic {
     doUpdateAABBBounds() {
         const textTheme = (0, theme_1.getTheme)(this).text;
         this._AABBBounds.setValue(1 / 0, 1 / 0, -1 / 0, -1 / 0);
-        const attribute = this.attribute, bounds = modules_1.graphicService.updateTextAABBBounds(attribute, textTheme, this._AABBBounds, this);
+        const attribute = this.attribute, bounds = application_1.application.graphicService.updateTextAABBBounds(attribute, textTheme, this._AABBBounds, this);
         return this.clearUpdateBoundTag(), bounds;
     }
     updateAABBBounds() {
-        const textTheme = (0, theme_1.getTheme)(this).text, attribute = this.attribute, bounds = modules_1.graphicService.updateTextAABBBounds(attribute, (0, 
+        const textTheme = (0, theme_1.getTheme)(this).text, attribute = this.attribute, bounds = application_1.application.graphicService.updateTextAABBBounds(attribute, (0, 
         theme_1.getTheme)(this).text, this._AABBBounds, this), {boundsPadding: boundsPadding = textTheme.boundsPadding} = this.attribute, paddingArray = (0, 
-        common_1.parsePadding)(boundsPadding);
+        utils_1.parsePadding)(boundsPadding);
         return paddingArray && bounds.expand(paddingArray), this.clearUpdateBoundTag(), 
         bounds;
     }
     updateSingallineAABBBounds(text) {
         var _a;
-        const textTheme = (0, theme_1.getTheme)(this).text, textMeasure = modules_1.graphicUtil.textMeasure;
+        const textTheme = (0, theme_1.getTheme)(this).text, textMeasure = application_1.application.graphicUtil.textMeasure;
         let width, str;
         const buf = 2, attribute = this.attribute, {maxLineWidth: maxLineWidth = textTheme.maxLineWidth, ellipsis: ellipsis = textTheme.ellipsis, textAlign: textAlign = textTheme.textAlign, textBaseline: textBaseline = textTheme.textBaseline, fontSize: fontSize = textTheme.fontSize, stroke: stroke = textTheme.stroke, lineHeight: lineHeight = (null !== (_a = attribute.lineHeight) && void 0 !== _a ? _a : (attribute.fontSize || textTheme.fontSize) + buf), lineWidth: lineWidth = textTheme.lineWidth} = attribute;
         if (!this.shouldUpdateShape() && this.cache) {
             width = this.cache.clipedWidth;
-            const dx = (0, common_1.textDrawOffsetX)(textAlign, width), dy = (0, common_1.textLayoutOffsetY)(textBaseline, lineHeight);
+            const dx = (0, text_1.textDrawOffsetX)(textAlign, width), dy = (0, text_1.textLayoutOffsetY)(textBaseline, lineHeight);
             return this._AABBBounds.set(dx, dy, dx + width, dy + lineHeight), stroke && this._AABBBounds.expand(lineWidth / 2), 
             this._AABBBounds;
         }
@@ -89,7 +86,7 @@ class Text extends graphic_1.Graphic {
             fontSize: fontSize
         }), this.cache.clipedText = text.toString(), this.cache.clipedWidth = width;
         this.clearUpdateShapeTag();
-        const dx = (0, common_1.textDrawOffsetX)(textAlign, width), dy = (0, common_1.textLayoutOffsetY)(textBaseline, lineHeight);
+        const dx = (0, text_1.textDrawOffsetX)(textAlign, width), dy = (0, text_1.textLayoutOffsetY)(textBaseline, lineHeight);
         return this._AABBBounds.set(dx, dy, dx + width, dy + lineHeight), stroke && this._AABBBounds.expand(lineWidth / 2), 
         this._AABBBounds;
     }
@@ -101,7 +98,7 @@ class Text extends graphic_1.Graphic {
             return this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height), 
             stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;
         }
-        const textMeasure = modules_1.graphicUtil.textMeasure, layoutData = new layout_1.CanvasTextLayout(fontFamily, {
+        const textMeasure = application_1.application.graphicUtil.textMeasure, layoutData = new layout_1.CanvasTextLayout(fontFamily, {
             fontSize: fontSize
         }, textMeasure).GetLayoutByLines(text, textAlign, textBaseline, lineHeight, !0 === ellipsis ? textTheme.ellipsis : ellipsis || void 0, maxLineWidth), {bbox: bbox} = layoutData;
         return this.cache.layoutData = layoutData, this.clearUpdateShapeTag(), this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height), 

package/cjs/graphic/text.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graphic/text.ts"],"names":[],"mappings":"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","file":"text.js","sourcesContent":["import { AABBBounds, OBBBounds } from '@visactor/vutils';\nimport { getContextFont, parsePadding, textDrawOffsetX, textLayoutOffsetY } from '../common';\nimport { CanvasTextLayout, LayoutType } from '../core/contributions/textMeasure/layout';\nimport { graphicService, graphicUtil } from '../modules';\nimport { IText, ITextCache, ITextGraphicAttribute } from '../interface';\nimport { Graphic, GRAPHIC_UPDATE_TAG_KEY, genNumberType } from './graphic';\nimport { getTheme } from './theme';\n\nexport const TEXT_NUMBER_TYPE = genNumberType();\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  ...GRAPHIC_UPDATE_TAG_KEY\n];\n\nexport class Text extends Graphic<ITextGraphicAttribute> implements IText {\n  type: 'text' = 'text';\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;\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 = graphicService.updateTextAABBBounds(attribute, textTheme, this._AABBBounds, this) as AABBBounds;\n\n    this.clearUpdateBoundTag();\n    return bounds;\n  }\n  private updateAABBBounds(): AABBBounds {\n    const textTheme = getTheme(this).text;\n    const attribute = this.attribute;\n    const bounds = graphicService.updateTextAABBBounds(\n      attribute,\n      getTheme(this).text,\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\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 textMeasure = graphicUtil.textMeasure;\n    let width: number;\n    let str: string;\n    const buf = 2;\n    const attribute = this.attribute;\n    const {\n      maxLineWidth = textTheme.maxLineWidth,\n      ellipsis = textTheme.ellipsis,\n      textAlign = textTheme.textAlign,\n      textBaseline = textTheme.textBaseline,\n      fontSize = textTheme.fontSize,\n      stroke = textTheme.stroke,\n      lineHeight = attribute.lineHeight ?? (attribute.fontSize || textTheme.fontSize) + buf,\n      lineWidth = textTheme.lineWidth\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);\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(text.toString(), { fontSize }, maxLineWidth, strEllipsis);\n        str = data.str;\n        width = data.width;\n      } else {\n        const data = textMeasure.clipText(text.toString(), { fontSize }, maxLineWidth);\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 });\n      this.cache.clipedText = text.toString();\n      this.cache.clipedWidth = width;\n    }\n    this.clearUpdateShapeTag();\n\n    const dx = textDrawOffsetX(textAlign, width);\n    const dy = textLayoutOffsetY(textBaseline, lineHeight);\n    this._AABBBounds.set(dx, dy, dx + width, dy + lineHeight);\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  updateMultilineAABBBounds(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      lineHeight = attribute.lineHeight || attribute.fontSize || textTheme.fontSize,\n      ellipsis = textTheme.ellipsis,\n      maxLineWidth,\n      stroke = textTheme.stroke,\n      lineWidth = textTheme.lineWidth\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\n    const textMeasure = graphicUtil.textMeasure;\n    const layoutObj = new CanvasTextLayout(fontFamily, { fontSize }, 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      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  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  needUpdateTags(keys: string[]): boolean {\n    for (let i = 0; i < TEXT_UPDATE_TAG_KEY.length; i++) {\n      const attrKey = TEXT_UPDATE_TAG_KEY[i];\n      if (keys.indexOf(attrKey) !== -1) {\n        return true;\n      }\n    }\n    return false;\n  }\n  needUpdateTag(key: string): boolean {\n    for (let i = 0; i < TEXT_UPDATE_TAG_KEY.length; i++) {\n      const attrKey = TEXT_UPDATE_TAG_KEY[i];\n      if (key === attrKey) {\n        return true;\n      }\n    }\n    return false;\n  }\n\n  clone(): Text {\n    return new Text({ ...this.attribute });\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 { AABBBounds, OBBBounds } from '@visactor/vutils';\nimport { getContextFont, textDrawOffsetX, textLayoutOffsetY } from '../common/text';\nimport { CanvasTextLayout, LayoutType } from '../core/contributions/textMeasure/layout';\nimport { application } from '../application';\nimport { IText, ITextCache, ITextGraphicAttribute } from '../interface';\nimport { Graphic, GRAPHIC_UPDATE_TAG_KEY } from './graphic';\nimport { getTheme } from './theme';\nimport { parsePadding } from '../common/utils';\nimport { TEXT_NUMBER_TYPE } from './constants';\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  ...GRAPHIC_UPDATE_TAG_KEY\n];\n\nexport class Text extends Graphic<ITextGraphicAttribute> implements IText {\n  type: 'text' = 'text';\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;\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    this.clearUpdateBoundTag();\n    return bounds;\n  }\n  private updateAABBBounds(): AABBBounds {\n    const textTheme = getTheme(this).text;\n    const attribute = this.attribute;\n    const bounds = application.graphicService.updateTextAABBBounds(\n      attribute,\n      getTheme(this).text,\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\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 textMeasure = application.graphicUtil.textMeasure;\n    let width: number;\n    let str: string;\n    const buf = 2;\n    const attribute = this.attribute;\n    const {\n      maxLineWidth = textTheme.maxLineWidth,\n      ellipsis = textTheme.ellipsis,\n      textAlign = textTheme.textAlign,\n      textBaseline = textTheme.textBaseline,\n      fontSize = textTheme.fontSize,\n      stroke = textTheme.stroke,\n      lineHeight = attribute.lineHeight ?? (attribute.fontSize || textTheme.fontSize) + buf,\n      lineWidth = textTheme.lineWidth\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);\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(text.toString(), { fontSize }, maxLineWidth, strEllipsis);\n        str = data.str;\n        width = data.width;\n      } else {\n        const data = textMeasure.clipText(text.toString(), { fontSize }, maxLineWidth);\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 });\n      this.cache.clipedText = text.toString();\n      this.cache.clipedWidth = width;\n    }\n    this.clearUpdateShapeTag();\n\n    const dx = textDrawOffsetX(textAlign, width);\n    const dy = textLayoutOffsetY(textBaseline, lineHeight);\n    this._AABBBounds.set(dx, dy, dx + width, dy + lineHeight);\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  updateMultilineAABBBounds(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      lineHeight = attribute.lineHeight || attribute.fontSize || textTheme.fontSize,\n      ellipsis = textTheme.ellipsis,\n      maxLineWidth,\n      stroke = textTheme.stroke,\n      lineWidth = textTheme.lineWidth\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\n    const textMeasure = application.graphicUtil.textMeasure;\n    const layoutObj = new CanvasTextLayout(fontFamily, { fontSize }, 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      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  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  needUpdateTags(keys: string[]): boolean {\n    for (let i = 0; i < TEXT_UPDATE_TAG_KEY.length; i++) {\n      const attrKey = TEXT_UPDATE_TAG_KEY[i];\n      if (keys.indexOf(attrKey) !== -1) {\n        return true;\n      }\n    }\n    return false;\n  }\n  needUpdateTag(key: string): boolean {\n    for (let i = 0; i < TEXT_UPDATE_TAG_KEY.length; i++) {\n      const attrKey = TEXT_UPDATE_TAG_KEY[i];\n      if (key === attrKey) {\n        return true;\n      }\n    }\n    return false;\n  }\n\n  clone(): Text {\n    return new Text({ ...this.attribute });\n  }\n}\n\n// addAttributeToPrototype(DefaultLineStyle, Text, PURE_STYLE_KEY);\n"]}

package/cjs/graphic/theme.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graphic/theme.ts"],"names":[],"mappings":"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","file":"theme.js","sourcesContent":["import { IGraphicAttribute, IFullThemeSpec, IGraphic, IGroup, ITheme, IThemeSpec } from '../interface';\nimport {\n  DefaultArcAttribute,\n  DefaultAreaAttribute,\n  DefaultCircleAttribute,\n  DefaultGlyphAttribute,\n  DefaultGroupAttribute,\n  DefaultImageAttribute,\n  DefaultLineAttribute,\n  DefaultPathAttribute,\n  DefaultPolygonAttribute,\n  DefaultRect3dAttribute,\n  DefaultRectAttribute,\n  DefaultSymbolAttribute,\n  DefaultTextAttribute,\n  DefaultRichTextAttribute,\n  DefaultRichTextIconAttribute\n} from './config';\n\nconst defaultThemeObj = {\n  arc: DefaultArcAttribute,\n  area: DefaultAreaAttribute,\n  circle: DefaultCircleAttribute,\n  line: DefaultLineAttribute,\n  path: DefaultPathAttribute,\n  symbol: DefaultSymbolAttribute,\n  text: DefaultTextAttribute,\n  rect: DefaultRectAttribute,\n  rect3d: DefaultRect3dAttribute,\n  polygon: DefaultPolygonAttribute,\n  richtext: DefaultRichTextAttribute,\n  richtextIcon: DefaultRichTextIconAttribute,\n  image: DefaultImageAttribute,\n  group: DefaultGroupAttribute,\n  glyph: DefaultGlyphAttribute\n};\n\nconst themeKeys = Object.keys(defaultThemeObj);\n\nexport function newThemeObj(): IFullThemeSpec {\n  return {\n    arc: Object.assign({}, defaultThemeObj.arc),\n    area: Object.assign({}, defaultThemeObj.area),\n    circle: Object.assign({}, defaultThemeObj.circle),\n    line: Object.assign({}, defaultThemeObj.line),\n    path: Object.assign({}, defaultThemeObj.path),\n    symbol: Object.assign({}, defaultThemeObj.symbol),\n    text: Object.assign({}, defaultThemeObj.text),\n    rect: Object.assign({}, defaultThemeObj.rect),\n    rect3d: Object.assign({}, defaultThemeObj.rect3d),\n    polygon: Object.assign({}, defaultThemeObj.polygon),\n    richtext: Object.assign({}, defaultThemeObj.richtext),\n    richtextIcon: Object.assign({}, defaultThemeObj.richtextIcon),\n    image: Object.assign({}, defaultThemeObj.image),\n    group: Object.assign({}, defaultThemeObj.group),\n    glyph: Object.assign({}, defaultThemeObj.glyph)\n  };\n}\n\n// 将t合并到out中\nfunction combineTheme(out: IThemeSpec, t: IThemeSpec) {\n  if (!t) {\n    return;\n  }\n  Object.keys(t).forEach(k => {\n    if (out[k]) {\n      Object.assign(out[k], t[k]);\n    } else {\n      out[k] = t[k];\n    }\n  });\n}\n\n// 全局创建60个theme，节省打点耗时时间\nconst staticThemePools = new Array(60).fill(0).map(() => newThemeObj());\n\n// // 性能优化，没有修改的theme都使用这个\n// const defaultCommontTheme = newThemeObj();\n\n// function combineTheme(out: IThemeSpec, userTheme: IThemeSpec, defaultTheme: IFullThemeSpec) {\n\n// }\n\n// 优先级：\n// 1. userTheme\n// 2. commonTheme\n// 3. parentTheme\n// 4. defaultTheme\n\nexport class Theme implements ITheme {\n  // 当前的总theme，最终合并后的theme\n  combinedTheme: IFullThemeSpec;\n\n  // 记录累计应用的所有用户设置上的theme\n  userTheme?: IThemeSpec;\n  // 公共属性，有些属性所有图元都生效，那就放在common位置\n  commonTheme?: Partial<IGraphicAttribute>;\n\n  // // 记录下一次设置的theme，同时也作为一个dirty位，记录是否存在没有合并的theme\n  // nextTheme?: IThemeSpec;\n\n  protected _defaultTheme: IFullThemeSpec;\n\n  dirty: boolean;\n\n  constructor() {\n    // group数量不多，问题不大\n    this._defaultTheme = staticThemePools.pop() || newThemeObj();\n    this.combinedTheme = this._defaultTheme;\n    this.dirty = false;\n  }\n\n  getTheme(group?: IGroup) {\n    if (!group) {\n      return this.combinedTheme;\n    }\n    if (!this.dirty) {\n      return this.combinedTheme;\n    }\n    let parentTheme = {};\n    const parentGroup = this.getParentWithTheme(group);\n    if (parentGroup) {\n      parentTheme = parentGroup.theme;\n    }\n    this.applyTheme(group, parentTheme);\n    return this.combinedTheme;\n  }\n\n  // 获取具有主题的parent\n  getParentWithTheme(group: IGroup) {\n    while (group.parent) {\n      group = group.parent;\n      if (group.theme) {\n        return group;\n      }\n    }\n    return null;\n  }\n\n  // 应用主题，从根节点一直触发到当前节点（如果上层节点需要的话）\n  applyTheme(group: IGroup, pt: IThemeSpec): IThemeSpec {\n    if (this.dirty) {\n      const parentGroup = this.getParentWithTheme(group);\n      if (parentGroup) {\n        const parentTheme = parentGroup.theme;\n        if (parentTheme.dirty) {\n          parentTheme.applyTheme(parentGroup, pt);\n        }\n        combineTheme(pt, parentTheme.userTheme);\n      }\n      // 如果当前节点没有userTheme的话，直接复用上层\n      if (!this.userTheme) {\n        if (parentGroup) {\n          this.combinedTheme = parentGroup.theme.combinedTheme;\n        } else {\n          this.combinedTheme = this._defaultTheme;\n          console.warn('未知错误，走到不应该走的区域里');\n        }\n        this.dirty = false;\n      } else {\n        this.doCombine(pt);\n      }\n    }\n\n    return this.combinedTheme;\n  }\n\n  // 合并userTheme到combinedTheme\n  protected doCombine(parentTheme: IThemeSpec) {\n    const userTheme = this.userTheme;\n    const defaultTheme = this._defaultTheme;\n    const combinedTheme = this.combinedTheme;\n    const parentCommonTheme = parentTheme.common || {};\n    const commonTheme = Object.assign(parentCommonTheme, this.commonTheme);\n    // combineTheme({}, this.userTheme, this._defaultTheme);\n    themeKeys.forEach(k => {\n      if (userTheme[k] || commonTheme || parentTheme[k]) {\n        combinedTheme[k] = Object.assign(\n          {},\n          defaultTheme[k],\n          commonTheme ?? {},\n          parentTheme[k] ?? {},\n          userTheme[k] ?? {}\n        );\n      } else {\n        combinedTheme[k] = defaultTheme[k];\n      }\n    });\n    this.dirty = false;\n  }\n\n  resetTheme(t: IThemeSpec, g: IGroup) {\n    this.userTheme = t;\n    // 设置自己和子节点的theme都为dirty\n    this.dirty = true;\n    this.dirtyChildren(g);\n  }\n\n  setTheme(t: IThemeSpec, g: IGroup) {\n    // 设置自己的nextTheme\n    let userTheme = this.userTheme;\n    if (userTheme) {\n      Object.keys(t).forEach(k => {\n        if (userTheme[k]) {\n          Object.assign(userTheme[k], t[k]);\n        } else {\n          // todo，这里调用次数不多，应该问题不大\n          userTheme[k] = Object.assign({}, t[k]);\n        }\n      });\n    } else {\n      userTheme = t;\n    }\n    if (t.common) {\n      if (!this.commonTheme) {\n        this.commonTheme = t.common;\n      } else {\n        Object.assign(this.commonTheme, t.common);\n      }\n    }\n    this.userTheme = userTheme;\n    // 设置自己和子节点的theme都为dirty\n    this.dirty = true;\n    this.dirtyChildren(g);\n  }\n\n  dirtyChildren(g: IGroup) {\n    g.forEachChildren(item => {\n      if ((item as IGroup).isContainer) {\n        if ((item as IGroup).theme) {\n          (item as IGroup).theme.dirty = true;\n        }\n        this.dirtyChildren(item as IGroup);\n      }\n    });\n  }\n\n  // // 设置theme到子元素，直接设置到currentTheme中去\n  // setThemeToChildrenCurrentTheme(t :IThemeSpec, g: IGroup) {\n  //   g.forEachChildren((item) => {\n  //     if ((item as IGroup).isContainer) {\n  //       const currentTheme = (item as IGroup).theme.currentTheme;\n  //       Object.keys(t).forEach(k => {\n  //         Object.assign(currentTheme[k], t[k]);\n  //       });\n  //       this.setThemeToChildrenCurrentTheme(t, item as IGroup);\n  //     }\n  //   })\n  // }\n}\n\nexport const globalTheme = new Theme();\n\nexport function getTheme(graphic: IGraphic, theme?: IFullThemeSpec): IFullThemeSpec {\n  if (graphic.glyphHost) {\n    return getTheme(graphic.glyphHost);\n  }\n  if (theme) {\n    if (graphic.isContainer) {\n      // 暂时不支持Group\n      return theme;\n    }\n    return theme;\n  }\n\n  return getThemeFromGroup(graphic) || globalTheme.getTheme();\n}\n\nexport function getThemeFromGroup(graphic: IGraphic): IFullThemeSpec | null {\n  let g: IGroup;\n  if (graphic.isContainer) {\n    // 找到存在theme的group\n    g = graphic as IGroup;\n  } else {\n    g = graphic.parent;\n  }\n\n  if (g) {\n    while (g) {\n      if (g.theme) {\n        break;\n      }\n      g = g.parent;\n    }\n    if (!g) {\n      return globalTheme.getTheme();\n    }\n    if (!g.theme) {\n      g.createTheme();\n    }\n    return g.theme.getTheme(g as IGroup);\n  }\n  return null;\n}\n"]}
+{"version":3,"sources":["../../src/graphic/theme.ts"],"names":[],"mappings":"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","file":"theme.js","sourcesContent":["import { IGraphicAttribute, IFullThemeSpec, IGraphic, IGroup, ITheme, IThemeSpec } from '../interface';\nimport {\n  DefaultArcAttribute,\n  DefaultAreaAttribute,\n  DefaultCircleAttribute,\n  DefaultGlyphAttribute,\n  DefaultGroupAttribute,\n  DefaultImageAttribute,\n  DefaultLineAttribute,\n  DefaultPathAttribute,\n  DefaultPolygonAttribute,\n  DefaultRect3dAttribute,\n  DefaultRectAttribute,\n  DefaultSymbolAttribute,\n  DefaultTextAttribute,\n  DefaultRichTextAttribute,\n  DefaultRichTextIconAttribute\n} from './config';\n\nconst defaultThemeObj = {\n  arc: DefaultArcAttribute,\n  area: DefaultAreaAttribute,\n  circle: DefaultCircleAttribute,\n  line: DefaultLineAttribute,\n  path: DefaultPathAttribute,\n  symbol: DefaultSymbolAttribute,\n  text: DefaultTextAttribute,\n  rect: DefaultRectAttribute,\n  rect3d: DefaultRect3dAttribute,\n  polygon: DefaultPolygonAttribute,\n  richtext: DefaultRichTextAttribute,\n  richtextIcon: DefaultRichTextIconAttribute,\n  image: DefaultImageAttribute,\n  group: DefaultGroupAttribute,\n  glyph: DefaultGlyphAttribute\n};\n\nconst themeKeys = Object.keys(defaultThemeObj);\n\nexport function newThemeObj(): IFullThemeSpec {\n  return {\n    arc: Object.assign({}, defaultThemeObj.arc),\n    area: Object.assign({}, defaultThemeObj.area),\n    circle: Object.assign({}, defaultThemeObj.circle),\n    line: Object.assign({}, defaultThemeObj.line),\n    path: Object.assign({}, defaultThemeObj.path),\n    symbol: Object.assign({}, defaultThemeObj.symbol),\n    text: Object.assign({}, defaultThemeObj.text),\n    rect: Object.assign({}, defaultThemeObj.rect),\n    rect3d: Object.assign({}, defaultThemeObj.rect3d),\n    polygon: Object.assign({}, defaultThemeObj.polygon),\n    richtext: Object.assign({}, defaultThemeObj.richtext),\n    richtextIcon: Object.assign({}, defaultThemeObj.richtextIcon),\n    image: Object.assign({}, defaultThemeObj.image),\n    group: Object.assign({}, defaultThemeObj.group),\n    glyph: Object.assign({}, defaultThemeObj.glyph)\n  };\n}\n\n// 将t合并到out中\nfunction combineTheme(out: IThemeSpec, t: IThemeSpec) {\n  if (!t) {\n    return;\n  }\n  Object.keys(t).forEach(k => {\n    if (out[k]) {\n      Object.assign(out[k], t[k]);\n    } else {\n      out[k] = t[k];\n    }\n  });\n}\n\n// 全局创建60个theme，节省打点耗时时间\nconst staticThemePools = new Array(60).fill(0).map(() => newThemeObj());\n\n// // 性能优化，没有修改的theme都使用这个\n// const defaultCommontTheme = newThemeObj();\n\n// function combineTheme(out: IThemeSpec, userTheme: IThemeSpec, defaultTheme: IFullThemeSpec) {\n\n// }\n\n// 优先级：\n// 1. userTheme\n// 2. commonTheme\n// 3. parentTheme\n// 4. defaultTheme\n\nexport class Theme implements ITheme {\n  // 当前的总theme，最终合并后的theme\n  combinedTheme: IFullThemeSpec;\n\n  // 记录累计应用的所有用户设置上的theme\n  userTheme?: IThemeSpec;\n  // 公共属性，有些属性所有图元都生效，那就放在common位置\n  commonTheme?: Partial<IGraphicAttribute>;\n\n  // // 记录下一次设置的theme，同时也作为一个dirty位，记录是否存在没有合并的theme\n  // nextTheme?: IThemeSpec;\n\n  protected _defaultTheme: IFullThemeSpec;\n\n  dirty: boolean;\n\n  constructor() {\n    // group数量不多，问题不大\n    this._defaultTheme = staticThemePools.pop() || newThemeObj();\n    this.combinedTheme = this._defaultTheme;\n    this.dirty = false;\n  }\n\n  getTheme(group?: IGroup) {\n    if (!group) {\n      return this.combinedTheme;\n    }\n    if (!this.dirty) {\n      return this.combinedTheme;\n    }\n    let parentTheme = {};\n    const parentGroup = this.getParentWithTheme(group);\n    if (parentGroup) {\n      parentTheme = parentGroup.theme;\n    }\n    this.applyTheme(group, parentTheme);\n    return this.combinedTheme;\n  }\n\n  // 获取具有主题的parent\n  getParentWithTheme(group: IGroup) {\n    while (group.parent) {\n      group = group.parent;\n      if (group.theme) {\n        return group;\n      }\n    }\n    return null;\n  }\n\n  // 应用主题，从根节点一直触发到当前节点（如果上层节点需要的话）\n  applyTheme(group: IGroup, pt: IThemeSpec): IThemeSpec {\n    if (this.dirty) {\n      const parentGroup = this.getParentWithTheme(group);\n      if (parentGroup) {\n        const parentTheme = parentGroup.theme;\n        if (parentTheme.dirty) {\n          parentTheme.applyTheme(parentGroup, pt);\n        }\n        combineTheme(pt, parentTheme.userTheme);\n      }\n      // 如果当前节点没有userTheme的话，直接复用上层\n      if (!this.userTheme) {\n        if (parentGroup) {\n          this.combinedTheme = parentGroup.theme.combinedTheme;\n        } else {\n          this.combinedTheme = this._defaultTheme;\n          console.warn('未知错误，走到不应该走的区域里');\n        }\n        this.dirty = false;\n      } else {\n        this.doCombine(pt);\n      }\n    }\n\n    return this.combinedTheme;\n  }\n\n  // 合并userTheme到combinedTheme\n  protected doCombine(parentTheme: IThemeSpec) {\n    const userTheme = this.userTheme;\n    const defaultTheme = this._defaultTheme;\n    const combinedTheme = this.combinedTheme;\n    const parentCommonTheme = parentTheme.common || {};\n    const commonTheme = Object.assign(parentCommonTheme, this.commonTheme);\n    // combineTheme({}, this.userTheme, this._defaultTheme);\n    themeKeys.forEach(k => {\n      if (userTheme[k] || commonTheme || parentTheme[k]) {\n        combinedTheme[k] = Object.assign(\n          {},\n          defaultTheme[k],\n          commonTheme ?? {},\n          parentTheme[k] ?? {},\n          userTheme[k] ?? {}\n        );\n      } else {\n        combinedTheme[k] = defaultTheme[k];\n      }\n    });\n    this.dirty = false;\n  }\n\n  resetTheme(t: IThemeSpec, g: IGroup) {\n    this.userTheme = t;\n    // 设置自己和子节点的theme都为dirty\n    this.dirty = true;\n    this.dirtyChildren(g);\n  }\n\n  setTheme(t: IThemeSpec, g: IGroup) {\n    // 设置自己的nextTheme\n    let userTheme = this.userTheme;\n    if (userTheme) {\n      Object.keys(t).forEach(k => {\n        if (userTheme[k]) {\n          Object.assign(userTheme[k], t[k]);\n        } else {\n          // todo，这里调用次数不多，应该问题不大\n          userTheme[k] = Object.assign({}, t[k]);\n        }\n      });\n    } else {\n      userTheme = t;\n    }\n    if (t.common) {\n      if (!this.commonTheme) {\n        this.commonTheme = t.common;\n      } else {\n        Object.assign(this.commonTheme, t.common);\n      }\n    }\n    this.userTheme = userTheme;\n    // 设置自己和子节点的theme都为dirty\n    this.dirty = true;\n    this.dirtyChildren(g);\n  }\n\n  dirtyChildren(g: IGroup) {\n    g.forEachChildren(item => {\n      if ((item as IGroup).isContainer) {\n        if ((item as IGroup).theme) {\n          (item as IGroup).theme.dirty = true;\n        }\n        this.dirtyChildren(item as IGroup);\n      }\n    });\n  }\n\n  // // 设置theme到子元素，直接设置到currentTheme中去\n  // setThemeToChildrenCurrentTheme(t :IThemeSpec, g: IGroup) {\n  //   g.forEachChildren((item) => {\n  //     if ((item as IGroup).isContainer) {\n  //       const currentTheme = (item as IGroup).theme.currentTheme;\n  //       Object.keys(t).forEach(k => {\n  //         Object.assign(currentTheme[k], t[k]);\n  //       });\n  //       this.setThemeToChildrenCurrentTheme(t, item as IGroup);\n  //     }\n  //   })\n  // }\n}\n\nexport const globalTheme = new Theme();\n\nexport function getTheme(graphic: IGraphic, theme?: IFullThemeSpec): IFullThemeSpec {\n  if (graphic.glyphHost) {\n    return getTheme(graphic.glyphHost);\n  }\n  if (theme) {\n    if (graphic.isContainer) {\n      // 暂时不支持Group\n      return theme;\n    }\n    return theme;\n  }\n\n  return getThemeFromGroup(graphic) || globalTheme.getTheme();\n}\n\nexport function getThemeFromGroup(graphic: IGraphic): IFullThemeSpec | null {\n  let g: IGroup;\n  if (graphic.isContainer) {\n    // 找到存在theme的group\n    g = graphic as IGroup;\n  } else {\n    g = graphic.parent;\n  }\n\n  if (g) {\n    while (g) {\n      if (g.theme) {\n        break;\n      }\n      g = g.parent;\n    }\n    if (!g) {\n      return globalTheme.getTheme();\n    }\n    if (!g.theme) {\n      g.createTheme();\n    }\n    return g.theme.getTheme(g as IGroup);\n  }\n  return null;\n}\n"]}

package/cjs/graphic/tools.d.ts

@@ -3,3 +3,4 @@ import { IAABBBounds } from '@visactor/vutils';
 export declare function incrementalAddTo(group: IGroup, graphic: IGraphic): void;
 export declare function waitForAllSubLayers(stage: IStage): Promise<void>;
 export declare function boundStroke(bounds: IAABBBounds, length: number, miter: boolean, pad?: number): import("@visactor/vutils").IBounds;
+export declare function genNumberType(): number;

package/cjs/graphic/tools.js

@@ -28,9 +28,9 @@ var __awaiter = this && this.__awaiter || function(thisArg, _arguments, P, gener
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.boundStroke = exports.waitForAllSubLayers = exports.incrementalAddTo = void 0;
+}), exports.genNumberType = exports.boundStroke = exports.waitForAllSubLayers = exports.incrementalAddTo = void 0;
 
-const modules_1 = require("../modules");
+const application_1 = require("../application");
 
 function incrementalAddTo(group, graphic) {
     group.incrementalAppendChild(graphic);
@@ -40,7 +40,7 @@ function waitForAllSubLayers(stage) {
     return __awaiter(this, void 0, void 0, (function*() {
         const promiseList = [], layers = stage.getChildren();
         yield new Promise((resolve => {
-            modules_1.global.getRequestAnimationFrame()((() => {
+            application_1.application.global.getRequestAnimationFrame()((() => {
                 resolve(null);
             }));
         })), layers.forEach((l => {
@@ -67,4 +67,12 @@ function miterAdjustment(miter, strokeWidth) {
 
 exports.incrementalAddTo = incrementalAddTo, exports.waitForAllSubLayers = waitForAllSubLayers, 
 exports.boundStroke = boundStroke;
+
+let NUMBER_TYPE = 0;
+
+function genNumberType() {
+    return NUMBER_TYPE++;
+}
+
+exports.genNumberType = genNumberType;
 //# sourceMappingURL=tools.js.map

package/cjs/graphic/tools.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graphic/tools.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAAoC;AAKpC,SAAgB,gBAAgB,CAAC,KAAa,EAAE,OAAiB;IAC/D,KAAK,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;AAIxC,CAAC;AALD,4CAKC;AAED,SAAsB,mBAAmB,CAAC,KAAa;;QACrD,MAAM,WAAW,GAAmB,EAAE,CAAC;QACvC,MAAM,MAAM,GAAG,KAAK,CAAC,WAAW,EAAc,CAAC;QAC/C,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YAC1B,gBAAM,CAAC,wBAAwB,EAAE,CAAC,GAAG,EAAE;gBACrC,OAAO,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACjB,IAAI,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE;gBACpB,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;oBACvB,IAAI,EAAE,CAAC,gBAAgB,IAAI,EAAE,CAAC,gBAAgB,CAAC,KAAK,IAAI,EAAE,CAAC,gBAAgB,CAAC,SAAS,EAAE;wBACrF,WAAW,CAAC,IAAI,CACd,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;4BACpB,EAAE,CAAC,gBAAiB,CAAC,KAAM,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,EAAE;gCAC3D,EAAE,CAAC,gBAAiB,CAAC,KAAM,CAAC,YAAY,CAAC,IAAI,GAAG,EAAE,CAAC,gBAAiB,CAAC,KAAM,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAClG,CAAC,CAAC,EAAE;oCACF,OAAO,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC;gCAC9B,CAAC,CACF,CAAC;gCACF,OAAO,CAAC,IAAI,CAAC,CAAC;4BAChB,CAAC,CAAC,CAAC;wBACL,CAAC,CAAC,CACH,CAAC;qBACH;gBACH,CAAC,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACjC,CAAC;CAAA;AA7BD,kDA6BC;AAED,SAAgB,WAAW,CAAC,MAAmB,EAAE,MAAc,EAAE,KAAc,EAAE,GAAG,GAAG,CAAC;IACtF,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3E,OAAO,MAAM,CAAC;AAChB,CAAC;AAHD,kCAGC;AAED,SAAS,eAAe,CAAC,KAAc,EAAE,WAAmB;IAC1D,OAAO,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;AACjC,CAAC","file":"tools.js","sourcesContent":["import { global } from '../modules';\nimport { IGraphic, IGroup, ILayer, IStage } from '../interface';\nimport { IAABBBounds } from '@visactor/vutils';\n\n// 不触发外部的render\nexport function incrementalAddTo(group: IGroup, graphic: IGraphic) {\n  group.incrementalAppendChild(graphic);\n  // if (group.layer && group.layer.subLayers) {\n  //   // const subLayer = group.layer.subLayers.get(group._uid);\n  // }\n}\n\nexport async function waitForAllSubLayers(stage: IStage) {\n  const promiseList: Promise<any>[] = [];\n  const layers = stage.getChildren() as ILayer[];\n  await new Promise(resolve => {\n    global.getRequestAnimationFrame()(() => {\n      resolve(null);\n    });\n  });\n  layers.forEach(l => {\n    if (l.subLayers.size) {\n      l.subLayers.forEach(sl => {\n        if (sl.drawContribution && sl.drawContribution.hooks && sl.drawContribution.rendering) {\n          promiseList.push(\n            new Promise(resolve => {\n              sl.drawContribution!.hooks!.completeDraw.tap('outWait', () => {\n                sl.drawContribution!.hooks!.completeDraw.taps = sl.drawContribution!.hooks!.completeDraw.taps.filter(\n                  i => {\n                    return i.name !== 'outWait';\n                  }\n                );\n                resolve(null);\n              });\n            })\n          );\n        }\n      });\n    }\n  });\n  await Promise.all(promiseList);\n}\n\nexport function boundStroke(bounds: IAABBBounds, length: number, miter: boolean, pad = 0) {\n  bounds.expand(length + pad + (miter ? miterAdjustment(miter, length) : 0));\n  return bounds;\n}\n\nfunction miterAdjustment(miter: boolean, strokeWidth: number) {\n  return miter ? strokeWidth : 0;\n}\n\n// function attachShadow(graphic: Graphic) {\n//   graphic.shadowRoot = createShadowRoot(graphic);\n//   graphic.addUpdateBoundTag();\n//   return graphic.shadowRoot;\n// }\n\n// function detachShadow(graphic: Graphic) {\n//   if (graphic.shadowRoot) {\n//     graphic.addUpdateBoundTag();\n//     graphic.shadowRoot = null;\n//   }\n// }\n"]}
+{"version":3,"sources":["../../src/graphic/tools.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gDAA6C;AAK7C,SAAgB,gBAAgB,CAAC,KAAa,EAAE,OAAiB;IAC/D,KAAK,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;AAIxC,CAAC;AALD,4CAKC;AAED,SAAsB,mBAAmB,CAAC,KAAa;;QACrD,MAAM,WAAW,GAAmB,EAAE,CAAC;QACvC,MAAM,MAAM,GAAG,KAAK,CAAC,WAAW,EAAc,CAAC;QAC/C,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YAC1B,yBAAW,CAAC,MAAM,CAAC,wBAAwB,EAAE,CAAC,GAAG,EAAE;gBACjD,OAAO,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACjB,IAAI,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE;gBACpB,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;oBACvB,IAAI,EAAE,CAAC,gBAAgB,IAAI,EAAE,CAAC,gBAAgB,CAAC,KAAK,IAAI,EAAE,CAAC,gBAAgB,CAAC,SAAS,EAAE;wBACrF,WAAW,CAAC,IAAI,CACd,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;4BACpB,EAAE,CAAC,gBAAiB,CAAC,KAAM,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,EAAE;gCAC3D,EAAE,CAAC,gBAAiB,CAAC,KAAM,CAAC,YAAY,CAAC,IAAI,GAAG,EAAE,CAAC,gBAAiB,CAAC,KAAM,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAClG,CAAC,CAAC,EAAE;oCACF,OAAO,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC;gCAC9B,CAAC,CACF,CAAC;gCACF,OAAO,CAAC,IAAI,CAAC,CAAC;4BAChB,CAAC,CAAC,CAAC;wBACL,CAAC,CAAC,CACH,CAAC;qBACH;gBACH,CAAC,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACjC,CAAC;CAAA;AA7BD,kDA6BC;AAED,SAAgB,WAAW,CAAC,MAAmB,EAAE,MAAc,EAAE,KAAc,EAAE,GAAG,GAAG,CAAC;IACtF,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3E,OAAO,MAAM,CAAC;AAChB,CAAC;AAHD,kCAGC;AAED,SAAS,eAAe,CAAC,KAAc,EAAE,WAAmB;IAC1D,OAAO,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;AACjC,CAAC;AAeD,IAAI,WAAW,GAAW,CAAC,CAAC;AAC5B,SAAgB,aAAa;IAC3B,OAAO,WAAW,EAAE,CAAC;AACvB,CAAC;AAFD,sCAEC","file":"tools.js","sourcesContent":["import { application } from '../application';\nimport { IGraphic, IGroup, ILayer, IStage } from '../interface';\nimport { IAABBBounds } from '@visactor/vutils';\n\n// 不触发外部的render\nexport function incrementalAddTo(group: IGroup, graphic: IGraphic) {\n  group.incrementalAppendChild(graphic);\n  // if (group.layer && group.layer.subLayers) {\n  //   // const subLayer = group.layer.subLayers.get(group._uid);\n  // }\n}\n\nexport async function waitForAllSubLayers(stage: IStage) {\n  const promiseList: Promise<any>[] = [];\n  const layers = stage.getChildren() as ILayer[];\n  await new Promise(resolve => {\n    application.global.getRequestAnimationFrame()(() => {\n      resolve(null);\n    });\n  });\n  layers.forEach(l => {\n    if (l.subLayers.size) {\n      l.subLayers.forEach(sl => {\n        if (sl.drawContribution && sl.drawContribution.hooks && sl.drawContribution.rendering) {\n          promiseList.push(\n            new Promise(resolve => {\n              sl.drawContribution!.hooks!.completeDraw.tap('outWait', () => {\n                sl.drawContribution!.hooks!.completeDraw.taps = sl.drawContribution!.hooks!.completeDraw.taps.filter(\n                  i => {\n                    return i.name !== 'outWait';\n                  }\n                );\n                resolve(null);\n              });\n            })\n          );\n        }\n      });\n    }\n  });\n  await Promise.all(promiseList);\n}\n\nexport function boundStroke(bounds: IAABBBounds, length: number, miter: boolean, pad = 0) {\n  bounds.expand(length + pad + (miter ? miterAdjustment(miter, length) : 0));\n  return bounds;\n}\n\nfunction miterAdjustment(miter: boolean, strokeWidth: number) {\n  return miter ? strokeWidth : 0;\n}\n\n// function attachShadow(graphic: Graphic) {\n//   graphic.shadowRoot = createShadowRoot(graphic);\n//   graphic.addUpdateBoundTag();\n//   return graphic.shadowRoot;\n// }\n\n// function detachShadow(graphic: Graphic) {\n//   if (graphic.shadowRoot) {\n//     graphic.addUpdateBoundTag();\n//     graphic.shadowRoot = null;\n//   }\n// }\n\nlet NUMBER_TYPE: number = 0;\nexport function genNumberType() {\n  return NUMBER_TYPE++;\n}\n"]}

package/cjs/graphic/wrap-text.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.WrapText = void 0;
 
-const vutils_1 = require("@visactor/vutils"), core_1 = require("../core"), modules_1 = require("../modules"), text_1 = require("./text"), theme_1 = require("./theme"), WRAP_TEXT_UPDATE_TAG_KEY = [ "heightLimit", "lineClamp" ];
+const vutils_1 = require("@visactor/vutils"), layout_1 = require("../core/contributions/textMeasure/layout"), application_1 = require("../application"), text_1 = require("./text"), theme_1 = require("./theme"), WRAP_TEXT_UPDATE_TAG_KEY = [ "heightLimit", "lineClamp" ];
 
 class WrapText extends text_1.Text {
     _isValid() {
@@ -19,7 +19,7 @@ class WrapText extends text_1.Text {
             return this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height), 
             stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;
         }
-        const textMeasure = modules_1.graphicUtil.textMeasure, layoutObj = new core_1.CanvasTextLayout(fontFamily, {
+        const textMeasure = application_1.application.graphicUtil.textMeasure, layoutObj = new layout_1.CanvasTextLayout(fontFamily, {
             fontSize: fontSize
         }, textMeasure), lines = text.map((l => l.toString())), linesLayout = [], bboxWH = [ 0, 0 ];
         let lineCountLimit = 1 / 0;

package/cjs/graphic/wrap-text.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graphic/wrap-text.ts"],"names":[],"mappings":"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","file":"wrap-text.js","sourcesContent":["import { isArray } from '@visactor/vutils';\nimport { CanvasTextLayout, LayoutItemType } from '../core';\nimport { IWrapTextGraphicAttribute } from '../interface';\nimport { graphicUtil } from '../modules';\nimport { Text } from './text';\nimport { getTheme } from './theme';\n\nconst WRAP_TEXT_UPDATE_TAG_KEY = ['heightLimit', 'lineClamp'];\n\n/* WrapText功能\n * 1. 按照宽度限制自动折行或显示省略号(maxLineWidth)\n * 2. 高度限制控制显示内容及省略号(heightLimit)\n * 3. 按照行数限制显示内容及省略号(lineClamp)\n */\nexport class WrapText extends Text {\n  declare attribute: IWrapTextGraphicAttribute;\n\n  protected _isValid(): boolean {\n    const { text } = this.attribute;\n    if (isArray(text)) {\n      return !(text as any[]).every((t: any) => t == null || t === '');\n    }\n    return text != null && text !== '';\n  }\n\n  /**\n   * 计算多行文字的bounds，缓存每行文字的布局位置\n   * 自动折行params.text是数组，因此只重新updateMultilineAABBBounds\n   * @param text\n   */\n  updateMultilineAABBBounds(text: (number | string)[]) {\n    const textTheme = getTheme(this).text;\n    const {\n      fontFamily = textTheme.fontFamily,\n      textAlign = textTheme.textAlign,\n      textBaseline = textTheme.textBaseline,\n      fontSize = textTheme.fontSize,\n      lineHeight = this.attribute.lineHeight || this.attribute.fontSize || textTheme.fontSize,\n      ellipsis = textTheme.ellipsis,\n      maxLineWidth,\n      stroke = textTheme.stroke,\n      lineWidth = textTheme.lineWidth,\n      // widthLimit,\n      heightLimit = 0,\n      lineClamp\n    } = this.attribute;\n    const buf = 2;\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\n    const textMeasure = graphicUtil.textMeasure;\n    const layoutObj = new CanvasTextLayout(fontFamily, { fontSize }, textMeasure as any) as any;\n\n    // layoutObj内逻辑\n    const lines = text.map(l => l.toString()) as string[];\n    const linesLayout: LayoutItemType[] = [];\n    const bboxWH: [number, number] = [0, 0];\n\n    let lineCountLimit = Infinity;\n    if (heightLimit > 0) {\n      lineCountLimit = Math.max(Math.floor(heightLimit / lineHeight), 1);\n    }\n    if (lineClamp) {\n      // 处理行数限制\n      lineCountLimit = Math.min(lineCountLimit, lineClamp);\n    }\n\n    if (typeof maxLineWidth === 'number' && maxLineWidth !== Infinity) {\n      // widthLimit > 0\n      if (maxLineWidth > 0) {\n        for (let i = 0; i < lines.length; i++) {\n          const str = lines[i] as string;\n          // // 测量当前行宽度\n          // width = Math.min(\n          //   layoutObj.textMeasure.measureTextWidth(str, layoutObj.textOptions),\n          //   maxLineWidth\n          // );\n\n          // 判断是否超过高度限制\n          if (i === lineCountLimit - 1) {\n            // 当前行为最后一行\n            const clip = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis);\n            linesLayout.push({\n              str: clip.str,\n              width: clip.width\n            });\n            break; // 不处理后续行\n          }\n\n          // 测量截断位置\n          const clip = layoutObj.textMeasure.clipText(str, layoutObj.textOptions, maxLineWidth);\n          linesLayout.push({\n            str: clip.str,\n            width: clip.width\n          });\n          if (clip.str.length === str.length) {\n            // 不需要截断\n          } else {\n            const newStr = str.substring(clip.str.length);\n            lines.splice(i + 1, 0, newStr);\n          }\n        }\n      }\n      // bboxWH[0] = maxLineWidth;\n      let maxWidth = 0;\n      linesLayout.forEach(layout => {\n        maxWidth = Math.max(maxWidth, layout.width);\n      });\n      bboxWH[0] = maxWidth;\n    } else {\n      // 使用所有行中最长的作为lineWidth\n      let lineWidth = 0;\n      let width: number;\n      let text: string;\n      for (let i = 0, len = lines.length; i < len; i++) {\n        // 判断是否超过高度限制\n        if (i === lineCountLimit - 1) {\n          // 当前行为最后一行\n          const clip = layoutObj.textMeasure.clipTextWithSuffix(\n            lines[i],\n            layoutObj.textOptions,\n            maxLineWidth,\n            ellipsis\n          );\n          linesLayout.push({\n            str: clip.str,\n            width: clip.width\n          });\n          lineWidth = Math.max(lineWidth, clip.width);\n          break; // 不处理后续行\n        }\n\n        text = lines[i] as string;\n        width = layoutObj.textMeasure.measureTextWidth(text, layoutObj.textOptions);\n        lineWidth = Math.max(lineWidth, width);\n        linesLayout.push({ str: text, width });\n      }\n      bboxWH[0] = lineWidth;\n    }\n    bboxWH[1] = linesLayout.length * (lineHeight + buf);\n\n    const bbox = {\n      xOffset: 0,\n      yOffset: 0,\n      width: bboxWH[0],\n      height: bboxWH[1]\n    };\n\n    layoutObj.LayoutBBox(bbox, textAlign, textBaseline as any);\n\n    const layoutData = layoutObj.layoutWithBBox(bbox, linesLayout, textAlign, textBaseline as any, lineHeight);\n\n    // const layoutData = layoutObj.GetLayoutByLines(\n    //   text,\n    //   textAlign,\n    //   textBaseline as any,\n    //   lineHeight,\n    //   ellipsis === true ? (DefaultTextAttribute.ellipsis as string) : ellipsis || undefined,\n    //   maxLineWidth\n    // );\n    // const { bbox } = layoutData;\n    this.cache.layoutData = layoutData;\n    this.clearUpdateShapeTag();\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  needUpdateTags(keys: string[]): boolean {\n    for (let i = 0; i < WRAP_TEXT_UPDATE_TAG_KEY.length; i++) {\n      const attrKey = WRAP_TEXT_UPDATE_TAG_KEY[i];\n      if (keys.indexOf(attrKey) !== -1) {\n        return true;\n      }\n    }\n    return super.needUpdateTags(keys);\n  }\n\n  needUpdateTag(key: string): boolean {\n    for (let i = 0; i < WRAP_TEXT_UPDATE_TAG_KEY.length; i++) {\n      const attrKey = WRAP_TEXT_UPDATE_TAG_KEY[i];\n      if (key === attrKey) {\n        return true;\n      }\n    }\n    return super.needUpdateTag(key);\n  }\n}\n"]}
+{"version":3,"sources":["../../src/graphic/wrap-text.ts"],"names":[],"mappings":"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","file":"wrap-text.js","sourcesContent":["import { isArray } from '@visactor/vutils';\nimport { CanvasTextLayout, LayoutItemType } from '../core/contributions/textMeasure/layout';\nimport { IWrapTextGraphicAttribute } from '../interface';\nimport { application } from '../application';\nimport { Text } from './text';\nimport { getTheme } from './theme';\n\nconst WRAP_TEXT_UPDATE_TAG_KEY = ['heightLimit', 'lineClamp'];\n\n/* WrapText功能\n * 1. 按照宽度限制自动折行或显示省略号(maxLineWidth)\n * 2. 高度限制控制显示内容及省略号(heightLimit)\n * 3. 按照行数限制显示内容及省略号(lineClamp)\n */\nexport class WrapText extends Text {\n  declare attribute: IWrapTextGraphicAttribute;\n\n  protected _isValid(): boolean {\n    const { text } = this.attribute;\n    if (isArray(text)) {\n      return !(text as any[]).every((t: any) => t == null || t === '');\n    }\n    return text != null && text !== '';\n  }\n\n  /**\n   * 计算多行文字的bounds，缓存每行文字的布局位置\n   * 自动折行params.text是数组，因此只重新updateMultilineAABBBounds\n   * @param text\n   */\n  updateMultilineAABBBounds(text: (number | string)[]) {\n    const textTheme = getTheme(this).text;\n    const {\n      fontFamily = textTheme.fontFamily,\n      textAlign = textTheme.textAlign,\n      textBaseline = textTheme.textBaseline,\n      fontSize = textTheme.fontSize,\n      lineHeight = this.attribute.lineHeight || this.attribute.fontSize || textTheme.fontSize,\n      ellipsis = textTheme.ellipsis,\n      maxLineWidth,\n      stroke = textTheme.stroke,\n      lineWidth = textTheme.lineWidth,\n      // widthLimit,\n      heightLimit = 0,\n      lineClamp\n    } = this.attribute;\n    const buf = 2;\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\n    const textMeasure = application.graphicUtil.textMeasure;\n    const layoutObj = new CanvasTextLayout(fontFamily, { fontSize }, textMeasure as any) as any;\n\n    // layoutObj内逻辑\n    const lines = text.map(l => l.toString()) as string[];\n    const linesLayout: LayoutItemType[] = [];\n    const bboxWH: [number, number] = [0, 0];\n\n    let lineCountLimit = Infinity;\n    if (heightLimit > 0) {\n      lineCountLimit = Math.max(Math.floor(heightLimit / lineHeight), 1);\n    }\n    if (lineClamp) {\n      // 处理行数限制\n      lineCountLimit = Math.min(lineCountLimit, lineClamp);\n    }\n\n    if (typeof maxLineWidth === 'number' && maxLineWidth !== Infinity) {\n      // widthLimit > 0\n      if (maxLineWidth > 0) {\n        for (let i = 0; i < lines.length; i++) {\n          const str = lines[i] as string;\n          // // 测量当前行宽度\n          // width = Math.min(\n          //   layoutObj.textMeasure.measureTextWidth(str, layoutObj.textOptions),\n          //   maxLineWidth\n          // );\n\n          // 判断是否超过高度限制\n          if (i === lineCountLimit - 1) {\n            // 当前行为最后一行\n            const clip = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis);\n            linesLayout.push({\n              str: clip.str,\n              width: clip.width\n            });\n            break; // 不处理后续行\n          }\n\n          // 测量截断位置\n          const clip = layoutObj.textMeasure.clipText(str, layoutObj.textOptions, maxLineWidth);\n          linesLayout.push({\n            str: clip.str,\n            width: clip.width\n          });\n          if (clip.str.length === str.length) {\n            // 不需要截断\n          } else {\n            const newStr = str.substring(clip.str.length);\n            lines.splice(i + 1, 0, newStr);\n          }\n        }\n      }\n      // bboxWH[0] = maxLineWidth;\n      let maxWidth = 0;\n      linesLayout.forEach(layout => {\n        maxWidth = Math.max(maxWidth, layout.width);\n      });\n      bboxWH[0] = maxWidth;\n    } else {\n      // 使用所有行中最长的作为lineWidth\n      let lineWidth = 0;\n      let width: number;\n      let text: string;\n      for (let i = 0, len = lines.length; i < len; i++) {\n        // 判断是否超过高度限制\n        if (i === lineCountLimit - 1) {\n          // 当前行为最后一行\n          const clip = layoutObj.textMeasure.clipTextWithSuffix(\n            lines[i],\n            layoutObj.textOptions,\n            maxLineWidth,\n            ellipsis\n          );\n          linesLayout.push({\n            str: clip.str,\n            width: clip.width\n          });\n          lineWidth = Math.max(lineWidth, clip.width);\n          break; // 不处理后续行\n        }\n\n        text = lines[i] as string;\n        width = layoutObj.textMeasure.measureTextWidth(text, layoutObj.textOptions);\n        lineWidth = Math.max(lineWidth, width);\n        linesLayout.push({ str: text, width });\n      }\n      bboxWH[0] = lineWidth;\n    }\n    bboxWH[1] = linesLayout.length * (lineHeight + buf);\n\n    const bbox = {\n      xOffset: 0,\n      yOffset: 0,\n      width: bboxWH[0],\n      height: bboxWH[1]\n    };\n\n    layoutObj.LayoutBBox(bbox, textAlign, textBaseline as any);\n\n    const layoutData = layoutObj.layoutWithBBox(bbox, linesLayout, textAlign, textBaseline as any, lineHeight);\n\n    // const layoutData = layoutObj.GetLayoutByLines(\n    //   text,\n    //   textAlign,\n    //   textBaseline as any,\n    //   lineHeight,\n    //   ellipsis === true ? (DefaultTextAttribute.ellipsis as string) : ellipsis || undefined,\n    //   maxLineWidth\n    // );\n    // const { bbox } = layoutData;\n    this.cache.layoutData = layoutData;\n    this.clearUpdateShapeTag();\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  needUpdateTags(keys: string[]): boolean {\n    for (let i = 0; i < WRAP_TEXT_UPDATE_TAG_KEY.length; i++) {\n      const attrKey = WRAP_TEXT_UPDATE_TAG_KEY[i];\n      if (keys.indexOf(attrKey) !== -1) {\n        return true;\n      }\n    }\n    return super.needUpdateTags(keys);\n  }\n\n  needUpdateTag(key: string): boolean {\n    for (let i = 0; i < WRAP_TEXT_UPDATE_TAG_KEY.length; i++) {\n      const attrKey = WRAP_TEXT_UPDATE_TAG_KEY[i];\n      if (key === attrKey) {\n        return true;\n      }\n    }\n    return super.needUpdateTag(key);\n  }\n}\n"]}

package/cjs/index.d.ts

@@ -1,12 +1,10 @@
 import 'reflect-metadata';
-import { DefaultTicker } from './animate';
 import './modules';
 export * from './core/global';
 export * from './graphic';
 export * from './modules';
 export * from './create';
 export * from './event';
-export * from './common';
 export * from './interface';
 export * from './render';
 export * from './canvas';
@@ -15,4 +13,24 @@ export * from './picker';
 export * from './kits';
 export * from './animate';
 export * from './resource-loader/loader';
-export declare const defaultTicker: DefaultTicker;
+export * from './common/text';
+export * from './common/bezier-utils';
+export * from './common/bounds-context';
+export * from './common/seg-context';
+export * from './common/custom-path2d';
+export * from './common/segment';
+export * from './common/canvas-utils';
+export * from './common/contribution-provider';
+export * from './common/generator';
+export * from './common/utils';
+export * from './common/shape/arc';
+export * from './common/shape/rect';
+export * from './common/path-svg';
+export * from './common/render-curve';
+export * from './common/render-area';
+export * from './common/render-command-list';
+export * from './common/sort';
+export * from './common/morphing-utils';
+export * from './common/split-path';
+export * from './common/enums';
+export * from './animate/default-ticker';

package/cjs/index.js

@@ -17,20 +17,22 @@ var __createBinding = this && this.__createBinding || (Object.create ? function(
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.defaultTicker = void 0, require("reflect-metadata");
-
-const animate_1 = require("./animate");
-
-require("./modules"), __exportStar(require("./core/global"), exports), __exportStar(require("./graphic"), exports), 
-__exportStar(require("./modules"), exports), __exportStar(require("./create"), exports), 
-__exportStar(require("./event"), exports), __exportStar(require("./common"), exports), 
+}), require("reflect-metadata"), require("./modules"), __exportStar(require("./core/global"), exports), 
+__exportStar(require("./graphic"), exports), __exportStar(require("./modules"), exports), 
+__exportStar(require("./create"), exports), __exportStar(require("./event"), exports), 
 __exportStar(require("./interface"), exports), __exportStar(require("./render"), exports), 
 __exportStar(require("./canvas"), exports), __exportStar(require("./core"), exports), 
 __exportStar(require("./picker"), exports), __exportStar(require("./kits"), exports), 
 __exportStar(require("./animate"), exports), __exportStar(require("./resource-loader/loader"), exports), 
-exports.defaultTicker = new animate_1.DefaultTicker, exports.defaultTicker.addTimeline(animate_1.defaultTimeline);
-
-const DEFAULT_TICKER_FPS = 60;
-
-exports.defaultTicker.setFPS(60);
+__exportStar(require("./common/text"), exports), __exportStar(require("./common/bezier-utils"), exports), 
+__exportStar(require("./common/bounds-context"), exports), __exportStar(require("./common/seg-context"), exports), 
+__exportStar(require("./common/custom-path2d"), exports), __exportStar(require("./common/segment"), exports), 
+__exportStar(require("./common/canvas-utils"), exports), __exportStar(require("./common/contribution-provider"), exports), 
+__exportStar(require("./common/generator"), exports), __exportStar(require("./common/utils"), exports), 
+__exportStar(require("./common/shape/arc"), exports), __exportStar(require("./common/shape/rect"), exports), 
+__exportStar(require("./common/path-svg"), exports), __exportStar(require("./common/render-curve"), exports), 
+__exportStar(require("./common/render-area"), exports), __exportStar(require("./common/render-command-list"), exports), 
+__exportStar(require("./common/sort"), exports), __exportStar(require("./common/morphing-utils"), exports), 
+__exportStar(require("./common/split-path"), exports), __exportStar(require("./common/enums"), exports), 
+__exportStar(require("./animate/default-ticker"), exports);
 //# sourceMappingURL=index.js.map