Commit 6c57d894 authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'fly-out-nav-mousepos-error' into 'master'

Fixed fly-out error if mousePos array is empty

See merge request gitlab-org/gitlab-ce!14338
parents 4d88f649 35d189d6
...@@ -34,7 +34,7 @@ export const canShowActiveSubItems = (el) => { ...@@ -34,7 +34,7 @@ export const canShowActiveSubItems = (el) => {
export const canShowSubItems = () => bp.getBreakpointSize() === 'sm' || bp.getBreakpointSize() === 'md' || bp.getBreakpointSize() === 'lg'; export const canShowSubItems = () => bp.getBreakpointSize() === 'sm' || bp.getBreakpointSize() === 'md' || bp.getBreakpointSize() === 'lg';
export const getHideSubItemsInterval = () => { export const getHideSubItemsInterval = () => {
if (!currentOpenMenu) return 0; if (!currentOpenMenu || !mousePos.length) return 0;
const currentMousePos = mousePos[mousePos.length - 1]; const currentMousePos = mousePos[mousePos.length - 1];
const prevMousePos = mousePos[0]; const prevMousePos = mousePos[0];
......
...@@ -73,6 +73,12 @@ describe('Fly out sidebar navigation', () => { ...@@ -73,6 +73,12 @@ describe('Fly out sidebar navigation', () => {
).toBe(0); ).toBe(0);
}); });
it('returns 0 if mousePos is empty', () => {
expect(
getHideSubItemsInterval(),
).toBe(0);
});
it('returns 0 when mouse above sub-items', () => { it('returns 0 when mouse above sub-items', () => {
showSubLevelItems(el); showSubLevelItems(el);
documentMouseMove({ documentMouseMove({
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment