From 9e867c7af5a2650970bea87859980779cea730c4 Mon Sep 17 00:00:00 2001
From: Lim Chee Aun <cheeaun@gmail.com>
Date: Sat, 25 Feb 2023 10:03:34 +0800
Subject: [PATCH] Fix title not working when not logged in

Welcome page's useTitle overridden other page's useTitle
---
 src/pages/welcome.jsx | 2 +-
 src/utils/useTitle.js | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/pages/welcome.jsx b/src/pages/welcome.jsx
index 78c7499..99ceed6 100644
--- a/src/pages/welcome.jsx
+++ b/src/pages/welcome.jsx
@@ -6,7 +6,7 @@ import states from '../utils/states';
 import useTitle from '../utils/useTitle';
 
 function Welcome() {
-  useTitle();
+  useTitle(null, ['/', '/welcome']);
   return (
     <main id="welcome">
       <h1>
diff --git a/src/utils/useTitle.js b/src/utils/useTitle.js
index e4a5382..6257b00 100644
--- a/src/utils/useTitle.js
+++ b/src/utils/useTitle.js
@@ -9,10 +9,11 @@ const { VITE_CLIENT_NAME: CLIENT_NAME } = import.meta.env;
 export default function useTitle(title, path) {
   const snapStates = useSnapshot(states);
   const { currentLocation } = snapStates;
-  let paths = [];
+  const hasPaths = Array.isArray(path);
+  let paths = hasPaths ? path : [];
   // Workaround for matchPath not working for optional path segments
   // https://github.com/remix-run/react-router/discussions/9862
-  if (/:?\w+\?/.test(path)) {
+  if (!hasPaths && /:?\w+\?/.test(path)) {
     paths.push(path.replace(/(:\w+)\?/g, '$1'));
     paths.push(path.replace(/\/?:\w+\?/g, ''));
   }
@@ -24,7 +25,7 @@ export default function useTitle(title, path) {
   }
   console.debug({ paths, matched, currentLocation });
   useEffect(() => {
-    if (path && !matched) return;
+    if (!matched) return;
     document.title = title ? `${title} / ${CLIENT_NAME}` : CLIENT_NAME;
-  }, [title, snapStates.currentLocation]);
+  }, [title, matched]);
 }