From 02311a0e7b3ddd07ba5588feec113ff429c3d0f9 Mon Sep 17 00:00:00 2001
From: Elijah Duffy <elijah@thatoneguy.ca>
Date: Thu, 3 Jul 2025 14:45:23 -0700
Subject: [PATCH] finish custom class and improved options overhaul

---
 src/lib/Button.svelte          | 18 +++++------
 src/lib/CenterBox.svelte       | 10 ++++--
 src/lib/Checkbox.svelte        |  5 ++-
 src/lib/Combobox.svelte        | 17 +++++-----
 src/lib/Dateinput.svelte       |  7 ++--
 src/lib/FramelessButton.svelte | 23 ++++++++------
 src/lib/Label.svelte           | 19 +++++++----
 src/lib/Link.svelte            | 23 ++++++++------
 src/lib/RadioGroup.svelte      | 30 ++----------------
 src/lib/TextInput.svelte       |  5 ++-
 src/lib/TimezoneInput.svelte   | 29 ++++++++++-------
 src/lib/ToggleGroup.svelte     | 58 +++++++++++++++++++---------------
 src/lib/ToggleSelect.svelte    | 25 ++++++++-------
 src/lib/index.ts               |  2 +-
 src/lib/util.ts                | 28 ++++++++++++++++
 src/routes/+page.svelte        |  2 +-
 16 files changed, 170 insertions(+), 131 deletions(-)

diff --git a/src/lib/Button.svelte b/src/lib/Button.svelte
index a9f9f27..07696e3 100644
--- a/src/lib/Button.svelte
+++ b/src/lib/Button.svelte
@@ -1,21 +1,18 @@
 <script lang="ts">
 	import type { Snippet } from 'svelte';
-	import type { MouseEventHandler } from 'svelte/elements';
+	import type { ClassValue, MouseEventHandler } from 'svelte/elements';
 	import Spinner from './Spinner.svelte';
 
-	let {
-		icon,
-		animate = true,
-		loading,
-		children,
-		onclick
-	}: {
+	interface Props {
 		icon?: string;
 		animate?: boolean;
 		loading?: boolean;
+		class?: ClassValue | null | undefined;
 		children: Snippet;
 		onclick?: MouseEventHandler<HTMLButtonElement>;
-	} = $props();
+	}
+
+	let { icon, animate = true, loading, class: classValue, children, onclick }: Props = $props();
 
 	let iconElement = $state<HTMLSpanElement | null>(null);
 
@@ -68,7 +65,8 @@
 	class={[
 		'button group relative flex gap-3 overflow-hidden rounded-sm px-5',
 		'text-background cursor-pointer py-3 font-medium transition-colors',
-		!loading ? ' bg-primary hover:bg-secondary' : 'bg-primary/50 cursor-not-allowed '
+		!loading ? ' bg-primary hover:bg-secondary' : 'bg-primary/50 cursor-not-allowed ',
+		classValue
 	]}
 	onclick={handleButtonClick}
 >
diff --git a/src/lib/CenterBox.svelte b/src/lib/CenterBox.svelte
index a55975f..24b99ec 100644
--- a/src/lib/CenterBox.svelte
+++ b/src/lib/CenterBox.svelte
@@ -1,10 +1,16 @@
 <script lang="ts">
 	import type { Snippet } from 'svelte';
+	import type { ClassValue } from 'svelte/elements';
 
-	let { children }: { children: Snippet } = $props();
+	interface Props {
+		class?: ClassValue | null | undefined;
+		children: Snippet;
+	}
+
+	let { class: classValue, children }: Props = $props();
 </script>
 
-<div class="min-h-screen items-center justify-center sm:flex">
+<div class={['min-h-screen items-center justify-center sm:flex', classValue]}>
 	<main class="m-4 max-w-(--breakpoint-sm) sm:mb-[5%] sm:w-full lg:max-w-[950px]">
 		{@render children()}
 	</main>
