@visactor/vchart 1.2.0-beta.5 → 1.2.0-beta.6

package/build/index.js

@@ -51690,6 +51690,7 @@
 	    ChartEvent["legendItemUnHover"] = "legendItemUnHover";
 	    ChartEvent["tooltipShow"] = "tooltipShow";
 	    ChartEvent["tooltipHide"] = "tooltipHide";
+	    ChartEvent["tooltipRelease"] = "tooltipRelease";
 	})(ChartEvent || (ChartEvent = {}));
 	var Event_Source_Type;
 	(function (Event_Source_Type) {
@@ -53327,14 +53328,43 @@
 	                        });
 	                    }
 	                    else {
-	                        data.push({
-	                            series,
-	                            datum: viewData.filter((datum) => datum[dimensionField[0]]?.toString() === value?.toString() ||
-	                                (isValid(datum[dimensionField[0]]) &&
-	                                    isValid(datum[dimensionField[1]]) &&
-	                                    value >= datum[dimensionField[0]] &&
-	                                    value < datum[dimensionField[1]]))
-	                        });
+	                        if (isValid(dimensionField[1])) {
+	                            data.push({
+	                                series,
+	                                datum: viewData.filter((datum) => {
+	                                    if (datum[dimensionField[0]]?.toString() === value?.toString()) {
+	                                        return true;
+	                                    }
+	                                    return (isValid(datum[dimensionField[0]]) &&
+	                                        isValid(datum[dimensionField[1]]) &&
+	                                        value >= datum[dimensionField[0]] &&
+	                                        value < datum[dimensionField[1]]);
+	                                })
+	                            });
+	                        }
+	                        else {
+	                            let minDelta = Infinity;
+	                            let minDatums = [];
+	                            let deltaSign = 0;
+	                            viewData.forEach((datum) => {
+	                                if (isValid(datum[dimensionField[0]])) {
+	                                    const delta = Math.abs(datum[dimensionField[0]] - value);
+	                                    const sign = Math.sign(datum[dimensionField[0]] - value);
+	                                    if (delta < minDelta) {
+	                                        minDelta = delta;
+	                                        minDatums = [datum];
+	                                        deltaSign = sign;
+	                                    }
+	                                    else if (delta === minDelta && sign === deltaSign) {
+	                                        minDatums.push(datum);
+	                                    }
+	                                }
+	                            });
+	                            data.push({
+	                                series,
+	                                datum: minDatums
+	                            });
+	                        }
 	                    }
 	                }
 	            }
@@ -58260,7 +58290,7 @@
 	VChart.useMark([ComponentMark, GroupMark, ImageMark]);
 	Factory.registerRegion('region', Region);
 	Factory.registerLayout('base', Layout);
-	const version = "1.2.0-beta.5";
+	const version = "1.2.0-beta.6";
 	Logger.getInstance(LoggerLevel.Error);
 
 	var SeriesMarkNameEnum;
@@ -65200,7 +65230,13 @@
 	        return map;
 	    }, new Map());
 	    let set;
-	    if (values) {
+	    if (isFunction(opt.set)) {
+	        set = function (d) {
+	            const v = index.get(d[key]);
+	            opt.set(d, v);
+	        };
+	    }
+	    else if (values) {
 	        const m = values.length;
 	        set = function (d) {
 	            const v = index.get(d[key]);
@@ -65387,15 +65423,16 @@
 	    }
 	}
 
+	const DEFAULT_MAP_LOOK_UP_KEY = `${PREFIX}_MAP_LOOK_UP_KEY`;
 	const map = (data, opt) => {
 	    if (data.features) {
 	        data.features.forEach((f, index) => {
 	            f[DEFAULT_DATA_INDEX] = index;
 	            if (opt.nameMap) {
-	                f.name = opt.nameMap[f.properties?.[opt.nameProperty]];
+	                f[DEFAULT_MAP_LOOK_UP_KEY] = opt.nameMap[f.properties?.[opt.nameProperty]];
 	            }
 	            else {
-	                f.name = f.properties?.[opt.nameProperty];
+	                f[DEFAULT_MAP_LOOK_UP_KEY] = f.properties?.[opt.nameProperty];
 	            }
 	        });
 	    }
@@ -65483,10 +65520,17 @@
 	            type: 'lookup',
 	            options: {
 	                from: () => this._data?.getLatestData(),
-	                key: 'name',
+	                key: DEFAULT_MAP_LOOK_UP_KEY,
 	                fields: this._nameField,
-	                values: [this.nameField, this.valueField, this._seriesField ?? DEFAULT_DATA_SERIES_FIELD, DEFAULT_DATA_KEY],
-	                as: [this.nameField, this.valueField, this._seriesField ?? DEFAULT_DATA_SERIES_FIELD, DEFAULT_DATA_KEY]
+	                set: (feature, datum) => {
+	                    if (datum) {
+	                        Object.keys(datum).forEach(key => {
+	                            if (!(key in feature)) {
+	                                feature[key] = datum[key];
+	                            }
+	                        });
+	                    }
+	                }
 	            }
 	        });
 	        this._data?.getDataView().target.addListener('change', mapData.reRunAllTransform);
