diff --git a/packages/react-core/src/components/Page/Page.tsx b/packages/react-core/src/components/Page/Page.tsx index 2e1c75aa142..7d78e679ad7 100644 --- a/packages/react-core/src/components/Page/Page.tsx +++ b/packages/react-core/src/components/Page/Page.tsx @@ -19,8 +19,8 @@ export interface PageProps extends React.HTMLProps { children?: React.ReactNode; /** Additional classes added to the page layout */ className?: string; - /** Header component (e.g. ) */ - header?: React.ReactNode; + /** Masthead component (e.g. ) */ + masthead?: React.ReactNode; /** Sidebar component for a side nav (e.g. ) */ sidebar?: React.ReactNode; /** Notification drawer component for an optional notification drawer (e.g. ) */ @@ -214,7 +214,7 @@ class Page extends React.Component { isBreadcrumbWidthLimited, className, children, - header, + masthead, sidebar, notificationDrawer, isNotificationDrawerExpanded, @@ -328,7 +328,7 @@ class Page extends React.Component { )} > {skipToContent} - {header} + {masthead} {sidebar} {notificationDrawer && (
diff --git a/packages/react-core/src/components/Page/PageSidebar.tsx b/packages/react-core/src/components/Page/PageSidebar.tsx index df6b5f63bbe..3ece4f4e226 100644 --- a/packages/react-core/src/components/Page/PageSidebar.tsx +++ b/packages/react-core/src/components/Page/PageSidebar.tsx @@ -10,7 +10,7 @@ export interface PageSidebarProps extends React.HTMLProps { children?: React.ReactNode; /** * If true, manages the sidebar open/close state and there is no need to pass the isSidebarOpen boolean into - * the sidebar component or add a callback onSidebarToggle function into the PageHeader component + * the sidebar component or add a callback onSidebarToggle function into the Masthead component */ isManagedSidebar?: boolean; /** Programmatically manage if the sidebar is shown, if isManagedSidebar is set to true in the Page component, this prop is managed */ diff --git a/packages/react-core/src/components/Page/__tests__/Page.test.tsx b/packages/react-core/src/components/Page/__tests__/Page.test.tsx index a67ec598808..a72f3400ee1 100644 --- a/packages/react-core/src/components/Page/__tests__/Page.test.tsx +++ b/packages/react-core/src/components/Page/__tests__/Page.test.tsx @@ -22,7 +22,7 @@ const props = { describe('Page', () => { test('Check page vertical layout example against snapshot', () => { - const Header = ; + const masthead = ; const Sidebar = ( Navigation @@ -30,7 +30,7 @@ describe('Page', () => { ); const { asFragment } = render( - + Section with default background ); @@ -39,7 +39,7 @@ describe('Page', () => { }); test('Check dark page against snapshot', () => { - const Header = ; + const masthead = ; const Sidebar = ( Navigation @@ -47,7 +47,7 @@ describe('Page', () => { ); const { asFragment } = render( - + Section with default background ); @@ -56,11 +56,11 @@ describe('Page', () => { }); test('Check page horizontal layout example against snapshot', () => { - const Header = ; + const masthead = ; const Sidebar = ; const { asFragment } = render( - + Section with default background ); @@ -69,7 +69,7 @@ describe('Page', () => { }); test('Check page to verify breadcrumb is created', () => { - const Header = ; + const masthead = ; const Sidebar = ; const PageBreadcrumb = () => ( @@ -83,7 +83,7 @@ describe('Page', () => { ); const { asFragment } = render( - }> + }> Section with default background ); @@ -93,7 +93,7 @@ describe('Page', () => { }); test('Verify sticky top breadcrumb on all height breakpoints', () => { - const Header = ; + const masthead = ; const Sidebar = ; const PageBreadcrumb = () => ( @@ -109,7 +109,7 @@ describe('Page', () => { const { asFragment } = render( } breadcrumbProps={{ stickyOnBreakpoint: { sm: 'top', md: 'top', lg: 'top', xl: 'top', '2xl': 'top' } }} @@ -123,7 +123,7 @@ describe('Page', () => { }); test('Verify sticky bottom breadcrumb on all height breakpoints', () => { - const Header = ; + const masthead = ; const Sidebar = ; const PageBreadcrumb = () => ( @@ -139,7 +139,7 @@ describe('Page', () => { const { asFragment } = render( } breadcrumbProps={{ @@ -155,11 +155,11 @@ describe('Page', () => { }); test('Check page to verify breadcrumb is created - PageBreadcrumb syntax', () => { - const Header = ; + const masthead = ; const Sidebar = ; const { asFragment } = render( - + Section Home @@ -179,11 +179,11 @@ describe('Page', () => { }); test('Verify sticky top breadcrumb on all height breakpoints - PageBreadcrumb syntax', () => { - const Header = ; + const masthead = ; const Sidebar = ; const { asFragment } = render( - + Section Home @@ -203,11 +203,11 @@ describe('Page', () => { }); test('Sticky bottom breadcrumb on all height breakpoints - PageBreadcrumb syntax', () => { - const Header = ; + const masthead = ; const Sidebar = ; const { asFragment } = render( - + @@ -229,11 +229,11 @@ describe('Page', () => { }); test('Check page to verify nav is created - PageNavigation syntax', () => { - const Header = ; + const masthead = ; const Sidebar = ; const { asFragment } = render( - +