Skip to content

fix: avoid invalid label/button nesting in switch #571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jrasm91 merged 1 commit into from
Feb 4, 2026
Merged

fix: avoid invalid label/button nesting in switch #571

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 30 additions & 39 deletions packages/ui/src/lib/components/Switch/Switch.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,44 +75,35 @@

const inputId = $derived(`input-${id}`);
const labelId = $derived(`label-${id}`);
const descriptionId = $derived(description ? `description-${id}` : undefined);
const descriptionId = $derived(description ? `description-${id}` : restProps['aria-describedby']);
</script>

<Switch.Root
bind:checked
bind:ref
id={inputId}
disabled={disabled || readOnly}
required={!!required}
class={cleanClass(label && 'w-full', className)}
aria-readonly={readOnly}
aria-labelledby={labelId}
aria-describedby={descriptionId}
{...restProps}
>
<Switch.Thumb>
{#snippet child()}
<div class={cleanClass(label && 'flex items-center justify-between gap-1')}>
{#if label}
<div class="text-start">
<Label
id={labelId}
for={inputId}
{label}
requiredIndicator={required === 'indicator'}
{...labelProps}
{size}
/>
{#if description}
<Text color="muted" size="small" id={descriptionId}>{description}</Text>
{/if}
</div>
{/if}
<span class={wrapper({ disabled })}>
<span class={bar({ fillColor: enabled ? color : 'default' })}> </span>
<span class={dot({ checked: enabled, fillColor: enabled ? color : 'default' })}></span>
</span>
</div>
{/snippet}
</Switch.Thumb>
</Switch.Root>
<div class={cleanClass(label ? 'flex w-full items-center gap-3' : undefined, className)}>
{#if label}
<div class="min-w-0 flex-1 text-start">
<Label id={labelId} for={inputId} {label} requiredIndicator={required === 'indicator'} {...labelProps} {size} />
{#if description}
<Text color="muted" size="small" id={descriptionId}>{description}</Text>
{/if}
</div>
{/if}

<Switch.Root
bind:checked
bind:ref
id={inputId}
disabled={disabled || readOnly}
required={!!required}
aria-readonly={readOnly}
aria-labelledby={labelId}
aria-describedby={descriptionId}
{...restProps}
>
<Switch.Thumb>
<span class={wrapper({ disabled })}>
<span class={bar({ fillColor: enabled ? color : 'default' })}> </span>
<span class={dot({ checked: enabled, fillColor: enabled ? color : 'default' })}></span>
</span>
</Switch.Thumb>
</Switch.Root>
</div>
Loading