diff --git a/src/lib/Checkbox.svelte b/src/lib/Checkbox.svelte
index 89a13b3..c9d03aa 100644
--- a/src/lib/Checkbox.svelte
+++ b/src/lib/Checkbox.svelte
@@ -6,12 +6,14 @@
 	import type { Snippet } from 'svelte';
 	import { validate } from '@svelte-toolkit/validate';
 	import { generateIdentifier } from './util.js';
+	import type { ClassValue } from 'svelte/elements';
 
 	interface Props {
 		name?: string;
 		required?: boolean;
 		value?: CheckboxState;
 		color?: 'default' | 'contrast';
+		class?: ClassValue | null | undefined;
 		children?: Snippet;
 		onchange: (value: CheckboxState) => void;
 	}
@@ -21,6 +23,7 @@
 		required = false,
 		value = $bindable(false),
 		color = 'contrast',
+		class: classValue,
 		children,
 		onchange
 	}: Props = $props();
@@ -30,7 +33,7 @@
 	let valid = $state(true);
 </script>
 
-<div class="flex items-center">
+<div class={['flex items-center', classValue]}>
 	<input
 		type="hidden"
 		{name}
diff --git a/src/lib/Combobox.svelte b/src/lib/Combobox.svelte
index 63607fb..ae7e983 100644
--- a/src/lib/Combobox.svelte
+++ b/src/lib/Combobox.svelte
@@ -29,6 +29,7 @@
 	import { browser } from '$app/environment';
 	import { scale } from 'svelte/transition';
 	import { generateIdentifier } from './util.js';
+	import type { ClassValue } from 'svelte/elements';
 
 	interface Props {
 		name?: string;
@@ -42,6 +43,7 @@
 		label?: string;
 		placeholder?: string;
 		notFoundMessage?: string;
+		class?: ClassValue | null | undefined;
 		onvalidate?: (e: InputValidatorEvent) => void;
 		onchange?: (e: ComboboxChangeEvent) => void;
 	}
@@ -54,10 +56,11 @@
 		matchWidth = false,
 		options,
 		required = false,
-		invalidMessage,
+		invalidMessage = 'Please select an option',
 		label,
 		placeholder,
 		notFoundMessage = 'No results found',
+		class: classValue,
 		onvalidate,
 		onchange
 	}: Props = $props();
@@ -324,7 +327,7 @@
 	{/if}
 </Portal>
 
