Skip to content

fix(popover): forwarded focus to close button with VoiceOver click #6660

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
tlabaj merged 2 commits into from
Dec 6, 2021
Merged

fix(popover): forwarded focus to close button with VoiceOver click #6660

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
dd5ddbf
fix(popover): forwarded focus to close button with VoiceOver click
evwilkin Nov 30, 2021
7a9eae6
updated snapshots
evwilkin Dec 1, 2021
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
20 changes: 1 addition & 19 deletions packages/react-core/src/components/Popover/Popover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,23 +334,6 @@ export const Popover: React.FunctionComponent<PopoverProps> = ({
}
}
};
const onTriggerEnter = (event: KeyboardEvent) => {
if (event.keyCode === KEY_CODES.ENTER) {
if (!visible) {
if (triggerManually) {
shouldOpen(show, event);
} else {
show(true);
}
} else {
if (triggerManually) {
shouldClose(null, hide, event);
} else {
hide();
}
}
}
};
const onTriggerClick = (event: MouseEvent) => {
if (triggerManually) {
if (visible) {
Expand All @@ -362,7 +345,7 @@ export const Popover: React.FunctionComponent<PopoverProps> = ({
if (visible) {
hide();
} else {
show();
show(true);
}
}
};
Expand Down Expand Up @@ -451,7 +434,6 @@ export const Popover: React.FunctionComponent<PopoverProps> = ({
distance={distance}
placement={position}
onTriggerClick={onTriggerClick}
onTriggerEnter={onTriggerEnter}
onDocumentClick={onDocumentClick}
onDocumentKeyDown={onDocumentKeyDown}
enableFlip={enableFlip}
Expand Down
1 change: 0 additions & 1 deletion ...react-core/src/components/Popover/__tests__/Generated/__snapshots__/Popover.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ exports[`Popover should match snapshot (auto-generated) 1`] = `
onDocumentClick={[Function]}
onDocumentKeyDown={[Function]}
onTriggerClick={[Function]}
onTriggerEnter={[Function]}
placement="top"
popper={
<FocusTrap
Expand Down
4 changes: 0 additions & 4 deletions packages/react-core/src/components/Popover/__tests__/__snapshots__/Popover.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ exports[`popover can close from content (uncontrolled) 1`] = `
onDocumentClick={[Function]}
onDocumentKeyDown={[Function]}
onTriggerClick={[Function]}
onTriggerEnter={[Function]}
placement="top"
popper={
<FocusTrap
Expand Down Expand Up @@ -150,7 +149,6 @@ exports[`popover can have a custom minimum width 1`] = `
onDocumentClick={[Function]}
onDocumentKeyDown={[Function]}
onTriggerClick={[Function]}
onTriggerEnter={[Function]}
placement="top"
popper={
<FocusTrap
Expand Down Expand Up @@ -256,7 +254,6 @@ exports[`popover can specify position as object value 1`] = `
onDocumentClick={[Function]}
onDocumentKeyDown={[Function]}
onTriggerClick={[Function]}
onTriggerEnter={[Function]}
placement="right"
popper={
<FocusTrap
Expand Down Expand Up @@ -362,7 +359,6 @@ exports[`popover renders close-button, header and body 1`] = `
onDocumentClick={[Function]}
onDocumentKeyDown={[Function]}
onTriggerClick={[Function]}
onTriggerEnter={[Function]}
placement="top"
popper={
<FocusTrap
Expand Down