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

Excluding modals from Active link check #1942

Merged
merged 11 commits into from
Mar 19, 2024
Merged

Excluding modals from Active link check #1942

Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c4c8034
Fix: Excluding modals from Active link check
Feb 28, 2024
31d3db6
Merge branch 'stage' into MWPW-143213
bandana147 Mar 11, 2024
f4f089d
Fix: removing pathname from check
Mar 11, 2024
3a798d2
Merge branch 'MWPW-143213' of github.com:bandana147/milo into MWPW-14…
Mar 11, 2024
b213f7b
Merge branch 'stage' into MWPW-143213
bandana147 Mar 12, 2024
18137cc
Fix: Change in check for url
Mar 13, 2024
d2a4a7f
Merge branch 'MWPW-143213' of github.com:bandana147/milo into MWPW-14…
Mar 13, 2024
5573b92
Merge branch 'stage' into MWPW-143213
bandana147 Mar 13, 2024
a4b6cec
Merge branch 'stage' into MWPW-143213
bandana147 Mar 14, 2024
b22874b
Merge branch 'stage' into MWPW-143213
bandana147 Mar 15, 2024
437e22a
Merge branch 'stage' into MWPW-143213
bandana147 Mar 19, 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
9 changes: 3 additions & 6 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 @@ -259,12 +259,9 @@ export const [hasActiveLink, setActiveLink, getActiveLink] = (() => {
(area) => {
if (hasActiveLink() || !(area instanceof HTMLElement)) return null;
const { origin, pathname } = window.location;
let activeLink;

[`${origin}${pathname}`, pathname].forEach((path) => {
if (activeLink) return;
activeLink = area.querySelector(`a[href = '${path}'], a[href ^= '${path}?'], a[href ^= '${path}#']`);
});
const activeLink = [
...area.querySelectorAll('a:not([data-modal-hash])'),
].find((el) => new RegExp(`^${`${origin}${pathname}`}(\\?[^#]*)?(#.*)?$`).test(el.href));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just realized that there may be some potential for improvement for the regular expression here. Let's just use this page's URL as an example.

var { origin, pathname } = window.location;
var regex = new RegExp(`^${`${origin}${pathname}`}(\\?[^#]*)?(#.*)?$`);
// regex will be: /^https:\/\/github.com\/adobecom\/milo\/pull\/1942\/files(\?[^#]*)?(#.*)?$/

The issue is that ., which in regular expression terms translates to any character. So regex.test('https://githubXcom/adobecom/milo/pull/1942/files'); would actually be true.

One way to solve this would be to call an additional .replaceAll('.', '\\.') on the string. Another would be to replace the regular expression with

const url = `${origin}${pathname}`;
const matches = endsWith(url) || startsWith(`${url}?`)  || startsWith(`${url}#`); // to be adapted, just a quick example

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@overmyheadandbody Thanks for the catch with . Will update the code as discussed.


if (!activeLink) return null;

Expand Down
Loading