From 7fa3b60bd43371af708db936de3cf14790a53b94 Mon Sep 17 00:00:00 2001
From: James Xylight
Date: Sat, 23 Aug 2025 11:32:59 -0700
Subject: [PATCH] impr: rewrite image upload handling
---
.../ImageAttachForm.svelte} | 125 ++++++++----------
.../components/form/ImageInputModal.svelte | 69 ++++++++++
.../components/form/ImageInputUpload.svelte | 26 ++--
.../lemmy/post/form/PostForm.svelte | 8 +-
.../components/markdown/MarkdownEditor.svelte | 23 ++--
src/lib/i18n/en.json | 3 +-
src/lib/mono/modal/Modal.svelte | 8 +-
src/routes/admin/config/+page.svelte | 97 +++-----------
.../(local_user)/settings/+page.svelte | 50 +++----
src/routes/profile/+layout.svelte | 5 +-
src/routes/profile/+page.svelte | 72 +---------
11 files changed, 200 insertions(+), 286 deletions(-)
rename src/lib/components/{lemmy/modal/ImageUploadModal.svelte => form/ImageAttachForm.svelte} (55%)
create mode 100644 src/lib/components/form/ImageInputModal.svelte
diff --git a/src/lib/components/lemmy/modal/ImageUploadModal.svelte b/src/lib/components/form/ImageAttachForm.svelte
similarity index 55%
rename from src/lib/components/lemmy/modal/ImageUploadModal.svelte
rename to src/lib/components/form/ImageAttachForm.svelte
index acf2c09c..7547917b 100644
--- a/src/lib/components/lemmy/modal/ImageUploadModal.svelte
+++ b/src/lib/components/form/ImageAttachForm.svelte
@@ -1,17 +1,15 @@
-
- {#snippet customTitle()}
- Upload image
- {/snippet}
- {#if progress != 1}
-
- {/if}
-
+ >
+
+ {$t('form.post.selectFile')}
+
+ {/if}
+
+
+
+
diff --git a/src/lib/components/form/ImageInputModal.svelte b/src/lib/components/form/ImageInputModal.svelte
new file mode 100644
index 00000000..d93b1456
--- /dev/null
+++ b/src/lib/components/form/ImageInputModal.svelte
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
+ {#if customUrl}
+
+ {:else}
+ {
+ open = false
+ passedImageUrl = uploaded[0]
+ }}
+ />
+ {/if}
+
diff --git a/src/lib/components/form/ImageInputUpload.svelte b/src/lib/components/form/ImageInputUpload.svelte
index cf4d1b1e..1218d718 100644
--- a/src/lib/components/form/ImageInputUpload.svelte
+++ b/src/lib/components/form/ImageInputUpload.svelte
@@ -1,11 +1,18 @@
@@ -43,15 +50,6 @@
{$t('common.attach')}
{/if}
- {#if open}
- {
- open = false
- imageUrl = uploaded[0]
- }}
- />
- {/if}
+
diff --git a/src/lib/components/lemmy/post/form/PostForm.svelte b/src/lib/components/lemmy/post/form/PostForm.svelte
index ac22052f..a7949b7d 100644
--- a/src/lib/components/lemmy/post/form/PostForm.svelte
+++ b/src/lib/components/lemmy/post/form/PostForm.svelte
@@ -251,14 +251,10 @@
{#if uploadingImage}
- {#await import('$lib/components/lemmy/modal/ImageUploadModal.svelte') then { default: UploadModal }}
+ {#await import('$lib/components/form/ImageInputModal.svelte') then { default: UploadModal }}
{
- if (e) data.url = e[0]
- uploadingImage = false
- }}
+ bind:imageUrl={() => '', v => (data.url = v)}
/>
{/await}
{/if}
diff --git a/src/lib/components/markdown/MarkdownEditor.svelte b/src/lib/components/markdown/MarkdownEditor.svelte
index efe2e742..48372f73 100644
--- a/src/lib/components/markdown/MarkdownEditor.svelte
+++ b/src/lib/components/markdown/MarkdownEditor.svelte
@@ -2,7 +2,7 @@
import MultiSelect from '$lib/components/input/Switch.svelte'
import Markdown from '$lib/components/markdown/Markdown.svelte'
import { t } from '$lib/i18n/translations'
- import { Button, Label, TextArea } from 'mono-svelte'
+ import { Button, Label, Modal, TextArea } from 'mono-svelte'
import type { TextAreaProps } from 'mono-svelte/forms/TextArea.svelte'
import { tick } from 'svelte'
import {
@@ -17,8 +17,8 @@
Photo,
Strikethrough,
} from 'svelte-hero-icons'
- import ImageUploadModal from '../lemmy/modal/ImageUploadModal.svelte'
import type { ClassValue } from 'svelte/elements'
+ import ImageAttachForm from '../form/ImageAttachForm.svelte'
let textArea: HTMLTextAreaElement | undefined = $state()
@@ -122,15 +122,16 @@
{#if uploadingImage && images}
- {
- e.forEach(i => {
- wrapSelection(`\n\n`, '')
- })
- }}
- />
+
+ {
+ e.forEach(i => {
+ wrapSelection(`\n\n`, '')
+ })
+ }}
+ />
+
{/if}
diff --git a/src/lib/i18n/en.json b/src/lib/i18n/en.json
index d8b0e23c..341eea98 100644
--- a/src/lib/i18n/en.json
+++ b/src/lib/i18n/en.json
@@ -254,7 +254,8 @@
"warning": "This is permanent. Are you sure you want to do this?"
},
"overview": "Overview",
- "submissions": "Submissions"
+ "submissions": "Submissions",
+ "edit": "Edit"
},
"translators": "Translators",
"accounts": "Accounts",
diff --git a/src/lib/mono/modal/Modal.svelte b/src/lib/mono/modal/Modal.svelte
index da1cf420..2fbfda92 100644
--- a/src/lib/mono/modal/Modal.svelte
+++ b/src/lib/mono/modal/Modal.svelte
@@ -77,6 +77,8 @@
{#if open}
+
+
{#if dismissable}
diff --git a/src/routes/admin/config/+page.svelte b/src/routes/admin/config/+page.svelte
index c97f71b5..b785862a 100644
--- a/src/routes/admin/config/+page.svelte
+++ b/src/routes/admin/config/+page.svelte
@@ -1,6 +1,5 @@
-