feat(matrix): new matrix coordinate

package.json

@@ -181,6 +181,8 @@
     "./lib/component/axisPointer": "./lib/component/axisPointer.js",
     "./lib/component/brush": "./lib/component/brush.js",
     "./lib/component/calendar": "./lib/component/calendar.js",
+    "./lib/component/matrix": "./lib/component/matrix.js",
+    "./lib/component/thumbnail": "./lib/component/thumbnail.js",
     "./lib/component/dataZoom": "./lib/component/dataZoom.js",
     "./lib/component/dataZoomInside": "./lib/component/dataZoomInside.js",
     "./lib/component/dataZoomSelect": "./lib/component/dataZoomSelect.js",

src/chart/bar/BarSeries.ts

@@ -38,11 +38,13 @@ import SeriesData from '../../data/SeriesData';
 import { BrushCommonSelectorsForSeries } from '../../component/brush/selector';
 import tokens from '../../visual/tokens';
 
-export type PolarBarLabelPosition = SeriesLabelOption['position']
-    | 'start' | 'insideStart' | 'middle' | 'end' | 'insideEnd';
+type PolarBarLabelPositionExtra = 'start' | 'insideStart' | 'middle' | 'end' | 'insideEnd';
+export type PolarBarLabelPosition = SeriesLabelOption['position'] | PolarBarLabelPositionExtra;
 