-<div>
+<div class={classValue}>
 	<!-- Combobox Label -->
 	{#if label}
 		<Label for={id}>{label}</Label>
@@ -335,7 +338,7 @@
 		{name}
 		{id}
 		value={value?.value ?? ''}
-		class="hidden"
+		type="hidden"
 		use:validate={validateOpts}
 		onvalidate={(e) => {
 			valid = e.detail.valid;
@@ -349,11 +352,9 @@
 	</div>
 
 	<!-- Error message if invalid -->
-	{#if invalidMessage}
-		<div class={['opacity-0 transition-opacity', !valid && 'opacity-100']}>
-			<Label for={id} error>{invalidMessage}</Label>
-		</div>
-	{/if}
+	<div class={['opacity-0 transition-opacity', !valid && 'opacity-100']}>
+		<Label for={id} error>{invalidMessage}</Label>
+	</div>
 </div>
 
 {#snippet searchInputBox(caret: boolean = true)}
diff --git a/src/lib/Dateinput.svelte b/src/lib/Dateinput.svelte
index 81a22c1..69a2838 100644
--- a/src/lib/Dateinput.svelte
+++ b/src/lib/Dateinput.svelte
@@ -35,7 +35,7 @@
 		label,
 		required = false,
 		invalidMessage = 'Valid date is required',
-		class: classList,
+		class: classValue,
 		format = ['year', 'month', 'day']
 	}: Props = $props();
 
@@ -200,7 +200,7 @@
 	};
 </script>
 
-<div>
+<div class={classValue}>
 	<!-- Date input Label -->
 	{#if label}
 		<Label for={id}>{label}</Label>
@@ -213,8 +213,7 @@
 			'border-accent rounded-sm border bg-white px-[1.125rem] py-3.5 font-normal transition-colors',
 			'text-text dark:border-accent/50 dark:bg-text-800 dark:text-background dark:sm:bg-slate-800',
 			'ring-accent focus-within:ring-1',
-			!valid && 'border-red-500!',
-			classList
+			!valid && 'border-red-500!'
 		]}
 	>
 		<input
diff --git a/src/lib/FramelessButton.svelte b/src/lib/FramelessButton.svelte
index dd62e83..f46cd4d 100644
--- a/src/lib/FramelessButton.svelte
+++ b/src/lib/FramelessButton.svelte
@@ -1,20 +1,24 @@
 <script lang="ts">
 	import type { Snippet } from 'svelte';
-	import type { MouseEventHandler } from 'svelte/elements';
+	import type { ClassValue, MouseEventHandler } from 'svelte/elements';
+
+	interface Props {
+		icon?: string;
+		iconPosition?: 'left' | 'right';
+		disabled?: boolean;
+		class?: ClassValue | null | undefined;
+		children: Snippet;
+		onclick?: MouseEventHandler<HTMLButtonElement>;
+	}
 
 	let {
 		icon,
 		iconPosition = 'right',
 		disabled = false,
+		class: classValue,
 		children,
 		onclick
-	}: {
-		icon?: string;
-		iconPosition?: 'left' | 'right';
-		disabled?: boolean;
-		children: Snippet;
-		onclick?: MouseEventHandler<HTMLButtonElement>;
-	} = $props();
+	}: Props = $props();
 </script>
 
 {#snippet iconSnippet()}
@@ -24,7 +28,8 @@
 <button
 	class={[
 		'text-accent hover:text-primary inline-flex cursor-pointer items-center gap-1.5 transition-colors',
-		disabled && 'pointer-events-none cursor-not-allowed opacity-50'
+		disabled && 'pointer-events-none cursor-not-allowed opacity-50',
+		classValue
 	]}
 	{onclick}
 >
diff --git a/src/lib/Label.svelte b/src/lib/Label.svelte
index 9ebca9c..c0e7bf9 100644
--- a/src/lib/Label.svelte
+++ b/src/lib/Label.svelte
@@ -1,12 +1,16 @@
 <script lang="ts">
 	import type { Snippet } from 'svelte';
+	import type { ClassValue } from 'svelte/elements';
 
-	let {
-		for: target,
-		error,
-		bigError,
-		children
-	}: { for: string; error?: boolean; bigError?: boolean; children: Snippet } = $props();
+	interface Props {
+		for: string;
+		error?: boolean;
+		bigError?: boolean;
+		class?: ClassValue | null | undefined;
+		children: Snippet;
+	}
+
+	let { for: target, error, bigError, class: classValue, children }: Props = $props();
 </script>
 
 <label
@@ -16,7 +20,8 @@
 		error && !bigError
 			? 'mt-1 text-sm font-normal text-red-500'
 			: 'text-text dark:text-background mb-2 text-base font-medium',
-		bigError && 'text-red-500!'
+		bigError && 'text-red-500!',
+		classValue
 	]}
 >
 	{@render children()}
diff --git a/src/lib/Link.svelte b/src/lib/Link.svelte
index ce9c385..8101013 100644
--- a/src/lib/Link.svelte
+++ b/src/lib/Link.svelte
@@ -21,21 +21,25 @@
 
 <script lang="ts">
 	import type { Snippet } from 'svelte';
