Fix issue with default theme typing

implydata · Sep 23, 2021 · 3c9d2e0 · 3c9d2e0
1 parent 844c9a0
commit 3c9d2e0
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 18 deletions.
diff --git a/packages/core/types/stitches.d.ts b/packages/core/types/stitches.d.ts
@@ -109,16 +109,22 @@ export default interface Stitches<
 					: ThemeTokens<Argument0, Prefix>
 			)
 	}
-	theme: string & {
-		[Scale in keyof Theme]: {
-			[Token in keyof Theme[Scale]]: ThemeUtil.Token<
-				Extract<Token, string | number>,
-				string,
-				Extract<Scale, string | void>,
-				Extract<Prefix, string | void>
-			>
+	theme:
+		string 
+		& {
+			className: string
+			selector: string
+		}
+		& {
+			[Scale in keyof Theme]: {
+				[Token in keyof Theme[Scale]]: ThemeUtil.Token<
+					Extract<Token, string | number>,
+					string,
+					Extract<Scale, string | void>,
+					Extract<Prefix, string | void>
+				>
+			}
 		}
-	}
 	reset: {
 		(): void
 	}

diff --git a/packages/react/types/stitches.d.ts b/packages/react/types/stitches.d.ts
@@ -109,16 +109,22 @@ export default interface Stitches<
 					: ThemeTokens<Argument0, Prefix>
 			)
 	}
-	theme: string & {
-		[Scale in keyof Theme]: {
-			[Token in keyof Theme[Scale]]: ThemeUtil.Token<
-				Extract<Token, string | number>,
-				string,
-				Extract<Scale, string | void>,
-				Extract<Prefix, string | void>
-			>
+	theme:
+		string 
+		& {
+			className: string
+			selector: string
+		}
+		& {
+			[Scale in keyof Theme]: {
+				[Token in keyof Theme[Scale]]: ThemeUtil.Token<
+					Extract<Token, string | number>,
+					string,
+					Extract<Scale, string | void>,
+					Extract<Prefix, string | void>
+				>
+			}
 		}
-	}
 	reset: {
 		(): void
 	}