From ebf53faa10bd01ff08ec1180718aa7c45cc8be50 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Fri, 29 Aug 2025 16:09:22 -0700 Subject: [PATCH] impr: improve select menu semantics --- .../components/lemmy/dropdowns/Sort.svelte | 93 +++++++++--------- src/lib/components/lemmy/post/PostMeta.svelte | 4 +- src/lib/components/ui/Expandable.svelte | 2 +- src/lib/components/ui/ExpandableImage.svelte | 12 +-- src/lib/components/ui/navbar/Navbar.svelte | 2 +- src/lib/components/ui/navbar/Profile.svelte | 53 +++++----- src/lib/components/ui/sidebar/Sidebar.svelte | 5 +- src/lib/mono/forms/Label.svelte | 12 +-- src/lib/mono/forms/select/Select.svelte | 98 +++++++++---------- src/lib/mono/popover/Menu.svelte | 5 - src/lib/mono/popover/MenuButton.svelte | 8 +- src/lib/mono/popover/Popover.svelte | 13 +-- src/routes/inbox/+page.svelte | 50 +++++----- 13 files changed, 170 insertions(+), 187 deletions(-) diff --git a/src/lib/components/lemmy/dropdowns/Sort.svelte b/src/lib/components/lemmy/dropdowns/Sort.svelte index 459e31d4..f14830a3 100644 --- a/src/lib/components/lemmy/dropdowns/Sort.svelte +++ b/src/lib/components/lemmy/dropdowns/Sort.svelte @@ -88,53 +88,50 @@ {#if selected?.startsWith('Top')} -
- -
+ {/if} diff --git a/src/lib/components/lemmy/post/PostMeta.svelte b/src/lib/components/lemmy/post/PostMeta.svelte index 1f525206..d2ae4fe7 100644 --- a/src/lib/components/lemmy/post/PostMeta.svelte +++ b/src/lib/components/lemmy/post/PostMeta.svelte @@ -144,8 +144,9 @@ > {#if showCommunity && community} - {#snippet target()} + {#snippet target(attachment)} diff --git a/src/lib/components/ui/navbar/Navbar.svelte b/src/lib/components/ui/navbar/Navbar.svelte index 823ef408..7c05da4b 100644 --- a/src/lib/components/ui/navbar/Navbar.svelte +++ b/src/lib/components/ui/navbar/Navbar.svelte @@ -142,7 +142,7 @@ {:then { default: Profile }} - + {/await} {/if} {/snippet} diff --git a/src/lib/components/ui/navbar/Profile.svelte b/src/lib/components/ui/navbar/Profile.svelte index 58c6631d..5dfe484a 100644 --- a/src/lib/components/ui/navbar/Profile.svelte +++ b/src/lib/components/ui/navbar/Profile.svelte @@ -133,34 +133,31 @@ {/snippet} {$t('nav.menu.settings')} - - -
e.stopPropagation()}> - -
+ {#snippet prefix()} diff --git a/src/lib/components/ui/sidebar/Sidebar.svelte b/src/lib/components/ui/sidebar/Sidebar.svelte index e581e8d4..df99ff4e 100644 --- a/src/lib/components/ui/sidebar/Sidebar.svelte +++ b/src/lib/components/ui/sidebar/Sidebar.svelte @@ -11,8 +11,10 @@ import { ArrowLeftOnRectangle, Bookmark, + ChevronUpDown, Cog6Tooth, ComputerDesktop, + Icon, Identification, Inbox, Moon, @@ -92,7 +94,7 @@ : theme.colorScheme == 'light' ? Sun : Moon} - class=" w-full" + class="w-full relative" > + {/snippet} diff --git a/src/lib/mono/forms/Label.svelte b/src/lib/mono/forms/Label.svelte index a4a5fa29..84d943f1 100644 --- a/src/lib/mono/forms/Label.svelte +++ b/src/lib/mono/forms/Label.svelte @@ -1,5 +1,5 @@ - {#if text} {text} {:else if children} {@render children?.()} {/if} - + diff --git a/src/lib/mono/forms/select/Select.svelte b/src/lib/mono/forms/select/Select.svelte index 957c3fb6..726c6814 100644 --- a/src/lib/mono/forms/select/Select.svelte +++ b/src/lib/mono/forms/select/Select.svelte @@ -35,12 +35,14 @@ {#snippet selectTarget(attachment: Attachment)} - + {/snippet} -
- {#if customLabel || label} - - {/if} - -
- + + {#snippet target(attachment)} + {@const render = passedTarget ?? selectTarget} + {@render render?.(attachment)} + {/snippet} {#each context.options as option (option)} {#if customOption}{@render customOption({ option, @@ -179,11 +181,3 @@ {/if} {/each} - -
-
diff --git a/src/lib/mono/popover/Menu.svelte b/src/lib/mono/popover/Menu.svelte index 7412725d..66423306 100644 --- a/src/lib/mono/popover/Menu.svelte +++ b/src/lib/mono/popover/Menu.svelte @@ -14,7 +14,6 @@ interface Props { openOnHover?: boolean open?: boolean - manual?: boolean placement?: Placement middleware?: Middleware[] strategy?: Strategy @@ -26,11 +25,9 @@ let { openOnHover = false, open = $bindable(false), - manual = false, placement = 'bottom-start', middleware = [offset(6), shift({ padding: 6 }), flip()], strategy = 'absolute', - class: clazz = '', target, children, ...rest @@ -42,12 +39,10 @@ {placement} {middleware} {strategy} - {manual} {target} {...rest} bind:open popoverClass="rounded-xl w-full backdrop-blur-md max-w-72" - class={clazz} > {#snippet popover()}
@@ -48,6 +50,7 @@ {alignment} {href} {disabled} + data-autoclose={nest ? 'false' : 'true'} shadow="none" > {#snippet prefix()} @@ -67,5 +70,8 @@ {@render children?.()} {#snippet suffix()} {@render passedSuffix?.()} + {#if nest} + + {/if} {/snippet} diff --git a/src/lib/mono/popover/Popover.svelte b/src/lib/mono/popover/Popover.svelte index fbaf82af..1b758d2f 100644 --- a/src/lib/mono/popover/Popover.svelte +++ b/src/lib/mono/popover/Popover.svelte @@ -82,16 +82,13 @@ const clickHandler = (event: Event) => { if (!e) return - if (!e?.contains(event.target as Node | null)) { - if (!autoClose) { - // @ts-expect-error svelte hell - if (popoverEl && !popoverEl.contains(event.target)) { - open = false - } - } else { + const target = event.target as Element | null + + if (!e?.contains(event.target as Element | null)) { + if (target?.closest("[data-autoclose='false']") == null) { open = false + document.removeEventListener('click', clickHandler) } - document.removeEventListener('click', clickHandler) } } document.addEventListener('click', clickHandler) diff --git a/src/routes/inbox/+page.svelte b/src/routes/inbox/+page.svelte index e68aed0f..5aff9d22 100644 --- a/src/routes/inbox/+page.svelte +++ b/src/routes/inbox/+page.svelte @@ -73,31 +73,31 @@
-
- -
+ + +
{#if !data.inbox?.value || (data.inbox.value?.length ?? 0) == 0}