@visactor/vrender 0.16.14-alpha.5 → 0.16.14-alpha.6

package/cjs/index.d.ts

@@ -1,3 +1,3 @@
-export declare const version = "0.16.14-alpha.5";
+export declare const version = "0.16.14-alpha.6";
 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.5", (0, vrender_kits_1.loadAllModule)(vrender_core_1.container), 
+exports.version = "0.16.14-alpha.6", (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.5\";\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.6\";\n\nloadAllModule(container);\n\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\n"]}

package/dist/index.js

@@ -4591,13 +4591,9 @@
           _this$_userSpec$textB = _this$_userSpec.textBaseline,
           textBaseline = _this$_userSpec$textB === void 0 ? null != baseline ? baseline : "middle" : _this$_userSpec$textB,
           ellipsis = _this$_userSpec.ellipsis,
-          limit = _this$_userSpec.limit;
-        var _this$_userSpec$lineH = this._userSpec.lineHeight,
+          limit = _this$_userSpec.limit,
+          _this$_userSpec$lineH = _this$_userSpec.lineHeight,
           lineHeight = _this$_userSpec$lineH === void 0 ? fontSize : _this$_userSpec$lineH;
-        if (isString$1(lineHeight) && "%" === lineHeight[lineHeight.length - 1]) {
-          var scale = Number.parseFloat(lineHeight.substring(0, lineHeight.length - 1)) / 100;
-          lineHeight = fontSize * scale;
-        }
         return {
           fontStyle: fontStyle,
           fontVariant: fontVariant,
@@ -4673,7 +4669,6 @@
     }, {
       key: "_measureWithNaiveCanvas",
       value: function _measureWithNaiveCanvas(text) {
-        var _a;
         if (!this.initContext()) return this._quickMeasureWithoutCanvas(text);
         var metrics = this._context.measureText(text),
           _this$textSpec2 = this.textSpec,
@@ -4681,7 +4676,7 @@
           lineHeight = _this$textSpec2.lineHeight;
         return {
           width: metrics.width,
-          height: null !== (_a = lineHeight) && void 0 !== _a ? _a : fontSize
+          height: null != lineHeight ? lineHeight : fontSize
         };
       }
     }, {
@@ -4711,7 +4706,6 @@
     }, {
       key: "_quickMeasureWithoutCanvas",
       value: function _quickMeasureWithoutCanvas(text) {
-        var _a;
         var totalSize = {
             width: 0,
             height: 0
@@ -4724,12 +4718,11 @@
             size = ["F", "W"].includes(eastAsianCharacterInfo(_char2)) ? 1 : .53;
           totalSize.width += size * fontSize;
         }
-        return totalSize.height = null !== (_a = lineHeight) && void 0 !== _a ? _a : fontSize, totalSize;
+        return totalSize.height = null != lineHeight ? lineHeight : fontSize, totalSize;
       }
     }, {
       key: "_measureReduce",
       value: function _measureReduce(text, processor) {
-        var _a;
         var _this$textSpec4 = this.textSpec,
           fontSize = _this$textSpec4.fontSize,
           lineHeight = _this$textSpec4.lineHeight,
@@ -4746,7 +4739,7 @@
             width: textArr.reduce(function (maxWidth, cur) {
               return Math.max(maxWidth, processor(cur).width);
             }, 0),
-            height: textArr.length * ((null !== (_a = lineHeight) && void 0 !== _a ? _a : fontSize) + 1) + 1
+            height: textArr.length * ((null != lineHeight ? lineHeight : fontSize) + 1) + 1
           };
         }
         return processor(text.toString());
@@ -6292,10 +6285,7 @@
     direction: "horizontal",
     wordBreak: "break-all",
     ignoreBuf: !1,
