Skip to content

Commit 9c743be

Browse files
authored
Merge pull request #18310 from apache/fix/sunburst-types
fix(type): fix `treePathInfo` is missing in the type of sunburst formatter callback
2 parents 0e2954c + a208201 commit 9c743be

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

src/chart/sunburst/SunburstSeries.ts

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ interface SunburstItemStyleOption<TCbParams = never> extends ItemStyleOption<TCb
5050
borderRadius?: (number | string)[] | number | string
5151
}
5252

53-
interface SunburstLabelOption extends Omit<SeriesLabelOption, 'rotate' | 'position'> {
53+
interface SunburstLabelOption extends Omit<SeriesLabelOption<SunburstDataParams>, 'rotate' | 'position'> {
5454
rotate?: 'radial' | 'tangential' | number
5555
minAngle?: number
5656
silent?: boolean
@@ -77,8 +77,8 @@ export interface SunburstStateOption<TCbParams = never> {
7777
}
7878

7979
export interface SunburstSeriesNodeItemOption extends
80-
SunburstStateOption<CallbackDataParams>,
81-
StatesOptionMixin<SunburstStateOption<CallbackDataParams>, SunburstStatesMixin>,
80+
SunburstStateOption<SunburstDataParams>,
81+
StatesOptionMixin<SunburstStateOption<SunburstDataParams>, SunburstStatesMixin>,
8282
OptionDataItemObject<OptionDataValue>
8383
{
8484
nodeClick?: 'rootToNode' | 'link' | false
@@ -92,8 +92,9 @@ export interface SunburstSeriesNodeItemOption extends
9292

9393
cursor?: string
9494
}
95-
export interface SunburstSeriesLevelOption
96-
extends SunburstStateOption, StatesOptionMixin<SunburstStateOption, SunburstStatesMixin> {
95+
export interface SunburstSeriesLevelOption extends
96+
SunburstStateOption<SunburstDataParams>,
97+
StatesOptionMixin<SunburstStateOption<SunburstDataParams>, SunburstStatesMixin> {
9798

9899
radius?: (number | string)[]
99100
/**
@@ -118,7 +119,8 @@ interface SortParam {
118119
getValue(): number
119120
}
120121
export interface SunburstSeriesOption extends
121-
SeriesOption<SunburstStateOption, SunburstStatesMixin>, SunburstStateOption,
122+
SeriesOption<SunburstStateOption<SunburstDataParams>, SunburstStatesMixin>,
123+
SunburstStateOption<SunburstDataParams>,
122124
SunburstColorByMixin,
123125
CircleLayoutOptionMixin {
124126

@@ -142,6 +144,8 @@ export interface SunburstSeriesOption extends
142144

143145
renderLabelForZeroData?: boolean
144146

147+
data?: SunburstSeriesNodeItemOption[]
148+
145149
levels?: SunburstSeriesLevelOption[]
146150

147151
animationType?: 'expansion' | 'scale'

src/util/types.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1064,8 +1064,8 @@ export interface LabelOption extends TextCommonOption {
10641064
rich?: Dictionary<TextCommonOption>
10651065
}
10661066

1067-
export interface SeriesLabelOption extends LabelOption {
1068-
formatter?: string | LabelFormatterCallback<CallbackDataParams>
1067+
export interface SeriesLabelOption<T extends CallbackDataParams = CallbackDataParams> extends LabelOption {
1068+
formatter?: string | LabelFormatterCallback<T>
10691069
}
10701070

10711071
/**

0 commit comments

Comments
 (0)