From 39ca78e8374d98acc17690acb7843632aeaedcce Mon Sep 17 00:00:00 2001
From: Elijah Duffy <elijah@thatoneguy.ca>
Date: Tue, 8 Jul 2025 12:21:58 -0700
Subject: [PATCH] action select: patch weird focus issue, add value helper
 field

---
 src/lib/ActionSelect.svelte | 109 +++++++++++++++++++++++++-----------
 src/lib/Button.svelte       |   3 +
 src/routes/+page.svelte     |  16 +++---
 3 files changed, 88 insertions(+), 40 deletions(-)

diff --git a/src/lib/ActionSelect.svelte b/src/lib/ActionSelect.svelte
index d762563..3d0221f 100644
--- a/src/lib/ActionSelect.svelte
+++ b/src/lib/ActionSelect.svelte
@@ -1,9 +1,11 @@
 <script lang="ts" module>
 	export type ActionSelectOption = {
+		/** value is a convenience field, it has no internal use */
+		value?: string;
 		icon?:
 			| { component: Component; props: Record<string, any> }
 			| Snippet<[opt: ActionSelectOption]>;
-		title: string | Snippet<[opt: ActionSelectOption]>;
+		label: string | Snippet<[opt: ActionSelectOption]>;
 		disabled?: boolean;
 		onchoose?: (opt: ActionSelectOption) => void;
 	};
@@ -11,7 +13,7 @@
 
 <script lang="ts">
 	import { Select } from 'melt/builders';
-	import type { Component, Snippet } from 'svelte';
+	import { tick, type Component, type Snippet } from 'svelte';
 	import Label from './Label.svelte';
 	import Button from './Button.svelte';
 	import { CaretDown, Check } from 'phosphor-svelte';
@@ -23,6 +25,7 @@
 		value?: ActionSelectOption;
 		stateless?: boolean;
 		tabbable?: boolean;
+		sameWidth?: boolean;
 		options: ActionSelectOption[];
 		class?: ClassValue | null | undefined;
 		onchange?: (value: ActionSelectOption | undefined) => void;
@@ -34,20 +37,45 @@
 		value = $bindable(undefined),
 		stateless = false,
 		tabbable = true,
+		sameWidth = true,
 		options,
 		class: classValue,
 		onchange
 	}: Props = $props();
 
 	const select = new Select<ActionSelectOption>({
+		forceVisible: true,
 		value: () => value,
+		sameWidth: () => sameWidth,
 		onValueChange: (val) => {
 			if (val?.disabled) return;
 			val?.onchoose?.(val);
-			if (!stateless) {
-				value = val;
-				onchange?.(val);
-			}
+			onchange?.(val);
+			if (!stateless) value = val;
+		}
+	});
+
+	let buttonElement = $state<HTMLButtonElement | null>(null);
+	let allowFocus = false;
+
+	$effect(() => {
+		tick().then(() => {
+			setTimeout(() => {
+				allowFocus = true;
+			}, 100);
+		});
+	});
+
+	$effect(() => {
+		if (buttonElement) {
+			// Prevent focus during hydration
+			const originalFocus = buttonElement.focus.bind(buttonElement);
+			buttonElement.focus = (...args) => {
+				if (allowFocus) {
+					console.log('allowing focus');
+					return originalFocus(...args);
+				}
+			};
 		}
 	});
 </script>
@@ -58,15 +86,16 @@
 	{/if}
 
 	<Button
+		bind:ref={buttonElement}
 		class={['flex w-full items-center rounded-xl!']}
 		{...select.trigger}
