From 2891c684948a58721960148cab1ec18a33844d9b Mon Sep 17 00:00:00 2001 From: James Xylight Date: Thu, 28 Aug 2025 21:18:43 -0700 Subject: [PATCH 1/6] impr: switch menus to attachment based vs cursed div wrapper --- .../lemmy/comment/CommentActions.svelte | 3 +- .../lemmy/community/CommunityCard.svelte | 4 +- .../lemmy/community/CommunityForm.svelte | 4 +- .../lemmy/community/CommunityHeader.svelte | 4 +- .../moderation/CommentModerationMenu.svelte | 3 +- .../lemmy/moderation/ModerationMenu.svelte | 7 +- .../lemmy/post/actions/PostActions.svelte | 6 +- src/lib/components/ui/navbar/Navbar.svelte | 3 +- src/lib/components/ui/navbar/Profile.svelte | 6 +- .../ui/sidebar/ProfileSelection.svelte | 3 +- src/lib/components/ui/sidebar/Sidebar.svelte | 3 +- src/lib/mono/forms/select/Select.svelte | 3 +- src/lib/mono/popover/Menu.svelte | 6 +- src/lib/mono/popover/Popover.svelte | 110 ++++++++---------- src/lib/mono/search/Search.svelte | 3 +- src/routes/accounts/+page.svelte | 3 +- src/routes/admin/config/+page.svelte | 4 +- .../(local_user)/settings/+page.svelte | 4 +- src/routes/profile/+layout.svelte | 3 +- src/routes/u/[name]/+page.svelte | 4 +- 20 files changed, 93 insertions(+), 93 deletions(-) diff --git a/src/lib/components/lemmy/comment/CommentActions.svelte b/src/lib/components/lemmy/comment/CommentActions.svelte index 21d3e7cb..6eaaa318 100644 --- a/src/lib/components/lemmy/comment/CommentActions.svelte +++ b/src/lib/components/lemmy/comment/CommentActions.svelte @@ -66,8 +66,9 @@ {/if} - {#snippet target()} + {#snippet target(attachment)} {/if} - {#snippet target()} - From f105240559680b9dd562cced5a5d882bed934c33 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Fri, 29 Aug 2025 15:19:35 -0700 Subject: [PATCH 2/6] 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 }
{/if}
import { page } from '$app/state' + import { t } from '$lib/i18n/translations' import { Button, Material, toast } from 'mono-svelte' + import { focusTrap } from 'svelte-focus-trap' import { Icon, Share, XMark } from 'svelte-hero-icons' import { expoOut } from 'svelte/easing' import { fade, scale } from 'svelte/transition' - import { focusTrap } from 'svelte-focus-trap' - import { t } from '$lib/i18n/translations' interface Props { /** * The full-resolution image URL */ alt?: string - class?: string - children?: import('svelte').Snippet } - let { alt = '', class: clazz = '', children }: Props = $props() + let { alt = '' }: Props = $props() {#if page.state.openImage || '' != ''} @@ -88,7 +86,3 @@
{/if} - - 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} Date: Fri, 29 Aug 2025 17:04:06 -0700 Subject: [PATCH 4/6] design: improve instances page --- .vscode/settings.json | 3 +- src/routes/communities/+page.svelte | 78 ++++++++++++----------- src/routes/instances/+layout.svelte | 2 +- src/routes/instances/blocked/+page.svelte | 69 ++++++++++++++++++++ src/routes/instances/linked/+page.svelte | 69 ++++++++++++-------- 5 files changed, 156 insertions(+), 65 deletions(-) create mode 100644 src/routes/instances/blocked/+page.svelte diff --git a/.vscode/settings.json b/.vscode/settings.json index f2b25e04..93c3f4de 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,5 +2,6 @@ "i18n-ally.localesPaths": [ "src/lib/i18n", "src/routes/inbox/messages" - ] + ], + "i18n-ally.keystyle": "nested" } \ No newline at end of file diff --git a/src/routes/communities/+page.svelte b/src/routes/communities/+page.svelte index 9ea857b8..0292721c 100644 --- a/src/routes/communities/+page.svelte +++ b/src/routes/communities/+page.svelte @@ -4,12 +4,12 @@ import CommunityItem from '$lib/components/lemmy/community/CommunityItem.svelte' import Location from '$lib/components/lemmy/dropdowns/Location.svelte' import Sort from '$lib/components/lemmy/dropdowns/Sort.svelte' + import EndPlaceholder from '$lib/components/ui/EndPlaceholder.svelte' import Skeleton from '$lib/components/ui/generic/Skeleton.svelte' import CommonList from '$lib/components/ui/layout/CommonList.svelte' import Header from '$lib/components/ui/layout/pages/Header.svelte' import Pageination from '$lib/components/ui/Pageination.svelte' import Placeholder from '$lib/components/ui/Placeholder.svelte' - import SectionTitle from '$lib/components/ui/SectionTitle.svelte' import { t } from '$lib/i18n/translations.js' import { LINKED_INSTANCE_URL } from '$lib/instance.svelte' import { Material, Option } from 'mono-svelte' @@ -17,7 +17,6 @@ import { expoOut } from 'svelte/easing' import { fly } from 'svelte/transition' import SearchBar from '../search/SearchBar.svelte' - import EndPlaceholder from '$lib/components/ui/EndPlaceholder.svelte' let { data } = $props() @@ -44,43 +43,46 @@
{$t('routes.communities.title')} + + {#snippet extended()} +
+ + +
+ form?.requestSubmit()} + > + {#if !LINKED_INSTANCE_URL} + {@const instanceSet = new Set( + profile.meta.profiles.map(i => i.instance), + )} + {#if instanceSet.size > 1} + + {#each instanceSet as instance} + + {/each} + {/if} + {/if} + + form?.requestSubmit()} + /> +
+ + {/snippet}
-
- - -
- form?.requestSubmit()} - > - {#if !LINKED_INSTANCE_URL} - {@const instanceSet = new Set( - profile.meta.profiles.map(i => i.instance), - )} - {#if instanceSet.size > 1} - - {#each instanceSet as instance} - - {/each} - {/if} - {/if} - - form?.requestSubmit()} - /> -
- {#if navigating.to?.route.id == '/communities'} -
+
{#each new Array(5) as _, index} {_}
+ {$t('routes.search.top')}
0} - + {$t('routes.search.other')} {/if} diff --git a/src/routes/instances/+layout.svelte b/src/routes/instances/+layout.svelte index 8492808e..811bc76c 100644 --- a/src/routes/instances/+layout.svelte +++ b/src/routes/instances/+layout.svelte @@ -5,7 +5,6 @@ let { children } = $props() -
Instances
+
Instances
{@render children?.()} diff --git a/src/routes/instances/blocked/+page.svelte b/src/routes/instances/blocked/+page.svelte new file mode 100644 index 00000000..ebe18d6c --- /dev/null +++ b/src/routes/instances/blocked/+page.svelte @@ -0,0 +1,69 @@ + + +{#if data} +
+
triggerFilter(filter)}> + +
+ {#if data.blocked && data.blocked.length > 0} + {#if loading} + + {/if} + + {#snippet item(index)} + {#if data.blocked[index]} +
+
+ {data.blocked[index].domain} + + {data.blocked[index].software ?? 'Unknown'} • + +
+
+ {/if} + {/snippet} +
+ {:else} + + {/if} +
+{/if} diff --git a/src/routes/instances/linked/+page.svelte b/src/routes/instances/linked/+page.svelte index 9cec6fbe..3a10b938 100644 --- a/src/routes/instances/linked/+page.svelte +++ b/src/routes/instances/linked/+page.svelte @@ -3,27 +3,46 @@ import Placeholder from '$lib/components/ui/Placeholder.svelte' import RelativeDate from '$lib/components/util/RelativeDate.svelte' import { publishedToDate } from '$lib/components/util/date.js' - import { Material } from 'mono-svelte' + import { t } from '$lib/i18n/translations.js' + import { Spinner, TextInput } from 'mono-svelte' import { Check } from 'svelte-hero-icons' - let { data } = $props() + let { data: passedData } = $props() + let data = $state(passedData) + + let filter = $state('') + + let loading = $state(false) + + function triggerFilter(filter: string) { + if (!passedData.linked) return + loading = true + data.linked = passedData.linked.filter(i => i.domain.includes(filter)) + loading = false + } {#if data} -
- - {#if data.linked && data.linked.length > 0} - - {#snippet item(index)} +
+
triggerFilter(filter)}> + +
+ {#if data.linked && data.linked.length > 0} + {#if loading} + + {/if} + + {#snippet item(index)} + {#if data.linked[index]}
{data.linked[index].domain} @@ -36,15 +55,15 @@
- {/snippet} -
- {:else} - - {/if} - + {/if} + {/snippet} + + {:else} + + {/if}
{/if} From 59e99c04d824bdee8386731ae97d45251a3f8fd2 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Fri, 29 Aug 2025 17:05:23 -0700 Subject: [PATCH 5/6] fix: use new attachment system for post actions --- .../lemmy/post/actions/PostActionsMenu.svelte | 69 +++++++++---------- 1 file changed, 32 insertions(+), 37 deletions(-) diff --git a/src/lib/components/lemmy/post/actions/PostActionsMenu.svelte b/src/lib/components/lemmy/post/actions/PostActionsMenu.svelte index 60b003e3..428f87b3 100644 --- a/src/lib/components/lemmy/post/actions/PostActionsMenu.svelte +++ b/src/lib/components/lemmy/post/actions/PostActionsMenu.svelte @@ -82,45 +82,40 @@ {/snippet} {$t('post.actions.more.share')} - - {#if !post.post.local} -
e.stopPropagation()} - > - - {#snippet target()} - + + {#snippet target(attachment)} + + {/snippet} + share(true)}> + {#snippet prefix()} + {/snippet} - share(true)}> - {#snippet prefix()} - - {/snippet} - {$t('filter.location.global')} - - share(false)}> - {#snippet prefix()} - - {/snippet} - {$t('filter.location.local')} - - -
+ {$t('filter.location.global')} + + share(false)}> + {#snippet prefix()} + + {/snippet} + {$t('filter.location.local')} + +
{/if} {#if profile.current?.jwt} From 29c2e97efc66e31e85d57d4974ae78c24a5d9708 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Fri, 29 Aug 2025 19:23:08 -0700 Subject: [PATCH 6/6] perf: async load posts on main page --- src/lib/settings.svelte.ts | 5 +- src/routes/+layout.ts | 3 +- src/routes/+page.svelte | 97 +++++++++++++++++++++++--------------- src/routes/+page.ts | 34 +++++++------ 4 files changed, 81 insertions(+), 58 deletions(-) diff --git a/src/lib/settings.svelte.ts b/src/lib/settings.svelte.ts index d322e5eb..7764b80a 100644 --- a/src/lib/settings.svelte.ts +++ b/src/lib/settings.svelte.ts @@ -3,9 +3,6 @@ import { env } from '$env/dynamic/public' import { locale } from './i18n/translations' import { browser } from '$app/environment' -console.log('Using the following default settings from the environment:') -console.log(env) - export type View = 'cozy' | 'compact' export const SSR_ENABLED = env.PUBLIC_SSR_ENABLED?.toLowerCase() == 'true' @@ -230,7 +227,7 @@ function isObject(item: object) { * @param target * @param ...sources */ -// eslint-disable-next-line + function mergeDeep(target: any, ...sources: any[]) { if (!sources.length) return target const source = sources.shift() diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts index 91791067..ccb18c02 100644 --- a/src/routes/+layout.ts +++ b/src/routes/+layout.ts @@ -1,9 +1,8 @@ import { browser } from '$app/environment' -import { env } from '$env/dynamic/public' import { settings } from '$lib/settings.svelte' import { aliases, loadTranslations } from '$lib/i18n/translations.js' -export const ssr = (env.PUBLIC_SSR_ENABLED?.toLowerCase() ?? 'false') == 'true' +export const ssr = false export const load = async () => { if (browser) { diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index c12f29c1..55107f14 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -6,25 +6,27 @@ import PostFeed from '$lib/components/lemmy/post/feed/PostFeed.svelte' import VirtualFeed from '$lib/components/lemmy/post/feed/VirtualFeed.svelte' import EndPlaceholder from '$lib/components/ui/EndPlaceholder.svelte' - import LabelStat from '$lib/components/ui/LabelStat.svelte' + import Skeleton from '$lib/components/ui/generic/Skeleton.svelte' import Header from '$lib/components/ui/layout/pages/Header.svelte' - import Tabs from '$lib/components/ui/layout/pages/Tabs.svelte' import Pageination from '$lib/components/ui/Pageination.svelte' import { t } from '$lib/i18n/translations.js' import { site } from '$lib/lemmy.svelte.js' import { postFeeds } from '$lib/lemmy/postfeed.svelte.js' import { settings } from '$lib/settings.svelte.js' import Button from 'mono-svelte/button/Button.svelte' + import { onMount } from 'svelte' import { ArrowRight, ChartBar, Icon } from 'svelte-hero-icons' let { data = $bindable() } = $props() - let type = $state(data.feed.value.type_) - let sort = $state(data.feed.value.sort) - - $effect(() => { - if (type) settings.defaultSort.feed = type - if (sort) settings.defaultSort.sort = sort + onMount(async () => { + await data.feed.value + $effect(() => { + if (data.filters.value.type_) + settings.defaultSort.feed = data.filters.value.type_ + if (data.filters.value.sort) + settings.defaultSort.sort = data.filters.value.sort + }) }) const FeedComponent = $derived( @@ -44,10 +46,19 @@ {#snippet extended()}
- {#if type} - + {#if data.filters.value.type_} + {/if} - +