Skip to content
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

[EuiContextMenuPanel] Fix popover toggle focus restoration issues and remove need for watchedItemProps #5880

Merged
merged 10 commits into from
May 10, 2022
Merged

[EuiContextMenuPanel] Fix popover toggle focus restoration issues and remove need for watchedItemProps #5880

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a5be54f
[misc] move componentDidUpdate fn
cee-chen May 5, 2022
1e3d257
[setup] Refactor popover parent finding logic
cee-chen May 5, 2022
f6c99b8
[fix] Add a wait condition/state for popover focus
cee-chen May 5, 2022
6ef9342
[!!!] EuiContextMenuPanels with `children` are still broken and do no…
cee-chen May 5, 2022
1fb9b24
[!!!] Remove `shouldComponentUpdate` logic & `watchedItemProps`
cee-chen May 5, 2022
40dc5c4
[!!!] Move `tabbable` iteration out of focus logic and into its own m…
cee-chen May 5, 2022
4b397b0
[!!!] Restore up/down key navigation behavior
cee-chen May 5, 2022
1721abf
changelog
cee-chen May 6, 2022
6a7a464
Merge branch 'main' into contextmenu/focus-fix
cee-chen May 9, 2022
f8e7a5c
[PR feedback] Prefer not to hook into className for popover panel
cee-chen May 9, 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
17 changes: 9 additions & 8 deletions src/components/context_menu/context_menu_panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,15 +128,17 @@ export class EuiContextMenuPanel extends Component<Props, State> {
}
};

incrementFocusedItemIndex = (amount: number) => {
focusMenuItem = (direction: 'up' | 'down') => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++

const indexOffset = direction === 'up' ? -1 : 1;
let nextFocusedItemIndex;

if (this.state.focusedItemIndex === undefined) {
// If this is the beginning of the user's keyboard navigation of the menu, then we'll focus
// either the first or last item.
nextFocusedItemIndex = amount < 0 ? this.state.menuItems.length - 1 : 0;
nextFocusedItemIndex =
direction === 'up' ? this.state.menuItems.length - 1 : 0;
} else {
nextFocusedItemIndex = this.state.focusedItemIndex + amount;
nextFocusedItemIndex = this.state.focusedItemIndex + indexOffset;

if (nextFocusedItemIndex < 0) {
nextFocusedItemIndex = this.state.menuItems.length - 1;
Expand All @@ -145,9 +147,8 @@ export class EuiContextMenuPanel extends Component<Props, State> {
}
}

this.setState({
focusedItemIndex: nextFocusedItemIndex,
});
this.setState({ focusedItemIndex: nextFocusedItemIndex });
this.state.menuItems[nextFocusedItemIndex]?.focus();
};

onKeyDown = (event: React.KeyboardEvent<HTMLDivElement>) => {
Expand Down Expand Up @@ -198,7 +199,7 @@ export class EuiContextMenuPanel extends Component<Props, State> {

case cascadingMenuKeys.ARROW_UP:
event.preventDefault();
this.incrementFocusedItemIndex(-1);
this.focusMenuItem('up');

if (this.props.onUseKeyboardToNavigate) {
this.props.onUseKeyboardToNavigate();
Expand All @@ -207,7 +208,7 @@ export class EuiContextMenuPanel extends Component<Props, State> {

case cascadingMenuKeys.ARROW_DOWN:
event.preventDefault();
this.incrementFocusedItemIndex(1);
this.focusMenuItem('down');

if (this.props.onUseKeyboardToNavigate) {
this.props.onUseKeyboardToNavigate();
Expand Down