@visactor/vrender 0.16.14-alpha.1 → 0.16.14-alpha.3

package/cjs/index.d.ts

@@ -1,3 +1,3 @@
-export declare const version = "0.16.14-alpha.1";
+export declare const version = "0.16.14-alpha.3";
 export * from '@visactor/vrender-core';
 export * from '@visactor/vrender-kits';

package/cjs/index.js

@@ -21,5 +21,5 @@ Object.defineProperty(exports, "__esModule", {
 
 const vrender_core_1 = require("@visactor/vrender-core"), vrender_kits_1 = require("@visactor/vrender-kits");
 
-exports.version = "0.16.14-alpha.1", (0, vrender_kits_1.loadAllModule)(vrender_core_1.container), 
+exports.version = "0.16.14-alpha.3", (0, vrender_kits_1.loadAllModule)(vrender_core_1.container), 
 __exportStar(require("@visactor/vrender-core"), exports), __exportStar(require("@visactor/vrender-kits"), exports);

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,yDAAmD;AACnD,yDAAuD;AAG1C,QAAA,OAAO,GAAG,iBAAiB,CAAC;AAEzC,IAAA,4BAAa,EAAC,wBAAS,CAAC,CAAC;AAEzB,yDAAuC;AACvC,yDAAuC","file":"index.js","sourcesContent":["import { container } from '@visactor/vrender-core';\nimport { loadAllModule } from '@visactor/vrender-kits';\n\n// 导出版本号\nexport const version = \"0.16.14-alpha.1\";\n\nloadAllModule(container);\n\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,yDAAmD;AACnD,yDAAuD;AAG1C,QAAA,OAAO,GAAG,iBAAiB,CAAC;AAEzC,IAAA,4BAAa,EAAC,wBAAS,CAAC,CAAC;AAEzB,yDAAuC;AACvC,yDAAuC","file":"index.js","sourcesContent":["import { container } from '@visactor/vrender-core';\nimport { loadAllModule } from '@visactor/vrender-kits';\n\n// 导出版本号\nexport const version = \"0.16.14-alpha.3\";\n\nloadAllModule(container);\n\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\n"]}

package/dist/index.js

@@ -7178,6 +7178,158 @@
     return containPath(commands, lineWidth, !0, x, y);
   }
 
+  exports.Edge = void 0;
+  !function (Edge) {
+    Edge[Edge.Top = 1] = "Top", Edge[Edge.Right = 2] = "Right", Edge[Edge.Bottom = 4] = "Bottom", Edge[Edge.Left = 8] = "Left", Edge[Edge.ALL = 15] = "ALL";
+  }(exports.Edge || (exports.Edge = {}));
+  var _strokeVec4 = [!1, !1, !1, !1];
+  var parseStroke = function parseStroke(stroke) {
+    var _a;
+    var isFullStroke = !0;
+    if (isBoolean$1(stroke, !0)) {
+      for (var i = 0; i < 4; i++) _strokeVec4[i] = stroke, isFullStroke && (isFullStroke = !(null !== (_a = _strokeVec4[i]) && void 0 !== _a && !_a));
+      isFullStroke = stroke;
+    } else if (Array.isArray(stroke)) for (var _i = 0; _i < 4; _i++) _strokeVec4[_i] = !!stroke[_i], isFullStroke && (isFullStroke = !!_strokeVec4[_i]);else _strokeVec4[0] = !1, _strokeVec4[1] = !1, _strokeVec4[2] = !1, _strokeVec4[3] = !1;
+    return {
+      isFullStroke: isFullStroke,
+      stroke: _strokeVec4
+    };
+  };
+  var _paddingVec4 = [0, 0, 0, 0];
+  var parsePadding = function parsePadding(padding) {
+    return padding ? isArray$1(padding) ? 0 === padding.length ? 0 : 1 === padding.length ? padding[0] : 2 === padding.length ? (_paddingVec4[0] = padding[0], _paddingVec4[2] = padding[0], _paddingVec4[1] = padding[1], _paddingVec4[3] = padding[1], _paddingVec4) : padding : padding : 0;
+  };
+  var _coords = [{
+      x: 0,
+      y: 0
+    }, {
+      x: 0,
+      y: 0
+    }, {
+      x: 0,
+      y: 0
+    }, {
+      x: 0,
+      y: 0
+    }],
+    indexList = [1, 2, 3, 0, 1, 2, 3, 0];
+  function circleBounds(startAngle, endAngle, radius, bounds) {
+    for (; startAngle >= pi2;) startAngle -= pi2;
+    for (; startAngle < 0;) startAngle += pi2;
+    for (; startAngle > endAngle;) endAngle += pi2;
+    _coords[0].x = radius, _coords[1].y = radius, _coords[2].x = -radius, _coords[3].y = -radius;
+    var startIdx = Math.ceil(startAngle / halfPi$1) % 4,
+      endIdx = Math.ceil(endAngle / halfPi$1) % 4;
+    if (bounds.add(cos(startAngle) * radius, sin(startAngle) * radius), bounds.add(cos(endAngle) * radius, sin(endAngle) * radius), startIdx !== endIdx || endAngle - startAngle > pi) {
+      var match = !1;
+      for (var i = 0; i < indexList.length; i++) if (match || startIdx !== indexList[i]) {
+        if (match && endIdx === indexList[i]) break;
+        if (match) {
+          var p = _coords[indexList[i]];
+          bounds.add(p.x, p.y);
+        }
+      } else {
+        match = !0;
+        var _p = _coords[startIdx];
+        bounds.add(_p.x, _p.y);
+      }
+    }
+  }
+  function pointsEqual(pointsA, pointsB) {
+    return !(!pointsA || !pointsB) && (Array.isArray(pointsA) && Array.isArray(pointsB) ? pointsA.length === pointsB.length && pointsA.every(function (point, index) {
+      return pointEqual(point, pointsB[index]);
+    }) : !Number.isNaN(pointsA.x + pointsA.y) && pointEqual(pointsA, pointsB));
+  }
+  function pointEqual(pointA, pointB) {
+    return pointA.x === pointB.x && pointA.y === pointB.y && pointA.x1 === pointB.x1 && pointA.y1 === pointB.y1 && pointA.defined === pointB.defined;
+  }
+  function pointInterpolation(pointA, pointB, ratio) {
+    var _pointAt = pointAt(pointA.x, pointA.y, pointB.x, pointB.y, ratio),
+      x = _pointAt.x,
+      y = _pointAt.y,
+      _pointAt2 = pointAt(pointA.x1, pointA.y1, pointB.x1, pointB.y1, ratio),
+      x1 = _pointAt2.x,
+      y1 = _pointAt2.y,
+      point = new Point(x, y, x1, y1);
+    return point.defined = pointB.defined, point;
+  }
+  function pointInterpolationHighPerformance(pointA, pointB, ratio, point) {
+    var _pointAt3 = pointAt(pointA.x, pointA.y, pointB.x, pointB.y, ratio),
+      x = _pointAt3.x,
+      y = _pointAt3.y,
+      _pointAt4 = pointAt(pointA.x1, pointA.y1, pointB.x1, pointB.y1, ratio),
+      x1 = _pointAt4.x,
+      y1 = _pointAt4.y;
+    return point.x = x, point.y = y, point.x1 = x1, point.y1 = y1, point.defined = pointB.defined, point;
+  }
+  function pointsInterpolation(pointsA, pointsB, ratio) {
+    if (!pointsA || !pointsB) return [];
+    Array.isArray(pointsA) || (pointsA = [pointsA]), Array.isArray(pointsB) || (pointsB = [pointsB]);
+    var points = [];
+    if (pointsA.length > pointsB.length) {
+      points = pointsB.map(function (point) {
+        var p = new Point(point.x, point.y, point.x1, point.y1);
+        return p.defined = point.defined, p;
+      });
+      for (var i = 0; i < pointsB.length; i++) points[i] = pointInterpolation(pointsA[i], pointsB[i], ratio);
+    } else {
+      points = pointsB.map(function (point) {
+        var p = new Point(point.x, point.y, point.x1, point.y1);
+        return p.defined = point.defined, p;
+      });
+      for (var _i2 = 0; _i2 < pointsA.length; _i2++) points[_i2] = pointInterpolation(pointsA[_i2], pointsB[_i2], ratio);
+    }
+    return points;
+  }
+  var transformKeys = ["x", "y", "dx", "dy", "scaleX", "scaleY", "angle", "anchor", "postMatrix", "scrollX", "scrollY"];
+  var isTransformKey = function isTransformKey(key) {
+    return transformKeys.includes(key);
+  };
+  function getAttributeFromDefaultAttrList(attr, key) {
+    if (isArray$1(attr)) {
+      var val;
+      for (var i = 0; i < attr.length && void 0 === val; i++) val = attr[i][key];
+      return val;
+    }
+    return attr[key];
+  }
+  var RafBasedSTO = /*#__PURE__*/function () {
+    function RafBasedSTO() {
+      _classCallCheck(this, RafBasedSTO);
+      this.durations = [], this.timeout = RafBasedSTO.TimeOut, this.lastDate = 0, this.durationsListThreshold = 30;
+    }
+    _createClass(RafBasedSTO, [{
+      key: "call",
+      value: function call(cb) {
+        var _this = this;
+        return this.lastDate = Date.now(), setTimeout(function () {
+          _this.appendDuration(Date.now() - _this.lastDate), cb(0);
+        }, this.timeout, !0);
+      }
+    }, {
+      key: "clear",
+      value: function clear(h) {
+        clearTimeout(h);
+      }
+    }, {
+      key: "appendDuration",
+      value: function appendDuration(d) {
+        this.durations.push(d), this.durations.length > this.durationsListThreshold && this.durations.shift(), this.timeout = Math.min(Math.max(this.durations.reduce(function (a, b) {
+          return a + b;
+        }, 0) / this.durations.length, 1e3 / 60), 1e3 / 30);
+      }
+    }]);
+    return RafBasedSTO;
+  }();
+  RafBasedSTO.TimeOut = 1e3 / 60;
+  var rafBasedSto = new RafBasedSTO();
+  var calculateLineHeight = function calculateLineHeight(lineHeight, fontSize) {
+    if (isString$1(lineHeight) && "%" === lineHeight[lineHeight.length - 1]) {
+      return fontSize * (Number.parseFloat(lineHeight.substring(0, lineHeight.length - 1)) / 100);
+    }
+    return lineHeight;
+  };
+
   var __decorate$1P = undefined && undefined.__decorate || function (decorators, target, key, desc) {
       var d,
         c = arguments.length,
@@ -7254,7 +7406,9 @@
           },
           getTextBounds: void 0,
           specialCharSet: "-/: .,@%'\"~" + TextMeasure.ALPHABET_CHAR_SET + TextMeasure.ALPHABET_CHAR_SET.toUpperCase()
-        }, null != option ? option : {}), textSpec);
+        }, null != option ? option : {}), Object.assign(Object.assign({}, textSpec), {
+          lineHeight: calculateLineHeight(null == textSpec ? void 0 : textSpec.lineHeight, null == textSpec ? void 0 : textSpec.fontSize)
+        }));
       }
     }]);
     return DefaultGraphicUtil;
