@visactor/vrender-core 0.21.0-alpha.2 → 0.21.0-alpha.3

package/es/common/3d-interceptor.js

@@ -43,4 +43,5 @@ export const draw3dItem = (context, graphic, callback, output) => {
         }));
     } else result = callback(isPie, is3d);
     return result;
-};
+};
+//# sourceMappingURL=3d-interceptor.js.map

package/es/common/bounds-context.js

@@ -49,5 +49,4 @@ export class BoundsContext {
         this.bounds.clear();
     }
     release(...params) {}
-}
-//# sourceMappingURL=bounds-context.js.map
+}

package/es/common/morphing-utils.js

@@ -284,4 +284,4 @@ export function bezierCurversToPath(bezierCurves) {
     }
     return path;
 }
-//# sourceMappingURL=morphing-utils.js.map
+//# sourceMappingURL=morphing-utils.js.map

package/es/common/path-svg.js

@@ -45,14 +45,14 @@ export function parseSvgPath(str) {
         for (let i = 0, len = coordsStrArr.length; i < len; i++) coordStr = coordsStrArr[i], 
         coordNumber = parseFloat(coordStr), Number.isNaN(coordNumber) || currCommandData.push(coordNumber);
         if (standardCommandLen = commandLengths[commandChar], currCommandData.length - 1 > standardCommandLen) {
-            let subCommand;
+            let subCommand, bestCommandChar = commandChar;
             for (let i = 1, len = currCommandData.length; i < len; i += standardCommandLen) {
-                subCommand = [ commandChar ];
+                subCommand = [ bestCommandChar ];
                 for (let j = i, subLen = i + standardCommandLen; j < subLen; j++) subCommand.push(currCommandData[j]);
-                result.push(subCommand);
+                result.push(subCommand), "m" === bestCommandChar ? bestCommandChar = "l" : "M" === bestCommandChar && (bestCommandChar = "L");
             }
         } else result.push(currCommandData);
     } else result.push(currCommandData);
     return result;
 }
-//# sourceMappingURL=path-svg.js.map
+//# sourceMappingURL=path-svg.js.map

