From ea545945159f5a377ea061e852a829c43c4478fb Mon Sep 17 00:00:00 2001
From: Jordan Pittman <jordan@cryptica.me>
Date: Thu, 22 Aug 2024 17:04:30 -0400
Subject: [PATCH] Handle inline theme keys in `resolveWith`

---
 packages/tailwindcss/src/theme.ts | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/tailwindcss/src/theme.ts b/packages/tailwindcss/src/theme.ts
index da90aff4b..178472b96 100644
--- a/packages/tailwindcss/src/theme.ts
+++ b/packages/tailwindcss/src/theme.ts
@@ -121,12 +121,23 @@ export class Theme {
 
     let extra = {} as Record<string, string>
     for (let name of nestedKeys) {
-      let nestedValue = this.#var(`${themeKey}${name}`)
-      if (nestedValue) {
-        extra[name] = nestedValue
+      let nestedKey = `${themeKey}${name}`
+      let nestedValue = this.values.get(nestedKey)!
+      if (!nestedValue) continue
+
+      if (nestedValue.isInline) {
+        extra[name] = nestedValue.value
+      } else {
+        extra[name] = this.#var(nestedKey)!
       }
     }
 
+    let value = this.values.get(themeKey)!
+
+    if (value.isInline) {
+      return [value.value, extra]
+    }
+
     return [this.#var(themeKey)!, extra]
   }