From 5defddb35c386dd5302cab672cf4a9a6eb1d1431 Mon Sep 17 00:00:00 2001
From: Yuri Karamian <yuri@arkhost.com>
Date: Mon, 8 Jun 2026 12:51:03 +0200
Subject: [PATCH] Add tag autocomplete: suggest existing tags while typing to
 avoid near-duplicates

---
 src/lib/components/NoteList.svelte        |  49 +++------
 src/lib/components/TagSuggestInput.svelte | 128 ++++++++++++++++++++++
 2 files changed, 144 insertions(+), 33 deletions(-)
 create mode 100644 src/lib/components/TagSuggestInput.svelte

diff --git a/src/lib/components/NoteList.svelte b/src/lib/components/NoteList.svelte
index b544f6e..bf179f8 100644
--- a/src/lib/components/NoteList.svelte
+++ b/src/lib/components/NoteList.svelte
@@ -39,6 +39,7 @@
 	import { revealItemInDir } from '@tauri-apps/plugin-opener';
 	import type { NoteEntry, TrashNotebookEntry, SortMode, TaskItem } from '$lib/types';
 	import TasksView from './TasksView.svelte';
+	import TagSuggestInput from './TagSuggestInput.svelte';
 
 	let { onNoteSelected = (_path: string, _content: string) => {}, onNoteMoved = () => {}, onBeforeNoteSwitch = () => {}, onNoteCreated = () => {}, onToggleTask = async (_t: TaskItem) => {}, onSetTaskPriority = async (_t: TaskItem, _p: string | null) => {}, onSetTaskDue = async (_t: TaskItem, _d: string | null) => {} }: {
 		onNoteSelected?: (path: string, content: string) => void;
@@ -131,7 +132,7 @@
 		if (isMobile) {
 			deriveTagsFromNotes();
 		} else {
-			await refreshTags();
+			try { $tags = await getAllTags(); } catch (_) {}
 		}
 	}
 
@@ -143,7 +144,6 @@
 	let editValue = $state('');
 	let movePickerNote = $state<NoteEntry | null>(null);
 	let tagEditNote = $state<NoteEntry | null>(null);
-	let tagEditValue = $state('');
 	let tagEditTags = $state<string[]>([]);
 
 	// Multi-select
@@ -532,7 +532,7 @@
 	function openTagEdit(note: NoteEntry) {
 		tagEditNote = note;
 		tagEditTags = [...note.meta.tags];
-		tagEditValue = '';
+		refreshTags();
 	}
 
 	async function addTagToNote(tag: string) {
@@ -540,7 +540,6 @@
 		const cleaned = tag.trim().toLowerCase();
 		if (tagEditTags.includes(cleaned)) return;
 		tagEditTags = [...tagEditTags, cleaned];
-		tagEditValue = '';
 		await saveTagsForNote(tagEditNote, tagEditTags);
 	}
 
