Merge pull request #17390 from apache/fix/symbol-scale-types

fix(type): add missing type `number` to `emphasis.scale` for scatter/line/graph series
apache · Jul 19, 2022 · 65d867e · 65d867e
2 parents add1145 + 6e3efd8
commit 65d867e
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/src/action/roamHelper.ts b/src/action/roamHelper.ts
@@ -22,7 +22,7 @@ import type View from '../coord/View';
 import type ExtensionAPI from '../core/ExtensionAPI';
 import type { Payload } from '../util/types';
 
-export interface RoamPaylod extends Payload {
+export interface RoamPayload extends Payload {
     dx: number
     dy: number
     zoom: number
@@ -39,7 +39,7 @@ function getCenterCoord(view: View, point: number[]) {
 
 export function updateCenterAndZoom(
     view: View,
-    payload: RoamPaylod,
+    payload: RoamPayload,
     zoomLimit?: {
         min?: number,
         max?: number

diff --git a/src/chart/graph/GraphSeries.ts b/src/chart/graph/GraphSeries.ts
@@ -184,7 +184,7 @@ export interface GraphSeriesOption
 
     emphasis?: {
         focus?: Exclude<GraphNodeItemOption['emphasis'], undefined>['focus']
-        scale?: boolean
+        scale?: boolean | number
         label?: SeriesLabelOption
         edgeLabel?: SeriesLabelOption
         itemStyle?: ItemStyleOption
@@ -513,4 +513,4 @@ class GraphSeriesModel extends SeriesModel<GraphSeriesOption> {
     };
 }
 
-export default GraphSeriesModel;
+export default GraphSeriesModel;
diff --git a/src/chart/graph/install.ts b/src/chart/graph/install.ts
@@ -29,7 +29,7 @@ import createView from './createView';
 import View from '../../coord/View';
 import GraphView from './GraphView';
 import GraphSeriesModel from './GraphSeries';
-import { RoamPaylod, updateCenterAndZoom } from '../../action/roamHelper';
+import { RoamPayload, updateCenterAndZoom } from '../../action/roamHelper';
 import GlobalModel from '../../model/Global';
 import { noop } from 'zrender/src/core/util';
 import type ExtensionAPI from '../../core/ExtensionAPI';
@@ -73,7 +73,7 @@ export function install(registers: EChartsExtensionInstallRegisters) {
     }, noop);
 
     // Register roam action.
-    registers.registerAction(actionInfo, function (payload: RoamPaylod, ecModel: GlobalModel, api: ExtensionAPI) {
+    registers.registerAction(actionInfo, function (payload: RoamPayload, ecModel: GlobalModel, api: ExtensionAPI) {
         ecModel.eachComponent({
             mainType: 'series', query: payload
         }, function (seriesModel: GraphSeriesModel) {

diff --git a/src/chart/line/LineSeries.ts b/src/chart/line/LineSeries.ts
@@ -48,7 +48,7 @@ type LineDataValue = OptionDataValue | OptionDataValue[];
 interface LineStateOptionMixin {
     emphasis?: {
         focus?: DefaultEmphasisFocus
-        scale?: boolean
+        scale?: boolean | number
     }
 }
 

diff --git a/src/chart/scatter/ScatterSeries.ts b/src/chart/scatter/ScatterSeries.ts
@@ -50,7 +50,7 @@ interface ScatterStateOption<TCbParams = never> {
 interface ScatterStatesOptionMixin {
     emphasis?: {
         focus?: DefaultEmphasisFocus
-        scale?: boolean
+        scale?: boolean | number
     }
 }
 
@@ -163,4 +163,4 @@ class ScatterSeriesModel extends SeriesModel<ScatterSeriesOption> {
 
 }
 
-export default ScatterSeriesModel;
+export default ScatterSeriesModel;
diff --git a/src/chart/tree/treeAction.ts b/src/chart/tree/treeAction.ts
@@ -17,7 +17,7 @@
 * under the License.
 */
 
-import {updateCenterAndZoom, RoamPaylod} from '../../action/roamHelper';
+import {updateCenterAndZoom, RoamPayload} from '../../action/roamHelper';
 import { Payload } from '../../util/types';
 import TreeSeriesModel from './TreeSeries';
 import GlobalModel from '../../model/Global';
@@ -52,7 +52,7 @@ export function installTreeAction(registers: EChartsExtensionInstallRegisters) {
         // the layout. So don't need to go through the whole update process, such
         // as 'dataPrcocess', 'coordSystemUpdate', 'layout' and so on.
         update: 'none'
-    }, function (payload: RoamPaylod, ecModel: GlobalModel, api: ExtensionAPI) {
+    }, function (payload: RoamPayload, ecModel: GlobalModel, api: ExtensionAPI) {
         ecModel.eachComponent({
             mainType: 'series', subType: 'tree', query: payload
         }, function (seriesModel: TreeSeriesModel) {
@@ -67,4 +67,4 @@ export function installTreeAction(registers: EChartsExtensionInstallRegisters) {
         });
     });
 
-}
+}
diff --git a/src/component/geo/install.ts b/src/component/geo/install.ts
@@ -23,7 +23,7 @@ import geoCreator from '../../coord/geo/geoCreator';
 import { ActionInfo } from '../../util/types';
 import { each } from 'zrender/src/core/util';
 import GlobalModel from '../../model/Global';
-import { updateCenterAndZoom, RoamPaylod } from '../../action/roamHelper';
+import { updateCenterAndZoom, RoamPayload } from '../../action/roamHelper';
 import MapSeries from '../../chart/map/MapSeries';
 import GeoView from './GeoView';
 import geoSourceManager from '../../coord/geo/geoSourceManager';
@@ -115,7 +115,7 @@ export function install(registers: EChartsExtensionInstallRegisters) {
         type: 'geoRoam',
         event: 'geoRoam',
         update: 'updateTransform'
-    }, function (payload: RoamPaylod, ecModel: GlobalModel, api: ExtensionAPI) {
+    }, function (payload: RoamPayload, ecModel: GlobalModel, api: ExtensionAPI) {
         const componentType = payload.componentType || 'series';
 
         ecModel.eachComponent(
@@ -147,4 +147,4 @@ export function install(registers: EChartsExtensionInstallRegisters) {
             }
         );
     });
-}
+}