package/es/common/path-svg.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/common/path-svg.ts"],"names":[],"mappings":"AAmBA,MAAM,aAAa,GAAG,wDAAwD,CAAC;AAC/E,MAAM,cAAc,GAA2B;IAC7C,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;CACL,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,CAAC,EAAE,CAAC;IACJ,EAAE,EAAE,CAAC;IACL,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;CACL,CAAC;AAGF,IAAI,QAAgB,CAAC;AACrB,IAAI,SAAiB,CAAC;AACtB,IAAI,WAAiB,CAAC;AACtB,IAAI,QAAgB,CAAC;AACrB,IAAI,WAAmB,CAAC;AACxB,IAAI,kBAA0B,CAAC;AAC/B,MAAM,UAAU,YAAY,CAAC,GAAW;IACtC,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,EAAE,CAAC;KACX;IAED,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;IACxD,IAAI,KAAK,KAAK,IAAI,EAAE;QAClB,OAAO,EAAE,CAAC;KACX;IAED,IAAI,eAAoC,CAAC;IACzC,IAAI,YAAqC,CAAC;IAC1C,MAAM,MAAM,GAA0B,EAAE,CAAC;IACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE;QAChD,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACpB,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC9B,WAAW,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC1B,eAAe,GAAG,CAAC,WAAW,CAAC,CAAC;QAEhC,YAAY,GAAG,SAAS,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAC9C,IAAI,YAAY,KAAK,IAAI,EAAE;YACzB,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAC7B,SAAS;SACV;QAGD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE;YACvD,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;YAC3B,WAAW,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;YACnC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;gBAC9B,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aACnC;SACF;QAGD,kBAAkB,GAAG,cAAc,CAAC,WAAW,CAAC,CAAC;QACjD,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,GAAG,kBAAkB,EAAE;YAEnD,IAAI,UAA+B,CAAC;YACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,IAAI,kBAAkB,EAAE;gBAC9E,UAAU,GAAG,CAAC,WAAW,CAAC,CAAC;gBAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,CAAC,GAAG,kBAAkB,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE;oBAChE,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;iBACrC;gBACD,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aACzB;SACF;aAAM;YACL,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;SAC9B;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC","file":"path-svg.js","sourcesContent":["/**\n * 基于fabric.js https://github.com/fabricjs/fabric.js/blob/a709d3be8e5bbdf520ae385ff28bca17a9566d76/src/util/path.js\n * Copyright (c) 2008-2015 Printio (Juriy Zaytsev, Maxim Chernyak)\n\n  Permission is hereby granted, free of charge, to any person obtaining a copy\n  of this software and associated documentation files (the \"Software\"), to deal\n  in the Software without restriction, including without limitation the rights\n  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n  copies of the Software, and to permit persons to whom the Software is\n  furnished to do so, subject to the following conditions:\n\n  THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n  FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL THE\n  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n  SOFTWARE.\n */\nconst rePathCommand = /([-+]?((\\d+\\.\\d+)|((\\d+)|(\\.\\d+)))(?:[eE][-+]?\\d+)?)/gi;\nconst commandLengths: Record<string, number> = {\n  m: 2,\n  l: 2,\n  h: 1,\n  v: 1,\n  c: 6,\n  s: 4,\n  q: 4,\n  t: 2,\n  a: 7,\n  M: 2,\n  L: 2,\n  H: 1,\n  V: 1,\n  C: 6,\n  S: 4,\n  Q: 4,\n  T: 2,\n  A: 7\n};\n\nexport const enumCommandMap = {\n  A: 0,\n  AT: 1,\n  C: 2,\n  Z: 3,\n  E: 4,\n  L: 5,\n  M: 6,\n  Q: 7,\n  R: 8\n};\n\ntype char = string;\nlet currPath: string;\nlet coordsStr: string;\nlet commandChar: char;\nlet coordStr: string;\nlet coordNumber: number;\nlet standardCommandLen: number;\nexport function parseSvgPath(str: string): Array<string | number>[] {\n  if (!str) {\n    return [];\n  }\n  // parse str到命令数组\n  const paths = str.match(/[mzlhvcsqta][^mzlhvcsqta]*/gi);\n  if (paths === null) {\n    return [];\n  }\n\n  let currCommandData: (string | number)[];\n  let coordsStrArr: RegExpMatchArray | null;\n  const result: (string | number)[][] = [];\n  for (let i = 0, len = paths.length; i < len; i++) {\n    currPath = paths[i];\n    coordsStr = currPath.slice(1);\n    commandChar = currPath[0];\n    currCommandData = [commandChar];\n\n    coordsStrArr = coordsStr.match(rePathCommand);\n    if (coordsStrArr === null) {\n      result.push(currCommandData);\n      continue;\n    }\n\n    // 转到number\n    for (let i = 0, len = coordsStrArr.length; i < len; i++) {\n      coordStr = coordsStrArr[i];\n      coordNumber = parseFloat(coordStr);\n      if (!Number.isNaN(coordNumber)) {\n        currCommandData.push(coordNumber);\n      }\n    }\n\n    // 当前命令的参数长度，svg可能会合并多个相同的命令\n    standardCommandLen = commandLengths[commandChar];\n    if (currCommandData.length - 1 > standardCommandLen) {\n      // 如果命令长度超过默认长度，就拆分为多个命令\n      let subCommand: (string | number)[];\n      for (let i = 1, len = currCommandData.length; i < len; i += standardCommandLen) {\n        subCommand = [commandChar];\n        for (let j = i, subLen = i + standardCommandLen; j < subLen; j++) {\n          subCommand.push(currCommandData[j]);\n        }\n        result.push(subCommand);\n      }\n    } else {\n      result.push(currCommandData);\n    }\n  }\n\n  return result;\n}\n"]}
+{"version":3,"sources":["../src/common/path-svg.ts"],"names":[],"mappings":"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","file":"path-svg.js","sourcesContent":["/**\n * 基于fabric.js https://github.com/fabricjs/fabric.js/blob/a709d3be8e5bbdf520ae385ff28bca17a9566d76/src/util/path.js\n * Copyright (c) 2008-2015 Printio (Juriy Zaytsev, Maxim Chernyak)\n\n  Permission is hereby granted, free of charge, to any person obtaining a copy\n  of this software and associated documentation files (the \"Software\"), to deal\n  in the Software without restriction, including without limitation the rights\n  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n  copies of the Software, and to permit persons to whom the Software is\n  furnished to do so, subject to the following conditions:\n\n  THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n  FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL THE\n  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n  SOFTWARE.\n */\nconst rePathCommand = /([-+]?((\\d+\\.\\d+)|((\\d+)|(\\.\\d+)))(?:[eE][-+]?\\d+)?)/gi;\nconst commandLengths: Record<string, number> = {\n  m: 2,\n  l: 2,\n  h: 1,\n  v: 1,\n  c: 6,\n  s: 4,\n  q: 4,\n  t: 2,\n  a: 7,\n  M: 2,\n  L: 2,\n  H: 1,\n  V: 1,\n  C: 6,\n  S: 4,\n  Q: 4,\n  T: 2,\n  A: 7\n};\n\nexport const enumCommandMap = {\n  A: 0,\n  AT: 1,\n  C: 2,\n  Z: 3,\n  E: 4,\n  L: 5,\n  M: 6,\n  Q: 7,\n  R: 8\n};\n\ntype char = string;\nlet currPath: string;\nlet coordsStr: string;\nlet commandChar: char;\nlet coordStr: string;\nlet coordNumber: number;\nlet standardCommandLen: number;\nexport function parseSvgPath(str: string): Array<string | number>[] {\n  if (!str) {\n    return [];\n  }\n  // parse str到命令数组\n  const paths = str.match(/[mzlhvcsqta][^mzlhvcsqta]*/gi);\n  if (paths === null) {\n    return [];\n  }\n\n  let currCommandData: (string | number)[];\n  let coordsStrArr: RegExpMatchArray | null;\n  const result: (string | number)[][] = [];\n  for (let i = 0, len = paths.length; i < len; i++) {\n    currPath = paths[i];\n    coordsStr = currPath.slice(1);\n    commandChar = currPath[0];\n    currCommandData = [commandChar];\n\n    coordsStrArr = coordsStr.match(rePathCommand);\n    if (coordsStrArr === null) {\n      result.push(currCommandData);\n      continue;\n    }\n\n    // 转到number\n    for (let i = 0, len = coordsStrArr.length; i < len; i++) {\n      coordStr = coordsStrArr[i];\n      coordNumber = parseFloat(coordStr);\n      if (!Number.isNaN(coordNumber)) {\n        currCommandData.push(coordNumber);\n      }\n    }\n\n    // 当前命令的参数长度，svg可能会合并多个相同的命令\n    standardCommandLen = commandLengths[commandChar];\n    if (currCommandData.length - 1 > standardCommandLen) {\n      // 如果命令长度超过默认长度，就拆分为多个命令\n      let subCommand: (string | number)[];\n      let bestCommandChar = commandChar;\n      for (let i = 1, len = currCommandData.length; i < len; i += standardCommandLen) {\n        subCommand = [bestCommandChar];\n        for (let j = i, subLen = i + standardCommandLen; j < subLen; j++) {\n          subCommand.push(currCommandData[j]);\n        }\n        result.push(subCommand);\n        // 如果是一堆m命令，后续就转为l命令\n        if (bestCommandChar === 'm') {\n          bestCommandChar = 'l';\n        } else if (bestCommandChar === 'M') {\n          bestCommandChar = 'L';\n        }\n      }\n    } else {\n      result.push(currCommandData);\n    }\n  }\n\n  return result;\n}\n"]}

package/es/common/polygon.js

@@ -36,4 +36,4 @@ function getProportionPoint(point, segment, length, dx, dy) {
         y: point.y - dy * factor
     };
 }
