wip

package.json

@@ -52,7 +52,6 @@
     "html5-qrcode": "^2.3.8",
     "localforage": "1.10.0",
     "papaparse": "^5.5.2",
-    "svelecte": "3",
     "svelte": "3.58.0",
     "svelte-french-toast": "1.2.0",
     "svelte-i18n": "4.0.1",

pnpm-lock.yaml

@@ -38,9 +38,6 @@ importers:
       papaparse:
         specifier: ^5.5.2
         version: 5.5.2
-      svelecte:
-        specifier: '3'
-        version: 3.17.3
       svelte:
         specifier: 3.58.0
         version: 3.58.0
@@ -1986,9 +1983,6 @@ packages:
     resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
     engines: {node: '>= 0.4'}
 
-  svelecte@3.17.3:
-    resolution: {integrity: sha512-wnvoRxJIFFkm+CmXgjL4R3i/TcuYUIBkE+jDJSBD7AdSOzk1K6u3+nW4zwxaGT29zyZpiZkWeiy7lO62r5F+tg==}
-
   svelte-french-toast@1.2.0:
     resolution: {integrity: sha512-5PW+6RFX3xQPbR44CngYAP1Sd9oCq9P2FOox4FZffzJuZI2mHOB7q5gJBVnOiLF5y3moVGZ7u2bYt7+yPAgcEQ==}
     peerDependencies:
@@ -2010,9 +2004,6 @@ packages:
   svelte-select@3.17.0:
     resolution: {integrity: sha512-ITmX/XUiSdkaILmsTviKRkZPaXckM5/FA7Y8BhiUPoamaZG/ZDyOo6ydjFu9fDVFTbwoAUGUi6HBjs+ZdK2AwA==}
 
-  svelte-tiny-virtual-list@2.1.2:
-    resolution: {integrity: sha512-jeP/WMvgFUR4mYXHGPiCexjX5DuzSO+3xzHNhxfcsFyy+uYPtnqI5UGb383swpzQAyXB0OBqYfzpYihD/5gxnA==}
-
   svelte-writable-derived@3.1.1:
     resolution: {integrity: sha512-w4LR6/bYZEuCs7SGr+M54oipk/UQKtiMadyOhW0PTwAtJ/Ai12QS77sLngEcfBx2q4H8ZBQucc9ktSA5sUGZWw==}
     peerDependencies:
@@ -3955,10 +3946,6 @@ snapshots:
 
   supports-preserve-symlinks-flag@1.0.0: {}
 
-  svelecte@3.17.3:
-    dependencies:
-      svelte-tiny-virtual-list: 2.1.2
-
   svelte-french-toast@1.2.0(svelte@3.58.0):
     dependencies:
       svelte: 3.58.0
@@ -3981,8 +3968,6 @@ snapshots:
 
   svelte-select@3.17.0: {}
 
-  svelte-tiny-virtual-list@2.1.2: {}
-
   svelte-writable-derived@3.1.1(svelte@3.58.0):
     dependencies:
       svelte: 3.58.0

src/components/tools/DonationCreate.svelte

@@ -5,8 +5,9 @@
 		DonorService,
 		RunnerService,
 	} from "@odit/lfk-client-js";
-  import Select from "svelte-select";
 	import toast from "svelte-french-toast";
+	import VirtualSelect from "./VirtualSelect.svelte";
+	import { onMount } from "svelte";
 
 	let runners = [];
 	let donors = [];
@@ -19,7 +20,7 @@
 		postalcode: "",
 		country: "Germany",
 	};
-  let amount = 0;
+	let amount = null;
 	let address_checked = false;
 	let donor_create_new = false;
 	let last_created = null;
@@ -51,37 +52,40 @@
 	}
 	loadDonors();
 