-    verticalMode: 0,
-    whiteSpace: "no-wrap",
-    heightLimit: 1 / 0,
-    lineClamp: 1 / 0
+    verticalMode: 0
   };
   var DefaultStyle = Object.assign(Object.assign(Object.assign({
     opacity: 1,
@@ -9954,12 +9944,6 @@
   }();
   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);
@@ -14496,7 +14480,7 @@
     return CanvasTextLayout;
   }();
 
-  var TEXT_UPDATE_TAG_KEY = ["text", "maxLineWidth", "heightLimit", "lineClamp", "fontSize", "fontFamily", "fontWeight", "ellipsis", "lineHeight", "direction", "wordBreak"].concat(_toConsumableArray(GRAPHIC_UPDATE_TAG_KEY));
+  var TEXT_UPDATE_TAG_KEY = ["text", "maxLineWidth", "fontSize", "fontFamily", "fontWeight", "ellipsis", "lineHeight", "direction", "wordBreak"].concat(_toConsumableArray(GRAPHIC_UPDATE_TAG_KEY));
   var Text = /*#__PURE__*/function (_Graphic) {
     _inherits(Text, _Graphic);
     var _super = _createSuper(Text);
@@ -14570,117 +14554,6 @@
           paddingArray = parsePadding(boundsPadding);
         return paddingArray && bounds.expand(paddingArray), this.clearUpdateBoundTag(), bounds;
       }
-    }, {
-      key: "updateWrapAABBBounds",
-      value: function updateWrapAABBBounds(text) {
-        var _a, _b, _c, _d;
-        var textTheme = getTheme(this).text,
-          _this$attribute = this.attribute,
-          _this$attribute$fontF = _this$attribute.fontFamily,
-          fontFamily = _this$attribute$fontF === void 0 ? textTheme.fontFamily : _this$attribute$fontF,
-          _this$attribute$textA = _this$attribute.textAlign,
-          textAlign = _this$attribute$textA === void 0 ? textTheme.textAlign : _this$attribute$textA,
-          _this$attribute$textB = _this$attribute.textBaseline,
-          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$ellip = _this$attribute.ellipsis,
-          ellipsis = _this$attribute$ellip === void 0 ? textTheme.ellipsis : _this$attribute$ellip,
-          maxLineWidth = _this$attribute.maxLineWidth,
-          _this$attribute$strok = _this$attribute.stroke,
-          stroke = _this$attribute$strok === void 0 ? textTheme.stroke : _this$attribute$strok,
-          _this$attribute$lineW = _this$attribute.lineWidth,
-          lineWidth = _this$attribute$lineW === void 0 ? textTheme.lineWidth : _this$attribute$lineW,
-          _this$attribute$wordB = _this$attribute.wordBreak,
-          wordBreak = _this$attribute$wordB === void 0 ? textTheme.wordBreak : _this$attribute$wordB,
-          _this$attribute$fontW = _this$attribute.fontWeight,
-          fontWeight = _this$attribute$fontW === void 0 ? textTheme.fontWeight : _this$attribute$fontW,
-          _this$attribute$ignor = _this$attribute.ignoreBuf,
-          ignoreBuf = _this$attribute$ignor === void 0 ? textTheme.ignoreBuf : _this$attribute$ignor,
-          _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 === (_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;
-        }
-        var textMeasure = application.graphicUtil.textMeasure,
-          layoutObj = new CanvasTextLayout(fontFamily, {
-            fontSize: fontSize,
-            fontWeight: fontWeight,
-            fontFamily: fontFamily
-          }, textMeasure),
-          lines = isArray$1(text) ? text.map(function (l) {
-            return l.toString();
-          }) : [text.toString()],
-          linesLayout = [],
-          bboxWH = [0, 0];
-        var lineCountLimit = 1 / 0;
-        if (heightLimit > 0 && (lineCountLimit = Math.max(Math.floor(heightLimit / lineHeight), 1)), lineClamp && (lineCountLimit = Math.min(lineCountLimit, lineClamp)), "number" == typeof maxLineWidth && maxLineWidth !== 1 / 0) {
-          if (maxLineWidth > 0) for (var i = 0; i < lines.length; i++) {
-            var str = lines[i];
-            var needCut = !0;
-            if (i === lineCountLimit - 1) {
-              var _clip = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis, !1);
-              linesLayout.push({
-                str: _clip.str,
-                width: _clip.width
-              });
-              break;
-            }
-            var clip = layoutObj.textMeasure.clipText(str, layoutObj.textOptions, maxLineWidth, "break-word" === wordBreak);
-            if ("" !== str && "" === clip.str) {
-              if (ellipsis) {
-                var clipEllipsis = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis, !1);
-                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;
-            }
-            if (linesLayout.push({
-              str: clip.str,
-              width: clip.width
-            }), clip.str.length === str.length) ;else if (needCut) {
-              var newStr = str.substring(clip.str.length);
-              lines.splice(i + 1, 0, newStr);
-            }
-          }
-          var maxWidth = 0;
-          linesLayout.forEach(function (layout) {
-            maxWidth = Math.max(maxWidth, layout.width);
-          }), bboxWH[0] = maxWidth;
-        } else {
-          var width,
-            _text,
-            _lineWidth = 0;
-          for (var _i = 0, len = lines.length; _i < len; _i++) {
-            if (_i === lineCountLimit - 1) {
-              var _clip2 = layoutObj.textMeasure.clipTextWithSuffix(lines[_i], layoutObj.textOptions, maxLineWidth, ellipsis, !1);
-              linesLayout.push({
-                str: _clip2.str,
-                width: _clip2.width
-              }), _lineWidth = Math.max(_lineWidth, _clip2.width);
-              break;
-            }
-            _text = lines[_i], width = layoutObj.textMeasure.measureTextWidth(_text, layoutObj.textOptions, "break-word" === wordBreak), _lineWidth = Math.max(_lineWidth, width), linesLayout.push({
-              str: _text,
-              width: width
-            });
-          }
-          bboxWH[0] = _lineWidth;
-        }
-        bboxWH[1] = linesLayout.length * (lineHeight + buf);
-        var bbox = {
-          xOffset: 0,
-          yOffset: 0,
-          width: bboxWH[0],
-          height: bboxWH[1]
-        };
-        layoutObj.LayoutBBox(bbox, textAlign, textBaseline);
-        var layoutData = layoutObj.layoutWithBBox(bbox, linesLayout, textAlign, textBaseline, lineHeight);
-        return this.cache.layoutData = layoutData, this.clearUpdateShapeTag(), this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height), stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;
-      }
     }, {
       key: "updateSingallineAABBBounds",
       value: function updateSingallineAABBBounds(text) {
@@ -14727,12 +14600,9 @@
           _attribute$wordBreak === void 0 ? textTheme.wordBreak : _attribute$wordBreak;
           var _attribute$ignoreBuf = attribute.ignoreBuf,
           ignoreBuf = _attribute$ignoreBuf === void 0 ? textTheme.ignoreBuf : _attribute$ignoreBuf,
-          _attribute$whiteSpace = attribute.whiteSpace,
-          whiteSpace = _attribute$whiteSpace === void 0 ? textTheme.whiteSpace : _attribute$whiteSpace;
-        if ("normal" === whiteSpace) return this.updateWrapAABBBounds(text);
-        var buf = ignoreBuf ? 0 : Math.max(2, .075 * fontSize),
-          textFontSize = attribute.fontSize || textTheme.fontSize,
-          lineHeight = null !== (_a = calculateLineHeight(attribute.lineHeight, textFontSize)) && void 0 !== _a ? _a : textFontSize + buf;
+          buf = ignoreBuf ? 0 : Math.max(2, .075 * fontSize),
+          _attribute$lineHeight = attribute.lineHeight,
+          lineHeight = _attribute$lineHeight === void 0 ? null !== (_a = attribute.lineHeight) && void 0 !== _a ? _a : (attribute.fontSize || textTheme.fontSize) + buf : _attribute$lineHeight;
         if (!this.shouldUpdateShape() && this.cache) {
           width = null !== (_b = this.cache.clipedWidth) && void 0 !== _b ? _b : 0;
           var _dx = textDrawOffsetX(textAlign, width),
@@ -14802,11 +14672,12 @@
           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 ? null !== (_a = attribute.lineHeight) && void 0 !== _a ? _a : (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,
-          lineHeight = null !== (_a = calculateLineHeight(attribute.lineHeight, attribute.fontSize || textTheme.fontSize)) && void 0 !== _a ? _a : (attribute.fontSize || textTheme.fontSize) + buf;
+          verticalMode = _attribute$verticalMo === void 0 ? textTheme.verticalMode : _attribute$verticalMo;
         var _attribute$textAlign2 = attribute.textAlign,
           textAlign = _attribute$textAlign2 === void 0 ? textTheme.textAlign : _attribute$textAlign2,
           _attribute$textBaseli2 = attribute.textBaseline,
@@ -14856,7 +14727,7 @@
     }, {
       key: "updateHorizontalMultilineAABBBounds",
       value: function updateHorizontalMultilineAABBBounds(text) {
-        var _a, _b;
+        var _a;
         var textTheme = getTheme(this).text,
           attribute = this.attribute,
           _attribute$fontFamily3 = attribute.fontFamily,
@@ -14869,6 +14740,8 @@
           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 ? attribute.lineHeight || attribute.fontSize || textTheme.fontSize : _attribute$lineHeight3,
           _attribute$ellipsis3 = attribute.ellipsis,
           ellipsis = _attribute$ellipsis3 === void 0 ? textTheme.ellipsis : _attribute$ellipsis3,
           maxLineWidth = attribute.maxLineWidth,
@@ -14876,13 +14749,11 @@
           stroke = _attribute$stroke3 === void 0 ? textTheme.stroke : _attribute$stroke3,
           _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,
-          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 === (_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;
+          _attribute$wordBreak2 = attribute.wordBreak;
+          _attribute$wordBreak2 === void 0 ? textTheme.wordBreak : _attribute$wordBreak2;
+        if (!this.shouldUpdateShape() && (null === (_a = this.cache) || void 0 === _a ? void 0 : _a.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;
         }
         var textMeasure = application.graphicUtil.textMeasure,
           layoutData = new CanvasTextLayout(fontFamily, {
@@ -14916,11 +14787,12 @@
           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 ? null !== (_a = attribute.lineHeight) && void 0 !== _a ? _a : (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,
-          lineHeight = null !== (_a = calculateLineHeight(attribute.lineHeight, attribute.fontSize || textTheme.fontSize)) && void 0 !== _a ? _a : (attribute.fontSize || textTheme.fontSize) + buf;
+          verticalMode = _attribute$verticalMo2 === void 0 ? textTheme.verticalMode : _attribute$verticalMo2;
         var _attribute$textAlign4 = attribute.textAlign,
           textAlign = _attribute$textAlign4 === void 0 ? textTheme.textAlign : _attribute$textAlign4,
           _attribute$textBaseli4 = attribute.textBaseline,
@@ -15053,7 +14925,7 @@
     }, {
       key: "updateMultilineAABBBounds",
       value: function updateMultilineAABBBounds(text) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         var textTheme = getTheme(this).text,
           _this$attribute = this.attribute,
           _this$attribute$fontF = _this$attribute.fontFamily,
@@ -15064,6 +14936,8 @@
           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 ? this.attribute.lineHeight || 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,
@@ -15080,9 +14954,8 @@
           _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 === (_b = this.cache) || void 0 === _b ? void 0 : _b.layoutData)) {
+        if (!this.shouldUpdateShape() && (null === (_a = this.cache) || void 0 === _a ? void 0 : _a.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;
         }
@@ -15114,7 +14987,7 @@
             if ("" !== str && "" === clip.str) {
               if (ellipsis) {
                 var clipEllipsis = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis, !1);
-                clip.str = null !== (_c = clipEllipsis.str) && void 0 !== _c ? _c : "", clip.width = null !== (_d = clipEllipsis.width) && void 0 !== _d ? _d : 0;
+                clip.str = null !== (_b = clipEllipsis.str) && void 0 !== _b ? _b : "", clip.width = null !== (_c = clipEllipsis.width) && void 0 !== _c ? _c : 0;
               } else clip.str = "", clip.width = 0;
               needCut = !1;
             }
@@ -16627,9 +16500,7 @@
   var Paragraph = /*#__PURE__*/function () {
     function Paragraph(text, newLine, character) {
       _classCallCheck(this, Paragraph);
-      this.fontSize = character.fontSize || 16, this.textBaseline = character.textBaseline || "alphabetic";
-      var lineHeight = calculateLineHeight(character.lineHeight, this.fontSize);
-      this.lineHeight = "number" == typeof lineHeight ? lineHeight > this.fontSize ? lineHeight : this.fontSize : Math.floor(1.2 * this.fontSize), this.height = this.lineHeight;
+      this.fontSize = character.fontSize || 16, this.textBaseline = character.textBaseline || "alphabetic", "number" == typeof character.lineHeight ? this.lineHeight = character.lineHeight > this.fontSize ? character.lineHeight : this.fontSize : this.lineHeight = Math.floor(1.2 * this.fontSize), this.height = this.lineHeight;
       var _measureTextCanvas = measureTextCanvas(text, character),
         ascent = _measureTextCanvas.ascent,
         height = _measureTextCanvas.height,
@@ -20358,7 +20229,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 = calculateLineHeight(text.attribute.lineHeight, fontSize)) && void 0 !== _c ? _c : fontSize,
+        var lineHeight = null !== (_c = text.attribute.lineHeight) && void 0 !== _c ? _c : fontSize,
           data = this.valid(text, textAttribute, fillCb, strokeCb);
         if (!data) return;
         var fVisible = data.fVisible,
@@ -24969,11 +24840,6 @@
       get: function get() {
         return this.at(0);
       }
-    }, {
-      key: "preventRender",
-      value: function preventRender(prevent) {
-        prevent ? this._skipRender = -1 / 0 : this.params && this.params.optimize && !1 !== this.params.optimize.skipRenderWithOutRange ? this._skipRender = this.window.isVisible() ? 0 : 1 : this._skipRender = 0;
-      }
     }, {
       key: "optmize",
       value: function optmize(params) {
@@ -24984,8 +24850,8 @@
       value: function optmizeRender() {
         var _this2 = this;
         var skipRenderWithOutRange = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : !0;
-        skipRenderWithOutRange && (this._skipRender = this._skipRender < 0 ? this._skipRender : this.window.isVisible() ? 0 : 1, this.window.onVisibleChange(function (visible) {
-          _this2._skipRender < 0 || (visible ? (_this2.dirtyBounds && _this2.dirtyBounds.setValue(0, 0, _this2._viewBox.width(), _this2._viewBox.height()), _this2._skipRender > 1 && _this2.renderNextFrame(), _this2._skipRender = 0) : _this2._skipRender = 1);
+        skipRenderWithOutRange && (this._skipRender = this.window.isVisible() ? 0 : 1, this.window.onVisibleChange(function (visible) {
+          visible ? (_this2.dirtyBounds && _this2.dirtyBounds.setValue(0, 0, _this2._viewBox.width(), _this2._viewBox.height()), _this2._skipRender > 1 && _this2.renderNextFrame(), _this2._skipRender = 0) : _this2._skipRender = 1;
         }));
       }
     }, {
@@ -33461,13 +33327,6 @@
           _context.globalAlpha = strokeOpacity * opacity, _context.lineWidth = getScaledStroke(this, lineWidth, this.dpr), _context.strokeStyle = createColor(this, stroke, params, offsetX, offsetY), _context.lineJoin = lineJoin, 0 === lineDash[0] && 0 === lineDash[1] || _context.setLineDash(lineDash), _context.lineCap = lineCap, _context.miterLimit = miterLimit;
         }
       }
-    }, {
-      key: "measureText",
-      value: function measureText(text) {
-        var method = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : application.global.measureTextMethod;
-        this.setTransform(1, 0, 0, 1, 0, 0, !0, application.global.devicePixelRatio);
-        return _get(_getPrototypeOf(LynxContext2d.prototype), "measureText", this).call(this, text, method);
-      }
     }, {
       key: "createPattern",
       value: function createPattern(image, repetition) {
@@ -34634,7 +34493,7 @@
 
   var roughModule = _roughModule;
 
-  const version = "0.16.14-alpha.5";
+  const version = "0.16.14-alpha.6";
   loadAllModule(container);
 
   exports.ACustomAnimate = ACustomAnimate;
@@ -34867,7 +34726,6 @@
   exports.builtinSymbols = builtinSymbols;
   exports.builtinSymbolsMap = builtinSymbolsMap;
   exports.calcLineCache = calcLineCache$1;
-  exports.calculateLineHeight = calculateLineHeight;
   exports.centroidOfSubpath = centroidOfSubpath;
   exports.circleBounds = circleBounds;
   exports.clock = clock;