feature&fix(axis):

(1) feature: Enable uniform bandWidth calculation in numeric axis (e.g., for tooltip shadow); it previously only applicable to category axis, but buggy in numeric axis with bar series. And enable the clip of tooltip shadow.
(2) refactor: Introduce a dedicated workflow phase for series aggregation and data statistics computation on a single axis, allowting the results to be reused across multiple features.
(3) fix: Fix duplicate ticks in TimeScale and customValues, which cause jitter of splitArea.
(4) fix: Fix category showMin/MaxLabel handling when step > 1 and showMin/MaxLabel: false
(5) chore: Tweak bad effects introduced by the previous implementation of SCALE_EXTENT_KIND_MAPPING.
(6) chore: Clean some code.

Author: 100pah

src/chart/bar/install.ts

@@ -19,7 +19,7 @@
 
 import { EChartsExtensionInstallRegisters } from '../../extension';
 import * as zrUtil from 'zrender/src/core/util';
-import {layout, createProgressiveLayout, registerBarGridAxisContainShapeHandler} from '../../layout/barGrid';
+import {layout, createProgressiveLayout, registerBarGridAxisHandlers} from '../../layout/barGrid';
 import dataSample from '../../processor/dataSample';
 
 import BarSeries from './BarSeries';
@@ -67,5 +67,5 @@ export function install(registers: EChartsExtensionInstallRegisters) {
         );
     });
 
-    registerBarGridAxisContainShapeHandler(registers);
+    registerBarGridAxisHandlers(registers);
 }

src/chart/bar/installPictorialBar.ts

@@ -20,7 +20,7 @@
 import { EChartsExtensionInstallRegisters } from '../../extension';
 import PictorialBarView from './PictorialBarView';
 import PictorialBarSeriesModel from './PictorialBarSeries';
