Merge pull request #21052 from apache/next-merge

chore: use zrender next branch and merge from master

Author: Ovilia

package-lock.json

@@ -65,7 +65,7 @@
   },
   "dependencies": {
     "tslib": "2.3.0",
-    "zrender": "github:ecomfe/zrender#v6"
+    "zrender": "github:ecomfe/zrender#next"
   },
   "devDependencies": {
     "@babel/code-frame": "7.10.4",
@@ -224,4 +224,4 @@
     "./dist/extension/dataTool.min": "./dist/extension/dataTool.min.js",
     "./*": "./*"
   }
-}
+}

package.json

@@ -85,9 +85,9 @@ export interface CoordinateSystemMaster {
     convertToLayout?(
         ecModel: GlobalModel,
         finder: ParsedModelFinder,
-        value: Parameters<CoordinateSystem['dataToLayout']>[0],
+        value: Parameters<NonNullable<CoordinateSystem['dataToLayout']>>[0],
         opt?: unknown
-    ): ReturnType<CoordinateSystem['dataToLayout']> | NullUndefined;
+    ): ReturnType<NonNullable<CoordinateSystem['dataToLayout']>> | NullUndefined;
 
     // This methods is also responsible for determining whether this
     // coordinate system is applicable to the given `finder`.
@@ -96,9 +96,9 @@ export interface CoordinateSystemMaster {
     convertFromPixel?(
         ecModel: GlobalModel,
         finder: ParsedModelFinder,
-        pixelValue: Parameters<CoordinateSystem['pointToData']>[0],
+        pixelValue: Parameters<NonNullable<CoordinateSystem['pointToData']>>[0],
         opt?: unknown
-    ): ReturnType<CoordinateSystem['pointToData']> | NullUndefined;
+    ): ReturnType<NonNullable<CoordinateSystem['pointToData']>> | NullUndefined;
 
     // @param point Point in global pixel coordinate system.
     // The signature of this method should be the same as `CoordinateSystemExecutive`

src/coord/CoordinateSystem.ts

@@ -34,19 +34,20 @@ import { eqNaN, isArray, retrieve2 } from 'zrender/src/core/util';
 import Point from 'zrender/src/core/Point';
 import { WH, XY } from '../../util/graphic';
 import Model from '../../model/Model';
