Skip to content

Fix for navigation anchor links to close modal #45829

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

Merged
merged 2 commits into from
Nov 17, 2022
Merged

Fix for navigation anchor links to close modal #45829

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
625cf1f
Fix for navigation anchor links to close modal
coreyworrell Nov 16, 2022
722c585
Rename function to be more accurate
coreyworrell Nov 16, 2022
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
Next Next commit
Fix for navigation anchor links to close modal
  • Loading branch information
@coreyworrell
coreyworrell committed Nov 16, 2022
commit 625cf1f12271b2b1d656fdbe3abecf503892dcb5
12 changes: 11 additions & 1 deletion packages/block-library/src/navigation/view-modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,16 @@ function navigationToggleModal( modal ) {
htmlElement.classList.toggle( 'has-modal-open' );
}

function isLinkToAnchorOnSamePage( node ) {
return (
node.hash &&
node.protocol === window.location.protocol &&
node.host === window.location.host &&
node.pathname === window.location.pathname &&
node.search === window.location.search
);
}

window.addEventListener( 'load', () => {
MicroModal.init( {
onShow: navigationToggleModal,
Expand All @@ -42,7 +52,7 @@ window.addEventListener( 'load', () => {
navigationLinks.forEach( function ( link ) {
// Ignore non-anchor links and anchor links which open on a new tab.
if (
! link.getAttribute( 'href' )?.startsWith( '#' ) ||
! isLinkToAnchorOnSamePage( link ) ||
link.attributes?.target === '_blank'
) {
return;
Expand Down