@visactor/vchart 1.3.0-beta.2 → 1.3.0-beta.4

package/build/index.js

@@ -532,6 +532,18 @@
 	  return target;
 	}
 
+	function pickWithout(obj, keys) {
+	  if (!obj || !isPlainObject(obj)) return obj;
+	  const result = {};
+	  return Object.keys(obj).forEach(k => {
+	    const v = obj[k];
+	    let match = !1;
+	    keys.forEach(itKey => {
+	      (isString(itKey) && itKey === k || itKey instanceof RegExp && k.match(itKey)) && (match = !0);
+	    }), match || (result[k] = v);
+	  }), result;
+	}
+
 	function objToString(obj) {
 	  return Object.prototype.toString.call(obj);
 	}
@@ -56086,9 +56098,20 @@
 	}
 
 	class DimensionClickEvent extends DimensionEvent {
-	    constructor(eventDispatcher, mode) {
-	        super(eventDispatcher, mode);
-	        this.onClick = this.onClick.bind(this);
+	    constructor() {
+	        super(...arguments);
+	        this.onClick = (params) => {
+	            if (!params) {
+	                return;
+	            }
+	            const x = params.event.viewX;
+	            const y = params.event.viewY;
+	            const targetDimensionInfo = this.getTargetDimensionInfo(x, y);
+	            if (!targetDimensionInfo) {
+	                return;
+	            }
+	            this._callback.call(null, Object.assign(Object.assign({}, params), { action: 'click', dimensionInfo: [...targetDimensionInfo] }));
+	        };
 	    }
 	    register(eType, handler) {
 	        this._callback = handler.callback;
@@ -56103,25 +56126,41 @@
 	            callback: this.onClick
 	        });
 	    }
-	    onClick(params) {
-	        if (!params) {
-	            return;
-	        }
-	        const x = params.event.viewX;
-	        const y = params.event.viewY;
-	        const targetDimensionInfo = this.getTargetDimensionInfo(x, y);
-	        if (!targetDimensionInfo) {
-	            return;
-	        }
-	        this._callback.call(null, Object.assign(Object.assign({}, params), { action: 'click', dimensionInfo: [...targetDimensionInfo] }));
-	    }
 	}
 
 	class DimensionHoverEvent extends DimensionEvent {
-	    constructor(eventDispatcher, mode) {
-	        super(eventDispatcher, mode);
+	    constructor() {
+	        super(...arguments);
 	        this._cacheDimensionInfo = null;
-	        this.onMouseMove = this.onMouseMove.bind(this);
+	        this.onMouseMove = (params) => {
+	            if (!params) {
+	                return;
+	            }
+	            const x = params.event.viewX;
+	            const y = params.event.viewY;
+	            const targetDimensionInfo = this.getTargetDimensionInfo(x, y);
+	            if (targetDimensionInfo === null && this._cacheDimensionInfo !== null) {
+	                this._callback.call(null, Object.assign(Object.assign({}, params), { action: 'leave', dimensionInfo: [...this._cacheDimensionInfo] }));
+	                this._cacheDimensionInfo = targetDimensionInfo;
+	            }
+	            else if (targetDimensionInfo !== null &&
+	                (this._cacheDimensionInfo === null ||
+	                    targetDimensionInfo.length !== this._cacheDimensionInfo.length ||
+	                    targetDimensionInfo.some((info, i) => !isSameDimensionInfo(info, this._cacheDimensionInfo[i])))) {
+	                this._callback.call(null, Object.assign(Object.assign({}, params), { action: 'enter', dimensionInfo: [...targetDimensionInfo] }));
+	                this._cacheDimensionInfo = targetDimensionInfo;
+	            }
+	            else if (targetDimensionInfo !== null) {
+	                this._callback.call(null, Object.assign(Object.assign({}, params), { action: 'move', dimensionInfo: [...targetDimensionInfo] }));
+	            }
+	        };
+	        this.onMouseOut = (params) => {
+	            if (!params) {
+	                return;
+	            }
+	            this._callback.call(null, Object.assign(Object.assign({}, params), { action: 'leave', dimensionInfo: this._cacheDimensionInfo ? [...this._cacheDimensionInfo] : [] }));
+	            this._cacheDimensionInfo = null;
+	        };
 	    }
 	    register(eType, handler) {
 	        this._callback = handler.callback;
@@ -56129,6 +56168,10 @@
 	            query: Object.assign(Object.assign({}, handler.query), { source: Event_Source_Type.chart }),
 	            callback: this.onMouseMove
 	        });
+	        this._eventDispatcher.register('pointerout', {
+	            query: Object.assign(Object.assign({}, handler.query), { source: Event_Source_Type.chart }),
+	            callback: this.onMouseOut
+	        });
 	        if (isMobileLikeMode(this._mode)) {
 	            this._eventDispatcher.register('pointerdown', {
 	                query: Object.assign(Object.assign({}, handler.query), { source: Event_Source_Type.chart }),
@@ -56148,28 +56191,6 @@
 	            });
 	        }
 	    }
