impr: rewrite Tabs selection detection

This commit is contained in:
James Xylight committed 2025-08-29 15:19:35 -07:00
1 parent 2891c68494
commit f105240559
14 files changed
+106 -73

No files matched your search

@@ -32,7 +32,7 @@
pageHeader &&
`w-[calc(100%+1.5rem)] sm:w-[calc(100%+3rem)]
bg-slate-100 dark:bg-zinc-950 -mx-3 sm:-mx-6 sm:px-6 sm:pb-6 px-4 pb-4 -mt-64 pt-64
border-b border-slate-200 dark:border-zinc-900 margin z-0`,
border-b border-slate-200 dark:border-zinc-900 margin z-0 mb-3 sm:mb-6`,
]}
{style}
aria-label={$t('aria.element.pageHeader')}
+35 -6
View File
@@ -23,22 +23,47 @@
style = 'header',
}: Props = $props()
function isSelected(url: URL, href?: SvelteURL) {
if (href?.search != '') return href?.search == url.search
else if (url.search == '') return href?.pathname == url.pathname
let matchType = $derived<('search' | 'pathname')[]>(
routes.map(i =>
new URL(`https://example.com${i.href}`)?.search != ''
? 'search'
: 'pathname',
),
)
// i am on 2 hours of sleep i apologize
function isSelected(url: URL, href: SvelteURL, type: 'search' | 'pathname') {
const currentSearch = new Set(url.searchParams.values())
const hrefSearch = new Set(href.searchParams.values())
// checks if there is any
const usePathname = !routes.some(
i =>
new Set(
new URL(`https://example.com${i.href}`).searchParams.values(),
).intersection(currentSearch).size > 0,
)
const hasSearchParam = hrefSearch.intersection(currentSearch).size > 0
if (hasSearchParam && !usePathname) return hasSearchParam
else if ((url.search == '' || usePathname) && type == 'pathname')
return href.pathname == url.pathname
}
</script>
<nav
class={[
'flex flex-row items-center justify-center sm:justify-start my-2 sm:mt-0 flex-wrap z-20',
style == 'header' ? 'p-1 gap-x-8 gap-y-4' : 'gap-2',
'flex flex-row items-center my-2 sm:mt-0 flex-wrap z-20',
style == 'header'
? 'p-1 gap-x-8 gap-y-4 justify-center sm:justify-start'
: 'gap-2',
]}
>
{#each routes as route (route.href)}
{#each routes as route, index (route.href)}
{@const selected = isSelected(
page.url,
new SvelteURL(`${page.url.origin}${route.href}`),
matchType[index],
)}
{#if style == 'header'}
<a
@@ -61,3 +86,7 @@
{/each}
{@render children?.()}
</nav>
{#if style == 'subpage'}
<div class="h-3"></div>
{/if}