From 53cb0e4f208a450a2d479b725e5a2a0a57bda593 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Wed, 5 Feb 2025 19:29:54 -0800 Subject: [PATCH] migrate: switch to svelte 5 events system for everything --- .../lemmy/ObjectAutocomplete.svelte | 8 +- .../lemmy/community/CommunityForm.svelte | 8 +- .../lemmy/modal/ImageUploadModal.svelte | 17 ++- .../lemmy/post/feed/VirtualFeed.svelte | 7 - .../lemmy/post/form/PostForm.svelte | 8 +- .../lemmy/user/UserAutocomplete.svelte | 3 +- .../components/markdown/MarkdownEditor.svelte | 4 +- .../components/ui/list/EditableList.svelte | 23 --- .../ui/list/EditableListItem.svelte | 13 -- src/lib/mono/forms/TextInput.svelte | 29 ++-- src/lib/mono/modal/Modal.svelte | 12 +- src/lib/mono/modal/ModalContainer.svelte | 2 +- src/lib/mono/search/Search.svelte | 55 +++---- src/routes/accounts/+page.svelte | 1 - src/routes/admin/config/+page.svelte | 8 +- src/routes/admin/federation/+page.svelte | 9 +- src/routes/admin/taglines/+page.svelte | 44 +++--- src/routes/admin/team/+page.svelte | 44 +++--- .../c/[name]/settings/team/+page.svelte | 74 +++++----- src/routes/modlog/+page.svelte | 26 ++-- .../profile/(local_user)/blocks/+page.svelte | 135 +++++++++--------- .../(local_user)/password/delete/+page.svelte | 4 +- src/routes/profile/media/+page.svelte | 2 +- src/routes/profile/media/PictrsImage.svelte | 7 +- src/routes/search/+page.svelte | 4 +- src/routes/settings/+page.svelte | 2 +- src/routes/theme/+page.svelte | 2 +- 27 files changed, 248 insertions(+), 303 deletions(-) delete mode 100644 src/lib/components/ui/list/EditableList.svelte delete mode 100644 src/lib/components/ui/list/EditableListItem.svelte diff --git a/src/lib/components/lemmy/ObjectAutocomplete.svelte b/src/lib/components/lemmy/ObjectAutocomplete.svelte index 5c55ec46..487e455d 100644 --- a/src/lib/components/lemmy/ObjectAutocomplete.svelte +++ b/src/lib/components/lemmy/ObjectAutocomplete.svelte @@ -1,8 +1,9 @@ - - + { + e.preventDefault() + addModerator() + }} + class="mt-auto flex gap-2 w-full" +> + onselect={(e) => searchParam( page.url, 'instance', - e.detail?.domain.toString() ?? '', + e?.domain.toString() ?? '', 'page', 'community', 'user', @@ -115,13 +115,8 @@ label="Community" class="flex-1" q={page.url.searchParams.get('community') ? 'Selected' : ''} - on:select={(e) => - searchParam( - page.url, - 'community', - e.detail?.id.toString() ?? '', - 'page', - )} + onselect={(e) => + searchParam(page.url, 'community', e?.id.toString() ?? '', 'page')} /> - searchParam(page.url, 'user', e.detail?.id.toString() ?? '', 'page')} + onselect={(e) => + searchParam(page.url, 'user', e?.id.toString() ?? '', 'page')} /> {#if $profile?.user && isAdmin($profile?.user)} - searchParam( - page.url, - 'mod_id', - e.detail?.id.toString() ?? '', - 'page', - )} + onselect={(e) => + searchParam(page.url, 'mod_id', e?.id.toString() ?? '', 'page')} /> {/if} - - - {/each} - {/snippet} - + {#snippet prefix()} + + {/snippet} + + + + {/each} + {/if} {#if data.community_blocks?.length > 0}
{$t('content.communities')} - unblockCommunity(i.detail)}> - {#snippet children({ action })} - {#each data.community_blocks as block (block.community.id)} -
+ {#each data.community_blocks as block (block.community.id)} +
+ - -
- {/each} - {/snippet} - + {#snippet prefix()} + + {/snippet} + + +
+ {/each} +
{/if} {#if data.person_blocks?.length > 0}
{$t('content.users')} - unblockUser(i.detail)}> - {#snippet children({ action })} - {#each data.person_blocks as block (block.target.id)} -
+ {#each data.person_blocks as block (block.target.id)} +
+ - -
- {/each} - {/snippet} - + {#snippet prefix()} + + {/snippet} + + +
+ {/each} +
{/if} {:else} diff --git a/src/routes/profile/(local_user)/password/delete/+page.svelte b/src/routes/profile/(local_user)/password/delete/+page.svelte index 117dd817..a7f2ac55 100644 --- a/src/routes/profile/(local_user)/password/delete/+page.svelte +++ b/src/routes/profile/(local_user)/password/delete/+page.svelte @@ -99,9 +99,9 @@ deleteAccount(4)} + onaction={() => deleteAccount(4)} > - {#snippet title()} + {#snippet customTitle()} {$t('form.profile.deleteAccount.label')} {/snippet} { + ondelete={() => { data.images = data.images.toSpliced( data.images.findIndex( (i) => diff --git a/src/routes/profile/media/PictrsImage.svelte b/src/routes/profile/media/PictrsImage.svelte index fcc1ae05..aa3ced11 100644 --- a/src/routes/profile/media/PictrsImage.svelte +++ b/src/routes/profile/media/PictrsImage.svelte @@ -11,8 +11,6 @@ import { createEventDispatcher } from 'svelte' import { ArrowDown, ArrowDownTray, Icon, Trash } from 'svelte-hero-icons' - const dispatch = createEventDispatcher<{ delete: boolean }>() - let loading = $state(false) async function deleteImage(image: LocalImage) { @@ -25,7 +23,7 @@ filename: image.pictrs_alias, }) - dispatch('delete', res) + ondelete?.(res) } catch (e) { toast({ content: e as any, type: 'error' }) } @@ -34,9 +32,10 @@ interface Props { image: LocalImage + ondelete?: (res: boolean) => void } - let { image }: Props = $props() + let { image, ondelete }: Props = $props()
diff --git a/src/routes/search/+page.svelte b/src/routes/search/+page.svelte index 5c35ad57..39f49452 100644 --- a/src/routes/search/+page.svelte +++ b/src/routes/search/+page.svelte @@ -139,8 +139,8 @@ jwt={$profile?.jwt} listing_type={'All'} showWhenEmpty={true} - on:select={(c) => - searchParam(page.url, 'community', c.detail?.id || undefined, 'page')} + onselect={(c) => + searchParam(page.url, 'community', c?.id || undefined, 'page')} />
{/if} diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte index fd5ad079..9dec4f3a 100644 --- a/src/routes/settings/+page.svelte +++ b/src/routes/settings/+page.svelte @@ -91,7 +91,7 @@ {#if importing} { + onaction={() => { try { if (importText == '') { throw new Error('Import is empty') diff --git a/src/routes/theme/+page.svelte b/src/routes/theme/+page.svelte index 03434c64..0dcbf126 100644 --- a/src/routes/theme/+page.svelte +++ b/src/routes/theme/+page.svelte @@ -34,7 +34,7 @@ {#if importing} { + onaction={() => { try { if (importText == '') { throw new Error('Import is empty')