Simplify theme setting in root

regalijan · Oct 19, 2023 · 13b02c3 · 13b02c3
1 parent 2fc6a52
commit 13b02c3
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/app/root.tsx b/app/root.tsx
@@ -165,14 +165,18 @@ function getMarkup(
 
       return (
         <html
+          data-theme={loaderData.theme}
           lang="en-US"
-          {...(loaderData.theme && {
-            "data-theme": loaderData.theme,
-            style: { colorScheme: loaderData.theme },
-          })}
         >
           <head>
             <Links />
+            <style nonce={loaderData.nonce}>
+              {`
+                :root {
+                  color-scheme: ${loaderData.theme};
+                }
+              `}
+            </style>
             {serverStyleData?.map(({ key, ids, css }) => (
               <style
                 key={key}