@visactor/vchart 1.2.0-beta.2 → 1.2.0-beta.3

package/build/index.js

@@ -51599,6 +51599,8 @@
 	    ChartEvent["legendItemClick"] = "legendItemClick";
 	    ChartEvent["legendItemHover"] = "legendItemHover";
 	    ChartEvent["legendItemUnHover"] = "legendItemUnHover";
+	    ChartEvent["tooltipShow"] = "tooltipShow";
+	    ChartEvent["tooltipHide"] = "tooltipHide";
 	})(ChartEvent || (ChartEvent = {}));
 	var Event_Source_Type;
 	(function (Event_Source_Type) {
@@ -58168,7 +58170,7 @@
 	VChart.useMark([ComponentMark, GroupMark, ImageMark]);
 	Factory.registerRegion('region', Region);
 	Factory.registerLayout('base', Layout);
-	const version = "1.2.0-beta.2";
+	const version = "1.2.0-beta.3";
 	Logger.getInstance(LoggerLevel.Error);
 
 	var SeriesMarkNameEnum;
@@ -86600,7 +86602,7 @@
 	        return TooltipResult.success;
 	    };
 	    hideTooltip(params) {
-	        this.changeTooltip(false, params);
+	        return this.changeTooltip(false, params);
 	    }
 	    release() {
 	        this._cacheViewSpec = undefined;
@@ -87664,6 +87666,9 @@
 	    _getParentElement(spec) {
 	        return this._container ?? super._getParentElement(spec);
 	    }
+	    isTooltipShown() {
+	        return this.getVisibility();
+	    }
 	    reInit() {
 	        super.reInit();
 	        this._initStyle();
@@ -87715,7 +87720,9 @@
 	        if (!visible) {
 	            if (this._tooltipComponent && this._tooltipComponent.attribute.visible) {
 	                this._tooltipComponent.hideAll();
-	                stage.renderNextFrame();
+	                this._tooltipComponent.setAttributes({
+	                    visibleAll: false
+	                });
 	            }
 	            return;
 	        }
@@ -87725,7 +87732,6 @@
 	        const pos = actualTooltip?.position;
 	        if (!params.changePositionOnly) {
 	            this._tooltipComponent.setAttributes({
-	                visible: true,
 	                ...this._attributeCache,
 	                ...pos
 	            });
@@ -87735,8 +87741,14 @@
 	        }
 	        if (!this._tooltipComponent.attribute.visible) {
 	            this._tooltipComponent.showAll();
+	            this._tooltipComponent.setAttributes({
+	                visibleAll: true
+	            });
 	        }
 	    }
+	    isTooltipShown() {
+	        return this._tooltipComponent?.attribute.visibleAll;
+	    }
 	    release() {
 	        super.release();
 	        this._layer?.release();
@@ -87750,6 +87762,12 @@
 	        this.component = component;
 	    }
 	    _showTooltipByHandler = (data, params) => {
+	        this.component.event.emit(ChartEvent.tooltipShow, {
+	            ...params,
+	            tooltipData: data,
+	            activeType: this.activeType,
+	            tooltip: this.component
+	        });
 	        if (this.component.tooltipHandler?.showTooltip && isValid(data)) {
 	            return this.component.tooltipHandler.showTooltip(this.activeType, data, params) ?? TooltipResult.success;
 	        }
@@ -87772,14 +87790,9 @@
 	        if (isNil(info)) {
 	            return false;
 	        }
-	        if (![TooltipHandlerType.dom, TooltipHandlerType.canvas].includes(this.component.tooltipHandler.type)) {
-	            return true;
-	        }
 	        const helper = params.model?.tooltipHelper;
-	        if (isEmptyPos(params) || isNil(helper)) {
-	            return true;
-	        }
-	        if (!helper.activeType.includes('dimension')) {
+	        const activeType = helper?.activeType ?? this.component.getSpec().activeType;
+	        if (!activeType.includes('dimension')) {
 	            return false;
 	        }
 	        return true;
@@ -87868,9 +87881,6 @@
 	        if (isNil(info)) {
 	            return false;
 	        }
-	        if (![TooltipHandlerType.dom, TooltipHandlerType.canvas].includes(this.component.tooltipHandler.type)) {
-	            return true;
-	        }
 	        const helper = params.model?.tooltipHelper;
 	        if (!helper?.activeType.includes('mark')) {
 	            return false;
@@ -87930,6 +87940,10 @@
 	    _cacheInfo;
 	    _eventList = [];
 	    _processor;
+	    _isTooltipShown = false;
+	    isTooltipShown() {
+	        return this._isTooltipShown;
+	    }
 	    changeRegions(regions) {
 	    }
 	    _registerEvent() {
@@ -87956,6 +87970,7 @@
 	        });
 	        this._eventList = [];
 	        this.tooltipHandler?.release?.();
+	        this._isTooltipShown = false;
 	    }
 	    _initHandler() {
 	        const renderMode = this._spec.renderMode ?? 'html';
@@ -88070,6 +88085,9 @@
 	                this._cacheInfo = tooltipInfo;
 	            }
 	        }
+	        if (success) {
+	            this._isTooltipShown = true;
+	        }
 	        const vchart = this._option.globalInstance;
 	        if (success && VChart.globalConfig.uniqueTooltip) {
 	            VChart.hideTooltip(vchart.id);
@@ -88089,9 +88107,21 @@
 	        return result;
 	    };
 	    _hideTooltipByHandler = (params) => {
+	        if (!this._isTooltipShown && !this.tooltipHandler?.isTooltipShown?.()) {
+	            return TooltipResult.success;
+	        }
+	        this.event.emit(ChartEvent.tooltipHide, {
+	            ...params,
+	            tooltip: this
+	        });
 	        if (this.tooltipHandler?.hideTooltip) {
-	            this.tooltipHandler.hideTooltip(params);
+	            const result = this.tooltipHandler.hideTooltip(params);
+	            if (!result) {
+	                this._isTooltipShown = false;
+	            }
+	            return result;
 	        }
+	        return TooltipResult.failed;
 	    };
 	    _initTheme(theme) {
 	        super._initTheme(theme);
@@ -88162,17 +88192,14 @@
 	        return result;
 	    }
 	    hideTooltip() {
-	        if (!this.tooltipHandler?.hideTooltip) {
-	            return false;
-	        }
-	        this._alwaysShow = false;
-	        this.tooltipHandler.hideTooltip({
+	        const params = {
 	            changePositionOnly: false,
 	            item: undefined,
 	            datum: undefined,
 	            source: Event_Source_Type.chart
-	        });
-	        return true;
+	        };
+	        this._alwaysShow = false;
+	        return !this._hideTooltipByHandler(params);
 	    }
 	    _isSameAsCacheInfo(nextInfo) {
 	        if (nextInfo === this._cacheInfo) {