@visactor/react-vchart 2.1.3 → 2.1.4-alpha.0

package/build/index.js

@@ -33773,6 +33773,24 @@
             },
             textBaseline: "middle"
           }
+        },
+        conversionArrow: {
+          line: {
+            style: {
+              stroke: "black"
+            }
+          },
+          symbol: {
+            style: {
+              fill: "black"
+            }
+          },
+          text: {
+            style: {
+              fontSize: 12,
+              fill: "#606773"
+            }
+          }
         }
       };
       return res[is3d ? "transform3d" : "transform"] = {
@@ -33890,20 +33908,16 @@
       }
       return isArray$1(spec) ? spec.map(s => specTransform(s, special)) : spec;
     }
-    function functionTransform(spec, VChart) {
-      if (!spec) return spec;
-      if (isPlainObject$3(spec)) {
+    function functionTransform(value, registry) {
+      var _a;
+      if (!value) return value;
+      if (isString$1(value)) return null !== (_a = registry.getFunction(value)) && void 0 !== _a ? _a : value;
+      if (isPlainObject$3(value)) {
         const result = {};
-        for (const key in spec) if (Object.prototype.hasOwnProperty.call(spec, key)) {
-          if (isString$1(spec[key]) && VChart.getFunction(spec[key])) {
-            result[key] = VChart.getFunction(spec[key]);
-            continue;
-          }
-          result[key] = functionTransform(spec[key], VChart);
-        }
+        for (const key in value) Object.prototype.hasOwnProperty.call(value, key) && (result[key] = functionTransform(value[key], registry));
         return result;
       }
-      return isArray$1(spec) ? spec.map(s => functionTransform(s, VChart)) : spec;
+      return isArray$1(value) ? value.map(item => functionTransform(item, registry)) : value;
     }
     function transformFunctionAttribute(att, ...args) {
       return isFunction$1(att) ? att(...args) : att;
@@ -48939,13 +48953,14 @@
           if (this._cachedProcessedTheme[cacheKey]) return this._cachedProcessedTheme[cacheKey];
           let theme = this._currentTheme;
           return keys.forEach((key, index) => {
+            var _a;
             if (1 !== index || "series" !== keys[0] && "component" !== keys[0]) theme = null == theme ? void 0 : theme[key];else {
               const buildInTheme = "series" === keys[0] ? Factory.getSeriesBuiltInTheme(key) : Factory.getComponentBuiltInTheme(key);
               theme = theme ? mergeSpec({}, buildInTheme, theme[key]) : buildInTheme;
             }
             index === keys.length - 1 && isValid$1(theme) && (theme = preprocessTheme({
               [key]: theme
-            }, this._currentTheme.colorScheme, this._currentTheme.token)[key]);
+            }, this._currentTheme.colorScheme, this._currentTheme.token)[key], (null === (_a = this.getFunctionList()) || void 0 === _a ? void 0 : _a.length) && (theme = functionTransform(theme, this)));
           }), this._cachedProcessedTheme[cacheKey] = theme, theme;
         }, removeUndefined(options), this._option = Object.assign(Object.assign({}, this._option), options), (null == options ? void 0 : options.optimize) && (this._option.optimize = Object.assign(Object.assign({}, this._option.optimize), options.optimize)), this._onError = null === (_a = this._option) || void 0 === _a ? void 0 : _a.onError;
         const _k = this._option,
@@ -54559,7 +54574,7 @@
           animationEnter: this._animationConfig.enter ? Array.isArray(this._animationConfig.enter) ? this._animationConfig.enter[0] : this._animationConfig.enter : void 0,
           animationUpdate: this._animationConfig.update ? Array.isArray(this._animationConfig.update) ? this._animationConfig.update[0] : this._animationConfig.update : void 0,
           animationExit: this._animationConfig.exit ? Array.isArray(this._animationConfig.exit) ? this._animationConfig.exit[0] : this._animationConfig.exit : void 0
-        })), this._component ? this._component.setAttributes(attrs) : (this._component = Factory.createGraphicComponent(this._componentType, attrs, {
+        })), this._component ? (this._component.setAttributes(attrs), this._product && this._component.parent !== this._product && this._product.appendChild(this._component)) : (this._component = Factory.createGraphicComponent(this._componentType, attrs, {
           mode: this._mode,
           skipDefault: this._markConfig.skipTheme
         }), this._component && this._product.appendChild(this._component)), this._component && (this._component.context = this._getCommonContext()), this._markConfig.support3d && this._product && this._product.setMode("3d"), this.model.event.emit(HOOK_EVENT.AFTER_ELEMENT_ENCODE, {
@@ -55133,6 +55148,8 @@
               specIndex: this._seriesIndex
             });
           }
