@visactor/react-vchart 2.0.15 → 2.0.16

package/build/index.js

@@ -66331,6 +66331,31 @@
     const DEFAULT_FONT_PADDING = 1;
     const SHAPE_TYPE = ["triangleForward", "triangle", "diamond", "square", "star", "cardioid", "circle", "pentagon", "rect"];
 
+    class WordMeasureCache {
+      constructor(maxSize = 1e3) {
+        this._map = new Map(), this._maxSize = maxSize;
+      }
+      get(key) {
+        const v = this._map.get(key);
+        if (v) return this._map.delete(key), this._map.set(key, v), v;
+      }
+      set(key, value) {
+        if (this._map.has(key)) this._map.set(key, value);else {
+          if (this._map.size >= this._maxSize) {
+            const oldest = this._map.keys().next().value;
+            void 0 !== oldest && 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), {
@@ -66387,12 +66412,13 @@
           fillingSeriesField: this.getSeriesField(),
           fillingRotateAngles: DEFAULT_ROTATE_ANGLES,
           layoutMode: "default"
-        }, this._spec.wordCloudShapeConfig), this._isWordCloudShape = !SHAPE_TYPE.includes(this._maskShape) && !["fast", "grid", "cloud"].includes(this._wordCloudConfig.layoutMode), this._defaultFontFamily = this._option.getTheme("fontFamily");
+        }, this._spec.wordCloudShapeConfig), this._isWordCloudShape = !SHAPE_TYPE.includes(this._maskShape) && !["fast", "grid", "cloud"].includes(this._wordCloudConfig.layoutMode), this._defaultFontFamily = this._option.getTheme("fontFamily"), this._wordMeasureCache || (this._wordMeasureCache = new WordMeasureCache(1e3));
       }
       initData() {
         var _a, _b;
         super.initData(), null === (_b = null === (_a = this.getViewData()) || void 0 === _a ? void 0 : _a.target) || void 0 === _b || _b.addListener("change", () => {
-          this._dataChange = !0, this.compile();
+          var _a;
+          null === (_a = this._wordMeasureCache) || void 0 === _a || _a.clear(), this._dataChange = !0, this.compile();
         });
       }
       initMark() {
@@ -66559,6 +66585,7 @@
           wordCloudShapeConfig = null !== (_c = this._wordCloudShapeConfig) && void 0 !== _c ? _c : {};
         return Object.assign(Object.assign(Object.assign({}, wordCloudShapeConfig), this._getCommonTransformOptions()), {
           createImage: createImage,
+          measureCache: this._wordMeasureCache,
           rotateList: this._rotateAngles,
           fillingRotateList: wordCloudShapeConfig.fillingRotateAngles,
           fillingFontFamily: isValid$1(wordCloudShapeConfig.fillingFontFamilyField) ? {
@@ -66614,7 +66641,12 @@
         return [this._wordMark];
       }
       reInit() {
-        super.reInit(), this._keyWordColorCallback && (this._keyWordColorCallback = null), this._fillingColorCallback && (this._fillingColorCallback = null);
+        var _a;
+        super.reInit(), this._keyWordColorCallback && (this._keyWordColorCallback = null), this._fillingColorCallback && (this._fillingColorCallback = null), null === (_a = this._wordMeasureCache) || void 0 === _a || _a.clear();
+      }
+      release() {
+        var _a;
+        super.release(), null === (_a = this._wordMeasureCache) || void 0 === _a || _a.clear(), this._wordMeasureCache = void 0;
       }
     }
     BaseWordCloudSeries.mark = wordCloudSeriesMark, BaseWordCloudSeries.builtInTheme = {
@@ -69899,6 +69931,30 @@
     !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;
@@ -69986,7 +70042,7 @@
           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(board, word, maxR, ratio, size, boardSize, stepFactor) && (word.hasPlaced = !0);
         }
@@ -69996,7 +70052,7 @@
         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(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(board, word, shapeMaxR, shapeRatio, size, boardSize, stepFactor) && (word.hasPlaced = !0);
         }
       }
       layoutConfig.board = board;
@@ -70042,7 +70098,7 @@
           } = 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(board, word, maxR, ratio, size, boardSize, stepFactor)) word.hasPlaced = !0;else {
             if (!word.skip && word.weight > weightStd && globalShinkFactor > globalShinkLimit) {
@@ -70067,7 +70123,7 @@
         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(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(board, word, shapeMaxR, shapeRatio, size, boardSize, stepFactor) && (word.hasPlaced = !0);
         }
       }
       layoutConfig.board = board;
@@ -70112,7 +70168,7 @@
           } = 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(board, word, maxR, ratio, size, boardSize, stepFactor)) {
             if (word.hasPlaced = !0, word.weight >= weightStd && importantWordSuccessedNum++, importantWordSuccessedNum >= importantCount && !layoutFinish) {
@@ -70138,7 +70194,7 @@
         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(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(board, word, shapeMaxR, shapeRatio, size, boardSize, stepFactor) && (word.hasPlaced = !0);
         }
       }
       layoutConfig.board = board;
@@ -70217,8 +70273,13 @@
         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;
@@ -70281,14 +70342,25 @@
           }
           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: {
@@ -70385,7 +70457,7 @@
           } = 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 {
@@ -70521,7 +70593,7 @@
         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;
+        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;
@@ -70548,35 +70620,36 @@
         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: simpleField(options.fillingFontFamily || "sans-serif"),
             getFillingFontStyle: simpleField(options.fillingFontStyle || "normal"),
             getFillingFontWeight: simpleField(options.fillingFontWeight || "normal"),
-            getFillingPadding: simpleField(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: simpleField(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);
@@ -70623,8 +70696,8 @@
             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 = [];
@@ -83200,13 +83273,13 @@
         return "polar" === markerSpec.coordinateType || doPolarProcess ? "polar" : "geo" === markerSpec.coordinateType || doGeoProcess ? "geo" : "cartesian";
       }
       _createMarkerComponent() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9;
         const {
             itemContent = {},
             itemLine = {},
             targetSymbol = {}
           } = this._spec,
-          _9 = itemContent,
+          _10 = itemContent,
           {
             type = "text",
             text: label,
@@ -83221,8 +83294,8 @@
             customMarkStyle: customMarkStyle,
             style = {},
             state = {}
-          } = _9,
-          restItemContent = __rest$1(_9, ["type", "text", "symbol", "image", "richText", "customMark", "textStyle", "symbolStyle", "imageStyle", "richTextStyle", "customMarkStyle", "style", "state"]);
+          } = _10,
+          restItemContent = __rest$1(_10, ["type", "text", "symbol", "image", "richText", "customMark", "textStyle", "symbolStyle", "imageStyle", "richTextStyle", "customMarkStyle", "style", "state"]);
         let itemContentState = null,
           itemContentStyle = null,
           defaultStyle = {};
