@patternfly/react-core 4.225.11 → 4.226.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/react-core",
-  "version": "4.225.11",
+  "version": "4.226.2",
   "description": "This library provides a set of common React components for use with the PatternFly reference implementation.",
   "main": "dist/js/index.js",
   "module": "dist/esm/index.js",
@@ -34,16 +34,16 @@
     "generate": "node scripts/copyStyles.js"
   },
   "dependencies": {
-    "@patternfly/react-icons": "^4.76.11",
-    "@patternfly/react-styles": "^4.75.11",
-    "@patternfly/react-tokens": "^4.77.11",
+    "@patternfly/react-icons": "^4.77.2",
+    "@patternfly/react-styles": "^4.76.2",
+    "@patternfly/react-tokens": "^4.78.2",
     "focus-trap": "6.9.2",
     "react-dropzone": "9.0.0",
     "tippy.js": "5.1.2",
     "tslib": "^2.0.0"
   },
   "devDependencies": {
-    "@patternfly/patternfly": "4.204.2",
+    "@patternfly/patternfly": "4.204.3",
     "@rollup/plugin-commonjs": "^21.0.0",
     "@rollup/plugin-node-resolve": "^13.0.0",
     "@rollup/plugin-replace": "^3.0.0",
@@ -60,5 +60,5 @@
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },
-  "gitHead": "aaeb37eb17dd5180aaa6ac3548fd4ac52c2a6eb7"
+  "gitHead": "fb67d6b2dfbfd2b4080e1313101f4d663a0a09c3"
 }

package/src/components/CalendarMonth/CalendarMonth.tsx

@@ -57,6 +57,11 @@ export interface CalendarProps extends CalendarFormat, Omit<React.HTMLProps<HTML
   onSelectToggle?: (open: boolean) => void;
   /** Flag to set browser focus on the passed date **/
   isDateFocused?: boolean;
+  /** Callback when month or year is changed */
+  onMonthChange?: (
+    newDate?: Date,
+    event?: React.MouseEvent | React.ChangeEvent | React.FormEvent<HTMLInputElement>
+  ) => void;
 }
 
 // Must be numeric given current header design
