[pull] main from chakra-ui:main

packages/react/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+### Changed
+
+- **Fieldset**: Reverted `Fieldset.Legend` to render as a `legend` element instead of a `div` element (reverting changes
+  from v5.21.0) for better semantic HTML
+
 ## [5.23.0] - 2025-09-08
 
 ### Added

packages/react/src/components/fieldset/fieldset-legend.tsx

@@ -4,13 +4,13 @@ import { type HTMLProps, type PolymorphicProps, ark } from '../factory'
 import { useFieldsetContext } from './use-fieldset-context'
 
 export interface FieldsetLegendBaseProps extends PolymorphicProps {}
-export interface FieldsetLegendProps extends HTMLProps<'div'>, FieldsetLegendBaseProps {}
+export interface FieldsetLegendProps extends HTMLProps<'legend'>, FieldsetLegendBaseProps {}
 
-export const FieldsetLegend = forwardRef<HTMLDivElement, FieldsetLegendProps>((props, ref) => {
+export const FieldsetLegend = forwardRef<HTMLLegendElement, FieldsetLegendProps>((props, ref) => {
   const fieldset = useFieldsetContext()
   const mergedProps = mergeProps(fieldset.getLegendProps(), props)
 
-  return <ark.div {...mergedProps} ref={ref} />
+  return <ark.legend {...mergedProps} ref={ref} />
 })
 
 FieldsetLegend.displayName = 'FieldsetLegend'

packages/solid/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+### Changed
+
+- **Fieldset**: Reverted `Fieldset.Legend` to render as a `legend` element instead of a `div` element (reverting changes
+  from v5.21.0) for better semantic HTML
+
 ## [5.23.0] - 2025-09-08
 
 ### Added

packages/solid/src/components/fieldset/fieldset-legend.tsx

@@ -2,12 +2,12 @@ import { mergeProps } from '@zag-js/solid'
 import { type HTMLProps, type PolymorphicProps, ark } from '../factory'
 import { useFieldsetContext } from './use-fieldset-context'
 
-export interface FieldsetLegendBaseProps extends PolymorphicProps<'div'> {}
-export interface FieldsetLegendProps extends HTMLProps<'div'>, FieldsetLegendBaseProps {}
+export interface FieldsetLegendBaseProps extends PolymorphicProps<'legend'> {}
+export interface FieldsetLegendProps extends HTMLProps<'legend'>, FieldsetLegendBaseProps {}
 
 export const FieldsetLegend = (props: FieldsetLegendProps) => {
   const fieldset = useFieldsetContext()
   const mergedProps = mergeProps(() => fieldset().getLegendProps(), props)
 
-  return <ark.div {...mergedProps} />
+  return <ark.legend {...mergedProps} />
 }

packages/svelte/CHANGELOG.md

@@ -6,6 +6,11 @@ description: All notable changes will be documented in this file.
 
 ## [Unreleased]
 
+### Changed
+
+- **Fieldset**: Reverted `Fieldset.Legend` to render as a `legend` element instead of a `div` element (reverting changes
+  from v5.6.0) for better semantic HTML
+
 ## [5.8.0] - 2025-09-08
 
 ### Added

packages/svelte/src/lib/components/fieldset/fieldset-legend.svelte

@@ -1,8 +1,8 @@
 <script module lang="ts">
   import type { Assign, HTMLProps, PolymorphicProps, RefAttribute } from '$lib/types'
 
-  export interface FieldsetLegendBaseProps extends PolymorphicProps<'div'>, RefAttribute {}
-  export interface FieldsetLegendProps extends Assign<HTMLProps<'div'>, FieldsetLegendBaseProps> {}
+  export interface FieldsetLegendBaseProps extends PolymorphicProps<'legend'>, RefAttribute {}
+  export interface FieldsetLegendProps extends Assign<HTMLProps<'legend'>, FieldsetLegendBaseProps> {}
 </script>
 
 <script lang="ts">
@@ -15,4 +15,4 @@
   const mergedProps = $derived(mergeProps(fieldset?.().getLegendProps(), props))
 </script>
 
-<Ark as="div" bind:ref {...mergedProps} />
+<Ark as="legend" bind:ref {...mergedProps} />

packages/vue/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+### Changed
+
+- **Fieldset**: Reverted `Fieldset.Legend` to render as a `legend` element instead of a `div` element (reverting changes
+  from v5.21.0) for better semantic HTML
+
 ## [5.23.0] - 2025-09-08
 
 ### Added

packages/vue/src/components/fieldset/fieldset-legend.vue

@@ -23,5 +23,5 @@ useForwardExpose()
 </script>
 
 <template>
-  <ark.div v-bind="fieldset.getLegendProps()" :as-child="asChild"><slot /></ark.div>
+  <ark.legend v-bind="fieldset.getLegendProps()" :as-child="asChild"><slot /></ark.legend>
 </template>