@@ -8389,13 +8543,12 @@
     }, {
       key: "mapEvent",
       value: function mapEvent(e) {
-        var _this$_prePointTarget;
         var _a, _b, _c, _d, _e, _f, _g;
         if (!this.rootTarget) return;
         var mappers = this.mappingTable[e.type];
         var target;
         var cacheKey = "".concat(e.canvasX, "-").concat(e.canvasY);
-        if ((null === (_a = this._prePointTargetCache) || void 0 === _a ? void 0 : _a[cacheKey]) && (null === (_c = null === (_b = this._prePointTargetCache) || void 0 === _b ? void 0 : _b[cacheKey]) || void 0 === _c ? void 0 : _c.stage) && (null === (_e = null === (_d = this._prePointTargetCache) || void 0 === _d ? void 0 : _d[cacheKey]) || void 0 === _e ? void 0 : _e.stage.renderCount) === (null === (_f = this._prePointTargetCache) || void 0 === _f ? void 0 : _f.stageRenderCount) ? target = this._prePointTargetCache[cacheKey] : (target = this.pickTarget(e.canvasX, e.canvasY, e), e.pickParams || (this._prePointTargetCache = (_this$_prePointTarget = {}, _defineProperty(_this$_prePointTarget, cacheKey, target), _defineProperty(_this$_prePointTarget, "stageRenderCount", null !== (_g = null == target ? void 0 : target.stage.renderCount) && void 0 !== _g ? _g : -1), _this$_prePointTarget))), mappers) for (var i = 0, j = mappers.length; i < j; i++) mappers[i].fn(e, target);else console.warn("[EventManager]: Event mapping not defined for ".concat(e.type));
+        if ((null === (_a = this._prePointTargetCache) || void 0 === _a ? void 0 : _a[cacheKey]) && (null === (_c = null === (_b = this._prePointTargetCache) || void 0 === _b ? void 0 : _b[cacheKey]) || void 0 === _c ? void 0 : _c.stage) && (null === (_e = null === (_d = this._prePointTargetCache) || void 0 === _d ? void 0 : _d[cacheKey]) || void 0 === _e ? void 0 : _e.stage.renderCount) === (null === (_f = this._prePointTargetCache) || void 0 === _f ? void 0 : _f.stageRenderCount) ? target = this._prePointTargetCache[cacheKey] : (target = this.pickTarget(e.canvasX, e.canvasY, e), e.pickParams || (this._prePointTargetCache = _defineProperty(_defineProperty({}, cacheKey, target), "stageRenderCount", null !== (_g = null == target ? void 0 : target.stage.renderCount) && void 0 !== _g ? _g : -1))), mappers) for (var i = 0, j = mappers.length; i < j; i++) mappers[i].fn(e, target);else console.warn("[EventManager]: Event mapping not defined for ".concat(e.type));
       }
     }, {
       key: "propagate",
@@ -9803,158 +9956,6 @@
     easing: "quadInOut"
   };
 
