diff --git a/packages/react-core/src/components/Page/PageSidebar.tsx b/packages/react-core/src/components/Page/PageSidebar.tsx index 9568d467edc..646fc553450 100644 --- a/packages/react-core/src/components/Page/PageSidebar.tsx +++ b/packages/react-core/src/components/Page/PageSidebar.tsx @@ -1,6 +1,7 @@ import { createContext } from 'react'; import styles from '@patternfly/react-styles/css/components/Page/page'; import { css } from '@patternfly/react-styles'; +import { IS_INERT } from '../../helpers/inert'; import { PageContextConsumer } from './PageContext'; export interface PageSidebarProps extends React.HTMLProps { @@ -48,6 +49,7 @@ export const PageSidebar: React.FunctionComponent = ({ className )} aria-hidden={!sidebarOpen} + {...(!sidebarOpen && { inert: IS_INERT })} {...props} > diff --git a/packages/react-core/src/demos/Page.md b/packages/react-core/src/demos/Page.md index 1b054d85a9d..02df1f86b70 100644 --- a/packages/react-core/src/demos/Page.md +++ b/packages/react-core/src/demos/Page.md @@ -57,7 +57,7 @@ This demonstrates a variety of navigation patterns in the context of a full page ### Context selector/perspective switcher in sidebar -When adding a context selector/perspective switcher in a `PageSidebar`, you must manually control the open state of the `PageSidebar` as well as ensure any interactive menu toggles or buttons cannot receive focus. This demo adds a `tabIndex` of `-1` when the sidebar is not expanded to achieve this. +A collapsed `PageSidebar` removes its interactive content, including the context selector, from the tab order. ```ts file='./examples/Page/PageContextSelector.tsx' isFullscreen diff --git a/packages/react-core/src/demos/examples/Page/PageContextSelector.tsx b/packages/react-core/src/demos/examples/Page/PageContextSelector.tsx index 60f7802134e..28bbd521f94 100644 --- a/packages/react-core/src/demos/examples/Page/PageContextSelector.tsx +++ b/packages/react-core/src/demos/examples/Page/PageContextSelector.tsx @@ -274,13 +274,7 @@ export const PageStickySectionBreadcrumb: React.FunctionComponent = () => { onSelect={onContextSelectorSelect} onOpenChange={(isOpen: boolean) => setIsContextSelectorOpen(isOpen)} toggle={(toggleRef: React.Ref) => ( - + Developer )} diff --git a/packages/react-integration/cypress/integration/pagemanagedsidebarclosed.spec.ts b/packages/react-integration/cypress/integration/pagemanagedsidebarclosed.spec.ts index 22176e04398..f32f627410d 100644 --- a/packages/react-integration/cypress/integration/pagemanagedsidebarclosed.spec.ts +++ b/packages/react-integration/cypress/integration/pagemanagedsidebarclosed.spec.ts @@ -16,4 +16,20 @@ describe('Page Managed Sidebar Closed Demo Test', () => { cy.get('.pf-v6-c-masthead__content').invoke('text').should('contain', 'header-tools | Avatar'); }); }); + + it('skips the sidebar link when collapsed and reaches it when expanded', { browser: '!firefox' }, () => { + cy.viewport(390, 792); + cy.visit('http://localhost:3000/page-managed-sidebar-closed-demo-nav-link'); + + cy.get('#uncontrolled-sidebar').should('have.attr', 'aria-hidden', 'true'); + cy.get('#uncontrolled-nav-toggle').focus(); + cy.press(Cypress.Keyboard.Keys.TAB); + cy.focused().should('have.text', 'Main content link'); + + cy.get('#uncontrolled-nav-toggle').click(); + cy.get('#uncontrolled-sidebar').should('have.attr', 'aria-hidden', 'false'); + cy.get('#uncontrolled-nav-toggle').focus(); + cy.press(Cypress.Keyboard.Keys.TAB); + cy.get('#uncontrolled-sidebar a').should('have.focus'); + }); }); diff --git a/packages/react-integration/demo-app-ts/src/components/demos/PageDemo/PageManagedSidebarClosedDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/PageDemo/PageManagedSidebarClosedDemo.tsx index 5a50399a844..4a78ef58eeb 100644 --- a/packages/react-integration/demo-app-ts/src/components/demos/PageDemo/PageManagedSidebarClosedDemo.tsx +++ b/packages/react-integration/demo-app-ts/src/components/demos/PageDemo/PageManagedSidebarClosedDemo.tsx @@ -40,13 +40,19 @@ export const PageManagedSidebarClosedDemo: React.FunctionComponent = () => { const sidebar = ( - Navigation + + Navigation link + ); return ( - Section + + + Main content link + + ); };