Merge pull request #547 from sevonj/fix-inbox-tab-routes
fix: inbox route tabs highlight
This commit is contained in:
2 files changed
+21
-18
No files matched your search
@@ -9,12 +9,6 @@
|
||||
name: string
|
||||
}[]
|
||||
currentRoute?: string | undefined
|
||||
isSelected?: (
|
||||
url: URL,
|
||||
currentRoute: string | undefined,
|
||||
route: string,
|
||||
defaultRoute?: string,
|
||||
) => boolean
|
||||
buildUrl?: (currentRoute: string | undefined, href: string) => string
|
||||
defaultRoute?: string | undefined
|
||||
class?: string
|
||||
@@ -24,13 +18,29 @@
|
||||
let {
|
||||
routes,
|
||||
currentRoute = undefined,
|
||||
isSelected = (url, currentRoute, route) =>
|
||||
(currentRoute ?? url.pathname) == route,
|
||||
buildUrl = (route, href) => href,
|
||||
defaultRoute = undefined,
|
||||
class: clazz = '',
|
||||
children,
|
||||
}: Props = $props()
|
||||
|
||||
function isSelected(
|
||||
url: URL,
|
||||
currentRoute: string | undefined,
|
||||
route: string,
|
||||
defaultRoute?: string,
|
||||
) {
|
||||
if (route.startsWith('?')) {
|
||||
const param = route.slice(1)
|
||||
const key = param.split(/(?<=[=])/g)[0]
|
||||
if (currentRoute?.includes(param)) {
|
||||
return true
|
||||
} else if (route == defaultRoute && !currentRoute?.includes(key)) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return (currentRoute ?? url.pathname) == route
|
||||
}
|
||||
</script>
|
||||
|
||||
<nav
|
||||
|
||||
@@ -98,17 +98,12 @@ items-center px-2 w-max top-6 lg:top-22"
|
||||
},
|
||||
]}
|
||||
currentRoute={page.url.search}
|
||||
isSelected={(url, current, route, def) =>
|
||||
page.url.search == route ||
|
||||
(page.url.pathname == route && page.url.search == '') ||
|
||||
page.url.searchParams.toString().includes(route.slice(1)) ||
|
||||
(page.url.search == '' && route == def)}
|
||||
class="overflow-auto"
|
||||
buildUrl={(route, href) =>
|
||||
href.includes('?')
|
||||
? '?' + addSearchParam(page.url.searchParams, href).toString()
|
||||
: `${href}${page.url.search}`}
|
||||
defaultRoute="?type=All"
|
||||
defaultRoute="?type=all"
|
||||
class="overflow-auto"
|
||||
/>
|
||||
<Tabs
|
||||
routes={[
|
||||
@@ -121,9 +116,7 @@ items-center px-2 w-max top-6 lg:top-22"
|
||||
name: $t('filter.unread'),
|
||||
},
|
||||
]}
|
||||
isSelected={(url, current, route, def) =>
|
||||
page.url.searchParams.toString().includes(route.slice(1)) ||
|
||||
(page.url.search == '' && route == def)}
|
||||
currentRoute={page.url.search}
|
||||
buildUrl={(route, href) =>
|
||||
'?' + addSearchParam(page.url.searchParams, href).toString()}
|
||||
defaultRoute="?unreadOnly=true"
|
||||
|
||||
Reference in new issue
Block a user