Sidebar Container: Run the fixed sidebar check after setting up the t…

…able of contents (#410) Fixes #409
WordPress · Jun 23, 2023 · b6b919e · b6b919e
1 parent fa41a30
commit b6b919e
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/mu-plugins/blocks/sidebar-container/src/view.js b/mu-plugins/blocks/sidebar-container/src/view.js
@@ -85,15 +85,6 @@ function isSidebarWithinViewport( container ) {
 
 function init() {
 	const container = document.querySelector( '.wp-block-wporg-sidebar-container' );
-
-	if ( container ) {
-		if ( isSidebarWithinViewport( container ) ) {
-			container.classList.add( 'is-fixed-sidebar' );
-			onScroll(); // Run once to avoid footer collisions on load (ex, when linked to #reply-title).
-			window.addEventListener( 'scroll', onScroll );
-		}
-	}
-
 	const toggleButton = container?.querySelector( '.wporg-table-of-contents__toggle' );
 	const list = container?.querySelector( '.wporg-table-of-contents__list' );
 
@@ -146,6 +137,14 @@ function init() {
 		} );
 	}
 
+	if ( container ) {
+		if ( isSidebarWithinViewport( container ) ) {
+			container.classList.add( 'is-fixed-sidebar' );
+			onScroll(); // Run once to avoid footer collisions on load (ex, when linked to #reply-title).
+			window.addEventListener( 'scroll', onScroll );
+		}
+	}
+
 	// If there is no table of contents, hide the heading.
 	if ( ! document.querySelector( '.wp-block-wporg-table-of-contents' ) ) {
 		const heading = document.querySelector( '.wp-block-wporg-sidebar-container h2' );