migrate: convert most components to svelte 5

This commit is contained in:
Xylight committed 2024-10-25 19:33:27 -07:00
1 parent d670f39f0a
commit 10ef4123da
225 files changed
+5441 -3341

No files matched your search

+41 -24
View File
@@ -1,4 +1,6 @@
<script lang="ts">
import { preventDefault } from 'svelte/legacy'
import {
ArrowUp,
Bookmark,
@@ -30,25 +32,38 @@
import { expoInOut, expoOut } from 'svelte/easing'
import FormattedNumber from '$lib/components/util/FormattedNumber.svelte'
export let node: CommentNodeI
export let postId: number
export let op: boolean = false
interface Props {
node: CommentNodeI
postId: number
op?: boolean
actions?: boolean
meta?: boolean
open?: boolean
replying?: boolean
contentClass?: string
class?: string
metaSuffix?: import('svelte').Snippet
children?: import('svelte').Snippet
}
export let actions: boolean = true
export let meta: boolean = true
let {
node = $bindable(),
postId,
op = false,
actions = true,
meta = true,
open = $bindable(true),
replying = $bindable(false),
contentClass = '',
class: clazz = '',
metaSuffix,
children,
}: Props = $props()
export let open = true
let editing = $state(false)
let newComment = $state(node.comment_view.comment.content)
export let replying = false
let editing = false
let newComment = node.comment_view.comment.content
let editingLoad = false
export let contentClass: string = ''
let clazz: string = ''
export { clazz as class }
let editingLoad = $state(false)
async function save() {
if (!$profile?.jwt || newComment.length <= 0) return
@@ -84,13 +99,15 @@
}
})
let highlight = ''
let highlight = $state('')
</script>
{#if editing}
<Modal bind:open={editing}>
<span slot="title">{$t('form.edit')}</span>
<form on:submit|preventDefault={save} class="contents">
{#snippet customTitle()}
<span>{$t('form.edit')}</span>
{/snippet}
<form onsubmit={preventDefault(save)} class="contents">
<CommentForm
postId={node.comment_view.comment.id}
bind:value={newComment}
@@ -120,11 +137,11 @@
>
{#if meta}
<button
on:click={() => (open = !open)}
onclick={() => (open = !open)}
class="flex flex-row cursor-pointer gap-2 items-center group text-[13px] flex-wrap w-full
z-0 group relative"
>
<slot name="meta-suffix" />
{@render metaSuffix?.()}
<div
class="absolute opacity-0 -z-10 inset-0 group-hover:block group-hover:opacity-100
bg-slate-100 dark:bg-zinc-900 group-hover:-inset-1 group-hover:-inset-x-2 rounded-full transition-all
@@ -154,14 +171,14 @@
avatar
user={node.comment_view.creator}
>
<svelte:fragment slot="badges">
{#snippet extraBadges()}
{#if node.comment_view.creator_is_moderator}
<ShieldIcon filled width={14} class="text-green-500" />
{/if}
{#if node.comment_view.creator_is_admin}
<ShieldIcon filled width={14} class="text-red-500" />
{/if}
</svelte:fragment>
{/snippet}
</UserLink>
{#if op}
<Icon mini size="16" src={Microphone} class="text-sky-600" />
@@ -254,7 +271,7 @@
</div>
{/if}
<div class="bg-transparent dark:bg-transparent">
<slot />
{@render children?.()}
</div>
</div>
{/if}
@@ -30,14 +30,22 @@
import { text } from '$lib/components/translate/translation'
import { userSettings } from '$lib/settings'
export let comment: CommentView
export let replying: boolean = false
export let disabled = false
interface Props {
comment: CommentView
replying?: boolean
disabled?: boolean
}
let {
comment = $bindable(),
replying = $bindable(false),
disabled = false,
}: Props = $props()
const dispatcher = createEventDispatcher<{ edit: CommentView }>()
let reply = ''
let translating = false
let translating = $state(false)
</script>
{#if translating}
@@ -69,22 +77,19 @@
<CommentModerationMenu bind:item={comment} />
{/if}
<Menu placement="bottom">
<Button
slot="target"
title={$t('comment.actions.label')}
color="tertiary"
rounding="pill"
size="square-sm"
class="text-slate-700 dark:text-zinc-300"
>
<Icon
src={EllipsisHorizontal}
width={16}
height={16}
mini
slot="prefix"
/>
</Button>
{#snippet target()}
<Button
title={$t('comment.actions.label')}
color="tertiary"
rounding="pill"
size="square-sm"
class="text-slate-700 dark:text-zinc-300"
>
{#snippet prefix()}
<Icon src={EllipsisHorizontal} width={16} height={16} mini />
{/snippet}
</Button>
{/snippet}
<MenuDivider>{$t('comment.actions.label')}</MenuDivider>
<MenuButton
on:click={() => {
@@ -104,7 +109,9 @@
translating = !translating
}}
>
<Icon src={Language} size="16" mini slot="prefix" />
{#snippet prefix()}
<Icon src={Language} size="16" mini />
{/snippet}
{$t('post.actions.more.translate')}
</MenuButton>
{/if}
@@ -134,7 +141,7 @@
comment.comment.deleted = await deleteItem(
comment,
!comment.comment.deleted,
$profile.jwt
$profile.jwt,
)
}}
>
@@ -154,5 +161,5 @@
{/if}
{/if}
</Menu>
<div class="flex-1 w-full" />
<div class="flex-1 w-full"></div>
</div>
@@ -12,26 +12,39 @@
import { errorMessage } from '$lib/lemmy/error'
import { Icon, XMark } from 'svelte-hero-icons'
export let postId: number
export let parentId: number | undefined = undefined
export let locked: boolean = false
export let banned: boolean = false
export let rows: number = 7
export let placeholder: string | undefined = undefined
const dispatch = createEventDispatcher<{
comment: CommentResponse
confirm: string
cancel: boolean
}>()
export let value = ''
export let actions = true
interface Props {
postId: number
parentId?: number | undefined
locked?: boolean
banned?: boolean
rows?: number
placeholder?: string | undefined
value?: string
actions?: boolean
preview?: boolean
[key: string]: any
}
let previewAction = true
export { previewAction as preview }
let {
postId,
parentId = undefined,
locked = false,
banned = false,
rows = 7,
placeholder = undefined,
value = $bindable(''),
actions = true,
preview: previewAction = true,
...rest
}: Props = $props()
let loading = false
let loading = $state(false)
let preview = false
async function submit() {
@@ -70,7 +83,7 @@
</div>
{:else}
<MarkdownEditor
{...$$restProps}
{...rest}
{rows}
placeholder={locked
? $t('comment.locked')
@@ -88,7 +101,7 @@
on:focus
previewButton={previewAction}
>
<div class="flex-1" />
<div class="flex-1"></div>
{#if actions}
<Button
size="custom"
@@ -9,13 +9,23 @@
import { Button, Material } from 'mono-svelte'
import { ArrowUturnUp, Icon } from 'svelte-hero-icons'
export let comment: CommentView
export let view = $userSettings.view
export let community = false
interface Props {
comment: CommentView
view?: any
community?: boolean
meta?: boolean
class?: string
[key: string]: any
}
export let meta: boolean = true
let clazz: string = ''
export { clazz as class }
let {
comment,
view = $userSettings.view,
community = false,
meta = true,
class: clazz = '',
...rest
}: Props = $props()
</script>
<Material
@@ -68,7 +78,7 @@
node={{ children: [], comment_view: comment, depth: 1, ui: {} }}
replying={false}
{meta}
{...$$restProps}
{...rest}
/>
</div>
</Material>
@@ -1,4 +1,6 @@
<script lang="ts">
import { run } from 'svelte/legacy'
import type { Post } from 'lemmy-js-client'
import type { CommentNodeI } from './comments'
import { createWindowVirtualizer } from '@tanstack/svelte-virtual'
@@ -6,31 +8,37 @@
import { browser } from '$app/environment'
import { onMount } from 'svelte'
export let nodes: CommentNodeI[]
export let post: Post
export let scrollTo: string | undefined
interface Props {
nodes: CommentNodeI[]
post: Post
scrollTo: string | undefined
}
let virtualListEl: HTMLElement | undefined = undefined
let { nodes, post, scrollTo }: Props = $props()
$: virtualizer = createWindowVirtualizer({
count: nodes.length,
estimateSize: () => 30,
scrollMargin: virtualListEl?.offsetTop,
initialRect: {
height: 1500,
width: 99999,
},
overscan: 5,
})
let virtualListEl: HTMLElement | undefined = $state(undefined)
let virtualItemEls: HTMLElement[] = []
let virtualizer = $derived(
createWindowVirtualizer({
count: nodes.length,
estimateSize: () => 30,
scrollMargin: virtualListEl?.offsetTop,
initialRect: {
height: 1500,
width: 99999,
},
overscan: 5,
}),
)
$: items = $virtualizer.getVirtualItems()
let virtualItemEls: HTMLElement[] = $state([])
$: {
let items = $derived($virtualizer.getVirtualItems())
run(() => {
if (virtualItemEls.length)
virtualItemEls.forEach((el) => $virtualizer.measureElement(el))
}
})
onMount(() => {
if (scrollTo) {
@@ -18,10 +18,19 @@
import { backOut } from 'svelte/easing'
import { t } from '$lib/translations'
export let vote: number = 0
export let upvotes: number
export let downvotes: number
export let commentId: number
interface Props {
vote?: number
upvotes: number
downvotes: number
commentId: number
}
let {
vote = $bindable(0),
upvotes = $bindable(),
downvotes = $bindable(),
commentId,
}: Props = $props()
const castVote = async (newVote: number) => {
if (!$profile?.jwt) {
@@ -42,7 +51,7 @@
class="h-full flex items-center overflow-hidden {buttonColor.ghost} rounded-full hover:bg-transparent"
>
<button
on:click={() => castVote(vote == 1 ? 0 : 1)}
onclick={() => castVote(vote == 1 ? 0 : 1)}
class="flex items-center gap-0.5 transition-colors px-1.5 h-full
{vote == 1
? shouldShowVoteColor(vote, 'upvotes')
@@ -65,7 +74,7 @@
class="border-l h-4 w-0 !p-0 border-slate-200 dark:border-zinc-800"
></div>
<button
on:click={() => castVote(vote == -1 ? 0 : -1)}
onclick={() => castVote(vote == -1 ? 0 : -1)}
class="flex flex-row-reverse items-center gap-0.5 h-full transition-colors border-0 px-1.5
{vote == -1
? shouldShowVoteColor(vote, 'downvotes')
@@ -1,4 +1,5 @@
<script lang="ts">
import Comments from './Comments.svelte'
import Comment from './Comment.svelte'
import { buildCommentsTree, type CommentNodeI } from './comments'
import { page } from '$app/stores'
@@ -22,11 +23,15 @@
import { t } from '$lib/translations'
import { browser } from '$app/environment'
export let nodes: CommentNodeI[]
export let isParent: boolean
export let post: Post
interface Props {
nodes: CommentNodeI[]
isParent: boolean
post: Post
}
let hydrated = false
let { nodes = $bindable(), isParent, post }: Props = $props()
let hydrated = $state(false)
onMount(() => {
hydrated = true
@@ -74,7 +79,7 @@
// 0.18.2 -> 0.18.3 broke this
// so i'm adding this check
const treeParent = tree.find(
(c) => c.comment_view.comment.id == parent.comment_view.comment.id
(c) => c.comment_view.comment.id == parent.comment_view.comment.id,
)
if (treeParent) {
@@ -113,10 +118,10 @@
? 'divide-y dark:divide-zinc-900 divide-slate-100'
: ' border-slate-200 dark:border-zinc-800 my-1'}
>
{#each nodes as node (node.comment_view.comment.id)}
{#each nodes as node, index (node.comment_view.comment.id)}
<Comment
postId={post.id}
bind:node
bind:node={nodes[index]}
bind:open={node.ui.open}
op={post.creator_id == node.comment_view.creator.id}
contentClass="pl-3 {node.children.length > 0 ||
@@ -125,7 +130,7 @@
: ''} ml-3 border-slate-200 dark:border-zinc-800"
>
{#if node.children?.length > 0}
<svelte:self {post} bind:nodes={node.children} isParent={false} />
<Comments {post} bind:nodes={nodes[index].children} isParent={false} />
{/if}
{#if node.comment_view.counts.child_count > 0 && node.children.length == 0}
<svelte:element
@@ -143,7 +148,7 @@
on:click={() => {
if (node.depth > 4) {
goto(
`/comment/${$page.params.instance}/${node.comment_view.comment.id}#comments`
`/comment/${$page.params.instance}/${node.comment_view.comment.id}#comments`,
)
} else {
node.loading = true
@@ -151,13 +156,14 @@
}
}}
>
<Icon
src={ArrowDownCircle}
micro
size="16"
slot="prefix"
class="text-primary-900 dark:text-primary-100"
/>
{#snippet prefix()}
<Icon
src={ArrowDownCircle}
micro
size="16"
class="text-primary-900 dark:text-primary-100"
/>
{/snippet}
{$t('comment.more', {
// @ts-ignore
comments: node.comment_view.counts.child_count,
+3 -3
View File
@@ -28,7 +28,7 @@ function getDepthFromComment(comment?: Comment): number | undefined {
export function buildCommentsTree(
comments: CommentView[],
baseDepth: number = 0,
filter: (c: CommentView) => boolean = (c) => true
filter: (c: CommentView) => boolean = (c) => true,
): CommentNodeI[] {
const start = performance.now()
const map = new Map<number, CommentNodeI>()
@@ -81,7 +81,7 @@ export function buildCommentsTree(
export function searchCommentTree(
tree: CommentNodeI[],
id: number
id: number,
): CommentNodeI | undefined {
for (const node of tree) {
if (node.comment_view.comment.id === id) {
@@ -102,7 +102,7 @@ export function searchCommentTree(
export function insertCommentIntoTree(
tree: CommentNodeI[],
cv: CommentView,
parentComment: boolean
parentComment: boolean,
) {
// Building a fake node to be used for later
const node: CommentNodeI = {