@cognitap/radiant 0.0.76 → 0.0.78

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (214) hide show
  1. package/CHANGELOG.md +29 -2
  2. package/dist/library/charts/Charts.d.ts.map +1 -1
  3. package/dist/library/charts/Charts.js +5 -1
  4. package/dist/library/charts/Charts.js.map +1 -1
  5. package/dist/library/components/AppShell/AppShell.d.ts.map +1 -1
  6. package/dist/library/components/AppShell/AppShell.js +6 -5
  7. package/dist/library/components/AppShell/AppShell.js.map +1 -1
  8. package/dist/library/components/Breadcrumb/Breadcrumb.d.ts +2 -1
  9. package/dist/library/components/Breadcrumb/Breadcrumb.d.ts.map +1 -1
  10. package/dist/library/components/Breadcrumb/Breadcrumb.js +4 -9
  11. package/dist/library/components/Breadcrumb/Breadcrumb.js.map +1 -1
  12. package/dist/library/components/Carousel/Carousel.d.ts.map +1 -1
  13. package/dist/library/components/Carousel/Carousel.js +6 -3
  14. package/dist/library/components/Carousel/Carousel.js.map +1 -1
  15. package/dist/library/components/Checkbox/Checkbox.d.ts +3 -1
  16. package/dist/library/components/Checkbox/Checkbox.d.ts.map +1 -1
  17. package/dist/library/components/Checkbox/Checkbox.js +7 -7
  18. package/dist/library/components/Checkbox/Checkbox.js.map +1 -1
  19. package/dist/library/components/CodeBlock/CodeBlock.js +2 -2
  20. package/dist/library/components/CodeBlock/CodeBlock.js.map +1 -1
  21. package/dist/library/components/Collapsible/Collapsible.d.ts.map +1 -1
  22. package/dist/library/components/Collapsible/Collapsible.js +3 -5
  23. package/dist/library/components/Collapsible/Collapsible.js.map +1 -1
  24. package/dist/library/components/Combobox/Combobox.d.ts +9 -1
  25. package/dist/library/components/Combobox/Combobox.d.ts.map +1 -1
  26. package/dist/library/components/Combobox/Combobox.js +15 -13
  27. package/dist/library/components/Combobox/Combobox.js.map +1 -1
  28. package/dist/library/components/Combobox/comboboxStyles.d.ts.map +1 -1
  29. package/dist/library/components/Combobox/comboboxStyles.js +5 -2
  30. package/dist/library/components/Combobox/comboboxStyles.js.map +1 -1
  31. package/dist/library/components/Command/Command.d.ts +1 -4
  32. package/dist/library/components/Command/Command.d.ts.map +1 -1
  33. package/dist/library/components/Command/Command.js +2 -8
  34. package/dist/library/components/Command/Command.js.map +1 -1
  35. package/dist/library/components/ContextMenu/ContextMenu.d.ts.map +1 -1
  36. package/dist/library/components/ContextMenu/ContextMenu.js +2 -1
  37. package/dist/library/components/ContextMenu/ContextMenu.js.map +1 -1
  38. package/dist/library/components/Dialog/Dialog.d.ts +3 -0
  39. package/dist/library/components/Dialog/Dialog.d.ts.map +1 -1
  40. package/dist/library/components/Dialog/Dialog.js +10 -9
  41. package/dist/library/components/Dialog/Dialog.js.map +1 -1
  42. package/dist/library/components/Drawer/Drawer.d.ts.map +1 -1
  43. package/dist/library/components/Drawer/Drawer.js +2 -0
  44. package/dist/library/components/Drawer/Drawer.js.map +1 -1
  45. package/dist/library/components/Fieldset/Fieldset.d.ts +1 -1
  46. package/dist/library/components/Fieldset/Fieldset.d.ts.map +1 -1
  47. package/dist/library/components/Fieldset/Fieldset.js +2 -2
  48. package/dist/library/components/Fieldset/Fieldset.js.map +1 -1
  49. package/dist/library/components/FileInput/FileInput.d.ts +3 -1
  50. package/dist/library/components/FileInput/FileInput.d.ts.map +1 -1
  51. package/dist/library/components/FileInput/FileInput.js +5 -3
  52. package/dist/library/components/FileInput/FileInput.js.map +1 -1
  53. package/dist/library/components/Form/Form.d.ts.map +1 -1
  54. package/dist/library/components/Form/Form.js +12 -7
  55. package/dist/library/components/Form/Form.js.map +1 -1
  56. package/dist/library/components/HoverCard/HoverCard.d.ts +1 -0
  57. package/dist/library/components/HoverCard/HoverCard.d.ts.map +1 -1
  58. package/dist/library/components/HoverCard/HoverCard.js +1 -0
  59. package/dist/library/components/HoverCard/HoverCard.js.map +1 -1
  60. package/dist/library/components/Input/Input.d.ts +3 -1
  61. package/dist/library/components/Input/Input.d.ts.map +1 -1
  62. package/dist/library/components/Input/Input.js +6 -11
  63. package/dist/library/components/Input/Input.js.map +1 -1
  64. package/dist/library/components/InputGroup/InputGroup.d.ts.map +1 -1
  65. package/dist/library/components/InputGroup/InputGroup.js +2 -1
  66. package/dist/library/components/InputGroup/InputGroup.js.map +1 -1
  67. package/dist/library/components/Link/Link.d.ts +4 -2
  68. package/dist/library/components/Link/Link.d.ts.map +1 -1
  69. package/dist/library/components/Link/Link.js +6 -3
  70. package/dist/library/components/Link/Link.js.map +1 -1
  71. package/dist/library/components/Menu/Menu.d.ts +13 -3
  72. package/dist/library/components/Menu/Menu.d.ts.map +1 -1
  73. package/dist/library/components/Menu/Menu.js +23 -8
  74. package/dist/library/components/Menu/Menu.js.map +1 -1
  75. package/dist/library/components/Menubar/Menubar.d.ts.map +1 -1
  76. package/dist/library/components/Menubar/Menubar.js +1 -1
  77. package/dist/library/components/Menubar/Menubar.js.map +1 -1
  78. package/dist/library/components/NativeSelect/NativeSelect.d.ts.map +1 -1
  79. package/dist/library/components/NativeSelect/NativeSelect.js +2 -1
  80. package/dist/library/components/NativeSelect/NativeSelect.js.map +1 -1
  81. package/dist/library/components/NavLink/NavLink.d.ts.map +1 -1
  82. package/dist/library/components/NavLink/NavLink.js +5 -3
  83. package/dist/library/components/NavLink/NavLink.js.map +1 -1
  84. package/dist/library/components/NavigationMenu/NavigationMenu.d.ts +1 -1
  85. package/dist/library/components/NavigationMenu/NavigationMenu.d.ts.map +1 -1
  86. package/dist/library/components/NavigationMenu/NavigationMenu.js +11 -3
  87. package/dist/library/components/NavigationMenu/NavigationMenu.js.map +1 -1
  88. package/dist/library/components/NumberField/NumberField.d.ts.map +1 -1
  89. package/dist/library/components/NumberField/NumberField.js +1 -1
  90. package/dist/library/components/NumberField/NumberField.js.map +1 -1
  91. package/dist/library/components/OTPField/OTPField.d.ts.map +1 -1
  92. package/dist/library/components/OTPField/OTPField.js +2 -1
  93. package/dist/library/components/OTPField/OTPField.js.map +1 -1
  94. package/dist/library/components/Pagination/Pagination.d.ts +2 -1
  95. package/dist/library/components/Pagination/Pagination.d.ts.map +1 -1
  96. package/dist/library/components/Pagination/Pagination.js +4 -6
  97. package/dist/library/components/Pagination/Pagination.js.map +1 -1
  98. package/dist/library/components/Popover/Popover.d.ts.map +1 -1
  99. package/dist/library/components/Popover/Popover.js +6 -2
  100. package/dist/library/components/Popover/Popover.js.map +1 -1
  101. package/dist/library/components/RadioGroup/RadioGroup.d.ts +4 -2
  102. package/dist/library/components/RadioGroup/RadioGroup.d.ts.map +1 -1
  103. package/dist/library/components/RadioGroup/RadioGroup.js +9 -10
  104. package/dist/library/components/RadioGroup/RadioGroup.js.map +1 -1
  105. package/dist/library/components/Resizable/Resizable.d.ts.map +1 -1
  106. package/dist/library/components/Resizable/Resizable.js +2 -1
  107. package/dist/library/components/Resizable/Resizable.js.map +1 -1
  108. package/dist/library/components/ScrollArea/ScrollArea.d.ts.map +1 -1
  109. package/dist/library/components/ScrollArea/ScrollArea.js +2 -1
  110. package/dist/library/components/ScrollArea/ScrollArea.js.map +1 -1
  111. package/dist/library/components/Select/Select.d.ts +7 -0
  112. package/dist/library/components/Select/Select.d.ts.map +1 -1
  113. package/dist/library/components/Select/Select.js +12 -10
  114. package/dist/library/components/Select/Select.js.map +1 -1
  115. package/dist/library/components/Select/selectStyles.d.ts.map +1 -1
  116. package/dist/library/components/Select/selectStyles.js +3 -1
  117. package/dist/library/components/Select/selectStyles.js.map +1 -1
  118. package/dist/library/components/Slider/Slider.d.ts +3 -1
  119. package/dist/library/components/Slider/Slider.d.ts.map +1 -1
  120. package/dist/library/components/Slider/Slider.js +6 -8
  121. package/dist/library/components/Slider/Slider.js.map +1 -1
  122. package/dist/library/components/Switch/Switch.d.ts +3 -1
  123. package/dist/library/components/Switch/Switch.d.ts.map +1 -1
  124. package/dist/library/components/Switch/Switch.js +6 -7
  125. package/dist/library/components/Switch/Switch.js.map +1 -1
  126. package/dist/library/components/Table/Table.d.ts.map +1 -1
  127. package/dist/library/components/Table/Table.js +3 -1
  128. package/dist/library/components/Table/Table.js.map +1 -1
  129. package/dist/library/components/Tabs/Tabs.d.ts.map +1 -1
  130. package/dist/library/components/Tabs/Tabs.js +10 -7
  131. package/dist/library/components/Tabs/Tabs.js.map +1 -1
  132. package/dist/library/components/TagsInput/TagsInput.d.ts +3 -1
  133. package/dist/library/components/TagsInput/TagsInput.d.ts.map +1 -1
  134. package/dist/library/components/TagsInput/TagsInput.js +8 -5
  135. package/dist/library/components/TagsInput/TagsInput.js.map +1 -1
  136. package/dist/library/components/Textarea/Textarea.d.ts +3 -1
  137. package/dist/library/components/Textarea/Textarea.d.ts.map +1 -1
  138. package/dist/library/components/Textarea/Textarea.js +8 -7
  139. package/dist/library/components/Textarea/Textarea.js.map +1 -1
  140. package/dist/library/components/Toast/Toast.d.ts +2 -1
  141. package/dist/library/components/Toast/Toast.d.ts.map +1 -1
  142. package/dist/library/components/Toast/Toast.js +22 -8
  143. package/dist/library/components/Toast/Toast.js.map +1 -1
  144. package/dist/library/components/Tooltip/Tooltip.d.ts +1 -0
  145. package/dist/library/components/Tooltip/Tooltip.d.ts.map +1 -1
  146. package/dist/library/components/Tooltip/Tooltip.js +3 -2
  147. package/dist/library/components/Tooltip/Tooltip.js.map +1 -1
  148. package/dist/library/components/shared/actionStyles.d.ts.map +1 -1
  149. package/dist/library/components/shared/actionStyles.js +3 -1
  150. package/dist/library/components/shared/actionStyles.js.map +1 -1
  151. package/dist/library/components/shared/focusStyles.d.ts +13 -0
  152. package/dist/library/components/shared/focusStyles.d.ts.map +1 -0
  153. package/dist/library/components/shared/focusStyles.js +17 -0
  154. package/dist/library/components/shared/focusStyles.js.map +1 -0
  155. package/dist/library/index.d.ts +1 -1
  156. package/dist/library/index.d.ts.map +1 -1
  157. package/dist/library/index.js.map +1 -1
  158. package/dist/library/react/useToastTimer.js +1 -1
  159. package/dist/library/react/useToastTimer.js.map +1 -1
  160. package/dist/library/styles.css +1 -1
  161. package/dist/library/themes/components.d.ts +12 -0
  162. package/dist/library/themes/components.d.ts.map +1 -1
  163. package/dist/library/themes/components.js +15 -3
  164. package/dist/library/themes/components.js.map +1 -1
  165. package/docs/architecture.md +87 -73
  166. package/docs/theming.md +9 -0
  167. package/package.json +1 -1
  168. package/src/charts/Charts.tsx +5 -2
  169. package/src/components/AppShell/AppShell.tsx +9 -5
  170. package/src/components/Breadcrumb/Breadcrumb.tsx +5 -9
  171. package/src/components/Carousel/Carousel.tsx +10 -3
  172. package/src/components/Checkbox/Checkbox.tsx +9 -6
  173. package/src/components/CodeBlock/CodeBlock.tsx +2 -2
  174. package/src/components/Collapsible/Collapsible.tsx +3 -5
  175. package/src/components/Combobox/Combobox.tsx +73 -15
  176. package/src/components/Combobox/comboboxStyles.ts +5 -2
  177. package/src/components/Command/Command.tsx +2 -9
  178. package/src/components/ContextMenu/ContextMenu.tsx +2 -4
  179. package/src/components/Dialog/Dialog.tsx +31 -13
  180. package/src/components/Drawer/Drawer.tsx +2 -0
  181. package/src/components/Fieldset/Fieldset.tsx +3 -3
  182. package/src/components/FileInput/FileInput.tsx +8 -2
  183. package/src/components/Form/Form.tsx +10 -6
  184. package/src/components/HoverCard/HoverCard.tsx +5 -1
  185. package/src/components/Input/Input.tsx +13 -12
  186. package/src/components/InputGroup/InputGroup.tsx +4 -2
  187. package/src/components/Link/Link.tsx +9 -3
  188. package/src/components/Menu/Menu.tsx +51 -9
  189. package/src/components/Menubar/Menubar.tsx +1 -0
  190. package/src/components/NativeSelect/NativeSelect.tsx +3 -1
  191. package/src/components/NavLink/NavLink.tsx +8 -5
  192. package/src/components/NavigationMenu/NavigationMenu.tsx +16 -11
  193. package/src/components/NumberField/NumberField.tsx +1 -0
  194. package/src/components/OTPField/OTPField.tsx +4 -1
  195. package/src/components/Pagination/Pagination.tsx +5 -7
  196. package/src/components/Popover/Popover.tsx +6 -1
  197. package/src/components/RadioGroup/RadioGroup.tsx +13 -7
  198. package/src/components/Resizable/Resizable.tsx +4 -2
  199. package/src/components/ScrollArea/ScrollArea.tsx +2 -1
  200. package/src/components/Select/Select.tsx +29 -13
  201. package/src/components/Select/selectStyles.ts +3 -1
  202. package/src/components/Slider/Slider.tsx +8 -7
  203. package/src/components/Switch/Switch.tsx +8 -6
  204. package/src/components/Table/Table.tsx +5 -1
  205. package/src/components/Tabs/Tabs.tsx +10 -8
  206. package/src/components/TagsInput/TagsInput.tsx +10 -3
  207. package/src/components/Textarea/Textarea.tsx +10 -6
  208. package/src/components/Toast/Toast.tsx +28 -11
  209. package/src/components/Tooltip/Tooltip.tsx +4 -1
  210. package/src/components/shared/actionStyles.ts +3 -1
  211. package/src/components/shared/focusStyles.ts +28 -0
  212. package/src/index.ts +1 -0
  213. package/src/react/useToastTimer.ts +1 -1
  214. package/src/themes/components.ts +15 -3