-//# sourceMappingURL=polygon.js.map
+//# sourceMappingURL=polygon.js.map

package/es/common/rect-utils.js

@@ -17,4 +17,4 @@ export const normalizeRectAttributes = attribute => {
         height: height
     };
 };
-//# sourceMappingURL=rect-utils.js.map
+//# sourceMappingURL=rect-utils.js.map

package/es/common/render-area.js

@@ -121,4 +121,4 @@ function drawAreaBlock(path, topList, bottomList, params) {
     }
     path.closePath();
 }
-//# sourceMappingURL=render-area.js.map
+//# sourceMappingURL=render-area.js.map

package/es/common/render-command-list.js

@@ -5,4 +5,5 @@ export function renderCommandList(commandList, context, x = 0, y = 0, sx = 1, sy
         const command = commandList[i];
         commandFuncs[command[0]](command, context, x, y, sx, sy, z);
     }
-}
+}
+//# sourceMappingURL=render-command-list.js.map

package/es/common/render-curve.js

@@ -93,4 +93,4 @@ export function drawIncrementalAreaSegments(path, lastSeg, segments, params) {
         path.closePath();
     }));
 }
-//# sourceMappingURL=render-curve.js.map
+//# sourceMappingURL=render-curve.js.map

package/es/common/render-utils.js

@@ -11,4 +11,4 @@ export function drawSegItem(ctx, curve, endPercent, params) {
         ctx.lineTo(offsetX + p.x, offsetY + p.y, offsetZ);
     }
 }
-//# sourceMappingURL=render-utils.js.map
+//# sourceMappingURL=render-utils.js.map

package/es/common/seg-context.js

@@ -91,4 +91,4 @@ export class ReflectSegContext extends SegContext {
         return super.clear();
     }
 }
-//# sourceMappingURL=seg-context.js.map
+//# sourceMappingURL=seg-context.js.map

package/es/common/simplify.js

