Updated remaining dock instances

Author: thatblindgeye

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

@@ -271,7 +271,7 @@ const ButtonBase: React.FunctionComponent<ButtonProps> = ({
         size === ButtonSize.sm && styles.modifiers.small,
         size === ButtonSize.lg && styles.modifiers.displayLg,
         isCircle && styles.modifiers.circle,
-        isDocked && styles.modifiers.dock, // Replace with docked class from https://github.com/patternfly/patternfly/pull/8308
+        isDocked && styles.modifiers.docked,
         isDocked && isTextExpanded && styles.modifiers.textExpanded,
         className
       )}

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

@@ -556,14 +556,14 @@ describe('Favorite button', () => {
 });
 
 describe('Dock variant', () => {
-  test(`Renders with class ${styles.modifiers.dock} when isDocked = true`, () => {
+  test(`Renders with class ${styles.modifiers.docked} when isDocked = true`, () => {
     render(<Button isDocked>Dock Button</Button>);
-    expect(screen.getByRole('button')).toHaveClass(styles.modifiers.dock);
+    expect(screen.getByRole('button')).toHaveClass(styles.modifiers.docked);
   });
 
-  test(`Does not render with class ${styles.modifiers.dock} when isDocked is not passed`, () => {
+  test(`Does not render with class ${styles.modifiers.docked} when isDocked is not passed`, () => {
     render(<Button>Button</Button>);
-    expect(screen.getByRole('button')).not.toHaveClass(styles.modifiers.dock);
+    expect(screen.getByRole('button')).not.toHaveClass(styles.modifiers.docked);
   });
 
   test(`Renders with class ${styles.modifiers.textExpanded} when isTextExpanded = true and isDocked = true`, () => {
@@ -585,14 +585,14 @@ describe('Dock variant', () => {
     expect(screen.getByRole('button')).not.toHaveClass(styles.modifiers.textExpanded);
   });
 
-  test(`Renders with both ${styles.modifiers.dock} and ${styles.modifiers.textExpanded} when both props are true`, () => {
+  test(`Renders with both ${styles.modifiers.docked} and ${styles.modifiers.textExpanded} when both props are true`, () => {
     render(
       <Button isDocked isTextExpanded>
         Dock Text Expanded Button
       </Button>
     );
     const button = screen.getByRole('button');
-    expect(button).toHaveClass(styles.modifiers.dock);
+    expect(button).toHaveClass(styles.modifiers.docked);
     expect(button).toHaveClass(styles.modifiers.textExpanded);
   });
 });

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

@@ -198,7 +198,7 @@ class MenuToggleBase extends Component<MenuToggleProps> {
             isDisabled && styles.modifiers.disabled,
             isPlaceholder && styles.modifiers.placeholder,
             isSettings && styles.modifiers.settings,
-            isDocked && styles.modifiers.dock, // Replace with docked class from https://github.com/patternfly/patternfly/pull/8308
+            isDocked && styles.modifiers.docked,
             isDocked && isTextExpanded && styles.modifiers.textExpanded,
             size === MenuToggleSize.sm && styles.modifiers.small,
             className

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

@@ -156,14 +156,14 @@ test('Does not render custom icon when icon prop and isSettings are passed', ()
   expect(screen.queryByText('Custom icon')).not.toBeInTheDocument();
 });
 
-test(`Renders with class ${styles.modifiers.dock} when isDocked is passed`, () => {
+test(`Renders with class ${styles.modifiers.docked} when isDocked is passed`, () => {
   render(<MenuToggle isDocked>Dock Toggle</MenuToggle>);
-  expect(screen.getByRole('button')).toHaveClass(styles.modifiers.dock);
+  expect(screen.getByRole('button')).toHaveClass(styles.modifiers.docked);
 });
 
-test(`Does not render with class ${styles.modifiers.dock} when isDocked is not passed`, () => {
+test(`Does not render with class ${styles.modifiers.docked} when isDocked is not passed`, () => {
   render(<MenuToggle>Toggle</MenuToggle>);
-  expect(screen.getByRole('button')).not.toHaveClass(styles.modifiers.dock);
+  expect(screen.getByRole('button')).not.toHaveClass(styles.modifiers.docked);
 });
 
 test(`Renders with class ${styles.modifiers.textExpanded} when isTextExpanded is passed and isDocked is passed`, () => {
@@ -185,13 +185,13 @@ test(`Does not render with class ${styles.modifiers.textExpanded} when isTextExp
   expect(screen.getByRole('button')).not.toHaveClass(styles.modifiers.textExpanded);
 });
 
-test(`Renders with both ${styles.modifiers.dock} and ${styles.modifiers.textExpanded} when both props are passed`, () => {
+test(`Renders with both ${styles.modifiers.docked} and ${styles.modifiers.textExpanded} when both props are passed`, () => {
   render(
     <MenuToggle isDocked isTextExpanded>
       Dock Text Expanded Toggle
     </MenuToggle>
   );
   const button = screen.getByRole('button');
-  expect(button).toHaveClass(styles.modifiers.dock);
+  expect(button).toHaveClass(styles.modifiers.docked);
   expect(button).toHaveClass(styles.modifiers.textExpanded);
 });

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

@@ -391,21 +391,21 @@ describe('Page', () => {
   });
 });
 
-describe('Page dock variant', () => {
-  test(`Does not render with dock classes when variant is default`, () => {
+describe('Page docked variant', () => {
+  test(`Does not render with docked classes when variant is default`, () => {
     render(<Page {...props} variant="default" data-testid="page"></Page>);
 
     const page = screen.getByTestId('page');
-    expect(page).not.toHaveClass(styles.modifiers.dock);
+    expect(page).not.toHaveClass(styles.modifiers.docked);
     expect(page.querySelector(`.${styles.pageDock}`)).not.toBeInTheDocument();
     expect(page.querySelector(`.${styles.pageDockMain}`)).not.toBeInTheDocument();
   });
 
-  test(`Does not render with dock classes when variant is not passed`, () => {
+  test(`Does not render with docked classes when variant is not passed`, () => {
     render(<Page data-testid="page"></Page>);
 
     const page = screen.getByTestId('page');
-    expect(page).not.toHaveClass(styles.modifiers.dock);
+    expect(page).not.toHaveClass(styles.modifiers.docked);
     expect(page.querySelector(`.${styles.pageDock}`)).not.toBeInTheDocument();
     expect(page.querySelector(`.${styles.pageDockMain}`)).not.toBeInTheDocument();
   });
@@ -479,6 +479,8 @@ describe('Page dock variant', () => {
 
     const pageDock = screen.getByText('Dock content').closest(`.${styles.pageDock}`);
     expect(pageDock).toHaveClass(styles.modifiers.textExpanded);
+  });
+
   test(`Does not render with ${styles.modifiers.docked} class when variant is default`, () => {
     render(<Page {...props} variant="default" data-testid="page"></Page>);