diff --git a/src/lib/components/lemmy/comment/Comment.svelte b/src/lib/components/lemmy/comment/Comment.svelte index ec21c8d0..0c075cab 100644 --- a/src/lib/components/lemmy/comment/Comment.svelte +++ b/src/lib/components/lemmy/comment/Comment.svelte @@ -237,7 +237,7 @@ (editing = true)} + onedit={() => (editing = true)} disabled={node.comment_view.banned_from_community || node.comment_view.post.locked} /> diff --git a/src/lib/components/lemmy/comment/CommentActions.svelte b/src/lib/components/lemmy/comment/CommentActions.svelte index 0f34a791..37578bcb 100644 --- a/src/lib/components/lemmy/comment/CommentActions.svelte +++ b/src/lib/components/lemmy/comment/CommentActions.svelte @@ -32,18 +32,15 @@ comment: CommentView replying?: boolean disabled?: boolean + onedit?: (comment: CommentView) => void } let { comment = $bindable(), replying = $bindable(false), disabled = false, + onedit, }: Props = $props() - - const dispatcher = createEventDispatcher<{ edit: CommentView }>() - - let reply = '' - let translating = $state(false)
{#if $profile?.jwt} {#if comment.creator.id == $profile.user?.local_user_view.person.id} - dispatcher('edit', comment)}> + onedit?.(comment)}> {$t('post.actions.more.edit')} diff --git a/src/lib/components/lemmy/comment/CommentListVirtualizer.svelte b/src/lib/components/lemmy/comment/CommentListVirtualizer.svelte index 165d611e..ec04a8e7 100644 --- a/src/lib/components/lemmy/comment/CommentListVirtualizer.svelte +++ b/src/lib/components/lemmy/comment/CommentListVirtualizer.svelte @@ -16,7 +16,7 @@ let { nodes, post, scrollTo }: Props = $props() - let virtualListEl: HTMLElement | undefined = $state(undefined) + let virtualListEl = $state() let virtualizer = $derived( createWindowVirtualizer({ diff --git a/src/lib/components/lemmy/comment/comments.svelte.ts b/src/lib/components/lemmy/comment/comments.svelte.ts index 3188551a..c529f166 100644 --- a/src/lib/components/lemmy/comment/comments.svelte.ts +++ b/src/lib/components/lemmy/comment/comments.svelte.ts @@ -27,7 +27,6 @@ export function buildCommentsTree( baseDepth: number = 0, filter: (c: CommentView) => boolean = (c) => true, ): CommentNodeI[] { - const start = performance.now() const map = new Map() let min_depth = Number.MAX_VALUE @@ -69,7 +68,6 @@ export function buildCommentsTree( } } - console.log(`Built tree in ${performance.now() - start}ms`) return tree } diff --git a/src/lib/components/lemmy/dropdowns/Location.svelte b/src/lib/components/lemmy/dropdowns/Location.svelte index 5042e120..46496b86 100644 --- a/src/lib/components/lemmy/dropdowns/Location.svelte +++ b/src/lib/components/lemmy/dropdowns/Location.svelte @@ -34,7 +34,7 @@ { + onchange={() => { sort = 'TopAll' if (navigate) searchParam($page.url, 'sort', selected, 'page', 'cursor') diff --git a/src/lib/components/lemmy/post/Post.svelte b/src/lib/components/lemmy/post/Post.svelte index 8b414eb8..8598bc98 100644 --- a/src/lib/components/lemmy/post/Post.svelte +++ b/src/lib/components/lemmy/post/Post.svelte @@ -62,6 +62,7 @@ style?: string class?: string badges?: import('svelte').Snippet + onhide?: (hide: boolean) => void } let { @@ -72,6 +73,7 @@ style = '', class: clazz = '', badges, + onhide, }: Props = $props() let tags = $derived(parseTags(post.post.name)) @@ -186,7 +188,7 @@ /> {/if} {#if actions} - + {:else if view == 'compact'}
diff --git a/src/lib/components/lemmy/post/PostActions.svelte b/src/lib/components/lemmy/post/PostActions.svelte index 8dd74f24..7087a977 100644 --- a/src/lib/components/lemmy/post/PostActions.svelte +++ b/src/lib/components/lemmy/post/PostActions.svelte @@ -66,13 +66,9 @@ formatRelativeDate, } from '$lib/components/util/RelativeDate.svelte' - const dispatcher = createEventDispatcher<{ edit: PostView; hide: boolean }>() - let editing = $state(false) let saving = $state(false) - let translating = $state(false) - let localShare = $state(false) interface Props { @@ -80,6 +76,8 @@ view?: View debug?: boolean style?: string + onedit?: (post: PostView) => void + onhide?: (hide: boolean) => void } let { @@ -87,6 +85,8 @@ view = 'cozy', debug = $bindable(false), style = '', + onedit, + onhide, }: Props = $props() let buttonHeight = $derived(view == 'compact' ? 'h-7' : 'h-8') let buttonSquare = $derived(view == 'compact' ? 'w-7 h-7' : 'w-8 h-8') @@ -105,10 +105,10 @@ { + onsubmit={(e) => { editing = false - post = e.detail - dispatcher('edit', e.detail) + post = e + onedit?.(e) }} > {#snippet formtitle()} @@ -431,9 +431,7 @@ $profile?.jwt, ) post.hidden = hidden - if (hidden) { - dispatcher('hide', hidden) - } + if (hidden) onhide?.(hidden) }} color="danger-subtle" > diff --git a/src/lib/components/lemmy/post/feed/VirtualFeed.svelte b/src/lib/components/lemmy/post/feed/VirtualFeed.svelte index 3ea2fced..7d6baa3a 100644 --- a/src/lib/components/lemmy/post/feed/VirtualFeed.svelte +++ b/src/lib/components/lemmy/post/feed/VirtualFeed.svelte @@ -38,7 +38,6 @@ } from '$lib/lemmy/postfeed' import { t } from '$lib/translations' import InfiniteScroll from 'svelte-infinite-scroll' - import type { Readable } from 'svelte/motion' import EndPlaceholder from '$lib/components/ui/EndPlaceholder.svelte' let virtualItemEls: HTMLElement[] = $state([]) @@ -252,7 +251,7 @@ : settings.view} {post} class="transition-all duration-250" - on:hide={() => { + onhide={() => { posts = posts.toSpliced(row.index, 1) }} > diff --git a/src/lib/components/lemmy/post/form/PostForm.svelte b/src/lib/components/lemmy/post/form/PostForm.svelte index b3327f95..5b63e18d 100644 --- a/src/lib/components/lemmy/post/form/PostForm.svelte +++ b/src/lib/components/lemmy/post/form/PostForm.svelte @@ -56,6 +56,7 @@ language_id?: number | string } formtitle?: import('svelte').Snippet + onsubmit?: (post: PostView) => void } let { @@ -75,10 +76,12 @@ language_id: undefined, }), formtitle, + onsubmit, }: Props = $props() + // weird select menu language handling // @ts-ignore - run(() => { + $effect(() => { if (data.language_id === '') data.language_id = undefined }) @@ -87,8 +90,6 @@ let communities: Community[] = $state([]) - const dispatcher = createEventDispatcher<{ submit: PostView }>() - onMount(async () => { if (editingPost) { data.url = editingPost.url ?? '' @@ -166,7 +167,7 @@ console.log(`Edited post ${post?.post_view.post.id}`) - dispatcher('submit', post.post_view) + onsubmit?.(post.post_view) } else { const post = await client().createPost({ community_id: data.community!.id, @@ -184,7 +185,7 @@ console.log(`Uploaded post ${post?.post_view.post.id}`) saveDraft = false - dispatcher('submit', post.post_view) + onsubmit?.(post.post_view) } } catch (err) { pushError({ message: errorMessage(err as any), scope: 'post-form' }) diff --git a/src/lib/components/ui/sidebar/Sidebar.svelte b/src/lib/components/ui/sidebar/Sidebar.svelte index c49baa98..cc7ceb61 100644 --- a/src/lib/components/ui/sidebar/Sidebar.svelte +++ b/src/lib/components/ui/sidebar/Sidebar.svelte @@ -19,9 +19,6 @@ import Expandable from '$lib/components/ui/Expandable.svelte' import EndPlaceholder from '../EndPlaceholder.svelte' import { t } from '$lib/translations' - import { iconOfLink } from '../navbar/link' - import { goto } from '$app/navigation' - import { page } from '$app/stores' interface Props { style?: string diff --git a/src/lib/lemmy/contentview.ts b/src/lib/lemmy/contentview.ts index 548c9050..15884488 100644 --- a/src/lib/lemmy/contentview.ts +++ b/src/lib/lemmy/contentview.ts @@ -144,7 +144,9 @@ export async function markAsRead( if (item.type == 'post') { getClient().markPostAsRead({ + // @ts-ignore post_id: item.id, + post_ids: [item.id], read: read, }) return read diff --git a/src/lib/mono/forms/select/Select.svelte b/src/lib/mono/forms/select/Select.svelte index 33c31de9..c7ae9a26 100644 --- a/src/lib/mono/forms/select/Select.svelte +++ b/src/lib/mono/forms/select/Select.svelte @@ -22,6 +22,7 @@ Icon, type IconSource, } from 'svelte-hero-icons' + import type { HTMLSelectAttributes } from 'svelte/elements' let open = $state(false) let element: HTMLSelectElement | undefined = $state() @@ -39,13 +40,7 @@ options: [], }) - const dispatcher = createEventDispatcher<{ - change: any - contextmenu: any - input: any - }>() - - interface Props { + interface Props extends Omit { value?: T | string | undefined placeholder?: string | undefined label?: string | undefined @@ -56,6 +51,8 @@ customLabel?: import('svelte').Snippet children?: import('svelte').Snippet customOption?: import('svelte').Snippet<[any]> + oncontextmenu?: () => void + onchange?: () => void } let { @@ -69,6 +66,8 @@ customLabel, children, customOption, + oncontextmenu, + onchange, ...rest }: Props = $props() @@ -117,10 +116,10 @@ selected: option.value == value, })}{:else} dispatcher('contextmenu')} + on:contextmenu={() => oncontextmenu?.()} onclick={() => { value = option.value - dispatcher('change') + onchange?.() }} size="custom" disabled={option.disabled} diff --git a/src/routes/create/post/+page.svelte b/src/routes/create/post/+page.svelte index 12637818..149b1dd6 100644 --- a/src/routes/create/post/+page.svelte +++ b/src/routes/create/post/+page.svelte @@ -48,7 +48,7 @@ url: undefined, }} passedCommunity={community} - on:submit={(e) => goto(`/post/${e.detail.post.id}`)} + onsubmit={(e) => goto(`/post/${e.post.id}`)} > {#snippet formtitle()}
diff --git a/src/routes/modlog/+page.svelte b/src/routes/modlog/+page.svelte index 302b7358..368afe9d 100644 --- a/src/routes/modlog/+page.svelte +++ b/src/routes/modlog/+page.svelte @@ -48,7 +48,7 @@
+ searchParam($page.url, 'type', type, 'page')} + onchange={() => searchParam($page.url, 'type', type, 'page')} > {#snippet customLabel()}
diff --git a/src/routes/u/[name]/+page.svelte b/src/routes/u/[name]/+page.svelte index 1147d476..dedd9bfd 100644 --- a/src/routes/u/[name]/+page.svelte +++ b/src/routes/u/[name]/+page.svelte @@ -296,7 +296,7 @@