-	import type { MouseEventHandler } from 'svelte/elements';
+	import type { ClassValue, MouseEventHandler } from 'svelte/elements';
+
+	interface Props {
+		href: string;
+		disabled?: boolean;
+		tab?: 'current' | 'new';
+		class?: ClassValue | null | undefined;
+		children: Snippet;
+		onclick?: MouseEventHandler<HTMLAnchorElement>;
+	}
 
 	let {
 		href,
 		disabled = false,
 		tab = 'current',
+		class: classValue,
 		children,
 		onclick
-	}: {
-		href: string;
-		disabled?: boolean;
-		tab?: 'current' | 'new';
-		children: Snippet;
-		onclick?: MouseEventHandler<HTMLAnchorElement>;
-	} = $props();
+	}: Props = $props();
 
 	if (PUBLIC_BASEPATH && !href.startsWith('http://') && !href.startsWith('https://')) {
 		let prefix = trim(PUBLIC_BASEPATH, '/');
@@ -46,7 +50,8 @@
 <a
 	class={[
 		'text-accent hover:text-primary inline-flex items-center gap-1.5 transition-colors',
-		disabled && 'pointer-events-none cursor-not-allowed opacity-50'
+		disabled && 'pointer-events-none cursor-not-allowed opacity-50',
+		classValue
 	]}
 	{href}
 	target={tab === 'new' ? '_blank' : undefined}
diff --git a/src/lib/RadioGroup.svelte b/src/lib/RadioGroup.svelte
index ca4d198..0f794a4 100644
--- a/src/lib/RadioGroup.svelte
+++ b/src/lib/RadioGroup.svelte
@@ -1,39 +1,13 @@
-<script lang="ts" module>
-	export type RadioGroupOption =
-		| {
-				value: string;
-				label?: string;
-		  }
-		| string;
-
-	/** getLabel returns the option label if it exists*/
-	const getLabel = (option: RadioGroupOption): string => {
-		if (typeof option === 'string') {
-			return option;
-		} else {
-			return option.label ?? option.value;
-		}
-	};
-
-	/** getValue returns the option value */
-	const getValue = (option: RadioGroupOption): string => {
-		if (typeof option === 'string') {
-			return option;
-		} else {
-			return option.value;
-		}
-	};
-</script>
-
 <script lang="ts">
 	import { RadioGroup, type RadioGroupProps } from 'melt/builders';
 	import type { ClassValue } from 'svelte/elements';
 	import { scale } from 'svelte/transition';
 	import Label from './Label.svelte';
 	import { validate } from '@svelte-toolkit/validate';
+	import { getLabel, getValue, type Option } from './util.js';
 
 	interface Props extends RadioGroupProps {
-		options: RadioGroupOption[];
+		options: Option[];
 		label?: string;
 		required?: boolean;
 		invalidMessage?: string;
diff --git a/src/lib/TextInput.svelte b/src/lib/TextInput.svelte
index a597b7c..59295ea 100644
--- a/src/lib/TextInput.svelte
+++ b/src/lib/TextInput.svelte
@@ -28,13 +28,13 @@
 		validate: validateOpts,
 		invalidMessage = 'Field is required',
 		ref = $bindable<HTMLInputElement | null>(null),
-		class: classList
+		class: classValue
 	}: Props = $props();
 
 	let valid: boolean = $state(true);
 </script>
 
-<div>
+<div class={classValue}>
 	{#if label}
 		<Label for={id}>{label}</Label>
 	{/if}
@@ -50,7 +50,6 @@
 		onvalidate={(e) => {
 			valid = e.detail.valid;
 		}}
-		class={classList}
 	/>
 
 	{#if validateOpts}
diff --git a/src/lib/TimezoneInput.svelte b/src/lib/TimezoneInput.svelte
index 85be638..44447fc 100644
--- a/src/lib/TimezoneInput.svelte
+++ b/src/lib/TimezoneInput.svelte
@@ -18,21 +18,27 @@
 </script>
 
 <script lang="ts">
-	import ExpandableCombobox, { type ComboboxItem } from './Combobox.svelte';
+	import type { ClassValue } from 'svelte/elements';
+
+	import Combobox, { type ComboboxItem } from './Combobox.svelte';
+
+	interface Props {
+		label?: string;
+		name?: string;
+		value?: string;
+		invalidMessage?: string;
+		required?: boolean;
+		class?: ClassValue | null | undefined;
+	}
 
 	let {
 		label,
 		name,
 		value = $bindable(''),
-		invalidMessage,
-		required
-	}: {
-		label?: string;
-		name: string;
-		value?: string;
-		invalidMessage?: string;
-		required?: boolean;
-	} = $props();
+		invalidMessage = 'Please select a timezone',
+		required,
+		class: classValue
+	}: Props = $props();
 
 	const sortedTimeZones = Intl.supportedValuesOf('timeZone')
 		.map((timeZone) => {
@@ -88,7 +94,7 @@
 	});
 </script>
 
-<ExpandableCombobox
+<Combobox
 	{label}
 	{name}
 	{invalidMessage}
@@ -97,6 +103,7 @@
 	{options}
 	matchWidth
 	placeholder="Select a timezone"
+	class={classValue}
 />
 
 {#snippet timezoneLabel(item: ComboboxItem)}
diff --git a/src/lib/ToggleGroup.svelte b/src/lib/ToggleGroup.svelte
index da08e21..58cc8c4 100644
--- a/src/lib/ToggleGroup.svelte
+++ b/src/lib/ToggleGroup.svelte
@@ -2,22 +2,30 @@
 	import Label from './Label.svelte';
 	import ToggleSelect from './ToggleSelect.svelte';
 	import { validate, validateInput } from '@svelte-toolkit/validate';
+	import { generateIdentifier, getLabel, getValue, type Option } from './util.js';
+	import type { ClassValue } from 'svelte/elements';
+
+	interface Props {
+		options: Option[];
+		selected?: string[];
+		name?: string;
+		label?: string;
+		required?: boolean;
+		missingMessage?: string;
+		class?: ClassValue | null | undefined;
+	}
 
 	let {
-		items,
+		options,
 		selected = $bindable([]),
 		name,
 		label,
 		required,
-		missingMessage
-	}: {
-		items: string[];
-		selected?: string[];
-		name?: string;
-		label: string;
-		required?: boolean;
-		missingMessage?: string;
-	} = $props();
+		missingMessage,
+		class: classValue
+	}: Props = $props();
+
+	const id = $derived(generateIdentifier('toggle-group', name));
 
 	let inputElement: HTMLInputElement | undefined = $state<HTMLInputElement>();
 	let valid: boolean = $state(true);
@@ -33,15 +41,16 @@
 	};
 </script>
 
-<div>
-	{#if label && name}
-		<Label for={name}>{label}</Label>
+<div class={classValue}>
+	{#if label}
+		<Label for={id}>{label}</Label>
 	{/if}
 
 	<div class="flex flex-wrap gap-3">
 		{#if name}
 			<input
 				type="hidden"
+				{id}
 				{name}
 				required={required ? true : false}
 				use:validate={{ required, baseval: '[]' }}
@@ -52,20 +61,19 @@
 			/>
 		{/if}
 
-		{#each items as item}
-			<ToggleSelect name={name ? undefined : `toggl_${item}`} ontoggle={makeSelectedHandler(item)}>
-				<span class="capitalize">{item}</span>
+		{#each options as opt}
+			<ToggleSelect
+				name={name ? undefined : `toggle_${getValue(opt)}`}
+				ontoggle={makeSelectedHandler(getValue(opt))}
+			>
+				<span class={[typeof opt === 'string' && 'capitalize']}>{getLabel(opt)}</span>
 			</ToggleSelect>
 		{/each}
 	</div>
 
-	{#if name}
-		<div class={['mt-2 opacity-0 transition-opacity', !valid && 'opacity-100']}>
-			<Label for={name} error>
-				{missingMessage !== undefined && missingMessage !== ''
-					? missingMessage
-					: 'Field is required'}
-			</Label>
-		</div>
-	{/if}
+	<div class={['mt-2 opacity-0 transition-opacity', !valid && 'opacity-100']}>
+		<Label for={id} error>
+			{missingMessage !== undefined && missingMessage !== '' ? missingMessage : 'Field is required'}
+		</Label>
+	</div>
 </div>
diff --git a/src/lib/ToggleSelect.svelte b/src/lib/ToggleSelect.svelte
index b74df25..bfbdd0c 100644
--- a/src/lib/ToggleSelect.svelte
+++ b/src/lib/ToggleSelect.svelte
@@ -1,20 +1,17 @@
 <script lang="ts">
 	import type { Snippet } from 'svelte';
-	import type { MouseEventHandler } from 'svelte/elements';
+	import type { ClassValue, MouseEventHandler } from 'svelte/elements';
 
-	let {
-		name,
-		selected = false,
-		children,
-		onclick,
-		ontoggle
-	}: {
+	interface Props {
 		name?: string;
 		selected?: boolean;
+		class?: ClassValue | null | undefined;
 		children: Snippet;
 		onclick?: MouseEventHandler<HTMLButtonElement>;
 		ontoggle?: (selected: boolean) => void;
-	} = $props();
+	}
+
+	let { name, selected = false, class: classValue, children, onclick, ontoggle }: Props = $props();
 
 	const handleToggleSelectClick: MouseEventHandler<HTMLButtonElement> = (event) => {
 		selected = !selected; // update state
@@ -28,9 +25,13 @@
 {/if}
 
 <button
-	class="rounded-3xl border px-6 py-2.5 font-medium transition-colors {selected
-		? 'border-secondary bg-primary text-background hover:bg-primary-600'
-		: 'border-accent text-text dark:border-accent/50 dark:bg-text dark:text-background dark:hover:bg-text-900 bg-white hover:bg-slate-100'}"
+	class={[
+		'rounded-3xl border px-6 py-2.5 font-medium transition-colors',
+		selected
+			? 'border-secondary bg-primary text-background hover:bg-primary-600'
+			: 'border-accent text-text dark:border-accent/50 dark:bg-text dark:text-background dark:hover:bg-text-900 bg-white hover:bg-slate-100',
+		classValue
+	]}
 	onclick={handleToggleSelectClick}
 >
 	{@render children()}
diff --git a/src/lib/index.ts b/src/lib/index.ts
index 88cff43..6001173 100644
--- a/src/lib/index.ts
+++ b/src/lib/index.ts
@@ -10,7 +10,6 @@ export { default as Link } from './Link.svelte';
 export { default as PhoneInput } from './PhoneInput.svelte';
 export { default as PinInput } from './PinInput.svelte';
 export { default as RadioGroup } from './RadioGroup.svelte';
-export { default as Select } from './Select.svelte';
 export { default as Spinner } from './Spinner.svelte';
 export { default as StateMachine, type StateMachinePage } from './StateMachine.svelte';
 export { default as StyledRawInput } from './StyledRawInput.svelte';
@@ -19,3 +18,4 @@ export { default as TimeInput } from './TimeInput.svelte';
 export { default as TimezoneInput } from './TimezoneInput.svelte';
 export { default as ToggleGroup } from './ToggleGroup.svelte';
 export { default as ToggleSelect } from './ToggleSelect.svelte';
+export { type Option, getLabel, getValue } from './util.js';
diff --git a/src/lib/util.ts b/src/lib/util.ts
index 4417ff1..3ea0455 100644
--- a/src/lib/util.ts
+++ b/src/lib/util.ts
@@ -15,3 +15,31 @@ export const generateIdentifier = (prefix?: string, identifier?: string): string
 	const timestampPart = Date.now().toString(36);
 	return `${prefix ? prefix + '-' : ''}${randomPart}-${timestampPart}`;
 };
+
+/**
+ * Option type definition for a select option. Used in various components.
+ */
+export type Option =
+	| {
+			value: string;
+			label?: string;
+	  }
+	| string;
+
+/** getLabel returns the option label if it exists*/
+export const getLabel = (option: Option): string => {
+	if (typeof option === 'string') {
+		return option;
+	} else {
+		return option.label ?? option.value;
+	}
+};
+
+/** getValue returns the option value */
+export const getValue = (option: Option): string => {
+	if (typeof option === 'string') {
+		return option;
+	} else {
+		return option.value;
+	}
+};
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index d81cca3..7c9e2a1 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -139,7 +139,7 @@
 	<ToggleGroup
 		name="example-toggle-group"
 		label="Toggler"
-		items={['item one', 'item two', 'item three']}
+		options={['item one', 'item two', { value: 'complex', label: 'Complex item' }]}
 	/>
 </div>