Remove masthead wrapping to reflect Core

Author: rebeccaalpert

packages/react-core/src/components/Page/Page.tsx

@@ -29,7 +29,7 @@ export interface PageProps extends React.HTMLProps<HTMLDivElement> {
    */
   isDockTextExpanded?: boolean;
   /** The horizontal masthead content (e.g. <Masthead /> or <PageHeader />). PageHeader is an alternative to Masthead
-   * and can wrap a Masthead or custom header content. When using the docked variant, this content will only render at
+   * and should only be used to wrap custom header content. When using the docked variant, this content will only render at
    * mobile viewports.
    */
   masthead?: React.ReactNode;

packages/react-core/src/components/Page/PageHeader.tsx

@@ -2,7 +2,7 @@ import styles from '@patternfly/react-styles/css/components/Page/page';
 import { css } from '@patternfly/react-styles';
 
 export interface PageHeaderProps extends React.HTMLProps<HTMLElement> {
-  /** Content rendered inside the page header. This can be a Masthead or custom header content. */
+  /** Content rendered inside the page header. This should be custom header content, rather than the PatternFly Masthead. */
   children?: React.ReactNode;
   /** Additional classes added to the page header */
   className?: string;

packages/react-core/src/components/Page/__tests__/Page.test.tsx

@@ -500,21 +500,4 @@ describe('Page docked variant', () => {
     expect(header).toHaveClass(styles.pageHeader);
     expect(header.parentElement).toHaveClass(styles.page);
   });
-
-  test('Renders Masthead inside PageHeader when passed to the masthead prop', () => {
-    render(
-      <Page
-        {...props}
-        masthead={
-          <PageHeader>
-            <Masthead>Logo</Masthead>
-          </PageHeader>
-        }
-      >
-        <PageSection>Custom content</PageSection>
-      </Page>
-    );
-
-    expect(screen.getByText('Logo').closest(`.${styles.pageHeader}`)).toBeInTheDocument();
-  });
 });

packages/react-core/src/components/Page/examples/Page.md

@@ -35,7 +35,7 @@ The `<MastheadMain>` component includes the smaller area that typically contains
 
 ### Page header
 
-To use a page header instead of passing a [masthead](/components/masthead) directly, pass a `<PageHeader>` to the `masthead` property. `<PageHeader>` can wrap a `<Masthead>` or custom header content.
+To use a page header instead of passing a [masthead](/components/masthead) directly, pass a `<PageHeader>` to the `masthead` property. `<PageHeader>` should only be used to wrap custom header content.
 
 ```ts file="./PageHeaderContent.tsx"