@visactor/vchart 1.10.6-alpha.2 → 1.10.7-alpha.0

package/build/index.js

@@ -8656,6 +8656,8 @@
       pickStrokeBuffer: 0
     };
     const DefaultStyle = Object.assign(Object.assign(Object.assign(Object.assign({
+      forceBoundsWidth: void 0,
+      forceBoundsHeight: void 0,
       opacity: 1,
       background: null,
       backgroundOpacity: 1,
@@ -8682,6 +8684,7 @@
     };
     const DefaultAttribute = Object.assign(Object.assign(Object.assign({
       strokeSeg: null,
+      renderable: !0,
       pickable: !0,
       childrenPickable: !0,
       fillPickable: !0,
@@ -8773,7 +8776,7 @@
       strokeBoundsBuffer: 0,
       cornerRadius: 0
     });
-    const DefaultRect3dAttribute = Object.assign(Object.assign({}, DefaultAttribute), {
+    Object.assign(Object.assign({}, DefaultAttribute), {
       width: 0,
       height: 0,
       x1: 0,
@@ -9972,7 +9975,6 @@
         symbol: DefaultSymbolAttribute,
         text: DefaultTextAttribute,
         rect: DefaultRectAttribute,
-        rect3d: DefaultRect3dAttribute,
         polygon: DefaultPolygonAttribute,
         richtext: DefaultRichTextAttribute,
         richtextIcon: DefaultRichTextIconAttribute,
@@ -9991,7 +9993,6 @@
         symbol: Object.assign({}, defaultThemeObj.symbol),
         text: Object.assign({}, defaultThemeObj.text),
         rect: Object.assign({}, defaultThemeObj.rect),
-        rect3d: Object.assign({}, defaultThemeObj.rect3d),
         polygon: Object.assign({}, defaultThemeObj.polygon),
         richtext: Object.assign({}, defaultThemeObj.richtext),
         richtextIcon: Object.assign({}, defaultThemeObj.richtextIcon),
@@ -14597,7 +14598,7 @@
     }
     function drawPathProxy(graphic, context, x, y, drawContext, params, fillCb, strokeCb) {
       if (!graphic.pathProxy) return !1;
-      const themeAttributes = getTheme$1(graphic, null == params ? void 0 : params.theme)[graphic.type],
+      const themeAttributes = getTheme$1(graphic, null == params ? void 0 : params.theme)[graphic.type.replace("3d", "")],
         {
           fill = themeAttributes.fill,
           stroke = themeAttributes.stroke,
@@ -16245,7 +16246,7 @@
             vertices: [],
             edges: []
           },
-          rectTheme = getTheme$1(this).rect3d,
+          rectTheme = getTheme$1(this).rect,
           {
             x1: x1,
             y1: y1,
@@ -17972,6 +17973,22 @@
           aabbBounds.union(node.AABBBounds);
         }), aabbBounds) : aabbBounds;
       }
+      updateHTMLTextAABBBounds(attribute, textTheme, aabbBounds, graphic) {
+        const {
+          textAlign: textAlign,
+          textBaseline: textBaseline
+        } = attribute;
+        if (null != attribute.forceBoundsHeight) {
+          const h = isNumber$3(attribute.forceBoundsHeight) ? attribute.forceBoundsHeight : attribute.forceBoundsHeight(),
+            dy = textLayoutOffsetY(textBaseline, h, h);
+          aabbBounds.set(aabbBounds.x1, dy, aabbBounds.x2, dy + h);
+        }
+        if (null != attribute.forceBoundsWidth) {
+          const w = isNumber$3(attribute.forceBoundsWidth) ? attribute.forceBoundsWidth : attribute.forceBoundsWidth(),
+            dx = textDrawOffsetX(textAlign, w);
+          aabbBounds.set(dx, aabbBounds.y1, dx + w, aabbBounds.y2);
+        }
+      }
       updateRichTextAABBBounds(attribute, richtextTheme, aabbBounds, graphic) {
         if (!this._validCheck(attribute, richtextTheme, aabbBounds, graphic)) return aabbBounds;
         if (!graphic) return aabbBounds;
@@ -18018,7 +18035,7 @@
         aabbBounds.translate(deltaX, deltaY);
         const tb1 = this.tempAABBBounds1,
           tb2 = this.tempAABBBounds2;
-        return tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this.transformAABBBounds(attribute, aabbBounds, richtextTheme, !1, graphic), aabbBounds;
+        return tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), null == attribute.forceBoundsHeight && null == attribute.forceBoundsWidth || this.updateHTMLTextAABBBounds(attribute, richtextTheme, aabbBounds), this.transformAABBBounds(attribute, aabbBounds, richtextTheme, !1, graphic), aabbBounds;
       }
       updateTextAABBBounds(attribute, textTheme, aabbBounds, graphic) {
         if (!this._validCheck(attribute, textTheme, aabbBounds, graphic)) return aabbBounds;
@@ -18040,7 +18057,7 @@
           const shadowBlurHalfWidth = shadowBlur / Math.abs(scaleX + scaleY);
           boundStroke(tb1, shadowBlurHalfWidth, !0, strokeBoundsBuffer), aabbBounds.union(tb1);
         }
-        return this.combindShadowAABBBounds(aabbBounds, graphic), transformBoundsWithMatrix(aabbBounds, aabbBounds, graphic.transMatrix), aabbBounds;
+        return this.combindShadowAABBBounds(aabbBounds, graphic), null == attribute.forceBoundsHeight && null == attribute.forceBoundsWidth || this.updateHTMLTextAABBBounds(attribute, textTheme, aabbBounds), transformBoundsWithMatrix(aabbBounds, aabbBounds, graphic.transMatrix), aabbBounds;
       }
       updatePathAABBBounds(attribute, pathTheme, aabbBounds, graphic) {
         if (!this._validCheck(attribute, pathTheme, aabbBounds, graphic)) return aabbBounds;
@@ -18322,6 +18339,7 @@
       }
       _validCheck(attribute, theme, aabbBounds, graphic) {
         if (!graphic) return !0;
+        if (null != attribute.forceBoundsHeight || null != attribute.forceBoundsWidth) return !0;
         if (!graphic.valid) return aabbBounds.clear(), !1;
         const {
           visible = theme.visible
@@ -18469,6 +18487,10 @@
           context: context
         } = drawContext;
         if (!context) return;
+        const {
+          renderable: renderable
+        } = graphic.attribute;
+        if (!1 === renderable) return;
         context.highPerformanceSave();
         const data = this.transform(graphic, defaultAttr, context, computed3dMatrix),
           {
@@ -19347,11 +19369,17 @@
       }
       drawShape(rect, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb) {
         const {
-          width = groupAttribute.width,
-          height = groupAttribute.height,
+          x1: x1,
+          y1: y1,
+          x: originX = groupAttribute.x,
+          y: originY = groupAttribute.y,
           stroke = groupAttribute.stroke
         } = rect.attribute;
-        if (Array.isArray(stroke) && stroke.some(s => !1 === s)) {
+        let {
+          width: width,
+          height: height
+        } = rect.attribute;
+        if (width = (null != width ? width : x1 - originX) || 0, height = (null != height ? height : y1 - originY) || 0, Array.isArray(stroke) && stroke.some(s => !1 === s)) {
           if (context.setStrokeStyle(rect, rect.attribute, x, y, groupAttribute), context.beginPath(), context.moveTo(x, y), stroke[0] ? context.lineTo(x + width, y) : context.moveTo(x + width, y), stroke[1] ? context.lineTo(x + width, y + height) : context.moveTo(x + width, y + height), stroke[2] ? context.lineTo(x, y + height) : context.moveTo(x, y + height), stroke[3]) {
             const adjustY = stroke[0] ? y - context.lineWidth / 2 : y;
             context.lineTo(x, adjustY);
@@ -20775,7 +20803,7 @@
             strokeOpacity: fillOpacity
           };
         if (underline) {
-          attribute.lineWidth = underline, context.setStrokeStyle(text, attribute, x, y, textAttribute), context.setLineDash(underlineDash), context.beginPath();
+          attribute.lineWidth = underline, context.setStrokeStyle(text, attribute, x, y, textAttribute), underlineDash && context.setLineDash(underlineDash), context.beginPath();
           const dy = y + offsetY + fontSize + underlineOffset;
           context.moveTo(x + offsetX, dy, z), context.lineTo(x + offsetX + w, dy, z), context.stroke();
         }
@@ -20804,7 +20832,7 @@
           };
         let deltaY = -3;
         if (underline) {
-          attribute.lineWidth = underline, context.setStrokeStyle(text, attribute, x, y, textAttribute), context.setLineDash(underlineDash), context.beginPath();
+          attribute.lineWidth = underline, context.setStrokeStyle(text, attribute, x, y, textAttribute), underlineDash && context.setLineDash(underlineDash), context.beginPath();
           const dy = y + offsetY + fontSize + deltaY + underlineOffset;
           context.moveTo(x + 0, dy, z), context.lineTo(x + 0 + w, dy, z), context.stroke();
         }
@@ -22700,7 +22728,7 @@
           }
         } else if ("flex-end" === justifyContent) {
           let pos = main.len;
-          for (let i = lastIdx; i <= currSeg.idx; i++) {
+          for (let i = currSeg.idx; i >= lastIdx; i--) {
             pos -= mianLenArray[i].mainLen;
             const posBaseLeftTop = pos + getPadding(children[i], main.field),
               b = this.getAABBBounds(children[i]);
@@ -24235,7 +24263,7 @@
       }
       drawShape(rect, context, x, y, drawContext, params, fillCb, strokeCb) {
         var _a;
-        const rectAttribute = getTheme$1(rect, null == params ? void 0 : params.theme).rect3d,
+        const rectAttribute = getTheme$1(rect, null == params ? void 0 : params.theme).rect,
           {
             fill = rectAttribute.fill,
             stroke = rectAttribute.stroke,
@@ -26590,7 +26618,7 @@
       setLineDash(segments) {
         const a = arguments,
           _context = this.nativeContext;
-        this.nativeContext.setLineDash ? _context.setLineDash(a[0]) : "mozDash" in _context ? _context.mozDash = a[0] : "webkitLineDash" in _context && (_context.webkitLineDash = a[0]);
+        this.nativeContext.setLineDash ? a[0] && _context.setLineDash(a[0]) : "mozDash" in _context ? _context.mozDash = a[0] : "webkitLineDash" in _context && (_context.webkitLineDash = a[0]);
       }
       stroke(path) {
         this.disableStroke || (path ? this.nativeContext.stroke(path) : this.nativeContext.stroke());
@@ -26681,7 +26709,7 @@
             lineCap = defaultParams.lineCap,
             miterLimit = defaultParams.miterLimit
           } = attribute;
-          _context.globalAlpha = strokeOpacity * opacity, _context.lineWidth = getScaledStroke(this, lineWidth, this.dpr), _context.strokeStyle = createColor(this, stroke, params, offsetX, offsetY), _context.lineJoin = lineJoin, _context.setLineDash(lineDash), _context.lineCap = lineCap, _context.miterLimit = miterLimit;
+          _context.globalAlpha = strokeOpacity * opacity, _context.lineWidth = getScaledStroke(this, lineWidth, this.dpr), _context.strokeStyle = createColor(this, stroke, params, offsetX, offsetY), _context.lineJoin = lineJoin, lineDash && _context.setLineDash(lineDash), _context.lineCap = lineCap, _context.miterLimit = miterLimit;
         }
       }
       setTextStyleWithoutAlignBaseline(params, defaultParams, z) {
@@ -27774,7 +27802,7 @@
         if (this.nativeContext.setLineDash) {
           const lineDash = a[0];
           if (0 === lineDash[0] && 0 === lineDash[1]) return;
-          _context.setLineDash(lineDash);
+          lineDash && _context.setLineDash(lineDash);
         }
       }
       _setStrokeStyle(params, attribute, offsetX, offsetY, defaultParams) {
@@ -27793,7 +27821,7 @@
             lineCap = defaultParams.lineCap,
             miterLimit = defaultParams.miterLimit
           } = attribute;
-          _context.globalAlpha = strokeOpacity * opacity, _context.lineWidth = getScaledStroke(this, lineWidth, this.dpr), _context.strokeStyle = createColor(this, stroke, params, offsetX, offsetY), _context.lineJoin = lineJoin, 0 === lineDash[0] && 0 === lineDash[1] || _context.setLineDash(lineDash), _context.lineCap = lineCap, _context.miterLimit = miterLimit;
+          _context.globalAlpha = strokeOpacity * opacity, _context.lineWidth = getScaledStroke(this, lineWidth, this.dpr), _context.strokeStyle = createColor(this, stroke, params, offsetX, offsetY), _context.lineJoin = lineJoin, 0 === lineDash[0] && 0 === lineDash[1] || lineDash && _context.setLineDash(lineDash), _context.lineCap = lineCap, _context.miterLimit = miterLimit;
         }
       }
       measureText(text) {
@@ -28410,7 +28438,7 @@
             lineCap = defaultParams.lineCap,
             miterLimit = defaultParams.miterLimit
           } = attribute;
-          _context.setGlobalAlpha(strokeOpacity * opacity), _context.setLineWidth(getScaledStroke(this, lineWidth, this.dpr)), _context.setStrokeStyle(createColor(this, stroke, params, offsetX, offsetY)), _context.setLineJoin(lineJoin), _context.setLineDash(lineDash), _context.setLineCap(lineCap), _context.setMiterLimit(miterLimit);
+          _context.setGlobalAlpha(strokeOpacity * opacity), _context.setLineWidth(getScaledStroke(this, lineWidth, this.dpr)), _context.setStrokeStyle(createColor(this, stroke, params, offsetX, offsetY)), _context.setLineJoin(lineJoin), lineDash && _context.setLineDash(lineDash), _context.setLineCap(lineCap), _context.setMiterLimit(miterLimit);
         }
       }
       setTextStyleWithoutAlignBaseline(params, defaultParams) {
@@ -32520,7 +32548,7 @@
           {
             visible: showLabelLine
           } = null !== (_a = this.attribute.line) && void 0 !== _a ? _a : {};
-        labels.forEach((text, index) => {
+        labels && labels.forEach((text, index) => {
           const relatedGraphic = this.getRelatedGraphic(text.attribute),
             textId = text.attribute.id,
             textKey = this._isCollectionBase ? textId : relatedGraphic,
@@ -32880,6 +32908,7 @@
         };
       }
       _layout(texts) {
+        if (!texts || !texts.length) return;
         const labels = super._layout(texts),
           textBoundsArray = labels.map(label => this.getGraphicBounds(label)),
           ellipsisLabelAttribute = Object.assign(Object.assign({}, this.attribute.textStyle), {
@@ -32983,9 +33012,11 @@
             align = this._computeAlign(arc, attribute);
           let labelRadius,
             alignOffset = 0;
-          "inside" === position && (alignOffset = "left" === align ? labelWidth : "right" === align ? 0 : labelWidth / 2), labelRadius = "inside-inner" === position ? innerRadius - offsetRadius + alignOffset : outerRadius + offsetRadius - alignOffset, arc.labelPosition = circlePoint(arc.circleCenter.x, arc.circleCenter.y, labelRadius, arc.middleAngle), arc.labelLimit = labelWidth, isGreater(labelWidth, 0) || (arc.labelVisible = !1), arc.angle = null !== (_b = null === (_a = attribute.textStyle) || void 0 === _a ? void 0 : _a.angle) && void 0 !== _b ? _b : arc.middleAngle;
-          let offsetAngle = null !== (_c = labelConfig.offsetAngle) && void 0 !== _c ? _c : 0;
-          ["inside-inner", "inside-outer"].includes(position) && (offsetAngle += Math.PI / 2), arc.angle += offsetAngle;
+          if ("inside" === position && (alignOffset = "left" === align ? labelWidth : "right" === align ? 0 : labelWidth / 2), labelRadius = "inside-inner" === position ? innerRadius - offsetRadius + alignOffset : outerRadius + offsetRadius - alignOffset, arc.labelPosition = circlePoint(arc.circleCenter.x, arc.circleCenter.y, labelRadius, arc.middleAngle), arc.labelLimit = labelWidth, isGreater(labelWidth, 0) || (arc.labelVisible = !1), !1 !== labelConfig.rotate) {
+            arc.angle = null !== (_b = null === (_a = attribute.textStyle) || void 0 === _a ? void 0 : _a.angle) && void 0 !== _b ? _b : arc.middleAngle;
+            let offsetAngle = null !== (_c = labelConfig.offsetAngle) && void 0 !== _c ? _c : 0;
+            ["inside-inner", "inside-outer"].includes(position) && (offsetAngle += Math.PI / 2), arc.angle += offsetAngle;
+          }
         }), arcs;
       }
       _layoutOutsideLabels(arcs, attribute, currentMarks) {
@@ -54955,6 +54986,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this._canvasListeners = new Map();
             this.isInited = false;
             this._isRunning = false;
+            this._released = false;
             this._model = {
                 [GrammarType.signal]: {},
                 [GrammarType.data]: {},
@@ -54982,6 +55014,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         }
         initView() {
             var _a, _b, _c, _d;
+            if (this._released) {
+                return;
+            }
             this.isInited = true;
             if (this._view) {
                 return;
@@ -55056,6 +55091,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             }
         }
         compile(ctx, option) {
+            if (this._released) {
+                return;
+            }
             const { chart } = ctx;
             this._compileChart = chart;
             this.initView();
@@ -55073,6 +55111,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this.releaseGrammar(removeGraphicItems);
         }
         renderNextTick(morphConfig) {
+            if (this._released) {
+                return;
+            }
             if (!this._nextRafId) {
                 this._nextRafId = VChart.vglobal.getRequestAnimationFrame()(() => {
                     this._nextRafId = null;
@@ -55082,6 +55123,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         }
         render(morphConfig) {
             var _a;
+            if (this._released) {
+                return;
+            }
             if (this._nextRafId) {
                 VChart.vglobal.getCancelAnimationFrame()(this._nextRafId);
                 this._nextRafId = null;
@@ -55242,6 +55286,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this._view = null;
             this.isInited = false;
             this._compileChart = null;
+            this._released = true;
         }
         releaseGrammar(removeGraphicItems = false) {
             var _a, _b;
@@ -64531,7 +64576,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         registerComponentPlugin(CanvasTooltipHandler);
     };
 
-    const version = "1.10.6-alpha.2";
+    const version = "1.10.7-alpha.0";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -65580,7 +65625,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             return selector;
         }
         _parseDefaultInteractionConfig(mainMarks) {
-            var _a;
             if (!(mainMarks === null || mainMarks === void 0 ? void 0 : mainMarks.length)) {
                 return [];
             }
@@ -65620,6 +65664,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             }
             if (finalSelectSpec.enable) {
                 const selector = this._parseSelectorOfInteraction(finalSelectSpec, mainMarks);
+                const isMultiple = finalSelectSpec.mode === 'multiple';
+                const triggerOff = isValid$3(finalSelectSpec.triggerOff)
+                    ? finalSelectSpec.triggerOff
+                    : isMultiple
+                        ? ['empty']
+                        : ['empty', finalSelectSpec.trigger];
                 selector.length &&
                     res.push({
                         type: 'element-select',
@@ -65627,10 +65677,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                         regionId: this._region.id,
                         selector,
                         trigger: finalSelectSpec.trigger,
-                        triggerOff: ((_a = finalSelectSpec.triggerOff) !== null && _a !== void 0 ? _a : 'empty'),
+                        triggerOff: triggerOff,
                         reverseState: STATE_VALUE_ENUM.STATE_SELECTED_REVERSE,
                         state: STATE_VALUE_ENUM.STATE_SELECTED,
-                        isMultiple: finalSelectSpec.mode === 'multiple'
+                        isMultiple
                     });
             }
             return res;
@@ -70168,6 +70218,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             else {
                 this.setMarkStyle(this._symbolMark, { visible: this._getInvalidDefined.bind(this) }, 'normal', exports.AttributeLevel.Series);
             }
+            if (this._symbolMark.getProduct()) {
+                this._symbolMark.compileEncode();
+            }
         }
         initLabelMarkStyle(labelMark) {
             if (!labelMark) {
@@ -82360,15 +82413,16 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 }
             };
             this._handleClearEmpty = () => {
-                const allNodeElements = this._nodeMark.getProductElements();
+                var _a, _b, _c;
+                const allNodeElements = (_a = this._nodeMark) === null || _a === void 0 ? void 0 : _a.getProductElements();
                 if (!allNodeElements || !allNodeElements.length) {
                     return;
                 }
-                const allLinkElements = this._linkMark.getProductElements();
+                const allLinkElements = (_b = this._linkMark) === null || _b === void 0 ? void 0 : _b.getProductElements();
                 if (!allLinkElements || !allLinkElements.length) {
                     return;
                 }
-                const allLabelElements = this._labelMark.getProductElements();
+                const allLabelElements = (_c = this._labelMark) === null || _c === void 0 ? void 0 : _c.getProductElements();
                 if (!allLabelElements || !allLabelElements.length) {
                     return;
                 }
@@ -85926,7 +85980,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     class RangeColumnChartSpecTransformer extends CartesianChartSpecTransformer {
         _getDefaultSeriesSpec(spec) {
             var _a, _b;
-            const series = Object.assign(Object.assign({}, super._getDefaultSeriesSpec(spec)), { barGapInGroup: spec.barGapInGroup, barBackground: spec.barBackground, barMinHeight: spec.barMinHeight });
+            const series = Object.assign(Object.assign({}, super._getDefaultSeriesSpec(spec)), { barWidth: spec.barWidth, barMaxWidth: spec.barMaxWidth, barMinWidth: spec.barMinWidth, barGapInGroup: spec.barGapInGroup, barBackground: spec.barBackground, barMinHeight: spec.barMinHeight, stackCornerRadius: spec.stackCornerRadius });
             series.bar = spec.bar;
             if (spec.direction === "horizontal") {
                 series.xField = (_a = spec.xField) !== null && _a !== void 0 ? _a : [spec.minField, spec.maxField];