Reverted page dock variant back to docked (for now)

Author: thatblindgeye

packages/react-core/src/components/Button/__tests__/__snapshots__/Button.test.tsx.snap

@@ -5,7 +5,7 @@ exports[`Renders basic button 1`] = `
   <button
     aria-label="basic button"
     class="pf-v6-c-button pf-m-primary"
-    data-ouia-component-id="OUIA-Generated-Button-primary-:r30:"
+    data-ouia-component-id="OUIA-Generated-Button-primary-:r34:"
     data-ouia-component-type="PF6/Button"
     data-ouia-safe="true"
     type="button"

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

@@ -21,7 +21,7 @@ export interface PageProps extends React.HTMLProps<HTMLDivElement> {
   /** Additional classes added to the page layout */
   className?: string;
   /** @beta Indicates the layout variant */
-  variant?: 'default' | 'dock';
+  variant?: 'default' | 'docked';
   /** @beta Flag indicating the dock nav is expanded on mobile. Only applies when variant is dock. */
   isDockExpanded?: boolean;
   /** @beta Flag indicating the dock nav should display text. Only applies when variant is dock. */
@@ -348,7 +348,7 @@ class Page extends Component<PageProps, PageState> {
           {...rest}
           className={css(
             styles.page,
-            variant === 'dock' && styles.modifiers.dock,
+            variant === 'docked' && styles.modifiers.dock,
             width !== null && height !== null && 'pf-m-resize-observer',
             width !== null && `pf-m-breakpoint-${getBreakpoint(width)}`,
             height !== null && `pf-m-height-breakpoint-${getVerticalBreakpoint(height)}`,
@@ -357,7 +357,7 @@ class Page extends Component<PageProps, PageState> {
           )}
         >
           {skipToContent}
-          {variant === 'dock' ? (
+          {variant === 'docked' ? (
             <>
               {masthead}
               <div

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

@@ -410,51 +410,51 @@ describe('Page dock variant', () => {
     expect(page.querySelector(styles.pageDockMain)).not.toBeInTheDocument();
   });
 
-  test(`Renders with ${styles.modifiers.dock} class when variant is dock`, () => {
-    render(<Page {...props} variant="dock" data-testid="page"></Page>);
+  test(`Renders with ${styles.modifiers.dock} class when variant is docked`, () => {
+    render(<Page {...props} variant="docked" data-testid="page"></Page>);
 
     expect(screen.getByTestId('page')).toHaveClass(styles.modifiers.dock);
   });
 
-  test('Renders dock content when dockContent and variant="dock" is passed', () => {
-    render(<Page variant="dock" dockContent={<>Dock content</>} masthead={<>Masthead</>} data-testid="page"></Page>);
+  test('Renders dock content when dockContent and variant="docked" is passed', () => {
+    render(<Page variant="docked" dockContent={<>Dock content</>} masthead={<>Masthead</>} data-testid="page"></Page>);
 
     expect(screen.getByText('Dock content')).toBeInTheDocument();
   });
 
-  test('Renders masthead content when masthead and variant="dock" is passed', () => {
+  test('Renders masthead content when masthead and variant="docked" is passed', () => {
     render(
-      <Page variant="dock" dockContent={<>Dock content</>} masthead={<>Masthead content</>} data-testid="page"></Page>
+      <Page variant="docked" dockContent={<>Dock content</>} masthead={<>Masthead content</>} data-testid="page"></Page>
     );
 
     expect(screen.getByText('Masthead content')).toBeInTheDocument();
   });
 
-  test(`Renders with ${styles.pageDock} wrapper when variant is dock`, () => {
-    render(<Page variant="dock" dockContent={<>Dock content</>} masthead={<>Masthead</>} data-testid="page"></Page>);
+  test(`Renders with ${styles.pageDock} wrapper when variant is docked`, () => {
+    render(<Page variant="docked" dockContent={<>Dock content</>} masthead={<>Masthead</>} data-testid="page"></Page>);
 
     const pageDock = screen.getByText('Dock content').closest(`.${styles.pageDock}`);
     expect(pageDock).toBeInTheDocument();
   });
 
-  test(`Does not render with ${styles.modifiers.expanded} by default when variant is dock`, () => {
-    render(<Page variant="dock" dockContent={<>Dock content</>} masthead={<>Masthead</>} data-testid="page"></Page>);
+  test(`Does not render with ${styles.modifiers.expanded} by default when variant is docked`, () => {
+    render(<Page variant="docked" dockContent={<>Dock content</>} masthead={<>Masthead</>} data-testid="page"></Page>);
 
     const pageDock = screen.getByText('Dock content').closest(`.${styles.pageDock}`);
     expect(pageDock).not.toHaveClass(styles.modifiers.expanded);
   });
 
-  test(`Does not render with ${styles.modifiers.textExpanded} by default when variant is dock`, () => {
-    render(<Page variant="dock" dockContent={<>Dock content</>} masthead={<>Masthead</>} data-testid="page"></Page>);
+  test(`Does not render with ${styles.modifiers.textExpanded} by default when variant is docked`, () => {
+    render(<Page variant="docked" dockContent={<>Dock content</>} masthead={<>Masthead</>} data-testid="page"></Page>);
 
     const pageDock = screen.getByText('Dock content').closest(`.${styles.pageDock}`);
     expect(pageDock).not.toHaveClass(styles.modifiers.textExpanded);
   });
 
-  test(`Renders with ${styles.modifiers.expanded} when isDockExpanded is true and variant is dock`, () => {
+  test(`Renders with ${styles.modifiers.expanded} when isDockExpanded is true and variant is docked`, () => {
     render(
       <Page
-        variant="dock"
+        variant="docked"
         isDockExpanded
         dockContent={<>Dock content</>}
         masthead={<>Masthead</>}
@@ -466,10 +466,10 @@ describe('Page dock variant', () => {
     expect(pageDock).toHaveClass(styles.modifiers.expanded);
   });
 
-  test(`Renders with ${styles.modifiers.textExpanded} when isDockTextExpanded is true and variant is dock`, () => {
+  test(`Renders with ${styles.modifiers.textExpanded} when isDockTextExpanded is true and variant is docked`, () => {
     render(
       <Page
-        variant="dock"
+        variant="docked"
         isDockTextExpanded
         dockContent={<>Dock content</>}
         masthead={<>Masthead</>}
@@ -481,8 +481,8 @@ describe('Page dock variant', () => {
     expect(pageDock).toHaveClass(styles.modifiers.textExpanded);
   });
 
-  test(`Renders with ${styles.pageDockMain} wrapper when variant is dock`, () => {
-    render(<Page variant="dock" dockContent={<>Dock content</>} masthead={<>Masthead</>} data-testid="page"></Page>);
+  test(`Renders with ${styles.pageDockMain} wrapper when variant is docked`, () => {
+    render(<Page variant="docked" dockContent={<>Dock content</>} masthead={<>Masthead</>} data-testid="page"></Page>);
 
     const pageDockMain = screen.getByText('Dock content').closest(`.${styles.pageDockMain}`);
     expect(pageDockMain).toBeInTheDocument();