@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
@@ -45,6 +45,11 @@ describe('Pagination', () => {
45
45
  expect(nav).toHaveAttribute('data-slot', 'pagination')
46
46
  })
47
47
 
48
+ it('relies on the implicit navigation role of <nav>', () => {
49
+ renderBasic()
50
+ expect(screen.getByRole('navigation', { name: 'pagination' })).not.toHaveAttribute('role')
51
+ })
52
+
48
53
  it('renders content as a ul and items as li', () => {
49
54
  renderBasic()
50
55
  const list = screen.getByRole('list')
@@ -61,6 +66,47 @@ describe('Pagination', () => {
61
66
  expect(active).toHaveAttribute('data-active')
62
67
  })
63
68
 
69
+ it('keeps a current page rendered as a <span> out of the tab order', async () => {
70
+ const user = userEvent.setup()
71
+ render(
72
+ <Pagination>
73
+ <PaginationList>
74
+ <PaginationItem>
75
+ <PaginationLink href="#1">1</PaginationLink>
76
+ </PaginationItem>
77
+ <PaginationItem>
78
+ <PaginationLink active render={<span />}>
79
+ 2
80
+ </PaginationLink>
81
+ </PaginationItem>
82
+ <PaginationItem>
83
+ <PaginationLink href="#3">3</PaginationLink>
84
+ </PaginationItem>
85
+ </PaginationList>
86
+ </Pagination>,
87
+ )
88
+ const current = screen.getByText('2')
89
+ expect(current.tagName).toBe('SPAN')
90
+ expect(current).toHaveAttribute('aria-current', 'page')
91
+ expect(current).not.toHaveAttribute('tabindex')
92
+
93
+ await user.tab()
94
+ expect(screen.getByRole('link', { name: '1' })).toHaveFocus()
95
+ await user.tab()
96
+ expect(screen.getByRole('link', { name: '3' })).toHaveFocus()
97
+ })
98
+
99
+ it('keeps a current page rendered as a link reachable', async () => {
100
+ const user = userEvent.setup()
101
+ renderBasic()
102
+ const current = screen.getByRole('link', { current: 'page' })
103
+ expect(current).not.toHaveAttribute('aria-disabled')
104
+ await user.tab()
105
+ await user.tab()
106
+ await user.tab()
107
+ expect(current).toHaveFocus()
108
+ })
109
+
64
110
  it('marks disabled links with aria-disabled and data-disabled', () => {
65
111
  render(
66
112
  <Pagination>
@@ -76,6 +122,20 @@ describe('Pagination', () => {
76
122
  const link = screen.getByRole('link', { name: 'Previous' })
77
123
  expect(link).toHaveAttribute('aria-disabled', 'true')
78
124
  expect(link).toHaveAttribute('data-disabled')
125
+ expect(link).toHaveAttribute('tabindex', '-1')
126
+ })
127
+
128
+ it('keeps a non-active link without an href focusable', () => {
129
+ render(
130
+ <Pagination>
131
+ <PaginationList>
132
+ <PaginationItem>
133
+ <PaginationLink onClick={() => {}}>4</PaginationLink>
134
+ </PaginationItem>
135
+ </PaginationList>
136
+ </Pagination>,
137
+ )
138
+ expect(screen.getByText('4')).toHaveAttribute('tabindex', '0')
79
139
  })
80
140
 
81
141
  it('forwards className alongside variant classes on the link', () => {
@@ -144,4 +204,27 @@ describe('Pagination', () => {
144
204
  const { container } = renderBasic()
145
205
  expect(await axe(container)).toHaveNoViolations()
146
206
  })
207
+
208
+ it('has no accessibility violations with a <span> current page and disabled controls', async () => {
209
+ const { container } = render(
210
+ <Pagination>
211
+ <PaginationList>
212
+ <PaginationItem>
213
+ <PaginationLink disabled render={<span />}>
214
+ Prev
215
+ </PaginationLink>
216
+ </PaginationItem>
217
+ <PaginationItem>
218
+ <PaginationLink active render={<span />}>
219
+ 1
220
+ </PaginationLink>
221
+ </PaginationItem>
222
+ <PaginationItem>
223
+ <PaginationLink href="#2">2</PaginationLink>
224
+ </PaginationItem>
225
+ </PaginationList>
226
+ </Pagination>,
227
+ )
228
+ expect(await axe(container)).toHaveNoViolations()
229
+ })
147
230
  })
@@ -43,7 +43,6 @@ function Pagination({ className, variant = 'outline', size = 'md', ...props }: P
43
43
  return (
44
44
  <PaginationContext.Provider value={ctx}>
45
45
  <nav
46
- role="navigation"
47
46
  aria-label="pagination"
48
47
  data-slot="pagination"
49
48
  className={cn('data-disabled:opacity-disabled flex w-fit', className)}
@@ -103,7 +102,7 @@ function PaginationLink({ className, active = false, disabled = false, render, .
103
102
  'data-slot': 'pagination-link',
104
103
  'data-active': active || undefined,
105
104
  'aria-current': active ? 'page' : undefined,
106
- ...focusableProps(disabled),
105
+ ...(active && !disabled ? {} : focusableProps(disabled)),
107
106
  className: cn(
108
107
  buttonVariants({ variant, size }),
109
108
  LINK_SIZE_OVERRIDES[size],
@@ -55,7 +55,7 @@ function PopoverContent({ className, arrow = true, children, ...props }: Popover
55
55
  'group-data-[side=inline-start]/popup:border-e-2',
56
56
  'group-data-[side=inline-end]/popup:border-s-2',
57
57
  ],
58
- 'motion-safe:origin-(--transform-origin) motion-safe:transition-[opacity,scale] motion-safe:duration-200 motion-safe:ease-[cubic-bezier(0.175,0.885,0.32,1.5)]',
58
+ 'motion-safe:ease-spring motion-safe:origin-(--transform-origin) motion-safe:transition-[opacity,scale] motion-safe:duration-200',
59
59
  'group-data-starting-style/popup:motion-safe:scale-90 group-data-starting-style/popup:motion-safe:opacity-0',
60
60
  'group-data-ending-style/popup:motion-safe:scale-95 group-data-ending-style/popup:motion-safe:opacity-0 group-data-ending-style/popup:motion-safe:duration-100 group-data-ending-style/popup:motion-safe:ease-out',
61
61
  className,
@@ -55,7 +55,7 @@ function PreviewCardContent({ className, arrow = true, children, ...props }: Pre
55
55
  'group-data-[side=inline-start]/popup:border-e-2',
56
56
  'group-data-[side=inline-end]/popup:border-s-2',
57
57
  ],
58
- 'motion-safe:origin-(--transform-origin) motion-safe:transition-[opacity,scale] motion-safe:duration-200 motion-safe:ease-[cubic-bezier(0.175,0.885,0.32,1.5)]',
58
+ 'motion-safe:ease-spring motion-safe:origin-(--transform-origin) motion-safe:transition-[opacity,scale] motion-safe:duration-200',
59
59
  'group-data-starting-style/popup:motion-safe:scale-90 group-data-starting-style/popup:motion-safe:opacity-0',
60
60
  'group-data-ending-style/popup:motion-safe:scale-95 group-data-ending-style/popup:motion-safe:opacity-0 group-data-ending-style/popup:motion-safe:duration-100 group-data-ending-style/popup:motion-safe:ease-out',
61
61
  className,
@@ -265,7 +265,7 @@ function SelectContent({ className, alignItemWithTrigger: alignOverride, childre
265
265
  'min-w-36',
266
266
  alignWithTrigger ? 'w-[calc(var(--anchor-width)+1rem)]' : 'w-(--anchor-width)',
267
267
  alignWithTrigger ? 'origin-center' : 'origin-(--transform-origin)',
268
- 'motion-safe:transition-[opacity,scale] motion-safe:duration-200 motion-safe:ease-[cubic-bezier(0.175,0.885,0.32,1.5)]',
268
+ 'motion-safe:ease-spring motion-safe:transition-[opacity,scale] motion-safe:duration-200',
269
269
  'data-starting-style:motion-safe:scale-90 data-starting-style:motion-safe:opacity-0',
270
270
  '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',
271
271
  className,
@@ -362,7 +362,7 @@ function SelectItem({ className, children, ...props }: SelectItemProps) {
362
362
  'before:bg-background-muted before:absolute before:inset-0 before:-z-10 before:rounded-[inherit] before:opacity-0',
363
363
  'active:translate-y-px active:scale-[0.98]',
364
364
  'data-highlighted:not-data-disabled:text-foreground-intense data-highlighted:not-data-disabled:before:opacity-100',
365
- 'motion-safe:transition motion-safe:duration-250 motion-safe:ease-[cubic-bezier(0.175,0.885,0.32,1.5)]',
365
+ 'motion-safe:ease-spring motion-safe:transition motion-safe:duration-250',
366
366
  'motion-safe:active:duration-100 motion-safe:active:ease-in-out',
367
367
  'motion-safe:before:transition-opacity motion-safe:before:duration-200 motion-safe:before:ease-out',
368
368
  'data-disabled:opacity-disabled data-disabled:pointer-events-none',
@@ -5,6 +5,11 @@ import { axe } from 'vitest-axe'
5
5
  import { Slider } from './slider'
6
6
 
7
7
  describe('Slider', () => {
8
+ it('keeps a surrounding Drawer from swiping on any drag that starts on the control', () => {
9
+ const { container } = render(<Slider thumbAriaLabel="Volume" />)
10
+ expect(container.querySelector('[data-slot="slider-control"]')).toHaveAttribute('data-base-ui-swipe-ignore', '')
11
+ })
12
+
8
13
  it('renders a single thumb when no value is provided', () => {
9
14
  render(<Slider thumbAriaLabel="Volume" />)
10
15
  const thumbs = screen.getAllByRole('slider')
@@ -19,6 +19,7 @@ const TOOLTIP_TILT_TRANSITION = {
19
19
 
20
20
  const TOOLTIP_POPUP_TRANSITION = {
21
21
  duration: 0.2,
22
+ // `--ease-spring` in styles.css, as numbers: Motion can't read a CSS variable.
22
23
  ease: [0.175, 0.885, 0.32, 1.5] satisfies [number, number, number, number],
23
24
  }
24
25
 
@@ -240,7 +241,7 @@ function Slider({
240
241
  className={cn(rootClasses, className)}
241
242
  {...rootProps}
242
243
  >
243
- <BaseSlider.Control data-slot="slider-control" className={controlClasses}>
244
+ <BaseSlider.Control data-slot="slider-control" data-base-ui-swipe-ignore="" className={controlClasses}>
244
245
  <BaseSlider.Track data-slot="slider-track" className={trackClasses}>
245
246
  <BaseSlider.Indicator data-slot="slider-indicator" className={indicatorClasses} />
246
247
  </BaseSlider.Track>
@@ -23,6 +23,22 @@ function stubRect(el: Element, width = 100) {
23
23
  }
24
24
 
25
25
  describe('Sparkline', () => {
26
+ it('claims horizontal drags from a surrounding Drawer only while it is interactive', () => {
27
+ const chart = (container: HTMLElement) => container.querySelector('[data-slot="sparkline-svg"]')!.parentElement
28
+ const { container: interactive } = render(
29
+ <Sparkline data={DATA}>
30
+ <SparklineChart />
31
+ </Sparkline>,
32
+ )
33
+ expect(chart(interactive)).toHaveAttribute('data-base-ui-swipe-ignore', 'x')
34
+ const { container: still } = render(
35
+ <Sparkline data={DATA}>
36
+ <SparklineChart indicator={false} />
37
+ </Sparkline>,
38
+ )
39
+ expect(chart(still)).not.toHaveAttribute('data-base-ui-swipe-ignore')
40
+ })
41
+
26
42
  it('renders a line path for the line variant', () => {
27
43
  const { container } = render(
28
44
  <Sparkline data={DATA}>
@@ -271,6 +271,7 @@ function SparklineChart({
271
271
  aria-label={ariaLabel ?? `${variant} chart`}
272
272
  className={cn('relative w-full', className)}
273
273
  style={{ height, touchAction: interactive ? 'pan-y' : undefined, ...style }}
274
+ data-base-ui-swipe-ignore={interactive ? 'x' : undefined}
274
275
  onPointerDown={interactive ? handlePointerDown : undefined}
275
276
  onPointerMove={interactive ? handlePointerMove : undefined}
276
277
  onPointerLeave={interactive ? () => setActiveIndex(null) : undefined}
@@ -4,14 +4,27 @@ import { axe } from 'vitest-axe'
4
4
  import { Spinner } from './spinner'
5
5
 
6
6
  describe('Spinner', () => {
7
- it('exposes a status region with a default accessible name', () => {
7
+ it('exposes a status region that reads "Loading" as text by default', () => {
8
8
  render(<Spinner />)
9
- expect(screen.getByRole('status')).toHaveAttribute('aria-label', 'Loading')
9
+ const status = screen.getByRole('status')
10
+ expect(status).toHaveTextContent('Loading')
11
+ expect(status).not.toHaveAttribute('aria-label')
10
12
  })
11
13
 
12
- it('forwards a custom aria-label', () => {
14
+ it('renders a custom aria-label as the status text', () => {
13
15
  render(<Spinner aria-label="Fetching results" />)
14
- expect(screen.getByRole('status')).toHaveAttribute('aria-label', 'Fetching results')
16
+ const status = screen.getByRole('status')
17
+ expect(status).toHaveTextContent('Fetching results')
18
+ expect(status).not.toHaveAttribute('aria-label')
19
+ })
20
+
21
+ it('contributes its label to the name of a surrounding button', () => {
22
+ render(
23
+ <button type="button">
24
+ <Spinner aria-label="Saving" currentColor />
25
+ </button>,
26
+ )
27
+ expect(screen.getByRole('button', { name: 'Saving' })).toBeInTheDocument()
15
28
  })
16
29
 
17
30
  it('renders the status region as a <span> so it nests inside <p> without invalid HTML', () => {
@@ -194,7 +194,7 @@ const VARIANT_COMPONENTS: Record<SpinnerVariant, React.ComponentType<VariantInne
194
194
  function Spinner({
195
195
  variant = 'circular',
196
196
  currentColor = false,
197
- 'aria-label': ariaLabel = 'Loading',
197
+ 'aria-label': label = 'Loading',
198
198
  className,
199
199
  ...props
200
200
  }: SpinnerProps) {
@@ -208,7 +208,6 @@ function Spinner({
208
208
  <span
209
209
  data-slot="spinner"
210
210
  role="status"
211
- aria-label={ariaLabel}
212
211
  className={cn('inline-flex shrink-0 items-center justify-center align-middle', SPINNER_SIZE, className)}
213
212
  {...props}
214
213
  >
@@ -219,6 +218,7 @@ function Spinner({
219
218
  {inner}
220
219
  </LazyMotion>
221
220
  )}
221
+ <span className="sr-only">{label}</span>
222
222
  </span>
223
223
  )
224
224
  }
@@ -99,7 +99,7 @@ const tabsTriggerVariants = cva(
99
99
  )
100
100
 
101
101
  const tabsTriggerInnerVariants = cva(
102
- 'relative isolate flex items-center data-[orientation=horizontal]:justify-center data-[orientation=vertical]:w-full data-[orientation=horizontal]:text-center data-[orientation=vertical]:text-start data-[orientation=horizontal]:whitespace-nowrap transform-gpu transition-transform duration-250 ease-[cubic-bezier(0.175,0.885,0.32,1.5)] motion-reduce:transition-none group-active/trigger:scale-[0.97] group-active/trigger:duration-100 group-active/trigger:ease-in-out group-active/trigger:translate-y-px',
102
+ 'relative isolate flex items-center data-[orientation=horizontal]:justify-center data-[orientation=vertical]:w-full data-[orientation=horizontal]:text-center data-[orientation=vertical]:text-start data-[orientation=horizontal]:whitespace-nowrap transform-gpu transition-transform duration-250 ease-spring motion-reduce:transition-none group-active/trigger:scale-[0.97] group-active/trigger:duration-100 group-active/trigger:ease-in-out group-active/trigger:translate-y-px',
103
103
  {
104
104
  variants: {
105
105
  variant: {
@@ -127,6 +127,14 @@ describe('Thumbnail', () => {
127
127
  expect(lifted.getAttribute('data-slot')).toBe('thumbnail-image')
128
128
  })
129
129
 
130
+ it('mounts the image on the first render with keepMounted instead of preloading it', () => {
131
+ const { container: preloaded } = render(<Thumbnail src="/peak.jpg" alt="Peak" />)
132
+ expect(preloaded.querySelector('[data-slot="thumbnail-image"]')).toBeNull()
133
+
134
+ const { container: inPlace } = render(<Thumbnail src="/peak.jpg" alt="Peak" keepMounted />)
135
+ expect(inPlace.querySelector('[data-slot="thumbnail-image"]')).toHaveAttribute('src', '/peak.jpg')
136
+ })
137
+
130
138
  it('swaps the underlying element via a render function', async () => {
131
139
  render(
132
140
  <Thumbnail
@@ -67,6 +67,11 @@ interface ThumbnailProps extends Omit<React.ComponentPropsWithoutRef<'div'>, 'si
67
67
  alt?: string
68
68
  /** Swap the `<img>` for another element - e.g. a Next.js `<Image>`. */
69
69
  render?: BaseImageProps['render']
70
+ /**
71
+ * Mount the image and let it load in place instead of preloading `src`. Set it for `loading="lazy"` and for image components such as Next.js `<Image>`, which otherwise download twice.
72
+ * @default false
73
+ */
74
+ keepMounted?: BaseImageProps['keepMounted']
70
75
  /** Fires as the image moves through its loading lifecycle. */
71
76
  onLoadingStatusChange?: BaseImageProps['onLoadingStatusChange']
72
77
  /** The icon to frame (icon variants). */
@@ -82,6 +87,7 @@ function Thumbnail({
82
87
  src,
83
88
  alt,
84
89
  render,
90
+ keepMounted,
85
91
  onLoadingStatusChange,
86
92
  children,
87
93
  ...props
@@ -121,6 +127,7 @@ function Thumbnail({
121
127
  src={src ?? lifted?.src}
122
128
  alt={alt ?? lifted?.alt ?? ''}
123
129
  render={render}
130
+ keepMounted={keepMounted}
124
131
  onLoadingStatusChange={onLoadingStatusChange}
125
132
  />
126
133
  <BaseAvatar.Fallback
@@ -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 { TimeField } from './time-field'
6
8
 
7
9
  function getSegments(name: 'hour' | 'minute' | 'second' | 'period') {
@@ -346,6 +348,68 @@ describe('TimeField', () => {
346
348
  expect(root).toHaveAttribute('data-disabled')
347
349
  })
348
350
 
351
+ describe('inside a Field', () => {
352
+ function renderInField(props: React.ComponentProps<typeof TimeField> = {}, invalid = false) {
353
+ return render(
354
+ <Field invalid={invalid}>
355
+ <FieldLabel>Start time</FieldLabel>
356
+ <TimeField defaultValue="09:30" {...props} />
357
+ <FieldDescription>Local time.</FieldDescription>
358
+ <FieldError match>Enter a valid time.</FieldError>
359
+ </Field>,
360
+ )
361
+ }
362
+
363
+ it('takes its accessible name from the FieldLabel', () => {
364
+ renderInField()
365
+ const group = screen.getByRole('group', { name: 'Start time' })
366
+ expect(group).toHaveAttribute('data-slot', 'time-field')
367
+ expect(screen.getByText('Start time')).not.toHaveAttribute('for')
368
+ })
369
+
370
+ it('is described by the FieldDescription', () => {
371
+ renderInField()
372
+ const description = screen.getByText('Local time.')
373
+ expect(screen.getByRole('group', { name: 'Start time' })).toHaveAttribute(
374
+ 'aria-describedby',
375
+ expect.stringContaining(description.id),
376
+ )
377
+ })
378
+
379
+ it('is described by the FieldError and marks every segment invalid', () => {
380
+ renderInField({ format: 'hh:mm a' }, true)
381
+ const group = screen.getByRole('group', { name: 'Start time' })
382
+ const error = screen.getByText('Enter a valid time.')
383
+ expect(group).toHaveAttribute('aria-describedby', expect.stringContaining(error.id))
384
+ expect(group).toHaveAttribute('aria-invalid', 'true')
385
+ const segments = screen.getAllByRole('spinbutton')
386
+ expect(segments).toHaveLength(3)
387
+ for (const segment of segments) {
388
+ expect(segment).toHaveAttribute('aria-invalid', 'true')
389
+ }
390
+ })
391
+
392
+ it('lets consumer aria-label and aria-describedby win over the Field wiring', () => {
393
+ renderInField({ 'aria-label': 'Departure', 'aria-describedby': 'custom-hint' })
394
+ const group = screen.getByRole('group', { name: 'Departure' })
395
+ expect(group).not.toHaveAttribute('aria-labelledby')
396
+ expect(group).toHaveAttribute('aria-describedby', 'custom-hint')
397
+ })
398
+
399
+ it('lets a consumer aria-invalid win on the group and segments', () => {
400
+ renderInField({ 'aria-invalid': false }, true)
401
+ expect(screen.getByRole('group', { name: 'Start time' })).toHaveAttribute('aria-invalid', 'false')
402
+ for (const segment of screen.getAllByRole('spinbutton')) {
403
+ expect(segment).toHaveAttribute('aria-invalid', 'false')
404
+ }
405
+ })
406
+
407
+ it('has no accessibility violations when labeled, described and invalid', async () => {
408
+ const { container } = renderInField({}, true)
409
+ expect(await axe(container)).toHaveNoViolations()
410
+ })
411
+ })
412
+
349
413
  it('renders startSlot and endSlot containers', () => {
350
414
  const { container } = render(
351
415
  <TimeField
@@ -3,6 +3,7 @@
3
3
  import * as React from 'react'
4
4
  import { type VariantProps } from 'class-variance-authority'
5
5
  import { useFieldRootContext } from '@base-ui/react/internals/field-root-context'
6
+ import { useLabelableContext, useLabelableId } from '@base-ui/react/internals/labelable-provider'
6
7
  import { cn } from '../../internal/utils'
7
8
  import { inputVariants } from '../input/input-variants'
8
9
 
@@ -256,6 +257,9 @@ function TimeField({
256
257
  const name = nameProp ?? field.name
257
258
  const ariaInvalid = rest['aria-invalid']
258
259
  const invalid = ariaInvalid === true || ariaInvalid === 'true' || field.invalid === true
260
+ const resolvedAriaInvalid = ariaInvalid ?? (invalid || undefined)
261
+ const { labelId, getDescriptionProps } = useLabelableContext()
262
+ useLabelableId({ id: null })
259
263
 
260
264
  const nodes = React.useMemo(() => parseFormat(format), [format])
261
265
  const segmentCount = React.useMemo(() => nodes.reduce((n, x) => n + (x.kind === 'segment' ? 1 : 0), 0), [nodes])
@@ -563,6 +567,8 @@ function TimeField({
563
567
  data-invalid={invalid || undefined}
564
568
  aria-invalid={invalid || undefined}
565
569
  aria-disabled={disabled || undefined}
570
+ aria-labelledby={rest['aria-label'] == null ? labelId : undefined}
571
+ aria-describedby={getDescriptionProps({})['aria-describedby']}
566
572
  role="group"
567
573
  ref={ref}
568
574
  className={cn(
@@ -625,6 +631,7 @@ function TimeField({
625
631
  spellCheck={false}
626
632
  aria-label={ariaLabel(node.type)}
627
633
  aria-readonly={readOnly || undefined}
634
+ aria-invalid={resolvedAriaInvalid}
628
635
  aria-valuemin={isPeriod ? 0 : range.min}
629
636
  aria-valuemax={isPeriod ? 1 : range.max}
630
637
  aria-valuenow={isPeriod ? periodAriaNow : (partVal ?? undefined)}
@@ -49,7 +49,7 @@ function TooltipContent({ className, arrow = true, children, ...props }: Tooltip
49
49
  data-slot="tooltip-content"
50
50
  className={cn(
51
51
  'bg-background-inverse text-foreground-inverse rounded-xs px-3 py-1.5 text-xs shadow-md',
52
- 'motion-safe:origin-(--transform-origin) motion-safe:transition-[opacity,scale] motion-safe:duration-200 motion-safe:ease-[cubic-bezier(0.175,0.885,0.32,1.5)]',
52
+ 'motion-safe:ease-spring motion-safe:origin-(--transform-origin) motion-safe:transition-[opacity,scale] motion-safe:duration-200',
53
53
  'data-starting-style:motion-safe:scale-90 data-starting-style:motion-safe:opacity-0',
54
54
  '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',
55
55
  'data-instant:motion-safe:transition-none',
@@ -16,10 +16,6 @@ export interface UseMediaQueryOptions {
16
16
  * Next.js, Remix, Astro): on the server and the first client render it returns
17
17
  * `defaultValue`, then the real value resolves on hydration via
18
18
  * `useSyncExternalStore`.
19
- *
20
- * @example
21
- * const isDesktop = useMediaQuery('(min-width: 768px)')
22
- * return isDesktop ? <Dialog … /> : <Drawer … />
23
19
  */
24
20
  export function useMediaQuery(query: string, { defaultValue = false }: UseMediaQueryOptions = {}): boolean {
25
21
  const subscribe = useCallback(
package/src/index.ts CHANGED
@@ -25,6 +25,7 @@ export * from './components/color-slider/color-slider'
25
25
  export * from './components/color-swatch/color-swatch'
26
26
  export * from './components/color-swatch-picker/color-swatch-picker'
27
27
  export * from './components/combobox/combobox'
28
+ export * from './components/compare-slider/compare-slider'
28
29
  export * from './components/context-menu/context-menu'
29
30
  export * from './components/copy-button/copy-button'
30
31
  export * from './components/countdown/countdown'
@@ -1,7 +1,14 @@
1
1
  import * as React from 'react'
2
2
  import { render } from '@testing-library/react'
3
3
  import { describe, it, expect, vi } from 'vitest'
4
- import { composeRefs, useComposedRefs } from './utils'
4
+ import { cn, composeRefs, useComposedRefs } from './utils'
5
+
6
+ describe('cn', () => {
7
+ it('treats ease-spring as a timing function, so a later ease-* replaces it', () => {
8
+ expect(cn('ease-spring', 'ease-linear')).toBe('ease-linear')
9
+ expect(cn('motion-safe:ease-out', 'motion-safe:ease-spring')).toBe('motion-safe:ease-spring')
10
+ })
11
+ })
5
12
 
6
13
  describe('composeRefs', () => {
7
14
  it('assigns a node to object refs and calls function refs', () => {
@@ -1,7 +1,10 @@
1
1
  import { clsx, type ClassValue } from 'clsx'
2
- import { twMerge } from 'tailwind-merge'
2
+ import { extendTailwindMerge } from 'tailwind-merge'
3
3
  import * as React from 'react'
4
4
 
5
+ // Custom theme keys must be registered, or `ease-linear` would sit beside `ease-spring` instead of replacing it.
6
+ const twMerge = extendTailwindMerge({ extend: { theme: { ease: ['spring'] } } })
7
+
5
8
  export function cn(...inputs: ClassValue[]) {
6
9
  return twMerge(clsx(inputs))
7
10
  }
package/styles.css CHANGED
@@ -174,6 +174,8 @@
174
174
  --shadow-inner: var(--inset-shadow-sm);
175
175
 
176
176
  --opacity-disabled: var(--opacity-disabled);
177
+
178
+ --ease-spring: var(--ease-spring);
177
179
  }
178
180
 
179
181
  :root,
@@ -285,6 +287,8 @@
285
287
  --selection-color: oklch(0.13 0.028 261.692 / 10%);
286
288
 
287
289
  --opacity-disabled: 0.65;
290
+
291
+ --ease-spring: cubic-bezier(0.175, 0.885, 0.32, 1.5);
288
292
  }
289
293
 
290
294
  .dark {