From 07b7102a78b3603c7277e5312c045bcf9ef59b62 Mon Sep 17 00:00:00 2001
From: Elijah Duffy <elijah@thatoneguy.ca>
Date: Thu, 3 Jul 2025 14:11:09 -0700
Subject: [PATCH] radio group: custom class support, improved options prop

---
 src/lib/RadioGroup.svelte | 82 ++++++++++++++++++++++++++++++++-------
 src/routes/+page.svelte   |  7 +++-
 2 files changed, 74 insertions(+), 15 deletions(-)

diff --git a/src/lib/RadioGroup.svelte b/src/lib/RadioGroup.svelte
index e30cbe5..ca4d198 100644
--- a/src/lib/RadioGroup.svelte
+++ b/src/lib/RadioGroup.svelte
@@ -1,26 +1,67 @@
+<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 } from 'melt/builders';
-	import type { RadioGroupProps } from 'melt/builders';
+	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';
+
+	interface Props extends RadioGroupProps {
+		options: RadioGroupOption[];
+		label?: string;
+		required?: boolean;
+		invalidMessage?: string;
+		class?: ClassValue | null | undefined;
+	}
 
 	let {
-		items,
+		options,
 		label,
+		class: classValue,
+		required = false,
+		invalidMessage = 'Field is required',
 		...props
-	}: RadioGroupProps & {
-		items: string[];
-		label: string;
-	} = $props();
+	}: Props = $props();
+	let valid = $state(true);
 
 	const group = new RadioGroup(props);
+	console.log('group', group.root.id);
 	const isVert = $derived(group.orientation === 'vertical');
 </script>
 
-<div class="flex w-fit flex-col gap-2" {...group.root}>
-	<label {...group.label} class="font-medium">{label}</label>
+<div class={['flex w-fit flex-col', classValue]} {...group.root}>
+	{#if label}
+		<Label {...group.label}>{label}</Label>
+	{/if}
 	<div class="flex {isVert ? 'flex-col gap-1' : 'flex-row gap-3'}">
-		{#each items as i}
-			{@const item = group.getItem(i)}
+		{#each options as opt}
+			{@const item = group.getItem(getValue(opt))}
 			<div
 				class="ring-accent-500 group -ml-1 flex items-center gap-3 rounded p-1 outline-hidden focus-visible:ring-3
 					data-disabled:cursor-not-allowed data-disabled:opacity-50"
@@ -42,11 +83,24 @@
 					{/if}
 				</div>
 
-				<span class="cursor-default leading-none font-semibold capitalize select-none">
-					{i}
+				<span
+					class={[
+						'cursor-default leading-none font-medium select-none',
+						typeof opt === 'string' && 'capitalize'
+					]}
+				>
+					{getLabel(opt)}
 				</span>
 			</div>
 		{/each}
 	</div>
-	<input {...group.hiddenInput} />
+	<input
+		{...group.hiddenInput}
+		use:validate={{ required }}
+		onvalidate={(e) => (valid = e.detail.valid)}
+	/>
+
+	<div class={['opacity-0 transition-opacity', !valid && 'opacity-100']}>
+		<Label for={group.label.for} error>{invalidMessage}</Label>
+	</div>
 </div>
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index eaeaf56..6c8d8fb 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -106,7 +106,12 @@
 	<RadioGroup
 		name="example-radio-group"
 		label="Choose an option"
-		items={['male', 'female', 'other', 'prefer not to say']}
+		options={[
+			'male',
+			'female',
+			'other',
+			{ value: 'prefer_not_to_say', label: 'Prefer not to say' }
+		]}
 	/>
 </div>