From 2b27e99784ffa0d662a1601a90a255a1602040d7 Mon Sep 17 00:00:00 2001 From: Xylight Date: Fri, 1 Nov 2024 10:24:40 -0700 Subject: [PATCH] fix: merge settings with default --- .../lemmy/moderation/RemoveModal.svelte | 8 +-- src/lib/components/ui/navbar/NavButton.svelte | 2 - src/lib/components/ui/navbar/Navbar.svelte | 2 +- src/lib/settings.svelte.ts | 61 +++++++++++++------ 4 files changed, 47 insertions(+), 26 deletions(-) diff --git a/src/lib/components/lemmy/moderation/RemoveModal.svelte b/src/lib/components/lemmy/moderation/RemoveModal.svelte index 32b46080..4daee0f1 100644 --- a/src/lib/components/lemmy/moderation/RemoveModal.svelte +++ b/src/lib/components/lemmy/moderation/RemoveModal.svelte @@ -58,8 +58,8 @@ }) } - let replyReason - run(() => { + let replyReason = $state('') + $effect(() => { replyReason = commentReason ? getReplyReason(reason, preset) : '' }) @@ -162,7 +162,6 @@ const resetText = () => { reason = '' - replyReason = '' commentReason = false } @@ -192,7 +191,6 @@ children: [], comment_view: item, depth: 1, - ui: {}, }} postId={item.post.id} actions={false} @@ -227,7 +225,7 @@ placeholder={replyReason} rows={3} > - {#snippet label()} + {#snippet customLabel()}
{$t('comment.reply')}