@visactor/vrender 0.21.0-alpha.5 → 0.21.0-alpha.7

package/dist/index.js

@@ -748,6 +748,13 @@
     };
     exports.DefaultGlobal = __decorate$1H([injectable(), __param$T(0, inject(ContributionProvider)), __param$T(0, named(EnvContribution)), __metadata$1h("design:paramtypes", [Object])], exports.DefaultGlobal);
 
+    exports.MeasureModeEnum = void 0;
+    !function (MeasureModeEnum) {
+      MeasureModeEnum[MeasureModeEnum.estimate = 0] = "estimate", MeasureModeEnum[MeasureModeEnum.actualBounding = 1] = "actualBounding", MeasureModeEnum[MeasureModeEnum.fontBounding = 2] = "fontBounding";
+    }(exports.MeasureModeEnum || (exports.MeasureModeEnum = {}));
+
+    const strCommandMap = ["arc", "arcTo", "bezierCurveTo", "closePath", "ellipse", "lineTo", "moveTo", "quadraticCurveTo", "rect"];
+
     function getDefaultExportFromCjs (x) {
     	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
     }
@@ -1702,7 +1709,9 @@
           } = this.textSpec;
         return {
           width: metrics.width,
-          height: null !== (_a = lineHeight) && void 0 !== _a ? _a : fontSize
+          height: null !== (_a = lineHeight) && void 0 !== _a ? _a : fontSize,
+          fontBoundingBoxAscent: metrics.fontBoundingBoxAscent,
+          fontBoundingBoxDescent: metrics.fontBoundingBoxDescent
         };
       }
       quickMeasure(text) {
@@ -1716,7 +1725,7 @@
         for (let i = 0; i < text.length; i++) {
           const char = text[i];
           let size = this._measureSpecialChar(char);
-          isNil$1(size) && TextMeasure.NUMBERS_CHAR_SET.includes(char) && (size = this._measureNumberChar()), isNil$1(size) && ["F", "W"].includes(eastAsianCharacterInfo(char)) && (size = this._measureFullSizeChar()), isNil$1(size) && (size = this._measureLetterChar()), totalSize.width += size.width, totalSize.height = Math.max(totalSize.height, size.height);
+          isNil$1(size) && TextMeasure.NUMBERS_CHAR_SET.includes(char) && (size = this._measureNumberChar()), isNil$1(size) && ["F", "W"].includes(eastAsianCharacterInfo(char)) && (size = this._measureFullSizeChar()), isNil$1(size) && (size = this._measureLetterChar()), totalSize.width += size.width, totalSize.height = Math.max(totalSize.height, size.height), !isNil$1(size.fontBoundingBoxAscent) && (totalSize.fontBoundingBoxAscent = size.fontBoundingBoxAscent), !isNil$1(size.fontBoundingBoxDescent) && (totalSize.fontBoundingBoxDescent = size.fontBoundingBoxDescent);
         }
         return totalSize;
       }
@@ -1765,7 +1774,9 @@
           const numberBounds = this._standardMethod(TextMeasure.NUMBERS_CHAR_SET);
           this._numberCharSize = {
             width: numberBounds.width / TextMeasure.NUMBERS_CHAR_SET.length,
-            height: numberBounds.height
+            height: numberBounds.height,
+            fontBoundingBoxAscent: numberBounds.fontBoundingBoxAscent,
+            fontBoundingBoxDescent: numberBounds.fontBoundingBoxDescent
           };
         }
         return this._numberCharSize;
@@ -1778,7 +1789,9 @@
           const alphabetBounds = this._standardMethod(TextMeasure.ALPHABET_CHAR_SET);
           this._letterCharSize = {
             width: alphabetBounds.width / TextMeasure.ALPHABET_CHAR_SET.length,
-            height: alphabetBounds.height
+            height: alphabetBounds.height,
+            fontBoundingBoxAscent: alphabetBounds.fontBoundingBoxAscent,
+            fontBoundingBoxDescent: alphabetBounds.fontBoundingBoxDescent
           };
         }
         return this._letterCharSize;