-	    onMouseMove(params) {
-	        if (!params) {
-	            return;
-	        }
-	        const x = params.event.viewX;
-	        const y = params.event.viewY;
-	        const targetDimensionInfo = this.getTargetDimensionInfo(x, y);
-	        if (targetDimensionInfo === null && this._cacheDimensionInfo !== null) {
-	            this._callback.call(null, Object.assign(Object.assign({}, params), { action: 'leave', dimensionInfo: [...this._cacheDimensionInfo] }));
-	            this._cacheDimensionInfo = targetDimensionInfo;
-	        }
-	        else if (targetDimensionInfo !== null &&
-	            (this._cacheDimensionInfo === null ||
-	                targetDimensionInfo.length !== this._cacheDimensionInfo.length ||
-	                targetDimensionInfo.some((info, i) => !isSameDimensionInfo(info, this._cacheDimensionInfo[i])))) {
-	            this._callback.call(null, Object.assign(Object.assign({}, params), { action: 'enter', dimensionInfo: [...targetDimensionInfo] }));
-	            this._cacheDimensionInfo = targetDimensionInfo;
-	        }
-	        else if (targetDimensionInfo !== null) {
-	            this._callback.call(null, Object.assign(Object.assign({}, params), { action: 'move', dimensionInfo: [...targetDimensionInfo] }));
-	        }
-	    }
 	}
 
 	var DimensionEventEnum;
@@ -57860,6 +57881,18 @@
 	        var _a;
 	        return (_a = this._chart) === null || _a === void 0 ? void 0 : _a.setDimensionIndex(value, opt);
 	    }
