@visactor/vchart 1.13.23-alpha.1 → 1.13.24-alpha.0

package/build/index.js

@@ -58360,6 +58360,33 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 });
             }
         }
+        _isGeoRegionRoamDragEnabled() {
+            var _a, _b;
+            const chartSpec = (_b = (_a = this._compileChart) === null || _a === void 0 ? void 0 : _a.getSpec) === null || _b === void 0 ? void 0 : _b.call(_a);
+            const regions = chartSpec === null || chartSpec === void 0 ? void 0 : chartSpec.region;
+            if (!isArray$1(regions)) {
+                return false;
+            }
+            return regions.some((region) => {
+                var _a;
+                if ((region === null || region === void 0 ? void 0 : region.coordinate) !== 'geo' || !region.roam) {
+                    return false;
+                }
+                if (region.roam === true) {
+                    return true;
+                }
+                return (_a = region.roam.drag) !== null && _a !== void 0 ? _a : true;
+            });
+        }
+        _shouldDisableCanvasTouchAction() {
+            if (!isTrueBrowser(this._option.mode)) {
+                return false;
+            }
+            const supportsTouchEvents = isValid$1(this._option.supportsTouchEvents)
+                ? this._option.supportsTouchEvents
+                : vglobal.supportsTouchEvents;
+            return supportsTouchEvents === false && this._isGeoRegionRoamDragEnabled();
+        }
         _setCanvasStyle() {
             if (!this._view) {
                 return;
@@ -58370,6 +58397,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 const canvas = this.getCanvas();
                 if (canvas) {
                     canvas.style.display = 'block';
+                    canvas.style.touchAction = this._shouldDisableCanvasTouchAction() ? 'none' : '';
                 }
             }
         }
@@ -58416,6 +58444,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 return;
             }
             chart.compile();
+            this._setCanvasStyle();
             chart.afterCompile();
             this.updateDepend();
             this.compileInteractions();
@@ -80493,41 +80522,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         'rect'
     ];
 
-    class WordMeasureCache {
-        constructor(maxSize = 1000) {
-            this._map = new Map();
-            this._maxSize = maxSize;
-        }
-        get(key) {
-            const v = this._map.get(key);
-            if (!v) {
-                return undefined;
-            }
-            this._map.delete(key);
-            this._map.set(key, v);
-            return v;
-        }
-        set(key, value) {
-            if (this._map.has(key)) {
-                this._map.set(key, value);
-                return;
-            }
-            if (this._map.size >= this._maxSize) {
-                const oldest = this._map.keys().next().value;
-                if (oldest !== undefined) {
-                    this._map.delete(oldest);
-                }
-            }
-            this._map.set(key, value);
-        }
-        clear() {
-            this._map.clear();
-        }
-        size() {
-            return this._map.size;
-        }
-    }
-
     const WORD_CLOUD_TEXT = `${PREFIX}_WORD_CLOUD_TEXT`;
 
     const wordCloudSeriesMark = Object.assign(Object.assign({}, baseSeriesMark), { ["word"]: { name: "word", type: "text" }, ["fillingWord"]: { name: "fillingWord", type: "text" }, ["wordMask"]: { name: "wordMask", type: "rect" } });
@@ -80604,16 +80598,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 !SHAPE_TYPE.includes(this._maskShape) &&
                     !['fast', 'grid', 'cloud'].includes(this._wordCloudConfig.layoutMode);
             this._defaultFontFamily = this._option.getTheme().fontFamily;