@@ -79722,42 +79766,83 @@
 	function labelFlush(axisLabels, axis) {
 	    const { width, height } = axis.getLayoutRect();
 	    const isX = isXAxis(axis.layoutOrient);
+	    const isInverse = axis.getSpec().inverse === true;
 	    const first = axisLabels[0];
 	    const last$1 = last(axisLabels);
 	    if (isX) {
-	        const start = 0;
-	        const end = width;
-	        const startBound = first.AABBBounds.x1;
-	        const endBound = last$1.AABBBounds.x2;
-	        if (startBound < start) {
-	            first.setAttributes({
-	                x: start,
-	                textAlign: 'left'
-	            });
+	        if (isInverse) {
+	            const start = width;
+	            const end = 0;
+	            const startBound = first.AABBBounds.x2;
+	            const endBound = last$1.AABBBounds.x1;
+	            if (startBound > start) {
+	                first.setAttributes({
+	                    x: start,
+	                    textAlign: 'right'
+	                });
+	            }
+	            if (endBound < end) {
+	                last$1.setAttributes({
+	                    x: end,
+	                    textAlign: 'left'
+	                });
+	            }
 	        }
-	        if (endBound > end) {
-	            last$1.setAttributes({
-	                x: end,
-	                textAlign: 'right'
-	            });
+	        else {
+	            const start = 0;
+	            const end = width;
+	            const startBound = first.AABBBounds.x1;
+	            const endBound = last$1.AABBBounds.x2;
+	            if (startBound < start) {
+	                first.setAttributes({
+	                    x: start,
+	                    textAlign: 'left'
+	                });
+	            }
+	            if (endBound > end) {
+	                last$1.setAttributes({
+	                    x: end,
+	                    textAlign: 'right'
+	                });
+	            }
 	        }
 	    }
 	    else {
-	        const start = height;
-	        const end = 0;
-	        const startBound = first.AABBBounds.y2;
-	        const endBound = last$1.AABBBounds.y1;
-	        if (startBound > start) {
-	            first.setAttributes({
-	                y: start,
-	                textBaseline: 'bottom'
-	            });
+	        if (isInverse) {
+	            const startBound = first.AABBBounds.y1;
+	            const endBound = last$1.AABBBounds.y2;
+	            const start = 0;
+	            const end = height;
+	            if (startBound < start) {
+	                first.setAttributes({
+	                    y: start,
+	                    textBaseline: 'top'
+	                });
+	            }
+	            if (endBound > end) {
+	                last$1.setAttributes({
+	                    y: end,
+	                    textBaseline: 'bottom'
+	                });
+	            }
 	        }
-	        if (endBound < end) {
-	            last$1.setAttributes({
-	                y: end,
-	                textBaseline: 'top'
-	            });
+	        else {
+	            const start = height;
+	            const end = 0;
+	            const startBound = first.AABBBounds.y2;
+	            const endBound = last$1.AABBBounds.y1;
+	            if (startBound > start) {
+	                first.setAttributes({
+	                    y: start,
+	                    textBaseline: 'bottom'
+	                });
+	            }
+	            if (endBound < end) {
+	                last$1.setAttributes({
+	                    y: end,
+	                    textBaseline: 'top'
+	                });
+	            }
 	        }
 	    }
 	}
@@ -86819,9 +86904,8 @@
 	            this._cacheViewSpec = undefined;
 	            this._cacheActualTooltip = undefined;
 	            const spec = this._component.getSpec();
-	            if (spec.handler?.hideTooltip) {
-	                spec.handler?.hideTooltip(params);
-	                return TooltipResult.success;
+	            if (spec.handler) {
+	                return spec.handler.hideTooltip?.(params) ?? TooltipResult.success;
 	            }
 	            this._updateTooltip(false, params);
 	            return TooltipResult.success;
@@ -86840,8 +86924,8 @@
 	        if (spec.visible === false) {
 	            return TooltipResult.failed;
 	        }
-	        if (spec.handler?.showTooltip) {
-	            return spec.handler?.showTooltip(activeType, data, params) ?? TooltipResult.success;
+	        if (spec.handler) {
+	            return spec.handler.showTooltip?.(activeType, data, params) ?? TooltipResult.success;
 	        }
 	        const pattern = spec[activeType];
 	        if (!pattern) {
@@ -86869,8 +86953,8 @@
 	    changeTooltipPosition;
 	    _changeTooltipPosition = (changePositionOnly, actualTooltip, spec, activeType, data, params) => {
 	        const event = params.event;
-	        if (spec.handler?.showTooltip) {
-	            return spec.handler.showTooltip(activeType, data, params) ?? TooltipResult.success;
+	        if (spec.handler) {
+	            return spec.handler.showTooltip?.(activeType, data, params) ?? TooltipResult.success;
 	        }
 	        const pattern = spec[activeType];
 	        if (!pattern) {
@@ -86901,8 +86985,8 @@
 	        this._cacheViewSpec = undefined;
 	        this._cacheActualTooltip = undefined;
 	        const spec = this._component.getSpec();
-	        if (spec.handler?.release) {
-	            spec.handler?.release();
+	        if (spec.handler) {
+	            spec.handler.release?.();
 	            return;
 	        }
 	        this._removeTooltip();
@@ -87167,7 +87251,7 @@
 	    const styles = {
 	        panel: {
 	            width: getPixelPropertyStr((attributeCache?.panel?.width ?? 0) + lineWidth * 2),
-	            height: getPixelPropertyStr((attributeCache?.panel?.height ?? 0) + lineWidth * 2),
+	            minHeight: getPixelPropertyStr((attributeCache?.panel?.height ?? 0) + lineWidth * 2),
 	            paddingBottom: getPixelPropertyStr(padding.bottom),
 	            paddingLeft: getPixelPropertyStr(padding.left),
 	            paddingRight: getPixelPropertyStr(padding.right),
@@ -88066,33 +88150,24 @@
 	        }
 	        return TooltipResult.failed;
 	    };
-	}
-
-	class DimensionTooltipProcessor extends BaseTooltipProcessor {
-	    activeType = 'dimension';
-	    showTooltip(info, params, changePositionOnly) {
-	        const newParams = {
-	            ...params,
-	            dimensionInfo: this._preprocessDimensionInfo(info),
-	            changePositionOnly
-	        };
-	        return this._showTooltipByHandler(info, newParams);
-	    }
-	    shouldHandleTooltip(params, mouseEventData) {
-	        const { tooltipInfo: info } = mouseEventData;
-	        if (isNil(info)) {
-	            return false;
-	        }
-	        const helper = params.model?.tooltipHelper;
-	        const activeType = helper?.activeType ?? this.component.getSpec().activeType;
-	        if (!activeType.includes('dimension')) {
-	            return false;
+	    _preprocessDimensionInfo(dimensionInfo) {
+	        const newDimensionInfo = [];
+	        dimensionInfo?.forEach(info => {
+	            const di = {
+	                ...info,
+	                data: info.data.filter(({ series }) => series.getSpec()?.tooltip?.visible !== false)
+	            };
+	            if (di.data.length > 0) {
+	                newDimensionInfo.push(di);
+	            }
+	        });
+	        if (newDimensionInfo.length > 0) {
+	            return newDimensionInfo;
 	        }
-	        return true;
+	        return undefined;
 	    }
-	    getMouseEventData(params) {
+	    _getDimensionInfo(params) {
 	        let targetDimensionInfo;
-	        let ignore;
 	        const x = params.event.viewX;
 	        const y = params.event.viewY;
 	        const chart = this.component.getChart();
@@ -88129,42 +88204,51 @@
 	            })[0] ?? targetDimensionInfo[0];
 	            targetDimensionInfo = [dimensionAxisInfo];
 	        }
-	        if ([...(this.component.getOption().getAllSeries() ?? [])].some(model => {
-	            const ignoreTriggers = model.tooltipHelper?.ignoreTriggerSet.dimension;
-	            return (params.model && ignoreTriggers?.has(params.model)) || (params.mark && ignoreTriggers?.has(params.mark));
-	        })) {
-	            ignore = true;
-	        }
-	        return {
-	            tooltipInfo: targetDimensionInfo,
-	            ignore
+	        return targetDimensionInfo;
+	    }
+	}
+
+	class DimensionTooltipProcessor extends BaseTooltipProcessor {
+	    activeType = 'dimension';
+	    showTooltip(info, params, changePositionOnly) {
+	        const newParams = {
+	            ...params,
+	            dimensionInfo: this._preprocessDimensionInfo(info),
+	            changePositionOnly
 	        };
+	        return this._showTooltipByHandler(info, newParams);
 	    }
-	    _preprocessDimensionInfo(dimensionInfo) {
-	        const newDimensionInfo = [];
-	        dimensionInfo?.forEach(info => {
-	            const di = {
-	                ...info,
-	                data: info.data.filter(({ series }) => series.getSpec()?.tooltip?.visible !== false)
-	            };
-	            if (di.data.length > 0) {
-	                newDimensionInfo.push(di);
-	            }
-	        });
-	        if (newDimensionInfo.length > 0) {
-	            return newDimensionInfo;
+	    shouldHandleTooltip(params, mouseEventData) {
+	        const { tooltipInfo: info } = mouseEventData;
+	        if (isNil(info)) {
+	            return false;
 	        }
-	        return undefined;
+	        const helper = params.model?.tooltipHelper;
+	        const activeType = helper?.activeType ?? this.component.getSpec().activeType;
+	        if (!activeType.includes('dimension')) {
+	            return false;
+	        }
+	        return true;
+	    }
+	    getMouseEventData(params) {
+	        return {
+	            tooltipInfo: this._getDimensionInfo(params),
+	            ignore: [...(this.component.getOption().getAllSeries() ?? [])].some(model => {
+	                const ignoreTriggers = model.tooltipHelper?.ignoreTriggerSet.dimension;
+	                return (params.model && ignoreTriggers?.has(params.model)) || (params.mark && ignoreTriggers?.has(params.mark));
+	            })
+	        };
 	    }
 	}
 
 	class MarkTooltipProcessor extends BaseTooltipProcessor {
 	    activeType = 'mark';
 	    showTooltip(info, params, changePositionOnly) {
-	        const { datum, series } = info;
+	        const { datum, series, dimensionInfo } = info;
 	        const tooltipData = [{ datum: [datum], series }];
 	        const newParams = {
 	            ...params,
+	            dimensionInfo: this._preprocessDimensionInfo(dimensionInfo),
 	            changePositionOnly
 	        };
 	        return this._showTooltipByHandler(tooltipData, newParams);
@@ -88192,7 +88276,8 @@
 	                info = {
 	                    mark: params.mark,
 	                    datum: params.datum,
-	                    series
+	                    series,
+	                    dimensionInfo: this._getDimensionInfo(params)
 	                };
 	            }
 	            else if (ignoreTriggers?.has(params.model) || ignoreTriggers?.has(params.mark)) {
@@ -88257,6 +88342,9 @@
 	        this._initEvent();
 	    }
 	    release() {
+	        this.event.emit(ChartEvent.tooltipRelease, {
+	            tooltip: this
+	        });
 	        super.release();
 	        this._eventList.forEach(({ eventType, handler }) => {
 	            this.event.off(eventType, handler);
@@ -88310,6 +88398,9 @@
 	        if (this._alwaysShow) {
 	            return;
 	        }
+	        if (!this._isTooltipShown && !this.tooltipHandler?.isTooltipShown?.()) {
+	            return;
+	        }
 	        const { clientX, clientY } = params.event;
 	        if (isTrueBrowser(this._option.mode) &&
 	            (this._isPointerInChart({ x: clientX, y: clientY }) || this._isPointerOnTooltip(params))) {