More actions
No edit summary |
No edit summary |
||
Line 18: | Line 18: | ||
if (content && content.classList.contains('citizen-section')) { | if (content && content.classList.contains('citizen-section')) { | ||
content.hidden = 'until-found'; // | content.hidden = 'until-found'; // Collapse by default | ||
} | } | ||
}); | }); | ||
Line 29: | Line 29: | ||
let current = heading; | let current = heading; | ||
while (current) { | while (current) { | ||
if (current.classList && current.classList.contains('citizen-section') && current.hidden) { | if (current.classList && current.classList.contains('citizen-section') && current.hidden) { | ||
current.hidden = false; | current.hidden = false; // Expand hidden section | ||
} | } | ||
if (current.classList && current.classList.contains('citizen-section-heading')) { | if (current.classList && current.classList.contains('citizen-section-heading')) { | ||
break; | break; // Stop at section heading | ||
} | } | ||
current = current.parentElement; | current = current.parentElement; | ||
} | } | ||
} | } | ||
// Helper: | // Helper: True final scroll to real heading, after layout is ready | ||
function smoothScrollToHeading(heading) { | function smoothScrollToHeading(heading) { | ||
if (!heading) return; | if (!heading) return; | ||
// If heading | // If the heading is an invisible anchor, find the next real visible heading | ||
if (heading.offsetHeight === 0) { | if (heading.offsetHeight === 0) { | ||
const nextHeading = heading.parentElement.querySelector('h1, h2, h3, h4, h5, h6'); | const nextHeading = heading.parentElement.querySelector('h1, h2, h3, h4, h5, h6'); | ||
Line 57: | Line 52: | ||
} | } | ||
// Wait two animation frames | // Wait two animation frames to ensure layout is ready | ||
requestAnimationFrame(() => { | requestAnimationFrame(() => { | ||
requestAnimationFrame(() => { | requestAnimationFrame(() => { | ||
const rect = heading.getBoundingClientRect(); | const rect = heading.getBoundingClientRect(); | ||
const scrollTop = window.scrollY + rect.top - 60; // 60px | const scrollTop = window.scrollY + rect.top - 60; // Adjust 60px for sticky header | ||
window.scrollTo({ top: scrollTop, behavior: 'smooth' }); | window.scrollTo({ top: scrollTop, behavior: 'smooth' }); | ||
Line 67: | Line 62: | ||
}); | }); | ||
} | } | ||
// === Handle direct URL loads with a hash (on page load) === | // === Handle direct URL loads with a hash (on page load) === | ||
Line 80: | Line 74: | ||
expandCitizenSectionFromHeading(heading); | expandCitizenSectionFromHeading(heading); | ||
requestAnimationFrame(() => { | |||
smoothScrollToHeading(heading); | requestAnimationFrame(() => { | ||
} | smoothScrollToHeading(heading); | ||
}); | |||
}); | |||
} | } | ||
}, 100); | }, 100); | ||
Line 89: | Line 85: | ||
}); | }); | ||
// === Hook into Citizen TOC (Contents Menu) clicks | // === Hook into Citizen TOC (Contents Menu) clicks correctly === | ||
mw.hook('wikipage.content').add(function() { | mw.hook('wikipage.content').add(function() { | ||
if (window.innerWidth >= 768) { | if (window.innerWidth >= 768) { | ||
Line 121: | Line 91: | ||
document.querySelectorAll('#mw-panel-toc a[href^="#"]').forEach(function(anchor) { | document.querySelectorAll('#mw-panel-toc a[href^="#"]').forEach(function(anchor) { | ||
anchor.addEventListener('click', function(e) { | anchor.addEventListener('click', function(e) { | ||
e.preventDefault(); // Block native browser jump immediately | |||
const hash = decodeURIComponent(this.getAttribute('href')).substring(1); | const hash = decodeURIComponent(this.getAttribute('href')).substring(1); | ||
const heading = document.getElementById(hash); | const heading = document.getElementById(hash); | ||
if (heading) { | if (heading) { | ||
expandCitizenSectionFromHeading(heading); | expandCitizenSectionFromHeading(heading); | ||
requestAnimationFrame(() => { | |||
smoothScrollToHeading(heading); | requestAnimationFrame(() => { | ||
} | smoothScrollToHeading(heading); | ||
}); | |||
}); | |||
} | } | ||
}); | }); |