@@ -114,6 +119,7 @@ export const CalendarMonth = ({
   validators = [() => true],
   className,
   onSelectToggle = () => {},
+  onMonthChange = () => {},
   rangeStart,
   prevMonthAriaLabel = 'Previous month',
   nextMonthAriaLabel = 'Next month',
@@ -162,10 +168,11 @@ export const CalendarMonth = ({
     }
   }, [focusedDate, isDateFocused, focusedDateValidated, focusRef]);
 
-  const onMonthClick = (newDate: Date) => {
+  const onMonthClick = (newDate: Date, ev: React.MouseEvent) => {
     setFocusedDate(newDate);
     setHoveredDate(newDate);
     setShouldFocus(false);
+    onMonthChange(newDate, ev);
   };
 
   const onKeyDown = (ev: React.KeyboardEvent<HTMLTableSectionElement>) => {
@@ -222,7 +229,11 @@ export const CalendarMonth = ({
     <div className={css(styles.calendarMonth, className)} {...props}>
       <div className={styles.calendarMonthHeader}>
         <div className={css(styles.calendarMonthHeaderNavControl, styles.modifiers.prevMonth)}>
-          <Button variant="plain" aria-label={prevMonthAriaLabel} onClick={() => onMonthClick(prevMonth)}>
+          <Button
+            variant="plain"
+            aria-label={prevMonthAriaLabel}
+            onClick={(ev: React.MouseEvent) => onMonthClick(prevMonth, ev)}
+          >
             <AngleLeftIcon aria-hidden={true} />
           </Button>
         </div>
@@ -240,7 +251,7 @@ export const CalendarMonth = ({
                 setIsSelectOpen(!isSelectOpen);
                 onSelectToggle(!isSelectOpen);
               }}
-              onSelect={(_ev, monthNum) => {
+              onSelect={(ev, monthNum) => {
                 // When we put CalendarMonth in a Popover we want the Popover's onDocumentClick
                 // to see the SelectOption as a child so it doesn't close the Popover.
                 setTimeout(() => {
@@ -251,6 +262,7 @@ export const CalendarMonth = ({
                   setFocusedDate(newDate);
                   setHoveredDate(newDate);
                   setShouldFocus(false);
+                  onMonthChange(newDate, ev);
                 }, 0);
               }}
               variant="single"
@@ -268,18 +280,23 @@ export const CalendarMonth = ({
               aria-label={yearInputAriaLabel}
               type="number"
               value={yearFormatted}
-              onChange={year => {
+              onChange={(year: string, ev: React.FormEvent<HTMLInputElement>) => {
                 const newDate = new Date(focusedDate);
                 newDate.setFullYear(+year);
                 setFocusedDate(newDate);
                 setHoveredDate(newDate);
                 setShouldFocus(false);
+                onMonthChange(newDate, ev);
               }}
             />
           </div>
         </InputGroup>
         <div className={css(styles.calendarMonthHeaderNavControl, styles.modifiers.nextMonth)}>
-          <Button variant="plain" aria-label={nextMonthAriaLabel} onClick={() => onMonthClick(nextMonth)}>
+          <Button
+            variant="plain"
+            aria-label={nextMonthAriaLabel}
+            onClick={(ev: React.MouseEvent) => onMonthClick(nextMonth, ev)}
+          >
             <AngleRightIcon aria-hidden={true} />
           </Button>
         </div>

package/src/components/CalendarMonth/examples/CalendarMonth.md

@@ -8,11 +8,6 @@ beta: true
 
 ## Examples
 
-### Default
-
-```ts file="./CalendarMonthDefault.tsx"
-```
-
 ### Selectable date
 
 ```ts file="./CalendarMonthSelectableDate.tsx"

package/src/components/CalendarMonth/examples/CalendarMonthSelectableDate.tsx

@@ -4,10 +4,15 @@ import { CalendarMonth } from '@patternfly/react-core';
 export const CalendarMonthSelectableDate: React.FunctionComponent = () => {
   const [date, setDate] = React.useState(new Date(2020, 10, 24));
 
+  const onMonthChange = (newDate: Date) => {
+    // eslint-disable-next-line no-console
+    console.log(`updated month: ${newDate.getMonth()}, updated year: ${newDate.getFullYear()}`);
+  };
+
   return (
     <React.Fragment>
       <pre>Selected date: {date.toString()}</pre>
-      <CalendarMonth date={date} onChange={setDate} />
+      <CalendarMonth date={date} onChange={setDate} onMonthChange={onMonthChange} />
     </React.Fragment>
   );
 };

package/src/components/Pagination/examples/Pagination.md

@@ -28,9 +28,9 @@ class PaginationTop extends React.Component {
       });
     };
 
-    this.onPerPageSelect = (_event, perPage) => {
+    this.onPerPageSelect = (_event, perPage, page) => {
       this.setState({
-        perPage
+        page, perPage
       });
     };
   }
@@ -68,9 +68,9 @@ class PaginationBottom extends React.Component {
         page: pageNumber
       });
     };
-    this.onPerPageSelect = (_event, perPage) => {
+    this.onPerPageSelect = (_event, perPage, page) => {
       this.setState({
-        perPage
+        page, perPage
       });
     };
   }
@@ -149,9 +149,9 @@ class PaginationDisabled extends React.Component {
       });
     };
 
-    this.onPerPageSelect = (_event, perPage) => {
+    this.onPerPageSelect = (_event, perPage, page) => {
       this.setState({
-        perPage
+        page, perPage
       });
     };
   }
@@ -193,9 +193,9 @@ class PaginationTop extends React.Component {
       });
     };
 
-    this.onPerPageSelect = (_event, perPage) => {
+    this.onPerPageSelect = (_event, perPage, page) => {
       this.setState({
-        perPage
+        page, perPage
       });
     };
   }
@@ -236,9 +236,9 @@ class PaginationTop extends React.Component {
       });
     };
 
-    this.onPerPageSelect = (_event, perPage) => {
+    this.onPerPageSelect = (_event, perPage, page) => {
       this.setState({
-        perPage
+        page, perPage
       });
     };
   }
@@ -279,9 +279,9 @@ class PaginationTop extends React.Component {
       });
     };
 
-    this.onPerPageSelect = (_event, perPage) => {
+    this.onPerPageSelect = (_event, perPage, page) => {
       this.setState({
-        perPage
+        page, perPage
       });
     };
   }
@@ -330,9 +330,9 @@ class PaginationSticky extends React.Component {
       });
     };
 
-    this.onPerPageSelect = (_event, perPage) => {
+    this.onPerPageSelect = (_event, perPage, page) => {
       this.setState({
-        perPage
+        page, perPage
       });
     };
   }

package/src/components/Toolbar/examples/Toolbar.md

@@ -1169,9 +1169,9 @@ class ToolbarStacked extends React.Component {
       });
     };
 
-    this.onPerPageSelect = (_event, perPage) => {
+    this.onPerPageSelect = (_event, perPage, page) => {
       this.setState({
-        perPage
+        page, perPage
       });
     };
 

package/src/components/Truncate/__tests__/Truncate.test.tsx

@@ -1,7 +1,83 @@
 import React from 'react';
-import { render } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 import { Truncate } from '../Truncate';
 
+jest.mock('../../Tooltip', () => ({
+  Tooltip: ({ content, position, children, ...props }) => (
+    <div data-testid="Tooltip-mock" {...props}>
+      <div data-testid="Tooltip-mock-content-container">Test {content}</div>
+      <p>{`position: ${position}`}</p>
+      {children}
+    </div>
+  )
+}));
+
+test('renders with class pf-c-truncate', () => {
+  render(
+    <Truncate
+      content={''}
+      aria-label='test-id'
+    />
+  );
+
+  const test = screen.getByLabelText('test-id');
+
+  expect(test).toHaveClass('pf-c-truncate');
+});
+
+test('renders with custom class name passed via prop', () => {
+  render(
+    <Truncate
+      content={''}
+      aria-label='test-id'
+      className='custom-classname'
+    />
+  );
+
+  const test = screen.getByLabelText('test-id');
+
+  expect(test).toHaveClass('custom-classname');
+});
+
+test('renders truncate with empty content', () => {
+  render(
+    <Truncate
+      content={''}
+      aria-label='test-id'
+    />
+  );
+
+  const test = screen.getByLabelText('test-id');
+
+  expect(test).toHaveTextContent('');
+});
+
+test('renders truncate with content', () => {
+  render(
+    <Truncate
+      content={'Test'}
+      aria-label='test-id'
+    />
+  );
+
+  const test = screen.getByLabelText('test-id');
+
+  expect(test).toHaveTextContent('Test');
+});
+
+test('only renders pf-c-truncate__start with default position', () => {
+  render(
+    <Truncate
+      content={'Testing truncate content'}
+    />
+  );
+
+  const start = screen.getByText('Testing truncate content');
+
+  expect(start).toHaveClass('pf-c-truncate__start');
+  expect(start).not.toHaveClass('pf-c-truncate__end');
+});
+
 test('renders default truncation', () => {
   const { asFragment } = render(
     <Truncate content={'Vestibulum interdum risus et enim faucibus, sit amet molestie est accumsan.'} />
@@ -9,7 +85,7 @@ test('renders default truncation', () => {
   expect(asFragment()).toMatchSnapshot();
 });
 
-test('renders start truncation', () => {
+test('renders start truncation with &lrm; at end', () => {
   const { asFragment } = render(
     <Truncate
       content={'Vestibulum interdum risus et enim faucibus, sit amet molestie est accumsan.'}
@@ -20,11 +96,74 @@ test('renders start truncation', () => {
 });
 
 test('renders middle truncation', () => {
-  const { asFragment } = render(
+  render(
     <Truncate
       content={'Vestibulum interdum risus et enim faucibus, sit amet molestie est accumsan.'}
       position={'middle'}
     />
   );
-  expect(asFragment()).toMatchSnapshot();
+
+  const start = screen.getByText('Vestibulum interdum risus et enim faucibus, sit amet molestie est ac');
+
+  expect(start).toHaveClass('pf-c-truncate__start');
+
+  const end = screen.getByText('cumsan.');
+
+  expect(end).toHaveClass('pf-c-truncate__end');
+});
+
+test('renders different content when trailingNumChars is passed with middle truncate', () => {
+  render(
+    <Truncate
+      content={'Vestibulum interdum risus et enim faucibus, sit amet molestie est accumsan.'}
+      trailingNumChars={3}
+      position='middle'
+    />
+  );
+
+  const start = screen.getByText('Vestibulum interdum risus et enim faucibus, sit amet molestie est accums');
+
+  expect(start).toHaveClass('pf-c-truncate__start');
+
+  const end = screen.getByText('an.');
+
+  expect(end).toHaveClass('pf-c-truncate__end');
+});
+
+test('renders tooltip position', () => {
+  render(
+    <Truncate
+      content={''}
+      tooltipPosition='top'
+    />
+  );
+
+  const input = screen.getByText('position: top');
+  
+  expect(input).toBeVisible();
+});
+
+test('renders tooltip content', () => {
+  render(
+    <Truncate
+      content={'Another Tooltip'}
+      tooltipPosition='top'
+    />
+  );
+
+  const input = screen.getByText('Test Another Tooltip');
+
+  expect(input).toBeVisible();
+});
+
+test('renders with inherited element props spread to the component', () => {
+  render(
+    <Truncate
+      content={'Test'}
+      data-testid="test-id"
+      aria-label="labelling-id"
+    />
+  );
+
+  expect(screen.getByTestId('test-id')).toHaveAccessibleName('labelling-id');
 });

package/src/components/Truncate/__tests__/__snapshots__/Truncate.test.tsx.snap

@@ -2,47 +2,52 @@
 
 exports[`renders default truncation 1`] = `
 <DocumentFragment>
-  <span
-    class="pf-c-truncate"
+  <div
+    data-testid="Tooltip-mock"
   >
-    <span
-      class="pf-c-truncate__start"
+    <div
+      data-testid="Tooltip-mock-content-container"
     >
-      Vestibulum interdum risus et enim faucibus, sit amet molestie est accumsan.
-    </span>
-  </span>
-</DocumentFragment>
-`;
-
-exports[`renders middle truncation 1`] = `
-<DocumentFragment>
-  <span
-    class="pf-c-truncate"
-  >
+      Test Vestibulum interdum risus et enim faucibus, sit amet molestie est accumsan.
+    </div>
+    <p>
+      position: top
+    </p>
     <span
-      class="pf-c-truncate__start"
+      class="pf-c-truncate"
     >
-      Vestibulum interdum risus et enim faucibus, sit amet molestie est ac
+      <span
+        class="pf-c-truncate__start"
+      >
+        Vestibulum interdum risus et enim faucibus, sit amet molestie est accumsan.
+      </span>
     </span>
-    <span
-      class="pf-c-truncate__end"
-    >
-      cumsan.
-    </span>
-  </span>
+  </div>
 </DocumentFragment>
 `;
 
-exports[`renders start truncation 1`] = `
+exports[`renders start truncation with &lrm; at end 1`] = `
 <DocumentFragment>
-  <span
-    class="pf-c-truncate"
+  <div
+    data-testid="Tooltip-mock"
   >
+    <div
+      data-testid="Tooltip-mock-content-container"
+    >
+      Test Vestibulum interdum risus et enim faucibus, sit amet molestie est accumsan.
+    </div>
+    <p>
+      position: top
+    </p>
     <span
-      class="pf-c-truncate__end"
+      class="pf-c-truncate"
     >
-      Vestibulum interdum risus et enim faucibus, sit amet molestie est accumsan.‎
+      <span
+        class="pf-c-truncate__end"
+      >
+        Vestibulum interdum risus et enim faucibus, sit amet molestie est accumsan.‎
+      </span>
     </span>
-  </span>
+  </div>
 </DocumentFragment>
 `;

package/src/components/Wizard/Wizard.tsx

@@ -106,6 +106,8 @@ export interface WizardProps extends React.HTMLProps<HTMLDivElement> {
   isOpen?: boolean;
   /** Flag indicating nav items with sub steps are expandable */
   isNavExpandable?: boolean;
+  /** Callback function to signal the current step in the wizard */
+  onCurrentStepChanged?: (step: WizardStep) => void;
   /** @beta Flag indicating the wizard has a drawer for at least one of the wizard steps */
   hasDrawer?: boolean;
   /** @beta Flag indicating the wizard drawer is expanded */
@@ -164,6 +166,14 @@ export class Wizard extends React.Component<WizardProps, WizardState> {
       isNavOpen: false
     };
 
+    if (props.onCurrentStepChanged) {
+      const flattenedSteps = this.getFlattenedSteps();
+      if (flattenedSteps.length >= this.state.currentStep) {
+        const currentStep = flattenedSteps[this.state.currentStep - 1];
+        props.onCurrentStepChanged(currentStep);
+      }
+    }
+
     this.drawerRef = React.createRef();
   }
 
@@ -202,9 +212,7 @@ export class Wizard extends React.Component<WizardProps, WizardState> {
         }
       }
 
-      this.setState({
-        currentStep: newStep
-      });
+      this.setCurrentStep(newStep, flattenedSteps[newStep - 1]);
       const { id: prevId, name: prevName } = flattenedSteps[currentStep - 1];
       const { id, name } = flattenedSteps[newStep - 1];
       return onNext && onNext({ id, name }, { prevId, prevName });
@@ -218,9 +226,7 @@ export class Wizard extends React.Component<WizardProps, WizardState> {
     if (flattenedSteps.length < currentStep) {
       // Previous step was removed, just update the currentStep state
       const adjustedStep = flattenedSteps.length;
-      this.setState({
-        currentStep: adjustedStep
-      });
+      this.setCurrentStep(adjustedStep, flattenedSteps[adjustedStep - 1]);
     } else {
       let newStep = currentStep;
 
@@ -235,9 +241,7 @@ export class Wizard extends React.Component<WizardProps, WizardState> {
         }
       }
 
-      this.setState({
-        currentStep: newStep
-      });
+      this.setCurrentStep(newStep, flattenedSteps[newStep - 1]);
       const { id: prevId, name: prevName } = flattenedSteps[newStep];
       const { id, name } = flattenedSteps[newStep - 1];
       return onBack && onBack({ id, name }, { prevId, prevName });
@@ -259,7 +263,8 @@ export class Wizard extends React.Component<WizardProps, WizardState> {
     } else if (step > maxSteps) {
       step = maxSteps;
     }
-    this.setState({ currentStep: step, isNavOpen: false });
+    this.setCurrentStep(step, flattenedSteps[step - 1]);
+    this.setState({ isNavOpen: false });
     const { id: prevId, name: prevName } = flattenedSteps[currentStep - 1];
     const { id, name } = flattenedSteps[step - 1];
     return onGoToStep && onGoToStep({ id, name }, { prevId, prevName });
@@ -275,7 +280,7 @@ export class Wizard extends React.Component<WizardProps, WizardState> {
       }
     }
     if (step) {
-      this.setState({ currentStep: step });
+      this.setCurrentStep(step, flattenedSteps[step - 1]);
     }
   };
 
@@ -289,7 +294,7 @@ export class Wizard extends React.Component<WizardProps, WizardState> {
       }
     }
     if (step) {
-      this.setState({ currentStep: step });
+      this.setCurrentStep(step, flattenedSteps[step - 1]);
     }
   };
 
@@ -338,6 +343,16 @@ export class Wizard extends React.Component<WizardProps, WizardState> {
     return appendTo || document.body;
   };
 
+  private setCurrentStep(currentStep: number, currentStepObject: WizardStep) {
+    this.setState({
+      currentStep
+    });
+
+    if (this.props.onCurrentStepChanged) {
+      this.props.onCurrentStepChanged(currentStepObject);
+    }
+  }
+
   componentDidMount() {
     const target = typeof document !== 'undefined' ? document.body : null;
     if (target) {
@@ -352,6 +367,12 @@ export class Wizard extends React.Component<WizardProps, WizardState> {
     }
   }
 
+  componentDidUpdate(prevProps: Readonly<WizardProps>) {
+    if (prevProps.startAtStep !== this.props.startAtStep) {
+      this.setState({ currentStep: this.props.startAtStep });
+    }
+  }
+
   render() {
     const {
       /* eslint-disable @typescript-eslint/no-unused-vars */
@@ -384,6 +405,7 @@ export class Wizard extends React.Component<WizardProps, WizardState> {
       titleId,
       descriptionId,
       isNavExpandable,
+      onCurrentStepChanged,
       hasDrawer,
       isDrawerExpanded,
       ...rest

package/src/components/Wizard/__tests__/Wizard.test.tsx

@@ -222,6 +222,34 @@ describe('Wizard', () => {
     expect(main).toBeInTheDocument();
     expect(main).toHaveAttribute('aria-labelledby', 'main-aria-labelledby');
   });
+
+  test('wiz with onCurrentStepChanged setter', () => {
+    const stepA = { name: 'A', component: <p>Step 1</p> };
+    const stepB = { name: 'B', component: <p>Step 2</p> };
+    const stepC = { name: 'C', component: <p>Step 3</p> };
+
+    const steps: WizardStep[] = [ stepA, stepB, stepC ];
+    const setter = jest.fn();
+
+    render(
+        <Wizard
+            title="Wiz title"
+            onCurrentStepChanged={ setter }
+            steps={steps}
+        />
+    );
+    expect(setter).toHaveBeenLastCalledWith(expect.objectContaining(stepA));
+    userEvent.click(screen.getByText(/next/i));
+    expect(setter).toHaveBeenLastCalledWith(expect.objectContaining(stepB));
+    userEvent.click(screen.getByText(/next/i));
+    expect(setter).toHaveBeenLastCalledWith(expect.objectContaining(stepC));
+    userEvent.click(screen.getByText('A'));
+    expect(setter).toHaveBeenLastCalledWith(expect.objectContaining(stepA));
+    userEvent.click(screen.getByText(/next/i));
+    expect(setter).toHaveBeenLastCalledWith(expect.objectContaining(stepB));
+    userEvent.click(screen.getByText(/back/i));
+    expect(setter).toHaveBeenLastCalledWith(expect.objectContaining(stepA));
+  });
 });
 
   test('wiz with disabled steps', () => {
@@ -314,3 +342,34 @@ describe('Wizard', () => {
 
     expect(screen.getByRole('button',{ name: "A-2" })).toBeDisabled();
   });
+
+test('startAtStep can be used to externally control the current step of the wizard', () => {
+  const WizardTest = () => {
+    const [step, setStep] = React.useState(1);
+
+    const incrementStep = () => {
+      setStep(prevStep => prevStep + 1);
+    };
+
+    const steps: WizardStep[] = [
+      { name: 'A', component: <p>Step 1</p> },
+      { name: 'B', component: <p>Step 2</p> },
+      { name: 'C', component: <p>Step 3</p> }
+    ];
+
+    return (
+      <>
+        <Wizard steps={steps} startAtStep={step} />
+        <button onClick={() => incrementStep()}>Increment step</button>
+      </>
+    );
+  };
+
+  render(<WizardTest />);
+
+  expect(screen.queryByText('Step 2')).not.toBeInTheDocument();
+
+  userEvent.click(screen.getByRole('button', { name: 'Increment step'}))
+
+  expect(screen.getByText('Step 2')).toBeVisible();
+});