Ticket #53976: 53976.patch

wp-content/themes/twentytwentyone/assets/js/primary-navigation.js

@@ -111 +111 @@
                         return;
                 }
 
-                if ( mobileButton ) {
-                        mobileButton.onclick = function() {
-                                wrapper.classList.toggle( id + '-navigation-open' );
-                                wrapper.classList.toggle( 'lock-scrolling' );
-                                twentytwentyoneToggleAriaExpanded( mobileButton );
-                                mobileButton.focus();
+                if (mobileButton) {
+                        let scrollPosition = 0; // To store the current scroll position
+                
+                        mobileButton.onclick = function () {
+                                const isMenuOpen = wrapper.classList.contains(id + '-navigation-open');
+                
+                                if (!isMenuOpen) {
+                                        // Save the scroll position when opening the menu
+                                        scrollPosition = window.scrollY;
+                                }
+                
+                                wrapper.classList.toggle(id + '-navigation-open');
+                                wrapper.classList.toggle('lock-scrolling');
+                                twentytwentyoneToggleAriaExpanded(mobileButton);
+                
+                                if (isMenuOpen) {
+                                        // Restore scroll position when closing the menu
+                                        window.scrollTo(0, scrollPosition);
+                                }
                         };
                 }