Merge pull request #308 from codegouvfr/no_script_when_only_light

No script when only light
codegouvfr · Sep 17, 2024 · a9ecdd1 · a9ecdd1
2 parents bb2e83e + 74a2e6a
commit a9ecdd1
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 42 deletions.
diff --git a/src/next-appdir/DsfrHead.tsx b/src/next-appdir/DsfrHead.tsx
@@ -94,26 +94,30 @@ export function DsfrHead(props: DsfrHeadProps) {
                     <link rel="shortcut icon" href={getAssetUrl(FaviconIco)} type="image/x-icon" />
                 </>
             )}
-            <script
-                suppressHydrationWarning
-                nonce={nonce}
-                dangerouslySetInnerHTML={{
-                    "__html": getScriptToRunAsap({
-                        defaultColorScheme,
-                        nonce,
-                        trustedTypesPolicyName
-                    })
-                }}
-            />
-            {nonce !== undefined && (
-                <script
-                    suppressHydrationWarning
-                    key="nonce-setter"
-                    nonce={nonce}
-                    dangerouslySetInnerHTML={{
-                        __html: `window.ssrNonce = "${nonce}";`
-                    }}
-                />
+            {defaultColorScheme !== "light" && (
+                <>
+                    <script
+                        suppressHydrationWarning
+                        nonce={nonce}
+                        dangerouslySetInnerHTML={{
+                            "__html": getScriptToRunAsap({
+                                defaultColorScheme,
+                                nonce,
+                                trustedTypesPolicyName
+                            })
+                        }}
+                    />
+                    {nonce !== undefined && (
+                        <script
+                            suppressHydrationWarning
+                            key="nonce-setter"
+                            nonce={nonce}
+                            dangerouslySetInnerHTML={{
+                                __html: `window.ssrNonce = "${nonce}";`
+                            }}
+                        />
+                    )}
+                </>
             )}
         </>
     );

diff --git a/src/next-pagesdir.tsx b/src/next-pagesdir.tsx
@@ -199,31 +199,37 @@ export function createNextDsfrIntegrationApi(
                                 />
                             </>
                         )}
-                        {!isBrowser && ( //NOTE: On browser we handle this manually
+                        {defaultColorScheme !== "light" && (
                             <>
-                                <style id={rootColorSchemeStyleTagId}>{`:root { color-scheme: ${
-                                    isDark ? "dark" : "light"
-                                }; }`}</style>
-                                <meta
-                                    name="theme-color"
-                                    content={
-                                        fr.colors.getHex({ isDark }).decisions.background.default
-                                            .grey.default
-                                    }
-                                />
+                                {!isBrowser && ( //NOTE: On browser we handle this manually
+                                    <>
+                                        <style
+                                            id={rootColorSchemeStyleTagId}
+                                        >{`:root { color-scheme: ${
+                                            isDark ? "dark" : "light"
+                                        }; }`}</style>
+                                        <meta
+                                            name="theme-color"
+                                            content={
+                                                fr.colors.getHex({ isDark }).decisions.background
+                                                    .default.grey.default
+                                            }
+                                        />
+                                    </>
+                                )}
+                                {isProduction && !isBrowser && (
+                                    <script
+                                        dangerouslySetInnerHTML={{
+                                            "__html": getScriptToRunAsap({
+                                                defaultColorScheme,
+                                                trustedTypesPolicyName,
+                                                "nonce": undefined
+                                            })
+                                        }}
+                                    />
+                                )}
                             </>
                         )}
-                        {isProduction && !isBrowser && (
-                            <script
-                                dangerouslySetInnerHTML={{
-                                    "__html": getScriptToRunAsap({
-                                        defaultColorScheme,
-                                        trustedTypesPolicyName,
-                                        "nonce": undefined
-                                    })
-                                }}
-                            />
-                        )}
                     </Head>
                     {isBrowser ? (
                         <App {...(props as any)} />