@visactor/vchart 1.13.22 → 1.13.23-alpha.1

package/build/index.es.js

@@ -80487,6 +80487,41 @@ const SHAPE_TYPE = [
     '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" } });
@@ -80563,11 +80598,16 @@ class BaseWordCloudSeries extends BaseSeries {
             !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();
         });
@@ -80736,7 +80776,7 @@ class BaseWordCloudSeries extends BaseSeries {
         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()), { rotateList: this._rotateAngles, fillingRotateList: wordCloudShapeConfig.fillingRotateAngles, fillingFontFamily: isValid$1(wordCloudShapeConfig.fillingFontFamilyField)
+        return Object.assign(Object.assign(Object.assign({}, wordCloudShapeConfig), this._getCommonTransformOptions()), { measureCache: this._wordMeasureCache, 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 }
@@ -80785,6 +80825,7 @@ class BaseWordCloudSeries extends BaseSeries {
         return [this._wordMark];
     }
     reInit() {
+        var _a;
         super.reInit();
         if (this._keyWordColorCallback) {
             this._keyWordColorCallback = null;
@@ -80792,6 +80833,13 @@ class BaseWordCloudSeries extends BaseSeries {
         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;
@@ -81718,6 +81766,30 @@ var WORDCLOUD_SHAPE_HOOK_EVENT;
 !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;
@@ -81957,7 +82029,7 @@ function layout(words, layoutConfig, segmentationOutput) {
       ratio: ratio
     } = region;
     for (let i = 0; i < regionWords.length; i++) {
-      measureSprite(canvas, ctx, words, i);
+      measureSprite(canvas, ctx, words, i, layoutConfig.measureCache);
       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);
     }
@@ -81967,7 +82039,7 @@ function layout(words, layoutConfig, segmentationOutput) {
     if (0 === failedWords.length) break;
     for (let i = 0; i < failedWords.length; i++) {
       const word = failedWords[i];
-      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);
+      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);
     }
   }
   layoutConfig.board = board;
@@ -82013,7 +82085,7 @@ function layoutGlobalShrink(words, layoutConfig, segmentationOutput) {
       } = region;
     let restartTag = !1;
     for (let i = 0; i < regionWords.length; i++) {
-      measureSprite(canvas, ctx, words, i);
+      measureSprite(canvas, ctx, words, i, layoutConfig.measureCache);
       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) {
@@ -82038,7 +82110,7 @@ function layoutGlobalShrink(words, layoutConfig, segmentationOutput) {
     if (0 === failedWords.length) break;
     for (let i = 0; i < failedWords.length; i++) {
       const word = failedWords[i];
-      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);
+      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);
     }
   }
   layoutConfig.board = board;
@@ -82083,7 +82155,7 @@ function layoutSelfEnlarge(words, layoutConfig, segmentationOutput) {
       } = region;
     let restartTag = !1;
     for (let i = 0; i < regionWords.length; i++) {
-      measureSprite(canvas, ctx, words, i);
+      measureSprite(canvas, ctx, words, i, layoutConfig.measureCache);
       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) {
@@ -82109,7 +82181,7 @@ function layoutSelfEnlarge(words, layoutConfig, segmentationOutput) {
     if (0 === failedWords.length) break;
     for (let i = 0; i < failedWords.length; i++) {
       const word = failedWords[i];
-      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);
+      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);
     }
   }
   layoutConfig.board = board;
@@ -82188,8 +82260,13 @@ function archimedeanSpiral(ratio) {
     return [ratio * (t *= .1) * Math.cos(t), t * Math.sin(t)];
   };
 }
-function measureSprite(canvas, ctx, words, wi) {
-  if (words[wi].sprite || 0 === words[wi].fontSize) return;
+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);
+  }
   const cw = 2048,
     radians = Math.PI / 180,
     n = words.length;
@@ -82252,14 +82329,25 @@ function measureSprite(canvas, ctx, words, wi) {
       }
       seen && (j < dTop && (dTop = j), j > dBottom && (dBottom = j));
     }
-    word.bounds = {
+    if (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, delete word.LT;
+    }, word.sprite = sprite, cache) {
+      const key = getWordMeasureKey(word);
+      cache.set(key, {
+        sprite: sprite,
+        bounds: word.bounds,
+        wordSize: wordSize
+      });
+    }
+    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: {
@@ -82356,7 +82444,7 @@ function filling(words, layoutConfig, segmentationOutput) {
       } = 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);
