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

Rework nav to remove :hover selectors to address bugs, inconsistencies #2388

Merged
merged 1 commit into from
Oct 27, 2017
Merged

Rework nav to remove :hover selectors to address bugs, inconsistencies #2388

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
22 changes: 7 additions & 15 deletions app/scripts/directives/nav.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ angular.module('openshiftConsole')
templateUrl: 'views/_sidebar.html',
controller: function($scope) {
var path;
var hoverDelay = 300;
var hideDelay = hoverDelay + 200;
var hoverDelay = 200;
var hideDelay = hoverDelay + 100;

$scope.navItems = Constants.PROJECT_NAVIGATION;
$scope.sidebar = {};
Expand Down Expand Up @@ -89,6 +89,10 @@ angular.module('openshiftConsole')
};

$scope.itemClicked = function(primaryItem) {
// Remove `isHover` from any of the items if another primary item was
// activated using the keyboard.
clearHover();

if (primaryItem.href) {
// Make sure any secondary nav closes if a primary item with an
// href was activated using the keyboard.
Expand All @@ -97,10 +101,6 @@ angular.module('openshiftConsole')
return;
}

// Remove `isHover` from any of the items if another primary item was
// activated using the keyboard.
clearHover();

// Open the item regardless of whether the mouse is really over it
// for keyboard and screen reader accessibility.
primaryItem.isHover = true;
Expand All @@ -110,10 +110,6 @@ angular.module('openshiftConsole')
};

