From e6e006adfe0df5e67c79eb5b3856dffbce5f530e Mon Sep 17 00:00:00 2001
From: Natalie Bridgers <natalie@stream.place>
Date: Mon, 4 May 2026 20:40:05 -0500
Subject: [PATCH] only have a single theme context

---
 js/components/src/lib/theme/theme.tsx | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/js/components/src/lib/theme/theme.tsx b/js/components/src/lib/theme/theme.tsx
index 46b2bbec..c8b9c9d5 100644
--- a/js/components/src/lib/theme/theme.tsx
+++ b/js/components/src/lib/theme/theme.tsx
@@ -475,13 +475,20 @@ export function ThemeProvider({
     ],
   );
 
+  const parentTheme = useContext(ThemeContext);
+  const isRoot = !parentTheme;
+
   return (
     <ThemeContext.Provider value={value}>
-      <GestureHandlerRootView>
-        {children}
-        <PortalHost />
-        <ToastProvider />
-      </GestureHandlerRootView>
+      {isRoot ? (
+        <GestureHandlerRootView>
+          {children}
+          <PortalHost />
+          <ToastProvider />
+        </GestureHandlerRootView>
+      ) : (
+        children
+      )}
     </ThemeContext.Provider>
   );
 }
-- 
2.51.2