-  exports.Edge = void 0;
-  !function (Edge) {
-    Edge[Edge.Top = 1] = "Top", Edge[Edge.Right = 2] = "Right", Edge[Edge.Bottom = 4] = "Bottom", Edge[Edge.Left = 8] = "Left", Edge[Edge.ALL = 15] = "ALL";
-  }(exports.Edge || (exports.Edge = {}));
-  var _strokeVec4 = [!1, !1, !1, !1];
-  var parseStroke = function parseStroke(stroke) {
-    var _a;
-    var isFullStroke = !0;
-    if (isBoolean$1(stroke, !0)) {
-      for (var i = 0; i < 4; i++) _strokeVec4[i] = stroke, isFullStroke && (isFullStroke = !(null !== (_a = _strokeVec4[i]) && void 0 !== _a && !_a));
-      isFullStroke = stroke;
-    } else if (Array.isArray(stroke)) for (var _i = 0; _i < 4; _i++) _strokeVec4[_i] = !!stroke[_i], isFullStroke && (isFullStroke = !!_strokeVec4[_i]);else _strokeVec4[0] = !1, _strokeVec4[1] = !1, _strokeVec4[2] = !1, _strokeVec4[3] = !1;
-    return {
-      isFullStroke: isFullStroke,
-      stroke: _strokeVec4
-    };
-  };
-  var _paddingVec4 = [0, 0, 0, 0];
-  var parsePadding = function parsePadding(padding) {
-    return padding ? isArray$1(padding) ? 0 === padding.length ? 0 : 1 === padding.length ? padding[0] : 2 === padding.length ? (_paddingVec4[0] = padding[0], _paddingVec4[2] = padding[0], _paddingVec4[1] = padding[1], _paddingVec4[3] = padding[1], _paddingVec4) : padding : padding : 0;
-  };
-  var _coords = [{
-      x: 0,
-      y: 0
-    }, {
-      x: 0,
-      y: 0
-    }, {
-      x: 0,
-      y: 0
-    }, {
-      x: 0,
-      y: 0
-    }],
-    indexList = [1, 2, 3, 0, 1, 2, 3, 0];
-  function circleBounds(startAngle, endAngle, radius, bounds) {
-    for (; startAngle >= pi2;) startAngle -= pi2;
-    for (; startAngle < 0;) startAngle += pi2;
-    for (; startAngle > endAngle;) endAngle += pi2;
-    _coords[0].x = radius, _coords[1].y = radius, _coords[2].x = -radius, _coords[3].y = -radius;
-    var startIdx = Math.ceil(startAngle / halfPi$1) % 4,
-      endIdx = Math.ceil(endAngle / halfPi$1) % 4;
-    if (bounds.add(cos(startAngle) * radius, sin(startAngle) * radius), bounds.add(cos(endAngle) * radius, sin(endAngle) * radius), startIdx !== endIdx || endAngle - startAngle > pi) {
-      var match = !1;
-      for (var i = 0; i < indexList.length; i++) if (match || startIdx !== indexList[i]) {
-        if (match && endIdx === indexList[i]) break;
-        if (match) {
-          var p = _coords[indexList[i]];
-          bounds.add(p.x, p.y);
-        }
-      } else {
-        match = !0;
-        var _p = _coords[startIdx];
-        bounds.add(_p.x, _p.y);
-      }
-    }
-  }
-  function pointsEqual(pointsA, pointsB) {
-    return !(!pointsA || !pointsB) && (Array.isArray(pointsA) && Array.isArray(pointsB) ? pointsA.length === pointsB.length && pointsA.every(function (point, index) {
-      return pointEqual(point, pointsB[index]);
-    }) : !Number.isNaN(pointsA.x + pointsA.y) && pointEqual(pointsA, pointsB));
-  }
-  function pointEqual(pointA, pointB) {
-    return pointA.x === pointB.x && pointA.y === pointB.y && pointA.x1 === pointB.x1 && pointA.y1 === pointB.y1 && pointA.defined === pointB.defined;
-  }
-  function pointInterpolation(pointA, pointB, ratio) {
-    var _pointAt = pointAt(pointA.x, pointA.y, pointB.x, pointB.y, ratio),
-      x = _pointAt.x,
-      y = _pointAt.y,
-      _pointAt2 = pointAt(pointA.x1, pointA.y1, pointB.x1, pointB.y1, ratio),
-      x1 = _pointAt2.x,
-      y1 = _pointAt2.y,
-      point = new Point(x, y, x1, y1);
-    return point.defined = pointB.defined, point;
-  }
-  function pointInterpolationHighPerformance(pointA, pointB, ratio, point) {
-    var _pointAt3 = pointAt(pointA.x, pointA.y, pointB.x, pointB.y, ratio),
-      x = _pointAt3.x,
-      y = _pointAt3.y,
-      _pointAt4 = pointAt(pointA.x1, pointA.y1, pointB.x1, pointB.y1, ratio),
-      x1 = _pointAt4.x,
-      y1 = _pointAt4.y;
-    return point.x = x, point.y = y, point.x1 = x1, point.y1 = y1, point.defined = pointB.defined, point;
-  }
-  function pointsInterpolation(pointsA, pointsB, ratio) {
-    if (!pointsA || !pointsB) return [];
-    Array.isArray(pointsA) || (pointsA = [pointsA]), Array.isArray(pointsB) || (pointsB = [pointsB]);
-    var points = [];
-    if (pointsA.length > pointsB.length) {
-      points = pointsB.map(function (point) {
-        var p = new Point(point.x, point.y, point.x1, point.y1);
-        return p.defined = point.defined, p;
-      });
-      for (var i = 0; i < pointsB.length; i++) points[i] = pointInterpolation(pointsA[i], pointsB[i], ratio);
-    } else {
-      points = pointsB.map(function (point) {
-        var p = new Point(point.x, point.y, point.x1, point.y1);
-        return p.defined = point.defined, p;
-      });
-      for (var _i2 = 0; _i2 < pointsA.length; _i2++) points[_i2] = pointInterpolation(pointsA[_i2], pointsB[_i2], ratio);
-    }
-    return points;
-  }
-  var transformKeys = ["x", "y", "dx", "dy", "scaleX", "scaleY", "angle", "anchor", "postMatrix", "scrollX", "scrollY"];
-  var isTransformKey = function isTransformKey(key) {
-    return transformKeys.includes(key);
-  };
-  function getAttributeFromDefaultAttrList(attr, key) {
-    if (isArray$1(attr)) {
-      var val;
-      for (var i = 0; i < attr.length && void 0 === val; i++) val = attr[i][key];
-      return val;
-    }
-    return attr[key];
-  }
-  var RafBasedSTO = /*#__PURE__*/function () {
-    function RafBasedSTO() {
-      _classCallCheck(this, RafBasedSTO);
-      this.durations = [], this.timeout = RafBasedSTO.TimeOut, this.lastDate = 0, this.durationsListThreshold = 30;
-    }
-    _createClass(RafBasedSTO, [{
-      key: "call",
-      value: function call(cb) {
-        var _this = this;
-        return this.lastDate = Date.now(), setTimeout(function () {
-          _this.appendDuration(Date.now() - _this.lastDate), cb(0);
-        }, this.timeout, !0);
-      }
-    }, {
-      key: "clear",
-      value: function clear(h) {
-        clearTimeout(h);
-      }
-    }, {
-      key: "appendDuration",
-      value: function appendDuration(d) {
-        this.durations.push(d), this.durations.length > this.durationsListThreshold && this.durations.shift(), this.timeout = Math.min(Math.max(this.durations.reduce(function (a, b) {
-          return a + b;
-        }, 0) / this.durations.length, 1e3 / 60), 1e3 / 30);
-      }
-    }]);
-    return RafBasedSTO;
-  }();
-  RafBasedSTO.TimeOut = 1e3 / 60;
-  var rafBasedSto = new RafBasedSTO();
-  var calculateLineHeight = function calculateLineHeight(lineHeight, fontSize) {
-    if (isString$1(lineHeight) && "%" === lineHeight[lineHeight.length - 1]) {
-      return fontSize * (Number.parseFloat(lineHeight.substring(0, lineHeight.length - 1)) / 100);
-    }
-    return lineHeight;
-  };
-
   var IncreaseCount = /*#__PURE__*/function (_ACustomAnimate) {
     _inherits(IncreaseCount, _ACustomAnimate);
     var _super = _createSuper(IncreaseCount);
@@ -12869,8 +12870,7 @@
     }, {
       key: "addChild",
       value: function addChild(node) {
-        var _this$child$push2;
-        "__proto__" === node.tagname && (node.tagname = "#__proto__"), node[":@"] && Object.keys(node[":@"]).length > 0 ? this.child.push((_this$child$push2 = {}, _defineProperty(_this$child$push2, node.tagname, node.child), _defineProperty(_this$child$push2, ":@", node[":@"]), _this$child$push2)) : this.child.push(_defineProperty({}, node.tagname, node.child));
+        "__proto__" === node.tagname && (node.tagname = "#__proto__"), node[":@"] && Object.keys(node[":@"]).length > 0 ? this.child.push(_defineProperty(_defineProperty({}, node.tagname, node.child), ":@", node[":@"])) : this.child.push(_defineProperty({}, node.tagname, node.child));
       }
     }]);
     return XmlNode;
