Skip to content

fix: decode uri for french #23

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
fkakatie merged 1 commit into from
Jul 13, 2026
Merged

fix: decode uri for french #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 15 additions & 6 deletions blocks/jump-nav/jump-nav.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
import { loadCopy } from '../../scripts/scripts.js';

/**
* Gets the decoded fragment id a jump-nav link points to.
* @param {HTMLAnchorElement} a Jump-nav link
* @returns {string} Decoded target id
*/
function getId(a) {
return decodeURIComponent(new URL(a.href).hash.slice(1));
}

export default async function decorate(block) {
const copy = await loadCopy(import.meta.url);
const ul = block.querySelector('ul');
Expand All @@ -20,7 +29,7 @@ export default async function decorate(block) {
const targets = links
.map((a) => {
try {
return document.getElementById(new URL(a.href).hash.slice(1));
return document.getElementById(getId(a));
} catch {
return null;
}
Expand All @@ -35,22 +44,22 @@ export default async function decorate(block) {
});
resizeObserver.observe(container);

const hash = window.location.hash.slice(1);
const initial = (hash && links.find((a) => a.href.endsWith(`#${hash}`))) || links[0];
const hash = decodeURIComponent(window.location.hash.slice(1));
const initial = (hash && links.find((a) => getId(a) === hash)) || links[0];
if (initial) initial.setAttribute('aria-current', 'location');

const prefersReduced = () => window.matchMedia('(prefers-reduced-motion: reduce)').matches;

links.forEach((a) => {
a.addEventListener('click', (e) => {
const id = new URL(a.href).hash.slice(1);
const id = getId(a);
const target = document.getElementById(id);
if (!target) return;
e.preventDefault();
const behavior = prefersReduced() ? 'auto' : 'smooth';
target.scrollIntoView({ behavior });
a.scrollIntoView({ behavior, inline: 'center', block: 'nearest' });
window.history.pushState(null, '', `#${id}`);
window.history.pushState(null, '', `#${encodeURIComponent(id)}`);
});
});

Expand All @@ -65,7 +74,7 @@ export default async function decorate(block) {
.sort((a, b) => b.px - a.px)[0];

if (!mostVisible) return;
const active = links.find((a) => a.href.endsWith(`#${mostVisible.t.id}`));
const active = links.find((a) => getId(a) === mostVisible.t.id);
if (!active) return;

links.forEach((a) => a.removeAttribute('aria-current'));
Expand Down