+	    stopAnimation() {
+	        var _a, _b, _c;
+	        (_c = (_b = (_a = this._compiler) === null || _a === void 0 ? void 0 : _a.getVGrammarView()) === null || _b === void 0 ? void 0 : _b.animate) === null || _c === void 0 ? void 0 : _c.stop();
+	    }
+	    pauseAnimation() {
+	        var _a, _b, _c;
+	        (_c = (_b = (_a = this._compiler) === null || _a === void 0 ? void 0 : _a.getVGrammarView()) === null || _b === void 0 ? void 0 : _b.animate) === null || _c === void 0 ? void 0 : _c.pause();
+	    }
+	    resumeAnimation() {
+	        var _a, _b, _c;
+	        (_c = (_b = (_a = this._compiler) === null || _a === void 0 ? void 0 : _a.getVGrammarView()) === null || _b === void 0 ? void 0 : _b.animate) === null || _c === void 0 ? void 0 : _c.resume();
+	    }
 	    convertDatumToPosition(datum, dataLinkInfo = {}, isRelativeToCanvas = false) {
 	        var _a;
 	        if (!this._chart) {
@@ -60687,7 +60720,7 @@
 	VChart.useMark([ComponentMark, GroupMark, ImageMark]);
 	Factory.registerRegion('region', Region);
 	Factory.registerLayout('base', Layout);
-	const version = "1.3.0-beta.2";
+	const version = "1.3.0-beta.4";
 	Logger.getInstance(LoggerLevel.Error);
 
 	var SeriesMarkNameEnum;
@@ -82924,7 +82957,8 @@
 	                autoHideSeparation: spec.label.autoHideSeparation,
 	                limitEllipsis: spec.label.limitEllipsis,
 	                layoutFunc: spec.label.layoutFunc,
-	                dataFilter: spec.label.dataFilter
+	                dataFilter: spec.label.dataFilter,
+	                containerAlign: spec.label.containerAlign
 	            },
 	            tick: {
 	                visible: spec.tick.visible,
@@ -83210,11 +83244,11 @@
 	        super.setAttrFromSpec();
 	        const isX = isXAxis(this.orient);
 	        if (isX) {
-	            if (isNil(this._spec.maxHeight)) {
+	            if (isUndefined(this._spec.maxHeight)) {
 	                this._spec.maxHeight = '30%';
 	            }
 	        }
-	        else if (isNil(this._spec.maxWidth)) {
+	        else if (isUndefined(this._spec.maxWidth)) {
 	            this._spec.maxWidth = '30%';
 	        }
 	        const axisStyle = this._getAxisAttributes();
@@ -83569,6 +83603,11 @@
 	                items: this.getLabelItems(width)
 	            };
 	        }
+	        let verticalMinSize = isX ? this._minHeight : this._minWidth;
+	        if ((isX && this._layoutRectLevelMap.height === USER_LAYOUT_RECT_LEVEL) ||
+	            (isY && this._layoutRectLevelMap.width === USER_LAYOUT_RECT_LEVEL)) {
+	            verticalMinSize = this._verticalLimitSize;
+	        }
 	        const attrs = {
 	            start: { x: 0, y: 0 },
 	            end,
@@ -83583,7 +83622,8 @@
 	                maxWidth: this._getTitleLimit(isX)
 	            },
 	            items: this.getLabelItems(axisLength),
-	            verticalLimitSize: this._verticalLimitSize
+	            verticalLimitSize: this._verticalLimitSize,
+	            verticalMinSize
 	        };
 	        return attrs;
 	    }
@@ -90286,6 +90326,7 @@
 	                this._mountEvent('pointerdown', { level: Event_Bubble_Level.chart }, this._handleMouseMove);
 	                this._mountEvent('pointerup', { source: 'window' }, this._handleMouseOut);
 	            }
+	            this._mountEvent('pointerout', { level: Event_Bubble_Level.chart, source: 'chart' }, this._handleMouseOut);
 	            this._mountEvent('pointermove', { source: 'window' }, this._handleMouseOut);
 	        }
 	        else if (trigger === 'click') {
@@ -90678,14 +90719,11 @@
 	                if (baseMark) {
 	                    const configFunc = (_a = markLabelConfigFunc[baseMark.type]) !== null && _a !== void 0 ? _a : markLabelConfigFunc.symbol;
 	                    const labelSpec = (_b = baseMark.getLabelSpec()) !== null && _b !== void 0 ? _b : {};
-	                    const { smartInvert, offset, overlap, animation } = labelSpec;
 	                    const interactive = this._interactiveConfig(labelSpec);
+	                    const passiveLabelSpec = pickWithout(labelSpec, ['position', 'style', 'state']);
 	                    return merge$2({
 	                        textStyle: { pickable: labelSpec.interactive === true }
-	                    }, configFunc(labelInfo[baseMarks.findIndex(mark => mark === baseMark)]), Object.assign({ smartInvert,
-	                        offset,
-	                        animation,
-	                        overlap }, interactive));
+	                    }, configFunc(labelInfo[baseMarks.findIndex(mark => mark === baseMark)]), Object.assign(Object.assign({}, passiveLabelSpec), interactive));
 	                }
 	            })
 	                .encode((datum, element) => {