@@ -5,14 +5,14 @@ import {
5
5
  type ComposedLinkRenderProps
6
6
  } from '../shared/composedLink.js'
7
7
  import { cn } from '../../cn.js'
8
- import { requireAccessibleName } from '../../internal/accessibleName.js'
8
+ import { requireAccessibleName, type AccessibleName } from '../../internal/accessibleName.js'
9
9
  import { joinIds } from '../../internal/ids.js'
10
10
  import type { ThemeStyle } from '../../themes/defineTheme.js'
11
11
  type Part<Host extends 'nav' | 'ol' | 'li' | 'span'> = Omit<
12
12
  ComponentProps<Host>,
13
13
  'style' | 'role'
14
14
  > & { style?: ThemeStyle; 'data-slot'?: string }
15
- export type BreadcrumbProps = Part<'nav'>
15
+ export type BreadcrumbProps = Part<'nav'> & AccessibleName
16
16
  export type BreadcrumbListProps = Part<'ol'>
17
17
  export type BreadcrumbItemProps = Part<'li'>
18
18
  export type BreadcrumbPageProps = Omit<Part<'span'>, 'aria-current'>
@@ -20,17 +20,11 @@ export type BreadcrumbSeparatorProps = Omit<Part<'span'>, 'aria-hidden' | 'tabIn
20
20
  export type BreadcrumbLinkRenderProps = ComposedLinkRenderProps
