From 85931cec35f339f84962999d34a5b0bcd2c17593 Mon Sep 17 00:00:00 2001 From: qfdk Date: Wed, 12 Oct 2022 08:36:27 +0200 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA?= =?UTF-8?q?home,=E5=A6=82=E6=9E=9C=E9=85=8D=E7=BD=AEnavigation=20=E4=BB=A5?= =?UTF-8?q?navigation=20=E4=B8=BA=E4=B8=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/site/SiteHeader.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/site/SiteHeader.tsx b/src/components/site/SiteHeader.tsx index b9d6a6d3..c0c17377 100644 --- a/src/components/site/SiteHeader.tsx +++ b/src/components/site/SiteHeader.tsx @@ -134,8 +134,7 @@ export const SiteHeader: React.FC<{ }, [subscribeToSite.isError, subscribeToSite.data?.code]) const leftLinks: HeaderLinkType[] = [ - { label: "Home", url: "/" }, - ...(site?.navigation || []), + ...(site?.navigation || [{ label: "Home", url: "/" }]), ] const moreMenuItems = [ From b0d584042d40a1b4fb7e4845692ebdbb2f6afd3b Mon Sep 17 00:00:00 2001 From: qfdk Date: Wed, 12 Oct 2022 17:00:47 +0200 Subject: [PATCH 2/2] Update SiteHeader.tsx fix: change the display "Home" logic when url path === "/", t will not to affect the existing site --- src/components/site/SiteHeader.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/site/SiteHeader.tsx b/src/components/site/SiteHeader.tsx index c0c17377..33334df2 100644 --- a/src/components/site/SiteHeader.tsx +++ b/src/components/site/SiteHeader.tsx @@ -133,9 +133,9 @@ export const SiteHeader: React.FC<{ } }, [subscribeToSite.isError, subscribeToSite.data?.code]) - const leftLinks: HeaderLinkType[] = [ - ...(site?.navigation || [{ label: "Home", url: "/" }]), - ] + const leftLinks: HeaderLinkType[] = site?.navigation?.find(nav => nav.url === "/") ? + site.navigation : [{ label: "Home", url: "/" }, ...(site?.navigation || [])] + const moreMenuItems = [ {