diff --git a/src/components/site-header/hy-desktop-menu-links/hy-desktop-menu-links.tsx b/src/components/site-header/hy-desktop-menu-links/hy-desktop-menu-links.tsx index 0def22ce8966f3da49e9267b1934735588ee14ce..275c759f05d730e88261273650747845fbb7a1c1 100644 --- a/src/components/site-header/hy-desktop-menu-links/hy-desktop-menu-links.tsx +++ b/src/components/site-header/hy-desktop-menu-links/hy-desktop-menu-links.tsx @@ -188,11 +188,13 @@ export class HyDesktopMenuLinks { item.classList.remove('hy-desktop-menu-panel--is-active'); item.setAttribute('aria-hidden', 'true'); }); - }, 2500); + }, 350); } else { menuPanelItems.forEach((item) => { item.classList.remove('hy-desktop-menu-panel--is-active'); item.setAttribute('aria-hidden', 'true'); + (item as HTMLElement).style.opacity = '0'; + (item as HTMLElement).style.transition = 'none'; }); } } @@ -212,6 +214,8 @@ export class HyDesktopMenuLinks { } handleDesktopMenuEnter(event, id) { + clearTimeout(this._fadeOutTimer); + this._hoverTimer = setTimeout(() => { const activeMenuItem = this.el.shadowRoot.querySelector(`.desktop-menu-link[link-id="${id}"]`) as HTMLElement; diff --git a/src/components/site-header/site-header.tsx b/src/components/site-header/site-header.tsx index d7b0e1707adfeb0ef1b5d389fa67ea00660a3f62..e2f2f6b299c4e2e53fed55b4d7ed6f72b28d6980 100644 --- a/src/components/site-header/site-header.tsx +++ b/src/components/site-header/site-header.tsx @@ -108,12 +108,9 @@ export class SiteHeader { this.el.children[0].setAttribute('menu-language-label-close', this.languageLabels['close']); this.el.children[0].setAttribute('label-front-page', this.menuLabels['front_page']); - //this.intervalId = setInterval(this.timer, 250); - //clearInterval(this.intervalId); this.intervalId = setInterval(() => { this.timer(); }, 250); - //console.log('willUpdate ' + this.intervalId); } timer() { @@ -133,7 +130,6 @@ export class SiteHeader { // If current position > last position AND scrolled past navbar... if (st > this.lastScrollTop && st > this.navbarHeight) { // Scroll Down - console.log('scroll down'); hySiteHeader.classList.add('hy-site-header--sticky-active'); hySiteHeader.classList.add('hy-site-header--sticky-hidden');