21
21
  export type BreadcrumbLinkProps = Omit<ComposedLinkProps, 'aria-current'> & { current?: boolean }
22
22
  export function Breadcrumb({ className, ...props }: BreadcrumbProps) {
23
- const labelledBy = props['aria-labelledby']?.trim() || undefined
24
- const name = {
25
- 'aria-label': props['aria-label'] ?? (labelledBy ? undefined : 'Breadcrumb'),
26
- 'aria-labelledby': labelledBy
27
- }
28
- requireAccessibleName('Breadcrumb', name)
23
+ requireAccessibleName('Breadcrumb', props)
29
24
  const nativeProps = { ...props, role: undefined }
30
25
  return (
31
26
  <nav
32
27
  {...nativeProps}
33
- {...name}
34
28
  data-slot={joinIds('breadcrumb', props['data-slot'])}
35
29
  className={cn(
36
30
  'min-w-0 max-w-full text-start [color:var(--rad-breadcrumb-color,var(--rad-color-muted-foreground))] font-[family-name:var(--rad-typography-roles-ui-body-family,system-ui,sans-serif)] text-[length:var(--rad-breadcrumb-font-size,var(--rad-typography-roles-ui-body-size,0.875rem))] leading-[var(--rad-typography-roles-ui-body-line-height,1.5)]',
@@ -83,6 +77,7 @@ export function BreadcrumbLink({
83
77
  variant={variant}
84
78
  tone={tone}
85
79
  aria-current={current ? 'page' : undefined}
80
+ data-selected={current ? '' : undefined}
86
81
  className={cn(
87
82
  'min-w-0 [overflow-wrap:anywhere] [color:var(--rad-breadcrumb-link-color,var(--rad-color-muted-foreground))] hover:[color:var(--rad-breadcrumb-link-hover-color,var(--rad-color-foreground))]',
88
83
  className
@@ -98,6 +93,7 @@ export function BreadcrumbPage({ className, ...props }: BreadcrumbPageProps) {
98
93
  <span
99
94
  {...nativeProps}
100
95
  aria-current="page"
96
+ data-selected=""
101
97
  data-slot={joinIds('breadcrumb-page', props['data-slot'])}
102
98
  className={cn(
103
99
  'min-w-0 [overflow-wrap:anywhere] [color:var(--rad-breadcrumb-current-color,var(--rad-color-foreground))] font-[family-name:var(--rad-typography-roles-ui-label-family,system-ui,sans-serif)] font-[number:var(--rad-typography-roles-ui-label-weight,600)] tracking-[var(--rad-typography-roles-ui-label-letter-spacing,-0.011em)]',
@@ -21,6 +21,8 @@ import { useControllableState } from '../../react/useControllableState.js'
21
21
  import type { ValueOwner } from '../../react/useNativeOwner.js'
22
22
  import { useComposedRefs } from '../../react/useComposedRefs.js'
23
23
  import type { ThemeStyle } from '../../themes/defineTheme.js'
24
+ import { scrollbarClass } from '../shared/scrollbarStyles.js'
25
+ import { focusRingClass } from '../shared/focusStyles.js'
24
26
 
25
27
  export type CarouselItem = { value: string; label?: string; children: ReactNode }
26
28
  export type CarouselProps = Omit<ComponentProps<'section'>, 'style' | 'role'> &
@@ -47,6 +49,7 @@ type Binding = CarouselState & {
47
49
  viewportId: string
48
50
  setViewport: (node: HTMLDivElement | null) => void
49
51
  slideLabel: (index: number, count: number) => string
52
+ name: { 'aria-label'?: string; 'aria-labelledby'?: string }
50
53
  }
51
54
  const Context = createContext<Binding | null>(null)
52
55
  export function useCarousel(): CarouselState | null {
@@ -246,7 +249,8 @@ export function Carousel({
246
249
  items,
247
250
  viewportId,
248
251
  setViewport,
249
- slideLabel
252
+ slideLabel,
253
+ name: { 'aria-label': props['aria-label'], 'aria-labelledby': props['aria-labelledby'] }
250
254
  }}
251
255
  >
252
256
  <section
@@ -339,11 +343,13 @@ export function CarouselViewport({
339
343
  ref={composed}
340
344
  id={state.viewportId}
341
345
  role="group"
342
- aria-label={props['aria-label'] ?? 'Slides'}
346
+ {...(props['aria-label'] || props['aria-labelledby'] ? {} : state.name)}
343
347
  tabIndex={0}
344
348
  data-slot={joinIds('carousel-viewport', props['data-slot'])}
345
349
  className={cn(
346
- 'flex min-w-0 overflow-x-auto overscroll-x-contain snap-x snap-mandatory [touch-action:pan-x_pan-y] gap-[var(--rad-carousel-slide-gap,0px)] rounded-[var(--rad-carousel-radius,var(--rad-surface-radius,0.75rem))] [corner-shape:var(--rad-surface-corner-shape,round)] focus-visible:outline-[color:var(--rad-color-focus)] focus-visible:outline-[length:var(--rad-focus-width,2px)] focus-visible:outline-offset-2',
350
+ 'flex min-w-0 overflow-x-auto overscroll-x-contain snap-x snap-mandatory [touch-action:pan-x_pan-y] gap-[var(--rad-carousel-slide-gap,0px)] rounded-[var(--rad-carousel-radius,var(--rad-surface-radius,0.75rem))] [corner-shape:var(--rad-surface-corner-shape,round)]',
351
+ focusRingClass,
352
+ scrollbarClass,
347
353
  className
348
354
  )}
349
355
  onKeyDown={event => {
@@ -510,6 +516,7 @@ export function CarouselIndicators({
510
516
  tone="neutral"
511
517
  aria-label={indicatorLabel(index, state.count)}
512
518
  aria-current={state.value === item.value ? 'true' : undefined}
519
+ data-selected={state.value === item.value ? '' : undefined}
513
520
  aria-controls={state.viewportId}
514
521
  onClick={() => state.setValue(item.value)}
515
522
  >
@@ -3,12 +3,14 @@
3
3
  import { useCallback, useLayoutEffect, useRef, type ComponentProps, type ReactNode } from 'react'
4
4
  import { cva } from 'class-variance-authority'
5
5
  import { cn } from '../../cn.js'
6
+ import { joinIds } from '../../internal/ids.js'
6
7
  import { useComposedRefs } from '../../react/useComposedRefs.js'
7
8
  import { useNativeOwner, type CheckedOwner } from '../../react/useNativeOwner.js'
8
9
  import { controlBorderClass, controlMetrics, indicatorPressClass } from '../shared/controlStyles.js'
9
10
  import type { ThemeStyle } from '../../themes/defineTheme.js'
10
11
  import type { ControlSize, ControlParts } from '../../presentation.js'
11
12
  import { useFieldControl } from '../Field/Field.js'
13
+ import { focusRingClass } from '../shared/focusStyles.js'
12
14
 
13
15
  const checkboxVariants = cva([
14
16
  controlBorderClass,
@@ -27,11 +29,9 @@ const checkboxVariants = cva([
27
29
  '[box-shadow:var(--rad-control-indicator-shadow,none)]',
28
30
  'checked:[box-shadow:var(--rad-control-indicator-checked-shadow,none)] indeterminate:[box-shadow:var(--rad-control-indicator-checked-shadow,none)]',
29
31
  'data-invalid:[border-color:var(--rad-checkbox-invalid-border,var(--rad-color-invalid,oklch(0.56_0.19_25)))]',
30
- 'focus-visible:outline-solid',
31
- 'focus-visible:[outline-color:var(--rad-checkbox-focus-color,var(--rad-color-focus,oklch(0.55_0.13_255)))]',
32
- 'focus-visible:[outline-width:var(--rad-checkbox-focus-width,var(--rad-focus-width,2px))]',
33
- 'focus-visible:[outline-offset:var(--rad-checkbox-focus-offset,var(--rad-focus-offset,2px))]',
34
- 'focus-visible:[outline-style:var(--rad-checkbox-focus-style,var(--rad-focus-style,solid))]',
32
+ 'in-[[data-slot~=checkbox-group][data-invalid]]:[border-color:var(--rad-checkbox-invalid-border,var(--rad-color-invalid,oklch(0.56_0.19_25)))]',
33
+ focusRingClass,
34
+ 'focus-visible:[--_rad-focus-color:var(--rad-checkbox-focus-color)] focus-visible:[--_rad-focus-width:var(--rad-checkbox-focus-width)] focus-visible:[--_rad-focus-offset:var(--rad-checkbox-focus-offset)] focus-visible:[--_rad-focus-style:var(--rad-checkbox-focus-style)]',
35
35
  'disabled:cursor-not-allowed',
36
36
  'disabled:[border-color:var(--rad-checkbox-disabled-border,var(--rad-color-disabled-border,oklch(0.88_0.005_286)))]',
37
37
  'disabled:checked:bg-[var(--rad-checkbox-disabled-background,var(--rad-color-disabled-background,oklch(0.96_0.005_286)))]',
@@ -63,6 +63,8 @@ export type CheckboxProps = Omit<
63
63
  controlSize?: ControlSize
64
64
  /** Input styles. Parts style the wrapper, label and decorative indicators. */
65
65
  style?: ThemeStyle
66
+ /** Additional composed identities; the checkbox token is always retained. */
67
+ 'data-slot'?: string
66
68
  parts?: ControlParts
67
69
  }
68
70
 
@@ -86,6 +88,7 @@ export function Checkbox({
86
88
  'aria-describedby': ariaDescribedBy,
87
89
  'aria-invalid': ariaInvalid,
88
90
  'aria-required': ariaRequired,
91
+ 'data-slot': slot,
89
92
  ...props
90
93
  }: CheckboxProps) {
91
94
  const controlled = useNativeOwner('Checkbox', checked, defaultChecked)
@@ -134,7 +137,7 @@ export function Checkbox({
134
137
  ref={hostRef}
135
138
  className={cn(checkboxVariants(), controlMetrics({ controlSize }), className)}
136
139
  data-control-size={controlSize}
137
- data-slot="checkbox"
140
+ data-slot={joinIds('checkbox', slot)}
138
141
  type="checkbox"
139
142
  />
140
143
  <svg
@@ -117,7 +117,7 @@ export function CodeBlock({
117
117
  {...props}
118
118
  data-slot={joinIds('code-block', props['data-slot'])}
119
119
  data-language={language}
120
- data-line-numbers={lineNumbers || undefined}
120
+ data-line-numbers={lineNumbers ? '' : undefined}
121
121
  data-copy-state={pending ? 'pending' : phase}
122
122
  className={cn(
123
123
  'box-border min-w-0 w-full overflow-hidden rounded-[var(--rad-code-block-radius,var(--rad-surface-radius,0.75rem))] [corner-shape:var(--rad-surface-corner-shape,round)]',
@@ -176,7 +176,7 @@ export function CodeBlockViewport({
176
176
  orientation={orientation}
177
177
  data-slot={joinIds('code-block-viewport', props['data-slot'])}
178
178
  className={cn(
179
- 'max-h-[var(--rad-code-block-max-height,24rem)] focus-visible:[outline-offset:-3px]',
179
+ 'max-h-[var(--rad-code-block-max-height,24rem)] focus-visible:[--_rad-focus-offset:calc(-1px_-_var(--_rad-focus-width,var(--rad-focus-width,2px)))]',
180
180
  className
181
181
  )}
182
182
  >
@@ -10,6 +10,7 @@ import type { ThemeStyle } from '../../themes/defineTheme.js'
10
10
  import { useControllableState } from '../../react/useControllableState.js'
11
11
  import { useComposedRefs } from '../../react/useComposedRefs.js'
12
12
  import type { StateOwner } from '../../react/useNativeOwner.js'
13
+ import { focusRingClass } from '../shared/focusStyles.js'
13
14
 
14
15
  const colorMotionClass =
15
16
  'transition-colors duration-[var(--rad-motion-color-duration,150ms)] motion-reduce:transition-none'
@@ -46,11 +47,8 @@ const collapsibleTriggerVariants = cva([
46
47
  'rounded-[max(0px,calc(var(--rad-collapsible-radius,var(--rad-surface-radius,0.75rem))-var(--rad-collapsible-border-width,var(--rad-surface-border-width,1px))))]',
47
48
  '[corner-shape:var(--rad-collapsible-corner-shape,var(--rad-surface-corner-shape,round))] [details[open]>&]:rounded-b-none',
48
49
  'hover:bg-[color-mix(in_oklch,var(--rad-color-foreground,oklch(0.21_0.006_286))_4%,transparent)]',
49
- 'focus-visible:outline-solid',
50
- 'focus-visible:[outline-color:var(--rad-collapsible-focus-color,var(--rad-color-focus,oklch(0.55_0.13_255)))]',
51
- 'focus-visible:[outline-width:var(--rad-collapsible-focus-width,var(--rad-focus-width,2px))]',
52
- 'focus-visible:[outline-offset:var(--rad-collapsible-focus-offset,var(--rad-focus-offset,2px))]',
53
- 'focus-visible:[outline-style:var(--rad-collapsible-focus-style,var(--rad-focus-style,solid))]',
50
+ focusRingClass,
51
+ 'focus-visible:[--_rad-focus-color:var(--rad-collapsible-focus-color)] focus-visible:[--_rad-focus-width:var(--rad-collapsible-focus-width)] focus-visible:[--_rad-focus-offset:var(--rad-collapsible-focus-offset)] focus-visible:[--_rad-focus-style:var(--rad-collapsible-focus-style)]',
54
52
  'forced-colors:text-[CanvasText]'
55
53
  ])
56
54
 
@@ -41,6 +41,7 @@ import { useComboboxPopup } from '../../react/useComboboxPopup.js'
41
41
  import type { StateOwner, ValueOwner } from '../../react/useNativeOwner.js'
42
42
  import type { ControlSize } from '../../presentation.js'
43
43
  import type { ThemeStyle } from '../../themes/defineTheme.js'
44
+ import { scrollbarClass } from '../shared/scrollbarStyles.js'
44
45
 
45
46
  export type ComboboxOption = { value: string; disabled?: boolean } & (
46
47
  | { label: string; textValue?: string }
@@ -152,7 +153,13 @@ export function useCommandParts() {
152
153
  if (!box?.command) throw new Error('Command results must render inside Command.')
153
154
  return box
154
155
  }
155
- function componentSlot(multiple: boolean, textMode: boolean, name: string, command = false) {
156
+ function componentSlot(
157
+ multiple: boolean,
158
+ textMode: boolean,
159
+ name: string,
160
+ command = false,
161
+ slot?: string
162
+ ) {
156
163
  return (
157
164
  joinIds(
158
165
  name,
@@ -161,7 +168,8 @@ function componentSlot(multiple: boolean, textMode: boolean, name: string, comma
161
168
  ? name.replaceAll('combobox-', 'multi-select-')
162
169
  : textMode
163
170
  ? name.replaceAll('combobox-', 'autocomplete-')
164
- : undefined
171
+ : undefined,
172
+ slot
165
173
  ) ?? name
166
174
  )
167
175
  }
@@ -561,6 +569,7 @@ export function ComboboxRoot(
561
569
  type="text"
562
570
  className="sr-only"
563
571
  data-slot="combobox-native multi-select-native"
572
+ data-form-name={name}
564
573
  form={form}
565
574
  disabled={disabled}
566
575
  readOnly={readOnly}
@@ -626,7 +635,7 @@ export type ComboboxInputProps = Omit<
626
635
  | 'aria-expanded'
627
636
  | 'aria-autocomplete'
628
637
  | 'aria-activedescendant'
629
- > & { style?: ThemeStyle }
638
+ > & { style?: ThemeStyle; 'data-slot'?: string }
630
639
  export function ComboboxInput({
631
640
  className,
632
641
  ref,
@@ -663,10 +672,17 @@ export function ComboboxInput({
663
672
  controlMetrics({ controlSize: box.controlSize }),
664
673
  className
665
674
  )}
666
- data-slot={componentSlot(box.multiple, !!box.textInput, 'combobox-input', !!box.command)}
675
+ data-slot={componentSlot(
676
+ box.multiple,
677
+ !!box.textInput,
678
+ 'combobox-input',
679
+ !!box.command,
680
+ props['data-slot']
681
+ )}
667
682
  data-control-size={box.controlSize}
668
683
  aria-autocomplete="list"
669
684
  aria-expanded={box.open}
685
+ data-state={box.open ? 'open' : 'closed'}
670
686
  aria-controls={box.open ? box.listId : undefined}
671
687
  aria-activedescendant={box.open && box.active !== null ? box.optionId(box.active) : undefined}
672
688
  onChange={event => {
@@ -828,7 +844,14 @@ export function ComboboxTrigger({
828
844
  aria-label={props['aria-label'] ?? (box.textInput ? 'Show suggestions' : 'Show options')}
829
845
  aria-controls={box.open ? box.listId : undefined}
830
846
  aria-expanded={box.open}
831
- data-slot={componentSlot(box.multiple, !!box.textInput, 'button combobox-trigger')}
847
+ data-state={box.open ? 'open' : 'closed'}
848
+ data-slot={componentSlot(
849
+ box.multiple,
850
+ !!box.textInput,
851
+ 'button combobox-trigger',
852
+ false,
853
+ props['data-slot']
854
+ )}
832
855
  onPointerDown={event => {
833
856
  onPointerDown?.(event)
834
857
  if (!event.defaultPrevented) event.preventDefault()
@@ -896,7 +919,13 @@ export function ComboboxClear({
896
919
  }}
897
920
  tabIndex={box.multiple ? 0 : -1}
898
921
  aria-label={props['aria-label'] ?? (box.textInput ? 'Clear text' : 'Clear selection')}
899
- data-slot={componentSlot(box.multiple, !!box.textInput, 'button combobox-clear')}
922
+ data-slot={componentSlot(
923
+ box.multiple,
924
+ !!box.textInput,
925
+ 'button combobox-clear',
926
+ false,
927
+ props['data-slot']
928
+ )}
900
929
  onPointerDown={event => {
901
930
  onPointerDown?.(event)
902
931
  if (!event.defaultPrevented) event.preventDefault()
@@ -936,6 +965,7 @@ export type ComboboxContentProps = Omit<
936
965
  sideOffset?: number
937
966
  collisionPadding?: number
938
967
  motion?: 'inherit' | 'off'
968
+ 'data-slot'?: string
939
969
  }
940
970
  export function ComboboxContent({
941
971
  children,
@@ -959,7 +989,13 @@ export function ComboboxContent({
959
989
  {...props}
960
990
  ref={transitionRef}
961
991
  popover="manual"
962
- data-slot={componentSlot(box.multiple, !!box.textInput, 'combobox-content', !!box.command)}
992
+ data-slot={componentSlot(
993
+ box.multiple,
994
+ !!box.textInput,
995
+ 'combobox-content',
996
+ !!box.command,
997
+ props['data-slot']
998
+ )}
963
999
  data-motion={motion}
964
1000
  data-state={box.open ? 'open' : 'closed'}
965
1001
  className={cn(
@@ -998,6 +1034,7 @@ function ComboboxResults({
998
1034
  data-slot={componentSlot(box.multiple, !!box.textInput, 'combobox-listbox', !!box.command)}
999
1035
  className={cn(
1000
1036
  'min-h-0 overflow-y-auto overscroll-contain',
1037
+ scrollbarClass,
1001
1038
  !inline && 'max-h-[calc(var(--_rad-combobox-max-height,100dvh)-0.5rem)]'
1002
1039
  )}
1003
1040
  >
@@ -1019,14 +1056,14 @@ export function ComboboxInlineContent({
1019
1056
  className,
1020
1057
  ref,
1021
1058
  ...props
1022
- }: Omit<ComponentProps<'div'>, 'style'> & { style?: ThemeStyle }) {
1059
+ }: Omit<ComponentProps<'div'>, 'style'> & { style?: ThemeStyle; 'data-slot'?: string }) {
1023
1060
  const box = useCommandParts()
1024
1061
  const contentRef = useComposedRefs(box.content, ref)
1025
1062
  return (
1026
1063
  <div
1027
1064
  {...props}
1028
1065
  ref={contentRef}
1029
- data-slot="combobox-content command-list"
1066
+ data-slot={joinIds('combobox-content', 'command-list', props['data-slot'])}
1030
1067
  className={cn(
1031
1068
  'flex min-h-0 min-w-0 flex-col overflow-hidden',
1032
1069
  controlMetrics({ controlSize: box.controlSize }),
@@ -1045,7 +1082,7 @@ export function ComboboxInlineContent({
1045
1082
  export type ComboboxItemProps = Omit<
1046
1083
  ComponentProps<'div'>,
1047
1084
  'style' | 'id' | 'role' | 'tabIndex'
1048
- > & { value: string; style?: ThemeStyle }
1085
+ > & { value: string; style?: ThemeStyle; 'data-slot'?: string }
1049
1086
  export function ComboboxItem({
1050
1087
  value,
1051
1088
  children,
@@ -1067,7 +1104,13 @@ export function ComboboxItem({
1067
1104
  onKeyDown={props.onKeyDown}
1068
1105
  aria-selected={box.multiple ? isItemOpen(box.value, value) : box.active === value}
1069
1106
  aria-disabled={item.disabled || undefined}
1070
- data-slot={componentSlot(box.multiple, !!box.textInput, 'combobox-item', !!box.command)}
1107
+ data-slot={componentSlot(
1108
+ box.multiple,
1109
+ !!box.textInput,
1110
+ 'combobox-item',
1111
+ !!box.command,
1112
+ props['data-slot']
1113
+ )}
1071
1114
  data-value={value}
1072
1115
  data-highlighted={box.active === value ? '' : undefined}
1073
1116
  data-selected={isItemOpen(box.value, value) ? '' : undefined}
@@ -1103,6 +1146,7 @@ export function ComboboxItem({
1103
1146
  }
1104
1147
  export type ComboboxStatusProps = Omit<ComponentProps<'div'>, 'style' | 'role'> & {
1105
1148
  style?: ThemeStyle
1149
+ 'data-slot'?: string
1106
1150
  }
1107
1151
  export function ComboboxStatus({ children, className, ...props }: ComboboxStatusProps) {
1108
1152
  const box = useComboboxContext()
@@ -1112,7 +1156,13 @@ export function ComboboxStatus({ children, className, ...props }: ComboboxStatus
1112
1156
  role="status"
1113
1157
  aria-live="polite"
1114
1158
  aria-atomic="true"
1115
- data-slot={componentSlot(box.multiple, !!box.textInput, 'combobox-status', !!box.command)}
1159
+ data-slot={componentSlot(
1160
+ box.multiple,
1161
+ !!box.textInput,
1162
+ 'combobox-status',
1163
+ !!box.command,
1164
+ props['data-slot']
1165
+ )}
1116
1166
  className={cn('px-3 py-2 empty:hidden', className)}
1117
1167
  >
1118
1168
  {box.open ? (children ?? box.status) : null}
@@ -1122,14 +1172,22 @@ export function ComboboxStatus({ children, className, ...props }: ComboboxStatus
1122
1172
 
1123
1173
  export type ComboboxTagsProps = Omit<ComponentProps<'div'>, 'children' | 'style'> & {
1124
1174
  style?: ThemeStyle
1175
+ 'data-slot'?: string
1176
+ /** Names each tag's removal Button from the option's text. */
1177
+ removeLabel?: (text: string) => string
1125
1178
  }
1126
- export function ComboboxTags({ className, ...props }: ComboboxTagsProps) {
1179
+ const defaultRemoveLabel = (text: string) => `Remove ${text}`
1180
+ export function ComboboxTags({
1181
+ removeLabel = defaultRemoveLabel,
1182
+ className,
1183
+ ...props
1184
+ }: ComboboxTagsProps) {
1127
1185
  const box = useComboboxContext()
1128
1186
  if (!box.multiple) throw new Error('ComboboxTags requires a multiple Combobox.')
1129
1187
  return (
1130
1188
  <div
1131
1189
  {...props}
1132
- data-slot="combobox-tags multi-select-tags"
1190
+ data-slot={joinIds('combobox-tags', 'multi-select-tags', props['data-slot'])}
1133
1191
  className={cn(
1134
1192
  'flex flex-wrap items-center gap-[var(--rad-multi-select-gap,0.5rem)] mb-[var(--rad-multi-select-gap,0.5rem)] empty:hidden',
1135
1193
  className
@@ -1139,7 +1197,7 @@ export function ComboboxTags({ className, ...props }: ComboboxTagsProps) {
1139
1197
  <Tag
1140
1198
  key={item.value}
1141
1199
  data-slot="multi-select-tag"
1142
- removeLabel={`Remove ${textOf(item)}`}
1200
+ removeLabel={removeLabel(textOf(item))}
1143
1201
  disabled={box.disabled || box.readOnly}
1144
1202
  onRemove={() => box.remove(item.value)}
1145
1203
  >
@@ -1,4 +1,5 @@
1
1
  import { controlBorderClass } from '../shared/controlStyles.js'
2
+ import { focusRingClass } from '../shared/focusStyles.js'
2
3
 
3
4
  export const comboboxInputClass = [
4
5
  controlBorderClass,
@@ -8,7 +9,8 @@ export const comboboxInputClass = [
8
9
  '[color:var(--rad-combobox-color,var(--rad-color-foreground,oklch(0.21_0.006_286)))] bg-[var(--rad-combobox-background,var(--rad-control-field-background,var(--rad-color-surface,white)))]',
9
10
  '[border-width:var(--rad-combobox-border-width,var(--rad-control-border-width,1px))] [border-style:var(--rad-combobox-border-style,var(--rad-control-border-style,solid))] [border-color:var(--rad-combobox-border-color,var(--rad-control-field-border-color,var(--_rad-control-border)))]',
10
11
  'rounded-[var(--rad-combobox-radius,var(--rad-control-radius,0.5rem))] [corner-shape:var(--rad-combobox-corner-shape,var(--rad-control-corner-shape,round))] [box-shadow:var(--rad-combobox-shadow,var(--rad-control-field-shadow,none))] [backdrop-filter:var(--rad-control-field-backdrop-filter,none)]',
11
- 'focus-visible:outline-solid focus-visible:[outline-color:var(--rad-combobox-focus-color,var(--rad-color-focus))] focus-visible:[outline-width:var(--rad-focus-width,2px)] focus-visible:[outline-offset:var(--rad-focus-offset,2px)]',
12
+ focusRingClass,
13
+ 'focus-visible:[--_rad-focus-color:var(--rad-combobox-focus-color)] focus-visible:[--_rad-focus-width:var(--rad-combobox-focus-width)] focus-visible:[--_rad-focus-offset:var(--rad-combobox-focus-offset)] focus-visible:[--_rad-focus-style:var(--rad-combobox-focus-style)]',
12
14
  'data-invalid:[border-color:var(--rad-color-invalid)] placeholder:[color:var(--rad-combobox-placeholder,var(--rad-color-placeholder))] disabled:cursor-not-allowed disabled:bg-[var(--rad-color-disabled-background)]',
13
15
  'forced-colors:border-[CanvasText] forced-colors:bg-[Canvas] forced-colors:text-[CanvasText] forced-colors:disabled:text-[GrayText]'
14
16
  ].join(' ')
@@ -39,6 +41,7 @@ export const comboboxItemClass = [
39
41
  export const comboboxActionClass = [
40
42
  'inline-flex shrink-0 items-center justify-center border-0 bg-transparent p-0 [font:inherit]',
41
43
  '[color:var(--rad-combobox-color,var(--rad-color-foreground))] shadow-none cursor-pointer',
42
- 'focus-visible:outline-solid focus-visible:[outline-color:var(--rad-combobox-focus-color,var(--rad-color-focus))] focus-visible:[outline-width:var(--rad-focus-width,2px)] focus-visible:[outline-offset:var(--rad-focus-offset,2px)]',
44
+ focusRingClass,
45
+ 'focus-visible:[--_rad-focus-color:var(--rad-combobox-focus-color)] focus-visible:[--_rad-focus-width:var(--rad-combobox-focus-width)] focus-visible:[--_rad-focus-offset:var(--rad-combobox-focus-offset)] focus-visible:[--_rad-focus-style:var(--rad-combobox-focus-style)]',
43
46
  'disabled:cursor-not-allowed forced-colors:text-[CanvasText] forced-colors:disabled:text-[GrayText]'
44
47
  ].join(' ')
@@ -59,7 +59,7 @@ export type CommandContentProps = DialogContentProps
59
59
  export type CommandTitleProps = DialogTitleProps
60
60
  export type CommandDescriptionProps = DialogDescriptionProps
61
61
  export type CommandInputProps = Omit<ComboboxInputProps, 'aria-label' | 'aria-labelledby'> &
62
- (AccessibleName | { 'aria-label'?: undefined; 'aria-labelledby'?: undefined })
62
+ AccessibleName
63
63
  export type CommandListProps = Omit<ComponentProps<'div'>, 'style' | 'role' | 'id'> & {
64
64
  style?: ThemeStyle
65
65
  }
@@ -210,17 +210,10 @@ export function CommandDescription(props: CommandDescriptionProps) {
210
210
  export function CommandInput({ className, ...props }: CommandInputProps) {
211
211
  useCommandContext()
212
212
  useCommandParts()
213
- const name = {
214
- 'aria-label': props['aria-labelledby']
215
- ? props['aria-label']
216
- : (props['aria-label'] ?? 'Search commands'),
217
- 'aria-labelledby': props['aria-labelledby']
218
- }
219
- requireAccessibleName('CommandInput', name)
213
+ requireAccessibleName('CommandInput', props)
220
214
  return (
221
215
  <ComboboxInput
222
216
  {...props}
223
- {...name}
224
217
  className={cn('shrink-0 pe-[var(--_rad-control-padding,1rem)]', className)}
225
218
  />
226
219
  )
@@ -47,6 +47,7 @@ import { joinIds } from '../../internal/ids.js'
47
47
  import { cn } from '../../cn.js'
48
48
  import { useComposedRefs } from '../../react/useComposedRefs.js'
49
49
  import type { ThemeStyle } from '../../themes/defineTheme.js'
50
+ import { focusRingClass } from '../shared/focusStyles.js'
50
51
 
51
52
  type Point = { x: number; y: number }
52
53
  export type ContextMenuProps = MenuProps
@@ -160,10 +161,7 @@ export function ContextMenuTrigger({
160
161
  data-state={menu.open ? 'open' : 'closed'}
161
162
  aria-controls={menu.contentId}
162
163
  data-slot={joinIds('context-menu-trigger', props['data-slot'])}
163
- className={cn(
164
- 'focus-visible:outline-solid focus-visible:[outline-color:var(--rad-color-focus,oklch(0.55_0.13_255))] focus-visible:[outline-width:var(--rad-focus-width,2px)] focus-visible:[outline-offset:var(--rad-focus-offset,2px)] forced-colors:focus-visible:outline-[Highlight]',
165
- className
166
- )}
164
+ className={cn(focusRingClass, className)}
167
165
  onContextMenu={event => {
168
166
  onContextMenu?.(event)
169
167
  if (event.defaultPrevented) return
@@ -14,6 +14,8 @@ import { useControllableState } from '../../react/useControllableState.js'
14
14
  import type { StateOwner } from '../../react/useNativeOwner.js'
15
15
  import type { WithoutToggle } from '../../internal/types.js'
16
16
  import type { ThemeStyle } from '../../themes/defineTheme.js'
17
+ import { scrollbarClass } from '../shared/scrollbarStyles.js'
18
+ import { focusRingClass } from '../shared/focusStyles.js'
17
19
 
18
20
  const colorMotionClass =
19
21
  'transition-colors duration-[var(--rad-motion-color-duration,150ms)] motion-reduce:transition-none'
@@ -24,6 +26,7 @@ const dialogVariants = cva([
24
26
  'box-border text-start antialiased',
25
27
  '[&:not([open])]:hidden!',
26
28
  'open:m-auto open:grid open:overflow-auto open:overscroll-contain',
29
+ scrollbarClass,
27
30
  'open:max-h-[min(40rem,calc(100dvh-2rem))]',
28
31
  'open:w-[min(calc(100%-2rem),var(--rad-dialog-width,32rem))]',
29
32
  'open:gap-[var(--rad-dialog-gap,var(--rad-surface-gap,1rem))]',
@@ -38,11 +41,8 @@ const dialogVariants = cva([
38
41
  '[color:var(--rad-dialog-color,var(--rad-color-foreground,oklch(0.21_0.006_286)))]',
39
42
  '[box-shadow:var(--rad-dialog-shadow,var(--rad-surface-overlay-shadow,0_24px_64px_-16px_rgb(0_0_0/0.3)))]',
40
43
  'backdrop:[background:var(--rad-dialog-backdrop,var(--rad-surface-backdrop,rgb(0_0_0/0.45)))]',
41
- 'focus-visible:outline-solid',
42
- 'focus-visible:[outline-color:var(--rad-dialog-focus-color,var(--rad-color-focus,oklch(0.55_0.13_255)))]',
43
- 'focus-visible:[outline-width:var(--rad-dialog-focus-width,var(--rad-focus-width,2px))]',
44
- 'focus-visible:[outline-offset:var(--rad-dialog-focus-offset,var(--rad-focus-offset,2px))]',
45
- 'focus-visible:[outline-style:var(--rad-dialog-focus-style,var(--rad-focus-style,solid))]',
44
+ focusRingClass,
45
+ 'focus-visible:[--_rad-focus-color:var(--rad-dialog-focus-color)] focus-visible:[--_rad-focus-width:var(--rad-dialog-focus-width)] focus-visible:[--_rad-focus-offset:var(--rad-dialog-focus-offset)] focus-visible:[--_rad-focus-style:var(--rad-dialog-focus-style)]',
46
46
  'forced-colors:border-[CanvasText] forced-colors:bg-[Canvas] forced-colors:text-[CanvasText]',
47
47
  'forced-colors:backdrop:[background:CanvasText]'
48
48
  ])
@@ -98,11 +98,18 @@ export type DialogContentProps = Omit<ComponentProps<'dialog'>, 'open' | 'style'
98
98
  style?: ThemeStyle
99
99
  /** Opt-in MotionProvider presentation; native close and focus never wait for an exit. */
100
100
  motion?: 'inherit' | 'off'
101
+ 'data-slot'?: string
101
102
  }
102
103
 
103
- export type DialogTitleProps = Omit<ComponentProps<'h2'>, 'style'> & { style?: ThemeStyle }
104
+ export type DialogTitleProps = Omit<ComponentProps<'h2'>, 'style'> & {
105
+ style?: ThemeStyle
106
+ 'data-slot'?: string
107
+ }
104
108
 
105
- export type DialogDescriptionProps = Omit<ComponentProps<'p'>, 'style'> & { style?: ThemeStyle }
109
+ export type DialogDescriptionProps = Omit<ComponentProps<'p'>, 'style'> & {
110
+ style?: ThemeStyle
111
+ 'data-slot'?: string
112
+ }
106
113
 
107
114
  export type DialogCloseProps = DialogTriggerProps
108
115
 
@@ -196,7 +203,8 @@ function DialogAction({ action, ...props }: DialogTriggerProps & { action: 'open
196
203
  ? {
197
204
  'aria-haspopup': 'dialog',
198
205
  'aria-expanded': dialog.open,
199
- 'aria-controls': dialog.contentId
206
+ 'aria-controls': dialog.contentId,
207
+ 'data-state': dialog.open ? 'open' : 'closed'
200
208
  }
201
209
  : {}),
202
210
  'data-slot': joinIds(
@@ -277,7 +285,11 @@ export function DialogContent({
277
285
  aria-describedby={joinIds(dialog.descriptionId, props['aria-describedby'])}
278
286
  aria-labelledby={props['aria-label'] ? props['aria-labelledby'] : dialog.titleId}
279
287
  className={cn(dialogVariants(), className)}
280
- data-slot={family === 'dialog' ? 'dialog' : `dialog ${family}`}
288
+ data-slot={joinIds(
289
+ 'dialog-content',
290
+ family === 'dialog' ? undefined : `${family}-content`,
291
+ props['data-slot']
292
+ )}
281
293
  data-state={dialog.open ? 'open' : 'closed'}
282
294
  id={dialog.contentId}
283
295
  onCancel={event => {
@@ -311,7 +323,11 @@ export function DialogTitle({ className, children, ...props }: DialogTitleProps)
311
323
  <h2
312
324
  {...props}
313
325
  className={cn(dialogTitleVariants(), className)}
314
- data-slot={family === 'dialog' ? 'dialog-title' : `dialog-title ${family}-title`}
326
+ data-slot={joinIds(
327
+ 'dialog-title',
328
+ family === 'dialog' ? undefined : `${family}-title`,
329
+ props['data-slot']
330
+ )}
315
331
  id={dialog.titleId}
316
332
  >
317
333
  {children}
@@ -326,9 +342,11 @@ export function DialogDescription({ className, ...props }: DialogDescriptionProp
326
342
  <p
327
343
  {...props}
328
344
  className={cn(dialogDescriptionVariants(), className)}
329
- data-slot={
330
- family === 'dialog' ? 'dialog-description' : `dialog-description ${family}-description`
331
- }
345
+ data-slot={joinIds(
346
+ 'dialog-description',
347
+ family === 'dialog' ? undefined : `${family}-description`,
348
+ props['data-slot']
349
+ )}
332
350
  id={dialog.descriptionId}
333
351
  />
334
352
  )
@@ -28,6 +28,7 @@ import { useControllableState } from '../../react/useControllableState.js'
28
28
  import { useDrawerHost } from '../../motion/host.js'
29
29
  import type { PartStyle } from '../../presentation.js'
30
30
  import type { StateOwner } from '../../react/useNativeOwner.js'
31
+ import { scrollbarClass } from '../shared/scrollbarStyles.js'
31
32
 
32
33
  export type { DrawerSide } from '../../internal/drawer.js'
33
34
  export type DrawerProps = DialogProps &
@@ -151,6 +152,7 @@ const surface = [
151
152
  ]
152
153
  const viewport = [
153
154
  'absolute inset-y-0 left-0 grid content-start box-border min-w-0 min-h-0 overflow-auto overscroll-contain max-w-full max-h-full',
155
+ scrollbarClass,
154
156
  'w-[var(--_rad-drawer-visible,100%)]',
155
157
  '[[data-physical-side=left]>&]:left-auto [[data-physical-side=left]>&]:right-0',
156
158
  '[[data-physical-side=top]>&]:inset-x-0 [[data-physical-side=top]>&]:top-auto [[data-physical-side=top]>&]:bottom-0 [[data-physical-side=top]>&]:w-full [[data-physical-side=top]>&]:h-[var(--_rad-drawer-visible,100%)]',
@@ -9,7 +9,7 @@ export type FieldsetProps = Omit<
9
9
  > & {
10
10
  /** Names the group; nested Fields keep their individual labels. */
11
11
  legend: ReactNode
12
- parts?: { legend?: PartStyle; description?: PartStyle; error?: PartStyle }
12
+ parts?: { label?: PartStyle; description?: PartStyle; error?: PartStyle }
13
13
  }
14
14
  /** Native grouping built on Field's existing relationships and disabled context. */
15
15
  export function Fieldset({ legend, parts, className, ...props }: FieldsetProps) {
@@ -26,10 +26,10 @@ export function Fieldset({ legend, parts, className, ...props }: FieldsetProps)
26
26
  )}
27
27
  parts={{
28
28
  label: {
29
- ...parts?.legend,
29
+ ...parts?.label,
30
30
  className: cn(
31
31
  'max-w-full mb-[var(--rad-fieldset-gap,var(--rad-spacing-group-gap,0.75rem))]',
32
- parts?.legend?.className
32
+ parts?.label?.className
33
33
  )
34
34
  },
35
35
  description: parts?.description,