From 1f91f16a54c1539fa4ad169afffb36458ba1d1b1 Mon Sep 17 00:00:00 2001
From: Romuald Brillout <git@brillout.com>
Date: Fri, 2 Aug 2024 09:39:06 +0200
Subject: [PATCH] fix: avoid the default of title/lang setting to override Head
 setting

---
 vike-solid/renderer/onRenderClient.tsx | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/vike-solid/renderer/onRenderClient.tsx b/vike-solid/renderer/onRenderClient.tsx
index 8a0e69a..ca6b8c7 100644
--- a/vike-solid/renderer/onRenderClient.tsx
+++ b/vike-solid/renderer/onRenderClient.tsx
@@ -32,16 +32,22 @@ const onRenderClient: OnRenderClientAsync = async (pageContext): ReturnType<OnRe
     // Client-side navigation
 
     setPageContext(pageContext);
+  }
 
-    const title = getHeadSetting("title", pageContext) || "";
-    const lang = getHeadSetting("lang", pageContext) || "en";
-
-    // We skip if the value is undefined because we shouldn't remove values set in HTML (by the Head setting).
-    //  - This also means that previous values will leak: upon client-side navigation, the title set by the previous
-    //    page won't be removed if the next page doesn't override it. But that's okay because usually pages always have
-    //    a favicon and title, which means that previous values are always overridden. Also, as a workaround, the user
-    //    can set the value to `null` to ensure that previous values are overridden.
-    if (title !== undefined) document.title = title;
-    if (lang !== undefined) document.documentElement.lang = lang;
+  if (!pageContext.isHydration) {
+    // E.g. document.title
+    updateDocument(pageContext);
   }
 };
+
+function updateDocument(pageContext: PageContextClient) {
+  const title = getHeadSetting("title", pageContext);
+  const lang = getHeadSetting("lang", pageContext);
+
+  // - We skip if `undefined` as we shouldn't remove values set by the Head setting.
+  // - Setting a default prevents the previous value to be leaked: upon client-side navigation, the value set by the previous page won't be removed if the next page doesn't override it.
+  //   - Most of the time, the user sets a default himself (i.e. a value defined at /pages/+config.js)
+  //     - If he doesn't have a default then he can use `null` to opt into Vike's defaults
+  if (title !== undefined) document.title = title || "";
+  if (lang !== undefined) document.documentElement.lang = lang || "en";
+}