@visactor/react-vchart 2.1.0-alpha.10 → 2.1.0-alpha.11

package/build/index.js

@@ -91081,6 +91081,7 @@
       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"],
+      MARKER_ITEM_CONTENT_LAYOUT_SPEC_KEYS = ["offsetX", "offsetY", "confine"],
       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,
@@ -91093,7 +91094,6 @@
         }), 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 => {
@@ -91103,12 +91103,17 @@
         }), "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)), {
+        const itemContent = normalized.itemContent;
+        if (itemContent && "object" == typeof itemContent) {
+          normalized.itemContent = Object.assign({}, itemContent), MARKER_ITEM_CONTENT_LAYOUT_SPEC_KEYS.forEach(key => {
+            key in normalized.itemContent && (normalized.itemContent[key] = MARKER_COORDINATE_PLACEHOLDER);
+          });
+          const text = normalized.itemContent.text;
+          text && "object" == typeof text && (normalized.itemContent.text = Object.assign(Object.assign({}, normalizeMarkerLabelFormatMethod(text)), {
             text: MARKER_TEXT_PLACEHOLDER
-          })
-        })), normalized;
+          }));
+        }
+        return normalized;
       };
     class BaseMarker extends BaseComponent {
       constructor() {
@@ -93251,6 +93256,7 @@
             itemLine = {},
             targetSymbol = {}
           } = this._spec,
+          region = this._relativeSeries.getRegion(),
           _10 = itemContent,
           {
             type = "text",
@@ -93300,8 +93306,8 @@
             clipInRange: null !== (_v = this._spec.clip) && void 0 !== _v && _v,
             itemContent: Object.assign(Object.assign({
               type: type,
-              offsetX: transformOffset(itemContent.offsetX, this._relativeSeries.getRegion()),
-              offsetY: transformOffset(itemContent.offsetX, this._relativeSeries.getRegion())
+              offsetX: transformOffset(itemContent.offsetX, region),
+              offsetY: transformOffset(itemContent.offsetY, region)
             }, restItemContent), {
               style: transformStyle(itemContentStyle, this._markerData, this._markAttributeContext)
             }),
@@ -93351,6 +93357,7 @@
             itemLine = {},
             itemContent = {}
           } = this._spec,
+          region = this._relativeSeries.getRegion(),
           {
             visible: itemLineVisible,
             line = {}
@@ -93386,7 +93393,9 @@
         if (this._markerComponent) {
           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;
+            specText = null === (_g = this._spec.itemContent.text) || void 0 === _g ? void 0 : _g.text,
+            offsetX = transformOffset(itemContent.offsetX, region),
+            offsetY = transformOffset(itemContent.offsetY, region);
           this._markerComponent.setAttributes({
             position: void 0 === point ? {
               x: null,
@@ -93398,8 +93407,8 @@
               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())
+              offsetX: computeOffsetFromRegion(point, offsetX, region),
+              offsetY: computeOffsetFromRegion(point, offsetY, region)
             }),
             itemLine: itemLineAttrs,
             limitRect: limitRect,