Skip to content

Fix new select panel issues #2147

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
merged 7 commits into from
Jun 28, 2022
Merged

Fix new select panel issues #2147

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b83cae8
Don't use selected items as the SelectPanel anchor label
hectahertz Jun 27, 2022
d14d724
Fix select state not synchronizing with updated items
camchenry Jun 27, 2022
e37b9db
Fix onClose being called with event instead of gesture
camchenry Jun 27, 2022
c4cbcce
Merge remote-tracking branch 'upstream/primer/issues/1021/reeact-sele…
camchenry Jun 27, 2022
9ef86d9
Merge remote-tracking branch 'upstream/primer/issues/1021/reeact-sele…
camchenry Jun 27, 2022
acea745
Merge remote-tracking branch 'upstream/primer/issues/1021/reeact-sele…
camchenry Jun 27, 2022
a36cb97
Remove useEffect post-merge
camchenry Jun 27, 2022
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
13 changes: 9 additions & 4 deletions src/SelectPanel/SelectPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,14 +156,19 @@ export function SelectPanel({
onClose('selection')
}, [finalItemsSelected, onSelectedChange, onClose, selected])

const onCancelClickHandler = React.useCallback(
const onCloseOverlay = React.useCallback(
(gesture?: 'anchor-click' | 'click-outside' | 'escape') => {
setFinalItemsSelected(selectedItems)
onClose(gesture ?? 'escape')
},
[onClose, selectedItems]
)

const onCloseClickHandler = React.useCallback(() => {
setFinalItemsSelected(selectedItems)
onClose('escape')
}, [onClose, selectedItems])

const inputRef = React.useRef<HTMLInputElement>(null)
const titleId = useSSRSafeId()
const focusTrapSettings = {
Expand Down Expand Up @@ -196,7 +201,7 @@ export function SelectPanel({
anchorRef={anchorRef}
open={open}
onOpen={onOpen}
onClose={onCancelClickHandler}
onClose={onCloseOverlay}
overlayProps={{...overlayProps, onKeyPress: overlayKeyPressHandler, role: 'dialog', 'aria-labelledby': titleId}}
focusTrapSettings={focusTrapSettings}
focusZoneSettings={focusZoneSettings}
Expand All @@ -214,7 +219,7 @@ export function SelectPanel({
<Heading as="h1" id={titleId} sx={{fontSize: 1}}>
{title}
</Heading>
<IconButton icon={XIcon} aria-label="Close" variant="invisible" onClick={onCancelClickHandler} />
<IconButton icon={XIcon} aria-label="Close" variant="invisible" onClick={onCloseClickHandler} />
</Box>
<FilteredActionList
filterValue={filterValue}
Expand All @@ -239,7 +244,7 @@ export function SelectPanel({
borderTopWidth={1}
borderTopStyle="solid"
>
<Button onClick={onCancelClickHandler}>Cancel</Button>
<Button onClick={onCloseClickHandler}>Cancel</Button>
<Button variant="primary" onClick={onSaveClickHandler}>
Save
</Button>
Expand Down