cdransf/coryd.dev-astro
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: normalize both nav urls before comparing

Browse source
This commit is contained in:
Cory Dransfeldt 2024-11-28 21:01:28 -08:00
parent ef133b7dca
commit a7e0b36d82
No known key found for this signature in database
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/nav/NavLink.astro
View file

@ -1,10 +1,10 @@
--- ---
import IconMapper from "@components/IconMapper.astro"; import IconMapper from "@components/IconMapper.astro";
import { removeTrailingSlash } from "@utils/helpers/general.js"; import { normalizePath } from "@utils/helpers/general.js";
const { url, title, icon } = Astro.props; const { url, title, icon } = Astro.props;
const isHttp = url?.startsWith("http"); const isHttp = url?.startsWith("http");
const isActive = Astro.url.pathname === removeTrailingSlash(url); const isActive = normalizePath(Astro.url.pathname) === normalizePath(url);
--- ---
{ {

13
src/utils/helpers/general.js
View file

@ -36,7 +36,7 @@ export const parseCountryField = (countryField) => {
.reduce( .reduce(
(countries, delimiter) => (countries, delimiter) =>
countries.flatMap((country) => country.split(delimiter)), countries.flatMap((country) => country.split(delimiter)),
[countryField] [countryField],
) )
.map(getCountryName) .map(getCountryName)
.join(", "); .join(", ");
@ -110,7 +110,16 @@ export const md = (string) => markdown.render(string);
// urls // urls
export const encodeAmp = (url) => url.replace(/&/g, "&"); export const encodeAmp = (url) => url.replace(/&/g, "&");
export const removeTrailingSlash = (url) => url.replace(/\/$/, "");
export const removeTrailingSlash = (url) => {
if (!url) return "";
return url.replace(/\/+$/, "");
};
export const normalizePath = (path) => {
if (!path) return "/";
return removeTrailingSlash(path).toLowerCase();
};
export const isExcludedPath = (path, exclusions) => export const isExcludedPath = (path, exclusions) =>
exclusions.some((exclusion) => path.includes(exclusion)); exclusions.some((exclusion) => path.includes(exclusion));