@visactor/react-vchart 2.1.0-alpha.6 → 2.1.0-alpha.7

package/build/index.js

@@ -66334,17 +66334,10 @@
         [ComponentTypeEnum.markArea]: !0
       },
       MARKER_ADDITION_REMAKE_SPEC_KEYS = {
-        autoRange: !0,
         regionId: !0,
         regionIndex: !0,
         seriesId: !0,
         seriesIndex: !0,
-        relativeSeriesId: !0,
-        relativeSeriesIndex: !0,
-        startRelativeSeriesId: !0,
-        startRelativeSeriesIndex: !0,
-        endRelativeSeriesId: !0,
-        endRelativeSeriesIndex: !0,
         specifiedDataSeriesId: !0,
         specifiedDataSeriesIndex: !0
       };
@@ -66423,7 +66416,11 @@
         }, this.getComponentsByKey = key => this._components.filter(c => (c.specKey || c.type) === key), this.getComponentByUserId = userId => {
           const component = this._components.find(s => s.userId === userId);
           if (component) return component;
-        }, this.getComponentsByType = type => this._components.filter(c => c.type === type), this._isMarkerAdditionSpecSafeWithoutRemake = spec => !(!spec || "object" != typeof spec || !1 === spec.visible) && !Object.keys(MARKER_ADDITION_REMAKE_SPEC_KEYS).some(key => !isNil$1(spec[key])), this._paddingSpec = normalizeLayoutPaddingSpec(null !== (_a = spec.padding) && void 0 !== _a ? _a : option.getTheme("padding")), this._event = new Event$1(option.eventDispatcher, option.mode), this._dataSet = option.dataSet, this._chartData = new ChartData(this._dataSet), this._modelOption = Object.assign(Object.assign({}, option), {
+        }, this.getComponentsByType = type => this._components.filter(c => c.type === type), this._isMarkerAdditionSpecSafeWithoutRemake = spec => {
+          if (!spec || "object" != typeof spec) return !1;
+          const markerSpec = spec;
+          return !1 !== markerSpec.visible && !Object.keys(MARKER_ADDITION_REMAKE_SPEC_KEYS).some(key => !isNil$1(markerSpec[key]));
+        }, this._paddingSpec = normalizeLayoutPaddingSpec(null !== (_a = spec.padding) && void 0 !== _a ? _a : option.getTheme("padding")), this._event = new Event$1(option.eventDispatcher, option.mode), this._dataSet = option.dataSet, this._chartData = new ChartData(this._dataSet), this._modelOption = Object.assign(Object.assign({}, option), {
           mode: this._option.mode,
           map: this._idMap,
           getChartLayoutRect: () => this._layoutRect,
@@ -66841,6 +66838,9 @@
       _canAddMarkerComponentsWithoutRemake(key, currentSpec, nextSpec) {
         return !!(MARKER_COMPONENT_SPEC_KEYS[key] && isArray$1(currentSpec) && isArray$1(nextSpec)) && !(nextSpec.length <= currentSpec.length) && nextSpec.slice(currentSpec.length).every(this._isMarkerAdditionSpecSafeWithoutRemake);
       }
+      _isAutoRangeMarkerSpec(spec) {
+        return !!spec && "object" == typeof spec && !0 === spec.autoRange;
+      }
       _canRemoveMarkerComponentsWithoutRemake(key, currentSpec, nextSpec) {
         return MARKER_COMPONENT_SPEC_KEYS[key] && isArray$1(currentSpec) && currentSpec.length > 0 && isArray$1(nextSpec) && 0 === nextSpec.length;
       }
@@ -66906,13 +66906,17 @@
       }
       _createMissingMarkerComponentsForSpecs(result, componentCache) {
         var _a;
-        let createdCount = 0;
+        let createdCount = 0,
+          hasAutoRangeMarker = !1;
         null === (_a = this._specTransformer) || void 0 === _a || _a.forEachComponentInSpec(this._spec, (constructor, specInfo) => {
           if (result.reMake) return;
           const compSpecKey = constructor.specKey || constructor.type;
-          MARKER_COMPONENT_SPEC_KEYS[compSpecKey] && !this._hasComponentForSpecInfo(compSpecKey, specInfo) && (this._isMarkerAdditionSpecSafeWithoutRemake(specInfo.spec) ? (this._createComponent(constructor, specInfo), componentCache[compSpecKey] && componentCache[compSpecKey].componentCount++, createdCount++) : result.reMake = !0);
-        }, this._option.getSpecInfo()), createdCount && (result.change = !0, result.effects = Object.assign(Object.assign({}, result.effects), {
-          component: !0,
+          MARKER_COMPONENT_SPEC_KEYS[compSpecKey] && !this._hasComponentForSpecInfo(compSpecKey, specInfo) && (this._isMarkerAdditionSpecSafeWithoutRemake(specInfo.spec) ? (this._createComponent(constructor, specInfo), componentCache[compSpecKey] && componentCache[compSpecKey].componentCount++, createdCount++, hasAutoRangeMarker = hasAutoRangeMarker || this._isAutoRangeMarkerSpec(specInfo.spec)) : result.reMake = !0);
+        }, this._option.getSpecInfo()), createdCount && (result.change = !0, result.effects = Object.assign(Object.assign(Object.assign(Object.assign({}, result.effects), {
+          component: !0
+        }), hasAutoRangeMarker ? {
+          scaleDomain: !0
+        } : null), {
           layout: !0,
           render: !0
         }));
@@ -90844,20 +90848,31 @@
       MARKER_COORDINATE_PLACEHOLDER = "__vchart_marker_coordinate__",
       MARKER_TEXT_PLACEHOLDER = "__vchart_marker_text__",
       MARKER_AUTO_RANGE_PLACEHOLDER = "__vchart_marker_auto_range__",
+      MARKER_STYLE_PLACEHOLDER = "__vchart_marker_style__",
       MARKER_DOMAIN_POSITION_SPEC_KEYS = ["coordinate", "coordinates", "x", "y", "x1", "y1", "angle", "angle1", "radius", "radius1"],
       MARKER_LAYOUT_POSITION_SPEC_KEYS = ["position", "positions", "coordinatesOffset", "regionRelative"],
       normalizeMarkerLabelFormatMethod = label => Array.isArray(label) ? label.map(normalizeMarkerLabelFormatMethod) : label && "object" == typeof label ? "function" != typeof label.formatMethod ? label : Object.assign(Object.assign({}, label), {
         formatMethod: MARKER_FORMAT_METHOD_PLACEHOLDER
       }) : label,
+      normalizeMarkerStyles = value => {
+        if (Array.isArray(value)) return value.map(normalizeMarkerStyles);
+        if (!value || "object" != typeof value) return value;
+        const normalized = Object.assign({}, value);
+        return Object.keys(normalized).forEach(key => {
+          "style" === key || key.endsWith("Style") ? normalized[key] = MARKER_STYLE_PLACEHOLDER : normalized[key] = normalizeMarkerStyles(normalized[key]);
+        }), normalized;
+      },
       normalizeMarkerSpecForComponentOnlyUpdate = (spec, options) => {
         var _a;
         if (!spec || "object" != typeof spec) return spec;
         const normalized = Object.assign({}, spec);
         options.normalizeDomainPosition && MARKER_DOMAIN_POSITION_SPEC_KEYS.forEach(key => {
-          key in normalized && (normalized[key] = MARKER_COORDINATE_PLACEHOLDER);
+          normalized[key] = MARKER_COORDINATE_PLACEHOLDER;
         }), options.normalizeAutoRange && "autoRange" in normalized && (normalized.autoRange = MARKER_AUTO_RANGE_PLACEHOLDER), MARKER_LAYOUT_POSITION_SPEC_KEYS.forEach(key => {
           key in normalized && (normalized[key] = MARKER_COORDINATE_PLACEHOLDER);
-        }), "label" in normalized && (normalized.label = normalizeMarkerLabelFormatMethod(normalized.label));
+        }), "label" in normalized && (normalized.label = normalizeMarkerLabelFormatMethod(normalized.label)), Object.keys(normalized).forEach(key => {
+          normalized[key] = normalizeMarkerStyles(normalized[key]);
+        });
         const text = null === (_a = normalized.itemContent) || void 0 === _a ? void 0 : _a.text;
         return text && "object" == typeof text && (normalized.itemContent = Object.assign(Object.assign({}, normalized.itemContent), {
           text: Object.assign(Object.assign({}, normalizeMarkerLabelFormatMethod(text)), {
@@ -91044,7 +91059,7 @@
         }));
       }
       reInit(spec) {
-        super.reInit(spec), this._bindSeries(), this._initDataView(), this._buildMarkerAttributeContext(), this._markerComponent && this._updateMarkerLayout();
+        super.reInit(spec), this._releaseMarkerData(), this._bindSeries(), this._initDataView(), this._buildMarkerAttributeContext(), this._markerComponent && this._updateMarkerLayout();
       }
       _initCommonDataView() {
         const {
@@ -93093,7 +93108,7 @@
         return new MarkPoint$1(markPointAttrs);
       }
       _markerLayout() {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         const spec = this._spec,
           data = this._markerData,
           relativeSeries = this._relativeSeries,
@@ -93101,9 +93116,30 @@
             point: point
           } = this._computePointsAttr(),
           seriesData = this._getRelativeDataView().latestData,
-          dataPoints = data ? data.latestData[0] && data.latestData[0].latestData ? data.latestData[0].latestData : data.latestData : seriesData;
+          dataPoints = data ? data.latestData[0] && data.latestData[0].latestData ? data.latestData[0].latestData : data.latestData : seriesData,
+          {
+            itemLine = {},
+            itemContent = {}
+          } = this._spec,
+          {
+            visible: itemLineVisible,
+            line = {}
+          } = itemLine,
+          restItemLine = __rest$1(itemLine, ["visible", "line"]),
+          itemLineAttrs = !1 !== itemLineVisible ? Object.assign(Object.assign({}, restItemLine), {
+            visible: !0,
+            lineStyle: transformToGraphic(line.style)
+          }) : {
+            visible: !1
+          },
+          labelAttrs = transformLabelAttributes(Object.assign(Object.assign({}, itemContent.text), {
+            style: merge$1({
+              dx: 0,
+              dy: 0
+            }, null !== (_b = null === (_a = itemContent.text) || void 0 === _a ? void 0 : _a.style) && void 0 !== _b ? _b : itemContent.style)
+          }), data, this._markAttributeContext);
         let limitRect;
-        if (spec.clip || (null === (_a = spec.itemContent) || void 0 === _a ? void 0 : _a.confine)) {
+        if (spec.clip || (null === (_c = spec.itemContent) || void 0 === _c ? void 0 : _c.confine)) {
           const {
             minX: minX,
             maxX: maxX,
@@ -93118,21 +93154,24 @@
           };
         }
         if (this._markerComponent) {
-          const attribute = null !== (_b = this._markerComponent.attribute) && void 0 !== _b ? _b : {},
-            textStyle = null !== (_d = null === (_c = attribute.itemContent) || void 0 === _c ? void 0 : _c.textStyle) && void 0 !== _d ? _d : {},
-            specText = null === (_e = this._spec.itemContent.text) || void 0 === _e ? void 0 : _e.text;
+          const attribute = null !== (_d = this._markerComponent.attribute) && void 0 !== _d ? _d : {},
+            textStyle = null !== (_f = null === (_e = attribute.itemContent) || void 0 === _e ? void 0 : _e.textStyle) && void 0 !== _f ? _f : {},
+            specText = null === (_g = this._spec.itemContent.text) || void 0 === _g ? void 0 : _g.text;
           this._markerComponent.setAttributes({
             position: void 0 === point ? {
               x: null,
               y: null
             } : point,
             itemContent: Object.assign(Object.assign({}, attribute.itemContent), {
-              textStyle: Object.assign(Object.assign({}, textStyle), {
-                text: (null === (_f = this._spec.itemContent.text) || void 0 === _f ? void 0 : _f.formatMethod) ? this._spec.itemContent.text.formatMethod(dataPoints, seriesData) : isValid$1(specText) ? specText : textStyle.text
+              panel: null !== (_h = labelAttrs.panel) && void 0 !== _h ? _h : null === (_j = attribute.itemContent) || void 0 === _j ? void 0 : _j.panel,
+              padding: null !== (_k = labelAttrs.padding) && void 0 !== _k ? _k : null === (_l = attribute.itemContent) || void 0 === _l ? void 0 : _l.padding,
+              textStyle: Object.assign(Object.assign(Object.assign({}, textStyle), null !== (_m = labelAttrs.textStyle) && void 0 !== _m ? _m : {}), {
+                text: (null === (_o = this._spec.itemContent.text) || void 0 === _o ? void 0 : _o.formatMethod) ? this._spec.itemContent.text.formatMethod(dataPoints, seriesData) : isValid$1(specText) ? specText : textStyle.text
               }),
               offsetX: computeOffsetFromRegion(point, attribute.itemContent.offsetX, this._relativeSeries.getRegion()),
               offsetY: computeOffsetFromRegion(point, attribute.itemContent.offsetY, this._relativeSeries.getRegion())
             }),
+            itemLine: itemLineAttrs,
             limitRect: limitRect,
             dx: this._layoutOffsetX,
             dy: this._layoutOffsetY