From 11b6f1bb3aecdc682411556f3e8d3d0cd1a91606 Mon Sep 17 00:00:00 2001
From: Zaki-Mohd <zakilol21427@gmail.com>
Date: Fri, 3 Oct 2025 21:56:44 +0530
Subject: [PATCH 1/2] Bug #4808: Navigation sidebar closes on item selection
 for narrower screens

---
 packages/documentation-framework/components/sideNav/sideNav.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/documentation-framework/components/sideNav/sideNav.js b/packages/documentation-framework/components/sideNav/sideNav.js
index bf224878c7..d5edd65555 100644
--- a/packages/documentation-framework/components/sideNav/sideNav.js
+++ b/packages/documentation-framework/components/sideNav/sideNav.js
@@ -24,14 +24,13 @@ const getIsActive = (location, section, subsection = null) => {
 const defaultValue = 50;
 
 const NavItem = ({ text, href, isDeprecated, isBeta, isDemo }) => {
-  const isMobileView = window.innerWidth < Number.parseInt(globalBreakpointXl.value, 10);
   return (
     <PageContextConsumer key={href + text}>
       {({ onSidebarToggle, isSidebarOpen }) => (
         <li
           key={href + text}
           className="pf-v6-c-nav__item"
-          onClick={() => isMobileView && onSidebarToggle && onSidebarToggle()}
+          onClick={() => onSidebarToggle && onSidebarToggle()}
         >
           <Link
             to={href}

From 1bea9fc5016c6fcbaf75c89b06b80e3ec2fb1501 Mon Sep 17 00:00:00 2001
From: Zaki-Mohd <zakilol21427@gmail.com>
Date: Fri, 3 Oct 2025 22:05:24 +0530
Subject: [PATCH 2/2] Bug #4808: Navigation sidebar closes on item selection
 for narrower screens

---
 .../components/sideNav/sideNav.js                    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/documentation-framework/components/sideNav/sideNav.js b/packages/documentation-framework/components/sideNav/sideNav.js
index d5edd65555..f496c64511 100644
--- a/packages/documentation-framework/components/sideNav/sideNav.js
+++ b/packages/documentation-framework/components/sideNav/sideNav.js
@@ -16,6 +16,8 @@ import { makeSlug } from '../../helpers';
 import globalBreakpointXl from '@patternfly/react-tokens/dist/esm/t_global_breakpoint_xl';
 import { trackEvent } from '../../helpers';
 
+const mobileBreakpoint = Number(globalBreakpointXl.value.replace('px', ''));
+
 const getIsActive = (location, section, subsection = null) => {
   const slug = makeSlug(null, section, null, null, subsection);
   return location.pathname.startsWith(slug);
@@ -26,11 +28,15 @@ const defaultValue = 50;
 const NavItem = ({ text, href, isDeprecated, isBeta, isDemo }) => {
   return (
     <PageContextConsumer key={href + text}>
-      {({ onSidebarToggle, isSidebarOpen }) => (
+      {({ onNavToggle, isNavOpen }) => (
         <li
           key={href + text}
           className="pf-v6-c-nav__item"
-          onClick={() => onSidebarToggle && onSidebarToggle()}
+          onClick={() => {
+            if (typeof window !== 'undefined' && onNavToggle && window.innerWidth < mobileBreakpoint) {
+              onNavToggle();
+            }
+          }}
         >
           <Link
             to={href}
@@ -40,7 +46,7 @@ const NavItem = ({ text, href, isDeprecated, isBeta, isDemo }) => {
                 className: css('pf-v6-c-nav__link', (isCurrent || pathname.startsWith(href + '/')) && 'pf-m-current')
               };
             }}
-            tabIndex={isSidebarOpen ? undefined : -1}
+            tabIndex={isNavOpen ? undefined : -1}
           >
             <Flex spaceItems={{ default: 'spaceItemsSm' }}>
               <FlexItem>{text}</FlexItem>