@@ -17,7 +17,7 @@ function simplifyDPStep(points, startIdx, endIdx, sqTolerance, simplified) {
     sqDistance = sqArea / sqLength, sqDistance > maxSqDist && (maxSqDist = sqDistance, 
     nextIdx = i);
     maxSqDist > sqTolerance && (nextIdx - startIdx > 2 && simplifyDPStep(points, startIdx, nextIdx, sqTolerance, simplified), 
-    simplified.push(points[nextIdx], points[nextIdx + 1]), endIdx - nextIdx > 2 && simplifyDPStep(points, nextIdx, endIdx, sqTolerance, simplified));
+    simplified.push(points[nextIdx], points[nextIdx + 1]), endIdx - nextIdx > 2 && simplifyDPStep(points, nextIdx + 1, endIdx, sqTolerance, simplified));
 }
 
 function simplifyDouglasPeucker(points, sqTolerance) {
@@ -28,7 +28,6 @@ function simplifyDouglasPeucker(points, sqTolerance) {
 
 export function flatten_simplify(points, tolerance, highestQuality) {
     if (points.length <= 10) return points;
-    const sqTolerance = void 0 !== tolerance ? tolerance * tolerance : 1;
-    return points = simplifyDouglasPeucker(points = highestQuality ? points : simplifyRadialDist(points, sqTolerance), sqTolerance);
+    return points = highestQuality ? points : simplifyRadialDist(points, void 0 !== tolerance ? tolerance * tolerance : 1);
 }
-//# sourceMappingURL=simplify.js.map
+//# sourceMappingURL=simplify.js.map

package/es/common/simplify.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/common/simplify.ts"],"names":[],"mappings":"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","file":"simplify.js","sourcesContent":["/*\n  优化自simplify-js: https://github.com/mourner/simplify-js\n (c) 2017, Vladimir Agafonkin\n Simplify.js, a high-performance JS polyline simplification library\n mourner.github.io/simplify-js\n*/\n\nimport type { IPointLike } from '@visactor/vutils';\n\n// basic distance-based simplification\nfunction simplifyRadialDist(points: IPointLike[], sqTolerance: number): IPointLike[] {\n  let lastX = points[0].x;\n  let lastY = points[0].y;\n  let deltaX;\n  let deltaY;\n  const newPoints: IPointLike[] = [points[0]];\n  for (let i = 1, len = points.length; i < len; i++) {\n    deltaX = points[i].x - lastX;\n    deltaY = points[i].y - lastY;\n    if (deltaX * deltaX + deltaY * deltaY > sqTolerance) {\n      lastX = points[i].x;\n      lastY = points[i].y;\n      newPoints.push(points[i]);\n    }\n  }\n  if (points[points.length - 1].x !== lastX || points[points.length - 1].y !== lastY) {\n    newPoints.push(points[points.length - 1]);\n  }\n  return newPoints;\n}\nfunction simplifyDPStep(\n  points: IPointLike[],\n  startIdx: number,\n  endIdx: number,\n  sqTolerance: number,\n  simplified: IPointLike[]\n) {\n  let maxSqDist = sqTolerance;\n  let nextIdx = startIdx;\n  const startX = points[startIdx].x;\n  const startY = points[startIdx].y;\n  const endX = points[endIdx].x;\n  const endY = points[endIdx].y;\n  const vecX2 = endX - startX;\n  const vecY2 = endY - startY;\n  const sqLength = vecX2 * vecX2 + vecY2 * vecY2;\n  let area;\n  let sqArea;\n  let sqDistance;\n  // 计算距离startIdx到endIdx最长的distance\n  let vecX1;\n  let vecY1;\n  for (let i = startIdx + 1, len = endIdx - 1; i < len; i++) {\n    vecX1 = points[i].x - startX;\n    vecY1 = points[i].y - startY;\n    // axb = x1y2 - x2y1\n    area = vecX1 * vecY2 - vecX2 * vecY1;\n    sqArea = area * area;\n    sqDistance = sqArea / sqLength;\n    if (sqDistance > maxSqDist) {\n      maxSqDist = sqDistance;\n      nextIdx = i;\n    }\n  }\n  if (maxSqDist > sqTolerance) {\n    if (nextIdx - startIdx > 2) {\n      simplifyDPStep(points, startIdx, nextIdx, sqTolerance, simplified);\n    }\n    simplified.push(points[nextIdx], points[nextIdx + 1]);\n    if (endIdx - nextIdx > 2) {\n      simplifyDPStep(points, nextIdx, endIdx, sqTolerance, simplified);\n    }\n  }\n}\n// simplification using Ramer-Douglas-Peucker algorithm\n// https://karthaus.nl/rdp/\nfunction simplifyDouglasPeucker(points: IPointLike[], sqTolerance: number): IPointLike[] {\n  const lastIdx = points.length - 1;\n  const simplified = [points[0]];\n  simplifyDPStep(points, 0, lastIdx, sqTolerance, simplified);\n  simplified.push(points[lastIdx]);\n  return simplified;\n}\n// both algorithms combined for awesome performance\nexport function flatten_simplify(points: IPointLike[], tolerance: number, highestQuality: boolean): IPointLike[] {\n  if (points.length <= 10) {\n    return points;\n  }\n  const sqTolerance = tolerance !== undefined ? tolerance * tolerance : 1;\n  points = highestQuality ? points : simplifyRadialDist(points, sqTolerance);\n  points = simplifyDouglasPeucker(points, sqTolerance);\n  return points;\n}\n"]}
+{"version":3,"sources":["../src/common/simplify.ts"],"names":[],"mappings":"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","file":"simplify.js","sourcesContent":["/*\n  优化自simplify-js: https://github.com/mourner/simplify-js\n (c) 2017, Vladimir Agafonkin\n Simplify.js, a high-performance JS polyline simplification library\n mourner.github.io/simplify-js\n*/\n\nimport type { IPointLike } from '@visactor/vutils';\n\n// basic distance-based simplification\nfunction simplifyRadialDist(points: IPointLike[], sqTolerance: number): IPointLike[] {\n  let lastX = points[0].x;\n  let lastY = points[0].y;\n  let deltaX;\n  let deltaY;\n  const newPoints: IPointLike[] = [points[0]];\n  for (let i = 1, len = points.length; i < len; i++) {\n    deltaX = points[i].x - lastX;\n    deltaY = points[i].y - lastY;\n    if (deltaX * deltaX + deltaY * deltaY > sqTolerance) {\n      lastX = points[i].x;\n      lastY = points[i].y;\n      newPoints.push(points[i]);\n    }\n  }\n  if (points[points.length - 1].x !== lastX || points[points.length - 1].y !== lastY) {\n    newPoints.push(points[points.length - 1]);\n  }\n  return newPoints;\n}\nfunction simplifyDPStep(\n  points: IPointLike[],\n  startIdx: number,\n  endIdx: number,\n  sqTolerance: number,\n  simplified: IPointLike[]\n) {\n  let maxSqDist = sqTolerance;\n  let nextIdx = startIdx;\n  const startX = points[startIdx].x;\n  const startY = points[startIdx].y;\n  const endX = points[endIdx].x;\n  const endY = points[endIdx].y;\n  const vecX2 = endX - startX;\n  const vecY2 = endY - startY;\n  const sqLength = vecX2 * vecX2 + vecY2 * vecY2;\n  let area;\n  let sqArea;\n  let sqDistance;\n  // 计算距离startIdx到endIdx最长的distance\n  let vecX1;\n  let vecY1;\n  for (let i = startIdx + 1, len = endIdx - 1; i < len; i++) {\n    vecX1 = points[i].x - startX;\n    vecY1 = points[i].y - startY;\n    // axb = x1y2 - x2y1\n    area = vecX1 * vecY2 - vecX2 * vecY1;\n    sqArea = area * area;\n    sqDistance = sqArea / sqLength;\n    if (sqDistance > maxSqDist) {\n      maxSqDist = sqDistance;\n      nextIdx = i;\n    }\n  }\n\n  if (maxSqDist > sqTolerance) {\n    if (nextIdx - startIdx > 2) {\n      simplifyDPStep(points, startIdx, nextIdx, sqTolerance, simplified);\n    }\n    simplified.push(points[nextIdx], points[nextIdx + 1]);\n    if (endIdx - nextIdx > 2) {\n      simplifyDPStep(points, nextIdx + 1, endIdx, sqTolerance, simplified);\n    }\n  }\n}\n// simplification using Ramer-Douglas-Peucker algorithm\n// https://karthaus.nl/rdp/\nfunction simplifyDouglasPeucker(points: IPointLike[], sqTolerance: number): IPointLike[] {\n  const lastIdx = points.length - 1;\n  const simplified = [points[0]];\n  simplifyDPStep(points, 0, lastIdx, sqTolerance, simplified);\n  simplified.push(points[lastIdx]);\n  return simplified;\n}\n// both algorithms combined for awesome performance\nexport function flatten_simplify(points: IPointLike[], tolerance: number, highestQuality: boolean): IPointLike[] {\n  if (points.length <= 10) {\n    return points;\n  }\n  const sqTolerance = tolerance !== undefined ? tolerance * tolerance : 1;\n  points = highestQuality ? points : simplifyRadialDist(points, sqTolerance);\n  // 暂时屏蔽 Douglas-Peucker 算法, 因为在极端情况下不会有点被删除, 导致性能问题\n  // points = simplifyDouglasPeucker(points, sqTolerance);\n  return points;\n}\n"]}

package/es/common/sort.js

@@ -94,4 +94,4 @@ export function findNextGraphic(graphic, id, defaultZIndex, reverse = !1) {
     !1)), reverse);
     return result;
 }
