Skip to content

fix(VerticalNavigation): Accept no hover delay on subsequent hovers #306

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
priley86 merged 1 commit into from
Apr 17, 2018
Merged

fix(VerticalNavigation): Accept no hover delay on subsequent hovers #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/common/Timer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ class Timer {
}

// startTimer optionally takes a new func and delay so the timer instance can be reused.
startTimer(func, delay) {
startTimer(func, delay = -1) {
this.clearTimer();
if (func) this.execute = func;
if (delay) this.delay = delay;
if (delay >= 0) this.delay = delay;
this.timer = setTimeout(this.execute, this.delay);
}
clearTimer() {
Expand Down
4 changes: 2 additions & 2 deletions src/components/VerticalNav/VerticalNav.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,8 +445,8 @@ class BaseVerticalNav extends React.Component {
'show-mobile-tertiary': showMobileTertiary,
'hover-secondary-nav-pf': hoverSecondaryNav,
'hover-tertiary-nav-pf': hoverTertiaryNav,
'collapsed-secondary-nav-pf': pinnedSecondaryNav,
'collapsed-tertiary-nav-pf': pinnedTertiaryNav,
'collapsed-secondary-nav-pf': pinnableMenus && pinnedSecondaryNav,
'collapsed-tertiary-nav-pf': pinnableMenus && pinnedTertiaryNav,
hidden: isMobile,
collapsed: !isMobile && navCollapsed,
'force-hide-secondary-nav-pf': forceHidden,
Expand Down
6 changes: 4 additions & 2 deletions src/components/VerticalNav/VerticalNavItemHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,10 @@ class BaseVerticalNavItemHelper extends React.Component {
depth !== 'tertiary' &&
childItemComponents &&
childItemComponents.length > 0,
active: active || pinned, // This is the only class we have at the tertiary depth.
'is-hover': onPinnedPath || (depth !== 'tertiary' && hovered),
active: active || (pinned && pinnableMenus), // This is the only class we have at the tertiary depth.
'is-hover':
(pinnableMenus && onPinnedPath) ||
(depth !== 'tertiary' && hovered),
// This class is present at primary and secondary depths if selectedOnMobile is true,
// except for the primary depth, where it is only present if showMobileSecondary is also true.
'mobile-nav-item-pf':
Expand Down