Skip to content

[pull] main from adobe:main #133

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 2 commits into from
Sep 13, 2025
Merged

[pull] main from adobe:main #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee5c451
fix: Properly allow user to keyboard edit the Autocomplete input fiel…
LFDanLu Sep 12, 2025
53366f0
Publish
devongovett Sep 12, 2025
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
56 changes: 28 additions & 28 deletions packages/@adobe/react-spectrum/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@adobe/react-spectrum",
"version": "3.44.1",
"version": "3.44.2",
"description": "Spectrum UI components in React",
"license": "Apache-2.0",
"main": "dist/main.js",
Expand Down Expand Up @@ -41,30 +41,30 @@
},
"dependencies": {
"@internationalized/string": "^3.2.7",
"@react-aria/collections": "3.0.0-rc.6",
"@react-aria/collections": "3.0.0-rc.7",
"@react-aria/i18n": "^3.12.12",
"@react-aria/ssr": "^3.9.10",
"@react-aria/utils": "^3.30.1",
"@react-aria/visually-hidden": "^3.8.27",
"@react-spectrum/accordion": "^3.0.11",
"@react-spectrum/actionbar": "^3.6.12",
"@react-spectrum/actiongroup": "^3.11.2",
"@react-spectrum/accordion": "^3.0.12",
"@react-spectrum/actionbar": "^3.6.13",
"@react-spectrum/actiongroup": "^3.11.3",
"@react-spectrum/avatar": "^3.0.25",
"@react-spectrum/badge": "^3.1.28",
"@react-spectrum/breadcrumbs": "^3.9.22",
"@react-spectrum/button": "^3.17.2",
"@react-spectrum/badge": "^3.1.29",
"@react-spectrum/breadcrumbs": "^3.9.23",
"@react-spectrum/button": "^3.17.3",
"@react-spectrum/buttongroup": "^3.6.25",
"@react-spectrum/calendar": "^3.7.6",
"@react-spectrum/checkbox": "^3.10.2",
"@react-spectrum/color": "^3.1.2",
"@react-spectrum/combobox": "^3.16.2",
"@react-spectrum/contextualhelp": "^3.6.26",
"@react-spectrum/datepicker": "^3.14.6",
"@react-spectrum/dialog": "^3.9.2",
"@react-spectrum/calendar": "^3.7.7",
"@react-spectrum/checkbox": "^3.10.3",
"@react-spectrum/color": "^3.1.3",
"@react-spectrum/combobox": "^3.16.3",
"@react-spectrum/contextualhelp": "^3.6.27",
"@react-spectrum/datepicker": "^3.14.7",
"@react-spectrum/dialog": "^3.9.3",
"@react-spectrum/divider": "^3.5.26",
"@react-spectrum/dnd": "^3.6.1",
"@react-spectrum/dropzone": "^3.0.16",
"@react-spectrum/filetrigger": "^3.0.16",
"@react-spectrum/dropzone": "^3.0.17",
"@react-spectrum/filetrigger": "^3.0.17",
"@react-spectrum/form": "^3.7.18",
"@react-spectrum/icon": "^3.8.8",
"@react-spectrum/illustratedmessage": "^3.5.13",
Expand All @@ -73,31 +73,31 @@
"@react-spectrum/labeledvalue": "^3.2.6",
"@react-spectrum/layout": "^3.6.18",
"@react-spectrum/link": "^3.6.21",
"@react-spectrum/list": "^3.10.6",
"@react-spectrum/listbox": "^3.15.6",
"@react-spectrum/menu": "^3.22.6",
"@react-spectrum/list": "^3.10.7",
"@react-spectrum/listbox": "^3.15.7",
"@react-spectrum/menu": "^3.22.7",
"@react-spectrum/meter": "^3.5.13",
"@react-spectrum/numberfield": "^3.10.1",
"@react-spectrum/overlays": "^5.8.2",
"@react-spectrum/picker": "^3.16.2",
"@react-spectrum/picker": "^3.16.3",
"@react-spectrum/progress": "^3.7.19",
"@react-spectrum/provider": "^3.10.10",
"@react-spectrum/radio": "^3.7.20",
"@react-spectrum/searchfield": "^3.8.21",
"@react-spectrum/searchfield": "^3.8.22",
"@react-spectrum/slider": "^3.8.1",
"@react-spectrum/statuslight": "^3.5.25",
"@react-spectrum/switch": "^3.6.5",
"@react-spectrum/table": "^3.17.6",
"@react-spectrum/tabs": "^3.8.25",
"@react-spectrum/tag": "^3.3.5",
"@react-spectrum/text": "^3.5.20",
"@react-spectrum/table": "^3.17.7",
"@react-spectrum/tabs": "^3.8.26",
"@react-spectrum/tag": "^3.3.6",
"@react-spectrum/text": "^3.5.21",
"@react-spectrum/textfield": "^3.14.1",
"@react-spectrum/theme-dark": "^3.5.21",
"@react-spectrum/theme-default": "^3.5.21",
"@react-spectrum/theme-light": "^3.4.21",
"@react-spectrum/toast": "^3.1.2",
"@react-spectrum/toast": "^3.1.3",
"@react-spectrum/tooltip": "^3.7.10",
"@react-spectrum/tree": "^3.1.6",
"@react-spectrum/tree": "^3.1.7",
"@react-spectrum/view": "^3.6.22",
"@react-spectrum/well": "^3.4.26",
"@react-stately/collections": "^3.12.7",
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-aria/autocomplete/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@react-aria/autocomplete",
"version": "3.0.0-rc.1",
"version": "3.0.0-rc.2",
"description": "Spectrum UI components in React",
"license": "Apache-2.0",
"main": "dist/main.js",
Expand Down
21 changes: 14 additions & 7 deletions packages/@react-aria/autocomplete/src/useAutocomplete.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,11 @@ export function useAutocomplete<T>(props: AriaAutocompleteOptions<T>, state: Aut
queuedActiveDescendant.current = target.id;
state.setFocusedNodeId(target.id);
}
} else {
} else if (queuedActiveDescendant.current && !document.getElementById(queuedActiveDescendant.current)) {
// If we recieve a focus event refocusing the collection, either we have newly refocused the input and are waiting for the
// wrapped collection to refocus the previously focused node if any OR
// we are in a state where we've filtered to such a point that there aren't any matching items in the collection to focus.
// In this case we want to clear tracked item if any and clear active descendant
queuedActiveDescendant.current = null;
state.setFocusedNodeId(null);
}
Expand Down Expand Up @@ -189,7 +193,7 @@ export function useAutocomplete<T>(props: AriaAutocompleteOptions<T>, state: Aut
// copy paste/backspacing/undo/redo for screen reader announcements
if (lastInputType.current === 'insertText' && !disableAutoFocusFirst) {
focusFirstItem();
} else if (lastInputType.current.includes('insert') || lastInputType.current.includes('delete') || lastInputType.current.includes('history')) {
} else if (lastInputType.current && (lastInputType.current.includes('insert') || lastInputType.current.includes('delete') || lastInputType.current.includes('history'))) {
clearVirtualFocus(true);

// If onChange was triggered before the timeout actually updated the activedescendant, we need to fire
Expand Down Expand Up @@ -274,9 +278,11 @@ export function useAutocomplete<T>(props: AriaAutocompleteOptions<T>, state: Aut
) || false;
} else {
let item = document.getElementById(focusedNodeId);
shouldPerformDefaultAction = item?.dispatchEvent(
new KeyboardEvent(e.nativeEvent.type, e.nativeEvent)
) || false;
if (item) {
shouldPerformDefaultAction = item?.dispatchEvent(
new KeyboardEvent(e.nativeEvent.type, e.nativeEvent)
) || false;
}
}
}