-//# sourceMappingURL=sort.js.map
+//# sourceMappingURL=sort.js.map

package/es/common/split-path.js

@@ -248,4 +248,4 @@ export const splitPath = (path, count) => {
     }
     return res;
 };
-//# sourceMappingURL=split-path.js.map
+//# sourceMappingURL=split-path.js.map

package/es/common/store.js

@@ -1,2 +1,2 @@
 class StageStore {}
-//# sourceMappingURL=store.js.map
+//# sourceMappingURL=store.js.map

package/es/common/text.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/common/text.ts"],"names":[],"mappings":"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","file":"text.js","sourcesContent":["// 存放一些公共方法，公共配置\n\nimport { isNil, isString, isValid, lowerCamelCaseToMiddle } from '@visactor/vutils';\nimport type { ITextGraphicAttribute, TextAlignType, TextBaselineType } from '../interface';\n\n// TODO: 更好的方案\n/**\n * 用于绘制的时候偏移\n * 经验值，来源于 https://github.com/vega/vega/blob/b45cf431cd6c0d0c0e1567f087f9b3b55bc236fa/packages/vega-scenegraph/src/util/text.js\n * @param baseline\n * @param h\n * @returns\n */\nexport function textDrawOffsetY(baseline: TextBaselineType, h: number): number {\n  const offset =\n    baseline === 'top'\n      ? Math.ceil(0.79 * h)\n      : baseline === 'middle'\n      ? Math.round(0.3 * h)\n      : baseline === 'bottom'\n      ? Math.round(-0.21 * h)\n      : 0;\n  return offset;\n}\n\n/**\n * 用于绘制的时候偏移\n * @param textAlign\n * @param width\n * @returns\n */\nexport function textDrawOffsetX(textAlign: TextAlignType, width: number): number {\n  if (textAlign === 'end' || textAlign === 'right') {\n    return -width;\n  } else if (textAlign === 'center') {\n    return -width / 2;\n  }\n  return 0;\n}\n\n/**\n * 用于计算布局的偏移\n * 经验值，来源于 https://github.com/vega/vega/blob/b45cf431cd6c0d0c0e1567f087f9b3b55bc236fa/packages/vega-scenegraph/src/util/text.js\n * @param baseline\n * @param lineHeight\n * @returns\n */\nexport function textLayoutOffsetY(\n  baseline: TextBaselineType,\n  lineHeight: number,\n  fontSize: number,\n  buf: number = 0\n): number {\n  if (baseline === 'middle') {\n    return -lineHeight / 2;\n  }\n  if (baseline === 'top') {\n    return 0;\n  }\n  if (baseline === 'bottom') {\n    return buf - lineHeight;\n  }\n  if (!baseline || baseline === 'alphabetic') {\n    if (!fontSize) {\n      fontSize = lineHeight;\n    }\n    return -(lineHeight - fontSize) / 2 - 0.79 * fontSize;\n  }\n  return 0;\n}\n\nexport function textAttributesToStyle(attrs: ITextGraphicAttribute) {\n  const stringTypes = ['textAlign', 'fontFamily', 'fontVariant', 'fontStyle', 'fontWeight'];\n  const pxKeys = ['fontSize', 'lineHeight'];\n  const style: any = {};\n  const parsePxValue = (value: string | number) => {\n    return /^\\d+(\\.\\d+)?$/.test(`${value}`) ? `${value}px` : `${value}`;\n  };\n\n  stringTypes.forEach(key => {\n    if (attrs[key]) {\n      style[lowerCamelCaseToMiddle(key)] = attrs[key];\n    }\n  });\n\n  pxKeys.forEach(key => {\n    const styleKey = lowerCamelCaseToMiddle(key);\n    if (!isNil(attrs[key])) {\n      style[styleKey] = parsePxValue(attrs[key]);\n    }\n  });\n\n  if (isValid(attrs.maxLineWidth)) {\n    style['max-width'] = parsePxValue(attrs.maxLineWidth);\n  }\n\n  if (attrs.underline) {\n    style['text-decoration'] = 'underline';\n  } else if (attrs.lineThrough) {\n    style['text-decoration'] = 'line-through';\n  }\n\n  if (attrs.fill) {\n    if (isString(attrs.fill)) {\n      style.color = attrs.fill;\n    }\n  }\n\n  return style;\n}\n"]}
+{"version":3,"sources":["../src/common/text.ts"],"names":[],"mappings":"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","file":"text.js","sourcesContent":["// 存放一些公共方法，公共配置\n\nimport { isNil, isString, isValid, lowerCamelCaseToMiddle } from '@visactor/vutils';\nimport type { IText, ITextGraphicAttribute, TextAlignType, TextBaselineType } from '../interface';\n\n// TODO: 更好的方案\n/**\n * 用于绘制的时候偏移\n * 经验值，来源于 https://github.com/vega/vega/blob/b45cf431cd6c0d0c0e1567f087f9b3b55bc236fa/packages/vega-scenegraph/src/util/text.js\n * @param baseline\n * @param h\n * @returns\n */\nexport function textDrawOffsetY(baseline: TextBaselineType, h: number): number {\n  const offset =\n    baseline === 'top'\n      ? Math.ceil(0.79 * h)\n      : baseline === 'middle'\n      ? Math.round(0.3 * h)\n      : baseline === 'bottom'\n      ? Math.round(-0.21 * h)\n      : 0;\n  return offset;\n}\n\n/**\n * 用于绘制的时候偏移\n * @param textAlign\n * @param width\n * @returns\n */\nexport function textDrawOffsetX(textAlign: TextAlignType, width: number): number {\n  if (textAlign === 'end' || textAlign === 'right') {\n    return -width;\n  } else if (textAlign === 'center') {\n    return -width / 2;\n  }\n  return 0;\n}\n\n/**\n * 用于计算布局的偏移，相对于xy的偏移\n * 经验值，来源于 https://github.com/vega/vega/blob/b45cf431cd6c0d0c0e1567f087f9b3b55bc236fa/packages/vega-scenegraph/src/util/text.js\n * @param baseline\n * @param lineHeight\n * @returns\n */\nexport function textLayoutOffsetY(\n  baseline: TextBaselineType,\n  lineHeight: number,\n  fontSize: number,\n  buf: number = 0\n): number {\n  if (baseline === 'middle') {\n    return -lineHeight / 2;\n  }\n  if (baseline === 'top') {\n    return 0;\n  }\n  if (baseline === 'bottom') {\n    return buf - lineHeight;\n  }\n  if (!baseline || baseline === 'alphabetic') {\n    if (!fontSize) {\n      fontSize = lineHeight;\n    }\n    return -(lineHeight - fontSize) / 2 - 0.79 * fontSize;\n  }\n  return 0;\n}\n\nexport function textAttributesToStyle(attrs: ITextGraphicAttribute) {\n  const stringTypes = ['textAlign', 'fontFamily', 'fontVariant', 'fontStyle', 'fontWeight'];\n  const pxKeys = ['fontSize', 'lineHeight'];\n  const style: any = {};\n  const parsePxValue = (value: string | number) => {\n    return /^\\d+(\\.\\d+)?$/.test(`${value}`) ? `${value}px` : `${value}`;\n  };\n\n  stringTypes.forEach(key => {\n    if ((attrs as any)[key]) {\n      style[lowerCamelCaseToMiddle(key)] = (attrs as any)[key];\n    }\n  });\n\n  pxKeys.forEach(key => {\n    const styleKey = lowerCamelCaseToMiddle(key);\n    if (!isNil((attrs as any)[key])) {\n      style[styleKey] = parsePxValue((attrs as any)[key]);\n    }\n  });\n\n  if (isValid(attrs.maxLineWidth)) {\n    style['max-width'] = parsePxValue(attrs.maxLineWidth);\n  }\n\n  if (attrs.underline) {\n    style['text-decoration'] = 'underline';\n  } else if (attrs.lineThrough) {\n    style['text-decoration'] = 'line-through';\n  }\n\n  if (attrs.fill) {\n    if (isString(attrs.fill)) {\n      style.color = attrs.fill;\n    }\n  }\n\n  return style;\n}\n"]}