-  const getRunnerLabel = (option) =>
+	const getRunnerLabel = (option) => {
-    option.firstname + " " + (option.middlename || "") + " " + option.lastname;
-
-  const filterRunners = (label, filterText, option) => {
-    if (filterText.startsWith("#")) {
-      return option.value.id == parseInt(filterText.replace("#", ""));
-    }
 		return (
-      label.toLowerCase().includes(filterText.toLowerCase()) ||
+			[option.firstname, option.middlename, option.lastname]
-      option.value.toString().startsWith(filterText.toLowerCase())
+				.join(" ")
+				.replace("  ", " ") +
+			" [#" +
+			option.id +
+			"]"
 		);
 	};
 
+	let selectRefRunner;
+	let selectRefDonor;
+
 	function resetAll() {
 		runnerinfo = { id: 0, firstname: "", lastname: "" };
 		donorinfo = { id: 0, firstname: "", lastname: "" };
-    amount = 0;
+		amount = null;
 		address_checked = false;
 		donor_create_new = false;
-    const clears = document.getElementsByClassName("clearSelect");
+		selectRefRunner?.reset();
-    for (let i = 0; i < clears.length; i++) {
+		selectRefDonor?.reset();
-      clears[i].click();
+		document.querySelector("#jjqzqicxujrnnh1x3447x18x").focus();
-    }
 	}
+	onMount(() => {
+		document.querySelector("#jjqzqicxujrnnh1x3447x18x").focus();
+	});
 </script>
 
 <div class="p-4">
 	<h3 class="text-3xl font-bold">{$_("fast_donation_create")}</h3>
 	<!--  -->
 	<div>
-    <div class="w-full max-w-md space-y-4 mb-6">
+		<div class="w-full space-y-4 mb-6">
 			{#if last_created}
 				<div class="mt-4 p-3 bg-green-50 border border-green-200 rounded-md">
 					<p class="text-black">
@@ -93,23 +97,32 @@
 				</div>
 			{/if}
 
-      <!-- Runner Selection -->
+			<!--  -->
-      <div>
 			<h4 class="text-xl font-semibold">{$_("runner")}</h4>
-        <Select
+			<VirtualSelect
-          containerClasses="rounded-md mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
+				inputElementID="jjqzqicxujrnnh1x3447x18x"
-          itemFilter={(label, filterText, option) =>
+				bind:this={selectRefRunner}
-            filterRunners(label, filterText, option)}
+				on:onClear={() => {
-          items={runners}
+					console.log("Cleared selection");
-          showChevron={true}
+				}}
-          placeholder={$_("search-for-runner-by-name-or-id")}
+				options={runners}
-          noOptionsMessage={$_("no-runners-found")}
+				filterFn={(item, searchTerm) => {
-          on:select={(selectedValue) => {
+					if (searchTerm.startsWith("#")) {
-            runnerinfo = selectedValue.detail.value;
+						const id = parseInt(searchTerm.replace("#", ""));
+						return item.value.id === id;
+					}
+					return item.label.toLowerCase().includes(searchTerm.toLowerCase());
+				}}
+				bind:selected={runnerinfo}
+				inputAriaLabel={$_("search-for-runner-by-name-or-id")}
+				inputPlaceholder={$_("search-for-runner-by-name-or-id")}
+				noOptionsText={$_("no-runners-found")}
+				on:onSelected={(data) => {
+					if (data.detail !== null) {
+						document.querySelector("#donation_amount_eur").focus();
+					}
 				}}
-          on:clear={() => (runnerinfo = { id: 0, firstname: "", lastname: "" })}
 			/>
-      </div>
 
 			<!-- Amount Input -->
 			<div>
@@ -121,11 +134,18 @@
 						class:focus:border-red-500={!amount > 0}
 						class:focus:ring-red-500={!amount > 0}
 						bind:value={amount}
+						on:keydown={(e) => {
+							if (e.key === "Enter") {
+								e.preventDefault();
+								document.querySelector("#button_existing_donor").focus();
+							}
+						}}
 						type="number"
 						step="0.01"
+						id="donation_amount_eur"
 						name="donation_amount_eur"
 						class="focus:ring-indigo-500 focus:border-indigo-500 flex-1 block w-full rounded-none rounded-l-md sm:text-sm border-neutral-300 border bg-neutral-50 text-neutral-800 p-2"
-            placeholder="2.00"
+						placeholder="z.B. 1,50"
 					/>
 					<span
 						class="inline-flex items-center px-3 rounded-r-md border border-neutral-300 bg-neutral-50 text-neutral-500 text-sm"
@@ -142,6 +162,18 @@
 				<div class="mb-2">
 					<div class="flex border rounded-md overflow-hidden shadow-sm">
 						<button
+							on:keydown={(e) => {
+								if (e.key === "ArrowRight") {
+									e.preventDefault();
+									document.querySelector("#button_new_donor").focus();
+									document.querySelector("#button_new_donor").click();
+								}
+								if (e.key === "Enter") {
+									e.preventDefault();
+									document.querySelector("#zt12c3udy3bme5bqobmqcif1").focus();
+								}
+							}}
+							id="button_existing_donor"
 							class:bg-indigo-600={!donor_create_new}
 							class:text-white={!donor_create_new}
 							class="py-2 px-4 w-1/2 transition-colors"
@@ -153,10 +185,25 @@
 							{$_("existing-donor")}
 						</button>
 						<button
+							on:keydown={(e) => {
+								if (e.key === "ArrowLeft") {
+									e.preventDefault();
+									document.querySelector("#button_existing_donor").focus();
+									document.querySelector("#button_existing_donor").click();
+								}
+								if (e.key === "Enter") {
+									e.preventDefault();
+									document.querySelector("#button_new_donor").click();
+								}
+							}}
+							id="button_new_donor"
 							class={`py-2 px-4 w-1/2 transition-colors ${donor_create_new ? "bg-indigo-600 text-white" : "bg-gray-100 text-gray-700"}`}
 							on:click={() => {
 								donor_create_new = true;
 								donorinfo = { id: 0, firstname: "", lastname: "" };
+								setTimeout(() => {
+									document.querySelector("#firstname").focus();
+								}, 50);
 							}}
 						>
 							{$_("new-donor")}
@@ -165,19 +212,31 @@
 				</div>
 
 				{#if !donor_create_new}
-          <Select
+					<VirtualSelect
-            containerClasses="rounded-md mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
+						inputElementID="zt12c3udy3bme5bqobmqcif1"
-            itemFilter={(label, filterText, option) =>
+						bind:this={selectRefDonor}
-              filterRunners(label, filterText, option)}
+						on:onClear={() => {
-            items={donors}
+							console.log("Cleared selection");
-            showChevron={true}
+						}}
-            placeholder={$_("search-for-donor")}
+						options={donors}
-            noOptionsMessage={$_("no-donors-found")}
+						filterFn={(item, searchTerm) => {
-            on:select={(selectedValue) => {
+							return item.label
-              donorinfo = selectedValue.detail.value;
+								.toLowerCase()
+								.includes(searchTerm.toLowerCase());
+						}}
+						bind:selected={donorinfo}
+						inputAriaLabel={$_("search-for-donor")}
+						inputPlaceholder={$_("search-for-donor")}
+						noOptionsText={$_("no-donors-found")}
+						on:onSelected={(data) => {
+							console.log(data.detail);
+							if (data.detail !== null) {
+								document.querySelector("#submit_button").focus();
+								setTimeout(() => {
+									document.querySelector("#submit_button").focus();
+								}, 100);
+							}
 						}}
-            on:clear={() =>
-              (donorinfo = { id: 0, firstname: "", lastname: "" })}
 					/>
 				{:else}
 					<div class="space-y-3">
@@ -192,6 +251,11 @@
 							<input
 								type="text"
 								id="firstname"
+								on:keydown={(e) => {
+									if (e.key === "Enter") {
+										document.querySelector("#lastname").focus();
+									}
+								}}
 								bind:value={donorinfo.firstname}
 								class="focus:ring-indigo-500 focus:border-indigo-500 flex-1 block w-full rounded-none rounded-l-md sm:text-sm border-neutral-300 border bg-neutral-50 text-neutral-800 p-2"
 								placeholder={$_("first-name")}
@@ -306,6 +370,7 @@
 			<!-- Submit Button -->
 			<div class="mt-6">
 				<button
+					id="submit_button"
 					type="button"
 					class="w-full inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-md text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 disabled:bg-gray-400 disabled:cursor-not-allowed"
 					disabled={!amount > 0 ||

src/components/tools/VirtualSelect.svelte

@@ -0,0 +1,357 @@
+<script>
+	import { createEventDispatcher, onMount, tick } from "svelte";
+
+	// Generate a default unique ID
+	function generateDefaultID() {
+		return "virtual-select-" + Math.random().toString(36).slice(2);
+	}
+
+	// Props
+	export let options = [];
+	export let selected = null;
+	export let inputPlaceholder = "Search options...";
+	export let noOptionsText = "No options found";
+	export let inputAriaLabel = "Search and select an option";
+	export let toggleAriaLabel = "Toggle dropdown";
+	export let clearAriaLabel = "Clear selection";
+	export let filterFn = null; // Custom filter function
+	export let autofocus = false; // Autofocus input
+	export let inputElementID = generateDefaultID(); // Input element ID
+
+	// Internal state
+	let searchTerm = "";
+	let filteredOptions = options;
+	let isOpen = false;
+	let container;
+	let visibleItems = [];
+	let startIndex = 0;
+	let itemHeight = 40; // Fixed height for each option (in pixels)
+	let visibleCount = 10; // Default number of items to render
+	let focusedIndex = -1; // Track the focused option index (-1 means no focus)
+	let inputElement; // Reference to input element
+
+	const dispatch = createEventDispatcher();
+
+	// Filter options based on search term
+	$: {
+		filteredOptions = searchTerm
+			? filterFn
+				? options.filter((option) => filterFn(option, searchTerm))
+				: options.filter((option) =>
+						option.label.toLowerCase().includes(searchTerm.toLowerCase())
+					)
+			: options;
+		// Reset scroll and focus when filtered options change
+		startIndex = 0;
+		focusedIndex = -1;
+		updateVisibleItems();
+	}
+
+	// Update visible items based on scroll position
+	function updateVisibleItems() {
+		if (!container) return;
+		const scrollTop = container.scrollTop;
+		startIndex = Math.floor(scrollTop / itemHeight);
+		const endIndex = Math.min(
+			startIndex + visibleCount,
+			filteredOptions.length
+		);
+		visibleItems = filteredOptions.slice(startIndex, endIndex);
+	}
+
+	// Handle scroll event
+	function handleScroll() {
+		updateVisibleItems();
+	}
+
+	// Calculate visible item count based on container height
+	async function updateVisibleCount() {
+		if (container) {
+			await tick(); // Wait for DOM to render
+			visibleCount = Math.ceil(container.clientHeight / itemHeight) + 2; // Buffer of 2 items
+			updateVisibleItems();
+		}
+	}
+
+	// Handle option selection
+	function selectOption(option) {
+		selected = option.value;
+		isOpen = false;
+		searchTerm = option.label; // Set searchTerm to the selected option's label
+		focusedIndex = -1;
+		dispatch("onSelected", option.value);
+	}
+
+	// Handle clear selection
+	function clearSelection() {
+		selected = null;
+		searchTerm = "";
+		focusedIndex = -1;
+		dispatch("onSelected", null);
+		dispatch("onClear");
+	}
+
+	// Reset component state
+	export function reset() {
+		selected = null;
+		searchTerm = "";
+		isOpen = false;
+		focusedIndex = -1;
+		startIndex = 0;
+		updateVisibleItems();
+		dispatch("onSelected", null);
+		dispatch("onClear");
+	}
+
+	// Toggle dropdown
+	async function toggleDropdown() {
+		isOpen = !isOpen;
+		if (isOpen) {
+			forceVisibleItems();
+		}
+	}
+
+	// Handle click outside to close dropdown
+	function handleClickOutside(event) {
+		if (!event.target.closest(".select-container")) {
+			isOpen = false;
+			focusedIndex = -1;
+		}
+	}
+
+	// Handle input focus to open dropdown
+	async function handleInputFocus() {
+		// forceVisibleItems();
+	}
+
+	// Handle input typing to open dropdown
+	async function handleInput() {
+		forceVisibleItems();
+	}
+
+	async function forceVisibleItems() {
+		isOpen = true;
+		await updateVisibleCount(); // Ensure items render on focus
+		// these 2 timeouts are a more or less tmp fix for rendering items when dropdown opens
+		setTimeout(async () => {
+			await updateVisibleCount(); // Ensure items render on focus
+		}, 25);
+		setTimeout(async () => {
+			await updateVisibleCount(); // Ensure items render on focus
+		}, 50);
+	}
+
+	// Handle keyboard navigation
+	function handleKeydown(event, index) {
+		if (!isOpen) return;
+
+		if (event.key === "ArrowDown") {
+			event.preventDefault();
+			if (focusedIndex < filteredOptions.length - 1) {
+				focusedIndex += 1;
+				scrollToFocusedItem();
+			}
+		} else if (event.key === "ArrowUp") {
+			event.preventDefault();
+			if (focusedIndex > 0) {
+				focusedIndex -= 1;
+				scrollToFocusedItem();
+			} else if (focusedIndex === -1 && filteredOptions.length > 0) {
+				focusedIndex = 0;
+				scrollToFocusedItem();
+			}
+		} else if (event.key === "Enter" && index >= 0) {
+			event.preventDefault();
+			selectOption(filteredOptions[index]);
+		} else if (event.key === "Escape") {
+			event.preventDefault();
+			isOpen = false;
+			focusedIndex = -1;
+		}
+	}
+
+	// Scroll to the focused item
+	function scrollToFocusedItem() {
+		if (!container || focusedIndex < 0) return;
+
+		const itemTop = focusedIndex * itemHeight;
+		const itemBottom = itemTop + itemHeight;
+		const containerTop = container.scrollTop;
+		const containerBottom = containerTop + container.clientHeight;
+
+		if (itemTop < containerTop) {
+			container.scrollTop = itemTop;
+		} else if (itemBottom > containerBottom) {
+			container.scrollTop = itemBottom - container.clientHeight;
+		}
+		updateVisibleItems();
+	}
+
+	// Initialize container size observer and autofocus fallback
+	onMount(async () => {
+		if (container) {
+			const resizeObserver = new ResizeObserver(updateVisibleCount);
+			resizeObserver.observe(container);
+			return () => resizeObserver.disconnect();
+		}
+		// Fallback autofocus with tick to ensure inputElement is bound
+		if (autofocus && inputElement) {
+			await tick();
+			inputElement.focus();
+		}
+	});
+
+	// Get display text for the input
+	function getDisplayText() {
+		if (!selected) return inputPlaceholder;
+		const selectedOption = options.find((option) => option.value === selected);
+		return selectedOption ? selectedOption.label : inputPlaceholder;
+	}
+</script>
+
+<svelte:window on:click={handleClickOutside} />
+
+<div class="select-container relative w-full">
+	<!-- Select element with inline search -->
+	<div
+		class="border rounded-md px-3 py-2 bg-white shadow-sm flex items-center gap-2"
+		role="combobox"
+		aria-expanded={isOpen}
+	>
+		<input
+			autocomplete="off"
+			type="text"
+			id={inputElementID}
+			bind:value={searchTerm}
+			bind:this={inputElement}
+			placeholder={getDisplayText()}
+			class="w-full bg-transparent focus:outline-none {selected
+				? 'text-black'
+				: 'text-gray-700'}"
+			{autofocus}
+			on:focus={handleInputFocus}
+			on:input={handleInput}
+			on:keydown={(e) => {
+				if (e.key === "Enter" && !isOpen) {
+					toggleDropdown();
+				} else {
+					handleKeydown(e, focusedIndex);
+				}
+			}}
+			aria-label={inputAriaLabel}
+		/>
+		{#if selected}
+			<button
+				type="button"
+				class="w-5 h-5 flex items-center justify-center text-gray-500 hover:text-gray-700"
+				on:click={clearSelection}
+				on:keydown={(e) => {
+					if (e.key === "Enter" || e.key === " ") {
+						e.preventDefault();
+						clearSelection();
+					} else if (e.key === "Escape") {
+						e.preventDefault();
+						isOpen = false;
+						focusedIndex = -1;
+					}
+				}}
+				role="button"
+				tabindex="0"
+				aria-label={clearAriaLabel}
+			>
+				<svg
+					class="w-4 h-4"
+					fill="none"
+					stroke="currentColor"
+					viewBox="0 0 24 24"
+				>
+					<path
+						stroke-linecap="round"
+						stroke-linejoin="round"
+						stroke-width="2"
+						d="M6 18L18 6M6 6l12 12"
+					/>
+				</svg>
+			</button>
+		{/if}
+		<svg
+			class="w-4 h-4 text-gray-500 transform {isOpen ? 'rotate-180' : ''}"
+			fill="none"
+			stroke="currentColor"
+			viewBox="0 0 24 24"
+			on:click={toggleDropdown}
+			role="button"
+			tabindex="0"
+			on:keydown={(e) => {
+				if (e.key === "Enter") toggleDropdown();
+				else if (e.key === "Escape") {
+					e.preventDefault();
+					isOpen = false;
+					focusedIndex = -1;
+				}
+			}}
+			aria-label={toggleAriaLabel}
+		>
+			<path
+				stroke-linecap="round"
+				stroke-linejoin="round"
+				stroke
+				Politeness="round"
+				stroke-width="2"
+				d="M19 9l-7 7-7-7"
+			/>
+		</svg>
+	</div>
+
+	<!-- Dropdown -->
+	{#if isOpen}
+		<div
+			class="absolute z-10 w-full mt-1 bg-white border rounded-md shadow-lg max-h-80 overflow-auto"
+			bind:this={container}
+			on:scroll={handleScroll}
+			role="listbox"
+		>
+			{#if filteredOptions.length > 0}
+				<!-- Virtualized list container -->
+				<div style="height: {filteredOptions.length * itemHeight}px;">
+					<div style="transform: translateY({startIndex * itemHeight}px);">
+						{#each visibleItems as item, i (item.label + "-" + (startIndex + i))}
+							<div
+								class="px-3 py-2 hover:bg-blue-100 cursor-pointer {selected ===
+								item.value
+									? 'bg-blue-50'
+									: ''} {focusedIndex === startIndex + i
+									? 'bg-blue-200 outline outline-2 outline-blue-500'
+									: ''}"
+								on:click={() => selectOption(item)}
+								on:keydown={(e) => handleKeydown(e, startIndex + i)}
+								role="option"
+								tabindex="0"
+								aria-selected={selected === item.value}
+							>
+								{item.label}
+							</div>
+						{/each}
+					</div>
+				</div>
+			{:else}
+				<div class="px-3 py-2 text-gray-500">{noOptionsText}</div>
+			{/if}
+		</div>
+	{/if}
+</div>
+
+<style>
+	/* Ensure Tailwind classes handle additional styling */
+	:global(.select-container input:focus) {
+		border-color: #3b82f6; /* Tailwind's blue-500 */
+	}
+	:global([role="option"]:focus) {
+		outline: 2px solid #3b82f6;
+		outline-offset: -2px;
+	}
+	:global([role="button"]:focus) {
+		outline: 2px solid #3b82f6;
+		outline-offset: -2px;
+	}
+</style>

src/locales/de.json

@@ -227,7 +227,7 @@
     "enabled_large": "Aktiviert",
     "english": "Englisch",
     "enter-payment": "Zahlung eingeben",
-    "error-creating-donation": "Fehler bei der Anlage",
+    "error-creating-donation": "Fehler beim Erstellen des Sponsorings",
     "error-during-import": "Fehler beim Importieren",
     "error-whyile-copying-to-clipboard": "Fehler beim Kopieren in die Zwischenablage",
     "error_on_login": "😢Fehler beim Login",

src/locales/en.json

@@ -227,6 +227,7 @@
     "enabled_large": "Enabled",
     "english": "English",
     "enter-payment": "Enter payment",
+    "error-creating-donation": "error creating the sponsoring",
     "error-during-import": "Error during import",
     "error-whyile-copying-to-clipboard": "Error while copying to clipboard",
     "error_on_login": "Error on login",