-import { createProgressiveLayout, layout, registerBarGridAxisContainShapeHandler } from '../../layout/barGrid';
+import { createProgressiveLayout, layout, registerBarGridAxisHandlers } from '../../layout/barGrid';
 import { curry } from 'zrender/src/core/util';
 
 export function install(registers: EChartsExtensionInstallRegisters) {
@@ -31,5 +31,5 @@ export function install(registers: EChartsExtensionInstallRegisters) {
     // Do layout after other overall layout, which can prepare some information.
     registers.registerLayout(registers.PRIORITY.VISUAL.PROGRESSIVE_LAYOUT, createProgressiveLayout('pictorialBar'));
 
-    registerBarGridAxisContainShapeHandler(registers);
+    registerBarGridAxisHandlers(registers);
 }

src/chart/line/LineView.ts

@@ -399,7 +399,7 @@ function getIsIgnoreFunc(
 
     zrUtil.each(categoryAxis.getViewLabels(), function (labelItem) {
         const ordinalNumber = (categoryAxis.scale as OrdinalScale)
-            .getRawOrdinalNumber(labelItem.tickValue);
+            .getRawOrdinalNumber(labelItem.tick.value);
         labelMap[ordinalNumber] = 1;
     });
 

src/chart/sankey/sankeyLayout.ts

@@ -25,6 +25,7 @@ import { GraphNode, GraphEdge } from '../../data/Graph';
 import { LayoutOrient } from '../../util/types';
 import GlobalModel from '../../model/Global';
 import { createBoxLayoutReference, getLayoutRect } from '../../util/layout';
+import { asc } from '../../util/number';
 
 export default function sankeyLayout(ecModel: GlobalModel, api: ExtensionAPI) {
 
@@ -290,9 +291,7 @@ function prepareNodesByBreadth(nodes: GraphNode[], orient: LayoutOrient) {
     const groupResult = groupData(nodes, function (node) {
         return node.getLayout()[keyAttr] as number;
     });
-    groupResult.keys.sort(function (a, b) {
-        return a - b;
-    });
+    asc(groupResult.keys);
     zrUtil.each(groupResult.keys, function (key) {
         nodesByBreadth.push(groupResult.buckets.get(key));
     });

src/component/axis/AngleAxisView.ts

@@ -101,8 +101,8 @@ class AngleAxisView extends AxisView {
             labelItem = zrUtil.clone(labelItem);
             const scale = angleAxis.scale;
             const tickValue = scale.type === 'ordinal'
-                ? (scale as OrdinalScale).getRawOrdinalNumber(labelItem.tickValue)
-                : labelItem.tickValue;
+                ? (scale as OrdinalScale).getRawOrdinalNumber(labelItem.tick.value)
+                : labelItem.tick.value;
             labelItem.coord = angleAxis.dataToCoord(tickValue);
             return labelItem;
         });
@@ -250,7 +250,7 @@ const angelAxisElementsBuilders: Record<typeof elementList[number], AngleAxisEle
         // Use length of ticksAngles because it may remove the last tick to avoid overlapping
         zrUtil.each(labels, function (labelItem, idx) {
             let labelModel = commonLabelModel;
-            const tickValue = labelItem.tickValue;
+            const tickValue = labelItem.tick.value;
 
             const r = radiusExtent[getRadiusIdx(polar)];
             const p = polar.coordToPoint([r + labelMargin, labelItem.coord]);

src/component/axis/AxisBuilder.ts

@@ -44,7 +44,8 @@ import {
     DimensionName,
 } from '../../util/types';
 import {
-    AxisBaseOption, AxisBaseOptionCommon, AxisLabelBaseOptionNuance
+    AxisBaseOption, AxisBaseOptionCommon, AxisLabelBaseOptionNuance,
+    AxisShowMinMaxLabelOption,
 } from '../../coord/axisCommonTypes';
 import type Element from 'zrender/src/Element';
 import { PathProps, PathStyleProps } from 'zrender/src/graphic/Path';
@@ -70,9 +71,11 @@ import BoundingRect from 'zrender/src/core/BoundingRect';
 import Point from 'zrender/src/core/Point';
 import { copyTransform } from 'zrender/src/core/Transformable';
 import {
+    AxisLabelInfoDetermined,
     AxisLabelsComputingContext, AxisTickLabelComputingKind, createAxisLabelsComputingContext
 } from '../../coord/axisTickLabelBuilder';
 import { AxisTickCoord } from '../../coord/Axis';
+import { isTimeScale } from '../../scale/helper';
 
 
 const PI = Math.PI;
@@ -112,14 +115,13 @@ type AxisLabelText = graphic.Text & {
 } & ECElement;
 
 export const getLabelInner = makeInner<{
-    break: VisualAxisBreak;
-    tickValue: number;
+    labelInfo: AxisLabelInfoDetermined; // Never be null/undefined.
     layoutRotation: number;
 }, graphic.Text>();
 
 const getTickInner = makeInner<{
-    onBand: AxisTickCoord['onBand']
-    tickValue: AxisTickCoord['tickValue']
+    onBand: AxisTickCoord['onBand'];
+    tickValue: AxisTickCoord['tickValue'];
 }, graphic.Line>();
 
 
@@ -1061,7 +1063,10 @@ function fixMinMaxLabelShow(
     labelLayoutList: LabelLayoutData[],
     optionHideOverlap: AxisBaseOption['axisLabel']['hideOverlap']
 ) {
-    if (shouldShowAllLabels(axisModel.axis)) {
+    const axis = axisModel.axis;
+    const customValuesOption = axisModel.get(['axisLabel', 'customValues']);
+
+    if (shouldShowAllLabels(axis)) {
         return;
     }
 
@@ -1070,7 +1075,7 @@ function fixMinMaxLabelShow(
     // Assert no ignore in labels.
 
     function deal(
-        showMinMaxLabel: boolean,
+        showMinMaxLabelOption: AxisShowMinMaxLabelOption,
         outmostLabelIdx: number,
         innerLabelIdx: number,
     ) {
@@ -1079,8 +1084,18 @@ function fixMinMaxLabelShow(
         if (!outmostLabelLayout || !innerLabelLayout) {
             return;
         }
+        if (showMinMaxLabelOption == null) {
+            if (!optionHideOverlap && customValuesOption) {
+                // In this case, users are unlikely to expect labels to be hidden.
+                return;
+            }
+            if (isTimeScale(axis.scale) && getLabelInner(outmostLabelLayout.label).labelInfo.tick.notNice) {
+                // TimeScale does not expand extent to "nice", so eliminate labels that are not nice.
+                ignoreEl(outmostLabelLayout.label);
+            }
+        }
 
-        if (showMinMaxLabel === false || outmostLabelLayout.suggestIgnore) {
+        if (showMinMaxLabelOption === false || outmostLabelLayout.suggestIgnore) {
             ignoreEl(outmostLabelLayout.label);
             return;
         }
@@ -1107,7 +1122,7 @@ function fixMinMaxLabelShow(
             innerLabelLayout = newLabelLayoutWithGeometry({marginForce}, innerLabelLayout);
         }
         if (labelIntersect(outmostLabelLayout, innerLabelLayout, null, {touchThreshold})) {
-            if (showMinMaxLabel) {
+            if (showMinMaxLabelOption) {
                 ignoreEl(innerLabelLayout.label);
             }
             else {
@@ -1119,11 +1134,11 @@ function fixMinMaxLabelShow(
     // If min or max are user set, we need to check
     // If the tick on min(max) are overlap on their neighbour tick
     // If they are overlapped, we need to hide the min(max) tick label
-    const showMinLabel = axisModel.get(['axisLabel', 'showMinLabel']);
-    const showMaxLabel = axisModel.get(['axisLabel', 'showMaxLabel']);
+    const showMinLabelOption = axisModel.get(['axisLabel', 'showMinLabel']);
+    const showMaxLabelOption = axisModel.get(['axisLabel', 'showMaxLabel']);
     const labelsLen = labelLayoutList.length;
-    deal(showMinLabel, 0, 1);
-    deal(showMaxLabel, labelsLen - 1, labelsLen - 2);
+    deal(showMinLabelOption, 0, 1);
+    deal(showMaxLabelOption, labelsLen - 1, labelsLen - 2);
 }
 
 // PENDING: Is it necessary to display a tick while the corresponding label is ignored?
@@ -1146,7 +1161,7 @@ function syncLabelIgnoreToMajorTicks(
                 const labelInner = getLabelInner(labelLayout.label);
                 if (tickInner.tickValue != null
                     && !tickInner.onBand
-                    && tickInner.tickValue === labelInner.tickValue
+                    && tickInner.tickValue === labelInner.labelInfo.tick.value
                 ) {
                     ignoreEl(tickEl);
                     return;
@@ -1355,9 +1370,11 @@ function buildAxisLabel(
     let z2Max = -Infinity;
 
     each(labels, function (labelItem, index) {
+        const labelItemTick = labelItem.tick;
+        const labelItemTickValue = labelItemTick.value;
         const tickValue = axis.scale.type === 'ordinal'
-            ? (axis.scale as OrdinalScale).getRawOrdinalNumber(labelItem.tickValue)
-            : labelItem.tickValue;
+            ? (axis.scale as OrdinalScale).getRawOrdinalNumber(labelItemTickValue)
+            : labelItemTickValue;
         const formattedLabel = labelItem.formattedLabel;
         const rawLabel = labelItem.rawLabel;
 
@@ -1396,7 +1413,7 @@ function buildAxisLabel(
             itemLabelModel.getShallow('verticalAlignMaxLabel', true),
             verticalAlign
         );
-        const z2 = 10 + (labelItem.time?.level || 0);
+        const z2 = 10 + (labelItemTick.time?.level || 0);
         z2Min = Math.min(z2Min, z2);
         z2Max = Math.max(z2Max, z2);
 
@@ -1443,8 +1460,7 @@ function buildAxisLabel(
         textEl.anid = 'label_' + tickValue;
 
         const inner = getLabelInner(textEl);
-        inner.break = labelItem.break;
-        inner.tickValue = tickValue;
+        inner.labelInfo = labelItem;
         inner.layoutRotation = labelLayout.rotation;
 
         graphic.setTooltipConfig({
@@ -1464,11 +1480,13 @@ function buildAxisLabel(
             eventData.targetType = 'axisLabel';
             eventData.value = rawLabel;
             eventData.tickIndex = index;
-            if (labelItem.break) {
+            const labelItemTickBreak = labelItem.tick.break;
+            const labelItemTickBreakParsedBreak = labelItemTickBreak.parsedBreak;
+            if (labelItemTickBreak) {
                 eventData.break = {
                     // type: labelItem.break.type,
-                    start: labelItem.break.parsedBreak.vmin,
-                    end: labelItem.break.parsedBreak.vmax,
+                    start: labelItemTickBreakParsedBreak.vmin,
+                    end: labelItemTickBreakParsedBreak.vmax,
                 };
             }
             if (axis.type === 'category') {
@@ -1477,8 +1495,8 @@ function buildAxisLabel(
 
             getECData(textEl).eventData = eventData;
 
-            if (labelItem.break) {
-                addBreakEventHandler(axisModel, api, textEl, labelItem.break);
+            if (labelItemTickBreak) {
+                addBreakEventHandler(axisModel, api, textEl, labelItemTickBreak);
             }
         }
 
@@ -1488,7 +1506,7 @@ function buildAxisLabel(
 
     const labelLayoutList = map(labelEls, label => ({
         label,
-        priority: getLabelInner(label).break
+        priority: getLabelInner(label).labelInfo.tick.break
             ? label.z2 + (z2Max - z2Min + 1) // Make break labels be highest priority.
             : label.z2,
         defaultAttr: {
@@ -1537,7 +1555,7 @@ function updateAxisLabelChangableProps(
         labelEl.ignore = false;
 
         copyTransform(_tmpLayoutEl, _tmpLayoutElReset);
-        _tmpLayoutEl.x = axisModel.axis.dataToCoord(inner.tickValue);
+        _tmpLayoutEl.x = axisModel.axis.dataToCoord(inner.labelInfo.tick.value);
         _tmpLayoutEl.y = cfg.labelOffset + cfg.labelDirection * labelMargin;
         _tmpLayoutEl.rotation = inner.layoutRotation;
 
@@ -1590,7 +1608,7 @@ function adjustBreakLabels(
     }
     const breakLabelIndexPairs = scaleBreakHelper.retrieveAxisBreakPairs(
         labelLayoutList,
-        layoutInfo => layoutInfo && getLabelInner(layoutInfo.label).break,
+        layoutInfo => layoutInfo && getLabelInner(layoutInfo.label).labelInfo.tick.break,
         true
     );
     const moveOverlap = axisModel.get(['breakLabelLayout', 'moveOverlap'], true);

src/component/axis/axisSplitHelper.ts

@@ -26,6 +26,7 @@ import type CartesianAxisView from './CartesianAxisView';
 import type SingleAxisModel from '../../coord/single/AxisModel';
 import type CartesianAxisModel from '../../coord/cartesian/AxisModel';
 import AxisView from './AxisView';
+import type { AxisBaseModel } from '../../coord/AxisBaseModel';
 
 const inner = makeInner<{
     // Hash map of color index
@@ -35,7 +36,7 @@ const inner = makeInner<{
 export function rectCoordAxisBuildSplitArea(
     axisView: SingleAxisView | CartesianAxisView,
     axisGroup: graphic.Group,
-    axisModel: SingleAxisModel | CartesianAxisModel,
+    axisModel: (SingleAxisModel | CartesianAxisModel) & AxisBaseModel,
     gridModel: GridModel | SingleAxisModel
 ) {
     const axis = axisModel.axis;
@@ -44,8 +45,7 @@ export function rectCoordAxisBuildSplitArea(
         return;
     }
 
-    // TODO: TYPE
-    const splitAreaModel = (axisModel as CartesianAxisModel).getModel('splitArea');
+    const splitAreaModel = axisModel.getModel('splitArea');
     const areaStyleModel = splitAreaModel.getModel('areaStyle');
     let areaColors = areaStyleModel.get('color');
 
@@ -107,7 +107,6 @@ export function rectCoordAxisBuildSplitArea(
 
         const tickValue = ticksCoords[i - 1].tickValue;
         tickValue != null && newSplitAreaColors.set(tickValue, colorIndex);
-
         axisGroup.add(new graphic.Rect({
             anid: tickValue != null ? 'area_' + tickValue : null,
             shape: {

src/component/axisPointer/CartesianAxisPointer.ts

@@ -27,6 +27,7 @@ import Grid from '../../coord/cartesian/Grid';
 import Axis2D from '../../coord/cartesian/Axis2D';
 import { PathProps } from 'zrender/src/graphic/Path';
 import Model from '../../model/Model';
+import { isNullableNumberFinite, mathMax, mathMin } from '../../util/number';
 
 // Not use top level axisPointer model
 type AxisPointerModel = Model<CommonAxisPointerOption>;
@@ -105,8 +106,8 @@ class CartesianAxisPointer extends BaseAxisPointer {
 
         const currPosition = [transform.x, transform.y];
         currPosition[dimIndex] += delta[dimIndex];
-        currPosition[dimIndex] = Math.min(axisExtent[1], currPosition[dimIndex]);
-        currPosition[dimIndex] = Math.max(axisExtent[0], currPosition[dimIndex]);
+        currPosition[dimIndex] = mathMin(axisExtent[1], currPosition[dimIndex]);
+        currPosition[dimIndex] = mathMax(axisExtent[0], currPosition[dimIndex]);
 
         const cursorOtherValue = (otherExtent[1] + otherExtent[0]) / 2;
         const cursorPoint = [cursorOtherValue, cursorOtherValue];
@@ -156,13 +157,18 @@ const pointerShapeBuilder = {
     },
 
     shadow: function (axis: Axis2D, pixelValue: number, otherExtent: number[]): PathProps & { type: 'Rect'} {
-        const bandWidth = Math.max(1, axis.getBandWidth());
-        const span = otherExtent[1] - otherExtent[0];
+        let bandWidth = axis.getBandWidth();
+        const thisExtent = axis.getGlobalExtent();
+        bandWidth = isNullableNumberFinite(bandWidth)
+            ? mathMax(1, bandWidth) : 1;
+        const otherSpan = otherExtent[1] - otherExtent[0];
+        const thisX = mathMax(thisExtent[0], pixelValue - bandWidth / 2);
+        const thisW = mathMin(thisX + bandWidth, thisExtent[1]) - thisX;
         return {
             type: 'Rect',
             shape: viewHelper.makeRectShape(
-                [pixelValue - bandWidth / 2, otherExtent[0]],
-                [bandWidth, span],
+                [thisX, otherExtent[0]],
+                [thisW, otherSpan],
                 getAxisDimIndex(axis)
             )
         };

src/component/axisPointer/axisTrigger.ts

@@ -368,7 +368,7 @@ function showTooltip(
         axisType: axisModel.type,
         axisId: axisModel.id,
         value: value as number,
-        // Caustion: viewHelper.getValueLabel is actually on "view stage", which
+        // Caution: viewHelper.getValueLabel is actually on "view stage", which
         // depends that all models have been updated. So it should not be performed
         // here. Considering axisPointerModel used here is volatile, which is hard
         // to be retrieve in TooltipView, we prepare parameters here.

src/component/brush/preprocessor.ts

@@ -23,7 +23,7 @@ import { ECUnitOption, Dictionary } from '../../util/types';
 import { BrushOption, BrushToolboxIconType } from './BrushModel';
 import { ToolboxOption } from '../toolbox/ToolboxModel';
 import { ToolboxBrushFeatureOption } from '../toolbox/feature/Brush';
-import { normalizeToArray } from '../../util/model';
+import { normalizeToArray, removeDuplicates } from '../../util/model';
 
 const DEFAULT_TOOLBOX_BTNS: BrushToolboxIconType[] = ['rect', 'polygon', 'keep', 'clear'];
 
@@ -61,20 +61,9 @@ export default function brushPreprocessor(option: ECUnitOption, isNew: boolean):
 
     brushTypes.push.apply(brushTypes, brushComponentSpecifiedBtns);
 
-    removeDuplicate(brushTypes);
+    removeDuplicates(brushTypes, item => item + '', null);
 
     if (isNew && !brushTypes.length) {
         brushTypes.push.apply(brushTypes, DEFAULT_TOOLBOX_BTNS);
     }
 }
-
-function removeDuplicate(arr: string[]): void {
-    const map = {} as Dictionary<number>;
-    zrUtil.each(arr, function (val) {
-        map[val] = 1;
-    });
-    arr.length = 0;
-    zrUtil.each(map, function (flag, val) {
-        arr.push(val);
-    });
-}