fix cr

Author: quao

src/component/marker/checkMarkerInSeries.ts

@@ -20,7 +20,7 @@
 import { isArray } from 'zrender/src/core/util';
 import { SeriesOption } from '../../util/types';
 
-type MarkerTypes = 'markPoint' | 'markLine' | 'markArea';
+export type MarkerTypes = 'markPoint' | 'markLine' | 'markArea';
 
 type SeriesWithMarkerOption = SeriesOption & Partial<Record<MarkerTypes, unknown>>;
 

src/coord/cartesian/Grid.ts

@@ -70,6 +70,7 @@ import { error, log } from '../../util/log';
 import { AxisTickLabelComputingKind } from '../axisTickLabelBuilder';
 import { injectCoordSysByOption } from '../../core/CoordinateSystem';
 import { mathMax, parsePositionSizeOption } from '../../util/number';
+import { MarkerTypes } from '../../component/marker/checkMarkerInSeries';
 
 type Cartesian2DDimensionName = 'x' | 'y';
 
@@ -81,8 +82,6 @@ type AxesMap = {
 
 type ParsedOuterBoundsContain = 'all' | 'axisLabel';
 
-type MarkerTypes = 'markPoint' | 'markLine' | 'markArea';
-
 // margin is [top, right, bottom, left]
 const XY_TO_MARGIN_IDX = [
     [3, 1], // xyIdx 0 => 'x'
@@ -545,7 +544,7 @@ class Grid implements CoordinateSystemMaster {
                 unionExtent(data, xAxis);
                 unionExtent(data, yAxis);
 
-                // 处理 markPoint、markLine、markArea
+                // Handle markPoint, markLine, markArea
                 const markerTypes: MarkerTypes[] = ['markPoint', 'markLine', 'markArea'];
 
                 markerTypes.forEach(markerType => {
@@ -563,7 +562,7 @@ class Grid implements CoordinateSystemMaster {
             });
         }
 
-        function UnionExtentForAxisByValue(
+        function unionExtentForAxisByValue(
             value: any,
             axis: Axis2D,
             axisType: OptionAxisType,
@@ -572,10 +571,7 @@ class Grid implements CoordinateSystemMaster {
             if (includeMarkerInExtent && value != null && typeof value !== 'string' && axisType !== 'category') {
                 const val = axis.scale.parse(value);
                 if (!isNaN(val)) {
-                    // Construct the parameter and use unionExtentFromData to avoid using the private method _innerUnionExtent
-                    axis.scale.unionExtentFromData({
-                        getApproximateExtent: () => [val, val]
-                    } as any, 0);
+                    axis.scale.unionExtentByValue(val);
                 }
             }
         }
@@ -596,12 +592,12 @@ class Grid implements CoordinateSystemMaster {
                         return;
                     }
 
-                    UnionExtentForAxisByValue(markerItem.xAxis, xAxis, xAxis.type);
-                    UnionExtentForAxisByValue(markerItem.yAxis, yAxis, yAxis.type);
+                    unionExtentForAxisByValue(markerItem.xAxis, xAxis, xAxis.type);
+                    unionExtentForAxisByValue(markerItem.yAxis, yAxis, yAxis.type);
 
                     if (markerItem.coord && Array.isArray(markerItem.coord)) {
-                        UnionExtentForAxisByValue(markerItem.coord[0], xAxis, xAxis.type);
-                        UnionExtentForAxisByValue(markerItem.coord[1], yAxis, yAxis.type);
+                        unionExtentForAxisByValue(markerItem.coord[0], xAxis, xAxis.type);
+                        unionExtentForAxisByValue(markerItem.coord[1], yAxis, yAxis.type);
                     }
                 });
             });

src/scale/Scale.ts

@@ -133,6 +133,18 @@ abstract class Scale<SETTING extends ScaleSettingDefault = ScaleSettingDefault>
         this._innerUnionExtent(data.getApproximateExtent(dim));
     }
 
+    /**
+     * Update extent by value
+     */
+    unionExtentByValue(value: number): void {
+        const extent = this._extent;
+        // Considered that number could be NaN and should not write into the extent.
+        this._innerSetExtent(
+            value < extent[0] ? value : extent[0],
+            value > extent[1] ? value : extent[1]
+        );
+    }
+
     /**
      * Get a new slice of extent.
      * Extent is always in increase order.