@visactor/vrender-core 0.16.12-alpha.2 → 0.16.13

package/dist/index.js

@@ -4294,7 +4294,10 @@
         direction: 'horizontal',
         wordBreak: 'break-all',
         ignoreBuf: false,
-        verticalMode: 0
+        verticalMode: 0,
+        whiteSpace: 'no-wrap',
+        heightLimit: Infinity,
+        lineClamp: Infinity
     };
     const DefaultStyle = Object.assign(Object.assign(Object.assign({ opacity: 1, background: null, texture: null, textureColor: 'black', textureSize: 10, texturePadding: 2, backgroundMode: 0, blur: 0, cursor: null, html: null }, DefaultFillStyle), DefaultStrokeStyle), DefaultLayout);
     const DefaultConnectAttribute = {
@@ -9027,7 +9030,7 @@
             };
         }
         onBind() {
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b, _c, _d, _e, _f, _g, _h;
             this.fromNumber = vutils.isNumber((_a = this.from) === null || _a === void 0 ? void 0 : _a.text) ? (_b = this.from) === null || _b === void 0 ? void 0 : _b.text : Number.parseFloat((_c = this.from) === null || _c === void 0 ? void 0 : _c.text);
             this.toNumber = vutils.isNumber((_d = this.to) === null || _d === void 0 ? void 0 : _d.text) ? (_e = this.to) === null || _e === void 0 ? void 0 : _e.text : Number.parseFloat((_f = this.to) === null || _f === void 0 ? void 0 : _f.text);
             if (!Number.isFinite(this.toNumber)) {
@@ -9036,12 +9039,15 @@
             if (!Number.isFinite(this.toNumber)) {
                 this.valid = false;
             }
+            if (this.valid !== false) {
+                this.decimalLength =
+                    (_h = (_g = this.params) === null || _g === void 0 ? void 0 : _g.fixed) !== null && _h !== void 0 ? _h : Math.max(vutils.getDecimalPlaces(this.fromNumber), vutils.getDecimalPlaces(this.toNumber));
+            }
         }
         onEnd() {
             return;
         }
         onUpdate(end, ratio, out) {
-            var _a;
             if (this.valid === false) {
                 return;
             }
@@ -9049,11 +9055,7 @@
                 out.text = this.toNumber;
             }
             else {
-                let outText = this.fromNumber + (this.toNumber - this.fromNumber) * ratio;
-                if (((_a = this.params) === null || _a === void 0 ? void 0 : _a.fixed) >= 0) {
-                    outText = outText.toFixed(this.params.fixed);
-                }
-                out.text = outText;
+                out.text = (this.fromNumber + (this.toNumber - this.fromNumber) * ratio).toFixed(this.decimalLength);
             }
         }
     }
@@ -14315,6 +14317,8 @@
     const TEXT_UPDATE_TAG_KEY = [
         'text',
         'maxLineWidth',
+        'heightLimit',
+        'lineClamp',
         'fontSize',
         'fontFamily',
         'fontWeight',
@@ -14399,6 +14403,112 @@
             this.clearUpdateBoundTag();
             return bounds;
         }
