@appica/ui-react 1.2.0 → 1.3.1

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 (172) hide show
  1. package/CHANGELOG.md +61 -15
  2. package/agent-rules.md +2 -0
  3. package/appica.css +1 -1
  4. package/dist/components/alert-dialog/alert-dialog.js +1 -1
  5. package/dist/components/alert-dialog/alert-dialog.js.map +1 -1
  6. package/dist/components/autocomplete/autocomplete.d.ts.map +1 -1
  7. package/dist/components/autocomplete/autocomplete.js +3 -7
  8. package/dist/components/autocomplete/autocomplete.js.map +1 -1
  9. package/dist/components/badge/badge.js +1 -1
  10. package/dist/components/badge/badge.js.map +1 -1
  11. package/dist/components/breadcrumb/breadcrumb.js +2 -2
  12. package/dist/components/breadcrumb/breadcrumb.js.map +1 -1
  13. package/dist/components/button/button-variants.js +1 -1
  14. package/dist/components/button/button-variants.js.map +1 -1
  15. package/dist/components/calendar/calendar.js +1 -1
  16. package/dist/components/calendar/calendar.js.map +1 -1
  17. package/dist/components/carousel/carousel.d.ts +2 -10
  18. package/dist/components/carousel/carousel.d.ts.map +1 -1
  19. package/dist/components/carousel/carousel.js +153 -33
  20. package/dist/components/carousel/carousel.js.map +1 -1
  21. package/dist/components/color-area/color-area.d.ts.map +1 -1
  22. package/dist/components/color-area/color-area.js +1 -0
  23. package/dist/components/color-area/color-area.js.map +1 -1
  24. package/dist/components/color-slider/color-slider.d.ts.map +1 -1
  25. package/dist/components/color-slider/color-slider.js +1 -0
  26. package/dist/components/color-slider/color-slider.js.map +1 -1
  27. package/dist/components/color-swatch-picker/color-swatch-picker.js +1 -1
  28. package/dist/components/color-swatch-picker/color-swatch-picker.js.map +1 -1
  29. package/dist/components/combobox/combobox.d.ts +5 -4
  30. package/dist/components/combobox/combobox.d.ts.map +1 -1
  31. package/dist/components/combobox/combobox.js +5 -8
  32. package/dist/components/combobox/combobox.js.map +1 -1
  33. package/dist/components/compare-slider/compare-slider.d.ts +50 -0
  34. package/dist/components/compare-slider/compare-slider.d.ts.map +1 -0
  35. package/dist/components/compare-slider/compare-slider.js +321 -0
  36. package/dist/components/compare-slider/compare-slider.js.map +1 -0
  37. package/dist/components/context-menu/context-menu.js +1 -1
  38. package/dist/components/context-menu/context-menu.js.map +1 -1
  39. package/dist/components/copy-button/copy-button.d.ts +2 -2
  40. package/dist/components/copy-button/copy-button.d.ts.map +1 -1
  41. package/dist/components/copy-button/copy-button.js +49 -46
  42. package/dist/components/copy-button/copy-button.js.map +1 -1
  43. package/dist/components/date-field/date-field.d.ts.map +1 -1
  44. package/dist/components/date-field/date-field.js +7 -0
  45. package/dist/components/date-field/date-field.js.map +1 -1
  46. package/dist/components/date-picker/date-picker.d.ts +10 -0
  47. package/dist/components/date-picker/date-picker.d.ts.map +1 -1
  48. package/dist/components/date-picker/date-picker.js +14 -0
  49. package/dist/components/date-picker/date-picker.js.map +1 -1
  50. package/dist/components/dialog/dialog.js +1 -1
  51. package/dist/components/dialog/dialog.js.map +1 -1
  52. package/dist/components/dropdown-menu/dropdown-menu.d.ts +13 -2
  53. package/dist/components/dropdown-menu/dropdown-menu.d.ts.map +1 -1
  54. package/dist/components/dropdown-menu/dropdown-menu.js +109 -4
  55. package/dist/components/dropdown-menu/dropdown-menu.js.map +1 -1
  56. package/dist/components/field/field.d.ts.map +1 -1
  57. package/dist/components/field/field.js +1 -0
  58. package/dist/components/field/field.js.map +1 -1
  59. package/dist/components/loader/loader.d.ts +1 -1
  60. package/dist/components/loader/loader.d.ts.map +1 -1
  61. package/dist/components/loader/loader.js +7 -5
  62. package/dist/components/loader/loader.js.map +1 -1
  63. package/dist/components/navigation/navigation-link-variants.js +1 -1
  64. package/dist/components/navigation/navigation-link-variants.js.map +1 -1
  65. package/dist/components/navigation-menu/navigation-menu.js +1 -1
  66. package/dist/components/navigation-menu/navigation-menu.js.map +1 -1
  67. package/dist/components/number-field/number-field.d.ts +1 -1
  68. package/dist/components/number-field/number-field.d.ts.map +1 -1
  69. package/dist/components/number-field/number-field.js +7 -0
  70. package/dist/components/number-field/number-field.js.map +1 -1
  71. package/dist/components/pagination/pagination.d.ts.map +1 -1
  72. package/dist/components/pagination/pagination.js +1 -2
  73. package/dist/components/pagination/pagination.js.map +1 -1
  74. package/dist/components/popover/popover.js +1 -1
  75. package/dist/components/popover/popover.js.map +1 -1
  76. package/dist/components/preview-card/preview-card.js +1 -1
  77. package/dist/components/preview-card/preview-card.js.map +1 -1
  78. package/dist/components/select/select.js +2 -2
  79. package/dist/components/select/select.js.map +1 -1
  80. package/dist/components/slider/slider.d.ts.map +1 -1
  81. package/dist/components/slider/slider.js +2 -1
  82. package/dist/components/slider/slider.js.map +1 -1
  83. package/dist/components/sparkline/sparkline.d.ts.map +1 -1
  84. package/dist/components/sparkline/sparkline.js +1 -0
  85. package/dist/components/sparkline/sparkline.js.map +1 -1
  86. package/dist/components/spinner/spinner.d.ts +1 -1
  87. package/dist/components/spinner/spinner.d.ts.map +1 -1
  88. package/dist/components/spinner/spinner.js +7 -5
  89. package/dist/components/spinner/spinner.js.map +1 -1
  90. package/dist/components/tabs/tabs.js +1 -1
  91. package/dist/components/tabs/tabs.js.map +1 -1
  92. package/dist/components/thumbnail/thumbnail.d.ts +6 -1
  93. package/dist/components/thumbnail/thumbnail.d.ts.map +1 -1
  94. package/dist/components/thumbnail/thumbnail.js +2 -0
  95. package/dist/components/thumbnail/thumbnail.js.map +1 -1
  96. package/dist/components/time-field/time-field.d.ts.map +1 -1
  97. package/dist/components/time-field/time-field.js +7 -0
  98. package/dist/components/time-field/time-field.js.map +1 -1
  99. package/dist/components/tooltip/tooltip.js +1 -1
  100. package/dist/components/tooltip/tooltip.js.map +1 -1
  101. package/dist/hooks/use-media-query.d.ts +0 -4
  102. package/dist/hooks/use-media-query.d.ts.map +1 -1
  103. package/dist/hooks/use-media-query.js.map +1 -1
  104. package/dist/index.d.ts +1 -0
  105. package/dist/index.d.ts.map +1 -1
  106. package/dist/index.js +3 -2
  107. package/dist/index.js.map +1 -1
  108. package/dist/internal/utils.d.ts.map +1 -1
  109. package/dist/internal/utils.js +2 -1
  110. package/dist/internal/utils.js.map +1 -1
  111. package/package.json +28 -23
  112. package/src/components/alert-dialog/alert-dialog.tsx +1 -1
  113. package/src/components/autocomplete/autocomplete.test.tsx +33 -0
  114. package/src/components/autocomplete/autocomplete.tsx +3 -7
  115. package/src/components/badge/badge.tsx +1 -1
  116. package/src/components/breadcrumb/breadcrumb.test.tsx +57 -2
  117. package/src/components/breadcrumb/breadcrumb.tsx +2 -2
  118. package/src/components/button/button-variants.ts +1 -1
  119. package/src/components/calendar/calendar.tsx +1 -1
  120. package/src/components/carousel/carousel.test.tsx +526 -12
  121. package/src/components/carousel/carousel.tsx +173 -42
  122. package/src/components/chip/chip.test.tsx +4 -5
  123. package/src/components/color-area/color-area.test.tsx +5 -0
  124. package/src/components/color-area/color-area.tsx +1 -0
  125. package/src/components/color-slider/color-slider.test.tsx +5 -0
  126. package/src/components/color-slider/color-slider.tsx +1 -0
  127. package/src/components/color-swatch-picker/color-swatch-picker.tsx +1 -1
  128. package/src/components/combobox/combobox.test.tsx +66 -0
  129. package/src/components/combobox/combobox.tsx +14 -11
  130. package/src/components/compare-slider/compare-slider.test.tsx +261 -0
  131. package/src/components/compare-slider/compare-slider.tsx +397 -0
  132. package/src/components/context-menu/context-menu.test.tsx +2 -1
  133. package/src/components/context-menu/context-menu.tsx +1 -1
  134. package/src/components/copy-button/copy-button.test.tsx +68 -3
  135. package/src/components/copy-button/copy-button.tsx +49 -43
  136. package/src/components/date-field/date-field.test.tsx +82 -0
  137. package/src/components/date-field/date-field.tsx +7 -0
  138. package/src/components/date-picker/date-picker.test.tsx +70 -0
  139. package/src/components/date-picker/date-picker.tsx +26 -0
  140. package/src/components/dialog/dialog.tsx +1 -1
  141. package/src/components/dropdown-menu/dropdown-menu.test.tsx +190 -1
  142. package/src/components/dropdown-menu/dropdown-menu.tsx +129 -3
  143. package/src/components/field/field.test.tsx +34 -0
  144. package/src/components/field/field.tsx +1 -0
  145. package/src/components/loader/loader.test.tsx +17 -4
  146. package/src/components/loader/loader.tsx +2 -2
  147. package/src/components/navigation/navigation-link-variants.ts +1 -1
  148. package/src/components/navigation-menu/navigation-menu.tsx +2 -2
  149. package/src/components/number-field/number-field.test.tsx +59 -0
  150. package/src/components/number-field/number-field.tsx +8 -0
  151. package/src/components/pagination/pagination.test.tsx +83 -0
  152. package/src/components/pagination/pagination.tsx +1 -2
  153. package/src/components/popover/popover.tsx +1 -1
  154. package/src/components/preview-card/preview-card.tsx +1 -1
  155. package/src/components/select/select.tsx +2 -2
  156. package/src/components/slider/slider.test.tsx +5 -0
  157. package/src/components/slider/slider.tsx +2 -1
  158. package/src/components/sparkline/sparkline.test.tsx +16 -0
  159. package/src/components/sparkline/sparkline.tsx +1 -0
  160. package/src/components/spinner/spinner.test.tsx +17 -4
  161. package/src/components/spinner/spinner.tsx +2 -2
  162. package/src/components/tabs/tabs.tsx +1 -1
  163. package/src/components/thumbnail/thumbnail.test.tsx +8 -0
  164. package/src/components/thumbnail/thumbnail.tsx +7 -0
  165. package/src/components/time-field/time-field.test.tsx +64 -0
  166. package/src/components/time-field/time-field.tsx +7 -0
  167. package/src/components/tooltip/tooltip.tsx +1 -1
  168. package/src/hooks/use-media-query.ts +0 -4
  169. package/src/index.ts +1 -0
  170. package/src/internal/utils.test.tsx +8 -1
  171. package/src/internal/utils.ts +4 -1
  172. package/styles.css +4 -0
