From f61a567cea68e52d07f29831830d37e295bc5c04 Mon Sep 17 00:00:00 2001
From: Frederic Cabassut <frederic.cabassut@arte.tv>
Date: Sun, 8 Mar 2026 21:56:25 +0100
Subject: [PATCH] feat: auto-save note when clicking image toggle on new note

Instead of disabling the image button for unsaved notes, clicking it
now auto-saves the note first (with title "Untitled" if empty), then
opens the upload panel. This removes friction from the upload flow.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/lib/components/NoteEditor.svelte | 66 ++++++++++++++++++++--------
 tests/e2e/attachments.spec.ts        | 13 ++++--
 2 files changed, 57 insertions(+), 22 deletions(-)

diff --git a/src/lib/components/NoteEditor.svelte b/src/lib/components/NoteEditor.svelte
index 0b3212a..bfc432f 100644
--- a/src/lib/components/NoteEditor.svelte
+++ b/src/lib/components/NoteEditor.svelte
@@ -38,13 +38,19 @@
 	let tiptapEditor: Editor | undefined = $state();
 	let editorTick = $state(0);
 
+	// Mutable note identity — allows transitioning from new → saved without closing
+	// svelte-ignore state_referenced_locally
+	let noteId = $state<string | null>(note?.id ?? null);
+	// svelte-ignore state_referenced_locally
+	let currentlyNew = $state(isNew);
+
 	// svelte-ignore state_referenced_locally
 	let attachmentsList = $state<Attachment[]>(note?.attachments ?? []);
 
 	// Fetch attachments for existing notes if not pre-populated (e.g. loaded from IDB)
 	$effect(() => {
-		if (note && !isNew && (!note.attachments || note.attachments.length === 0)) {
-			fetch(`/api/notes/${note.id}/attachments`)
+		if (noteId && !currentlyNew && (!note?.attachments || note.attachments.length === 0)) {
+			fetch(`/api/notes/${noteId}/attachments`)
 				.then((res) => res.ok ? res.json() : [])
 				.then((data: Attachment[]) => {
 					if (data.length > 0) attachmentsList = data;
@@ -58,9 +64,9 @@
 	}
 
 	async function handleAttachmentRemove(attachmentId: string) {
-		if (!note) return;
+		if (!noteId) return;
 		try {
-			await fetch(`/api/notes/${note.id}/attachments?attachmentId=${attachmentId}`, {
+			await fetch(`/api/notes/${noteId}/attachments?attachmentId=${attachmentId}`, {
 				method: 'DELETE'
 			});
 			attachmentsList = attachmentsList.filter((a) => a.id !== attachmentId);
@@ -75,23 +81,48 @@
 		bgStyle = `background-color: ${colors.bg}`;
 	});
 
-	async function save() {
+	async function saveAndClose() {
 		if (!title.trim() && !content.trim()) {
 			onClose();
 			return;
 		}
 
-		if (isNew) {
+		if (currentlyNew) {
 			await createNote({ title, content, color, checklistMode });
-		} else if (note) {
-			await updateNote(note.id, { title, content, color, checklistMode });
+		} else if (noteId) {
+			await updateNote(noteId, { title, content, color, checklistMode });
 		}
 		onClose();
 	}
 
+	/** Auto-save a new note without closing, returns the new note ID */
+	async function autoSave(): Promise<string | null> {
+		if (!currentlyNew) return noteId;
+		const created = await createNote({
+			title: title || 'Untitled',
+			content,
+			color,
+			checklistMode
+		});
+		if (created) {
+			noteId = created.id;
+			currentlyNew = false;
+			return created.id;
+		}
+		return null;
+	}
+
+	async function toggleImageUpload() {
+		if (currentlyNew) {
+			const id = await autoSave();
+			if (!id) return;
+		}
+		showImageUpload = !showImageUpload;
+	}
+
 	function handleKeydown(e: KeyboardEvent) {
 		if (e.key === 'Escape') {
-			save();
+			saveAndClose();
 		}
 	}
 
@@ -111,7 +142,7 @@
 <!-- svelte-ignore a11y_no_static_element_interactions -->
 <div
 	class="fixed inset-0 z-40 flex items-start justify-center overflow-y-auto bg-black/50 pt-20 pb-10 animate-[fade-in_150ms_ease-out]"
-	onclick={save}
+	onclick={saveAndClose}
 	onkeydown={handleKeydown}
 	data-testid="note-editor-overlay"
 >
@@ -159,21 +190,21 @@
 		</div>
 
 		<!-- Image attachments -->
-		{#if !isNew && note && showImageUpload}
+		{#if noteId && showImageUpload}
 			<div class="border-t border-[var(--border-subtle)] px-4 py-2">
 				<ImageUpload
-					noteId={note.id}
+					noteId={noteId}
 					attachments={attachmentsList}
 					onUpload={handleAttachmentUpload}
 					onRemove={handleAttachmentRemove}
 				/>
 			</div>
-		{:else if !isNew && attachmentsList.length > 0}
+		{:else if noteId && attachmentsList.length > 0}
 			<div class="border-t border-[var(--border-subtle)] px-4 py-2">
 				<div class="flex flex-wrap gap-2">
 					{#each attachmentsList as attachment}
 						<img
-							src="/api/notes/{note?.id}/attachments?attachmentId={attachment.id}"
+							src="/api/notes/{noteId}/attachments?attachmentId={attachment.id}"
 							alt={attachment.filename}
 							class="h-20 w-20 rounded-sm object-cover"
 						/>
@@ -223,10 +254,9 @@
 
 				<!-- Image attachment toggle -->
 				<button
-					onclick={() => (showImageUpload = !showImageUpload)}
-					class="rounded-sm p-2 hover:bg-[var(--border)]/10 disabled:opacity-30 disabled:cursor-not-allowed"
+					onclick={toggleImageUpload}
+					class="rounded-sm p-2 hover:bg-[var(--border)]/10"
 					title="Image attachments"
-					disabled={isNew}
 					data-testid="image-toggle"
 				>
 					<ImageIcon class="h-5 w-5 {showImageUpload ? 'text-[var(--primary)]' : ''}" />
@@ -249,7 +279,7 @@
 			</div>
 
 			<button
-				onclick={save}
+				onclick={saveAndClose}
 				class="rounded-sm px-4 py-1 text-sm font-medium text-[var(--text)] hover:bg-[var(--border)]/10"
 				data-testid="close-editor-btn"
 			>
diff --git a/tests/e2e/attachments.spec.ts b/tests/e2e/attachments.spec.ts
index 0c9d6da..a35f1fb 100644
--- a/tests/e2e/attachments.spec.ts
+++ b/tests/e2e/attachments.spec.ts
@@ -84,14 +84,19 @@ test.describe('Image Attachments', () => {
 		await expect(card.getByTestId('card-thumbnail')).not.toBeVisible();
 	});
 
-	test('Scenario: Image toggle is disabled for new unsaved notes', async ({ authenticatedPage: page }) => {
-		// When the user opens a new note editor
+	test('Scenario: Image toggle on new note auto-saves and opens upload panel', async ({ authenticatedPage: page }) => {
+		// When the user opens a new note and clicks the image toggle
 		await page.getByTestId('new-note-btn').click();
+		await page.getByTestId('note-title-input').fill('Auto-Save Test');
+		await page.getByTestId('image-toggle').click();
 
-		// Then the image toggle button is disabled
-		await expect(page.getByTestId('image-toggle')).toBeDisabled();
+		// Then the upload panel is visible (note was auto-saved)
+		await expect(page.getByTestId('image-upload')).toBeVisible();
 
 		// Cleanup
 		await page.getByTestId('close-editor-btn').click();
+
+		// And the note exists in the list
+		await expect(noteCard(page, 'Auto-Save Test')).toBeVisible();
 	});
 });