Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

React 19 compatibility #2934

Merged
merged 27 commits into from
Jun 10, 2024
Merged

React 19 compatibility #2934

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
82bff21
Access ref from props before element.ref
chungweileong94 Apr 2, 2024
45b510a
Apply ref access fix to presence component
chungweileong94 Apr 27, 2024
2be7074
adding react 19 to peer deps
BenAHammond May 28, 2024
44c9aa9
Upgrade to React 18.3.1
Jun 4, 2024
4daf046
Merge branch 'chungweileong94/main' into vlad/react-upgrades
Jun 4, 2024
980acb3
Merge branch 'ben/react-19' into vlad/react-upgrades
Jun 4, 2024
21da11f
Add missing React 19 peer deps
Jun 4, 2024
bdbbc87
Remove propTypes
Jun 4, 2024
09c0140
Update ReactDOM usage
Jun 4, 2024
7a5e1b3
yarn
Jun 4, 2024
eccd0b0
Upgrade to React 19 and access refs in a backwards compatible way
Jun 4, 2024
8750d9c
Recover Storybook
Jun 4, 2024
2bbd60a
Remove an outdated type
Jun 4, 2024
6e97323
Suppress a type error, tweak formatting
Jun 4, 2024
a5a3075
Track version changes
Jun 4, 2024
b02edfc
Don't throw in render, just log the error
Jun 4, 2024
9f74b8a
Update and upgrade tests
Jun 4, 2024
303c39a
Roll back tests deps changes
Jun 4, 2024
f1bd85f
^ in react version affects tests?
Jun 4, 2024
007ba3a
Upgrade testing-library and wrap FocusScope tests in act
Jun 4, 2024
d8f2071
Upgrade @testing-library/react to 16.0
Jun 4, 2024
f3575fa
Of cooooourse
Jun 4, 2024
ceb0e7c
Remove unnecessary changes
Jun 4, 2024
e890cc1
Refine getElementRef
Jun 4, 2024
e2f4e2e
Upgrade start-server-and-test
Jun 5, 2024
f1f02eb
Flaky cypress test?
Jun 5, 2024
ac7d8a4
Remove unnecessary changes
Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
"@storybook/react": "^7.6.17",
"@storybook/react-webpack5": "^7.6.17",
"@storybook/test": "^7.6.17",
"@testing-library/cypress": "^7.0.6",
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^13.0.1",
"@testing-library/user-event": "^14.1.0",
"@testing-library/cypress": "^10.0.2",
"@testing-library/jest-dom": "^6.4.5",
"@testing-library/react": "^15.0.7",
"@testing-library/user-event": "^14.5.2",
"@types/eslint": "^7.28.0",
"@types/fs-extra": "^11",
"@types/jest": "^27.4.1",
Expand Down
6 changes: 3 additions & 3 deletions packages/react/focus-scope/src/FocusScope.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ describe('FocusScope', () => {
it('should focus the next element in the scope on tab', () => {
tabbableFirst.focus();
vladmoroz marked this conversation as resolved.
Show resolved Hide resolved
userEvent.tab();
expect(tabbableSecond).toHaveFocus();
waitFor(() => expect(tabbableSecond).toHaveFocus());
});

it('should focus the last element in the scope on shift+tab from the first element in scope', () => {
Expand All @@ -49,7 +49,7 @@ describe('FocusScope', () => {
it('should focus the first element in scope on tab from the last element in scope', async () => {
tabbableLast.focus();
userEvent.tab();
expect(tabbableFirst).toHaveFocus();
waitFor(() => expect(tabbableFirst).toHaveFocus());
});
});

Expand Down Expand Up @@ -79,7 +79,7 @@ describe('FocusScope', () => {
it('should skip the element with a negative tabindex on tab', () => {
tabbableLast.focus();
userEvent.tab();
expect(tabbableSecond).toHaveFocus();
waitFor(() => expect(tabbableSecond).toHaveFocus());
});

it('should skip the element with a negative tabindex on shift+tab', () => {
Expand Down
122 changes: 50 additions & 72 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ __metadata:
version: 8
cacheKey: 10

"@adobe/css-tools@npm:^4.0.1, @adobe/css-tools@npm:^4.3.2":
"@adobe/css-tools@npm:^4.3.2":
version: 4.3.3
resolution: "@adobe/css-tools@npm:4.3.3"
checksum: 10/0e77057efb4e18182560855503066b75edca98671be327d3f8a7ae89ec3da6821e693114b55225909fca00d7e7ed8422f3d79d71fe95dd4d5df1f2026a9fda02
Expand Down Expand Up @@ -1497,7 +1497,7 @@ __metadata:
languageName: node
linkType: hard

"@babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.10.3, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":
"@babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.10.3, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.14.6, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":
version: 7.24.6
resolution: "@babel/runtime@npm:7.24.6"
dependencies:
Expand Down Expand Up @@ -5907,19 +5907,35 @@ __metadata:
languageName: node
linkType: hard

"@testing-library/cypress@npm:^7.0.6":
version: 7.0.7
resolution: "@testing-library/cypress@npm:7.0.7"
"@testing-library/cypress@npm:^10.0.2":
version: 10.0.2
resolution: "@testing-library/cypress@npm:10.0.2"
dependencies:
"@babel/runtime": "npm:^7.12.5"
"@testing-library/dom": "npm:^7.29.6"
"@babel/runtime": "npm:^7.14.6"
"@testing-library/dom": "npm:^10.1.0"
peerDependencies:
cypress: ^2.1.0 || ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0
checksum: 10/c9ed1e18d36b493bc708f3abc47094c71ef4bbb190a8cb2392769a564352ade0206a2dca77d11a7c183ea1b0956d5b2f9a56a933d6166537e0a90cbcf9f8b300
cypress: ^12.0.0 || ^13.0.0
checksum: 10/8eaa8c38808350b2adfd75a8b51d28bd862bfa7249188e070ef6022338c6b90f7dc3a9db1f58509bd16e21a17f8409498e12afec852a2807e47f86a170baa0c2
languageName: node
linkType: hard

"@testing-library/dom@npm:^7.22.3, @testing-library/dom@npm:^7.29.6":
"@testing-library/dom@npm:^10.0.0, @testing-library/dom@npm:^10.1.0":
version: 10.1.0
resolution: "@testing-library/dom@npm:10.1.0"
dependencies:
"@babel/code-frame": "npm:^7.10.4"
"@babel/runtime": "npm:^7.12.5"
"@types/aria-query": "npm:^5.0.1"
aria-query: "npm:5.3.0"
chalk: "npm:^4.1.0"
dom-accessibility-api: "npm:^0.5.9"
lz-string: "npm:^1.5.0"
pretty-format: "npm:^27.0.2"
checksum: 10/6d6ef942deedf547180c76d4cc2c43fe8e52a98ef68be6ba7382a43d3b1e1e5696d9c32ae0b2df12c92ea50023187d132ad2542fc118ba4b900f149e97d019e0
languageName: node
linkType: hard

"@testing-library/dom@npm:^7.22.3":
version: 7.31.2
resolution: "@testing-library/dom@npm:7.31.2"
dependencies:
Expand All @@ -5935,22 +5951,6 @@ __metadata:
languageName: node
linkType: hard

"@testing-library/dom@npm:^8.5.0":
version: 8.20.1
resolution: "@testing-library/dom@npm:8.20.1"
dependencies:
"@babel/code-frame": "npm:^7.10.4"
"@babel/runtime": "npm:^7.12.5"
"@types/aria-query": "npm:^5.0.1"
aria-query: "npm:5.1.3"
chalk: "npm:^4.1.0"
dom-accessibility-api: "npm:^0.5.9"
lz-string: "npm:^1.5.0"
pretty-format: "npm:^27.0.2"
checksum: 10/6c7a92fcc89931ef62a9a92dacec09b3e5ee5c3aba2171aa8de6c7504927b7c9364d73d2ed87b72447d6783108c1c92c207d16f788de64c69bc97059d7105e3c
languageName: node
linkType: hard

"@testing-library/dom@npm:^9.3.1":
version: 9.3.4
resolution: "@testing-library/dom@npm:9.3.4"
Expand All @@ -5967,24 +5967,7 @@ __metadata:
languageName: node
linkType: hard

"@testing-library/jest-dom@npm:^5.16.4":
version: 5.17.0
resolution: "@testing-library/jest-dom@npm:5.17.0"
dependencies:
"@adobe/css-tools": "npm:^4.0.1"
"@babel/runtime": "npm:^7.9.2"
"@types/testing-library__jest-dom": "npm:^5.9.1"
aria-query: "npm:^5.0.0"
chalk: "npm:^3.0.0"
css.escape: "npm:^1.5.1"
dom-accessibility-api: "npm:^0.5.6"
lodash: "npm:^4.17.15"
redent: "npm:^3.0.0"
checksum: 10/5a75f2094f935d2da58ea1d2b3d0c9f58dc0bca2592f2ca8125176596b4adba88b742b7553ef228e2085eadcb498ce6cece3e78402e34e6af7b6bc26bf0a0baa
languageName: node
linkType: hard

"@testing-library/jest-dom@npm:^6.1.3":
"@testing-library/jest-dom@npm:^6.1.3, @testing-library/jest-dom@npm:^6.4.5":
version: 6.4.5
resolution: "@testing-library/jest-dom@npm:6.4.5"
dependencies:
Expand Down Expand Up @@ -6030,17 +6013,21 @@ __metadata:
languageName: node
linkType: hard

"@testing-library/react@npm:^13.0.1":
version: 13.4.0
resolution: "@testing-library/react@npm:13.4.0"
"@testing-library/react@npm:^15.0.7":
version: 15.0.7
resolution: "@testing-library/react@npm:15.0.7"
dependencies:
"@babel/runtime": "npm:^7.12.5"
"@testing-library/dom": "npm:^8.5.0"
"@testing-library/dom": "npm:^10.0.0"
"@types/react-dom": "npm:^18.0.0"
peerDependencies:
"@types/react": ^18.0.0
react: ^18.0.0
react-dom: ^18.0.0
checksum: 10/788249aad25a0161b197b7d387011e2578701ab18451b69a987eb073b2d24eb1041f242581c3dd4800f5abcf4f11811f5f6b1e682a45f1840a08fdde3ce559b7
peerDependenciesMeta:
"@types/react":
optional: true
checksum: 10/a9342ad09b019b0f99688fb50265899bc93adfe23c22aa6743fd920635b43fdc66877e66d95f240923aa6f7d3aa360837f5b053fb363a31975788974dff7bc93
languageName: node
linkType: hard

Expand All @@ -6053,7 +6040,7 @@ __metadata:
languageName: node
linkType: hard

"@testing-library/user-event@npm:^14.1.0":
"@testing-library/user-event@npm:^14.5.2":
version: 14.5.2
resolution: "@testing-library/user-event@npm:14.5.2"
peerDependencies:
Expand Down Expand Up @@ -6595,15 +6582,6 @@ __metadata:
languageName: node
linkType: hard

"@types/testing-library__jest-dom@npm:^5.9.1":
version: 5.14.9
resolution: "@types/testing-library__jest-dom@npm:5.14.9"
dependencies:
"@types/jest": "npm:*"
checksum: 10/e257de95a4a9385cc09ae4ca3396d23ad4b5cfb8e021a1ca3454c424c34636075f6fe151b2f881f79bf9d497aa04fbfae62449b135f293e8d2d614fa899898a8
languageName: node
linkType: hard

"@types/unist@npm:^2.0.0":
version: 2.0.10
resolution: "@types/unist@npm:2.0.10"
Expand Down Expand Up @@ -7331,6 +7309,15 @@ __metadata:
languageName: node
linkType: hard

"aria-query@npm:5.3.0, aria-query@npm:^5.0.0, aria-query@npm:^5.3.0":
version: 5.3.0
resolution: "aria-query@npm:5.3.0"
dependencies:
dequal: "npm:^2.0.3"
checksum: 10/c3e1ed127cc6886fea4732e97dd6d3c3938e64180803acfb9df8955517c4943760746ffaf4020ce8f7ffaa7556a3b5f85c3769a1f5ca74a1288e02d042f9ae4e
languageName: node
linkType: hard

"aria-query@npm:^4.2.2":
version: 4.2.2
resolution: "aria-query@npm:4.2.2"
Expand All @@ -7341,15 +7328,6 @@ __metadata:
languageName: node
linkType: hard

"aria-query@npm:^5.0.0, aria-query@npm:^5.3.0":
version: 5.3.0
resolution: "aria-query@npm:5.3.0"
dependencies:
dequal: "npm:^2.0.3"
checksum: 10/c3e1ed127cc6886fea4732e97dd6d3c3938e64180803acfb9df8955517c4943760746ffaf4020ce8f7ffaa7556a3b5f85c3769a1f5ca74a1288e02d042f9ae4e
languageName: node
linkType: hard

"array-buffer-byte-length@npm:^1.0.0, array-buffer-byte-length@npm:^1.0.1":
version: 1.0.1
resolution: "array-buffer-byte-length@npm:1.0.1"
Expand Down Expand Up @@ -15127,10 +15105,10 @@ __metadata:
"@storybook/react": "npm:^7.6.17"
"@storybook/react-webpack5": "npm:^7.6.17"
"@storybook/test": "npm:^7.6.17"
"@testing-library/cypress": "npm:^7.0.6"
"@testing-library/jest-dom": "npm:^5.16.4"
"@testing-library/react": "npm:^13.0.1"
"@testing-library/user-event": "npm:^14.1.0"
"@testing-library/cypress": "npm:^10.0.2"
"@testing-library/jest-dom": "npm:^6.4.5"
"@testing-library/react": "npm:^15.0.7"
"@testing-library/user-event": "npm:^14.5.2"
"@types/eslint": "npm:^7.28.0"
"@types/fs-extra": "npm:^11"
"@types/jest": "npm:^27.4.1"
Expand Down
Loading