@visactor/vchart 1.11.13 → 1.11.15-alpha.0

package/build/index.js

@@ -31600,10 +31600,10 @@
           if (visible && isBoolean$1(bgVisible)) {
             const bgRect = this.createOrUpdateChild("tag-panel", Object.assign(Object.assign({}, backgroundStyle), {
               visible: bgVisible && !!text,
-              x: textShape.AABBBounds.x1,
-              y: textShape.AABBBounds.y1,
-              width: textShape.AABBBounds.width(),
-              height: textShape.AABBBounds.height()
+              x: textShape.AABBBounds.x1 - parsedPadding[1],
+              y: textShape.AABBBounds.y1 - parsedPadding[0],
+              width: textShape.AABBBounds.width() + (parsedPadding[1] + parsedPadding[3]),
+              height: textShape.AABBBounds.height() + (parsedPadding[0] + parsedPadding[2])
             }), "rect");
             if (isEmpty(null == state ? void 0 : state.panel) || (bgRect.states = state.panel), backgroundStyle.customShape) {
               const customShape = backgroundStyle.customShape;
@@ -42266,7 +42266,7 @@
         }
       }
       render() {
-        var _a;
+        var _a, _b;
         if (this.removeAllChild(!0), !0 !== this.attribute.visible) return;
         const {
             title = {},
@@ -42278,7 +42278,8 @@
           group = this.createOrUpdateChild("indicator-container", {
             x: 0,
             y: 0,
-            zIndex: 1
+            zIndex: 1,
+            pickable: null === (_a = this.attribute.pickable) || void 0 === _a || _a
           }, "group");
         if (isValid$1(title) && (this._title = this._renderText(group, title, limit, limitRatio, "title.style", "indicator-title")), isValid$1(content)) {
           const contents = array(content),
@@ -42288,7 +42289,7 @@
           }), this._content = contentComponents;
         }
         this._setGlobalAutoFit(limit), this._setYPosition();
-        const totalHeight = null !== (_a = null == group ? void 0 : group.AABBBounds.height()) && void 0 !== _a ? _a : 0;
+        const totalHeight = null !== (_b = null == group ? void 0 : group.AABBBounds.height()) && void 0 !== _b ? _b : 0;
         group.setAttribute("y", size.height / 2 - totalHeight / 2), group.setAttribute("x", size.width / 2);
       }
       _setLocalAutoFit(limit, indicatorItem, indicatorItemSpec) {
@@ -57907,6 +57908,17 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 }
             }
         }
+        clearAllEventElement() {
+            if (this._disableTriggerEvent) {
+                return;
+            }
+            for (const [stateValue, elements] of this._stateElements) {
+                elements.forEach(e => {
+                    e.clearStates();
+                });
+                this._stateElements.set(stateValue, []);
+            }
+        }
         reverseEventElement(stateValue) {
             if (this._disableTriggerEvent) {
                 return;
@@ -57961,6 +57973,15 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 });
             }
         }
+        resetAllInteraction() {
+            for (const [stateValue, interactions] of this._vgrammarInteractions) {
+                if (interactions) {
+                    interactions.forEach(vgInteraction => {
+                        vgInteraction.reset(null);
+                    });
+                }
+            }
+        }
     }
 
     class CompilableBase {
@@ -62107,6 +62128,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             }
             this._chart.clearState(state);
         }
+        clearAllStates() {
+            if (!this._chart) {
+                return;
+            }
+            this._chart.clearAllStates();
+        }
         clearSelected() {
             if (!this._chart) {
                 return;
@@ -66854,7 +66881,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         registerComponentPlugin(CanvasTooltipHandler);
     };
 
-    const version = "1.11.13";
+    const version = "1.11.15-alpha.0";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -71786,6 +71813,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     result.reMake = true;
                     return result;
                 }
+                if (!isEqual$1(lastSpec.specified, s.specified)) {
+                    result.reMake = true;
+                    return result;
+                }
                 if (s.range && !isEqual$1(s.range, scale.range())) {
                     scale.range(s.range);
                     result.reRender = true;
@@ -72798,6 +72829,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 return;
             });
         }
+        clearAllStates() {
+            this.getAllRegions().forEach(r => {
+                r.interaction.clearAllEventElement();
+                r.interaction.resetAllInteraction();
+                return;
+            });
+        }
         clearSelected() {
             this.clearState(STATE_VALUE_ENUM.STATE_SELECTED);
         }
@@ -81808,12 +81846,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             });
         }
         initMarkStyle() {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e;
             const wordMark = this._wordMark;
             const wordSpec = (_a = this._spec.word) !== null && _a !== void 0 ? _a : {};
             if (wordMark) {
                 this.setMarkStyle(wordMark, {
-                    fill: this.getWordColor,
                     text: (datum) => datum[this._textField],
                     x: (datum) => datum.x,
                     y: (datum) => datum.y,
@@ -81825,7 +81862,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     visible: (datum) => datum.visible
                 }, 'normal', exports.AttributeLevel.Series);
                 this.setMarkStyle(wordMark, {
-                    fontFamily: (_c = (_b = wordSpec.style) === null || _b === void 0 ? void 0 : _b.fontFamily) !== null && _c !== void 0 ? _c : this._defaultFontFamily
+                    fontFamily: (_c = (_b = wordSpec.style) === null || _b === void 0 ? void 0 : _b.fontFamily) !== null && _c !== void 0 ? _c : this._defaultFontFamily,
+                    fill: (_e = (_d = wordSpec === null || wordSpec === void 0 ? void 0 : wordSpec.style) === null || _d === void 0 ? void 0 : _d.fill) !== null && _e !== void 0 ? _e : this.getWordColor
                 }, 'normal', exports.AttributeLevel.User_Mark);
             }
         }
