opt: opt overlay styles

klinecharts · Apr 15, 2023 · b4e8155 · b4e8155
1 parent 36d522f
commit b4e8155
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/src/common/DeepPartial.ts b/src/common/DeepPartial.ts
@@ -17,7 +17,9 @@ type DeepPartial<T> = {
     ? Array<DeepPartial<U>>
     : T[P] extends ReadonlyArray<infer X>
       ? ReadonlyArray<DeepPartial<X>>
-      : DeepPartial<T[P]>
+      : T[P] extends object
+        ? DeepPartial<T[P]>
+        : T[P]
 }
 
 export default DeepPartial
diff --git a/src/common/DeepRequired.ts b/src/common/DeepRequired.ts
@@ -17,7 +17,9 @@ type DeepRequired<T> = {
     ? Array<DeepRequired<U>>
     : T[P] extends ReadonlyArray<infer X>
       ? ReadonlyArray<DeepRequired<X>>
-      : DeepRequired<T[P]>
+      : T[P] extends object
+        ? DeepRequired<T[P]>
+        : T[P]
 }
 
 export default DeepRequired
diff --git a/src/common/Options.ts b/src/common/Options.ts
@@ -678,6 +678,7 @@ export interface OverlayStyle {
   arc: LineStyle
   text: TextStyle
   rectText: RectTextStyle
+  [key: string]: any
 }
 
 function getDefaultOverlayStyle (): OverlayStyle {

diff --git a/src/component/YAxis.ts b/src/component/YAxis.ts
@@ -87,8 +87,9 @@ export default class YAxisImp extends AxisImp implements YAxis {
         max = Math.max(max, data.high)
       }
       if (inCandle && isArea) {
-        min = Math.min(min, data[areaValueKey])
-        max = Math.max(max, data[areaValueKey])
+        const value = data[areaValueKey]
+        min = Math.min(min, value)
+        max = Math.max(max, value)
       }
       figuresResultList.forEach(({ figures, result }) => {
         const indicatorData = result[dataIndex] ?? {}

diff --git a/types/index.d.ts b/types/index.d.ts
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 export type DeepPartial<T> = {
-	[P in keyof T]?: T[P] extends Array<infer U> ? Array<DeepPartial<U>> : T[P] extends ReadonlyArray<infer X> ? ReadonlyArray<DeepPartial<X>> : DeepPartial<T[P]>;
+	[P in keyof T]?: T[P] extends Array<infer U> ? Array<DeepPartial<U>> : T[P] extends ReadonlyArray<infer X> ? ReadonlyArray<DeepPartial<X>> : T[P] extends object ? DeepPartial<T[P]> : T[P];
 };
 /**
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -317,6 +317,7 @@ export interface OverlayStyle {
 	arc: LineStyle;
 	text: TextStyle;
 	rectText: RectTextStyle;
+	[key: string]: any;
 }
 export interface SeparatorStyle {
 	size: number;