+        }, this._clearContinuousBarBandwidthCache = () => {
+          this._continuousBarBandwidthCache = void 0;
         }, this._transformLayoutPosition = pos => {
           let {
             x: x,
@@ -55339,12 +55356,60 @@
           isContinuous: isContinuous(this._scale.type),
           dataToPosition: this.dataToPosition.bind(this),
           getScale: (depth = 0) => this._scales[depth],
+          getBandwidth: (depth = 0) => this._getContinuousBarBandwidth(depth),
           getAxisType: () => this.type,
           getAxisId: () => this.id,
           isInverse: () => !0 === this._inverse,
           getSpec: () => this._spec
         };
       }
+      _getContinuousBarBandwidth(depth = 0) {
+        if (0 !== depth || !isContinuous(this._scale.type)) return;
+        const scale = this._scales[0],
+          domain = scale.domain(),
+          range = scale.range(),
+          domainStart = +(null == domain ? void 0 : domain[0]),
+          domainEnd = +(null == domain ? void 0 : domain[domain.length - 1]),
+          rangeStart = +(null == range ? void 0 : range[0]),
+          rangeEnd = +(null == range ? void 0 : range[range.length - 1]);
+        if (!(Number.isFinite(domainStart) && Number.isFinite(domainEnd) && Number.isFinite(rangeStart) && Number.isFinite(rangeEnd) && domainStart !== domainEnd)) return;
+        const cache = this._continuousBarBandwidthCache;
+        if (cache && cache.scale === scale && cache.domainStart === domainStart && cache.domainEnd === domainEnd && cache.rangeStart === rangeStart && cache.rangeEnd === rangeEnd) return cache.bandWidth;
+        const valueSet = new Set(),
+          orient = this.getOrient();
+        eachSeries(this._regions, s => {
+          var _a, _b, _c, _d;
+          if (s.type !== SeriesTypeEnum.bar) return;
+          const barSeries = s,
+            field = isXAxis(orient) && "vertical" === barSeries.direction ? barSeries.fieldX[0] : isYAxis(orient) && "horizontal" === barSeries.direction ? barSeries.fieldY[0] : void 0,
+            values = field ? null === (_d = null === (_c = null === (_b = null === (_a = s.getViewDataStatistics) || void 0 === _a ? void 0 : _a.call(s)) || void 0 === _b ? void 0 : _b.latestData) || void 0 === _c ? void 0 : _c[field]) || void 0 === _d ? void 0 : _d.values : void 0;
+          null == values || values.forEach(value => {
+            const numericValue = +value;
+            Number.isFinite(numericValue) && valueSet.add(numericValue);
+          });
+        }, {
+          userId: this._seriesUserId,
+          specIndex: this._seriesIndex
+        });
+        const values = Array.from(valueSet).sort((a, b) => a - b);
+        if (values.length < 2) return;
+        let minStep = 1 / 0,
+          lastValue = values[0];
+        for (let i = 1; i < values.length; i++) {
+          const value = values[i],
+            step = value - lastValue;
+          step > 0 && step < minStep && (minStep = step), lastValue = value;
+        }
+        const bandWidth = minStep < 1 / 0 ? Math.abs((rangeEnd - rangeStart) / (domainEnd - domainStart) * minStep) : void 0;
+        return Number.isFinite(bandWidth) ? (this._continuousBarBandwidthCache = {
+          scale: scale,
+          domainStart: domainStart,
+          domainEnd: domainEnd,
+          rangeStart: rangeStart,
+          rangeEnd: rangeEnd,
+          bandWidth: bandWidth
+        }, bandWidth) : void 0;
+      }
       afterCompile() {
         var _a;
         (null === (_a = this._axisMark) || void 0 === _a ? void 0 : _a.getProduct()) && this.event.on(HOOK_EVENT.AFTER_ELEMENT_ENCODE, ({
@@ -55527,7 +55592,13 @@
         })] : [];
       }
       initEvent() {
-        super.initEvent(), this._specVisible && (this.event.on(ChartEvent.layoutEnd, this._updateAxisLayout), this.event.on(ChartEvent.layoutEnd, this._fixAxisOnZero), this.event.on(ChartEvent.layoutRectUpdate, () => {
+        super.initEvent(), eachSeries(this._regions, s => {
+          var _a, _b;
+          null === (_b = null === (_a = s.getViewDataStatistics) || void 0 === _a ? void 0 : _a.call(s)) || void 0 === _b || _b.target.addListener("change", this._clearContinuousBarBandwidthCache);
+        }, {
+          userId: this._seriesUserId,
+          specIndex: this._seriesIndex
+        }), this._specVisible && (this.event.on(ChartEvent.layoutEnd, this._updateAxisLayout), this.event.on(ChartEvent.layoutEnd, this._fixAxisOnZero), this.event.on(ChartEvent.layoutRectUpdate, () => {
           this._clearLayoutCache();
         }));
       }
@@ -71015,6 +71086,20 @@
           compileOnlyKeys: Object.assign(Object.assign({}, policy.compileOnlyKeys), BAR_SERIES_COMPILE_ONLY_KEYS)
         });
       }