+      measureSprite(canvas, ctx, fillingWords, wi, layoutConfig.measureCache);
       const word = fillingWords[wi];
       word.x = x, word.y = y;
       const {
@@ -82473,7 +82561,7 @@ class Layout {
     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;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
     const segmentationInput = this.segmentationInput,
       segmentationOutput = segmentation(segmentationInput);
     if (!segmentationOutput.segmentation.regions.length) return;
@@ -82500,35 +82588,36 @@ class Layout {
     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 !== (_a = options.textLayoutTimes) && void 0 !== _a ? _a : 3,
+        textLayoutTimes: null !== (_b = options.textLayoutTimes) && void 0 !== _b ? _b : 3,
         removeWhiteBorder: options.removeWhiteBorder,
-        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,
+        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,
         globalShinkLimit: options.globalShinkLimit || .2,
-        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,
+        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,
         fillingInitialFontSize: options.fillingInitialFontSize,
         fillingDeltaFontSize: options.fillingDeltaFontSize,
-        fillingInitialOpacity: null !== (_l = options.fillingInitialOpacity) && void 0 !== _l ? _l : .8,
-        fillingDeltaOpacity: null !== (_m = options.fillingDeltaOpacity) && void 0 !== _m ? _m : .05,
+        fillingInitialOpacity: null !== (_m = options.fillingInitialOpacity) && void 0 !== _m ? _m : .8,
+        fillingDeltaOpacity: null !== (_o = options.fillingDeltaOpacity) && void 0 !== _o ? _o : .05,
         getFillingFontFamily: field(options.fillingFontFamily || "sans-serif"),
         getFillingFontStyle: field(options.fillingFontStyle || "normal"),
         getFillingFontWeight: field(options.fillingFontWeight || "normal"),
-        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,
+        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,
         fillingColorList: options.fillingColorList || ["#537EF5"],
         sameColorList: !1,
-        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
+        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
       },
       sameColorList = colorListEqual(wordsConfig.colorList, layoutConfig.fillingColorList);
     layoutConfig.sameColorList = sameColorList, initColorScale(data, wordsConfig, layoutConfig, options), initFillingWordsFontSize(data, wordsConfig, layoutConfig, segmentationOutput);
@@ -82575,8 +82664,8 @@ class Layout {
         successedWords: successedWords,
         failedWords: failedWords
       } = cloud(words, layoutConfig, segmentationOutput),
-      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",
+      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",
       as = options.as ? Object.assign(Object.assign({}, OUTPUT), options.as) : OUTPUT;
     let w, t;
     const modKeywords = [];
@@ -82591,7 +82680,7 @@ class Layout {
         successedWords: successedWords,
         failedWords: failedWords
       });
-      const stage = null === (_x = this.view.renderer) || void 0 === _x ? void 0 : _x.stage();
+      const stage = null === (_y = this.view.renderer) || void 0 === _y ? void 0 : _y.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,
@@ -104214,10 +104303,6 @@ class ScrollPlugin extends BasePlugin {
         };
         this.onWheel = (e) => {
             var _a, _b;
-            if (this._spec.preventDefault !== false) {
-                e.preventDefault();
-                e.stopPropagation();
-            }
             const scrollX = e.deltaX;
             const scrollY = e.deltaY;
             const rootMark = this.getRootMark();
@@ -104227,6 +104312,7 @@ class ScrollPlugin extends BasePlugin {
             const { percent: yPercent, y } = (_a = this._computeFinalScrollY(rootMark.attribute.y - scrollY)) !== null && _a !== void 0 ? _a : {};
             const { percent: xPercent, x } = (_b = this._computeFinalScrollX(rootMark.attribute.x - scrollX)) !== null && _b !== void 0 ? _b : {};
             const eventResult = {};
+            const isScroll = isValidNumber$1(x) || isValidNumber$1(y);
             if (isValidNumber$1(x)) {
                 this._updateScrollX(rootMark, x, xPercent);
                 eventResult.x = x;
@@ -104235,6 +104321,12 @@ class ScrollPlugin extends BasePlugin {
                 this._updateScrollY(rootMark, y, yPercent);
                 eventResult.y = y;
             }
+            if (isScroll) {
+                if (this._spec.preventDefault !== false) {
+                    e.preventDefault();
+                    e.stopPropagation();
+                }
+            }
             this._event.emit('chartScroll', eventResult);
         };
     }
@@ -104291,6 +104383,7 @@ class ScrollPlugin extends BasePlugin {
     }
     _computeFinalScrollY(y) {
         var _a;
+        y = Math.max(this._scrollLimit.y.min, Math.min(y, this._scrollLimit.y.max));
         if (this._lastScrollY === y) {
             return null;
         }
@@ -104298,15 +104391,15 @@ class ScrollPlugin extends BasePlugin {
         if (((_a = this._spec.y) === null || _a === void 0 ? void 0 : _a.enable) === false) {
             return null;
         }
-        const finalY = Math.max(this._scrollLimit.y.min, Math.min(y, this._scrollLimit.y.max));
-        const percent = Math.abs(finalY / this._scrollLimit.y.size);
+        const percent = Math.abs(y / this._scrollLimit.y.size);
         return {
-            y: finalY,
+            y,
             percent
         };
     }
     _computeFinalScrollX(x) {
         var _a;
+        x = Math.max(this._scrollLimit.x.min, Math.min(x, this._scrollLimit.x.max));
         if (this._lastScrollX === x) {
             return null;
         }
@@ -104314,10 +104407,9 @@ class ScrollPlugin extends BasePlugin {
         if (((_a = this._spec.x) === null || _a === void 0 ? void 0 : _a.enable) === false) {
             return null;
         }
-        const finalX = Math.max(this._scrollLimit.x.min, Math.min(x, this._scrollLimit.x.max));
-        const percent = Math.abs(finalX / this._scrollLimit.x.size);
+        const percent = Math.abs(x / this._scrollLimit.x.size);
         return {
-            x: finalX,
+            x,
             percent
         };
     }