+        updateWrapAABBBounds(text) {
+            var _a, _b, _c;
+            const textTheme = getTheme(this).text;
+            const { fontFamily = textTheme.fontFamily, textAlign = textTheme.textAlign, textBaseline = textTheme.textBaseline, fontSize = textTheme.fontSize, lineHeight = this.attribute.lineHeight || this.attribute.fontSize || textTheme.fontSize, ellipsis = textTheme.ellipsis, maxLineWidth, stroke = textTheme.stroke, lineWidth = textTheme.lineWidth, wordBreak = textTheme.wordBreak, fontWeight = textTheme.fontWeight, ignoreBuf = textTheme.ignoreBuf, heightLimit = 0, lineClamp } = this.attribute;
+            const buf = ignoreBuf ? 0 : 2;
+            if (!this.shouldUpdateShape() && ((_a = this.cache) === null || _a === void 0 ? void 0 : _a.layoutData)) {
+                const bbox = this.cache.layoutData.bbox;
+                this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height);
+                if (stroke) {
+                    this._AABBBounds.expand(lineWidth / 2);
+                }
+                return this._AABBBounds;
+            }
+            const textMeasure = application.graphicUtil.textMeasure;
+            const layoutObj = new CanvasTextLayout(fontFamily, { fontSize, fontWeight, fontFamily }, textMeasure);
+            const lines = vutils.isArray(text) ? text.map(l => l.toString()) : [text.toString()];
+            const linesLayout = [];
+            const bboxWH = [0, 0];
+            let lineCountLimit = Infinity;
+            if (heightLimit > 0) {
+                lineCountLimit = Math.max(Math.floor(heightLimit / lineHeight), 1);
+            }
+            if (lineClamp) {
+                lineCountLimit = Math.min(lineCountLimit, lineClamp);
+            }
+            if (typeof maxLineWidth === 'number' && maxLineWidth !== Infinity) {
+                if (maxLineWidth > 0) {
+                    for (let i = 0; i < lines.length; i++) {
+                        const str = lines[i];
+                        let needCut = true;
+                        if (i === lineCountLimit - 1) {
+                            const clip = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis, false);
+                            linesLayout.push({
+                                str: clip.str,
+                                width: clip.width
+                            });
+                            break;
+                        }
+                        const clip = layoutObj.textMeasure.clipText(str, layoutObj.textOptions, maxLineWidth, wordBreak === 'break-word');
+                        if (str !== '' && clip.str === '') {
+                            if (ellipsis) {
+                                const clipEllipsis = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis, false);
+                                clip.str = (_b = clipEllipsis.str) !== null && _b !== void 0 ? _b : '';
+                                clip.width = (_c = clipEllipsis.width) !== null && _c !== void 0 ? _c : 0;
+                            }
+                            else {
+                                clip.str = '';
+                                clip.width = 0;
+                            }
+                            needCut = false;
+                        }
+                        linesLayout.push({
+                            str: clip.str,
+                            width: clip.width
+                        });
+                        if (clip.str.length === str.length) ;
+                        else if (needCut) {
+                            const newStr = str.substring(clip.str.length);
+                            lines.splice(i + 1, 0, newStr);
+                        }
+                    }
+                }
+                let maxWidth = 0;
+                linesLayout.forEach(layout => {
+                    maxWidth = Math.max(maxWidth, layout.width);
+                });
+                bboxWH[0] = maxWidth;
+            }
+            else {
+                let lineWidth = 0;
+                let width;
+                let text;
+                for (let i = 0, len = lines.length; i < len; i++) {
+                    if (i === lineCountLimit - 1) {
+                        const clip = layoutObj.textMeasure.clipTextWithSuffix(lines[i], layoutObj.textOptions, maxLineWidth, ellipsis, false);
+                        linesLayout.push({
+                            str: clip.str,
+                            width: clip.width
+                        });
+                        lineWidth = Math.max(lineWidth, clip.width);
+                        break;
+                    }
+                    text = lines[i];
+                    width = layoutObj.textMeasure.measureTextWidth(text, layoutObj.textOptions, wordBreak === 'break-word');
+                    lineWidth = Math.max(lineWidth, width);
+                    linesLayout.push({ str: text, width });
+                }
+                bboxWH[0] = lineWidth;
+            }
+            bboxWH[1] = linesLayout.length * (lineHeight + buf);
+            const bbox = {
+                xOffset: 0,
+                yOffset: 0,
+                width: bboxWH[0],
+                height: bboxWH[1]
+            };
+            layoutObj.LayoutBBox(bbox, textAlign, textBaseline);
+            const layoutData = layoutObj.layoutWithBBox(bbox, linesLayout, textAlign, textBaseline, lineHeight);
+            this.cache.layoutData = layoutData;
+            this.clearUpdateShapeTag();
+            this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height);
+            if (stroke) {
+                this._AABBBounds.expand(lineWidth / 2);
+            }
+            return this._AABBBounds;
+        }
         updateSingallineAABBBounds(text) {
             const textTheme = getTheme(this).text;
             const { direction = textTheme.direction } = this.attribute;
@@ -14420,7 +14530,10 @@
             let width;
             let str;
             const attribute = this.attribute;
-            const { maxLineWidth = textTheme.maxLineWidth, ellipsis = textTheme.ellipsis, textAlign = textTheme.textAlign, textBaseline = textTheme.textBaseline, fontFamily = textTheme.fontFamily, fontSize = textTheme.fontSize, fontWeight = textTheme.fontWeight, stroke = textTheme.stroke, lineWidth = textTheme.lineWidth, wordBreak = textTheme.wordBreak, ignoreBuf = textTheme.ignoreBuf } = attribute;
+            const { maxLineWidth = textTheme.maxLineWidth, ellipsis = textTheme.ellipsis, textAlign = textTheme.textAlign, textBaseline = textTheme.textBaseline, fontFamily = textTheme.fontFamily, fontSize = textTheme.fontSize, fontWeight = textTheme.fontWeight, stroke = textTheme.stroke, lineWidth = textTheme.lineWidth, wordBreak = textTheme.wordBreak, ignoreBuf = textTheme.ignoreBuf, whiteSpace = textTheme.whiteSpace } = attribute;
+            if (whiteSpace === 'normal') {
+                return this.updateWrapAABBBounds(text);
+            }
             const buf = ignoreBuf ? 0 : Math.max(2, fontSize * 0.075);
             const { lineHeight = (_a = attribute.lineHeight) !== null && _a !== void 0 ? _a : (attribute.fontSize || textTheme.fontSize) + buf } = attribute;
             if (!this.shouldUpdateShape() && this.cache) {
@@ -14540,7 +14653,10 @@
             var _a;
             const textTheme = getTheme(this).text;
             const attribute = this.attribute;
-            const { fontFamily = textTheme.fontFamily, textAlign = textTheme.textAlign, textBaseline = textTheme.textBaseline, fontSize = textTheme.fontSize, fontWeight = textTheme.fontWeight, lineHeight = attribute.lineHeight || attribute.fontSize || textTheme.fontSize, ellipsis = textTheme.ellipsis, maxLineWidth, stroke = textTheme.stroke, lineWidth = textTheme.lineWidth, wordBreak = textTheme.wordBreak } = attribute;
+            const { fontFamily = textTheme.fontFamily, textAlign = textTheme.textAlign, textBaseline = textTheme.textBaseline, fontSize = textTheme.fontSize, fontWeight = textTheme.fontWeight, lineHeight = attribute.lineHeight || attribute.fontSize || textTheme.fontSize, ellipsis = textTheme.ellipsis, maxLineWidth, stroke = textTheme.stroke, lineWidth = textTheme.lineWidth, whiteSpace = textTheme.whiteSpace } = attribute;
+            if (whiteSpace === 'normal') {
+                return this.updateWrapAABBBounds(text);
+            }
             if (!this.shouldUpdateShape() && ((_a = this.cache) === null || _a === void 0 ? void 0 : _a.layoutData)) {
                 const bbox = this.cache.layoutData.bbox;
                 this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height);
@@ -26125,6 +26241,19 @@
                 this.setAttributes({ background: this._background });
             }
         }
+        preventRender(prevent) {
+            if (prevent) {
+                this._skipRender = -Infinity;
+            }
+            else {
+                if (this.params && this.params.optimize && this.params.optimize.skipRenderWithOutRange !== false) {
+                    this._skipRender = this.window.isVisible() ? 0 : 1;
+                }
+                else {
+                    this._skipRender = 0;
+                }
+            }
+        }
         optmize(params) {
             this.optmizeRender(params === null || params === void 0 ? void 0 : params.skipRenderWithOutRange);
         }
@@ -26132,8 +26261,11 @@
             if (!skipRenderWithOutRange) {
                 return;
             }
-            this._skipRender = this.window.isVisible() ? 0 : 1;
+            this._skipRender = this._skipRender < 0 ? this._skipRender : this.window.isVisible() ? 0 : 1;
             this.window.onVisibleChange(visible => {
+                if (this._skipRender < 0) {
+                    return;
+                }
                 if (visible) {
                     if (this.dirtyBounds) {
                         this.dirtyBounds.setValue(0, 0, this._viewBox.width(), this._viewBox.height());