diff --git a/src/lib/feature/post/actions/PostActions.svelte b/src/lib/feature/post/actions/PostActions.svelte index 6c233860..a60f4ec3 100644 --- a/src/lib/feature/post/actions/PostActions.svelte +++ b/src/lib/feature/post/actions/PostActions.svelte @@ -89,7 +89,10 @@ post = e onedit?.(e) }} - init={new PostFormState({ ...post.post })} + init={new PostFormState({ + type: post.post.poll ? 'poll' : post.post.event ? 'event' : 'normal', + ...post.post, + })} > {#snippet title()}{/snippet} diff --git a/src/lib/feature/post/form/PostForm.svelte b/src/lib/feature/post/form/PostForm.svelte index d7c31282..38420556 100644 --- a/src/lib/feature/post/form/PostForm.svelte +++ b/src/lib/feature/post/form/PostForm.svelte @@ -56,9 +56,8 @@ let { editPost, init, title, onsubmit }: Props = $props() - let form = $state(init ?? new PostFormState()) - let type = $derived<'normal' | 'poll' | 'event'>( - init?.poll ? 'poll' : init?.event ? 'event' : 'normal', + let form = $state( + init ?? new PostFormState({ type: 'normal' }), ) let extendedCommunity = $derived.by(() => { @@ -83,7 +82,7 @@ $t('form.post.types.poll'), $t('form.post.types.event'), ]} - bind:selected={type} + bind:selected={form.type} /> {/if} @@ -173,7 +172,7 @@ loading = true form - .submit(type, editPost) + .submit(editPost) .then(onsubmit) .catch((err) => pushError({ message: errorMessage(err as string), scope: 'post-form' }), @@ -242,7 +241,7 @@ previewButton /> - {#if type == 'normal' && form.url !== undefined} + {#if form.type == 'normal' && form.url !== undefined} {/if} - {#if type == 'poll' && form.poll} + {#if form.type == 'poll' && form.poll}
- {#each form.poll.choices as choice, index} + + {#each form.poll.choices as _, index}
  • - {/if} - {#if settings.debugInfo} - {form.poll?.end_poll} + {#if settings.debugInfo} + {form.poll?.end_poll} + {/if} {/if}
    @@ -354,7 +354,7 @@ orientation="horizontal" class="flex flex-row flex-wrap w-full" > - {#if type == 'normal'} + {#if form.type == 'normal'}