feat(Modal): added event to onClose

packages/react-core/src/components/LabelGroup/examples/LabelGroupEditableAddModal.tsx

@@ -104,7 +104,7 @@ export const LabelGroupEditableAddModal: React.FunctionComponent = () => {
     setIsEditable(false);
   };
 
-  const handleModalToggle = () => {
+  const handleModalToggle = (_event: KeyboardEvent | React.MouseEvent) => {
     setModalOpen(!isModalOpen);
   };
 

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

@@ -50,7 +50,7 @@ export interface ModalProps extends React.HTMLProps<HTMLDivElement>, OUIAProps {
   /** Flag to show the modal. */
   isOpen?: boolean;
   /** A callback for when the close button is clicked. */
-  onClose?: () => void;
+  onClose?: (event: KeyboardEvent | React.MouseEvent) => void;
   /** Modal handles pressing of the escape key and closes the modal. If you want to handle
    * this yourself you can use this callback function. */
   onEscapePress?: (event: KeyboardEvent) => void;
@@ -135,7 +135,7 @@ export class Modal extends React.Component<ModalProps, ModalState> {
   handleEscKeyClick = (event: KeyboardEvent): void => {
     const { onEscapePress } = this.props;
     if (event.key === KeyTypes.Escape && this.props.isOpen) {
-      onEscapePress ? onEscapePress(event) : this.props.onClose?.();
+      onEscapePress ? onEscapePress(event) : this.props.onClose?.(event);
     }
   };
 

packages/react-core/src/components/Modal/ModalBoxCloseButton.tsx

@@ -9,7 +9,7 @@ export interface ModalBoxCloseButtonProps extends OUIAProps {
   /** Additional classes added to the close button. */
   className?: string;
   /** A callback for when the close button is clicked. */
-  onClose?: () => void;
+  onClose?: (event: KeyboardEvent | React.MouseEvent) => void;
   /** Value to set the data-ouia-component-id.*/
   ouiaId?: number | string;
 }
@@ -23,7 +23,7 @@ export const ModalBoxCloseButton: React.FunctionComponent<ModalBoxCloseButtonPro
   <div className={css(styles.modalBoxClose, className)}>
     <Button
       variant="plain"
-      onClick={onClose}
+      onClick={(event) => onClose(event)}
       aria-label="Close"
       {...(ouiaId && { ouiaId: `${ouiaId}-${ModalBoxCloseButton.displayName}` })}
       {...props}

packages/react-core/src/components/Modal/ModalContent.tsx

@@ -60,7 +60,7 @@ export interface ModalContentProps extends OUIAProps {
   /** Id of the modal box title. */
   labelId: string;
   /** A callback for when the close button is clicked. */
-  onClose?: () => void;
+  onClose?: (event: KeyboardEvent | React.MouseEvent) => void;
   /** Position of the modal. By default a modal will be positioned vertically and horizontally centered. */
   position?: 'default' | 'top';
   /** Offset from alternate position. Can be any valid CSS length/percentage. */
@@ -187,7 +187,7 @@ export const ModalContent: React.FunctionComponent<ModalContentProps> = ({
       aria-describedby={ariaDescribedby || (hasNoBodyWrapper ? null : descriptorId)}
       {...getOUIAProps(ModalContent.displayName, ouiaId, ouiaSafe)}
     >
-      {showClose && <ModalBoxCloseButton onClose={onClose} ouiaId={ouiaId} />}
+      {showClose && <ModalBoxCloseButton onClose={(event) => onClose(event)} ouiaId={ouiaId} />}
       {modalBoxHeader}
       {modalBody}
       {modalBoxFooter}

packages/react-core/src/components/Modal/examples/ModalBasic.tsx

@@ -4,7 +4,7 @@ import { Modal, Button } from '@patternfly/react-core';
 export const ModalBasic: React.FunctionComponent = () => {
   const [isModalOpen, setIsModalOpen] = React.useState(false);
 
-  const handleModalToggle = () => {
+  const handleModalToggle = (_event: KeyboardEvent | React.MouseEvent) => {
     setIsModalOpen(!isModalOpen);
   };
 

packages/react-core/src/components/Modal/examples/ModalCustomHeaderFooter.tsx

@@ -5,7 +5,7 @@ import WarningTriangleIcon from '@patternfly/react-icons/dist/esm/icons/warning-
 export const ModalCustomHeaderFooter: React.FunctionComponent = () => {
   const [isModalOpen, setIsModalOpen] = React.useState(false);
 
-  const handleModalToggle = () => {
+  const handleModalToggle = (_event: KeyboardEvent | React.MouseEvent) => {
     setIsModalOpen(!isModalOpen);
   };
 

packages/react-core/src/components/Modal/examples/ModalCustomTitleIcon.tsx

@@ -5,7 +5,7 @@ import BullhornIcon from '@patternfly/react-icons/dist/esm/icons/bullhorn-icon';
 export const ModalCustomTitleIcon: React.FunctionComponent = () => {
   const [isModalOpen, setIsModalOpen] = React.useState(false);
 
-  const handleModalToggle = () => {
+  const handleModalToggle = (_event: KeyboardEvent | React.MouseEvent) => {
     setIsModalOpen(!isModalOpen);
   };
 

packages/react-core/src/components/Modal/examples/ModalCustomWidth.tsx

@@ -4,7 +4,7 @@ import { Modal, Button } from '@patternfly/react-core';
 export const ModalCustomWidth: React.FunctionComponent = () => {
   const [isModalOpen, setIsModalOpen] = React.useState(false);
 
-  const handleModalToggle = () => {
+  const handleModalToggle = (_event: KeyboardEvent | React.MouseEvent) => {
     setIsModalOpen(!isModalOpen);
   };
 

packages/react-core/src/components/Modal/examples/ModalLarge.tsx

@@ -4,7 +4,7 @@ import { Modal, ModalVariant, Button } from '@patternfly/react-core';
 export const ModalLarge: React.FunctionComponent = () => {
   const [isModalOpen, setIsModalOpen] = React.useState(false);
 
-  const handleModalToggle = () => {
+  const handleModalToggle = (_event: KeyboardEvent | React.MouseEvent) => {
     setIsModalOpen(!isModalOpen);
   };
 

packages/react-core/src/components/Modal/examples/ModalMedium.tsx

@@ -4,7 +4,7 @@ import { Modal, ModalVariant, Button } from '@patternfly/react-core';
 export const ModalMedium: React.FunctionComponent = () => {
   const [isModalOpen, setIsModalOpen] = React.useState(false);
 
-  const handleModalToggle = () => {
+  const handleModalToggle = (_event: KeyboardEvent | React.MouseEvent) => {
     setIsModalOpen(!isModalOpen);
   };
 

packages/react-core/src/components/Modal/examples/ModalNoHeaderFooter.tsx

@@ -4,7 +4,7 @@ import { Modal, ModalVariant, Button } from '@patternfly/react-core';
 export const ModalNoHeaderFooter: React.FunctionComponent = () => {
   const [isModalOpen, setIsModalOpen] = React.useState(false);
 
-  const handleModalToggle = () => {
+  const handleModalToggle = (_event: KeyboardEvent | React.MouseEvent) => {
     setIsModalOpen(!isModalOpen);
   };
 

packages/react-core/src/components/Modal/examples/ModalSmall.tsx

@@ -4,7 +4,7 @@ import { Modal, ModalVariant, Button } from '@patternfly/react-core';
 export const ModalSmall: React.FunctionComponent = () => {
   const [isModalOpen, setIsModalOpen] = React.useState(false);
 
-  const handleModalToggle = () => {
+  const handleModalToggle = (_event: KeyboardEvent | React.MouseEvent) => {
     setIsModalOpen(!isModalOpen);
   };
 

packages/react-core/src/components/Modal/examples/ModalTitleIcon.tsx

@@ -4,7 +4,7 @@ import { Modal, Button } from '@patternfly/react-core';
 export const ModalTitleIcon: React.FunctionComponent = () => {
   const [isModalOpen, setIsModalOpen] = React.useState(false);
 
-  const handleModalToggle = () => {
+  const handleModalToggle = (_event: KeyboardEvent | React.MouseEvent) => {
     setIsModalOpen(!isModalOpen);
   };
 

packages/react-core/src/components/Modal/examples/ModalTopAligned.tsx

@@ -4,7 +4,7 @@ import { Modal, Button } from '@patternfly/react-core';
 export const ModalTopAligned: React.FunctionComponent = () => {
   const [isModalOpen, setIsModalOpen] = React.useState(false);
 
-  const handleModalToggle = () => {
+  const handleModalToggle = (_event: KeyboardEvent | React.MouseEvent) => {
     setIsModalOpen(!isModalOpen);
   };
 

packages/react-core/src/components/Modal/examples/ModalWithDescription.tsx

@@ -4,7 +4,7 @@ import { Modal, Button } from '@patternfly/react-core';
 export const ModalWithDescription: React.FunctionComponent = () => {
   const [isModalOpen, setIsModalOpen] = React.useState(false);
 
-  const handleModalToggle = () => {
+  const handleModalToggle = (_event: KeyboardEvent | React.MouseEvent) => {
     setIsModalOpen(!isModalOpen);
   };
 

packages/react-core/src/components/Modal/examples/ModalWithDropdown.tsx

@@ -11,7 +11,7 @@ export const ModalWithDropdown: React.FunctionComponent = () => {
   const [isModalOpen, setIsModalOpen] = React.useState(false);
   const [isDropdownOpen, setIsDropdownOpen] = React.useState(false);
 
-  const handleModalToggle = () => {
+  const handleModalToggle = (_event: KeyboardEvent | React.MouseEvent) => {
     setIsModalOpen(!isModalOpen);
     setIsDropdownOpen(false);
   };
@@ -30,12 +30,12 @@ export const ModalWithDropdown: React.FunctionComponent = () => {
     (element as HTMLElement).focus();
   };
 
-  const onEscapePress = () => {
+  const onEscapePress = (event: KeyboardEvent) => {
     if (isDropdownOpen) {
       setIsDropdownOpen(!isDropdownOpen);
       onFocus();
     } else {
-      handleModalToggle();
+      handleModalToggle(event);
     }
   };
 

packages/react-core/src/components/Modal/examples/ModalWithForm.tsx

@@ -8,7 +8,7 @@ export const ModalWithForm: React.FunctionComponent = () => {
   const [emailValue, setEmailValue] = React.useState('');
   const [addressValue, setAddressValue] = React.useState('');
 
-  const handleModalToggle = () => {
+  const handleModalToggle = (_event: KeyboardEvent | React.MouseEvent) => {
     setModalOpen(!isModalOpen);
   };
 

packages/react-core/src/components/Modal/examples/ModalWithHelp.tsx

@@ -5,7 +5,7 @@ import HelpIcon from '@patternfly/react-icons/dist/esm/icons/help-icon';
 export const ModalWithHelp: React.FunctionComponent = () => {
   const [isModalOpen, setIsModalOpen] = React.useState(false);
 
-  const handleModalToggle = () => {
+  const handleModalToggle = (_event: KeyboardEvent | React.MouseEvent) => {
     setIsModalOpen(!isModalOpen);
   };
 

packages/react-core/src/components/Modal/examples/ModalWithOverflowingContent.tsx

@@ -4,7 +4,7 @@ import { Modal, ModalVariant, Button } from '@patternfly/react-core';
 export const ModalWithOverflowingContent: React.FunctionComponent = () => {
   const [isModalOpen, setIsModalOpen] = React.useState(false);
 
-  const handleModalToggle = () => {
+  const handleModalToggle = (_event: KeyboardEvent | React.MouseEvent) => {
     setIsModalOpen(prevIsModalOpen => !prevIsModalOpen);
   };
 

packages/react-core/src/components/Modal/examples/ModalWithWizard.tsx

@@ -4,7 +4,11 @@ import { Modal, ModalVariant, Button, Wizard, WizardHeader, WizardStep } from '@
 export const ModalWithWizard: React.FunctionComponent = () => {
   const [isModalOpen, setIsModalOpen] = React.useState(false);
 
-  const handleModalToggle = () => {
+  const handleModalToggle = (_event: KeyboardEvent | React.MouseEvent) => {
+    setIsModalOpen((prevIsModalOpen) => !prevIsModalOpen);
+  };
+
+  const handleWizardToggle = () => {
     setIsModalOpen((prevIsModalOpen) => !prevIsModalOpen);
   };
 
@@ -35,17 +39,17 @@ export const ModalWithWizard: React.FunctionComponent = () => {
               title="Wizard modal"
               titleId="modal-wizard-label"
               description="This is a wizard inside of a modal."
-              onClose={handleModalToggle}
+              onClose={handleWizardToggle}
               closeButtonAriaLabel="Close wizard"
             />
           }
-          onClose={handleModalToggle}
+          onClose={handleWizardToggle}
         >
           {numberedSteps}
           <WizardStep
             name="Review"
             id="with-wizard-review-step"
-            footer={{ nextButtonText: 'Finish', onNext: handleModalToggle }}
+            footer={{ nextButtonText: 'Finish', onNext: handleWizardToggle }}
           >
             Review step
           </WizardStep>

packages/react-core/src/demos/DatePicker/examples/DateTimePickerInModal.tsx

@@ -6,7 +6,7 @@ export const SimpleModal = () => {
   const [isTimePickerOpen, setIsTimePickerOpen] = React.useState(false);
   const dateRef = React.useRef(null);
 
-  const handleModalToggle = () => {
+  const handleModalToggle = (_event: KeyboardEvent | React.MouseEvent) => {
     setIsModalOpen(!isModalOpen);
   };
 
@@ -16,7 +16,7 @@ export const SimpleModal = () => {
     } else if (isTimePickerOpen) {
       setIsTimePickerOpen(false);
     } else {
-      handleModalToggle();
+      handleModalToggle(event);
     }
   };
 

packages/react-core/src/deprecated/components/Wizard/examples/WizardInModal.tsx

@@ -4,17 +4,25 @@ import { Wizard as WizardDeprecated } from '@patternfly/react-core/deprecated';
 
 export const WizardInModal: React.FunctionComponent = () => {
   const [isOpen, setIsOpen] = React.useState(false);
-  const handleModalToggle = () => {
+
+  const handleModalToggle = (_event: KeyboardEvent | React.MouseEvent) => {
+    setIsOpen(!isOpen);
+  };
+
+  const handleWizardToggle = () => {
     setIsOpen(!isOpen);
   };
+
   const steps = [
     { name: 'First step', component: <p>Step 1 content</p> },
     { name: 'Second step', component: <p>Step 2 content</p> },
     { name: 'Third step', component: <p>Step 3 content</p> },
     { name: 'Fourth step', component: <p>Step 4 content</p> },
     { name: 'Review', component: <p>Review step content</p>, nextButtonText: 'Finish' }
   ];
+
   const title = 'Wizard in modal example';
+
   return (
     <React.Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
@@ -25,7 +33,7 @@ export const WizardInModal: React.FunctionComponent = () => {
         description="Simple Wizard Description"
         descriptionComponent="div"
         steps={steps}
-        onClose={handleModalToggle}
+        onClose={handleWizardToggle}
         isOpen={isOpen}
       />
     </React.Fragment>

packages/react-integration/demo-app-ts/src/components/demos/ModalDemo/ModalDemo.tsx

@@ -34,7 +34,7 @@ export class ModalDemo extends React.Component<React.HTMLProps<HTMLDivElement>,
     customEscapePressed: false
   };
 
-  handleModalToggle = () => {
+  handleModalToggle = (_event: KeyboardEvent | React.MouseEvent) => {
     this.setState(({ isModalOpen }) => ({
       isModalOpen: !isModalOpen
     }));

packages/react-integration/demo-app-ts/src/components/demos/SelectDeprecatedDemo/SelectInModal.tsx

@@ -18,16 +18,16 @@ export const SelectInModal = () => {
   const [isTimePickerOpen, setIsTimePickerOpen] = React.useState(false);
   const [selection, setSelection] = React.useState(null);
 
-  const handleModalToggle = () => {
+  const handleModalToggle = (_event: KeyboardEvent | React.MouseEvent) => {
     setIsModalOpen(!isModalOpen);
   };
-  const onEscapePress = () => {
+  const onEscapePress = (event: KeyboardEvent) => {
     if (isSelectOpen) {
       setIsSelectOpen(false);
     } else if (isTimePickerOpen) {
       setIsTimePickerOpen(false);
     } else {
-      handleModalToggle();
+      handleModalToggle(event);
     }
   };
 

packages/react-table/src/docs/demos/Table.md

@@ -716,7 +716,7 @@ class ColumnManagementAction extends React.Component {
         [target.name]: value
       });
     };
-    this.handleModalToggle = () => {
+    this.handleModalToggle = (_event: KeyboardEvent | React.MouseEvent) => {
       this.setState(({ isModalOpen }) => ({
         isModalOpen: !isModalOpen
       }));

packages/react-table/src/docs/demos/table-demos/ColumnManagement.jsx

@@ -176,7 +176,7 @@ export const ColumnManagementAction = () => {
     setCheckedState(updatedCheckedState);
   };
 
-  const handleModalToggle = () => {
+  const handleModalToggle = (_event) => {
     setIsModalOpen(!isModalOpen);
   };