Skip to content
This repository was archived by the owner on Mar 4, 2020. It is now read-only.

fix(Toolbar): ToolbarMenuItem doesn't focus menu trigger element after 'onClick' was executed #2367

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix(Toolbar): ToolbarMenuItem doesn't focus menu trigger element after 'onClick' was executed #2367

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bb97467
removing focus handling after onClick, extend best practice about thi…
mituron Feb 17, 2020
8ef0c09
fix after review
mituron Feb 18, 2020
fce4d71
Merge branch 'master' into mituron/toolbar-menu-trigger-not-focusing
mituron Feb 18, 2020
c7c9f15
changelog update
mituron Feb 18, 2020
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
1 change: 1 addition & 0 deletions docs/src/examples/components/Toolbar/BestPractices/ToolbarBestPractices.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ const doList = [
`aria-labelledby` props). Refer to{' '}
{link('toolbar(role)', 'https://www.w3.org/WAI/PF/aria/roles#toolbar')} for details.
</Text>,
'If `Toolbar` contains menu, then focus will need be handled after `onClick` is executed on `menuItem`.'
Copy link
Contributor

Choose a reason for hiding this comment

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

'If Toolbar contains menu, the menu closes after clicking on one of the menu items. To prevent losing focus, move it manually in the onClick handler.

]

const ToolbarBestPractices: React.FunctionComponent<{}> = () => {
Expand Down
4 changes: 0 additions & 4 deletions packages/react/src/components/Toolbar/ToolbarItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,6 @@ class ToolbarItem extends UIComponent<WithAsProp<ToolbarItemProps>> {
}
// TODO: should we pass toolbarMenuItem to the user callback so he can decide if he wants to close the menu?
this.trySetMenuOpen(menuOpen, e)
if (!menuOpen) {
_.invoke(this.itemRef.current, 'focus')
}
},
variables: mergeComponentVariables(variables, predefinedProps.variables),
})
Expand Down Expand Up @@ -322,7 +319,6 @@ class ToolbarItem extends UIComponent<WithAsProp<ToolbarItemProps>> {
if (menu) {
if (doesNodeContainClick(this.menuRef.current, e, this.context.target)) {
this.trySetMenuOpen(false, e)
_.invoke(this.itemRef.current, 'focus')
}
}
}
Expand Down