fix: jssStyle type (#1423)

* fix: jssStyle type typescript can't work with [K in keyof NormalCssProperties | string] * chore: add missed JssValue
cssinjs · Nov 18, 2020 · 3c33514 · 3c33514
1 parent f9d9372
commit 3c33514
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/packages/jss/src/index.d.ts b/packages/jss/src/index.d.ts
@@ -15,13 +15,21 @@ type NormalCssValues<K> = K extends keyof NormalCssProperties
   ? NormalCssProperties[K] | JssValue
   : JssValue
 
-export type JssStyle = {
-  [K in keyof NormalCssProperties | string]:
-    | NormalCssValues<K>
-    | JssStyle
-    | Func<NormalCssValues<K> | JssStyle | undefined>
-    | Observable<NormalCssValues<K> | JssStyle | undefined>
-}
+export type JssStyle =
+  | {
+      [K in keyof NormalCssProperties]:
+        | NormalCssValues<K>
+        | JssStyle
+        | Func<NormalCssValues<K> | JssStyle | undefined>
+        | Observable<NormalCssValues<K> | JssStyle | undefined>
+    }
+  | {
+      [K: string]:
+        | JssValue
+        | JssStyle
+        | Func<JssValue | JssStyle | undefined>
+        | Observable<JssValue | JssStyle | undefined>
+    }
 
 export type Styles<Name extends string | number | symbol = string> = Record<
   Name,