From 0fca495520202f8c4c2d8df0ce443ad4b1e23add Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 3 Jan 2025 11:59:35 -0500
Subject: [PATCH] Fix fieldset legend displaying undefined

---
 .../checkbox-group/CheckboxGroup.svelte              |  2 +-
 .../fieldset-group/FieldsetGroup.svelte              |  2 +-
 .../src/component-library/fieldset/Fieldset.svelte   | 12 ++----------
 .../component-library/radio-group/RadioGroup.svelte  |  2 +-
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/mathesar_ui/src/component-library/checkbox-group/CheckboxGroup.svelte b/mathesar_ui/src/component-library/checkbox-group/CheckboxGroup.svelte
index 7f71337e04..660b3ecbfe 100644
--- 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
index 2885999942..867154ae6d 100644
--- 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
index e816ef4cc7..07bac5dbaa 100644
--- 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
index 43b68d8ea6..186ffa8aed 100644
--- 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>