Skip to content

fix(sharing-dialog): support keyboard autocomplete navigation #1763

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

Closed
sankorla315 wants to merge 1 commit into from
Closed

fix(sharing-dialog): support keyboard autocomplete navigation #1763

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
4 changes: 2 additions & 2 deletions collections/forms/i18n/en.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"POT-Creation-Date: 2026-06-29T22:33:55.937Z\n"
"PO-Revision-Date: 2026-06-29T22:33:55.938Z\n"
"POT-Creation-Date: 2026-09-02T07:23:58.681Z\n"
"PO-Revision-Date: 2026-09-02T07:23:58.682Z\n"

msgid "Upload file"
msgstr "Upload file"
Expand Down
33 changes: 23 additions & 10 deletions components/sharing-dialog/src/autocomplete/autocomplete.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,19 @@ export const Autocomplete = ({
searchResults,
}) => {
const wrapper = useRef(null)
const menuWrapper = useRef(null)
const [menuWidth] = useSize(wrapper)
const { isDisconnected: offline } = useDhis2ConnectionStatus()

const handleInputKeyDown = (_, event) => {
if (event.key !== 'ArrowDown' || searchResults.length === 0) {
return
}

event.preventDefault()
menuWrapper.current?.querySelector('[role="menu"]')?.focus()
}

return (
<>
<div ref={wrapper}>
Expand All @@ -31,6 +41,7 @@ export const Autocomplete = ({
loading={loading}
placeholder={placeholder}
onChange={({ value }) => onSearch(value)}
onKeyDown={handleInputKeyDown}
value={search}
inputWidth={inputWidth}
disabled={offline}
Expand All @@ -44,16 +55,18 @@ export const Autocomplete = ({
menuRef={wrapper}
dataTest={`${dataTest}-menu`}
>
<Menu>
{searchResults.map((result) => (
<MenuItem
key={result.id}
label={result.displayName}
value={result.id}
onClick={({ value }) => onSelect(value)}
/>
))}
</Menu>
<div ref={menuWrapper}>
<Menu>
{searchResults.map((result) => (
<MenuItem
key={result.id}
label={result.displayName}
value={result.id}
onClick={({ value }) => onSelect(value)}
/>
))}
</Menu>
</div>
</MenuPopup>
)}
</>
Expand Down
45 changes: 45 additions & 0 deletions components/sharing-dialog/src/autocomplete/sharing-autocomplete.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,49 @@ describe('SharingAutocomplete', () => {
}
expect(screen.queryByRole('menuitem')).not.toBeInTheDocument()
})

it('supports keyboard navigation and selection', async () => {
const firstUser = {
id: 'user-1',
displayName: 'First User',
}
const secondUser = {
id: 'user-2',
displayName: 'Second User',
}
const dataProviderData = {
'sharing/search': jest.fn(() => ({
users: [firstUser, secondUser],
})),
}

render(
<CustomDataProvider data={dataProviderData}>
<Wrapper />
</CustomDataProvider>
)

const input = screen.getByRole('textbox')
await userEvent.type(input, 'User')

const menuItems = await screen.findAllByRole('menuitem')
const firstItemContainer = menuItems[0].closest('li')
const secondItemContainer = menuItems[1].closest('li')

await userEvent.keyboard('{ArrowDown}')
expect(firstItemContainer).toHaveFocus()

await userEvent.keyboard('{ArrowDown}')
expect(secondItemContainer).toHaveFocus()

await userEvent.keyboard('{ArrowUp}')
expect(firstItemContainer).toHaveFocus()

await userEvent.keyboard('{ArrowDown}{Enter}')

await waitFor(() => {
expect(input).toHaveValue(secondUser.displayName)
})
expect(screen.queryByRole('menuitem')).not.toBeInTheDocument()
})
})