diff --git a/packages/core/types/css-util.d.ts b/packages/core/types/css-util.d.ts index 90219b2e..8189839e 100644 --- a/packages/core/types/css-util.d.ts +++ b/packages/core/types/css-util.d.ts @@ -30,6 +30,7 @@ export type CSS< | TokenByPropertyName | CSS.Globals | ThemeUtil.ScaleValue + | undefined ) } // known utility styles @@ -40,35 +41,43 @@ export type CSS< : ( | ( Utils[K] extends (arg: infer P) => any - ? P extends any[] - ? ( - $$PropertyValue extends keyof P[0] - ? ( - | ValueByPropertyName - | TokenByPropertyName - | CSS.Globals - | ThemeUtil.ScaleValue - ) - : $$ScaleValue extends keyof P[0] - ? ( - | TokenByScaleName - | ThemeUtil.ScaleValue - ) - : never - )[] - : $$PropertyValue extends keyof P - ? ( - | ValueByPropertyName - | TokenByPropertyName - | CSS.Globals - | ThemeUtil.ScaleValue - ) - : $$ScaleValue extends keyof P - ? ( - | TokenByScaleName - | ThemeUtil.ScaleValue - ) - : never + ? ( + P extends any[] + ? ( + $$PropertyValue extends keyof P[0] + ? ( + | ValueByPropertyName + | TokenByPropertyName + | CSS.Globals + | ThemeUtil.ScaleValue + | undefined + ) + : $$ScaleValue extends keyof P[0] + ? ( + | TokenByScaleName + | ThemeUtil.ScaleValue + | undefined + ) + : never + )[] + | P + : $$PropertyValue extends keyof P + ? ( + | ValueByPropertyName + | TokenByPropertyName + | CSS.Globals + | ThemeUtil.ScaleValue + | undefined + ) + : $$ScaleValue extends keyof P + ? ( + | TokenByScaleName + | ThemeUtil.ScaleValue + | undefined + ) + : never + ) + | P : never ) ) @@ -86,12 +95,14 @@ export type CSS< : ( | CSS.Globals | Util.Index + | undefined ) ) } // unknown css declaration styles & { - [K in string]: number | string | CSS | {} + /** Unknown property. */ + [K in string]: number | string | CSS | {} | undefined } ) @@ -105,7 +116,7 @@ export type KnownCSS< > = ( // nested at-rule css styles & { - [K in Util.Prefixed<'@', keyof Media>]?: KnownCSS + [K in Util.Prefixed<'@', keyof Media>]?: CSS } // known property styles & { diff --git a/packages/react/types/css-util.d.ts b/packages/react/types/css-util.d.ts index 6da69fd6..8189839e 100644 --- a/packages/react/types/css-util.d.ts +++ b/packages/react/types/css-util.d.ts @@ -30,6 +30,7 @@ export type CSS< | TokenByPropertyName | CSS.Globals | ThemeUtil.ScaleValue + | undefined ) } // known utility styles @@ -49,11 +50,13 @@ export type CSS< | TokenByPropertyName | CSS.Globals | ThemeUtil.ScaleValue + | undefined ) : $$ScaleValue extends keyof P[0] ? ( | TokenByScaleName | ThemeUtil.ScaleValue + | undefined ) : never )[] @@ -64,11 +67,13 @@ export type CSS< | TokenByPropertyName | CSS.Globals | ThemeUtil.ScaleValue + | undefined ) : $$ScaleValue extends keyof P ? ( | TokenByScaleName | ThemeUtil.ScaleValue + | undefined ) : never ) @@ -90,13 +95,14 @@ export type CSS< : ( | CSS.Globals | Util.Index + | undefined ) ) } // unknown css declaration styles & { /** Unknown property. */ - [K in string]: number | string | CSS | {} + [K in string]: number | string | CSS | {} | undefined } )