-            if (!this._wordMeasureCache) {
-                this._wordMeasureCache = new WordMeasureCache(1000);
-            }
         }
         initData() {
             var _a, _b;
             super.initData();
             (_b = (_a = this.getViewData()) === null || _a === void 0 ? void 0 : _a.target) === null || _b === void 0 ? void 0 : _b.addListener('change', () => {
-                var _a;
-                (_a = this._wordMeasureCache) === null || _a === void 0 ? void 0 : _a.clear();
                 this._dataChange = true;
                 this.compile();
             });
@@ -80782,7 +80771,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             var _a, _b, _c, _d, _e, _f;
             const fillingWordStyleSpec = (_b = (_a = this._spec.fillingWord) === null || _a === void 0 ? void 0 : _a.style) !== null && _b !== void 0 ? _b : {};
             const wordCloudShapeConfig = (_c = this._wordCloudShapeConfig) !== null && _c !== void 0 ? _c : {};
-            return Object.assign(Object.assign(Object.assign({}, wordCloudShapeConfig), this._getCommonTransformOptions()), { measureCache: this._wordMeasureCache, rotateList: this._rotateAngles, fillingRotateList: wordCloudShapeConfig.fillingRotateAngles, fillingFontFamily: isValid$1(wordCloudShapeConfig.fillingFontFamilyField)
+            return Object.assign(Object.assign(Object.assign({}, wordCloudShapeConfig), this._getCommonTransformOptions()), { rotateList: this._rotateAngles, fillingRotateList: wordCloudShapeConfig.fillingRotateAngles, fillingFontFamily: isValid$1(wordCloudShapeConfig.fillingFontFamilyField)
                     ? { field: wordCloudShapeConfig.fillingFontFamilyField }
                     : (_d = fillingWordStyleSpec.fontFamily) !== null && _d !== void 0 ? _d : this._defaultFontFamily, fillingPadding: (_f = (_e = this._spec.fillingWord) === null || _e === void 0 ? void 0 : _e.padding) !== null && _f !== void 0 ? _f : DEFAULT_FONT_PADDING, fillingFontStyle: isValid$1(wordCloudShapeConfig.fillingFontStyleField)
                     ? { field: wordCloudShapeConfig.fillingFontStyleField }
@@ -80831,7 +80820,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             return [this._wordMark];
         }
         reInit() {
-            var _a;
             super.reInit();
             if (this._keyWordColorCallback) {
                 this._keyWordColorCallback = null;
@@ -80839,13 +80827,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             if (this._fillingColorCallback) {
                 this._fillingColorCallback = null;
             }
-            (_a = this._wordMeasureCache) === null || _a === void 0 ? void 0 : _a.clear();
-        }
-        release() {
-            var _a;
-            super.release();
-            (_a = this._wordMeasureCache) === null || _a === void 0 ? void 0 : _a.clear();
-            this._wordMeasureCache = undefined;
         }
     }
     BaseWordCloudSeries.mark = wordCloudSeriesMark;
@@ -81772,30 +81753,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     !function (WORDCLOUD_SHAPE_HOOK_EVENT) {
       WORDCLOUD_SHAPE_HOOK_EVENT.BEFORE_WORDCLOUD_SHAPE_LAYOUT = "beforeWordcloudShapeLayout", WORDCLOUD_SHAPE_HOOK_EVENT.AFTER_WORDCLOUD_SHAPE_LAYOUT = "afterWordcloudShapeLayout", WORDCLOUD_SHAPE_HOOK_EVENT.AFTER_WORDCLOUD_SHAPE_DRAW = "afterWordcloudShapeDraw";
     }(WORDCLOUD_SHAPE_HOOK_EVENT || (WORDCLOUD_SHAPE_HOOK_EVENT = {}));
-    class MapWordMeasureCache {
-      constructor(maxSize = 1e3) {
-        this._map = new Map(), this._maxSize = maxSize;
-      }
-      get(key) {
-        const value = this._map.get(key);
-        if (void 0 !== value) return this._map.delete(key), this._map.set(key, value), value;
-      }
-      set(key, value) {
-        if (this._map.has(key)) this._map.set(key, value);else {
-          if (this._map.size >= this._maxSize) {
-            const firstKey = this._map.keys().next().value;
-            void 0 !== firstKey && this._map.delete(firstKey);
-          }
-          this._map.set(key, value);
-        }
-      }
-      clear() {
-        this._map.clear();
-      }
-      size() {
-        return this._map.size;
-      }
-    }
     const colorListEqual = (arr0, arr1) => {
       if (1 === arr1.length && "#537EF5" === arr1[0]) return !0;
       if (!Array.isArray(arr0) || !Array.isArray(arr1) || arr0.length !== arr1.length) return !1;
@@ -82035,7 +81992,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
           ratio: ratio
         } = region;
         for (let i = 0; i < regionWords.length; i++) {
-          measureSprite(canvas, ctx, words, i, layoutConfig.measureCache);
+          measureSprite(canvas, ctx, words, i);
           const word = regionWords[i];
           word.x = center[0], word.y = center[1], word.hasText && word.sprite && place$1(board, word, maxR, ratio, size, boardSize, stepFactor) && (word.hasPlaced = !0);
         }
@@ -82045,7 +82002,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         if (0 === failedWords.length) break;
         for (let i = 0; i < failedWords.length; i++) {
           const word = failedWords[i];
-          measureSprite(canvas, ctx, failedWords, i, layoutConfig.measureCache), word.x = shapeCenter[0], word.y = shapeCenter[1], word.hasText && place$1(board, word, shapeMaxR, shapeRatio, size, boardSize, stepFactor) && (word.hasPlaced = !0);
+          measureSprite(canvas, ctx, failedWords, i), word.x = shapeCenter[0], word.y = shapeCenter[1], word.hasText && place$1(board, word, shapeMaxR, shapeRatio, size, boardSize, stepFactor) && (word.hasPlaced = !0);
         }
       }
       layoutConfig.board = board;
@@ -82091,7 +82048,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
           } = region;
         let restartTag = !1;
         for (let i = 0; i < regionWords.length; i++) {
-          measureSprite(canvas, ctx, words, i, layoutConfig.measureCache);
+          measureSprite(canvas, ctx, words, i);
           const word = regionWords[i];
           if (word.x = center[0], word.y = center[1], !word.skip && word.hasText && word.sprite && place$1(board, word, maxR, ratio, size, boardSize, stepFactor)) word.hasPlaced = !0;else {
             if (!word.skip && word.weight > weightStd && globalShinkFactor > globalShinkLimit) {
@@ -82116,7 +82073,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         if (0 === failedWords.length) break;
         for (let i = 0; i < failedWords.length; i++) {
           const word = failedWords[i];
-          measureSprite(canvas, ctx, failedWords, i, layoutConfig.measureCache), word.x = shapeCenter[0], word.y = shapeCenter[1], word.hasText && place$1(board, word, shapeMaxR, shapeRatio, size, boardSize, stepFactor) && (word.hasPlaced = !0);
+          measureSprite(canvas, ctx, failedWords, i), word.x = shapeCenter[0], word.y = shapeCenter[1], word.hasText && place$1(board, word, shapeMaxR, shapeRatio, size, boardSize, stepFactor) && (word.hasPlaced = !0);
         }
       }
       layoutConfig.board = board;
@@ -82161,7 +82118,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
           } = region;
         let restartTag = !1;
         for (let i = 0; i < regionWords.length; i++) {
-          measureSprite(canvas, ctx, words, i, layoutConfig.measureCache);
+          measureSprite(canvas, ctx, words, i);
           const word = regionWords[i];
           if (word.x = center[0], word.y = center[1], word.hasText && word.sprite && place$1(board, word, maxR, ratio, size, boardSize, stepFactor)) {
             if (word.hasPlaced = !0, word.weight >= weightStd && importantWordSuccessedNum++, importantWordSuccessedNum >= importantCount && !layoutFinish) {
@@ -82187,7 +82144,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         if (0 === failedWords.length) break;
         for (let i = 0; i < failedWords.length; i++) {
           const word = failedWords[i];
-          measureSprite(canvas, ctx, failedWords, i, layoutConfig.measureCache), word.x = shapeCenter[0], word.y = shapeCenter[1], word.hasText && place$1(board, word, shapeMaxR, shapeRatio, size, boardSize, stepFactor) && (word.hasPlaced = !0);
+          measureSprite(canvas, ctx, failedWords, i), word.x = shapeCenter[0], word.y = shapeCenter[1], word.hasText && place$1(board, word, shapeMaxR, shapeRatio, size, boardSize, stepFactor) && (word.hasPlaced = !0);
         }
       }
       layoutConfig.board = board;
@@ -82266,13 +82223,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         return [ratio * (t *= .1) * Math.cos(t), t * Math.sin(t)];
       };
     }
-    function measureSprite(canvas, ctx, words, wi, cache) {
-      const targetWord = words[wi];
-      if (targetWord.sprite || 0 === targetWord.fontSize) return;
-      if (cache) {
-        const cached = cache.get(getWordMeasureKey(targetWord));
-        if (cached) return targetWord.sprite = cached.sprite, targetWord.bounds = cached.bounds, targetWord.wordSize = cached.wordSize, void (targetWord.hasText = !0);
-      }
+    function measureSprite(canvas, ctx, words, wi) {
+      if (words[wi].sprite || 0 === words[wi].fontSize) return;
       const cw = 2048,
         radians = Math.PI / 180,
         n = words.length;
@@ -82335,25 +82287,14 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
           }
           seen && (j < dTop && (dTop = j), j > dBottom && (dBottom = j));
         }
-        if (word.bounds = {
+        word.bounds = {
           dTop: (wordSize[1] >> 1) - dTop,
           dBottom: dBottom - (wordSize[1] >> 1),
           dLeft: (wordSize[0] >> 1) - dLeft,
           dRight: dRight - (wordSize[0] >> 1)
-        }, word.sprite = sprite, cache) {
-          const key = getWordMeasureKey(word);
-          cache.set(key, {
-            sprite: sprite,
-            bounds: word.bounds,
-            wordSize: wordSize
-          });
-        }
-        delete word.LT;
+        }, word.sprite = sprite, delete word.LT;
       }
     }
-    function getWordMeasureKey(word) {
-      return String(word.text) + "|" + String(word.fontFamily) + "|" + String(word.fontStyle) + "|" + String(word.fontWeight) + "|" + String(word.fontSize) + "|" + String(word.rotate) + "|" + String(word.padding);
-    }
     function initBoardWithShape(segmentationOutput) {
       const {
           segmentation: {
@@ -82450,7 +82391,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
           } = shapeBounds,
           [startX, startY] = [x1 + ~~(randomGenerator() * fillingXStep * 2), y1 + ~~(randomGenerator() * fillingYStep * 2)];
         for (let y = startY; y <= y2; y += fillingYStep) for (let x = startX; x <= x2; x += fillingXStep) {
-          measureSprite(canvas, ctx, fillingWords, wi, layoutConfig.measureCache);
+          measureSprite(canvas, ctx, fillingWords, wi);
           const word = fillingWords[wi];
           word.x = x, word.y = y;
           const {
@@ -82567,7 +82508,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         return this.progressiveResult;
       }
       doLayout() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
         const segmentationInput = this.segmentationInput,
           segmentationOutput = segmentation(segmentationInput);
         if (!segmentationOutput.segmentation.regions.length) return;
@@ -82594,36 +82535,35 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         const layoutConfig = {
             size: options.size,
             ratio: options.ratio || .8,
-            measureCache: null !== (_a = options.measureCache) && void 0 !== _a ? _a : new MapWordMeasureCache(),
             shapeUrl: options.shape,
             random: void 0 === options.random || options.random,
-            textLayoutTimes: null !== (_b = options.textLayoutTimes) && void 0 !== _b ? _b : 3,
+            textLayoutTimes: null !== (_a = options.textLayoutTimes) && void 0 !== _a ? _a : 3,
             removeWhiteBorder: options.removeWhiteBorder,
-            layoutMode: null !== (_c = options.layoutMode) && void 0 !== _c ? _c : "default",
-            fontSizeShrinkFactor: null !== (_d = options.fontSizeShrinkFactor) && void 0 !== _d ? _d : .8,
-            stepFactor: null !== (_e = options.stepFactor) && void 0 !== _e ? _e : 1,
-            importantWordCount: null !== (_f = options.importantWordCount) && void 0 !== _f ? _f : 10,
+            layoutMode: null !== (_b = options.layoutMode) && void 0 !== _b ? _b : "default",
+            fontSizeShrinkFactor: null !== (_c = options.fontSizeShrinkFactor) && void 0 !== _c ? _c : .8,
+            stepFactor: null !== (_d = options.stepFactor) && void 0 !== _d ? _d : 1,
+            importantWordCount: null !== (_e = options.importantWordCount) && void 0 !== _e ? _e : 10,
             globalShinkLimit: options.globalShinkLimit || .2,
-            fontSizeEnlargeFactor: null !== (_g = options.fontSizeEnlargeFactor) && void 0 !== _g ? _g : 1.5,
-            fillingRatio: null !== (_h = options.fillingRatio) && void 0 !== _h ? _h : .7,
-            fillingTimes: null !== (_j = options.fillingTimes) && void 0 !== _j ? _j : 4,
-            fillingXStep: options.fillingXRatioStep ? Math.max(Math.floor(options.size[0] * options.fillingXRatioStep), 1) : null !== (_k = options.fillingXStep) && void 0 !== _k ? _k : 4,
-            fillingYStep: options.fillingYRatioStep ? Math.max(Math.floor(options.size[1] * options.fillingYRatioStep), 1) : null !== (_l = options.fillingYStep) && void 0 !== _l ? _l : 4,
+            fontSizeEnlargeFactor: null !== (_f = options.fontSizeEnlargeFactor) && void 0 !== _f ? _f : 1.5,
+            fillingRatio: null !== (_g = options.fillingRatio) && void 0 !== _g ? _g : .7,
+            fillingTimes: null !== (_h = options.fillingTimes) && void 0 !== _h ? _h : 4,
+            fillingXStep: options.fillingXRatioStep ? Math.max(Math.floor(options.size[0] * options.fillingXRatioStep), 1) : null !== (_j = options.fillingXStep) && void 0 !== _j ? _j : 4,
+            fillingYStep: options.fillingYRatioStep ? Math.max(Math.floor(options.size[1] * options.fillingYRatioStep), 1) : null !== (_k = options.fillingYStep) && void 0 !== _k ? _k : 4,
             fillingInitialFontSize: options.fillingInitialFontSize,
             fillingDeltaFontSize: options.fillingDeltaFontSize,
-            fillingInitialOpacity: null !== (_m = options.fillingInitialOpacity) && void 0 !== _m ? _m : .8,
-            fillingDeltaOpacity: null !== (_o = options.fillingDeltaOpacity) && void 0 !== _o ? _o : .05,
+            fillingInitialOpacity: null !== (_l = options.fillingInitialOpacity) && void 0 !== _l ? _l : .8,
+            fillingDeltaOpacity: null !== (_m = options.fillingDeltaOpacity) && void 0 !== _m ? _m : .05,
             getFillingFontFamily: field(options.fillingFontFamily || "sans-serif"),
             getFillingFontStyle: field(options.fillingFontStyle || "normal"),
             getFillingFontWeight: field(options.fillingFontWeight || "normal"),
-            getFillingPadding: field(null !== (_p = options.fillingPadding) && void 0 !== _p ? _p : .4),
-            fillingRotateList: null !== (_q = options.fillingRotateList) && void 0 !== _q ? _q : [0, 90],
-            fillingDeltaFontSizeFactor: null !== (_r = options.fillingDeltaFontSizeFactor) && void 0 !== _r ? _r : .2,
+            getFillingPadding: field(null !== (_o = options.fillingPadding) && void 0 !== _o ? _o : .4),
+            fillingRotateList: null !== (_p = options.fillingRotateList) && void 0 !== _p ? _p : [0, 90],
+            fillingDeltaFontSizeFactor: null !== (_q = options.fillingDeltaFontSizeFactor) && void 0 !== _q ? _q : .2,
             fillingColorList: options.fillingColorList || ["#537EF5"],
             sameColorList: !1,
-            minInitFontSize: null !== (_s = options.minInitFontSize) && void 0 !== _s ? _s : 10,
-            minFontSize: null !== (_t = options.minFontSize) && void 0 !== _t ? _t : 4,
-            minFillFontSize: null !== (_u = options.minFillFontSize) && void 0 !== _u ? _u : 2
+            minInitFontSize: null !== (_r = options.minInitFontSize) && void 0 !== _r ? _r : 10,
+            minFontSize: null !== (_s = options.minFontSize) && void 0 !== _s ? _s : 4,
+            minFillFontSize: null !== (_t = options.minFillFontSize) && void 0 !== _t ? _t : 2
           },
           sameColorList = colorListEqual(wordsConfig.colorList, layoutConfig.fillingColorList);
         layoutConfig.sameColorList = sameColorList, initColorScale(data, wordsConfig, layoutConfig, options), initFillingWordsFontSize(data, wordsConfig, layoutConfig, segmentationOutput);
@@ -82670,8 +82610,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             successedWords: successedWords,
             failedWords: failedWords
           } = cloud(words, layoutConfig, segmentationOutput),
-          textKey = null !== (_w = null === (_v = options.text) || void 0 === _v ? void 0 : _v.field) && void 0 !== _w ? _w : "textKey",
-          dataIndexKey = null !== (_x = options.dataIndexKey) && void 0 !== _x ? _x : "defaultDataIndexKey",
+          textKey = null !== (_v = null === (_u = options.text) || void 0 === _u ? void 0 : _u.field) && void 0 !== _v ? _v : "textKey",
+          dataIndexKey = null !== (_w = options.dataIndexKey) && void 0 !== _w ? _w : "defaultDataIndexKey",
           as = options.as ? Object.assign(Object.assign({}, OUTPUT), options.as) : OUTPUT;
         let w, t;
         const modKeywords = [];
@@ -82686,7 +82626,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             successedWords: successedWords,
             failedWords: failedWords
           });
-          const stage = null === (_y = this.view.renderer) || void 0 === _y ? void 0 : _y.stage();
+          const stage = null === (_x = this.view.renderer) || void 0 === _x ? void 0 : _x.stage();
           stage && stage.hooks.afterRender.tap(WORDCLOUD_SHAPE_HOOK_EVENT.AFTER_WORDCLOUD_SHAPE_DRAW, () => {
             this.view.emit(WORDCLOUD_SHAPE_HOOK_EVENT.AFTER_WORDCLOUD_SHAPE_DRAW, {
               successedWords: successedWords,
@@ -98983,7 +98923,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             };
         }
         _getTitleAttrs() {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
+            var _a, _b, _c, _d, _e, _f;
             if (this._spec.visible === false) {
                 return { visible: false };
             }
@@ -98991,10 +98931,26 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             const titleWidth = calcLayoutNumber(this._spec.width, layoutRect.width, null, layoutRect.width);
             const titleMaxWidth = calcLayoutNumber(this._spec.maxWidth, layoutRect.width, null, layoutRect.width);
             const maxWidth = Math.max(Math.min(titleWidth, titleMaxWidth, layoutRect.width), 0);
-            const attrs = Object.assign(Object.assign({}, pickWithout(this._spec, ['padding'])), { textType: (_a = this._spec.textType) !== null && _a !== void 0 ? _a : 'text', text: (_b = this._spec.text) !== null && _b !== void 0 ? _b : '', subtextType: (_c = this._spec.subtextType) !== null && _c !== void 0 ? _c : 'text', subtext: (_d = this._spec.subtext) !== null && _d !== void 0 ? _d : '', x: (_e = this._spec.x) !== null && _e !== void 0 ? _e : 0, y: (_f = this._spec.y) !== null && _f !== void 0 ? _f : 0, height: this._spec.height, minWidth: this._spec.minWidth, maxWidth, minHeight: this._spec.minHeight, maxHeight: this._spec.maxHeight, padding: this._spec.innerPadding, align: (_g = this._spec.align) !== null && _g !== void 0 ? _g : 'left', verticalAlign: (_h = this._spec.verticalAlign) !== null && _h !== void 0 ? _h : 'top', textStyle: Object.assign({ width: maxWidth, maxLineWidth: maxWidth }, this._spec.textStyle), subtextStyle: Object.assign({ maxLineWidth: maxWidth }, this._spec.subtextStyle) });
+            const hasText = isValid$1(this._spec.text) && this._spec.text !== '';
+            const hasSubtext = isValid$1(this._spec.subtext) && this._spec.subtext !== '';
+            const attrs = Object.assign(Object.assign({}, pickWithout(this._spec, ['padding'])), { textType: (_a = this._spec.textType) !== null && _a !== void 0 ? _a : 'text', text: hasText ? this._spec.text : undefined, subtextType: (_b = this._spec.subtextType) !== null && _b !== void 0 ? _b : 'text', subtext: hasSubtext ? this._spec.subtext : undefined, x: (_c = this._spec.x) !== null && _c !== void 0 ? _c : 0, y: (_d = this._spec.y) !== null && _d !== void 0 ? _d : 0, height: this._spec.height, minWidth: this._spec.minWidth, maxWidth, minHeight: this._spec.minHeight, maxHeight: this._spec.maxHeight, padding: this._spec.innerPadding, align: (_e = this._spec.align) !== null && _e !== void 0 ? _e : 'left', verticalAlign: (_f = this._spec.verticalAlign) !== null && _f !== void 0 ? _f : 'top', textStyle: Object.assign({ maxLineWidth: maxWidth }, this._spec.textStyle), subtextStyle: Object.assign({ maxLineWidth: maxWidth }, this._spec.subtextStyle) });
+            if (hasText) {
+                attrs.textStyle.width = maxWidth;
+            }
+            if (hasSubtext) {
+                attrs.subtextStyle.width = maxWidth;
+            }
             if (isValid$1(this._spec.width)) {
-                attrs.textStyle.width = Math.max(titleWidth, layoutRect.width);
-                attrs.subtextStyle.width = attrs.textStyle.width;
+                const clampedWidth = Math.max(Math.min(titleWidth, layoutRect.width), 0);
+                if (hasText) {
+                    attrs.textStyle.width = clampedWidth;
+                }
+                else {
+                    delete attrs.textStyle.width;
+                }
+                if (hasSubtext) {
+                    attrs.subtextStyle.width = clampedWidth;
+                }
             }
             return attrs;
         }