Skip to content

[pull] main from adobe:main #476

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

Merged
pull merged 1 commit into from
Aug 12, 2026
Merged

[pull] main from adobe:main #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
111 changes: 0 additions & 111 deletions .yarn/patches/@testing-library-user-event-npm-14.6.3-15ecebe390.patch
View file
Open in desktop

This file was deleted.

39 changes: 39 additions & 0 deletions .yarn/patches/@testing-library-user-event-npm-14.6.4-1532248d3b.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
diff --git a/dist/cjs/document/prepareDocument.js b/dist/cjs/document/prepareDocument.js
index 39a24b8f2ccdc52739d130480ab18975073616cb..0c3f5199401c15b90230c25a02de364eeef3e297 100644
--- a/dist/cjs/document/prepareDocument.js
+++ b/dist/cjs/document/prepareDocument.js
@@ -30,7 +30,7 @@ function prepareDocument(document) {
const initialValue = UI.getInitialValue(el);
if (initialValue !== undefined) {
if (el.value !== initialValue) {
- dispatchEvent.dispatchDOMEvent(el, 'change');
+ el.dispatchEvent(new Event('change'));
}
UI.clearInitialValue(el);
}
diff --git a/dist/cjs/event/behavior/keydown.js b/dist/cjs/event/behavior/keydown.js
index 47aaf21bd48856df8bfe88b7509955c5947bf89b..5a5b2030ebbd5b86fb0456597bf13b13902f86cf 100644
--- a/dist/cjs/event/behavior/keydown.js
+++ b/dist/cjs/event/behavior/keydown.js
@@ -110,7 +110,7 @@ const keydownBehavior = {
},
Tab: (event, target, instance)=>{
return ()=>{
- const dest = getTabDestination.getTabDestination(target, instance.system.keyboard.modifiers.Shift);
+ const dest = getTabDestination.getTabDestination(document.activeElement, instance.system.keyboard.modifiers.Shift);
focus.focusElement(dest);
if (selection.hasOwnSelection(dest)) {
UI.setUISelection(dest, {
diff --git a/dist/cjs/utils/focus/getActiveElement.js b/dist/cjs/utils/focus/getActiveElement.js
index d80eef7fcfe64e66df7e2e1d92d9a4a5dc7b1543..0e3b4181b88426b1947de7d5dbe6a3e977d5b77b 100644
--- a/dist/cjs/utils/focus/getActiveElement.js
+++ b/dist/cjs/utils/focus/getActiveElement.js
@@ -9,6 +9,8 @@ function getActiveElement(document) {
if (activeElementInShadowTree) {
return activeElementInShadowTree;
}
+ } else if (activeElement && activeElement.tagName === 'IFRAME') {
+ return getActiveElement(activeElement.contentWindow.document);
}
// Browser does not yield disabled elements as document.activeElement - jsdom does
if (isDisabled.isDisabled(activeElement)) {
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
"@testing-library/dom": "^10.1.0",
"@testing-library/jest-dom": "^6.9.1",
"@testing-library/react": "^16.3.0",
"@testing-library/user-event": "patch:@testing-library/user-event@npm%3A14.6.3#~/.yarn/patches/@testing-library-user-event-npm-14.6.3-15ecebe390.patch",
"@testing-library/user-event": "patch:@testing-library/user-event@npm%3A14.6.4#~/.yarn/patches/@testing-library-user-event-npm-14.6.4-1532248d3b.patch",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"@typescript/native-preview": "^7.0.0-dev.20251223.1",
Expand Down Expand Up @@ -223,7 +223,7 @@
"@mdx-js/react": "2.0.0-rc.2",
"@parcel/packager-react-static": "^2.16.3",
"@sinclair/typebox": "0.27.10",
"@testing-library/user-event": "patch:@testing-library/user-event@npm%3A14.6.3#~/.yarn/patches/@testing-library-user-event-npm-14.6.3-15ecebe390.patch",
"@testing-library/user-event": "patch:@testing-library/user-event@npm%3A14.6.4#~/.yarn/patches/@testing-library-user-event-npm-14.6.4-1532248d3b.patch",
"@types/node@npm:*": "^24",
"@types/node@npm:>= 8": "^24",
"@types/node@npm:^18.0.0": "^24",
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-spectrum/ai/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"@storybook/jest": "^0.2.3",
"@testing-library/dom": "^10.1.0",
"@testing-library/react": "^16.0.0",
"@testing-library/user-event": "patch:@testing-library/user-event@npm%3A14.6.3#~/.yarn/patches/@testing-library-user-event-npm-14.6.3-15ecebe390.patch",
"@testing-library/user-event": "patch:@testing-library/user-event@npm%3A14.6.4#~/.yarn/patches/@testing-library-user-event-npm-14.6.4-1532248d3b.patch",
"react": "^19.0.0-rc.1",
"react-dom": "^19.0.0-rc.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-spectrum/s2/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
"@storybook/jest": "^0.2.3",
"@testing-library/dom": "^10.1.0",
"@testing-library/react": "^16.0.0",
"@testing-library/user-event": "patch:@testing-library/user-event@npm%3A14.6.3#~/.yarn/patches/@testing-library-user-event-npm-14.6.3-15ecebe390.patch",
"@testing-library/user-event": "patch:@testing-library/user-event@npm%3A14.6.4#~/.yarn/patches/@testing-library-user-event-npm-14.6.4-1532248d3b.patch",
"react": "^19.0.0-rc.1",
"react-dom": "^19.0.0-rc.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-spectrum/test-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"devDependencies": {
"@testing-library/dom": "^10.1.0",
"@testing-library/react": "^16.0.0",
"@testing-library/user-event": "patch:@testing-library/user-event@npm%3A14.6.3#~/.yarn/patches/@testing-library-user-event-npm-14.6.3-15ecebe390.patch",
"@testing-library/user-event": "patch:@testing-library/user-event@npm%3A14.6.4#~/.yarn/patches/@testing-library-user-event-npm-14.6.4-1532248d3b.patch",
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/dev/test-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@testing-library/dom": "^10.1.0",
"@testing-library/jest-dom": "^6.0.0",
"@testing-library/react": "^16.3.0",
"@testing-library/user-event": "patch:@testing-library/user-event@npm%3A14.6.3#~/.yarn/patches/@testing-library-user-event-npm-14.6.3-15ecebe390.patch",
"@testing-library/user-event": "patch:@testing-library/user-event@npm%3A14.6.4#~/.yarn/patches/@testing-library-user-event-npm-14.6.4-1532248d3b.patch",
"jest": "^30.0.0",
"react-aria": "^3.47.0",
"resolve": "^2.0.0-next.6"
Expand Down
26 changes: 13 additions & 13 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7382,7 +7382,7 @@ __metadata:
"@storybook/jest": "npm:^0.2.3"
"@testing-library/dom": "npm:^10.1.0"
"@testing-library/react": "npm:^16.0.0"
"@testing-library/user-event": "patch:@testing-library/user-event@npm%3A14.6.3#~/.yarn/patches/@testing-library-user-event-npm-14.6.3-15ecebe390.patch"
"@testing-library/user-event": "patch:@testing-library/user-event@npm%3A14.6.4#~/.yarn/patches/@testing-library-user-event-npm-14.6.4-1532248d3b.patch"
react: "npm:^19.0.0-rc.1"
react-aria: "npm:3.51.0"
react-aria-components: "npm:1.20.0"
Expand Down Expand Up @@ -8120,7 +8120,7 @@ __metadata:
"@storybook/jest": "npm:^0.2.3"
"@testing-library/dom": "npm:^10.1.0"
"@testing-library/react": "npm:^16.0.0"
"@testing-library/user-event": "patch:@testing-library/user-event@npm%3A14.6.3#~/.yarn/patches/@testing-library-user-event-npm-14.6.3-15ecebe390.patch"
"@testing-library/user-event": "patch:@testing-library/user-event@npm%3A14.6.4#~/.yarn/patches/@testing-library-user-event-npm-14.6.4-1532248d3b.patch"
react: "npm:^19.0.0-rc.1"
react-aria: "npm:3.51.0"
react-aria-components: "npm:1.20.0"
Expand Down Expand Up @@ -8280,7 +8280,7 @@ __metadata:
"@testing-library/dom": "npm:^10.1.0"
"@testing-library/jest-dom": "npm:^6.0.0"
"@testing-library/react": "npm:^16.3.0"
"@testing-library/user-event": "patch:@testing-library/user-event@npm%3A14.6.3#~/.yarn/patches/@testing-library-user-event-npm-14.6.3-15ecebe390.patch"
"@testing-library/user-event": "patch:@testing-library/user-event@npm%3A14.6.4#~/.yarn/patches/@testing-library-user-event-npm-14.6.4-1532248d3b.patch"
jest: "npm:^30.0.0"
react: "npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
react-aria: "npm:^3.47.0"
Expand All @@ -8301,7 +8301,7 @@ __metadata:
"@swc/helpers": "npm:^0.5.0"
"@testing-library/dom": "npm:^10.1.0"
"@testing-library/react": "npm:^16.0.0"
"@testing-library/user-event": "patch:@testing-library/user-event@npm%3A14.6.3#~/.yarn/patches/@testing-library-user-event-npm-14.6.3-15ecebe390.patch"
"@testing-library/user-event": "patch:@testing-library/user-event@npm%3A14.6.4#~/.yarn/patches/@testing-library-user-event-npm-14.6.4-1532248d3b.patch"
react: "npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
react-dom: "npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
peerDependencies:
Expand Down Expand Up @@ -10693,21 +10693,21 @@ __metadata:
languageName: node
linkType: hard

"@testing-library/user-event@npm:14.6.3":
version: 14.6.3
resolution: "@testing-library/user-event@npm:14.6.3"
"@testing-library/user-event@npm:14.6.4":
version: 14.6.4
resolution: "@testing-library/user-event@npm:14.6.4"
peerDependencies:
"@testing-library/dom": ">=7.21.4"
checksum: 10c0/60c401edcc1b39f98aefd0e236af69c1a0454e3a7b91b92d62e2d654b044c51d39abc4a7ee0f5675566e7246dc5fc5e91af872a49da7e30a5f0e9e52f5a83a82
checksum: 10c0/2460efb88c16ce6e56f64e403cc3e1905d8378a95003933924f31e3c724f5a42dd28d6fe51a9881ecd2e3b5b2e0b12363f3c7a816df90845553180b2a219b647
languageName: node
linkType: hard

"@testing-library/user-event@patch:@testing-library/user-event@npm%3A14.6.3#~/.yarn/patches/@testing-library-user-event-npm-14.6.3-15ecebe390.patch":
version: 14.6.3
resolution: "@testing-library/user-event@patch:@testing-library/user-event@npm%3A14.6.3#~/.yarn/patches/@testing-library-user-event-npm-14.6.3-15ecebe390.patch::version=14.6.3&hash=794207"
"@testing-library/user-event@patch:@testing-library/user-event@npm%3A14.6.4#~/.yarn/patches/@testing-library-user-event-npm-14.6.4-1532248d3b.patch":
version: 14.6.4
resolution: "@testing-library/user-event@patch:@testing-library/user-event@npm%3A14.6.4#~/.yarn/patches/@testing-library-user-event-npm-14.6.4-1532248d3b.patch::version=14.6.4&hash=f14f05"
peerDependencies:
"@testing-library/dom": ">=7.21.4"
checksum: 10c0/636938a4a6ed39eff53c8b44d48719d8b9bae7999fd2253ba0249cc0edaa9f89e01fed7f54857cd8c62eac97e842ea4a4adedc17e0b26fbe91b0e79c2e01fb13
checksum: 10c0/71759b04dcc9c71a32d14a0ce0821ae2a612b2bb85fd00de35dddfa7e9aeaad6b5e5aadbce831ea59902327a3ec71c951b20b6ee6edea14125cad5d76701021d
languageName: node
linkType: hard

Expand Down Expand Up @@ -26590,7 +26590,7 @@ __metadata:
"@testing-library/dom": "npm:^10.1.0"
"@testing-library/jest-dom": "npm:^6.9.1"
"@testing-library/react": "npm:^16.3.0"
"@testing-library/user-event": "patch:@testing-library/user-event@npm%3A14.6.3#~/.yarn/patches/@testing-library-user-event-npm-14.6.3-15ecebe390.patch"
"@testing-library/user-event": "patch:@testing-library/user-event@npm%3A14.6.4#~/.yarn/patches/@testing-library-user-event-npm-14.6.4-1532248d3b.patch"
"@types/react": "npm:^19.0.0"
"@types/react-dom": "npm:^19.0.0"
"@typescript/native-preview": "npm:^7.0.0-dev.20251223.1"
Expand Down
Loading