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

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);
 	}
@@ -60687,7 +60699,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.3";
 	Logger.getInstance(LoggerLevel.Error);
 
 	var SeriesMarkNameEnum;
@@ -82924,7 +82936,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 +83223,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 +83582,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 +83601,8 @@
 	                maxWidth: this._getTitleLimit(isX)
 	            },
 	            items: this.getLabelItems(axisLength),
-	            verticalLimitSize: this._verticalLimitSize
+	            verticalLimitSize: this._verticalLimitSize,
+	            verticalMinSize
 	        };
 	        return attrs;
 	    }
@@ -90678,14 +90697,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) => {