@@ -87981,6 +88019,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this._initLabelMarkStyle();
         }
         _initNodeMarkStyle() {
+            var _a, _b;
             const nodeMark = this._nodeMark;
             if (!nodeMark) {
                 return;
@@ -87991,12 +88030,14 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 },
                 x1: (datum) => datum.x1,
                 y: (datum) => datum.y0,
-                y1: (datum) => datum.y1,
-                fill: this._fillByNode
+                y1: (datum) => datum.y1
             }, STATE_VALUE_ENUM.STATE_NORMAL, exports.AttributeLevel.Mark);
+            this.setMarkStyle(nodeMark, {
+                fill: (_b = (_a = this._spec.node.style) === null || _a === void 0 ? void 0 : _a.fill) !== null && _b !== void 0 ? _b : this._fillByNode
+            }, 'normal', exports.AttributeLevel.User_Mark);
         }
         _initLinkMarkStyle() {
-            var _a;
+            var _a, _b, _c;
             const linkMark = this._linkMark;
             if (!linkMark) {
                 return;
@@ -88007,9 +88048,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 y0: (datum) => datum.y0,
                 y1: (datum) => datum.y1,
                 thickness: (datum) => datum.thickness,
-                fill: this._fillByLink,
                 direction: (_a = this._spec.direction) !== null && _a !== void 0 ? _a : 'horizontal'
             }, STATE_VALUE_ENUM.STATE_NORMAL, exports.AttributeLevel.Series);
+            this.setMarkStyle(linkMark, {
+                fill: (_c = (_b = this._spec.link.style) === null || _b === void 0 ? void 0 : _b.fill) !== null && _c !== void 0 ? _c : this._fillByLink
+            }, 'normal', exports.AttributeLevel.User_Mark);
         }
         _initLabelMarkStyle() {
             if (!this._labelMark) {
@@ -97268,11 +97311,17 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             super.updateLayoutAttribute();
         }
         _getIndicatorAttrs() {
+            if (this._spec.visible === false || (this._spec.fixed === false && this._activeDatum === null)) {
+                return {
+                    visible: false
+                };
+            }
             const region = this._regions[0];
             const { width, height } = region.getLayoutRect();
             const { x, y } = region.getLayoutStartPoint();
+            const _a = this._spec, { content, offsetX, offsetY, limitRatio, title } = _a, restSpec = __rest$7(_a, ["content", "offsetX", "offsetY", "limitRatio", "title"]);
             const contentComponentSpec = [];
-            array(this._spec.content).forEach((eachItem) => {
+            array(content).forEach((eachItem) => {
                 const contentSpec = mergeSpec({}, this._theme.content, eachItem);
                 contentComponentSpec.push({
                     visible: contentSpec.visible !== false && (contentSpec.field ? this._activeDatum !== null : true),
@@ -97284,29 +97333,18 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     style: Object.assign(Object.assign({}, transformIndicatorStyle(pickWithout(contentSpec.style, ['text']), this._activeDatum)), { text: this._createText(contentSpec.field, contentSpec.style.text) })
                 });
             });
-            return {
-                visible: this._spec.visible !== false && (this._spec.fixed !== false || this._activeDatum !== null),
-                size: {
+            return Object.assign({ visible: true, size: {
                     width: width,
                     height: height
-                },
-                zIndex: this.layoutZIndex,
-                x: x,
-                y: y,
-                dx: this._spec.offsetX ? getActualNumValue(this._spec.offsetX, this._computeLayoutRadius()) : 0,
-                dy: this._spec.offsetY ? getActualNumValue(this._spec.offsetY, this._computeLayoutRadius()) : 0,
-                limitRatio: this._spec.limitRatio || Infinity,
-                title: {
-                    visible: this._spec.title.visible !== false && (!isValid$1(this._spec.title.field) || this._activeDatum !== null),
-                    space: this._spec.title.space || this._gap,
-                    autoLimit: this._spec.title.autoLimit,
-                    autoFit: this._spec.title.autoFit,
-                    fitPercent: this._spec.title.fitPercent,
-                    fitStrategy: this._spec.title.fitStrategy,
-                    style: Object.assign(Object.assign({}, transformIndicatorStyle(pickWithout(this._spec.title.style, ['text']), this._activeDatum)), { text: this._createText(this._spec.title.field, this._spec.title.style.text) })
-                },
-                content: contentComponentSpec
-            };
+                }, zIndex: this.layoutZIndex, x: x, y: y, dx: offsetX ? getActualNumValue(offsetX, this._computeLayoutRadius()) : 0, dy: offsetY ? getActualNumValue(offsetY, this._computeLayoutRadius()) : 0, limitRatio: limitRatio || Infinity, title: {
+                    visible: title.visible !== false && (!isValid$1(title.field) || this._activeDatum !== null),
+                    space: title.space || this._gap,
+                    autoLimit: title.autoLimit,
+                    autoFit: title.autoFit,
+                    fitPercent: title.fitPercent,
+                    fitStrategy: title.fitStrategy,
+                    style: Object.assign(Object.assign({}, transformIndicatorStyle(pickWithout(title.style, ['text']), this._activeDatum)), { text: this._createText(title.field, title.style.text) })
+                }, content: contentComponentSpec }, restSpec);
         }
         _createOrUpdateIndicatorComponent(attrs) {
             if (this._indicatorComponent) {