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

Making localnav auto dismiss on click outside #3368

Merged
merged 2 commits into from
Dec 12, 2024
Merged

Making localnav auto dismiss on click outside #3368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01fe030
Making localnav auto dismiss on click outside
bandana147 Dec 12, 2024
ff1db32
making active link in localnav bold
bandana147 Dec 12, 2024
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
32 changes: 16 additions & 16 deletions libs/blocks/global-navigation/global-navigation.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1083,35 +1083,35 @@ header.new-nav .feds-breadcrumbs li:first-child:not(:nth-last-child(-n+3)):after
box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25);
}

.feds-localnav-items .feds-navItem:first-child {
font-weight: 600;
}

.feds-localnav-items .feds-navLink {
border: 0;
}

.feds-localnav.active .feds-localnav-items {
.feds-localnav-items .feds-navItem--active {
font-weight: 600;
}

.feds-localnav.feds-localnav--active .feds-localnav-items {
display: block;
width: 100%;
position: absolute;
overflow: auto;
}

.feds-localnav.active .feds-localnav-items .feds-menu-items {
.feds-localnav.feds-localnav--active .feds-localnav-items .feds-menu-items {
padding: 0;
border-bottom: 0;
}

.feds-localnav.active .feds-localnav-items .feds-menu-column > ul {
.feds-localnav.feds-localnav--active .feds-localnav-items .feds-menu-column > ul {
padding: 0;
}

.feds-localnav.active .feds-localnav-items .feds-menu-column > ul .feds-navLink {
.feds-localnav.feds-localnav--active .feds-localnav-items .feds-menu-column > ul .feds-navLink {
padding-left: 38px;
}

.feds-localnav.active .feds-localnav-items .feds-menu-items .feds-navLink {
.feds-localnav.feds-localnav--active .feds-localnav-items .feds-menu-items .feds-navLink {
padding: 12px 56px;
}

Expand All @@ -1136,40 +1136,40 @@ header.new-nav .feds-breadcrumbs li:first-child:not(:nth-last-child(-n+3)):after
padding: 10px 20px;
}

.feds-localnav.active .feds-localnav-items {
.feds-localnav.feds-localnav--active .feds-localnav-items {
box-sizing: border-box;
max-height: calc(100vh - (var(--global-height-nav) + var(--feds-localnav-height)));
}

.feds-localnav.active.is-sticky .feds-localnav-items {
.feds-localnav.feds-localnav--active.is-sticky .feds-localnav-items {
max-height: calc(100vh - var(--feds-localnav-height));
}

.feds-localnav .feds-dropdown--active::before {
.feds-localnav .feds-localnav--active::before {
display: none;
}

.feds-localnav .feds-localnav-exit {
display: none;
}

.feds-localnav.active .feds-localnav-title::after {
.feds-localnav.feds-localnav--active .feds-localnav-title::after {
transform: rotateZ(-135deg);
}

.feds-localnav.active .feds-localnav-curtain {
.feds-localnav.feds-localnav--active .feds-localnav-curtain {
width: 100%;
height: calc(100vh - (var(--feds-height-nav) + var(--feds-localnav-height)));
position: absolute;
background: var(--feds-color-black-v2);
opacity: 0.7;
}

.feds-localnav.active.is-sticky .feds-localnav-curtain {
.feds-localnav.feds-localnav--active.is-sticky .feds-localnav-curtain {
height: calc(100vh - var(--feds-localnav-height));
}

.feds-localnav.active .feds-localnav-exit {
.feds-localnav.feds-localnav--active .feds-localnav-exit {
display: block;
}

Expand Down
18 changes: 11 additions & 7 deletions libs/blocks/global-navigation/global-navigation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,10 @@ const getBrandImage = (image, brandImageOnly) => {
};

const closeOnClickOutside = (e) => {
if (!isDesktop.matches) return;
const newMobileNav = getMetadata('mobile-gnav-v2') !== 'false';
if (!isDesktop.matches && !newMobileNav) return;

const openElemSelector = `${selectors.globalNav} [aria-expanded = "true"]`;
const openElemSelector = `${selectors.globalNav} [aria-expanded = "true"], ${selectors.localNav} [aria-expanded = "true"]`;
const isClickedElemOpen = [...document.querySelectorAll(openElemSelector)]
.find((openItem) => openItem.parentElement.contains(e.target));

Expand Down Expand Up @@ -402,10 +403,14 @@ class Gnav {
});

localNav.querySelector('.feds-localnav-title').addEventListener('click', () => {
localNav.classList.toggle('active');
const isActive = localNav.classList.contains('active');
localNav.classList.toggle('feds-localnav--active');
const isActive = localNav.classList.contains('feds-localnav--active');
localNav.querySelector('.feds-localnav-title').setAttribute('aria-expanded', isActive);
});

localNav.querySelector('.feds-localnav-curtain').addEventListener('click', (e) => {
trigger({ element: e.currentTarget, event: e });
});
this.elements.localNav = localNav;
localNavItems[0].querySelector('a').textContent = title.trim();
const isAtTop = () => {
Expand Down Expand Up @@ -1012,9 +1017,8 @@ class Gnav {
if (elements) {
elements.innerHTML = template.innerHTML;
// Reattach click events, as cloned elem don't retain event listeners
elements.querySelector('button')?.addEventListener('click', (e) => {
trigger({ element: e.currentTarget, event: e, type: 'localNavTitle' });
setActiveDropdown(e.currentTarget);
elements.querySelector('.feds-localnav-items button')?.addEventListener('click', (e) => {
trigger({ element: e.currentTarget, event: e, type: 'localNavItem' });
});

elements.querySelectorAll('.feds-menu-headline').forEach((elem) => {
Expand Down
14 changes: 10 additions & 4 deletions libs/blocks/global-navigation/utilities/utilities.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export const selectors = {
gnavPromo: '.gnav-promo',
columnBreak: '.column-break',
brandImageOnly: '.brand-image-only',
localNav: '.feds-localnav',
};

export const icons = {
Expand Down Expand Up @@ -216,13 +217,18 @@ export function setCurtainState(state) {
export const isDesktop = window.matchMedia('(min-width: 900px)');
export const isTangentToViewport = window.matchMedia('(min-width: 900px) and (max-width: 1440px)');

export function setActiveDropdown(elem) {
export function setActiveDropdown(elem, type) {
const activeClass = selectors.activeDropdown.replace('.', '');
const activeLocalNav = '.feds-localnav--active';

// We always need to reset all active dropdowns at first
const resetActiveDropdown = () => {
[...document.querySelectorAll(selectors.activeDropdown)]
.forEach((activeDropdown) => activeDropdown.classList.remove(activeClass));
if (type !== 'localNavItem') {
[...document.querySelectorAll(activeLocalNav)]
.forEach((activeDropdown) => activeDropdown.classList.remove('feds-localnav--active'));
}
};
resetActiveDropdown();

Expand Down Expand Up @@ -286,16 +292,16 @@ export const [hasActiveLink, setActiveLink, isActiveLink, getActiveLink] = (() =
})();

export function closeAllDropdowns({ type } = {}) {
const selector = selectorMap[type] || `${selectors.globalNav} [aria-expanded='true']`;
const selector = selectorMap[type] || `${selectors.globalNav} [aria-expanded = "true"], ${selectors.localNav} [aria-expanded = "true"]`;

const openElements = document.querySelectorAll(selector);
if (!openElements) return;
[...openElements].forEach((el) => {
if ('fedsPreventautoclose' in el.dataset) return;
if ('fedsPreventautoclose' in el.dataset || (type === 'localNavItem' && el.classList.contains('feds-localnav-title'))) return;
el.setAttribute('aria-expanded', 'false');
});

setActiveDropdown();
setActiveDropdown(undefined, type);

if (isDesktop.matches) setCurtainState(false);
}
Expand Down
Loading