From d314f8269dcdff84c002f287fa04462d1b2bad03 Mon Sep 17 00:00:00 2001 From: Sam Samskies Date: Sat, 15 Apr 2023 18:08:16 -0500 Subject: [PATCH] fix followed tag active tab highlighting --- packages/app/src/Pages/Root.tsx | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/packages/app/src/Pages/Root.tsx b/packages/app/src/Pages/Root.tsx index 9f038f5c..bd336f2b 100644 --- a/packages/app/src/Pages/Root.tsx +++ b/packages/app/src/Pages/Root.tsx @@ -40,8 +40,22 @@ export default function RootPage() { data: "/global", }, }; + + const tagTabs = tags.item.map((t, idx) => { + return { text: `#${t}`, value: idx + 3, data: `/tag/${t}` }; + }); + const tabs = [RootTab.Posts, RootTab.PostsAndReplies, RootTab.Global, ...tagTabs]; const tab = useMemo(() => { const pTab = location.pathname.split("/").slice(-1)[0]; + + if (location.pathname.startsWith("/tag")) { + const selectedTag = tagTabs.find(t => t.text.slice(1) === pTab); + + if (selectedTag) { + return selectedTag; + } + } + switch (pTab) { case "conversations": { return RootTab.PostsAndReplies; @@ -64,11 +78,6 @@ export default function RootPage() { } }, [location]); - const tagTabs = tags.item.map((t, idx) => { - return { text: `#${t}`, value: idx + 3, data: `/tag/${t}` }; - }); - const tabs = [RootTab.Posts, RootTab.PostsAndReplies, RootTab.Global, ...tagTabs]; - return ( <>