Skip to content

Commit 67ea2f6

Browse files
ryo-manbajrgarciadev
ryo-manba
and
jrgarciadev
authored
chore: upgrade react-aria / React 19 & Next.js 15 support (#3732)
* chore: upgrade react-aria * chore: add changeset * chore: fix type error --------- Co-authored-by: Junior Garcia <[email protected]>
1 parent 2d6ae74 commit 67ea2f6

File tree

59 files changed

+1640
-1400
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1640
-1400
lines changed

‎.changeset/few-jars-flow.md

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
---
2+
"@nextui-org/table": minor
3+
"@nextui-org/accordion": patch
4+
"@nextui-org/autocomplete": patch
5+
"@nextui-org/avatar": patch
6+
"@nextui-org/breadcrumbs": patch
7+
"@nextui-org/button": patch
8+
"@nextui-org/calendar": patch
9+
"@nextui-org/card": patch
10+
"@nextui-org/checkbox": patch
11+
"@nextui-org/chip": patch
12+
"@nextui-org/date-input": patch
13+
"@nextui-org/date-picker": patch
14+
"@nextui-org/divider": patch
15+
"@nextui-org/dropdown": patch
16+
"@nextui-org/input": patch
17+
"@nextui-org/kbd": patch
18+
"@nextui-org/link": patch
19+
"@nextui-org/listbox": patch
20+
"@nextui-org/menu": patch
21+
"@nextui-org/modal": patch
22+
"@nextui-org/navbar": patch
23+
"@nextui-org/pagination": patch
24+
"@nextui-org/popover": patch
25+
"@nextui-org/progress": patch
26+
"@nextui-org/radio": patch
27+
"@nextui-org/select": patch
28+
"@nextui-org/slider": patch
29+
"@nextui-org/snippet": patch
30+
"@nextui-org/switch": patch
31+
"@nextui-org/tabs": patch
32+
"@nextui-org/tooltip": patch
33+
"@nextui-org/user": patch
34+
"@nextui-org/react": patch
35+
"@nextui-org/system": patch
36+
"@nextui-org/system-rsc": patch
37+
"@nextui-org/use-aria-accordion": patch
38+
"@nextui-org/use-aria-accordion-item": patch
39+
"@nextui-org/use-aria-button": patch
40+
"@nextui-org/use-aria-link": patch
41+
"@nextui-org/use-aria-menu": patch
42+
"@nextui-org/use-aria-modal-overlay": patch
43+
"@nextui-org/use-aria-multiselect": patch
44+
"@nextui-org/use-aria-overlay": patch
45+
"@nextui-org/use-aria-toggle-button": patch
46+
"@nextui-org/use-disclosure": patch
47+
"@nextui-org/use-intersection-observer": patch
48+
"@nextui-org/use-is-mobile": patch
49+
"@nextui-org/use-pagination": patch
50+
"@nextui-org/aria-utils": patch
51+
---
52+
53+
update react-aria version

‎apps/docs/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"@codesandbox/sandpack-react": "^2.6.4",
1919
"@iconify/icons-solar": "^1.2.3",
2020
"@iconify/react": "^4.1.1",
21-
"@internationalized/date": "^3.5.4",
21+
"@internationalized/date": "3.5.5",
2222
"@mapbox/rehype-prism": "^0.6.0",
2323
"@nextui-org/aria-utils": "workspace:*",
2424
"@nextui-org/badge": "workspace:*",
@@ -99,7 +99,7 @@
9999
"@docusaurus/utils": "2.0.0-beta.3",
100100
"@next/bundle-analyzer": "^13.4.6",
101101
"@next/env": "^13.4.12",
102-
"@react-types/shared": "3.23.1",
102+
"@react-types/shared": "3.24.1",
103103
"@tailwindcss/typography": "^0.5.9",
104104
"@types/canvas-confetti": "^1.4.2",
105105
"@types/lodash": "^4.14.194",

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"@commitlint/config-conventional": "^17.2.0",
6969
"@react-bootstrap/babel-preset": "^2.1.0",
7070
"@react-types/link": "^3.4.4",
71-
"@react-types/shared": "3.23.1",
71+
"@react-types/shared": "3.24.1",
7272
"@storybook/react": "^7.4.6",
7373
"@swc/core": "^1.3.35",
7474
"@swc/jest": "^0.2.24",

‎packages/components/accordion/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@
5454
"@nextui-org/framer-utils": "workspace:*",
5555
"@nextui-org/divider": "workspace:*",
5656
"@nextui-org/use-aria-accordion": "workspace:*",
57-
"@react-aria/interactions": "3.21.3",
58-
"@react-aria/focus": "3.17.1",
59-
"@react-aria/utils": "3.24.1",
60-
"@react-stately/tree": "3.8.1",
61-
"@react-aria/button": "3.9.5",
62-
"@react-types/accordion": "3.0.0-alpha.21",
63-
"@react-types/shared": "3.23.1"
57+
"@react-aria/interactions": "3.22.2",
58+
"@react-aria/focus": "3.18.2",
59+
"@react-aria/utils": "3.25.2",
60+
"@react-stately/tree": "3.8.4",
61+
"@react-aria/button": "3.9.8",
62+
"@react-types/accordion": "3.0.0-alpha.23",
63+
"@react-types/shared": "3.24.1"
6464
},
6565
"devDependencies": {
6666
"@nextui-org/theme": "workspace:*",

‎packages/components/autocomplete/package.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@
5353
"@nextui-org/spinner": "workspace:*",
5454
"@nextui-org/use-aria-button": "workspace:*",
5555
"@nextui-org/use-safe-layout-effect": "workspace:*",
56-
"@react-aria/combobox": "3.9.1",
57-
"@react-aria/focus": "3.17.1",
58-
"@react-aria/i18n": "3.11.1",
59-
"@react-aria/interactions": "3.21.3",
60-
"@react-aria/utils": "3.24.1",
61-
"@react-aria/visually-hidden": "3.8.12",
62-
"@react-stately/combobox": "3.8.4",
63-
"@react-types/combobox": "3.11.1",
64-
"@react-types/shared": "3.23.1"
56+
"@react-aria/combobox": "3.10.3",
57+
"@react-aria/focus": "3.18.2",
58+
"@react-aria/i18n": "3.12.2",
59+
"@react-aria/interactions": "3.22.2",
60+
"@react-aria/utils": "3.25.2",
61+
"@react-aria/visually-hidden": "3.8.15",
62+
"@react-stately/combobox": "3.9.2",
63+
"@react-types/combobox": "3.12.1",
64+
"@react-types/shared": "3.24.1"
6565
},
6666
"devDependencies": {
6767
"@nextui-org/avatar": "workspace:*",
@@ -70,7 +70,7 @@
7070
"@nextui-org/system": "workspace:*",
7171
"@nextui-org/theme": "workspace:*",
7272
"@nextui-org/use-infinite-scroll": "workspace:*",
73-
"@react-stately/data": "3.11.4",
73+
"@react-stately/data": "3.11.6",
7474
"clean-package": "2.2.0",
7575
"framer-motion": "^11.0.28",
7676
"react": "^18.0.0",

‎packages/components/avatar/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
"@nextui-org/shared-utils": "workspace:*",
4444
"@nextui-org/react-utils": "workspace:*",
4545
"@nextui-org/use-image": "workspace:*",
46-
"@react-aria/interactions": "3.21.3",
47-
"@react-aria/focus": "3.17.1",
48-
"@react-aria/utils": "3.24.1"
46+
"@react-aria/interactions": "3.22.2",
47+
"@react-aria/focus": "3.18.2",
48+
"@react-aria/utils": "3.25.2"
4949
},
5050
"devDependencies": {
5151
"@nextui-org/theme": "workspace:*",

‎packages/components/breadcrumbs/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@
4343
"@nextui-org/react-utils": "workspace:*",
4444
"@nextui-org/shared-utils": "workspace:*",
4545
"@nextui-org/shared-icons": "workspace:*",
46-
"@react-aria/focus": "3.17.1",
47-
"@react-aria/breadcrumbs": "3.5.13",
48-
"@react-aria/utils": "3.24.1",
49-
"@react-types/breadcrumbs": "3.7.5",
50-
"@react-types/shared": "3.23.1"
46+
"@react-aria/focus": "3.18.2",
47+
"@react-aria/breadcrumbs": "3.5.16",
48+
"@react-aria/utils": "3.25.2",
49+
"@react-types/breadcrumbs": "3.7.7",
50+
"@react-types/shared": "3.24.1"
5151
},
5252
"devDependencies": {
5353
"@nextui-org/theme": "workspace:*",

‎packages/components/button/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@
4646
"@nextui-org/use-aria-button": "workspace:*",
4747
"@nextui-org/ripple": "workspace:*",
4848
"@nextui-org/spinner": "workspace:*",
49-
"@react-aria/button": "3.9.5",
50-
"@react-aria/interactions": "3.21.3",
51-
"@react-aria/utils": "3.24.1",
52-
"@react-aria/focus": "3.17.1",
53-
"@react-types/shared": "3.23.1",
54-
"@react-types/button": "3.9.4"
49+
"@react-aria/button": "3.9.8",
50+
"@react-aria/interactions": "3.22.2",
51+
"@react-aria/utils": "3.25.2",
52+
"@react-aria/focus": "3.18.2",
53+
"@react-types/shared": "3.24.1",
54+
"@react-types/button": "3.9.6"
5555
},
5656
"devDependencies": {
5757
"@nextui-org/theme": "workspace:*",

‎packages/components/calendar/package.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -47,18 +47,18 @@
4747
"@nextui-org/use-aria-button": "workspace:*",
4848
"@nextui-org/button": "workspace:*",
4949
"lodash.debounce": "^4.0.8",
50-
"@internationalized/date": "^3.5.4",
51-
"@react-aria/calendar": "3.5.8",
52-
"@react-aria/focus": "3.17.1",
53-
"@react-aria/i18n": "3.11.1",
54-
"@react-stately/calendar": "3.5.1",
55-
"@react-types/button": "3.9.4",
56-
"@react-aria/visually-hidden": "3.8.12",
57-
"@react-aria/utils": "3.24.1",
58-
"@react-stately/utils": "3.10.1",
59-
"@react-types/calendar": "3.4.6",
60-
"@react-aria/interactions": "3.21.3",
61-
"@react-types/shared": "3.23.1",
50+
"@internationalized/date": "3.5.5",
51+
"@react-aria/calendar": "3.5.11",
52+
"@react-aria/focus": "3.18.2",
53+
"@react-aria/i18n": "3.12.2",
54+
"@react-stately/calendar": "3.5.4",
55+
"@react-types/button": "3.9.6",
56+
"@react-aria/visually-hidden": "3.8.15",
57+
"@react-aria/utils": "3.25.2",
58+
"@react-stately/utils": "3.10.3",
59+
"@react-types/calendar": "3.4.9",
60+
"@react-aria/interactions": "3.22.2",
61+
"@react-types/shared": "3.24.1",
6262
"scroll-into-view-if-needed": "3.0.10",
6363
"@types/lodash.debounce": "^4.0.7"
6464
},

