Skip to content

Commit 6aab7fc

Browse files
fix shorthand property default values
1 parent 565b6e7 commit 6aab7fc

File tree

1 file changed

+5
-24
lines changed

1 file changed

+5
-24
lines changed

packages/lib/src/internal/series.ts

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ export function series<T extends SeriesActionParams>(target: ChartActionResult,
6565
let data = params.reactive ? params.data : null;
6666
let destroyed = false;
6767

68+
// Never use shorthand properties as default values
69+
delete (defaults as any).borderColor;
70+
delete (defaults as any).wickColor;
71+
6872
return {
6973
alive(): boolean {
7074
return !destroyed;
@@ -84,16 +88,7 @@ export function series<T extends SeriesActionParams>(target: ChartActionResult,
8488
throw new TypeError('Can not change type of series in runtime. Report a bug please');
8589
}
8690

87-
const optionsToApply = merge(clone(defaults), nextOptions);
88-
89-
if (shouldHandleBorderCandlestickOptions(nextOptions)) {
90-
delete optionsToApply.borderColor;
91-
}
92-
if (shouldHandleWickCandlestickOptions(nextOptions)) {
93-
delete optionsToApply.wickColor;
94-
}
95-
96-
subject.applyOptions(optionsToApply);
91+
subject.applyOptions(merge(clone(defaults), nextOptions));
9792

9893
if (!nextReactive) {
9994
data = null;
@@ -170,17 +165,3 @@ function omit<T extends { reactive?: unknown; data: unknown; type: unknown }>(pa
170165
const {reactive, data, type, ...rest} = params;
171166
return rest;
172167
}
173-
174-
function shouldHandleBorderCandlestickOptions(next: any): boolean {
175-
if (next.borderColor === undefined) {
176-
return next.borderUpColor !== undefined || next.borderDownColor !== undefined;
177-
}
178-
return false;
179-
}
180-
181-
function shouldHandleWickCandlestickOptions(next: any): boolean {
182-
if (next.wickColor === undefined) {
183-
return next.wickUpColor !== undefined || next.wickDownColor !== undefined;
184-
}
185-
return false;
186-
}

0 commit comments

Comments
 (0)