Merge branch 'fly-out-nav-jump-fix' into 'master'
Fixed fly-out nav jumping Closes #36699 See merge request !13690
This commit is contained in:
commit
90eb9e2b6d
2 changed files with 16 additions and 31 deletions
|
@ -1,4 +1,3 @@
|
|||
import Cookies from 'js-cookie';
|
||||
import bp from './breakpoints';
|
||||
|
||||
const HIDE_INTERVAL_TIMEOUT = 300;
|
||||
|
@ -8,9 +7,11 @@ const IS_SHOWING_FLY_OUT_CLASS = 'is-showing-fly-out';
|
|||
let currentOpenMenu = null;
|
||||
let menuCornerLocs;
|
||||
let timeoutId;
|
||||
let sidebar;
|
||||
|
||||
export const mousePos = [];
|
||||
|
||||
export const setSidebar = (el) => { sidebar = el; };
|
||||
export const setOpenMenu = (menu = null) => { currentOpenMenu = menu; };
|
||||
|
||||
export const slope = (a, b) => (b.y - a.y) / (b.x - a.x);
|
||||
|
@ -20,10 +21,8 @@ let headerHeight = 50;
|
|||
export const getHeaderHeight = () => headerHeight;
|
||||
|
||||
export const canShowActiveSubItems = (el) => {
|
||||
const isHiddenByMedia = bp.getBreakpointSize() === 'sm' || bp.getBreakpointSize() === 'md';
|
||||
|
||||
if (el.classList.contains('active') && !isHiddenByMedia) {
|
||||
return Cookies.get('sidebar_collapsed') === 'true';
|
||||
if (el.classList.contains('active') && (sidebar && !sidebar.classList.contains('sidebar-icons-only'))) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
|
@ -143,13 +142,13 @@ export const documentMouseMove = (e) => {
|
|||
};
|
||||
|
||||
export default () => {
|
||||
const sidebar = document.querySelector('.sidebar-top-level-items');
|
||||
sidebar = document.querySelector('.nav-sidebar');
|
||||
|
||||
if (!sidebar) return;
|
||||
|
||||
const items = [...sidebar.querySelectorAll('.sidebar-top-level-items > li')];
|
||||
|
||||
sidebar.addEventListener('mouseleave', () => {
|
||||
sidebar.querySelector('.sidebar-top-level-items').addEventListener('mouseleave', () => {
|
||||
clearTimeout(timeoutId);
|
||||
|
||||
timeoutId = setTimeout(() => {
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
import Cookies from 'js-cookie';
|
||||
import {
|
||||
calculateTop,
|
||||
showSubLevelItems,
|
||||
|
@ -11,6 +10,7 @@ import {
|
|||
getHideSubItemsInterval,
|
||||
documentMouseMove,
|
||||
getHeaderHeight,
|
||||
setSidebar,
|
||||
} from '~/fly_out_nav';
|
||||
import bp from '~/breakpoints';
|
||||
|
||||
|
@ -113,7 +113,6 @@ describe('Fly out sidebar navigation', () => {
|
|||
clientX: el.getBoundingClientRect().left + 20,
|
||||
clientY: el.getBoundingClientRect().top + 10,
|
||||
});
|
||||
console.log(el);
|
||||
|
||||
expect(
|
||||
getHideSubItemsInterval(),
|
||||
|
@ -283,7 +282,7 @@ describe('Fly out sidebar navigation', () => {
|
|||
|
||||
describe('canShowActiveSubItems', () => {
|
||||
afterEach(() => {
|
||||
Cookies.remove('sidebar_collapsed');
|
||||
setSidebar(null);
|
||||
});
|
||||
|
||||
it('returns true by default', () => {
|
||||
|
@ -292,36 +291,23 @@ describe('Fly out sidebar navigation', () => {
|
|||
).toBeTruthy();
|
||||
});
|
||||
|
||||
it('returns false when cookie is false & element is active', () => {
|
||||
Cookies.set('sidebar_collapsed', 'false');
|
||||
it('returns false when active & expanded sidebar', () => {
|
||||
const sidebar = document.createElement('div');
|
||||
el.classList.add('active');
|
||||
|
||||
setSidebar(sidebar);
|
||||
|
||||
expect(
|
||||
canShowActiveSubItems(el),
|
||||
).toBeFalsy();
|
||||
});
|
||||
|
||||
it('returns true when cookie is false & element is active', () => {
|
||||
Cookies.set('sidebar_collapsed', 'true');
|
||||
it('returns true when active & collapsed sidebar', () => {
|
||||
const sidebar = document.createElement('div');
|
||||
sidebar.classList.add('sidebar-icons-only');
|
||||
el.classList.add('active');
|
||||
|
||||
expect(
|
||||
canShowActiveSubItems(el),
|
||||
).toBeTruthy();
|
||||
});
|
||||
|
||||
it('returns true when element is active & breakpoint is sm', () => {
|
||||
breakpointSize = 'sm';
|
||||
el.classList.add('active');
|
||||
|
||||
expect(
|
||||
canShowActiveSubItems(el),
|
||||
).toBeTruthy();
|
||||
});
|
||||
|
||||
it('returns true when element is active & breakpoint is md', () => {
|
||||
breakpointSize = 'md';
|
||||
el.classList.add('active');
|
||||
setSidebar(sidebar);
|
||||
|
||||
expect(
|
||||
canShowActiveSubItems(el),
|
||||
|
|
Loading…
Reference in a new issue