From 74fbe64360a5c3d89a9fff29e1fc2b2392dea73a Mon Sep 17 00:00:00 2001
From: Michelle Johnson <mchlljy@gmail.com>
Date: Tue, 12 Mar 2024 11:14:29 -0300
Subject: [PATCH] fix(query-devtools): Apply styles to explorer component in
 Shadow DOM (#7090)

---
 examples/react/shadow-dom/src/DogList.tsx | 34 +++++++++++++++++++
 examples/react/shadow-dom/src/main.tsx    |  7 ++--
 packages/query-devtools/src/Explorer.tsx  | 41 +++++++++++++++++------
 3 files changed, 69 insertions(+), 13 deletions(-)
 create mode 100644 examples/react/shadow-dom/src/DogList.tsx

diff --git a/examples/react/shadow-dom/src/DogList.tsx b/examples/react/shadow-dom/src/DogList.tsx
new file mode 100644
index 0000000000..1dec293c31
--- /dev/null
+++ b/examples/react/shadow-dom/src/DogList.tsx
@@ -0,0 +1,34 @@
+import { useQuery } from '@tanstack/react-query'
+
+type DogsResp = {
+  message: {
+    [dog: string]: string[]
+  }
+}
+
+export const DogList = () => {
+  const { data, status } = useQuery<DogsResp>({
+    queryKey: ['dogs'],
+    queryFn: async () => {
+      const resp = await fetch('https://dog.ceo/api/breeds/list/all')
+      if (resp.ok) {
+        return resp.json()
+      }
+      throw new Error('something went wrong')
+    },
+  })
+
+  if (status === 'pending') return 'Loading...'
+
+  if (status === 'error') return 'Error!'
+
+  const dogs = Object.keys(data?.message)
+
+  return (
+    <div>
+      {dogs.map((dog) => (
+        <div>{dog}</div>
+      ))}
+    </div>
+  )
+}
diff --git a/examples/react/shadow-dom/src/main.tsx b/examples/react/shadow-dom/src/main.tsx
index 640d4c6f64..cf1b9e5349 100644
--- a/examples/react/shadow-dom/src/main.tsx
+++ b/examples/react/shadow-dom/src/main.tsx
@@ -3,6 +3,7 @@ import ReactDOM from 'react-dom/client'
 import './index.css'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { ReactQueryDevtools } from '@tanstack/react-query-devtools'
+import { DogList } from './DogList'
 
 const appRoot = document.getElementById('root')
 
@@ -16,12 +17,12 @@ if (appRoot) {
       <QueryClientProvider client={queryClient}>
         <div
           style={{
-            display: 'flex',
-            justifyContent: 'center',
             width: '100vw',
+            padding: '30px',
           }}
         >
-          I'm just an app rendered in a shadow dom...
+          <h2>Dog Breeds</h2>
+          <DogList />
         </div>
         <ReactQueryDevtools
           initialIsOpen={false}
diff --git a/packages/query-devtools/src/Explorer.tsx b/packages/query-devtools/src/Explorer.tsx
index 1dbbc377b6..a028ff9540 100644
--- a/packages/query-devtools/src/Explorer.tsx
+++ b/packages/query-devtools/src/Explorer.tsx
@@ -1,8 +1,8 @@
 import { stringify } from 'superjson'
-import { css } from 'goober'
 import { clsx as cx } from 'clsx'
 import { Index, Match, Show, Switch, createMemo, createSignal } from 'solid-js'
 import { Key } from '@solid-primitives/keyed'
+import * as goober from 'goober'
 import { tokens } from './theme'
 import {
   deleteNestedDataByPath,
@@ -38,8 +38,11 @@ function chunkArray<T extends { label: string; value: unknown }>(
 
 const Expander = (props: { expanded: boolean }) => {
   const theme = useTheme()
+  const css = useQueryDevtoolsContext().shadowDOMTarget
+    ? goober.css.bind({ target: useQueryDevtoolsContext().shadowDOMTarget })
+    : goober.css
   const styles = createMemo(() => {
-    return theme() === 'dark' ? darkStyles : lightStyles
+    return theme() === 'dark' ? darkStyles(css) : lightStyles(css)
   })
 
   return (
@@ -78,8 +81,11 @@ const Expander = (props: { expanded: boolean }) => {
 type CopyState = 'NoCopy' | 'SuccessCopy' | 'ErrorCopy'
 const CopyButton = (props: { value: unknown }) => {
   const theme = useTheme()
+  const css = useQueryDevtoolsContext().shadowDOMTarget
+    ? goober.css.bind({ target: useQueryDevtoolsContext().shadowDOMTarget })
+    : goober.css
   const styles = createMemo(() => {
-    return theme() === 'dark' ? darkStyles : lightStyles
+    return theme() === 'dark' ? darkStyles(css) : lightStyles(css)
   })
   const [copyState, setCopyState] = createSignal<CopyState>('NoCopy')
 
@@ -136,8 +142,11 @@ const ClearArrayButton = (props: {
   activeQuery: Query
 }) => {
   const theme = useTheme()
+  const css = useQueryDevtoolsContext().shadowDOMTarget
+    ? goober.css.bind({ target: useQueryDevtoolsContext().shadowDOMTarget })
+    : goober.css
   const styles = createMemo(() => {
-    return theme() === 'dark' ? darkStyles : lightStyles
+    return theme() === 'dark' ? darkStyles(css) : lightStyles(css)
   })
   const queryClient = useQueryDevtoolsContext().client
 
@@ -162,8 +171,11 @@ const DeleteItemButton = (props: {
   activeQuery: Query
 }) => {
   const theme = useTheme()
+  const css = useQueryDevtoolsContext().shadowDOMTarget
+    ? goober.css.bind({ target: useQueryDevtoolsContext().shadowDOMTarget })
+    : goober.css
   const styles = createMemo(() => {
-    return theme() === 'dark' ? darkStyles : lightStyles
+    return theme() === 'dark' ? darkStyles(css) : lightStyles(css)
   })
   const queryClient = useQueryDevtoolsContext().client
 
@@ -189,8 +201,11 @@ const ToggleValueButton = (props: {
   value: boolean
 }) => {
   const theme = useTheme()
+  const css = useQueryDevtoolsContext().shadowDOMTarget
+    ? goober.css.bind({ target: useQueryDevtoolsContext().shadowDOMTarget })
+    : goober.css
   const styles = createMemo(() => {
-    return theme() === 'dark' ? darkStyles : lightStyles
+    return theme() === 'dark' ? darkStyles(css) : lightStyles(css)
   })
   const queryClient = useQueryDevtoolsContext().client
 
@@ -236,8 +251,11 @@ function isIterable(x: any): x is Iterable<unknown> {
 
 export default function Explorer(props: ExplorerProps) {
   const theme = useTheme()
+  const css = useQueryDevtoolsContext().shadowDOMTarget
+    ? goober.css.bind({ target: useQueryDevtoolsContext().shadowDOMTarget })
+    : goober.css
   const styles = createMemo(() => {
-    return theme() === 'dark' ? darkStyles : lightStyles
+    return theme() === 'dark' ? darkStyles(css) : lightStyles(css)
   })
   const queryClient = useQueryDevtoolsContext().client
 
@@ -482,7 +500,10 @@ export default function Explorer(props: ExplorerProps) {
   )
 }
 
-const stylesFactory = (theme: 'light' | 'dark') => {
+const stylesFactory = (
+  theme: 'light' | 'dark',
+  css: (typeof goober)['css'],
+) => {
   const { colors, font, size, border } = tokens
   const t = (light: string, dark: string) => (theme === 'light' ? light : dark)
   return {
@@ -612,5 +633,5 @@ const stylesFactory = (theme: 'light' | 'dark') => {
   }
 }
 
-const lightStyles = stylesFactory('light')
-const darkStyles = stylesFactory('dark')
+const lightStyles = (css: (typeof goober)['css']) => stylesFactory('light', css)
+const darkStyles = (css: (typeof goober)['css']) => stylesFactory('dark', css)