-		tabindex={tabbable ? 0 : -1}
+		{...!tabbable && { tabindex: -1 }}
 	>
 		{#if stateless || !select.value}
 			{placeholder}
 		{:else}
-			{@render icon(select.value)}
-			{@render title(select.value)}
+			{@render optionIcon(select.value)}
+			{@render optionLabel(select.value)}
 		{/if}
 
 		<CaretDown
@@ -76,53 +105,69 @@
 		/>
 	</Button>
 
-	<div class={['border-sui-accent space-y-1 rounded-xl border p-2 shadow-md']} {...select.content}>
+	<div
+		{...select.content}
+		class={['border-sui-accent flex flex-col gap-1 rounded-xl border p-2 shadow-md']}
+	>
 		{#each options as option}
-			<button
+			<div
+				{...select.getOption(option, typeof option.label === 'string' ? option.label : undefined)}
 				class={[
 					'flex w-full items-center gap-3 rounded px-5 py-2 text-base font-medium transition-colors',
 					option.disabled
 						? ['cursor-not-allowed opacity-50']
 						: stateless
-							? [select.highlighted?.title === option.title && 'bg-sui-text-100', 'cursor-pointer']
+							? [select.highlighted?.label === option.label && 'bg-sui-text-100', 'cursor-pointer']
 							: [
-									select.highlighted?.title === option.title &&
+									select.highlighted?.label === option.label &&
 										'bg-sui-accent/80 text-sui-background',
-									select.value?.title === option.title && 'bg-sui-accent text-sui-background'
+									select.value?.label === option.label && 'bg-sui-accent text-sui-background'
 								]
 				]}
-				{...select.getOption(option, typeof option.title === 'string' ? option.title : undefined)}
 			>
-				{@render icon(option)}
-				{@render title(option)}
+				{@render optionIcon(option)}
+				{@render optionLabel(option)}
 
-				{#if !stateless}
-					<Check
-						size="1.1em"
-						weight="bold"
-						class={[
-							select.value?.title === option.title ? 'opacity-100' : 'opacity-0',
-							'ml-auto transition-opacity'
-						]}
-					/>
+				{#if !stateless && select.isSelected(option)}
+					<Check size="1.1em" weight="bold" class={['ml-auto']} />
 				{/if}
-			</button>
+			</div>
 		{/each}
 	</div>
 </div>
 
-{#snippet title(opt: ActionSelectOption)}
-	{#if typeof opt.title === 'string'}
-		{opt.title}
+{#snippet optionLabel(opt: ActionSelectOption)}
+	{#if typeof opt.label === 'string'}
+		{opt.label}
 	{:else}
-		{@render opt.title(opt)}
+		{@render opt.label(opt)}
 	{/if}
 {/snippet}
 
-{#snippet icon(opt: ActionSelectOption)}
+{#snippet optionIcon(opt: ActionSelectOption)}
 	{#if opt.icon && typeof opt.icon === 'object'}
 		<opt.icon.component {...opt.icon.props} />
 	{:else if opt.icon}
 		{@render opt.icon(opt)}
 	{/if}
 {/snippet}
+
+<style lang="postcss">
+	[data-melt-select-content] {
+		position: absolute;
+		pointer-events: none;
+		opacity: 0;
+
+		transform: scale(0.975);
+
+		transition: 0.2s;
+		transition-property: opacity, transform;
+		transform-origin: var(--melt-popover-content-transform-origin, center);
+	}
+
+	[data-melt-select-content][data-open] {
+		pointer-events: auto;
+		opacity: 1;
+		transform: scale(1);
+	}
+</style>
diff --git a/src/lib/Button.svelte b/src/lib/Button.svelte
index be35bd6..7f4c0dc 100644
--- a/src/lib/Button.svelte
+++ b/src/lib/Button.svelte
@@ -8,6 +8,7 @@
 		animate?: boolean;
 		loading?: boolean;
 		class?: ClassValue | null | undefined;
+		ref?: HTMLButtonElement | null;
 		children: Snippet;
 		onclick?: MouseEventHandler<HTMLButtonElement>;
 	}
@@ -17,6 +18,7 @@
 		animate = true,
 		loading,
 		class: classValue,
+		ref = $bindable<HTMLButtonElement | null>(null),
 		children,
 		onclick,
 		...others
@@ -70,6 +72,7 @@
 </script>
 
 <button
+	bind:this={ref}
 	class={[
 		'button group relative flex gap-3 overflow-hidden rounded-sm px-5',
 		'text-sui-background cursor-pointer py-3 font-medium transition-colors',
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 19a35a6..e3aab1b 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -59,21 +59,21 @@
 			stateless
 			label="Stateless Action"
 			options={[
-				{ title: 'Yeet' },
-				{ title: 'Yote' },
-				{ title: 'Yote and Yeet' },
-				{ title: 'Disabled Action', disabled: true }
+				{ label: 'Yeet' },
+				{ label: 'Yote' },
+				{ label: 'Yote and Yeet' },
+				{ label: 'Disabled Action', disabled: true }
 			]}
 		/>
 		<ActionSelect
 			class="basis-1/2"
 			label="Stateful Action"
-			value={{ title: 'Initial Action', onchoose: (value) => console.log('Chosen:', value) }}
+			value={{ label: 'Initial Action', onchoose: (value) => console.log('Chosen:', value) }}
 			options={[
-				{ title: 'Action 1', onchoose: (value) => console.log('Action 1 chosen:', value) },
-				{ title: 'Action 2', onchoose: (value) => console.log('Action 2 chosen:', value) },
+				{ label: 'Action 1', onchoose: (value) => console.log('Action 1 chosen:', value) },
+				{ label: 'Action 2', onchoose: (value) => console.log('Action 2 chosen:', value) },
 				{
-					title: 'Disabled Action',
+					label: 'Disabled Action',
 					disabled: true,
 					onchoose: (value) => console.log('Disabled action chosen:', value)
 				}