Merge branch 'canary' of https://github.com/modulz/stitches into canary

implydata · Aug 12, 2021 · a19ad0e · a19ad0e
2 parents 9c58932 + fc1b4a1
commit a19ad0e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/packages/react/types/css-util.d.ts b/packages/react/types/css-util.d.ts
@@ -17,7 +17,8 @@ export type CSS<
 	Media = {},
 	Theme = {},
 	ThemeMap = Config.DefaultThemeMap,
-	Utils = {}
+	Utils = {},
+	IsFlat = false
 > = (
 	// nested at-rule css styles
 	& {
@@ -97,7 +98,7 @@ export type CSS<
 		)
 	}
 	// unknown css declaration styles
-	& {
+	& (true extends IsFlat ? {} : {
 		/** Unknown property. */
 		[K in string]: (
 			| number
@@ -106,7 +107,7 @@ export type CSS<
 			| {}
 			| undefined
 		)
-	}
+	})
 )
 
 /** Unique symbol used to reference a property value. */

diff --git a/packages/react/types/index.d.ts b/packages/react/types/index.d.ts
@@ -26,7 +26,8 @@ export type CSS<
 	Config['media'],
 	Config['theme'],
 	Config['themeMap'],
-	Config['utils']
+	Config['utils'],
+	false
 >
 
 /** Returns the properties, attributes, and children expected by a component. */

diff --git a/packages/react/types/stitches.d.ts b/packages/react/types/stitches.d.ts
@@ -121,7 +121,7 @@ export default interface Stitches<
 						? Composers[K]
 					: Composers[K] extends Util.Function
 						? Composers[K]
-					: CSSUtil.CSS<Media, Theme, ThemeMap, Utils> & {
+					: CSSUtil.CSS<Media, Theme, ThemeMap, Utils, true> & {
 						/** The **variants** property sets variants.
 						 *
 						 * [Read Documentation](https://stitches.dev/docs/variants)
@@ -194,7 +194,7 @@ export default interface Stitches<
 						? Composers[K]
 					: Composers[K] extends Util.Function
 						? Composers[K]
-					: CSSUtil.CSS<Media, Theme, ThemeMap, Utils> & {
+					: CSSUtil.CSS<Media, Theme, ThemeMap, Utils, true> & {
 						/** The **variants** property sets variants.
 						 *
 						 * [Read Documentation](https://stitches.dev/docs/variants)