@@ -83230,29 +83303,29 @@
           dx: 0,
           dy: 0
         }, itemContentStyle = transformLabelAttributes(Object.assign(Object.assign({}, label), {
-          style: merge$1(defaultStyle, null !== (_c = null !== (_b = null == label ? void 0 : label.textStyle) && void 0 !== _b ? _b : textStyle) && void 0 !== _c ? _c : style)
-        }), this._markerData, this._markAttributeContext)) : "richText" === type ? (itemContentState = null !== (_d = null == richText ? void 0 : richText.state) && void 0 !== _d ? _d : state, defaultStyle = {
+          style: merge$1(defaultStyle, null !== (_d = null !== (_c = null !== (_b = null == label ? void 0 : label.style) && void 0 !== _b ? _b : null == label ? void 0 : label.textStyle) && void 0 !== _c ? _c : textStyle) && void 0 !== _d ? _d : style)
+        }), this._markerData, this._markAttributeContext)) : "richText" === type ? (itemContentState = null !== (_e = null == richText ? void 0 : richText.state) && void 0 !== _e ? _e : state, defaultStyle = {
           width: 100,
           height: 100
-        }, itemContentStyle = transformStyle(merge$1(defaultStyle, null !== (_f = null !== (_e = null == richText ? void 0 : richText.style) && void 0 !== _e ? _e : richTextStyle) && void 0 !== _f ? _f : style), this._markerData, this._markAttributeContext)) : "symbol" === type ? (itemContentState = null !== (_g = null == symbol ? void 0 : symbol.state) && void 0 !== _g ? _g : state, defaultStyle = {
+        }, itemContentStyle = transformStyle(merge$1(defaultStyle, null !== (_g = null !== (_f = null == richText ? void 0 : richText.style) && void 0 !== _f ? _f : richTextStyle) && void 0 !== _g ? _g : style), this._markerData, this._markAttributeContext)) : "symbol" === type ? (itemContentState = null !== (_h = null == symbol ? void 0 : symbol.state) && void 0 !== _h ? _h : state, defaultStyle = {
           symbolType: "star",
           fill: "rgb(48, 115, 242)",
           fillOpacity: .8,
           size: 20
-        }, itemContentStyle = transformToGraphic(transformStyle(merge$1(defaultStyle, null !== (_j = null !== (_h = null == symbol ? void 0 : symbol.style) && void 0 !== _h ? _h : symbolStyle) && void 0 !== _j ? _j : style), this._markerData, this._markAttributeContext))) : "image" === type ? (itemContentState = null !== (_k = null == image ? void 0 : image.state) && void 0 !== _k ? _k : state, defaultStyle = {
+        }, itemContentStyle = transformToGraphic(transformStyle(merge$1(defaultStyle, null !== (_k = null !== (_j = null == symbol ? void 0 : symbol.style) && void 0 !== _j ? _j : symbolStyle) && void 0 !== _k ? _k : style), this._markerData, this._markAttributeContext))) : "image" === type ? (itemContentState = null !== (_l = null == image ? void 0 : image.state) && void 0 !== _l ? _l : state, defaultStyle = {
           width: 80,
           height: 80
-        }, itemContentStyle = transformStyle(merge$1(defaultStyle, null !== (_m = null !== (_l = null == image ? void 0 : image.style) && void 0 !== _l ? _l : imageStyle) && void 0 !== _m ? _m : style), this._markerData, this._markAttributeContext)) : "custom" === type && (itemContentState = null !== (_o = null == customMark ? void 0 : customMark.state) && void 0 !== _o ? _o : state, itemContentStyle = transformStyle(null !== (_q = null !== (_p = null == customMark ? void 0 : customMark.style) && void 0 !== _p ? _p : customMarkStyle) && void 0 !== _q ? _q : style, this._markerData, this._markAttributeContext));
+        }, itemContentStyle = transformStyle(merge$1(defaultStyle, null !== (_o = null !== (_m = null == image ? void 0 : image.style) && void 0 !== _m ? _m : imageStyle) && void 0 !== _o ? _o : style), this._markerData, this._markAttributeContext)) : "custom" === type && (itemContentState = null !== (_p = null == customMark ? void 0 : customMark.state) && void 0 !== _p ? _p : state, itemContentStyle = transformStyle(null !== (_r = null !== (_q = null == customMark ? void 0 : customMark.style) && void 0 !== _q ? _q : customMarkStyle) && void 0 !== _r ? _r : style, this._markerData, this._markAttributeContext));
         const markPointAttrs = {
             zIndex: this.layoutZIndex,
-            interactive: null === (_r = this._spec.interactive) || void 0 === _r || _r,
-            hover: null === (_s = this._spec.interactive) || void 0 === _s || _s,
-            select: null === (_t = this._spec.interactive) || void 0 === _t || _t,
+            interactive: null === (_s = this._spec.interactive) || void 0 === _s || _s,
+            hover: null === (_t = this._spec.interactive) || void 0 === _t || _t,
+            select: null === (_u = this._spec.interactive) || void 0 === _u || _u,
             position: {
               x: 0,
               y: 0
             },
-            clipInRange: null !== (_u = this._spec.clip) && void 0 !== _u && _u,
+            clipInRange: null !== (_v = this._spec.clip) && void 0 !== _v && _v,
             itemContent: Object.assign(Object.assign({
               type: type,
               offsetX: transformOffset(itemContent.offsetX, this._relativeSeries.getRegion()),
@@ -83261,20 +83334,20 @@
               style: transformStyle(itemContentStyle, this._markerData, this._markAttributeContext)
             }),
             targetSymbol: {
-              offset: null !== (_v = targetSymbol.offset) && void 0 !== _v ? _v : 0,
-              visible: null !== (_w = targetSymbol.visible) && void 0 !== _w && _w,
-              size: null !== (_x = targetSymbol.size) && void 0 !== _x ? _x : 20,
+              offset: null !== (_w = targetSymbol.offset) && void 0 !== _w ? _w : 0,
+              visible: null !== (_x = targetSymbol.visible) && void 0 !== _x && _x,
+              size: null !== (_y = targetSymbol.size) && void 0 !== _y ? _y : 20,
               style: transformStyle(targetSymbol.style, this._markerData, this._markAttributeContext)
             },
             state: {
-              line: transformState(null !== (_z = null === (_y = this._spec.itemLine.line) || void 0 === _y ? void 0 : _y.state) && void 0 !== _z ? _z : {}, this._markerData, this._markAttributeContext),
-              lineStartSymbol: transformState(null !== (_1 = null === (_0 = this._spec.itemLine.startSymbol) || void 0 === _0 ? void 0 : _0.state) && void 0 !== _1 ? _1 : {}, this._markerData, this._markAttributeContext),
-              lineEndSymbol: transformState(null !== (_3 = null === (_2 = this._spec.itemLine.endSymbol) || void 0 === _2 ? void 0 : _2.state) && void 0 !== _3 ? _3 : {}, this._markerData, this._markAttributeContext),
+              line: transformState(null !== (_0 = null === (_z = this._spec.itemLine.line) || void 0 === _z ? void 0 : _z.state) && void 0 !== _0 ? _0 : {}, this._markerData, this._markAttributeContext),
+              lineStartSymbol: transformState(null !== (_2 = null === (_1 = this._spec.itemLine.startSymbol) || void 0 === _1 ? void 0 : _1.state) && void 0 !== _2 ? _2 : {}, this._markerData, this._markAttributeContext),
+              lineEndSymbol: transformState(null !== (_4 = null === (_3 = this._spec.itemLine.endSymbol) || void 0 === _3 ? void 0 : _3.state) && void 0 !== _4 ? _4 : {}, this._markerData, this._markAttributeContext),
               itemContent: transformState(itemContentState, this._markerData, this._markAttributeContext),
-              textBackground: transformState(null === (_5 = null === (_4 = this._spec.itemContent.text) || void 0 === _4 ? void 0 : _4.labelBackground) || void 0 === _5 ? void 0 : _5.state, this._markerData, this._markAttributeContext),
-              targetItem: transformState(null !== (_7 = null === (_6 = this._spec.targetSymbol) || void 0 === _6 ? void 0 : _6.state) && void 0 !== _7 ? _7 : {}, this._markerData, this._markAttributeContext)
+              textBackground: transformState(null === (_6 = null === (_5 = this._spec.itemContent.text) || void 0 === _5 ? void 0 : _5.labelBackground) || void 0 === _6 ? void 0 : _6.state, this._markerData, this._markAttributeContext),
+              targetItem: transformState(null !== (_8 = null === (_7 = this._spec.targetSymbol) || void 0 === _7 ? void 0 : _7.state) && void 0 !== _8 ? _8 : {}, this._markerData, this._markAttributeContext)
             },
-            animation: null !== (_8 = this._spec.animation) && void 0 !== _8 && _8,
+            animation: null !== (_9 = this._spec.animation) && void 0 !== _9 && _9,
             animationEnter: this._spec.animationEnter,
             animationExit: this._spec.animationExit,
             animationUpdate: this._spec.animationUpdate
@@ -88703,7 +88776,7 @@
 
     const VChartSimple = createChart('VChartSimple');
 
-    const version = "2.0.15";
+    const version = "2.0.16";
 
     exports.Area = Area;
     exports.AreaChart = AreaChart;