Simplify theme setting in root

2023-10-19 16:50:23 -04:00 · 2023-10-19 16:50:23 -04:00 · 13b02c39a0
commit 13b02c39a0
parent 2fc6a521c3
1 changed files with 8 additions and 4 deletions
--- 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}