package/es/core/application.js

@@ -1,2 +1 @@
-export const ApplicationContribution = Symbol("ApplicationContribution");
-//# sourceMappingURL=application.js.map
+export const ApplicationContribution = Symbol("ApplicationContribution");

package/es/core/camera.js

@@ -66,4 +66,4 @@ export class OrthoCamera {
 export const registerOrthoCamera = () => {
     Factory.registerPlugin("OrthoCamera", OrthoCamera);
 };
-//# sourceMappingURL=camera.js.map
+//# sourceMappingURL=camera.js.map

package/es/core/constants.js

@@ -9,4 +9,4 @@ export const StaticLayerHandlerContribution = Symbol.for("StaticLayerHandlerCont
 export const DynamicLayerHandlerContribution = Symbol.for("DynamicLayerHandlerContribution");
 
 export const VirtualLayerHandlerContribution = Symbol.for("VirtualLayerHandlerContribution");
-//# sourceMappingURL=constants.js.map
+//# sourceMappingURL=constants.js.map

package/es/core/contributions/textMeasure/AtextMeasure.d.ts

@@ -6,13 +6,64 @@ export declare class ATextMeasure implements ITextMeasure {
     protected canvas?: ICanvas;
     protected context?: IContext2d | null;
     configure(service: IGraphicUtil, env: EnvType): void;
-    measureTextWidth(text: string, options: TextOptionsType): number;
-    estimate(text: string, { fontSize }: TextOptionsType): {
+    protected _measureTextWithoutAlignBaseline(text: string, options: TextOptionsType, compatible?: boolean): {
+        width: number;
+    } | TextMetrics;
+    protected _measureTextWithAlignBaseline(text: string, options: TextOptionsType, compatible?: boolean): {
+        width: number;
+    } | TextMetrics;
+    protected compatibleMetrics(metrics: TextMetrics | {
+        width: number;
+    }, options: TextOptionsType): TextMetrics | {
+        width: number;
+    };
+    protected estimate(text: string, { fontSize }: TextOptionsType): {
         width: number;
         height: number;
     };
-    measureTextPixelHeight(text: string, options: TextOptionsType): number;
-    measureTextBoundHieght(text: string, options: TextOptionsType): number;
+    measureTextWidth(text: string, options: TextOptionsType, textMeasure?: TextMetrics | {
+        width: number;
+    }): number;
+    measureTextBoundsWidth(text: string, options: TextOptionsType, textMeasure?: TextMetrics | {
+        width: number;
+    }): number;
+    measureTextBoundsLeftRight(text: string, options: TextOptionsType, textMeasure?: TextMetrics | {
+        width: number;
+    }): {
+        left: any;
+        right: any;
+    };
+    measureTextPixelHeight(text: string, options: TextOptionsType, textMeasure?: TextMetrics | {
+        width: number;
+    }): number;
+    measureTextPixelADscent(text: string, options: TextOptionsType, textMeasure?: TextMetrics | {
+        width: number;
+    }): {
+        ascent: any;
+        descent: any;
+    };
+    measureTextBoundHieght(text: string, options: TextOptionsType, textMeasure?: TextMetrics | {
+        width: number;
+    }): number;
+    measureTextBoundADscent(text: string, options: TextOptionsType, textMeasure?: TextMetrics | {
+        width: number;
+    }): {
+        ascent: any;
+        descent: any;
+    };
+    protected measureTextBoundADscentEstimate(options: TextOptionsType): {
+        ascent: number;
+        descent: number;
+    };
+    protected measureTextBoundLeftRightEstimate(options: TextOptionsType): {
+        left: number;
+        right: number;
+    };
+    measureTextPixelADscentAndWidth(text: string, options: TextOptionsType): {
+        width: number;
+        ascent: number;
+        descent: number;
+    };
     measureText(text: string, options: TextOptionsType): TextMetrics | {
         width: number;
     };

package/es/core/contributions/textMeasure/AtextMeasure.js

@@ -10,14 +10,33 @@ import { DefaultTextAttribute, DefaultTextStyle } from "../../../graphic/config"
 
 import { testLetter } from "../../../graphic/richtext/utils";
 
+import { Logger } from "@visactor/vutils";
+
 let ATextMeasure = class {
     configure(service, env) {
         this.canvas = service.canvas, this.context = service.context, service.bindTextMeasure(this);
     }
-    measureTextWidth(text, options) {
-        if (!this.context) return this.estimate(text, options).width;
+    _measureTextWithoutAlignBaseline(text, options, compatible) {
         this.context.setTextStyleWithoutAlignBaseline(options);
-        return this.context.measureText(text).width;
+        const metrics = this.context.measureText(text);
+        return compatible ? this.compatibleMetrics(metrics, options) : metrics;
+    }
+    _measureTextWithAlignBaseline(text, options, compatible) {
+        this.context.setTextStyle(options);
+        const metrics = this.context.measureText(text);
+        return compatible ? this.compatibleMetrics(metrics, options) : metrics;
+    }
+    compatibleMetrics(metrics, options) {
+        if (null == metrics.actualBoundingBoxAscent || null == metrics.actualBoundingBoxDescent || null == metrics.fontBoundingBoxAscent || null == metrics.fontBoundingBoxDescent) {
+            const {ascent: ascent, descent: descent} = this.measureTextBoundADscentEstimate(options);
+            metrics.actualBoundingBoxAscent = ascent, metrics.actualBoundingBoxDescent = descent, 
+            metrics.fontBoundingBoxAscent = ascent, metrics.fontBoundingBoxDescent = descent;
+        }
+        if (null == metrics.actualBoundingBoxLeft || null == metrics.actualBoundingBoxRight) {
+            const {left: left, right: right} = this.measureTextBoundLeftRightEstimate(options);
+            metrics.actualBoundingBoxLeft = left, metrics.actualBoundingBoxRight = right;
+        }
+        return metrics;
     }
     estimate(text, {fontSize: fontSize = DefaultTextAttribute.fontSize}) {
         let eCharLen = 0, cCharLen = 0;
@@ -27,19 +46,81 @@ let ATextMeasure = class {
             height: fontSize
         };
     }
-    measureTextPixelHeight(text, options) {
+    measureTextWidth(text, options, textMeasure) {
+        return this.context ? (textMeasure = null != textMeasure ? textMeasure : this._measureTextWithoutAlignBaseline(text, options)).width : this.estimate(text, options).width;
+    }
+    measureTextBoundsWidth(text, options, textMeasure) {
+        return this.context ? (textMeasure = null != textMeasure ? textMeasure : this._measureTextWithoutAlignBaseline(text, options)).width : this.estimate(text, options).width;
+    }
+    measureTextBoundsLeftRight(text, options, textMeasure) {
+        return this.context ? {
+            left: (textMeasure = null != textMeasure ? textMeasure : this._measureTextWithAlignBaseline(text, options, !0)).actualBoundingBoxLeft,
+            right: textMeasure.actualBoundingBoxRight
+        } : this.measureTextBoundLeftRightEstimate(options);
+    }
+    measureTextPixelHeight(text, options, textMeasure) {
         var _a;
-        if (!this.context) return null !== (_a = options.fontSize) && void 0 !== _a ? _a : DefaultTextStyle.fontSize;
-        this.context.setTextStyleWithoutAlignBaseline(options);
-        const textMeasure = this.context.measureText(text);
-        return Math.abs(textMeasure.actualBoundingBoxAscent - textMeasure.actualBoundingBoxDescent);
+        return this.context ? (textMeasure = null != textMeasure ? textMeasure : this._measureTextWithoutAlignBaseline(text, options, !0), 
+        Math.abs(textMeasure.actualBoundingBoxAscent - textMeasure.actualBoundingBoxDescent)) : null !== (_a = options.fontSize) && void 0 !== _a ? _a : DefaultTextStyle.fontSize;
+    }
+    measureTextPixelADscent(text, options, textMeasure) {
+        return this.context ? {
+            ascent: (textMeasure = null != textMeasure ? textMeasure : this._measureTextWithAlignBaseline(text, options, !0)).actualBoundingBoxAscent,
+            descent: textMeasure.actualBoundingBoxDescent
+        } : this.measureTextBoundADscentEstimate(options);
     }
-    measureTextBoundHieght(text, options) {
+    measureTextBoundHieght(text, options, textMeasure) {
         var _a;
-        if (!this.context) return null !== (_a = options.fontSize) && void 0 !== _a ? _a : DefaultTextStyle.fontSize;
-        this.context.setTextStyleWithoutAlignBaseline(options);
-        const textMeasure = this.context.measureText(text);
-        return Math.abs(textMeasure.fontBoundingBoxAscent - textMeasure.fontBoundingBoxDescent);
+        return this.context ? (textMeasure = null != textMeasure ? textMeasure : this._measureTextWithoutAlignBaseline(text, options, !0), 
+        Math.abs(textMeasure.fontBoundingBoxAscent - textMeasure.fontBoundingBoxDescent)) : null !== (_a = options.fontSize) && void 0 !== _a ? _a : DefaultTextStyle.fontSize;
+    }
+    measureTextBoundADscent(text, options, textMeasure) {
+        return this.context ? {
+            ascent: (textMeasure = null != textMeasure ? textMeasure : this._measureTextWithAlignBaseline(text, options, !0)).fontBoundingBoxAscent,
+            descent: textMeasure.fontBoundingBoxDescent
+        } : this.measureTextBoundADscentEstimate(options);
+    }
+    measureTextBoundADscentEstimate(options) {
+        var _a;
+        const fontSize = null !== (_a = options.fontSize) && void 0 !== _a ? _a : DefaultTextStyle.fontSize, {textBaseline: textBaseline} = options;
+        return "bottom" === textBaseline ? {
+            ascent: fontSize,
+            descent: 0
+        } : "middle" === textBaseline ? {
+            ascent: fontSize / 2,
+            descent: fontSize / 2
+        } : "alphabetic" === textBaseline ? {
+            ascent: .79 * fontSize,
+            descent: .21 * fontSize
+        } : {
+            ascent: 0,
+            descent: fontSize
+        };
+    }
+    measureTextBoundLeftRightEstimate(options) {
+        var _a;
+        const fontSize = null !== (_a = options.fontSize) && void 0 !== _a ? _a : DefaultTextStyle.fontSize, {textAlign: textAlign} = options;
+        return "center" === textAlign ? {
+            left: fontSize / 2,
+            right: fontSize / 2
+        } : "right" === textAlign || "end" === textAlign ? {
+            left: fontSize,
+            right: 0
+        } : {
+            left: 0,
+            right: fontSize
+        };
+    }
+    measureTextPixelADscentAndWidth(text, options) {
+        if (!this.context) return Object.assign(Object.assign({}, this.measureTextBoundADscentEstimate(options)), {
+            width: this.estimate(text, options).width
+        });
+        const out = this._measureTextWithoutAlignBaseline(text, options, !0);
+        return {
+            ascent: out.actualBoundingBoxAscent,
+            descent: out.actualBoundingBoxDescent,
+            width: out.width
+        };
     }
     measureText(text, options) {
         return this.context ? (this.context.setTextStyleWithoutAlignBaseline(options), this.context.measureText(text)) : this.estimate(text, options);
@@ -117,6 +198,14 @@ let ATextMeasure = class {
         return data;
     }
     _clipTextEnd(text, options, width, leftIdx, rightIdx) {
+        if (leftIdx === rightIdx) {
+            Logger.getInstance().warn(`【_clipTextEnd】不应该走到这里${text}, ${leftIdx}, ${rightIdx}`);
+            const subText = text.substring(0, rightIdx + 1);
+            return {
+                str: subText,
+                width: this.measureTextWidth(subText, options)
+            };
+        }
         const middleIdx = Math.floor((leftIdx + rightIdx) / 2), subText = text.substring(0, middleIdx + 1), strWidth = this.measureTextWidth(subText, options);
         let length;
         if (strWidth > width) {
@@ -147,25 +236,25 @@ let ATextMeasure = class {
         };
     }
     _clipTextStart(text, options, width, leftIdx, rightIdx) {
-        const middleIdx = Math.ceil((leftIdx + rightIdx) / 2), subText = text.substring(middleIdx - 1, text.length - 1), strWidth = this.measureTextWidth(subText, options);
+        const middleIdx = Math.ceil((leftIdx + rightIdx) / 2), subText = text.substring(middleIdx - 1, text.length), strWidth = this.measureTextWidth(subText, options);
         let length;
         if (strWidth > width) {
             if (subText.length <= 1) return {
                 str: "",
                 width: 0
             };
-            const str = text.substring(middleIdx, text.length - 1);
+            const str = text.substring(middleIdx, text.length);
             return length = this.measureTextWidth(str, options), length <= width ? {
                 str: str,
                 width: length
-            } : this._clipTextStart(text, options, width, middleIdx, text.length - 1);
+            } : this._clipTextStart(text, options, width, middleIdx, text.length);
         }
         if (strWidth < width) {
             if (middleIdx <= 0) return {
                 str: text,
                 width: this.measureTextWidth(text, options)
             };
-            const str = text.substring(middleIdx - 2, text.length - 1);
+            const str = text.substring(middleIdx - 2, text.length);
             return length = this.measureTextWidth(str, options), length >= width ? {
                 str: subText,
                 width: strWidth