@@ -14568,7 +14568,7 @@
     }, {
       key: "updateWrapAABBBounds",
       value: function updateWrapAABBBounds(text) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         var textTheme = getTheme(this).text,
           _this$attribute = this.attribute,
           _this$attribute$fontF = _this$attribute.fontFamily,
@@ -14579,8 +14579,6 @@
           textBaseline = _this$attribute$textB === void 0 ? textTheme.textBaseline : _this$attribute$textB,
           _this$attribute$fontS = _this$attribute.fontSize,
           fontSize = _this$attribute$fontS === void 0 ? textTheme.fontSize : _this$attribute$fontS,
-          _this$attribute$lineH = _this$attribute.lineHeight,
-          lineHeight = _this$attribute$lineH === void 0 ? calculateLineHeight(this.attribute.lineHeight || this.attribute.fontSize || textTheme.fontSize, this.attribute.fontSize || textTheme.fontSize) : _this$attribute$lineH,
           _this$attribute$ellip = _this$attribute.ellipsis,
           ellipsis = _this$attribute$ellip === void 0 ? textTheme.ellipsis : _this$attribute$ellip,
           maxLineWidth = _this$attribute.maxLineWidth,
@@ -14597,8 +14595,9 @@
           _this$attribute$heigh = _this$attribute.heightLimit,
           heightLimit = _this$attribute$heigh === void 0 ? 0 : _this$attribute$heigh,
           lineClamp = _this$attribute.lineClamp,
+          lineHeight = null !== (_a = calculateLineHeight(this.attribute.lineHeight, this.attribute.fontSize || textTheme.fontSize)) && void 0 !== _a ? _a : this.attribute.fontSize || textTheme.fontSize,
           buf = ignoreBuf ? 0 : 2;
-        if (!this.shouldUpdateShape() && (null === (_a = this.cache) || void 0 === _a ? void 0 : _a.layoutData)) {
+        if (!this.shouldUpdateShape() && (null === (_b = this.cache) || void 0 === _b ? void 0 : _b.layoutData)) {
           var _bbox = this.cache.layoutData.bbox;
           return this._AABBBounds.set(_bbox.xOffset, _bbox.yOffset, _bbox.xOffset + _bbox.width, _bbox.yOffset + _bbox.height), stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;
         }
@@ -14630,7 +14629,7 @@
             if ("" !== str && "" === clip.str) {
               if (ellipsis) {
                 var clipEllipsis = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis, !1);
-                clip.str = null !== (_b = clipEllipsis.str) && void 0 !== _b ? _b : "", clip.width = null !== (_c = clipEllipsis.width) && void 0 !== _c ? _c : 0;
+                clip.str = null !== (_c = clipEllipsis.str) && void 0 !== _c ? _c : "", clip.width = null !== (_d = clipEllipsis.width) && void 0 !== _d ? _d : 0;
               } else clip.str = "", clip.width = 0;
               needCut = !1;
             }
@@ -14728,8 +14727,7 @@
         if ("normal" === whiteSpace) return this.updateWrapAABBBounds(text);
         var buf = ignoreBuf ? 0 : Math.max(2, .075 * fontSize),
           textFontSize = attribute.fontSize || textTheme.fontSize,
-          _attribute$lineHeight = attribute.lineHeight,
-          lineHeight = _attribute$lineHeight === void 0 ? calculateLineHeight(null !== (_a = attribute.lineHeight) && void 0 !== _a ? _a : textFontSize, textFontSize) + buf : _attribute$lineHeight;
+          lineHeight = null !== (_a = calculateLineHeight(attribute.lineHeight, textFontSize)) && void 0 !== _a ? _a : textFontSize + buf;
         if (!this.shouldUpdateShape() && this.cache) {
           width = null !== (_b = this.cache.clipedWidth) && void 0 !== _b ? _b : 0;
           var _dx = textDrawOffsetX(textAlign, width),
@@ -14799,12 +14797,11 @@
           fontFamily = _attribute$fontFamily2 === void 0 ? textTheme.fontFamily : _attribute$fontFamily2,
           _attribute$stroke2 = attribute.stroke,
           stroke = _attribute$stroke2 === void 0 ? textTheme.stroke : _attribute$stroke2,
-          _attribute$lineHeight2 = attribute.lineHeight,
-          lineHeight = _attribute$lineHeight2 === void 0 ? calculateLineHeight(null !== (_a = attribute.lineHeight) && void 0 !== _a ? _a : attribute.fontSize || textTheme.fontSize, attribute.fontSize || textTheme.fontSize) + buf : _attribute$lineHeight2,
           _attribute$lineWidth2 = attribute.lineWidth,
           lineWidth = _attribute$lineWidth2 === void 0 ? textTheme.lineWidth : _attribute$lineWidth2,
           _attribute$verticalMo = attribute.verticalMode,
-          verticalMode = _attribute$verticalMo === void 0 ? textTheme.verticalMode : _attribute$verticalMo;
+          verticalMode = _attribute$verticalMo === void 0 ? textTheme.verticalMode : _attribute$verticalMo,
+          lineHeight = null !== (_a = calculateLineHeight(attribute.lineHeight, attribute.fontSize || textTheme.fontSize)) && void 0 !== _a ? _a : (attribute.fontSize || textTheme.fontSize) + buf;
         var _attribute$textAlign2 = attribute.textAlign,
           textAlign = _attribute$textAlign2 === void 0 ? textTheme.textAlign : _attribute$textAlign2,
           _attribute$textBaseli2 = attribute.textBaseline,
@@ -14854,7 +14851,7 @@
     }, {
       key: "updateHorizontalMultilineAABBBounds",
       value: function updateHorizontalMultilineAABBBounds(text) {
-        var _a;
+        var _a, _b;
         var textTheme = getTheme(this).text,
           attribute = this.attribute,
           _attribute$fontFamily3 = attribute.fontFamily,
@@ -14867,8 +14864,6 @@
           fontSize = _attribute$fontSize3 === void 0 ? textTheme.fontSize : _attribute$fontSize3,
           _attribute$fontWeight3 = attribute.fontWeight,
           fontWeight = _attribute$fontWeight3 === void 0 ? textTheme.fontWeight : _attribute$fontWeight3,
-          _attribute$lineHeight3 = attribute.lineHeight,
-          lineHeight = _attribute$lineHeight3 === void 0 ? calculateLineHeight(attribute.lineHeight || attribute.fontSize || textTheme.fontSize, attribute.fontSize || textTheme.fontSize) : _attribute$lineHeight3,
           _attribute$ellipsis3 = attribute.ellipsis,
           ellipsis = _attribute$ellipsis3 === void 0 ? textTheme.ellipsis : _attribute$ellipsis3,
           maxLineWidth = attribute.maxLineWidth,
@@ -14877,9 +14872,10 @@
           _attribute$lineWidth3 = attribute.lineWidth,
           lineWidth = _attribute$lineWidth3 === void 0 ? textTheme.lineWidth : _attribute$lineWidth3,
           _attribute$whiteSpace2 = attribute.whiteSpace,
-          whiteSpace = _attribute$whiteSpace2 === void 0 ? textTheme.whiteSpace : _attribute$whiteSpace2;
+          whiteSpace = _attribute$whiteSpace2 === void 0 ? textTheme.whiteSpace : _attribute$whiteSpace2,
+          lineHeight = null !== (_a = calculateLineHeight(attribute.lineHeight, attribute.fontSize || textTheme.fontSize)) && void 0 !== _a ? _a : attribute.fontSize || textTheme.fontSize;
         if ("normal" === whiteSpace) return this.updateWrapAABBBounds(text);
-        if (!this.shouldUpdateShape() && (null === (_a = this.cache) || void 0 === _a ? void 0 : _a.layoutData)) {
+        if (!this.shouldUpdateShape() && (null === (_b = this.cache) || void 0 === _b ? void 0 : _b.layoutData)) {
           var _bbox2 = this.cache.layoutData.bbox;
           return this._AABBBounds.set(_bbox2.xOffset, _bbox2.yOffset, _bbox2.xOffset + _bbox2.width, _bbox2.yOffset + _bbox2.height), stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;
         }
@@ -14915,12 +14911,11 @@
           fontWeight = _attribute$fontWeight4 === void 0 ? textTheme.fontWeight : _attribute$fontWeight4,
           _attribute$stroke4 = attribute.stroke,
           stroke = _attribute$stroke4 === void 0 ? textTheme.stroke : _attribute$stroke4,
-          _attribute$lineHeight4 = attribute.lineHeight,
-          lineHeight = _attribute$lineHeight4 === void 0 ? calculateLineHeight(null !== (_a = attribute.lineHeight) && void 0 !== _a ? _a : attribute.fontSize || textTheme.fontSize, attribute.fontSize || textTheme.fontSize) + buf : _attribute$lineHeight4,
           _attribute$lineWidth4 = attribute.lineWidth,
           lineWidth = _attribute$lineWidth4 === void 0 ? textTheme.lineWidth : _attribute$lineWidth4,
           _attribute$verticalMo2 = attribute.verticalMode,
-          verticalMode = _attribute$verticalMo2 === void 0 ? textTheme.verticalMode : _attribute$verticalMo2;
+          verticalMode = _attribute$verticalMo2 === void 0 ? textTheme.verticalMode : _attribute$verticalMo2,
+          lineHeight = null !== (_a = calculateLineHeight(attribute.lineHeight, attribute.fontSize || textTheme.fontSize)) && void 0 !== _a ? _a : (attribute.fontSize || textTheme.fontSize) + buf;
         var _attribute$textAlign4 = attribute.textAlign,
           textAlign = _attribute$textAlign4 === void 0 ? textTheme.textAlign : _attribute$textAlign4,
           _attribute$textBaseli4 = attribute.textBaseline,
@@ -15053,7 +15048,7 @@
     }, {
       key: "updateMultilineAABBBounds",
       value: function updateMultilineAABBBounds(text) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         var textTheme = getTheme(this).text,
           _this$attribute = this.attribute,
           _this$attribute$fontF = _this$attribute.fontFamily,
@@ -15064,8 +15059,6 @@
           textBaseline = _this$attribute$textB === void 0 ? textTheme.textBaseline : _this$attribute$textB,
           _this$attribute$fontS = _this$attribute.fontSize,
           fontSize = _this$attribute$fontS === void 0 ? textTheme.fontSize : _this$attribute$fontS,
-          _this$attribute$lineH = _this$attribute.lineHeight,
-          lineHeight = _this$attribute$lineH === void 0 ? calculateLineHeight(this.attribute.lineHeight || this.attribute.fontSize || textTheme.fontSize, this.attribute.fontSize || textTheme.fontSize) : _this$attribute$lineH,
           _this$attribute$ellip = _this$attribute.ellipsis,
           ellipsis = _this$attribute$ellip === void 0 ? textTheme.ellipsis : _this$attribute$ellip,
           maxLineWidth = _this$attribute.maxLineWidth,
@@ -15082,8 +15075,9 @@
           _this$attribute$heigh = _this$attribute.heightLimit,
           heightLimit = _this$attribute$heigh === void 0 ? 0 : _this$attribute$heigh,
           lineClamp = _this$attribute.lineClamp,
+          lineHeight = null !== (_a = calculateLineHeight(this.attribute.lineHeight, this.attribute.fontSize || textTheme.fontSize)) && void 0 !== _a ? _a : this.attribute.fontSize || textTheme.fontSize,
           buf = ignoreBuf ? 0 : 2;
-        if (!this.shouldUpdateShape() && (null === (_a = this.cache) || void 0 === _a ? void 0 : _a.layoutData)) {
+        if (!this.shouldUpdateShape() && (null === (_b = this.cache) || void 0 === _b ? void 0 : _b.layoutData)) {
           var _bbox = this.cache.layoutData.bbox;
           return this._AABBBounds.set(_bbox.xOffset, _bbox.yOffset, _bbox.xOffset + _bbox.width, _bbox.yOffset + _bbox.height), stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;
         }
@@ -15115,7 +15109,7 @@
             if ("" !== str && "" === clip.str) {
               if (ellipsis) {
                 var clipEllipsis = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis, !1);
-                clip.str = null !== (_b = clipEllipsis.str) && void 0 !== _b ? _b : "", clip.width = null !== (_c = clipEllipsis.width) && void 0 !== _c ? _c : 0;
+                clip.str = null !== (_c = clipEllipsis.str) && void 0 !== _c ? _c : "", clip.width = null !== (_d = clipEllipsis.width) && void 0 !== _d ? _d : 0;
               } else clip.str = "", clip.width = 0;
               needCut = !1;
             }
@@ -20357,7 +20351,7 @@
           var t = textAlign;
           textAlign = null !== (_a = text.getBaselineMapAlign()[textBaseline]) && void 0 !== _a ? _a : "left", textBaseline = null !== (_b = text.getAlignMapBaseline()[t]) && void 0 !== _b ? _b : "top";
         }
-        var lineHeight = null !== (_c = text.attribute.lineHeight) && void 0 !== _c ? _c : fontSize,
+        var lineHeight = null !== (_c = calculateLineHeight(text.attribute.lineHeight, fontSize)) && void 0 !== _c ? _c : fontSize,
           data = this.valid(text, textAttribute, fillCb, strokeCb);
         if (!data) return;
         var fVisible = data.fVisible,
@@ -34633,7 +34627,7 @@
 
   var roughModule = _roughModule;
 
-  const version = "0.16.14-alpha.1";
+  const version = "0.16.14-alpha.3";
   loadAllModule(container);
 
   exports.ACustomAnimate = ACustomAnimate;