$scope.onMouseEnter = function(primaryItem) {
if (_.isEmpty(primaryItem.secondaryNavSections)) {
return;
}

if (primaryItem.mouseLeaveTimeout) {
$timeout.cancel(primaryItem.mouseLeaveTimeout);
primaryItem.mouseLeaveTimeout = null;
Expand All @@ -122,15 +118,11 @@ angular.module('openshiftConsole')
primaryItem.mouseEnterTimeout = $timeout(function() {
primaryItem.isHover = true;
primaryItem.mouseEnterTimeout = null;
$scope.sidebar.secondaryOpen = true;
$scope.sidebar.secondaryOpen = !_.isEmpty(primaryItem.secondaryNavSections);
}, hoverDelay);
};

$scope.onMouseLeave = function(primaryItem) {
if (_.isEmpty(primaryItem.secondaryNavSections)) {
return;
}

if (primaryItem.mouseEnterTimeout) {
$timeout.cancel(primaryItem.mouseEnterTimeout);
primaryItem.mouseEnterTimeout = null;
Expand Down
67 changes: 40 additions & 27 deletions app/styles/_vertical-nav.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
display: none;
}
.has-project-bar & {
transition: width .1s ease-in-out;
top: (@navbar-os-header-height-mobile + @project-bar-height-mobile);
@media(min-width: @screen-sm-min) {
display: block;
Expand All @@ -29,29 +28,31 @@
top: 0px;
width: 100%;
}
&.active > a,
&:focus > a,
&:hover > a,
> a:focus,
> a:hover {
background-color: @nav-pf-vertical-active-bg-color;
color: @nav-pf-vertical-active-color;
font-weight: 300;
&:after,
// override PatternFly :hover as we don't want :hover changes
&:hover > a {
background-color: transparent;
color: @nav-pf-vertical-color;
.fa,
.pficon {
color: @nav-pf-vertical-active-color;
color: @nav-pf-vertical-icon-color;
}
}
&.active > a {
> a:focus,
&.active > a,
&.is-hover > a {
background-color: @nav-pf-vertical-active-bg-color;
color: @nav-pf-vertical-active-color !important;
&:after {
color: @nav-pf-vertical-active-color !important;
}
.fa,
.pficon {
color: @nav-pf-vertical-active-icon-color !important;
color: @nav-pf-vertical-active-icon-color;
}
}
> a {
font-size: @font-size-base;
font-weight: 300;
font-weight: 300 !important;
text-decoration: none;
@media(max-width: @screen-xs-max) {
height: auto;
Expand All @@ -70,23 +71,35 @@
text-decoration: none !important;
}
}
// padding aligns arrow vertically
&.secondary-nav-item-pf > a:after {
padding: 16px 0;
@media(max-width: @screen-xs-max) {
padding: 8px 0;
&.secondary-nav-item-pf {
> a:after {
font-size: 14px; // make right arrow size consistent with project-bar arrows
padding: 16px 0; // padding aligns arrow vertically
@media(max-width: @screen-xs-max) {
padding: 8px 0;
}
}
&.is-hover > a {
width: @nav-pf-vertical-width + 1; // cover .nav-pf-vertical border-right
z-index: @zindex-navbar-fixed + 1; // raise z-index to overlay
&:after {
color: @nav-pf-vertical-active-color;
right: 21px; // move 1px to offset parent width 1px increase onHover due to pf rules
}
}
}
// make right arrow size consistent with project-bar arrows
&.secondary-nav-item-pf > a:after {
font-size: 14px;
}
}
&.collapsed {
.list-group-item.secondary-nav-item-pf:hover,
.list-group-item.secondary-nav-item-pf.active {
> a:after {
right: 12px !important; // prevent arrow moving onHover due to pf rules
.list-group-item.secondary-nav-item-pf {
&.is-hover > a {
width: @nav-pf-vertical-collapsed-width + 2; // cover .nav-pf-vertical.collapsed border-right
}
&.is-hover,
&:hover,
&.active {
> a:after {
right: 12px !important; // prevent arrow moving onHover due to pf rules
}
}
}
.nav-pf-secondary-nav {
Expand Down
14 changes: 7 additions & 7 deletions dist/scripts/scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10507,18 +10507,18 @@ resource: e.canI.resource,
group: e.canI.group
}, e.canI.verb, l.projectName));
}, l.itemClicked = function(e) {
if (e.href) return l.nav.showMobileNav = !1, void (l.sidebar.secondaryOpen = !1);
m(), e.isHover = !0, e.mobileSecondary = l.isMobile, l.sidebar.showMobileSecondary = l.isMobile, l.sidebar.secondaryOpen = !0;
if (m(), e.href) return l.nav.showMobileNav = !1, void (l.sidebar.secondaryOpen = !1);
e.isHover = !0, e.mobileSecondary = l.isMobile, l.sidebar.showMobileSecondary = l.isMobile, l.sidebar.secondaryOpen = !0;
}, l.onMouseEnter = function(e) {
_.isEmpty(e.secondaryNavSections) || (e.mouseLeaveTimeout && (n.cancel(e.mouseLeaveTimeout), e.mouseLeaveTimeout = null), e.mouseEnterTimeout = n(function() {
e.isHover = !0, e.mouseEnterTimeout = null, l.sidebar.secondaryOpen = !0;
}, 300));
e.mouseLeaveTimeout && (n.cancel(e.mouseLeaveTimeout), e.mouseLeaveTimeout = null), e.mouseEnterTimeout = n(function() {
e.isHover = !0, e.mouseEnterTimeout = null, l.sidebar.secondaryOpen = !_.isEmpty(e.secondaryNavSections);
}, 200);
}, l.onMouseLeave = function(e) {
_.isEmpty(e.secondaryNavSections) || (e.mouseEnterTimeout && (n.cancel(e.mouseEnterTimeout), e.mouseEnterTimeout = null), e.mouseLeaveTimeout = n(function() {
e.mouseEnterTimeout && (n.cancel(e.mouseEnterTimeout), e.mouseEnterTimeout = null), e.mouseLeaveTimeout = n(function() {
e.isHover = !1, e.mouseLeaveTimeout = null, l.sidebar.secondaryOpen = _.some(l.navItems, function(e) {
return e.isHover && !_.isEmpty(e.secondaryNavSections);
});
}, 500));
}, 300);
}, l.closeNav = function() {
m(), l.nav.showMobileNav = !1, l.sidebar.secondaryOpen = !1;
}, l.collapseMobileSecondary = function(e, t) {
Expand Down
20 changes: 13 additions & 7 deletions dist/styles/main.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.