From 73363ff5ce3f5b30e28a159ae0f9e824735fc240 Mon Sep 17 00:00:00 2001 From: unional Date: Wed, 4 Mar 2026 19:28:00 -0800 Subject: [PATCH 1/2] feat: fixing typo of "Continous" --- src/component/visualMap/ContinuousModel.ts | 11 ++++++++--- src/component/visualMap/installCommon.ts | 4 ++-- src/component/visualMap/typeDefaulter.ts | 4 ++-- src/export/option.ts | 12 +++++++++--- test/ut/spec/component/visualMap/setOption.test.ts | 14 +++++++------- 5 files changed, 28 insertions(+), 17 deletions(-) diff --git a/src/component/visualMap/ContinuousModel.ts b/src/component/visualMap/ContinuousModel.ts index 35e14aa371..62a3a5a8de 100644 --- a/src/component/visualMap/ContinuousModel.ts +++ b/src/component/visualMap/ContinuousModel.ts @@ -34,6 +34,9 @@ type RangeWithAuto = { type VisualState = VisualMapModel['stateList'][number]; +/** + * @deprecated Use ContinuousVisualMapOption instead. + */ export interface ContinousVisualMapOption extends VisualMapOption { align?: 'auto' | 'left' | 'right' | 'top' | 'bottom' @@ -98,7 +101,9 @@ export interface ContinousVisualMapOption extends VisualMapOption { } } -class ContinuousModel extends VisualMapModel { +export type ContinuousVisualMapOption = ContinousVisualMapOption + +class ContinuousModel extends VisualMapModel { static type = 'visualMap.continuous' as const; type = ContinuousModel.type; @@ -106,7 +111,7 @@ class ContinuousModel extends VisualMapModel { /** * @override */ - optionUpdated(newOption: ContinousVisualMapOption, isInit: boolean) { + optionUpdated(newOption: ContinuousVisualMapOption, isInit: boolean) { super.optionUpdated.apply(this, arguments as any); this.resetExtent(); @@ -324,7 +329,7 @@ class ContinuousModel extends VisualMapModel { // shadowColor: tokens.color.shadow // } // } - }) as ContinousVisualMapOption; + }) as ContinuousVisualMapOption; } diff --git a/src/component/visualMap/installCommon.ts b/src/component/visualMap/installCommon.ts index c18ad4bf0f..27680e1e8b 100644 --- a/src/component/visualMap/installCommon.ts +++ b/src/component/visualMap/installCommon.ts @@ -20,7 +20,7 @@ import { EChartsExtensionInstallRegisters } from '../../extension'; import { VisualMapOption } from './VisualMapModel'; import { PiecewiseVisualMapOption } from './PiecewiseModel'; -import { ContinousVisualMapOption } from './ContinuousModel'; +import { ContinuousVisualMapOption } from './ContinuousModel'; import { visualMapActionInfo, visualMapActionHander } from './visualMapAction'; import { visualMapEncodingHandlers } from './visualEncoding'; import { each } from 'zrender/src/core/util'; @@ -44,7 +44,7 @@ export default function installCommon(registers: EChartsExtensionInstallRegister ? ((option as PiecewiseVisualMapOption)).pieces.length > 0 : ((option as PiecewiseVisualMapOption)).splitNumber > 0 ) - || (option as ContinousVisualMapOption).calculable + || (option as ContinuousVisualMapOption).calculable ) ) ? 'continuous' : 'piecewise'; diff --git a/src/component/visualMap/typeDefaulter.ts b/src/component/visualMap/typeDefaulter.ts index 6331c5520e..2edb92f551 100644 --- a/src/component/visualMap/typeDefaulter.ts +++ b/src/component/visualMap/typeDefaulter.ts @@ -20,7 +20,7 @@ import Component from '../../model/Component'; import {VisualMapOption} from './VisualMapModel'; import {PiecewiseVisualMapOption} from './PiecewiseModel'; -import {ContinousVisualMapOption} from './ContinuousModel'; +import {ContinuousVisualMapOption} from './ContinuousModel'; Component.registerSubTypeDefaulter( 'visualMap', function (option: VisualMapOption) { @@ -33,7 +33,7 @@ Component.registerSubTypeDefaulter( ? ((option as PiecewiseVisualMapOption)).pieces.length > 0 : ((option as PiecewiseVisualMapOption)).splitNumber > 0 ) - || (option as ContinousVisualMapOption).calculable + || (option as ContinuousVisualMapOption).calculable ) ) ? 'continuous' : 'piecewise'; diff --git a/src/export/option.ts b/src/export/option.ts index a490494e55..7121a5ac94 100644 --- a/src/export/option.ts +++ b/src/export/option.ts @@ -58,7 +58,7 @@ import type {SliderDataZoomOption as SliderDataZoomComponentOption} from '../com import type {InsideDataZoomOption as InsideDataZoomComponentOption} from '../component/dataZoom/InsideZoomModel'; import type { - ContinousVisualMapOption as ContinousVisualMapComponentOption + ContinuousVisualMapOption as ContinuousVisualMapComponentOption } from '../component/visualMap/ContinuousModel'; import type { PiecewiseVisualMapOption as PiecewiseVisualMapComponentOption @@ -145,8 +145,14 @@ interface ToolboxComponentOption extends ToolboxOption { export { SliderDataZoomComponentOption, InsideDataZoomComponentOption }; export type DataZoomComponentOption = SliderDataZoomComponentOption | InsideDataZoomComponentOption; -export { ContinousVisualMapComponentOption, PiecewiseVisualMapComponentOption }; -export type VisualMapComponentOption = ContinousVisualMapComponentOption | PiecewiseVisualMapComponentOption; +export { ContinuousVisualMapComponentOption, PiecewiseVisualMapComponentOption }; +export { + /** + * @deprecated Use ContinuousVisualMapComponentOption instead. + */ + ContinuousVisualMapComponentOption as ContinousVisualMapComponentOption, +}; +export type VisualMapComponentOption = ContinuousVisualMapComponentOption | PiecewiseVisualMapComponentOption; export { PlainLegendComponentOption, ScrollableLegendComponentOption }; export type LegendComponentOption = PlainLegendComponentOption | ScrollableLegendComponentOption; export { diff --git a/test/ut/spec/component/visualMap/setOption.test.ts b/test/ut/spec/component/visualMap/setOption.test.ts index d132385eac..05d9c58c82 100755 --- a/test/ut/spec/component/visualMap/setOption.test.ts +++ b/test/ut/spec/component/visualMap/setOption.test.ts @@ -21,7 +21,7 @@ import { createChart, getECModel } from '../../../core/utHelper'; import { EChartsType } from '../../../../../src/echarts'; import { EChartsOption } from '../../../../../src/export/option'; -import { ContinousVisualMapOption } from '../../../../../src/component/visualMap/ContinuousModel'; +import { ContinuousVisualMapOption } from '../../../../../src/component/visualMap/ContinuousModel'; import { PiecewiseVisualMapOption } from '../../../../../src/component/visualMap/PiecewiseModel'; import VisualMapModel from '../../../../../src/component/visualMap/VisualMapModel'; import globalDefault from '../../../../../src/model/globalDefault'; @@ -50,7 +50,7 @@ describe('vsiaulMap_setOption', function () { }); const option = chart.getOption(); - const visualMapOptionGotten = option.visualMap as (ContinousVisualMapOption | PiecewiseVisualMapOption)[]; + const visualMapOptionGotten = option.visualMap as (ContinuousVisualMapOption | PiecewiseVisualMapOption)[]; expect(visualMapOptionGotten.length).toEqual(1); expect(visualMapOptionGotten[0].inRange.color).toEqual(['red', 'blue', 'yellow']); @@ -70,7 +70,7 @@ describe('vsiaulMap_setOption', function () { }); const option = chart.getOption(); - const visualMapOptionGotten = option.visualMap as (ContinousVisualMapOption | PiecewiseVisualMapOption)[]; + const visualMapOptionGotten = option.visualMap as (ContinuousVisualMapOption | PiecewiseVisualMapOption)[]; expect(visualMapOptionGotten.length).toEqual(1); expect(visualMapOptionGotten[0].color).toEqual(['yellow', 'blue', 'red']); @@ -104,7 +104,7 @@ describe('vsiaulMap_setOption', function () { expectTheSame(chart.getOption() as EChartsOption); function expectTheSame(option: EChartsOption) { - const visualMapOptionGotten = option.visualMap as (ContinousVisualMapOption | PiecewiseVisualMapOption)[]; + const visualMapOptionGotten = option.visualMap as (ContinuousVisualMapOption | PiecewiseVisualMapOption)[]; expect(visualMapOptionGotten.length).toEqual(1); expect(visualMapOptionGotten[0].inRange.color).toEqual(['red', 'blue', 'yellow']); expect(visualMapOptionGotten[0].target.inRange.color).toEqual(['red', 'blue', 'yellow']); @@ -137,7 +137,7 @@ describe('vsiaulMap_setOption', function () { }); const option = chart.getOption(); - const visualMapOptionGotten = option.visualMap as (ContinousVisualMapOption | PiecewiseVisualMapOption)[]; + const visualMapOptionGotten = option.visualMap as (ContinuousVisualMapOption | PiecewiseVisualMapOption)[]; expect(visualMapOptionGotten.length).toEqual(1); expect(visualMapOptionGotten[0].inRange.hasOwnProperty('color')).toEqual(false); @@ -171,7 +171,7 @@ describe('vsiaulMap_setOption', function () { } }); - let visualMapOptionGotten: (ContinousVisualMapOption | PiecewiseVisualMapOption)[]; + let visualMapOptionGotten: (ContinuousVisualMapOption | PiecewiseVisualMapOption)[]; visualMapOptionGotten = chart.getOption().visualMap as typeof visualMapOptionGotten; expect(visualMapOptionGotten.length).toEqual(1); expect(visualMapOptionGotten[0].inRange.hasOwnProperty('color')).toEqual(false); @@ -234,7 +234,7 @@ describe('vsiaulMap_setOption', function () { }); const visualMapOptionGotten = chart.getOption().visualMap as ( - ContinousVisualMapOption | PiecewiseVisualMapOption + ContinuousVisualMapOption | PiecewiseVisualMapOption )[]; expect(!!visualMapOptionGotten[0].target.outOfRange.opacity).toEqual(true); done(); From b2cab42d537bf4f1962551e7c1cfc0334047c3d2 Mon Sep 17 00:00:00 2001 From: plainheart Date: Thu, 5 Mar 2026 19:07:57 +0800 Subject: [PATCH 2/2] fix(types): use alias for types that are deprecated by typo --- src/component/visualMap/ContinuousModel.ts | 10 +++++----- src/export/option.ts | 10 ++++------ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/component/visualMap/ContinuousModel.ts b/src/component/visualMap/ContinuousModel.ts index 62a3a5a8de..7146e81720 100644 --- a/src/component/visualMap/ContinuousModel.ts +++ b/src/component/visualMap/ContinuousModel.ts @@ -34,10 +34,7 @@ type RangeWithAuto = { type VisualState = VisualMapModel['stateList'][number]; -/** - * @deprecated Use ContinuousVisualMapOption instead. - */ -export interface ContinousVisualMapOption extends VisualMapOption { +export interface ContinuousVisualMapOption extends VisualMapOption { align?: 'auto' | 'left' | 'right' | 'top' | 'bottom' @@ -101,7 +98,10 @@ export interface ContinousVisualMapOption extends VisualMapOption { } } -export type ContinuousVisualMapOption = ContinousVisualMapOption +/** + * @deprecated Use `ContinuousVisualMapOption` instead. + */ +export type ContinousVisualMapOption = ContinuousVisualMapOption; class ContinuousModel extends VisualMapModel { diff --git a/src/export/option.ts b/src/export/option.ts index 7121a5ac94..119908f225 100644 --- a/src/export/option.ts +++ b/src/export/option.ts @@ -146,12 +146,10 @@ interface ToolboxComponentOption extends ToolboxOption { export { SliderDataZoomComponentOption, InsideDataZoomComponentOption }; export type DataZoomComponentOption = SliderDataZoomComponentOption | InsideDataZoomComponentOption; export { ContinuousVisualMapComponentOption, PiecewiseVisualMapComponentOption }; -export { - /** - * @deprecated Use ContinuousVisualMapComponentOption instead. - */ - ContinuousVisualMapComponentOption as ContinousVisualMapComponentOption, -}; +/** + * @deprecated Use `ContinuousVisualMapComponentOption` instead. + */ +export type ContinousVisualMapComponentOption = ContinuousVisualMapComponentOption; export type VisualMapComponentOption = ContinuousVisualMapComponentOption | PiecewiseVisualMapComponentOption; export { PlainLegendComponentOption, ScrollableLegendComponentOption }; export type LegendComponentOption = PlainLegendComponentOption | ScrollableLegendComponentOption;