‎packages/components/calendar/src/calendar-cell.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ export function CalendarCell(originalProps: CalendarCellProps) {
4949
!isDisabled && !isInvalid && state.isCellUnavailable(props.date.subtract({days: 1}));
5050
const highlightedRange = "highlightedRange" in state && state.highlightedRange;
5151
const isSelectionStart =
52-
isSelected && highlightedRange && isSameDay(props.date, highlightedRange.start);
52+
isSelected && highlightedRange ? isSameDay(props.date, highlightedRange.start) : false;
5353
const isSelectionEnd =
54-
isSelected && highlightedRange && isSameDay(props.date, highlightedRange.end);
54+
isSelected && highlightedRange ? isSameDay(props.date, highlightedRange.end) : false;
5555
const {locale} = useLocale();
5656
const dayOfWeek = getDayOfWeek(props.date, locale);
5757
const isRangeStart =

‎packages/components/calendar/src/utils.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {DateValue, startOfYear} from "@internationalized/date";
22

3-
export function getYearRange(start?: DateValue, end?: DateValue): DateValue[] {
3+
export function getYearRange(start?: DateValue | null, end?: DateValue | null): DateValue[] {
44
const years: DateValue[] = [];
55

66
if (!start || !end) {

‎packages/components/card/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@
4545
"@nextui-org/react-utils": "workspace:*",
4646
"@nextui-org/use-aria-button": "workspace:*",
4747
"@nextui-org/ripple": "workspace:*",
48-
"@react-aria/focus": "3.17.1",
49-
"@react-aria/utils": "3.24.1",
50-
"@react-aria/interactions": "3.21.3",
51-
"@react-aria/button": "3.9.5",
52-
"@react-types/shared": "3.23.1"
48+
"@react-aria/focus": "3.18.2",
49+
"@react-aria/utils": "3.25.2",
50+
"@react-aria/interactions": "3.22.2",
51+
"@react-aria/button": "3.9.8",
52+
"@react-types/shared": "3.24.1"
5353
},
5454
"devDependencies": {
5555
"@nextui-org/theme": "workspace:*",

‎packages/components/checkbox/package.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@
4444
"@nextui-org/shared-utils": "workspace:*",
4545
"@nextui-org/use-callback-ref": "workspace:*",
4646
"@nextui-org/use-safe-layout-effect": "workspace:*",
47-
"@react-aria/checkbox": "3.14.3",
48-
"@react-aria/focus": "3.17.1",
49-
"@react-aria/interactions": "3.21.3",
50-
"@react-aria/utils": "3.24.1",
51-
"@react-aria/visually-hidden": "3.8.12",
52-
"@react-stately/checkbox": "3.6.5",
53-
"@react-stately/toggle": "3.7.4",
54-
"@react-types/checkbox": "3.8.1",
55-
"@react-types/shared": "3.23.1"
47+
"@react-aria/checkbox": "3.14.6",
48+
"@react-aria/focus": "3.18.2",
49+
"@react-aria/interactions": "3.22.2",
50+
"@react-aria/utils": "3.25.2",
51+
"@react-aria/visually-hidden": "3.8.15",
52+
"@react-stately/checkbox": "3.6.8",
53+
"@react-stately/toggle": "3.7.7",
54+
"@react-types/checkbox": "3.8.3",
55+
"@react-types/shared": "3.24.1"
5656
},
5757
"devDependencies": {
5858
"@nextui-org/chip": "workspace:*",

‎packages/components/chip/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
"@nextui-org/shared-icons": "workspace:*",
4444
"@nextui-org/shared-utils": "workspace:*",
4545
"@nextui-org/react-utils": "workspace:*",
46-
"@react-aria/focus": "3.17.1",
47-
"@react-aria/interactions": "3.21.3",
48-
"@react-aria/utils": "3.24.1",
49-
"@react-types/checkbox": "3.8.1"
46+
"@react-aria/focus": "3.18.2",
47+
"@react-aria/interactions": "3.22.2",
48+
"@react-aria/utils": "3.25.2",
49+
"@react-types/checkbox": "3.8.3"
5050
},
5151
"devDependencies": {
5252
"@nextui-org/theme": "workspace:*",

‎packages/components/date-input/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@
4242
"dependencies": {
4343
"@nextui-org/react-utils": "workspace:*",
4444
"@nextui-org/shared-utils": "workspace:*",
45-
"@internationalized/date": "^3.5.4",
46-
"@react-aria/datepicker": "3.10.1",
47-
"@react-aria/i18n": "3.11.1",
48-
"@react-stately/datepicker": "3.9.4",
49-
"@react-types/datepicker": "3.7.4",
50-
"@react-types/shared": "3.23.1",
51-
"@react-aria/utils": "3.24.1"
45+
"@internationalized/date": "3.5.5",
46+
"@react-aria/datepicker": "3.11.2",
47+
"@react-aria/i18n": "3.12.2",
48+
"@react-stately/datepicker": "3.10.2",
49+
"@react-types/datepicker": "3.8.2",
50+
"@react-types/shared": "3.24.1",
51+
"@react-aria/utils": "3.25.2"
5252
},
5353
"devDependencies": {
5454
"@nextui-org/system": "workspace:*",

‎packages/components/date-input/src/date-input-segment.tsx

-6
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,8 @@ export const DateInputSegment: React.FC<DateInputSegmentProps> = ({
2222
...otherProps
2323
}) => {
2424
const ref = useRef(null);
25-
2625
let {segmentProps} = useDateSegment(segment, state, ref);
2726

28-
// @ts-expect-error autoCapitalize is not a valid prop
29-
// Removing autoCapitalize as it causes bugs in Firefox.
30-
// See: https://github.com/adobe/react-spectrum/issues/5599
31-
delete segmentProps.autoCapitalize;
32-
3327
return (
3428
<div
3529
{...mergeProps(segmentProps, otherProps)}

‎packages/components/date-input/src/use-date-input.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import type {DateInputVariantProps, DateInputSlots, SlotsToClasses} from "@nextui-org/theme";
22
import type {AriaDateFieldProps} from "@react-types/datepicker";
33
import type {SupportedCalendars} from "@nextui-org/system";
4-
import type {DateValue, Calendar} from "@internationalized/date";
4+
import type {DateValue} from "@react-types/datepicker";
5+
import type {Calendar} from "@internationalized/date";
56
import type {ReactRef} from "@nextui-org/react-utils";
67
import type {DOMAttributes, GroupDOMAttributes} from "@react-types/shared";
78
import type {DateInputGroupProps} from "./date-input-group";

‎packages/components/date-picker/package.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"react-dom": ">=18"
4141
},
4242
"dependencies": {
43-
"@internationalized/date": "^3.5.4",
43+
"@internationalized/date": "3.5.5",
4444
"@nextui-org/aria-utils": "workspace:*",
4545
"@nextui-org/button": "workspace:*",
4646
"@nextui-org/calendar": "workspace:*",
@@ -49,14 +49,14 @@
4949
"@nextui-org/react-utils": "workspace:*",
5050
"@nextui-org/shared-icons": "workspace:*",
5151
"@nextui-org/shared-utils": "workspace:*",
52-
"@react-aria/datepicker": "3.10.1",
53-
"@react-aria/i18n": "3.11.1",
54-
"@react-aria/utils": "3.24.1",
55-
"@react-stately/datepicker": "3.9.4",
56-
"@react-stately/overlays": "3.6.7",
57-
"@react-stately/utils": "3.10.1",
58-
"@react-types/datepicker": "3.7.4",
59-
"@react-types/shared": "3.23.1"
52+
"@react-aria/datepicker": "3.11.2",
53+
"@react-aria/i18n": "3.12.2",
54+
"@react-aria/utils": "3.25.2",
55+
"@react-stately/datepicker": "3.10.2",
56+
"@react-stately/overlays": "3.6.10",
57+
"@react-stately/utils": "3.10.3",
58+
"@react-types/datepicker": "3.8.2",
59+
"@react-types/shared": "3.24.1"
6060
},
6161
"devDependencies": {
6262
"@nextui-org/radio": "workspace:*",
@@ -68,4 +68,4 @@
6868
"react-dom": "^18.0.0"
6969
},
7070
"clean-package": "../../../clean-package.config.json"
71-
}
71+
}

‎packages/components/divider/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"@nextui-org/shared-utils": "workspace:*",
4343
"@nextui-org/react-rsc-utils": "workspace:*",
4444
"@nextui-org/system-rsc": "workspace:*",
45-
"@react-types/shared": "3.23.1"
45+
"@react-types/shared": "3.24.1"
4646
},
4747
"devDependencies": {
4848
"@nextui-org/theme": "workspace:*",

0 commit comments

Comments
 (0)