From 0916d53212cc60953a118fe171f23eb82a63852e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Sat, 25 Jan 2025 10:24:29 +0100 Subject: [PATCH] Revert to swup on list --- assets/js/sidebar/sidebar-drawer.js | 1 + assets/js/sidebar/sidebar-list.js | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/assets/js/sidebar/sidebar-drawer.js b/assets/js/sidebar/sidebar-drawer.js index bb9206108..b6f0022c8 100644 --- a/assets/js/sidebar/sidebar-drawer.js +++ b/assets/js/sidebar/sidebar-drawer.js @@ -47,6 +47,7 @@ if (!isEmbedded) { sessionStorage.setItem(SIDEBAR_WIDTH_KEY, width) document.body.style.setProperty('--sidebarWidth', `${width}px`) }) + // We observe on mousedown because we only care about user resize. sidebar.addEventListener('mousedown', () => resizeObserver.observe(sidebar)) sidebar.addEventListener('mouseup', () => resizeObserver.unobserve(sidebar)) diff --git a/assets/js/sidebar/sidebar-list.js b/assets/js/sidebar/sidebar-list.js index 716ddbda3..a76b0dfdf 100644 --- a/assets/js/sidebar/sidebar-list.js +++ b/assets/js/sidebar/sidebar-list.js @@ -89,7 +89,11 @@ export function initialize () { }) window.addEventListener('hashchange', markCurrentHashInSidebar) - window.addEventListener('exdoc:loaded', markCurrentHashInSidebar) + + // We listen to swup:page:view event because we need to trigger + // markCurrentHashInSidebar() before scollNodeListToCurrentCategory. + window.addEventListener('swup:page:view', markCurrentHashInSidebar) + markCurrentHashInSidebar() // Triggers layout, defer. requestAnimationFrame(scrollNodeListToCurrentCategory)