@@ -3943,7 +3956,8 @@
       suffixPosition: "end",
       underlineDash: [],
       underlineOffset: 0,
-      disableAutoClipedPoptip: void 0
+      disableAutoClipedPoptip: void 0,
+      measureMode: exports.MeasureModeEnum.fontBounding
     };
     const DefaultPickStyle = {
       pickStrokeBuffer: 0
@@ -4346,22 +4360,10 @@
       }
       measureTextBoundADscentEstimate(options) {
         var _a;
-        const fontSize = null !== (_a = options.fontSize) && void 0 !== _a ? _a : DefaultTextStyle.fontSize,
-          {
-            textBaseline: textBaseline
-          } = options;
-        return "bottom" === textBaseline ? {
-          ascent: fontSize,
-          descent: 0
-        } : "middle" === textBaseline ? {
-          ascent: fontSize / 2,
-          descent: fontSize / 2
-        } : "alphabetic" === textBaseline ? {
+        const fontSize = null !== (_a = options.fontSize) && void 0 !== _a ? _a : DefaultTextStyle.fontSize;
+        return {
           ascent: .79 * fontSize,
           descent: .21 * fontSize
-        } : {
-          ascent: 0,
-          descent: fontSize
         };
       }
       measureTextBoundLeftRightEstimate(options) {
@@ -4381,11 +4383,42 @@
           right: fontSize
         };
       }
