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

package/cjs/index.d.ts

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

package/dist/index.js

@@ -4591,9 +4591,13 @@
           _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,
-          _this$_userSpec$lineH = _this$_userSpec.lineHeight,
+          limit = _this$_userSpec.limit;
+        var _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,
@@ -4669,6 +4673,7 @@
     }, {
       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,
@@ -4676,7 +4681,7 @@
           lineHeight = _this$textSpec2.lineHeight;
         return {
           width: metrics.width,
-          height: null != lineHeight ? lineHeight : fontSize
+          height: null !== (_a = lineHeight) && void 0 !== _a ? _a : fontSize
         };
       }
     }, {
@@ -4706,6 +4711,7 @@
     }, {
       key: "_quickMeasureWithoutCanvas",
       value: function _quickMeasureWithoutCanvas(text) {
+        var _a;
         var totalSize = {
             width: 0,
             height: 0
@@ -4718,11 +4724,12 @@
             size = ["F", "W"].includes(eastAsianCharacterInfo(_char2)) ? 1 : .53;
           totalSize.width += size * fontSize;
         }
-        return totalSize.height = null != lineHeight ? lineHeight : fontSize, totalSize;
+        return totalSize.height = null !== (_a = lineHeight) && void 0 !== _a ? _a : fontSize, totalSize;
       }
     }, {
       key: "_measureReduce",
       value: function _measureReduce(text, processor) {
+        var _a;
         var _this$textSpec4 = this.textSpec,
           fontSize = _this$textSpec4.fontSize,
           lineHeight = _this$textSpec4.lineHeight,
@@ -4739,7 +4746,7 @@
             width: textArr.reduce(function (maxWidth, cur) {
               return Math.max(maxWidth, processor(cur).width);
             }, 0),
-            height: textArr.length * ((null != lineHeight ? lineHeight : fontSize) + 1) + 1
+            height: textArr.length * ((null !== (_a = lineHeight) && void 0 !== _a ? _a : fontSize) + 1) + 1
           };
         }
         return processor(text.toString());
@@ -7178,158 +7185,6 @@
     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,
@@ -7406,9 +7261,7 @@
           },
           getTextBounds: void 0,
           specialCharSet: "-/: .,@%'\"~" + TextMeasure.ALPHABET_CHAR_SET + TextMeasure.ALPHABET_CHAR_SET.toUpperCase()
-        }, null != option ? option : {}), Object.assign(Object.assign({}, textSpec), {
-          lineHeight: calculateLineHeight(null == textSpec ? void 0 : textSpec.lineHeight, null == textSpec ? void 0 : textSpec.fontSize)
-        }));
+        }, null != option ? option : {}), textSpec);
       }
     }]);
     return DefaultGraphicUtil;
@@ -9956,6 +9809,158 @@
     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);
@@ -16622,7 +16627,9 @@
   var Paragraph = /*#__PURE__*/function () {
     function Paragraph(text, newLine, character) {
       _classCallCheck(this, Paragraph);
-      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;
+      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;
       var _measureTextCanvas = measureTextCanvas(text, character),
         ascent = _measureTextCanvas.ascent,
         height = _measureTextCanvas.height,
@@ -34627,7 +34634,7 @@
 
   var roughModule = _roughModule;
 
-  const version = "0.16.14-alpha.3";
+  const version = "0.16.14-alpha.5";
   loadAllModule(container);
 
   exports.ACustomAnimate = ACustomAnimate;