Skip to content

fix(ui): fix Select keyboard navigation — first arrow key press now highlights first item #1798

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

Draft
franzheidl wants to merge 1 commit into
base: main
Choose a base branch
from
+43 −39
Draft

fix(ui): fix Select keyboard navigation — first arrow key press now highlights first item #1798

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
47 changes: 24 additions & 23 deletions packages/ui-components/src/components/Select/Select.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,33 +418,34 @@ export const Select = ({
)
}}
</ListboxButton>
{createPortal(
<div
ref={refs.setFloating}
className={`
{open &&
createPortal(
<div
ref={refs.setFloating}
className={`
juno-select-menu-container
${menuStylesContainer}
`}
style={{
position: strategy,
top: y ?? 0,
left: x ?? 0,
display: open ? "block" : "none",
}}
{...getFloatingProps()}
>
<ListboxOptions
static
className={`
juno-select-menu
${menuStyles}
`}
style={{
position: strategy,
top: y ?? 0,
left: x ?? 0,
}}
{...getFloatingProps()}
tabIndex={-1}
>
{children}
</ListboxOptions>
</div>,
portalContainerRef ?? document.body
)}
<ListboxOptions
static
className={`
juno-select-menu
${menuStyles}
`}
>
{children}
</ListboxOptions>
</div>,
portalContainerRef ?? document.body
)}
</div>
</>
)
Expand Down
35 changes: 19 additions & 16 deletions packages/ui-components/src/components/SelectOption/SelectOption.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

import React, { Fragment, HTMLAttributes, ReactNode, useContext, useEffect } from "react"
import React, { HTMLAttributes, ReactNode, useContext, useEffect } from "react"
import { ListboxOption } from "@headlessui/react"
import { SelectContext } from "../Select/Select.component"
import { Icon } from "../Icon"
Expand Down Expand Up @@ -90,20 +90,23 @@ export const SelectOption = ({
}, [value, label, children])

return (
<ListboxOption as={Fragment} disabled={disabled} value={value || children}>
{({ selected }) => (
<li
className={`
juno-select-option
jn:min-h-10
${optionStyles}
${selected ? "juno-select-option-selected " + selectedOptionStyles : unselectedOptionStyles}
${disabled ? "juno-select-option-disabled jn:opacity-50 jn:cursor-not-allowed" : ""}
${truncateOptions ? "juno-select-option-truncate" : ""}
${className}
`}
{...props}
>
<ListboxOption
as="li"
disabled={disabled}
value={value || children}
className={({ selected }: { selected: boolean }) => `
juno-select-option
jn:min-h-10
${optionStyles}
${selected ? "juno-select-option-selected " + selectedOptionStyles : unselectedOptionStyles}
${disabled ? "juno-select-option-disabled jn:opacity-50 jn:cursor-not-allowed" : ""}
${truncateOptions ? "juno-select-option-truncate" : ""}
${className}
`}
{...props}
>
{({ selected }: { selected: boolean }) => (
<>
{selected ? <Icon icon="check" size="18" className={selectedIconStyles} /> : ""}
<span
className={`
Expand All @@ -113,7 +116,7 @@ export const SelectOption = ({
>
{children || label || value}
</span>
</li>
</>
)}
</ListboxOption>
)
Expand Down
Loading