Merge pull request #4105 from mathesar-foundation/4091_fieldset_legend

Fix fieldset legend displaying undefined
mathesar-foundation · Jan 6, 2025 · 045f582 · 045f582
2 parents fbfb7d3 + 0fca495
commit 045f582
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/mathesar_ui/src/component-library/checkbox-group/CheckboxGroup.svelte b/mathesar_ui/src/component-library/checkbox-group/CheckboxGroup.svelte
@@ -72,5 +72,5 @@
     checked={values.some((o) => valuesAreEqual(o, option))}
     disabled={innerDisabled}
   />
-  <slot name="label" slot="label">{label}</slot>
+  <slot name="label" slot="label">{label ?? ''}</slot>
 </FieldsetGroup>
diff --git a/mathesar_ui/src/component-library/fieldset-group/FieldsetGroup.svelte b/mathesar_ui/src/component-library/fieldset-group/FieldsetGroup.svelte
@@ -30,7 +30,7 @@
 </script>
 
 <Fieldset {ariaLabel} {boxed}>
-  <slot name="label" slot="label">{label}</slot>
+  <slot name="label" slot="label">{label ?? ''}</slot>
   <ul
     class="fieldset-group-options"
     class:inline={isInline}

diff --git a/mathesar_ui/src/component-library/fieldset/Fieldset.svelte b/mathesar_ui/src/component-library/fieldset/Fieldset.svelte
@@ -4,15 +4,7 @@
   export let boxed = false;
 </script>
 
-<fieldset
-  class="fieldset"
-  class:boxed
-  class:has-label={!!label}
-  aria-label={ariaLabel}
-  on:change
->
-  {#if $$slots.label || label}
-    <legend><slot name="label">{label}</slot></legend>
-  {/if}
+<fieldset class="fieldset" class:boxed aria-label={ariaLabel} on:change>
+  <legend><slot name="label">{label ?? ''}</slot></legend>
   <slot />
 </fieldset>
diff --git a/mathesar_ui/src/component-library/radio-group/RadioGroup.svelte b/mathesar_ui/src/component-library/radio-group/RadioGroup.svelte
@@ -56,6 +56,6 @@
       dispatch('change', { value: option });
     }}
   />
-  <slot slot="label" name="label">{label}</slot>
+  <slot slot="label" name="label">{label ?? ''}</slot>
   <slot slot="extra" name="extra" />
 </FieldsetGroup>