Expand Down Expand Up @@ -366,8 +372,9 @@ export function useAutocomplete<T>(props: AriaAutocompleteOptions<T>, state: Aut
if (curFocusedNode) {
let target = e.target;
queueMicrotask(() => {
dispatchVirtualBlur(target, curFocusedNode);
dispatchVirtualFocus(curFocusedNode, target);
// instead of focusing the last focused node, just focus the collection instead and have the collection handle what item to focus via useSelectableCollection/Item
dispatchVirtualBlur(target, collectionRef.current);
dispatchVirtualFocus(collectionRef.current!, target);
});
}
};
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-aria/collections/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@react-aria/collections",
"version": "3.0.0-rc.6",
"version": "3.0.0-rc.7",
"description": "Spectrum UI components in React",
"license": "Apache-2.0",
"main": "dist/main.js",
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-spectrum/accordion/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@react-spectrum/accordion",
"version": "3.0.11",
"version": "3.0.12",
"description": "Spectrum UI components in React",
"license": "Apache-2.0",
"main": "dist/main.js",
Expand Down Expand Up @@ -45,7 +45,7 @@
"@react-types/shared": "^3.32.0",
"@spectrum-icons/ui": "^3.6.19",
"@swc/helpers": "^0.5.0",
"react-aria-components": "^1.12.1"
"react-aria-components": "^1.12.2"
},
"devDependencies": {
"@adobe/spectrum-css-temp": "3.0.0-alpha.1"
Expand Down
8 changes: 4 additions & 4 deletions packages/@react-spectrum/actionbar/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@react-spectrum/actionbar",
"version": "3.6.12",
"version": "3.6.13",
"description": "Spectrum UI components in React",
"license": "Apache-2.0",
"main": "dist/main.js",
Expand Down Expand Up @@ -45,10 +45,10 @@
"@react-aria/interactions": "^3.25.5",
"@react-aria/live-announcer": "^3.4.4",
"@react-aria/utils": "^3.30.1",
"@react-spectrum/actiongroup": "^3.11.2",
"@react-spectrum/button": "^3.17.2",
"@react-spectrum/actiongroup": "^3.11.3",
"@react-spectrum/button": "^3.17.3",
"@react-spectrum/overlays": "^5.8.2",
"@react-spectrum/text": "^3.5.20",
"@react-spectrum/text": "^3.5.21",
"@react-spectrum/utils": "^3.12.8",
"@react-stately/collections": "^3.12.7",
"@react-types/actionbar": "^3.1.18",
Expand Down
8 changes: 4 additions & 4 deletions packages/@react-spectrum/actiongroup/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@react-spectrum/actiongroup",
"version": "3.11.2",
"version": "3.11.3",
"description": "Spectrum UI components in React",
"license": "Apache-2.0",
"main": "dist/main.js",
Expand Down Expand Up @@ -45,9 +45,9 @@
"@react-aria/i18n": "^3.12.12",
"@react-aria/interactions": "^3.25.5",
"@react-aria/utils": "^3.30.1",
"@react-spectrum/button": "^3.17.2",
"@react-spectrum/menu": "^3.22.6",
"@react-spectrum/text": "^3.5.20",
"@react-spectrum/button": "^3.17.3",
"@react-spectrum/menu": "^3.22.7",
"@react-spectrum/text": "^3.5.21",
"@react-spectrum/tooltip": "^3.7.10",
"@react-spectrum/utils": "^3.12.8",
"@react-stately/collections": "^3.12.7",
Expand Down
8 changes: 4 additions & 4 deletions packages/@react-spectrum/autocomplete/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@react-spectrum/autocomplete",
"version": "3.0.0-alpha.48",
"version": "3.0.0-alpha.49",
"description": "Spectrum UI components in React",
"license": "Apache-2.0",
"main": "dist/main.js",
Expand Down Expand Up @@ -40,7 +40,7 @@
"url": "https://github.com/adobe/react-spectrum"
},
"dependencies": {
"@react-aria/autocomplete": "3.0.0-rc.1",
"@react-aria/autocomplete": "3.0.0-rc.2",
"@react-aria/button": "^3.14.1",
"@react-aria/dialog": "^3.5.30",
"@react-aria/focus": "^3.21.1",
Expand All @@ -50,10 +50,10 @@
"@react-aria/label": "^3.7.21",
"@react-aria/overlays": "^3.29.1",
"@react-aria/utils": "^3.30.1",
"@react-spectrum/button": "^3.17.2",
"@react-spectrum/button": "^3.17.3",
"@react-spectrum/form": "^3.7.18",
"@react-spectrum/label": "^3.16.18",
"@react-spectrum/listbox": "^3.15.6",
"@react-spectrum/listbox": "^3.15.7",
"@react-spectrum/overlays": "^5.8.2",
"@react-spectrum/progress": "^3.7.19",
"@react-spectrum/textfield": "^3.14.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-spectrum/badge/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@react-spectrum/badge",
"version": "3.1.28",
"version": "3.1.29",
"description": "Spectrum UI components in React",
"license": "Apache-2.0",
"main": "dist/main.js",
Expand Down Expand Up @@ -41,7 +41,7 @@
},
"dependencies": {
"@react-aria/utils": "^3.30.1",
"@react-spectrum/text": "^3.5.20",
"@react-spectrum/text": "^3.5.21",
"@react-spectrum/utils": "^3.12.8",
"@react-types/badge": "^3.1.20",
"@react-types/shared": "^3.32.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/@react-spectrum/breadcrumbs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@react-spectrum/breadcrumbs",
"version": "3.9.22",
"version": "3.9.23",
"description": "Spectrum UI components in React",
"license": "Apache-2.0",
"main": "dist/main.js",
Expand Down Expand Up @@ -45,8 +45,8 @@
"@react-aria/i18n": "^3.12.12",
"@react-aria/interactions": "^3.25.5",
"@react-aria/utils": "^3.30.1",
"@react-spectrum/button": "^3.17.2",
"@react-spectrum/menu": "^3.22.6",
"@react-spectrum/button": "^3.17.3",
"@react-spectrum/menu": "^3.22.7",
"@react-spectrum/utils": "^3.12.8",
"@react-stately/collections": "^3.12.7",
"@react-types/breadcrumbs": "^3.7.16",
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-spectrum/button/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@react-spectrum/button",
"version": "3.17.2",
"version": "3.17.3",
"description": "Spectrum UI components in React",
"license": "Apache-2.0",
"main": "dist/main.js",
Expand Down Expand Up @@ -46,7 +46,7 @@
"@react-aria/interactions": "^3.25.5",
"@react-aria/utils": "^3.30.1",
"@react-spectrum/progress": "^3.7.19",
"@react-spectrum/text": "^3.5.20",
"@react-spectrum/text": "^3.5.21",
"@react-spectrum/utils": "^3.12.8",
"@react-stately/toggle": "^3.9.1",
"@react-types/button": "^3.14.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-spectrum/calendar/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@react-spectrum/calendar",
"version": "3.7.6",
"version": "3.7.7",
"description": "Spectrum UI components in React",
"license": "Apache-2.0",
"main": "dist/main.js",
Expand Down Expand Up @@ -47,7 +47,7 @@
"@react-aria/interactions": "^3.25.5",
"@react-aria/utils": "^3.30.1",
"@react-aria/visually-hidden": "^3.8.27",
"@react-spectrum/button": "^3.17.2",
"@react-spectrum/button": "^3.17.3",
"@react-spectrum/label": "^3.16.18",
"@react-spectrum/utils": "^3.12.8",
"@react-stately/calendar": "^3.8.4",
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-spectrum/card/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@react-spectrum/card",
"version": "3.0.0-alpha.48",
"version": "3.0.0-alpha.49",
"description": "Spectrum UI components in React",
"license": "Apache-2.0",
"main": "dist/main.js",
Expand Down Expand Up @@ -46,7 +46,7 @@
"@react-aria/interactions": "^3.25.5",
"@react-aria/utils": "^3.30.1",
"@react-aria/virtualizer": "^4.1.9",
"@react-spectrum/checkbox": "^3.10.2",
"@react-spectrum/checkbox": "^3.10.3",
"@react-spectrum/progress": "^3.7.19",
"@react-spectrum/utils": "^3.12.8",
"@react-stately/collections": "^3.12.7",
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-spectrum/checkbox/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@react-spectrum/checkbox",
"version": "3.10.2",
"version": "3.10.3",
"description": "Spectrum UI components in React",
"license": "Apache-2.0",
"main": "dist/main.js",
Expand Down Expand Up @@ -52,7 +52,7 @@
"@react-types/shared": "^3.32.0",
"@spectrum-icons/ui": "^3.6.19",
"@swc/helpers": "^0.5.0",
"react-aria-components": "^1.12.1"
"react-aria-components": "^1.12.2"
},
"devDependencies": {
"@adobe/spectrum-css-temp": "3.0.0-alpha.1",
Expand Down
8 changes: 4 additions & 4 deletions packages/@react-spectrum/color/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@react-spectrum/color",
"version": "3.1.2",
"version": "3.1.3",
"description": "Spectrum UI components in React",
"license": "Apache-2.0",
"main": "dist/main.js",
Expand Down Expand Up @@ -45,11 +45,11 @@
"@react-aria/i18n": "^3.12.12",
"@react-aria/interactions": "^3.25.5",
"@react-aria/utils": "^3.30.1",
"@react-spectrum/dialog": "^3.9.2",
"@react-spectrum/dialog": "^3.9.3",
"@react-spectrum/form": "^3.7.18",
"@react-spectrum/label": "^3.16.18",
"@react-spectrum/overlays": "^5.8.2",
"@react-spectrum/picker": "^3.16.2",
"@react-spectrum/picker": "^3.16.3",
"@react-spectrum/textfield": "^3.14.1",
"@react-spectrum/utils": "^3.12.8",
"@react-spectrum/view": "^3.6.22",
Expand All @@ -58,7 +58,7 @@
"@react-types/shared": "^3.32.0",
"@react-types/textfield": "^3.12.5",
"@swc/helpers": "^0.5.0",
"react-aria-components": "^1.12.1"
"react-aria-components": "^1.12.2"
},
"devDependencies": {
"@adobe/spectrum-css-temp": "3.0.0-alpha.1",
Expand Down
Loading
Loading