@@ -569,7 +568,7 @@
 
 	function openBatchTagEdit() {
 		batchTagEdit = true;
-		tagEditValue = '';
+		refreshTags();
 		// Show tags common to ALL selected notes
 		const selectedNotes = $notes.filter(n => selectedPaths.has(n.path));
 		if (selectedNotes.length === 0) { tagEditTags = []; return; }
@@ -581,7 +580,6 @@
 	async function addTagToBatch(tag: string) {
 		if (!tag.trim()) return;
 		const cleaned = tag.trim().toLowerCase();
-		tagEditValue = '';
 		if (!tagEditTags.includes(cleaned)) tagEditTags = [...tagEditTags, cleaned];
 		try {
 			for (const path of selectedPaths) {
@@ -940,16 +938,11 @@
 				</div>
 				<div class="tag-edit-section">
 					<div class="tag-edit-input-row">
-						<input
-							type="text"
-							class="tag-edit-input"
+						<TagSuggestInput
+							existing={tagEditTags}
 							placeholder="Add tag to all..."
-							bind:value={tagEditValue}
-							onkeydown={(e) => {
-								if (e.key === 'Enter') { e.preventDefault(); addTagToBatch(tagEditValue); }
-								if (e.key === 'Escape') { e.preventDefault(); batchTagEdit = false; }
-							}}
-							autofocus
+							onsubmit={(t) => addTagToBatch(t)}
+							oncancel={() => batchTagEdit = false}
 						/>
 					</div>
 					{#if tagEditTags.length > 0}
@@ -1208,16 +1201,11 @@
 				<div class="context-sep"></div>
 				<div class="tag-edit-section">
 					<div class="tag-edit-input-row">
-						<input
-							type="text"
-							class="tag-edit-input"
+						<TagSuggestInput
+							existing={tagEditTags}
 							placeholder="Add tag to all..."
-							bind:value={tagEditValue}
-							onkeydown={(e) => {
-								if (e.key === 'Enter') { e.preventDefault(); addTagToBatch(tagEditValue); }
-								if (e.key === 'Escape') { e.preventDefault(); batchTagEdit = false; }
-							}}
-							autofocus
+							onsubmit={(t) => addTagToBatch(t)}
+							oncancel={() => batchTagEdit = false}
 						/>
 					</div>
 					{#if tagEditTags.length > 0}
@@ -1265,16 +1253,11 @@
 			<div class="context-sep"></div>
 			<div class="tag-edit-section">
 				<div class="tag-edit-input-row">
-					<input
-						type="text"
-						class="tag-edit-input"
+					<TagSuggestInput
+						existing={tagEditTags}
 						placeholder="Add tag..."
-						bind:value={tagEditValue}
-						onkeydown={(e) => {
-							if (e.key === 'Enter') { e.preventDefault(); addTagToNote(tagEditValue); }
-							if (e.key === 'Escape') { e.preventDefault(); tagEditNote = null; }
-						}}
-						autofocus
+						onsubmit={(t) => addTagToNote(t)}
+						oncancel={() => tagEditNote = null}
 					/>
 				</div>
 				{#if tagEditTags.length > 0}
diff --git a/src/lib/components/TagSuggestInput.svelte b/src/lib/components/TagSuggestInput.svelte
new file mode 100644
index 0000000..3467ee6
--- /dev/null
+++ b/src/lib/components/TagSuggestInput.svelte
@@ -0,0 +1,128 @@
+<script lang="ts">
+	import { onMount } from 'svelte';
+	import { tags } from '$lib/stores/app';
+
+	let { existing = [], placeholder = 'Add tag...', onsubmit, oncancel }: {
+		existing?: string[];
+		placeholder?: string;
+		onsubmit: (tag: string) => void;
+		oncancel: () => void;
+	} = $props();
+
+	let query = $state('');
+	let selIndex = $state(-1);
+	let inputEl = $state<HTMLInputElement>(null!);
+
+	// Existing tags that match what's typed, prefix matches first, already-applied ones excluded.
+	const suggestions = $derived.by(() => {
+		const q = query.trim().toLowerCase();
+		if (!q) return [];
+		const taken = new Set(existing);
+		const names = $tags
+			.map(([name]) => name)
+			.filter((name) => !taken.has(name) && name.toLowerCase().includes(q));
+		names.sort((a, b) => {
+			const ap = a.toLowerCase().startsWith(q) ? 0 : 1;
+			const bp = b.toLowerCase().startsWith(q) ? 0 : 1;
+			if (ap !== bp) return ap - bp;
+			return a.localeCompare(b);
+		});
+		return names.slice(0, 8);
+	});
+
+	function submit(tag: string) {
+		if (!tag.trim()) return;
+		onsubmit(tag);
+		query = '';
+		selIndex = -1;
+	}
+
+	function onKeydown(e: KeyboardEvent) {
+		if (e.key === 'ArrowDown') {
+			if (suggestions.length) { e.preventDefault(); selIndex = (selIndex + 1) % suggestions.length; }
+		} else if (e.key === 'ArrowUp') {
+			if (suggestions.length) { e.preventDefault(); selIndex = (selIndex - 1 + suggestions.length) % suggestions.length; }
+		} else if (e.key === 'Enter') {
+			e.preventDefault();
+			submit(selIndex >= 0 && selIndex < suggestions.length ? suggestions[selIndex] : query);
+		} else if (e.key === 'Tab') {
+			// Complete the input to the highlighted suggestion without committing.
+			if (selIndex >= 0 && selIndex < suggestions.length) { e.preventDefault(); query = suggestions[selIndex]; selIndex = -1; }
+		} else if (e.key === 'Escape') {
+			e.preventDefault();
+			if (selIndex >= 0) selIndex = -1; // first Escape just drops the highlight
+			else oncancel();
+		}
+	}
+
+	onMount(() => inputEl?.focus());
+</script>
+
+<div class="tag-suggest">
+	<input
+		bind:this={inputEl}
+		type="text"
+		class="tag-suggest-input"
+		{placeholder}
+		bind:value={query}
+		oninput={() => (selIndex = -1)}
+		onkeydown={onKeydown}
+	/>
+	{#if suggestions.length}
+		<div class="tag-suggest-list">
+			{#each suggestions as s, i}
+				<button
+					type="button"
+					class="tag-suggest-item"
+					class:selected={i === selIndex}
+					onmouseenter={() => (selIndex = i)}
+					onmousedown={(e) => { e.preventDefault(); submit(s); }}
+				>#{s}</button>
+			{/each}
+		</div>
+	{/if}
+</div>
+
+<style>
+	.tag-suggest {
+		display: flex;
+		flex-direction: column;
+	}
+	.tag-suggest-input {
+		width: 100%;
+		padding: 4px 8px;
+		border: 1px solid var(--border-color);
+		border-radius: 4px;
+		background: var(--bg-secondary);
+		color: var(--text-primary);
+		font-size: 12px;
+		outline: none;
+		font-family: inherit;
+	}
+	.tag-suggest-input:focus {
+		border-color: var(--accent);
+	}
+	.tag-suggest-list {
+		margin-top: 4px;
+		max-height: 180px;
+		overflow-y: auto;
+		display: flex;
+		flex-direction: column;
+		gap: 1px;
+	}
+	.tag-suggest-item {
+		text-align: left;
+		padding: 5px 8px;
+		border: none;
+		border-radius: 4px;
+		background: transparent;
+		color: var(--text-secondary);
+		font-size: 12px;
+		cursor: pointer;
+	}
+	.tag-suggest-item:hover,
+	.tag-suggest-item.selected {
+		background: var(--bg-hover);
+		color: var(--text-primary);
+	}
+</style>