From f105240559680b9dd562cced5a5d882bed934c33 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Fri, 29 Aug 2025 15:19:35 -0700 Subject: [PATCH] impr: rewrite Tabs selection detection --- .../lemmy/community/CommunityItem.svelte | 20 ++--- .../lemmy/dropdowns/ViewSelect.svelte | 3 +- .../components/ui/layout/pages/Header.svelte | 2 +- .../components/ui/layout/pages/Tabs.svelte | 41 ++++++++-- src/lib/mono/forms/select/Select.svelte | 3 +- src/lib/mono/popover/Popover.svelte | 3 - src/routes/+page.svelte | 11 +++ src/routes/create/+layout.svelte | 2 - src/routes/inbox/+page.svelte | 2 - src/routes/inbox/messages/+page.svelte | 1 - src/routes/instances/+layout.svelte | 1 - src/routes/saved/+page.svelte | 2 - src/routes/search/+page.svelte | 82 ++++++++++--------- src/routes/settings/+layout.svelte | 6 +- 14 files changed, 106 insertions(+), 73 deletions(-) diff --git a/src/lib/components/lemmy/community/CommunityItem.svelte b/src/lib/components/lemmy/community/CommunityItem.svelte index 2a811e05..3a1e0468 100644 --- a/src/lib/components/lemmy/community/CommunityItem.svelte +++ b/src/lib/components/lemmy/community/CommunityItem.svelte @@ -5,10 +5,13 @@ import LabelStat from '$lib/components/ui/LabelStat.svelte' import FormattedNumber from '$lib/components/util/FormattedNumber.svelte' import { t } from '$lib/i18n/translations' + import { client } from '$lib/lemmy.svelte' import { addSubscription } from '$lib/lemmy/user.js' + import { settings } from '$lib/settings.svelte' import { fullCommunityName, isSubscribed } from '$lib/util.svelte.js' import type { CommunityView } from 'lemmy-js-client' - import { Button, Modal } from 'mono-svelte' + import { Button, modal } from 'mono-svelte' + import type { Snippet } from 'svelte' import { Check, ExclamationTriangle, @@ -20,11 +23,7 @@ Trash, } from 'svelte-hero-icons' import Subscribe from '../../../../routes/communities/Subscribe.svelte' - import { settings } from '$lib/settings.svelte' - import type { Snippet } from 'svelte' - import { client } from '$lib/lemmy.svelte' - let showInfo = $state(false) interface Props { community: CommunityView view?: 'cozy' | 'compact' @@ -46,11 +45,9 @@ }: Props = $props() -{#if showInfo} - - - -{/if} +{#snippet communityInfo()} + +{/snippet}
(showInfo = !showInfo)} + onclick={() => + modal({ title: $t('form.post.community'), snippet: communityInfo })} > diff --git a/src/lib/components/lemmy/dropdowns/ViewSelect.svelte b/src/lib/components/lemmy/dropdowns/ViewSelect.svelte index 6ced6398..757017dc 100644 --- a/src/lib/components/lemmy/dropdowns/ViewSelect.svelte +++ b/src/lib/components/lemmy/dropdowns/ViewSelect.svelte @@ -3,9 +3,10 @@ import { settings } from '$lib/settings.svelte.js' import { Select } from 'mono-svelte' import Option from 'mono-svelte/forms/select/Option.svelte' + import type { SelectProps } from 'mono-svelte/forms/select/Select.svelte' import { Bars3, Icon, RectangleGroup, ViewColumns } from 'svelte-hero-icons' - interface Props { + interface Props extends SelectProps { showLabel?: boolean } diff --git a/src/lib/components/ui/layout/pages/Header.svelte b/src/lib/components/ui/layout/pages/Header.svelte index e6235941..462fab0c 100644 --- a/src/lib/components/ui/layout/pages/Header.svelte +++ b/src/lib/components/ui/layout/pages/Header.svelte @@ -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')} diff --git a/src/lib/components/ui/layout/pages/Tabs.svelte b/src/lib/components/ui/layout/pages/Tabs.svelte index 7d9018ec..b223e9f6 100644 --- a/src/lib/components/ui/layout/pages/Tabs.svelte +++ b/src/lib/components/ui/layout/pages/Tabs.svelte @@ -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 }