From bf2ce50ac7b2c6e22eb494025ea0d5794b022a6e Mon Sep 17 00:00:00 2001 From: Hossein Mohammadi Date: Sun, 21 Feb 2021 18:06:36 +0330 Subject: [PATCH 1/2] fix: type import from csstype --- packages/jss/src/index.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/jss/src/index.d.ts b/packages/jss/src/index.d.ts index 9d13f7375..9565f5d1d 100644 --- a/packages/jss/src/index.d.ts +++ b/packages/jss/src/index.d.ts @@ -1,4 +1,4 @@ -import * as css from 'csstype' +import {Properties as CSSProperties} from 'csstype' // Observable support is included as a plugin. Including it here allows // TypeScript users to use Observables, which could be confusing if a user @@ -10,7 +10,7 @@ import {Observable} from 'indefinite-observable' // TODO: Type data better, currently typed as any for allowing to override it type Func = ((data: any) => R) -type NormalCssProperties = css.Properties +type NormalCssProperties = CSSProperties type NormalCssValues = K extends keyof NormalCssProperties ? NormalCssProperties[K] | JssValue : JssValue From b69250314aa5ef87d95a1706d656fe84f212dace Mon Sep 17 00:00:00 2001 From: Hossein Mohammadi Date: Mon, 22 Feb 2021 12:49:36 +0330 Subject: [PATCH 2/2] fix: wrong type extends in NormalCssValues --- packages/jss/src/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/jss/src/index.d.ts b/packages/jss/src/index.d.ts index 9565f5d1d..f867e9642 100644 --- a/packages/jss/src/index.d.ts +++ b/packages/jss/src/index.d.ts @@ -12,7 +12,7 @@ type Func = ((data: any) => R) type NormalCssProperties = CSSProperties type NormalCssValues = K extends keyof NormalCssProperties - ? NormalCssProperties[K] | JssValue + ? NormalCssProperties[K] : JssValue export type JssStyle =