@@ -24,6 +24,35 @@ describe('CopyButton', () => {
24
24
  expect(screen.getByText('Copy SVG')).toBeInTheDocument()
25
25
  })
26
26
 
27
+ it('names the button from its visible children instead of an aria-label', () => {
28
+ render(
29
+ <CopyButton value="hello" label="Copy markup">
30
+ Copy SVG
31
+ </CopyButton>,
32
+ )
33
+ const button = screen.getByRole('button', { name: 'Copy SVG' })
34
+ expect(button).not.toHaveAttribute('aria-label')
35
+ })
36
+
37
+ it('keeps the aria-label on an icon-only button', () => {
38
+ render(<CopyButton value="hello" label="Copy code" />)
39
+ expect(screen.getByRole('button', { name: 'Copy code' })).toHaveAttribute('aria-label', 'Copy code')
40
+ })
41
+
42
+ it('treats empty children as icon-only', () => {
43
+ render(<CopyButton value="hello">{false}</CopyButton>)
44
+ expect(screen.getByRole('button')).toHaveAttribute('aria-label', 'Copy')
45
+ })
46
+
47
+ it('lets an explicit aria-label win', () => {
48
+ render(
49
+ <CopyButton value="hello" aria-label="Copy the install command">
50
+ Copy
51
+ </CopyButton>,
52
+ )
53
+ expect(screen.getByRole('button', { name: 'Copy the install command' })).toBeInTheDocument()
54
+ })
55
+
27
56
  it('swaps a string label to the copied label on success', async () => {
28
57
  const { user } = setup()
29
58
  render(
@@ -32,11 +61,39 @@ describe('CopyButton', () => {
32
61
  </CopyButton>,
33
62
  )
34
63
 
35
- await user.click(screen.getByRole('button'))
64
+ const button = screen.getByRole('button')
65
+ await user.click(button)
36
66
 
37
67
  await waitFor(() => expect(screen.queryByText('Copy SVG')).not.toBeInTheDocument())
38
- // Both the visible label and the sr-only status announce "Copied".
39
- expect(screen.getAllByText('Copied').length).toBeGreaterThanOrEqual(1)
68
+ expect(button).toHaveAccessibleName('Copied')
69
+ expect(button).not.toHaveAttribute('aria-label')
70
+ expect(screen.getByRole('status')).toHaveTextContent('Copied')
71
+ })
72
+
73
+ it('renders the status region as a sibling of the button, not inside it', async () => {
74
+ const { user } = setup()
75
+ const { container } = render(
76
+ <div data-testid="parent">
77
+ <CopyButton value="hello" copiedLabel="Code copied" />
78
+ </div>,
79
+ )
80
+ const button = screen.getByRole('button')
81
+ const status = screen.getByRole('status')
82
+
83
+ expect(button.contains(status)).toBe(false)
84
+ expect(status.parentElement).toBe(button.parentElement)
85
+ expect(status.parentElement).toBe(screen.getByTestId('parent'))
86
+ expect(status).toBeEmptyDOMElement()
87
+ expect(container.querySelectorAll('[data-slot="copy-button"]')).toHaveLength(1)
88
+
89
+ await user.click(button)
90
+ await waitFor(() => expect(status).toHaveTextContent('Code copied'))
91
+ })
92
+
93
+ it('forwards the ref to the button', () => {
94
+ const ref = React.createRef<HTMLButtonElement>()
95
+ render(<CopyButton value="hello" ref={ref} />)
96
+ expect(ref.current).toBe(screen.getByRole('button'))
40
97
  })
41
98
 
42
99
  it('renders a custom resting icon in place of the copy glyph and still swaps to the check', async () => {
@@ -157,4 +214,12 @@ describe('CopyButton', () => {
157
214
  const { container } = render(<CopyButton value="hello" />)
158
215
  expect(await axe(container)).toHaveNoViolations()
159
216
  })
217
+
218
+ it('has no accessibility violations with a visible label in the copied state', async () => {
219
+ const { user } = setup()
220
+ const { container } = render(<CopyButton value="hello">Copy SVG</CopyButton>)
221
+ await user.click(screen.getByRole('button'))
222
+ await waitFor(() => expect(screen.getByRole('status')).toHaveTextContent('Copied'))
223
+ expect(await axe(container)).toHaveNoViolations()
224
+ })
160
225
  })
@@ -56,12 +56,12 @@ interface CopyButtonProps extends Omit<ButtonProps, 'value' | 'onCopy'> {
56
56
  */
57
57
  timeout?: number
58
58
  /**
59
- * Accessible name (and tooltip via `title`) in the idle state.
59
+ * Accessible name of an icon-only button in the idle state. Visible children name the button instead.
60
60
  * @default 'Copy'
61
61
  */
62
62
  label?: string
63
63
  /**
64
- * Accessible name after a successful copy; a string child also swaps to this.
64
+ * Announced after a successful copy, and names an icon-only button until it reverts; a string child also swaps to this.
65
65
  * @default 'Copied'
66
66
  */
67
67
  copiedLabel?: string
@@ -110,51 +110,57 @@ function CopyButton({
110
110
  resetRef.current = setTimeout(() => setCopied(false), timeout)
111
111
  }
112
112
 
113
+ const iconOnly = React.Children.toArray(children).length === 0
114
+
113
115
  return (
114
- <Button
115
- data-slot="copy-button"
116
- data-copied={copied || undefined}
117
- type="button"
118
- variant={variant}
119
- size={size}
120
- aria-label={copied ? copiedLabel : label}
121
- onClick={handleClick}
122
- className={cn('group/copy', className)}
123
- {...props}
124
- >
125
- <span data-icon={children != null ? 'start' : undefined} className="grid place-items-center *:[grid-area:1/1]">
126
- <span
127
- className={cn(
128
- 'grid place-items-center transition-[opacity,scale] delay-150 duration-150 ease-out group-data-copied/copy:delay-0',
129
- 'group-data-copied/copy:scale-50 group-data-copied/copy:opacity-0',
130
- 'motion-reduce:transition-none',
131
- )}
132
- >
133
- {icon ?? (
134
- <svg {...ICON_SVG_PROPS}>
135
- <path d="M4.012 16.737c-.307-.175-.562-.427-.739-.732S3.001 15.353 3 15V5c0-1.1.9-2 2-2h10c.75 0 1.158.385 1.5 1M7 9.667c0-.707.281-1.386.781-1.886S8.96 7 9.667 7h8.666c.35 0 .697.069 1.021.203s.618.33.865.578.444.542.578.865A2.67 2.67 0 0 1 21 9.667v8.666a2.67 2.67 0 0 1-.781 1.886 2.67 2.67 0 0 1-1.886.781H9.667a2.67 2.67 0 0 1-1.021-.203c-.324-.134-.618-.331-.865-.578s-.444-.542-.578-.865S7 18.683 7 18.333V9.667z" />
136
- </svg>
137
- )}
138
- </span>
139
- <svg {...ICON_SVG_PROPS}>
140
- <path
141
- d={CHECK_PATH}
142
- pathLength={1}
143
- strokeDasharray="1 2"
116
+ <>
117
+ {/* First, so last-child rules (`space-x-*`, `divide-*`) still see the button as last, and
118
+ `!important`, so a parent's `*:` utilities (ButtonGroup's `*:relative`) can't pull it into flow. */}
119
+ <span role="status" className="sr-only!">
120
+ {copied ? copiedLabel : ''}
121
+ </span>
122
+ <Button
123
+ data-slot="copy-button"
124
+ data-copied={copied || undefined}
125
+ type="button"
126
+ variant={variant}
127
+ size={size}
128
+ aria-label={iconOnly ? (copied ? copiedLabel : label) : undefined}
129
+ onClick={handleClick}
130
+ className={cn('group/copy', className)}
131
+ {...props}
132
+ >
133
+ <span data-icon={children != null ? 'start' : undefined} className="grid place-items-center *:[grid-area:1/1]">
134
+ <span
144
135
  className={cn(
145
- '[stroke-dashoffset:1.02] group-data-copied/copy:[stroke-dashoffset:0]',
146
- 'transition-[stroke-dashoffset] duration-200 ease-in',
147
- 'group-data-copied/copy:delay-100 group-data-copied/copy:duration-350 group-data-copied/copy:ease-out',
136
+ 'grid place-items-center transition-[opacity,scale] delay-150 duration-150 ease-out group-data-copied/copy:delay-0',
137
+ 'group-data-copied/copy:scale-50 group-data-copied/copy:opacity-0',
148
138
  'motion-reduce:transition-none',
149
139
  )}
150
- />
151
- </svg>
152
- </span>
153
- {typeof children === 'string' && copied ? copiedLabel : children}
154
- <span role="status" className="sr-only">
155
- {copied ? copiedLabel : ''}
156
- </span>
157
- </Button>
140
+ >
141
+ {icon ?? (
142
+ <svg {...ICON_SVG_PROPS}>
143
+ <path d="M4.012 16.737c-.307-.175-.562-.427-.739-.732S3.001 15.353 3 15V5c0-1.1.9-2 2-2h10c.75 0 1.158.385 1.5 1M7 9.667c0-.707.281-1.386.781-1.886S8.96 7 9.667 7h8.666c.35 0 .697.069 1.021.203s.618.33.865.578.444.542.578.865A2.67 2.67 0 0 1 21 9.667v8.666a2.67 2.67 0 0 1-.781 1.886 2.67 2.67 0 0 1-1.886.781H9.667a2.67 2.67 0 0 1-1.021-.203c-.324-.134-.618-.331-.865-.578s-.444-.542-.578-.865S7 18.683 7 18.333V9.667z" />
144
+ </svg>
145
+ )}
146
+ </span>
147
+ <svg {...ICON_SVG_PROPS}>
148
+ <path
149
+ d={CHECK_PATH}
150
+ pathLength={1}
151
+ strokeDasharray="1 2"
152
+ className={cn(
153
+ '[stroke-dashoffset:1.02] group-data-copied/copy:[stroke-dashoffset:0]',
154
+ 'transition-[stroke-dashoffset] duration-200 ease-in',
155
+ 'group-data-copied/copy:delay-100 group-data-copied/copy:duration-350 group-data-copied/copy:ease-out',
156
+ 'motion-reduce:transition-none',
157
+ )}
158
+ />
159
+ </svg>
160
+ </span>
161
+ {typeof children === 'string' && copied ? copiedLabel : children}
162
+ </Button>
163
+ </>
158
164
  )
159
165
  }
160
166
 
@@ -1,7 +1,9 @@
1
+ import * as React from 'react'
1
2
  import { render, screen, fireEvent } from '@testing-library/react'
2
3
  import userEvent from '@testing-library/user-event'
3
4
  import { describe, it, expect, vi } from 'vitest'
4
5
  import { axe } from 'vitest-axe'
6
+ import { Field, FieldDescription, FieldError, FieldLabel } from '../field/field'
5
7
  import { DateField } from './date-field'
6
8
 
7
9
  function getSegment(name: 'day' | 'month' | 'year') {
@@ -349,6 +351,86 @@ describe('DateField', () => {
349
351
  expect(root).toHaveAttribute('data-disabled')
350
352
  })
351
353
 
354
+ describe('inside a Field', () => {
355
+ function renderInField(props: React.ComponentProps<typeof DateField> = {}, invalid = false) {
356
+ return render(
357
+ <Field invalid={invalid}>
358
+ <FieldLabel>Date of birth</FieldLabel>
359
+ <DateField defaultValue={JUN_23} {...props} />
360
+ <FieldDescription>As shown on your passport.</FieldDescription>
361
+ <FieldError match>Enter a valid date.</FieldError>
362
+ </Field>,
363
+ )
364
+ }
365
+
366
+ it('takes its accessible name from the FieldLabel', () => {
367
+ renderInField()
368
+ const group = screen.getByRole('group', { name: 'Date of birth' })
369
+ expect(group).toHaveAttribute('data-slot', 'date-field')
370
+ expect(screen.getByText('Date of birth')).not.toHaveAttribute('for')
371
+ })
372
+
373
+ it('is described by the FieldDescription', () => {
374
+ renderInField()
375
+ const description = screen.getByText('As shown on your passport.')
376
+ expect(screen.getByRole('group', { name: 'Date of birth' })).toHaveAttribute(
377
+ 'aria-describedby',
378
+ expect.stringContaining(description.id),
379
+ )
380
+ })
381
+
382
+ it('is described by the FieldError and marks every segment invalid', () => {
383
+ renderInField({}, true)
384
+ const group = screen.getByRole('group', { name: 'Date of birth' })
385
+ const error = screen.getByText('Enter a valid date.')
386
+ expect(group).toHaveAttribute('aria-describedby', expect.stringContaining(error.id))
387
+ expect(group).toHaveAttribute('aria-invalid', 'true')
388
+ for (const segment of screen.getAllByRole('spinbutton')) {
389
+ expect(segment).toHaveAttribute('aria-invalid', 'true')
390
+ }
391
+ })
392
+
393
+ it('lets consumer aria-label and aria-describedby win over the Field wiring', () => {
394
+ renderInField({ 'aria-label': 'Birthday', 'aria-describedby': 'custom-hint' })
395
+ const group = screen.getByRole('group', { name: 'Birthday' })
396
+ expect(group).not.toHaveAttribute('aria-labelledby')
397
+ expect(group).toHaveAttribute('aria-describedby', 'custom-hint')
398
+ })
399
+
400
+ it('lets a consumer aria-labelledby win over the FieldLabel', () => {
401
+ const { container } = render(
402
+ <Field>
403
+ <FieldLabel>Date of birth</FieldLabel>
404
+ <span id="custom-label">Birthday</span>
405
+ <DateField defaultValue={JUN_23} aria-labelledby="custom-label" />
406
+ </Field>,
407
+ )
408
+ expect(getRoot(container)).toHaveAttribute('aria-labelledby', 'custom-label')
409
+ expect(screen.getByRole('group', { name: 'Birthday' })).toBe(getRoot(container))
410
+ })
411
+
412
+ it('lets a consumer aria-invalid win on the group and segments', () => {
413
+ renderInField({ 'aria-invalid': false }, true)
414
+ const group = screen.getByRole('group', { name: 'Date of birth' })
415
+ expect(group).toHaveAttribute('aria-invalid', 'false')
416
+ for (const segment of screen.getAllByRole('spinbutton')) {
417
+ expect(segment).toHaveAttribute('aria-invalid', 'false')
418
+ }
419
+ })
420
+
421
+ it('does not mark segments invalid when the field is valid', () => {
422
+ renderInField()
423
+ for (const segment of screen.getAllByRole('spinbutton')) {
424
+ expect(segment).not.toHaveAttribute('aria-invalid')
425
+ }
426
+ })
427
+
428
+ it('has no accessibility violations when labeled, described and invalid', async () => {
429
+ const { container } = renderInField({}, true)
430
+ expect(await axe(container)).toHaveNoViolations()
431
+ })
432
+ })
433
+
352
434
  it('renders startSlot and endSlot containers', () => {
353
435
  const { container } = render(
354
436
  <DateField
@@ -4,6 +4,7 @@ import * as React from 'react'
4
4
  import { format as formatDate, formatISO, getDaysInMonth, isValid } from 'date-fns'
5
5
  import { type VariantProps } from 'class-variance-authority'
6
6
  import { useFieldRootContext } from '@base-ui/react/internals/field-root-context'
7
+ import { useLabelableContext, useLabelableId } from '@base-ui/react/internals/labelable-provider'
7
8
  import { cn } from '../../internal/utils'
8
9
  import { useDirection } from '../../hooks/use-direction'
9
10
  import { inputVariants } from '../input/input-variants'
@@ -223,6 +224,9 @@ function DateField({
223
224
  const name = nameProp ?? field.name
224
225
  const ariaInvalid = rest['aria-invalid']
225
226
  const invalid = ariaInvalid === true || ariaInvalid === 'true' || field.invalid === true
227
+ const resolvedAriaInvalid = ariaInvalid ?? (invalid || undefined)
228
+ const { labelId, getDescriptionProps } = useLabelableContext()
229
+ useLabelableId({ id: null })
226
230
 
227
231
  const nodes = React.useMemo(() => parseFormat(format), [format])
228
232
  const segmentCount = React.useMemo(() => nodes.reduce((n, x) => n + (x.kind === 'segment' ? 1 : 0), 0), [nodes])
@@ -462,6 +466,8 @@ function DateField({
462
466
  data-invalid={invalid || undefined}
463
467
  aria-invalid={invalid || undefined}
464
468
  aria-disabled={disabled || undefined}
469
+ aria-labelledby={rest['aria-label'] == null ? labelId : undefined}
470
+ aria-describedby={getDescriptionProps({})['aria-describedby']}
465
471
  role="group"
466
472
  ref={ref}
467
473
  className={cn(
@@ -512,6 +518,7 @@ function DateField({
512
518
  spellCheck={false}
513
519
  aria-label={node.type}
514
520
  aria-readonly={readOnly || undefined}
521
+ aria-invalid={resolvedAriaInvalid}
515
522
  aria-valuemin={range.min}
516
523
  aria-valuemax={range.max}
517
524
  aria-valuenow={partVal ?? undefined}
@@ -3,6 +3,7 @@ import userEvent from '@testing-library/user-event'
3
3
  import { describe, it, expect, vi } from 'vitest'
4
4
  import { axe } from 'vitest-axe'
5
5
  import * as React from 'react'
6
+ import { Field, FieldDescription, FieldLabel } from '../field/field'
6
7
  import { DatePicker, type DateRange } from './date-picker'
7
8
 
8
9
  const JUN_10 = new Date(2026, 5, 10)
@@ -163,6 +164,52 @@ describe('DatePicker', () => {
163
164
  expect(dayCells).toHaveLength(2)
164
165
  })
165
166
 
167
+ it('labels the two fields Start date and End date by default', () => {
168
+ const { container } = render(<DatePicker mode="range" defaultValue={{ from: JUN_10, to: JUN_17 }} />)
169
+ const fields = container.querySelectorAll('[data-slot="date-field"]')
170
+ expect(screen.getByRole('group', { name: 'Start date' })).toBe(fields[0])
171
+ expect(screen.getByRole('group', { name: 'End date' })).toBe(fields[1])
172
+ })
173
+
174
+ it('uses startAriaLabel and endAriaLabel when passed', () => {
175
+ render(<DatePicker mode="range" startAriaLabel="Check-in" endAriaLabel="Check-out" />)
176
+ expect(screen.getByRole('group', { name: 'Check-in' })).toBeInTheDocument()
177
+ expect(screen.getByRole('group', { name: 'Check-out' })).toBeInTheDocument()
178
+ expect(screen.queryByRole('group', { name: 'Start date' })).toBeNull()
179
+ })
180
+
181
+ it('labels the time fields with the same start and end labels when showTime is set', () => {
182
+ const { container } = render(<DatePicker mode="range" showTime />)
183
+ const timeFields = container.querySelectorAll('[data-slot="time-field"]')
184
+ expect(timeFields[0]).toHaveAttribute('aria-label', 'Start date')
185
+ expect(timeFields[1]).toHaveAttribute('aria-label', 'End date')
186
+ })
187
+
188
+ it('makes the wrapper a group labeled by the FieldLabel', () => {
189
+ const { container } = render(
190
+ <Field>
191
+ <FieldLabel>Trip dates</FieldLabel>
192
+ <DatePicker mode="range" defaultValue={{ from: JUN_10, to: JUN_17 }} />
193
+ </Field>,
194
+ )
195
+ const wrapper = container.querySelector('[data-slot="date-picker"]')
196
+ expect(screen.getByRole('group', { name: 'Trip dates' })).toBe(wrapper)
197
+ expect(screen.getByRole('group', { name: 'Start date' })).toBeInTheDocument()
198
+ expect(screen.getByRole('group', { name: 'End date' })).toBeInTheDocument()
199
+ expect(screen.getByText('Trip dates')).not.toHaveAttribute('for')
200
+ })
201
+
202
+ it('has no accessibility violations inside a Field', async () => {
203
+ const { container } = render(
204
+ <Field>
205
+ <FieldLabel>Trip dates</FieldLabel>
206
+ <DatePicker mode="range" showTime defaultValue={{ from: JUN_10, to: JUN_17 }} />
207
+ <FieldDescription>Check-in and check-out.</FieldDescription>
208
+ </Field>,
209
+ )
210
+ expect(await axe(container)).toHaveNoViolations()
211
+ })
212
+
166
213
  it('does NOT auto-close the popover after both ends are picked', async () => {
167
214
  const user = userEvent.setup()
168
215
  render(<DatePicker mode="range" defaultMonth={JUN_10} />)
@@ -284,8 +331,31 @@ describe('DatePicker', () => {
284
331
  expect(root).toHaveAttribute('data-disabled')
285
332
  })
286
333
 
334
+ it('names the single-mode field from a surrounding FieldLabel', () => {
335
+ render(
336
+ <Field>
337
+ <FieldLabel>Departure</FieldLabel>
338
+ <DatePicker defaultValue={JUN_10} defaultMonth={JUN_10} />
339
+ <FieldDescription>Pick a weekday.</FieldDescription>
340
+ </Field>,
341
+ )
342
+ const group = screen.getByRole('group', { name: 'Departure' })
343
+ expect(group).toHaveAttribute('data-slot', 'date-field')
344
+ expect(group).toHaveAttribute('aria-describedby', screen.getByText('Pick a weekday.').id)
345
+ })
346
+
287
347
  it('has no accessibility violations', async () => {
288
348
  const { container } = render(<DatePicker defaultValue={JUN_10} defaultMonth={JUN_10} />)
289
349
  expect(await axe(container)).toHaveNoViolations()
290
350
  })
351
+
352
+ it('has no accessibility violations inside a Field', async () => {
353
+ const { container } = render(
354
+ <Field>
355
+ <FieldLabel>Departure</FieldLabel>
356
+ <DatePicker showTime defaultValue={JUN_10} defaultMonth={JUN_10} />
357
+ </Field>,
358
+ )
359
+ expect(await axe(container)).toHaveNoViolations()
360
+ })
291
361
  })
@@ -9,6 +9,7 @@ import { Input, inputVariants } from '../input'
9
9
  import { Popover, PopoverContent, PopoverTrigger, type PopoverContentProps } from '../popover/popover'
10
10
  import { buttonVariants } from '../button/button-variants'
11
11
  import { useFieldRootContext } from '@base-ui/react/internals/field-root-context'
12
+ import { useLabelableContext } from '@base-ui/react/internals/labelable-provider'
12
13
  import { cn } from '../../internal/utils'
13
14
 
14
15
  type DatePickerSize = 'sm' | 'md' | 'lg'
@@ -144,6 +145,16 @@ type DatePickerBase = CalendarPassthrough & {
144
145
  * @default 'Open calendar'
145
146
  */
146
147
  triggerAriaLabel?: string
148
+ /**
149
+ * Accessible label for the start of a range (its date field, plus its time field with `showTime`).
150
+ * @default 'Start date'
151
+ */
152
+ startAriaLabel?: string
153
+ /**
154
+ * Accessible label for the end of a range (its date field, plus its time field with `showTime`).
155
+ * @default 'End date'
156
+ */
157
+ endAriaLabel?: string
147
158
  }
148
159
 
149
160
  type DatePickerProps =
@@ -226,6 +237,8 @@ function DatePicker(props: DatePickerProps) {
226
237
  rangeSeparator = '–',
227
238
  triggerIcon = DEFAULT_TRIGGER_ICON,
228
239
  triggerAriaLabel = 'Open calendar',
240
+ startAriaLabel = 'Start date',
241
+ endAriaLabel = 'End date',
229
242
  formatValue,
230
243
  'aria-invalid': _ariaInvalid,
231
244
  className,
@@ -241,6 +254,7 @@ function DatePicker(props: DatePickerProps) {
241
254
  }
242
255
 
243
256
  const field = useFieldRootContext(true)
257
+ const { labelId } = useLabelableContext()
244
258
  const disabled = disabledProp || field.disabled
245
259
  const name = nameProp ?? field.name
246
260
  const invalid = props['aria-invalid'] === true || field.invalid === true
@@ -442,12 +456,15 @@ function DatePicker(props: DatePickerProps) {
442
456
  startSlot={startSlot}
443
457
  endSlot={endSlot}
444
458
  trigger={triggerButton}
459
+ role="group"
460
+ ariaLabelledBy={labelId}
445
461
  >
446
462
  <DateField
447
463
  unstyled
448
464
  value={range?.from ?? null}
449
465
  onValueChange={handleRangeFromDateChange}
450
466
  format={dateFormat}
467
+ aria-label={startAriaLabel}
451
468
  {...sharedFieldProps}
452
469
  />
453
470
  {showTime && (
@@ -456,6 +473,7 @@ function DatePicker(props: DatePickerProps) {
456
473
  value={range?.from ? format(range.from, 'HH:mm:ss') : null}
457
474
  onValueChange={handleRangeFromTimeChange}
458
475
  format={timeFormat}
476
+ aria-label={startAriaLabel}
459
477
  {...sharedFieldProps}
460
478
  />
461
479
  )}
@@ -467,6 +485,7 @@ function DatePicker(props: DatePickerProps) {
467
485
  value={range?.to ?? null}
468
486
  onValueChange={handleRangeToDateChange}
469
487
  format={dateFormat}
488
+ aria-label={endAriaLabel}
470
489
  {...sharedFieldProps}
471
490
  />
472
491
  {showTime && (
@@ -475,6 +494,7 @@ function DatePicker(props: DatePickerProps) {
475
494
  value={range?.to ? format(range.to, 'HH:mm:ss') : null}
476
495
  onValueChange={handleRangeToTimeChange}
477
496
  format={timeFormat}
497
+ aria-label={endAriaLabel}
478
498
  {...sharedFieldProps}
479
499
  />
480
500
  )}
@@ -560,6 +580,8 @@ interface UnifiedWrapperProps {
560
580
  startSlot?: React.ReactNode
561
581
  endSlot?: React.ReactNode
562
582
  trigger: React.ReactNode
583
+ role?: 'group'
584
+ ariaLabelledBy?: string
563
585
  children: React.ReactNode
564
586
  }
565
587
 
@@ -572,6 +594,8 @@ function UnifiedWrapper({
572
594
  startSlot,
573
595
  endSlot,
574
596
  trigger,
597
+ role,
598
+ ariaLabelledBy,
575
599
  children,
576
600
  }: UnifiedWrapperProps) {
577
601
  return (
@@ -579,6 +603,8 @@ function UnifiedWrapper({
579
603
  data-slot="date-picker"
580
604
  data-disabled={disabled || undefined}
581
605
  data-invalid={ariaInvalid || undefined}
606
+ role={role}
607
+ aria-labelledby={ariaLabelledBy}
582
608
  className={cn(
583
609
  inputVariants({ variant, size, state: 'within' }),
584
610
  'flex w-full',
@@ -94,7 +94,7 @@ function DialogContent({
94
94
  showFrame ? 'border-white/15 bg-white/10 p-1.5 backdrop-blur-sm' : 'bg-background border-border-overlay',
95
95
  !showFrame && 'shadow-2xl',
96
96
  'isolate transform-gpu outline-none',
97
- 'motion-safe:transition-[opacity,scale] motion-safe:duration-250 motion-safe:ease-[cubic-bezier(0.175,0.885,0.32,1.5)]',
97
+ 'motion-safe:ease-spring motion-safe:transition-[opacity,scale] motion-safe:duration-250',
98
98
  'data-starting-style:motion-safe:scale-95 data-starting-style:motion-safe:opacity-0',
99
99
  'data-ending-style:motion-safe:scale-95 data-ending-style:motion-safe:opacity-0 data-ending-style:motion-safe:duration-100 data-ending-style:motion-safe:ease-out',
100
100
  'data-nested-dialog-open:pointer-events-none data-nested-dialog-open:scale-95 data-nested-dialog-open:opacity-0',