+      getStatisticFields() {
+        var _a;
+        const fields = super.getStatisticFields(),
+          positionAxisHelper = "horizontal" === this.direction ? this.getYAxisHelper() : this.getXAxisHelper(),
+          positionFields = "horizontal" === this.direction ? this._fieldY : this._fieldX,
+          positionScale = null === (_a = null == positionAxisHelper ? void 0 : positionAxisHelper.getScale) || void 0 === _a ? void 0 : _a.call(positionAxisHelper, 0);
+        return positionScale && isContinuous(positionScale.type) && positionFields.forEach(field => {
+          const fieldStatistics = fields.find(entry => entry.key === field);
+          fieldStatistics ? fieldStatistics.operations.includes("values") || fieldStatistics.operations.push("values") : fields.push({
+            key: field,
+            operations: ["values"]
+          });
+        }), fields;
+      }
       initMark() {
         this._initBarBackgroundMark(), this._barMark = this._createMark(Object.assign(Object.assign({}, BarSeries.mark.bar), {
           name: this._barMarkName,
@@ -71345,18 +71430,19 @@
         this._barMark.setAnimationConfig(animationConfig(null === (_b = Factory.getAnimationInKey("bar")) || void 0 === _b ? void 0 : _b(barAnimationParams, appearPreset), userAnimationConfig(this._barMarkName, this._spec, this._markAttributeContext), animationParams));
       }
       _getBarWidth(axisHelper, scaleDepth) {
-        var _a, _b;
+        var _a;
         const depthFromSpec = this._groups ? this._groups.fields.length : 1,
           depth = isNil$1(scaleDepth) ? depthFromSpec : Math.min(depthFromSpec, scaleDepth),
-          bandWidth = null !== (_b = null === (_a = axisHelper.getBandwidth) || void 0 === _a ? void 0 : _a.call(axisHelper, depth - 1)) && void 0 !== _b ? _b : 6,
           hasBarWidth = isValid$1(this._spec.barWidth) && depth === depthFromSpec,
+          axisBandWidth = hasBarWidth && "number" == typeof this._spec.barWidth && "string" != typeof this._spec.barMinWidth && "string" != typeof this._spec.barMaxWidth || null === (_a = axisHelper.getBandwidth) || void 0 === _a ? void 0 : _a.call(axisHelper, depth - 1),
+          bandWidth = null != axisBandWidth ? axisBandWidth : 6,
           hasBarMinWidth = isValid$1(this._spec.barMinWidth),
           hasBarMaxWidth = isValid$1(this._spec.barMaxWidth);
-        let width = bandWidth;
+        let width = !axisHelper.isContinuous || isNil$1(axisBandWidth) || hasBarWidth ? bandWidth : .5 * bandWidth;
         return hasBarWidth && (width = getActualNumValue(this._spec.barWidth, bandWidth)), hasBarMinWidth && (width = Math.max(width, getActualNumValue(this._spec.barMinWidth, bandWidth))), hasBarMaxWidth && (width = Math.min(width, getActualNumValue(this._spec.barMaxWidth, bandWidth))), width;
       }
       _getPosition(direction, datum, scaleDepth, mark) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         let axisHelper, sizeAttribute, dataToPosition;
         "horizontal" === direction ? (axisHelper = this.getYAxisHelper(), sizeAttribute = "height", dataToPosition = "barBackground" === mark ? this.dataToBarBackgroundPositionY.bind(this) : this.dataToPositionY.bind(this)) : (axisHelper = this.getXAxisHelper(), sizeAttribute = "width", dataToPosition = "barBackground" === mark ? this.dataToBarBackgroundPositionX.bind(this) : this.dataToPositionX.bind(this));
         const scale = axisHelper.getScale(0),
@@ -71377,7 +71463,7 @@
               i = groupValues.indexOf(datum[groupField]);
             index === groupFields.length - 1 ? (totalWidth += groupCount * size + (groupCount - 1) * gap, offSet += i * (size + gap)) : (offSet += i * (totalWidth + gap), totalWidth += totalWidth + (groupCount - 1) * gap);
           }
-          return scale.scale(datum[groupFields[0]]) + axisHelper.getBandwidth(0) / 2 - totalWidth / 2 + offSet;
+          return scale.scale(datum[groupFields[0]]) + (null !== (_f = axisHelper.getBandwidth(0)) && void 0 !== _f ? _f : bandWidth) / 2 - totalWidth / 2 + offSet;
         }
         const continuous = isContinuous(scale.type || "band");
         return dataToPosition(datum, depth) + .5 * (bandWidth - size) + (continuous ? -bandWidth / 2 : 0);