-      measureTextPixelADscentAndWidth(text, options) {
+      measureTextPixelADscentAndWidth(text, options, mode) {
         if (!this.context) return Object.assign(Object.assign({}, this.measureTextBoundADscentEstimate(options)), {
           width: this.estimate(text, options).width
         });
         const out = this._measureTextWithoutAlignBaseline(text, options, !0);
+        if (mode === exports.MeasureModeEnum.actualBounding) return {
+          ascent: out.actualBoundingBoxAscent,
+          descent: out.actualBoundingBoxDescent,
+          width: out.width
+        };
+        if (mode === exports.MeasureModeEnum.estimate) return Object.assign(Object.assign({}, this.measureTextBoundADscentEstimate(options)), {
+          width: out.width
+        });
+        if (mode === exports.MeasureModeEnum.fontBounding) {
+          const {
+            lineHeight = options.fontSize
+          } = options;
+          let ratio = 1;
+          if (lineHeight) {
+            ratio = lineHeight / (out.fontBoundingBoxAscent + out.fontBoundingBoxDescent);
+          }
+          let ascent = out.fontBoundingBoxAscent * ratio,
+            descent = out.fontBoundingBoxDescent * ratio;
+          if (out.actualBoundingBoxDescent && descent < out.actualBoundingBoxDescent) {
+            const delta = out.actualBoundingBoxDescent - descent;
+            descent += delta, ascent -= delta;
+          } else if (out.actualBoundingBoxAscent && ascent < out.actualBoundingBoxAscent) {
+            const delta = out.actualBoundingBoxAscent - ascent;
+            ascent += delta, descent -= delta;
+          }
+          return {
+            ascent: ascent,
+            descent: descent,
+            width: out.width
+          };
+        }
         return {
           ascent: out.actualBoundingBoxAscent,
           descent: out.actualBoundingBoxDescent,
@@ -14587,15 +14620,19 @@
       GetLayoutByLines(lines, textAlign, textBaseline, lineHeight) {
         let suffix = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : "";
         let wordBreak = arguments.length > 5 ? arguments[5] : undefined;
-        let lineWidth = arguments.length > 6 ? arguments[6] : undefined;
-        let suffixPosition = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : "end";
+        let params = arguments.length > 6 ? arguments[6] : undefined;
+        const {
+          lineWidth: lineWidth,
+          suffixPosition = "end",
+          measureMode = exports.MeasureModeEnum.actualBounding
+        } = null != params ? params : {};
         lines = lines.map(l => l.toString());
         const linesLayout = [],
           bboxWH = [0, 0];
         if ("number" == typeof lineWidth && lineWidth !== 1 / 0) {
           let width;
           for (let i = 0, len = lines.length; i < len; i++) {
-            const metrics = this.textMeasure.measureTextPixelADscentAndWidth(lines[i], this.textOptions);
+            const metrics = this.textMeasure.measureTextPixelADscentAndWidth(lines[i], this.textOptions, measureMode);
             width = Math.min(metrics.width, lineWidth), linesLayout.push({
               str: metrics.width <= lineWidth ? lines[i].toString() : this.textMeasure.clipTextWithSuffix(lines[i], this.textOptions, width, suffix, wordBreak, suffixPosition).str,
               width: width,
@@ -14605,19 +14642,20 @@
           }
           bboxWH[0] = lineWidth;
         } else {
-          let width, text;
-          lineWidth = 0;
+          let width,
+            text,
+            _lineWidth = 0;
           for (let i = 0, len = lines.length; i < len; i++) {
             text = lines[i];
-            const metrics = this.textMeasure.measureTextPixelADscentAndWidth(lines[i], this.textOptions);
-            width = metrics.width, lineWidth = Math.max(lineWidth, width), linesLayout.push({
+            const metrics = this.textMeasure.measureTextPixelADscentAndWidth(lines[i], this.textOptions, measureMode);
+            width = metrics.width, _lineWidth = Math.max(_lineWidth, width), linesLayout.push({
               str: text,
               width: width,
               ascent: metrics.ascent,
               descent: metrics.descent
             });
           }
-          bboxWH[0] = lineWidth;
+          bboxWH[0] = _lineWidth;
         }
         bboxWH[1] = linesLayout.length * lineHeight, bboxWH[0] = linesLayout.reduce((a, b) => Math.max(a, b.width), 0);
         const bbox = {
@@ -14775,6 +14813,9 @@
           b = "horizontal" === direction ? this.updateHorizontalMultilineAABBBounds(text) : this.updateVerticalMultilineAABBBounds(text);
         return "horizontal" === direction && underlineOffset && this._AABBBounds.add(this._AABBBounds.x1, this._AABBBounds.y2 + underlineOffset), b;
       }
+      guessLineHeightBuf(fontSize) {
+        return fontSize ? .1 * fontSize : 0;
+      }
       updateHorizontalMultilineAABBBounds(text) {
         var _a;
         const textTheme = this.getGraphicTheme(),
@@ -14789,12 +14830,14 @@
             maxLineWidth: maxLineWidth,
             stroke = textTheme.stroke,
             wrap = textTheme.wrap,
-            ignoreBuf = textTheme.ignoreBuf,
+            measureMode = textTheme.measureMode,
             lineWidth = textTheme.lineWidth,
             whiteSpace = textTheme.whiteSpace,
-            suffixPosition = textTheme.suffixPosition
+            suffixPosition = textTheme.suffixPosition,
+            ignoreBuf = textTheme.ignoreBuf
           } = attribute,
-          lineHeight = this.getLineHeight(attribute, textTheme);
+          buf = ignoreBuf ? 0 : this.guessLineHeightBuf(fontSize),
+          lineHeight = this.getLineHeight(attribute, textTheme) + buf;
         if ("normal" === whiteSpace || wrap) return this.updateWrapAABBBounds(text);
         if (!this.shouldUpdateShape() && (null === (_a = this.cache) || void 0 === _a ? void 0 : _a.layoutData)) {
           const bbox = this.cache.layoutData.bbox;
@@ -14804,8 +14847,13 @@
           layoutData = new CanvasTextLayout(fontFamily, {
             fontSize: fontSize,
             fontWeight: fontWeight,
-            fontFamily: fontFamily
-          }, textMeasure).GetLayoutByLines(text, textAlign, textBaseline, lineHeight, !0 === ellipsis ? textTheme.ellipsis : ellipsis || void 0, !1, maxLineWidth, suffixPosition),
+            fontFamily: fontFamily,
+            lineHeight: lineHeight
+          }, textMeasure).GetLayoutByLines(text, textAlign, textBaseline, lineHeight, !0 === ellipsis ? textTheme.ellipsis : ellipsis || void 0, !1, {
+            lineWidth: maxLineWidth,
+            suffixPosition: suffixPosition,
+            measureMode: measureMode
+          }),
           {
             bbox: bbox
           } = layoutData;
@@ -14826,11 +14874,13 @@
             wordBreak = textTheme.wordBreak,
             fontWeight = textTheme.fontWeight,
             ignoreBuf = textTheme.ignoreBuf,
+            measureMode = textTheme.measureMode,
             suffixPosition = textTheme.suffixPosition,
             heightLimit = 0,
             lineClamp: lineClamp
           } = this.attribute,
-          lineHeight = this.getLineHeight(this.attribute, textTheme);
+          buf = ignoreBuf ? 0 : this.guessLineHeightBuf(fontSize),
+          lineHeight = this.getLineHeight(this.attribute, textTheme) + buf;
         if (!this.shouldUpdateShape() && (null === (_a = this.cache) || void 0 === _a ? void 0 : _a.layoutData)) {
           const 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;
@@ -14839,7 +14889,8 @@
           textOptions = {
             fontSize: fontSize,
             fontWeight: fontWeight,
-            fontFamily: fontFamily
+            fontFamily: fontFamily,
+            lineHeight: lineHeight
           },
           layoutObj = new CanvasTextLayout(fontFamily, textOptions, textMeasure),
           lines = isArray$1(text) ? text.map(l => l.toString()) : [text.toString()],
@@ -14852,7 +14903,7 @@
             let needCut = !0;
             if (i === lineCountLimit - 1) {
               const clip = textMeasure.clipTextWithSuffix(str, textOptions, maxLineWidth, ellipsis, !1, suffixPosition, i !== lines.length - 1),
-                matrics = textMeasure.measureTextPixelADscentAndWidth(clip.str, textOptions);
+                matrics = textMeasure.measureTextPixelADscentAndWidth(clip.str, textOptions, measureMode);
               linesLayout.push({
                 str: clip.str,
                 width: clip.width,
@@ -14869,7 +14920,7 @@
               } else clip.str = "", clip.width = 0;
               needCut = !1;
             }
-            const matrics = textMeasure.measureTextPixelADscentAndWidth(clip.str, textOptions);
+            const matrics = textMeasure.measureTextPixelADscentAndWidth(clip.str, textOptions, measureMode);
             linesLayout.push({
               str: clip.str,
               width: clip.width,
@@ -14893,7 +14944,7 @@
           for (let i = 0, len = lines.length; i < len; i++) {
             if (i === lineCountLimit - 1) {
               const clip = textMeasure.clipTextWithSuffix(lines[i], textOptions, maxLineWidth, ellipsis, !1, suffixPosition),
-                matrics = textMeasure.measureTextPixelADscentAndWidth(clip.str, textOptions);
+                matrics = textMeasure.measureTextPixelADscentAndWidth(clip.str, textOptions, measureMode);
               linesLayout.push({
                 str: clip.str,
                 width: clip.width,
@@ -14903,7 +14954,7 @@
               break;
             }
             text = lines[i], width = textMeasure.measureTextWidth(text, textOptions), lineWidth = Math.max(lineWidth, width);
-            const matrics = textMeasure.measureTextPixelADscentAndWidth(text, textOptions);
+            const matrics = textMeasure.measureTextPixelADscentAndWidth(text, textOptions, measureMode);
             linesLayout.push({
               str: text,
               width: width,
@@ -18988,8 +19039,6 @@
       return new Stage(params);
     }
 
-    const strCommandMap = ["arc", "arcTo", "bezierCurveTo", "closePath", "ellipse", "lineTo", "moveTo", "quadraticCurveTo", "rect"];
-
     var __decorate$1d = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
@@ -28575,7 +28624,7 @@
 
     const roughModule = _roughModule;
 
-    const version = "0.21.0-alpha.5";
+    const version = "0.21.0-alpha.7";
     preLoadAllModule();
     if (isBrowserEnv()) {
         loadBrowserEnv(container);