From 9b493ed089df97e63462f509b72c6fc966546d20 Mon Sep 17 00:00:00 2001
From: Hossein Mohammadi <hosseinm.developer@gmail.com>
Date: Sun, 15 Nov 2020 17:24:24 +0330
Subject: [PATCH 1/2] fix: jssStyle type

typescript can't work with   [K in keyof NormalCssProperties | string]
---
 packages/jss/src/index.d.ts | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/jss/src/index.d.ts b/packages/jss/src/index.d.ts
index 1dfe120e1..b9d039df3 100644
--- a/packages/jss/src/index.d.ts
+++ b/packages/jss/src/index.d.ts
@@ -15,13 +15,17 @@ 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]: JssStyle | Func<JssStyle> | Observable<JssStyle | undefined>
+    }
 
 export type Styles<Name extends string | number | symbol = string> = Record<
   Name,

From 74b94ba4f0eab68a65cdf641d9d2b8677fc19562 Mon Sep 17 00:00:00 2001
From: Hossein Mohammadi <hosseinm.developer@gmail.com>
Date: Mon, 16 Nov 2020 10:08:27 +0330
Subject: [PATCH 2/2] chore: add missed JssValue

---
 packages/jss/src/index.d.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/jss/src/index.d.ts b/packages/jss/src/index.d.ts
index b9d039df3..edfc7ce16 100644
--- a/packages/jss/src/index.d.ts
+++ b/packages/jss/src/index.d.ts
@@ -24,7 +24,11 @@ export type JssStyle =
         | Observable<NormalCssValues<K> | JssStyle | undefined>
     }
   | {
-      [K: string]: JssStyle | Func<JssStyle> | Observable<JssStyle | undefined>
+      [K: string]:
+        | JssValue
+        | JssStyle
+        | Func<JssValue | JssStyle | undefined>
+        | Observable<JssValue | JssStyle | undefined>
     }
 
 export type Styles<Name extends string | number | symbol = string> = Record<