-export type BarSeriesLabelOption = Omit<SeriesLabelOption, 'position'>
-    & {position?: PolarBarLabelPosition | 'outside'};
+export type BarSeriesLabelOption = SeriesLabelOption<
+    CallbackDataParams,
+    {positionExtra: PolarBarLabelPositionExtra | 'outside'}
+>;
 
 export interface BarStateOption<TCbParams = never> {
     itemStyle?: BarItemStyleOption<TCbParams>

src/chart/bar/PictorialBarSeries.ts

@@ -27,15 +27,16 @@ import {
     StatesOptionMixin,
     OptionDataItemObject,
     DefaultEmphasisFocus,
-    SeriesEncodeOptionMixin
+    SeriesEncodeOptionMixin,
+    CallbackDataParams
 } from '../../util/types';
 import type Cartesian2D from '../../coord/cartesian/Cartesian2D';
 import { inheritDefaultOption } from '../../util/component';
 import tokens from '../../visual/tokens';
 
 export interface PictorialBarStateOption {
     itemStyle?: ItemStyleOption
-    label?: SeriesLabelOption
+    label?: SeriesLabelOption<CallbackDataParams, {positionExtra: 'outside'}>
 }
 
 interface PictorialBarSeriesSymbolOption {

src/chart/custom/CustomSeries.ts

@@ -26,10 +26,12 @@ import {
     AnimationOption,
     BlurScope,
     CallbackDataParams,
+    CoordinateSystemDataLayout,
     Dictionary,
     DimensionLoose,
     ItemStyleOption,
     LabelOption,
+    NullUndefined,
     OptionDataValue,
     OrdinalRawValue,
     ParsedValue,
@@ -303,13 +305,30 @@ export interface CustomSeriesRenderItemParamsCoordSys {
 }
 export interface CustomSeriesRenderItemCoordinateSystemAPI {
     coord(
-        data: OptionDataValue | OptionDataValue[],
-        clamp?: boolean
+        // @see `CoordinateSystemDataCoord`
+        data: (OptionDataValue | NullUndefined)
+            | (OptionDataValue | NullUndefined)[]
+            | (OptionDataValue | OptionDataValue[] | NullUndefined)[],
+        // Some coord sys may support `clamp?: boolean` there.
+        // Can also be an `{xxx?: ...}` here.
+        opt?: unknown
     ): number[];
     size?(
+        // Represents a range, rather than a absolute value.
+        // e.g., `dataSize: [5, 100]` represents
+        // data range `5` in x and data range `100` in y.
         dataSize: OptionDataValue | OptionDataValue[],
+        // Represents a data point, based on which to calculate size.
+        // Some axis, such as logarithm, size varies in different points.
         dataItem?: OptionDataValue | OptionDataValue[]
     ): number | number[];
+    layout?(
+        // @see `CoordinateSystemDataCoord`
+        data: (OptionDataValue | NullUndefined)
+            | (OptionDataValue | NullUndefined)[]
+            | (OptionDataValue | OptionDataValue[] | NullUndefined)[],
+        opt?: unknown
+    ): CoordinateSystemDataLayout;
 }
 
 export type WrapEncodeDefRet = Dictionary<number[]>;
@@ -396,7 +415,7 @@ export default class CustomSeriesModel extends SeriesModel<CustomSeriesOption> {
     static type = 'series.custom';
     readonly type = CustomSeriesModel.type;
 
-    static dependencies = ['grid', 'polar', 'geo', 'singleAxis', 'calendar'];
+    static dependencies = ['grid', 'polar', 'geo', 'singleAxis', 'calendar', 'matrix'];
 
     // preventAutoZ = true;
 

src/chart/custom/CustomView.ts

@@ -51,6 +51,7 @@ import prepareGeo from '../../coord/geo/prepareCustom';
 import prepareSingleAxis from '../../coord/single/prepareCustom';
 import preparePolar from '../../coord/polar/prepareCustom';
 import prepareCalendar from '../../coord/calendar/prepareCustom';
+import prepareMatrix from '../../coord/matrix/prepareCustom';
 import SeriesData, { DefaultDataVisual } from '../../data/SeriesData';
 import GlobalModel from '../../model/Global';
 import ExtensionAPI from '../../core/ExtensionAPI';
@@ -155,6 +156,8 @@ const attachedTxInfoTmp = {
 
 
 /**
+ * FIXME: register rather than import directly, for size.
+ *
  * To reduce total package size of each coordinate systems, the modules `prepareCustom`
  * of each coordinate systems are not required by each coordinate systems directly, but
  * required by the module `custom`.
@@ -170,7 +173,8 @@ const prepareCustoms: Dictionary<PrepareCustomInfo> = {
     geo: prepareGeo,
     single: prepareSingleAxis,
     polar: preparePolar,
-    calendar: prepareCalendar
+    calendar: prepareCalendar,
+    matrix: prepareMatrix
 };
 
 

src/chart/funnel/FunnelSeries.ts

@@ -148,6 +148,7 @@ class FunnelSeriesModel extends SeriesModel<FunnelSeriesOption> {
     }
 
     static defaultOption: FunnelSeriesOption = {
+        coordinateSystemUsage: 'box',
         // zlevel: 0,                  // 一级层叠
         z: 2,                       // 二级层叠
         legendHoverLink: true,

src/chart/funnel/funnelLayout.ts

@@ -25,6 +25,7 @@ import SeriesData from '../../data/SeriesData';
 import GlobalModel from '../../model/Global';
 import { isFunction } from 'zrender/src/core/util';
 
+
 function getSortedIndices(data: SeriesData, sort: FunnelSeriesOption['sort']) {
     const valueDim = data.mapDimension('value');
     const valueArr = data.mapArray(valueDim, function (val: number) {
@@ -242,7 +243,10 @@ export default function funnelLayout(ecModel: GlobalModel, api: ExtensionAPI) {
         const data = seriesModel.getData();
         const valueDim = data.mapDimension('value');
         const sort = seriesModel.get('sort');
-        const viewRect = layout.getViewRect(seriesModel, api);
+
+        const layoutRef = layout.createBoxLayoutReference(seriesModel, api);
+        const viewRect = layout.getLayoutRect(seriesModel.getBoxLayoutParams(), layoutRef.refContainer);
+
         const orient = seriesModel.get('orient');
         const viewWidth = viewRect.width;
         const viewHeight = viewRect.height;

src/chart/graph/GraphSeries.ts

@@ -43,7 +43,8 @@ import {
     GraphEdgeItemObject,
     OptionDataValueNumeric,
     CallbackDataParams,
-    DefaultEmphasisFocus
+    DefaultEmphasisFocus,
+    PreserveAspectMixin
 } from '../../util/types';
 import SeriesModel from '../../model/Series';
 import Graph from '../../data/Graph';
@@ -54,7 +55,6 @@ import { LineDataVisual } from '../../visual/commonVisualTypes';
 import { createTooltipMarkup } from '../../component/tooltip/tooltipMarkup';
 import { defaultSeriesFormatTooltip } from '../../component/tooltip/seriesFormatTooltip';
 import {initCurvenessList, createEdgeMapForCurveness} from '../helper/multipleGraphEdgeHelper';
-import Thumbnail, { ThumbnailOption } from './Thumbnail';
 import tokens from '../../visual/tokens';
 
 
@@ -144,7 +144,8 @@ export interface GraphSeriesOption
     SeriesOnGeoOptionMixin, SeriesOnSingleOptionMixin,
     SymbolOptionMixin<CallbackDataParams>,
     RoamOptionMixin,
-    BoxLayoutOptionMixin {
+    BoxLayoutOptionMixin,
+    PreserveAspectMixin {
 
     type?: 'graph'
 
@@ -230,8 +231,6 @@ export interface GraphSeriesOption
      * auto curveness for multiple edge, invalid when `lineStyle.curveness` is set
      */
     autoCurveness?: boolean | number | number[]
-
-    thumbnail?: ThumbnailOption
 }
 
 class GraphSeriesModel extends SeriesModel<GraphSeriesOption> {
@@ -514,8 +513,6 @@ class GraphSeriesModel extends SeriesModel<GraphSeriesOption> {
                 borderColor: tokens.color.primary
             }
         },
-
-        thumbnail: Thumbnail.defaultOption
     };
 }