@visactor/vrender 0.16.12 → 0.16.14-alpha.1

package/cjs/index.d.ts

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

package/dist/index.js

@@ -6285,7 +6285,10 @@
     direction: "horizontal",
     wordBreak: "break-all",
     ignoreBuf: !1,
-    verticalMode: 0
+    verticalMode: 0,
+    whiteSpace: "no-wrap",
+    heightLimit: 1 / 0,
+    lineClamp: 1 / 0
   };
   var DefaultStyle = Object.assign(Object.assign(Object.assign({
     opacity: 1,
@@ -9945,6 +9948,12 @@
   }();
   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);
@@ -14482,7 +14491,7 @@
     return CanvasTextLayout;
   }();
 
-  var TEXT_UPDATE_TAG_KEY = ["text", "maxLineWidth", "fontSize", "fontFamily", "fontWeight", "ellipsis", "lineHeight", "direction", "wordBreak"].concat(_toConsumableArray(GRAPHIC_UPDATE_TAG_KEY));
+  var TEXT_UPDATE_TAG_KEY = ["text", "maxLineWidth", "heightLimit", "lineClamp", "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);
@@ -14556,6 +14565,118 @@
           paddingArray = parsePadding(boundsPadding);
         return paddingArray && bounds.expand(paddingArray), this.clearUpdateBoundTag(), bounds;
       }
+    }, {
+      key: "updateWrapAABBBounds",
+      value: function updateWrapAABBBounds(text) {
+        var _a, _b, _c;
+        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$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,
+          _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,
+          buf = ignoreBuf ? 0 : 2;
+        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,
+          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 !== (_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;
+            }
+            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) {
@@ -14602,9 +14723,13 @@
           _attribute$wordBreak === void 0 ? textTheme.wordBreak : _attribute$wordBreak;
           var _attribute$ignoreBuf = attribute.ignoreBuf,
           ignoreBuf = _attribute$ignoreBuf === void 0 ? textTheme.ignoreBuf : _attribute$ignoreBuf,
-          buf = ignoreBuf ? 0 : Math.max(2, .075 * fontSize),
+          _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,
           _attribute$lineHeight = attribute.lineHeight,
-          lineHeight = _attribute$lineHeight === void 0 ? null !== (_a = attribute.lineHeight) && void 0 !== _a ? _a : (attribute.fontSize || textTheme.fontSize) + buf : _attribute$lineHeight;
+          lineHeight = _attribute$lineHeight === void 0 ? calculateLineHeight(null !== (_a = attribute.lineHeight) && void 0 !== _a ? _a : textFontSize, textFontSize) + buf : _attribute$lineHeight;
         if (!this.shouldUpdateShape() && this.cache) {
           width = null !== (_b = this.cache.clipedWidth) && void 0 !== _b ? _b : 0;
           var _dx = textDrawOffsetX(textAlign, width),
@@ -14675,7 +14800,7 @@
           _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,
+          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,
@@ -14743,7 +14868,7 @@
           _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,
+          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,
@@ -14751,11 +14876,12 @@
           stroke = _attribute$stroke3 === void 0 ? textTheme.stroke : _attribute$stroke3,
           _attribute$lineWidth3 = attribute.lineWidth,
           lineWidth = _attribute$lineWidth3 === void 0 ? textTheme.lineWidth : _attribute$lineWidth3,
-          _attribute$wordBreak2 = attribute.wordBreak;
-          _attribute$wordBreak2 === void 0 ? textTheme.wordBreak : _attribute$wordBreak2;
+          _attribute$whiteSpace2 = attribute.whiteSpace,
+          whiteSpace = _attribute$whiteSpace2 === void 0 ? textTheme.whiteSpace : _attribute$whiteSpace2;
+        if ("normal" === whiteSpace) return this.updateWrapAABBBounds(text);
         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 _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;
         }
         var textMeasure = application.graphicUtil.textMeasure,
           layoutData = new CanvasTextLayout(fontFamily, {
@@ -14790,7 +14916,7 @@
           _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,
+          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,
@@ -14939,7 +15065,7 @@
           _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,
+          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,
@@ -24842,6 +24968,11 @@
       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) {
@@ -24852,8 +24983,8 @@
       value: function optmizeRender() {
         var _this2 = this;
         var skipRenderWithOutRange = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : !0;
-        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;
+        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);
         }));
       }
     }, {
@@ -33329,6 +33460,13 @@
           _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) {
@@ -34495,7 +34633,7 @@
 
   var roughModule = _roughModule;
 
-  const version = "0.16.12";
+  const version = "0.16.14-alpha.1";
   loadAllModule(container);
 
   exports.ACustomAnimate = ACustomAnimate;
@@ -34728,6 +34866,7 @@
   exports.builtinSymbols = builtinSymbols;
   exports.builtinSymbolsMap = builtinSymbolsMap;
   exports.calcLineCache = calcLineCache$1;
+  exports.calculateLineHeight = calculateLineHeight;
   exports.centroidOfSubpath = centroidOfSubpath;
   exports.circleBounds = circleBounds;
   exports.clock = clock;