-import {
-    MatrixCellLayoutInfo, MatrixCellLayoutInfoType,
+import type {
+    MatrixCellLayoutInfo,
     MatrixDimensionCell, MatrixDimPair, MatrixXYLocator
 } from './MatrixDim';
 import { mathMax, mathMin, parsePositionSizeOption } from '../../util/number';
 import {
     createNaNRectLike,
     MatrixClampOption,
+    MatrixCellLayoutInfoType,
     parseCoordRangeOption,
     resetXYLocatorRange,
     xyLocatorRangeToRectOneDim
 } from './matrixCoordHelper';
-import { MatrixBodyCorner, MatrixBodyOrCornerKind } from './MatrixBodyCorner';
+import type { MatrixBodyCorner, MatrixBodyOrCornerKind } from './MatrixBodyCorner';
 import { error } from '../../util/log';
 import { injectCoordSysByOption, simpleCoordSysInjectionProvider } from '../../core/CoordinateSystem';
 

src/coord/matrix/Matrix.ts

@@ -18,12 +18,12 @@
 */
 
 import { HashMap, createHashMap, each, extend, isArray, isObject } from 'zrender/src/core/util';
-import { NullUndefined } from '../../util/types';
+import type { NullUndefined } from '../../util/types';
 import type { MatrixXYLocator, MatrixDimPair, MatrixXYLocatorRange } from './MatrixDim';
 import { error } from '../../util/log';
 import Point from 'zrender/src/core/Point';
 import { RectLike } from 'zrender/src/core/BoundingRect';
-import { MatrixBodyCornerCellOption, MatrixBodyOption, MatrixCornerOption } from './MatrixModel';
+import type { MatrixBodyCornerCellOption, MatrixBodyOption, MatrixCornerOption } from './MatrixModel';
 import {
     resolveXYLocatorRangeByCellMerge,
     MatrixClampOption,
@@ -34,7 +34,7 @@ import {
     resetXYLocatorRange,
     cloneXYLocatorRange,
 } from './matrixCoordHelper';
-import Model from '../../model/Model';
+import type Model from '../../model/Model';
 
 
 /**

src/coord/matrix/MatrixBodyCorner.ts

@@ -1,8 +1,7 @@
 import {
     createHashMap,
     defaults,
-    each, eqNaN, isArray, isObject, isString,
-    retrieve2,
+    each, eqNaN, isArray, isObject, isString
 } from 'zrender/src/core/util';
 import Point from 'zrender/src/core/Point';
 import OrdinalMeta from '../../data/OrdinalMeta';
@@ -17,7 +16,7 @@ import { WH, XY } from '../../util/graphic';
 import { ListIterator } from '../../util/model';
 import { RectLike } from 'zrender/src/core/BoundingRect';
 import {
-    createNaNRectLike, setDimXYValue
+    createNaNRectLike, setDimXYValue, MatrixCellLayoutInfoType
 } from './matrixCoordHelper';
 import { error } from '../../util/log';
 import { mathMax } from '../../util/number';
@@ -43,12 +42,6 @@ export interface MatrixCellLayoutInfo {
     dim: MatrixDim;
 }
 
-export const MatrixCellLayoutInfoType = {
-    level: 1,
-    leaf: 2,
-    nonLeaf: 3,
-} as const;
-export type MatrixCellLayoutInfoType = (typeof MatrixCellLayoutInfoType)[keyof typeof MatrixCellLayoutInfoType];
 
 export type MatrixXYLocator = MatrixCellLayoutInfo['id']['x'] | MatrixCellLayoutInfo['id']['y'];
 /**

src/coord/matrix/MatrixDim.ts

@@ -18,21 +18,26 @@
 */
 
 import Point from 'zrender/src/core/Point';
-import {
-    MatrixCellLayoutInfoType,
+import type {
     MatrixCellLayoutInfo,
     MatrixDimensionCell,
     MatrixDimPair,
     MatrixXYLocator,
     MatrixXYLocatorRange,
 } from './MatrixDim';
-import { NullUndefined } from '../../util/types';
+import type { NullUndefined } from '../../util/types';
 import { eqNaN, isArray, isNumber } from 'zrender/src/core/util';
 import { WH, XY } from '../../util/graphic';
-import { MatrixCoordRangeOption, MatrixCoordValueOption } from './MatrixModel';
-import { RectLike } from 'zrender/src/core/BoundingRect';
+import type { MatrixCoordRangeOption, MatrixCoordValueOption } from './MatrixModel';
+import type { RectLike } from 'zrender/src/core/BoundingRect';
 import { mathMax, mathMin } from '../../util/number';
 
+export const MatrixCellLayoutInfoType = {
+    level: 1,
+    leaf: 2,
+    nonLeaf: 3,
+} as const;
+export type MatrixCellLayoutInfoType = (typeof MatrixCellLayoutInfoType)[keyof typeof MatrixCellLayoutInfoType];
 
 /**
  * @public Public to users in `chart.convertFromPixel`.

src/coord/matrix/matrixCoordHelper.ts

@@ -54,7 +54,6 @@ import CartesianAxisModel from '../coord/cartesian/AxisModel';
 import GridModel from '../coord/cartesian/GridModel';
 import { isNumeric, getRandomIdBase, getPrecision, round } from './number';
 import { error, warn } from './log';
-import type Model from '../model/Model';
 
 function interpolateNumber(p0: number, p1: number, percent: number): number {
     return (p1 - p0) * percent + p0;