Skip to content
This repository has been archived by the owner on Sep 1, 2020. It is now read-only.

determine disabled status of selected menu item when handleKeyNavigat… #172

Merged
merged 2 commits into from
Dec 1, 2017
Merged

determine disabled status of selected menu item when handleKeyNavigat… #172

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29b6c27
determine disabled status of selected menu item when handleKeyNavigat…
WaterDesk Dec 1, 2017
deff259
refactor code to set disabled status directly
WaterDesk Dec 1, 2017
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
19 changes: 13 additions & 6 deletions src/AbstractMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,19 @@ export default class AbstractMenu extends Component {
case 13: // enter
e.preventDefault();
this.tryToOpenSubMenu(e);
if (this.seletedItemRef &&
this.seletedItemRef.ref instanceof HTMLElement &&
!this.seletedItemRef.ref.props.disabled) {
this.seletedItemRef.ref.click();
} else {
this.hideMenu(e);
{
// determine the selected item is disabled or not
const disabled = this.seletedItemRef &&
this.seletedItemRef.props &&
this.seletedItemRef.props.disabled;

if (this.seletedItemRef &&
this.seletedItemRef.ref instanceof HTMLElement &&
!disabled) {
this.seletedItemRef.ref.click();
} else {
this.hideMenu(e);
}
}
break;
default:
Expand Down