From 5a75cdee7af1c50b96d993c611830eebc9a9968b Mon Sep 17 00:00:00 2001
From: jenny-s51 <jshandel@redhat.com>
Date: Fri, 28 Apr 2023 11:46:00 -0400
Subject: [PATCH] add event param to onClose

---
 .../NotificationDrawer/NotificationDrawerHeader.tsx  |  4 ++--
 .../examples/NotificationDrawerBasic.tsx             |  4 ++--
 .../examples/NotificationDrawerLightweight.tsx       |  4 ++--
 .../demos/NotificationDrawer/NotificationDrawer.md   | 12 ++++++------
 .../AlertGroupToastWithNotificationDrawer.tsx        |  2 +-
 .../NotificationDrawerBasicDemo.tsx                  |  4 ++--
 .../NotificationDrawerGroupsDemo.tsx                 |  4 ++--
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/packages/react-core/src/components/NotificationDrawer/NotificationDrawerHeader.tsx b/packages/react-core/src/components/NotificationDrawer/NotificationDrawerHeader.tsx
index 4bf83e79d2e..1e54aea890a 100644
--- a/packages/react-core/src/components/NotificationDrawer/NotificationDrawerHeader.tsx
+++ b/packages/react-core/src/components/NotificationDrawer/NotificationDrawerHeader.tsx
@@ -19,7 +19,7 @@ export interface NotificationDrawerHeaderProps extends React.HTMLProps<HTMLDivEl
   /**  Notification drawer heading custom text which can be used instead of providing count/unreadText */
   customText?: string;
   /**  Callback for when close button is clicked */
-  onClose?: () => void;
+  onClose?: (event: KeyboardEvent | React.MouseEvent) => void;
   /**  Notification drawer heading title */
   title?: string;
   /**  Notification drawer heading unread text used in combination with a count */
@@ -49,7 +49,7 @@ export const NotificationDrawerHeader: React.FunctionComponent<NotificationDrawe
         {children}
         {onClose && (
           <div>
-            <Button variant={ButtonVariant.plain} aria-label={closeButtonAriaLabel} onClick={onClose}>
+            <Button variant={ButtonVariant.plain} aria-label={closeButtonAriaLabel} onClick={(event) => onClose(event)}>
               <TimesIcon aria-hidden="true" />
             </Button>
           </div>
diff --git a/packages/react-core/src/components/NotificationDrawer/examples/NotificationDrawerBasic.tsx b/packages/react-core/src/components/NotificationDrawer/examples/NotificationDrawerBasic.tsx
index 690b0872d81..549a22f1d2c 100644
--- a/packages/react-core/src/components/NotificationDrawer/examples/NotificationDrawerBasic.tsx
+++ b/packages/react-core/src/components/NotificationDrawer/examples/NotificationDrawerBasic.tsx
@@ -29,7 +29,7 @@ export const NotificationDrawerBasic: React.FunctionComponent = () => {
     setIsOpenMap(new Array(7).fill(false));
   };
 
-  const onDrawerClose = () => {
+  const onDrawerClose = (_event: React.MouseEvent<Element, MouseEvent> | KeyboardEvent) => {
     setIsOpenMap(new Array(7).fill(false));
   };
 
@@ -47,7 +47,7 @@ export const NotificationDrawerBasic: React.FunctionComponent = () => {
   ];
   return (
     <NotificationDrawer>
-      <NotificationDrawerHeader count={3} onClose={onDrawerClose}>
+      <NotificationDrawerHeader count={3} onClose={(event) => onDrawerClose(event)}>
         <DropdownDeprecated
           onSelect={onSelect}
           toggle={<KebabToggle onToggle={onToggle(0)} id="basic-kebab-toggle" />}
diff --git a/packages/react-core/src/components/NotificationDrawer/examples/NotificationDrawerLightweight.tsx b/packages/react-core/src/components/NotificationDrawer/examples/NotificationDrawerLightweight.tsx
index 71d8c687c9a..25263a10f49 100644
--- a/packages/react-core/src/components/NotificationDrawer/examples/NotificationDrawerLightweight.tsx
+++ b/packages/react-core/src/components/NotificationDrawer/examples/NotificationDrawerLightweight.tsx
@@ -43,13 +43,13 @@ export const NotificationDrawerLightweight: React.FunctionComponent = () => {
     setFirstGroupExpanded(false);
   };
 
-  const onDrawerClose = () => {
+  const onDrawerClose = (_event: KeyboardEvent | React.MouseEvent<Element, MouseEvent>) => {
     // do something cool in a callback
   };
 
   return (
     <NotificationDrawer>
-      <NotificationDrawerHeader onClose={onDrawerClose} />
+      <NotificationDrawerHeader onClose={(event) => onDrawerClose(event)} />
       <NotificationDrawerBody>
         <NotificationDrawerGroupList>
           <NotificationDrawerGroup
diff --git a/packages/react-core/src/demos/NotificationDrawer/NotificationDrawer.md b/packages/react-core/src/demos/NotificationDrawer/NotificationDrawer.md
index f2f6d1dfcb8..8bacf52bbdd 100644
--- a/packages/react-core/src/demos/NotificationDrawer/NotificationDrawer.md
+++ b/packages/react-core/src/demos/NotificationDrawer/NotificationDrawer.md
@@ -143,7 +143,7 @@ class BasicNotificationDrawer extends React.Component {
       });
     };
 
-    this.onCloseNotificationDrawer = () => {
+    this.onCloseNotificationDrawer = (_event) => {
       this.setState((prevState) => {
         return {
           isDrawerExpanded: !prevState.isDrawerExpanded
@@ -258,7 +258,7 @@ class BasicNotificationDrawer extends React.Component {
               <ToolbarItem visibility={{ default: 'visible' }} isSelected={isDrawerExpanded}>
                 <NotificationBadge
                   variant={this.getNumberUnread() === 0 ? 'read' : 'unread'}
-                  onClick={this.onCloseNotificationDrawer}
+                  onClick={(event) => this.onCloseNotificationDrawer(event)}
                   aria-label="Notifications"
                   isExpanded={isDrawerExpanded}
                 >
@@ -385,7 +385,7 @@ class BasicNotificationDrawer extends React.Component {
 
     const notificationDrawer = (
       <NotificationDrawer ref={this.drawerRef}>
-        <NotificationDrawerHeader count={this.getNumberUnread()} onClose={this.onCloseNotificationDrawer}>
+        <NotificationDrawerHeader count={this.getNumberUnread()} onClose={(event) => this.onCloseNotificationDrawer(event)}>
           <DropdownDeprecated
             onSelect={this.onSelect}
             toggle={
@@ -702,7 +702,7 @@ class GroupedNotificationDrawer extends React.Component {
       });
     };
 
-    this.onCloseNotificationDrawer = () => {
+    this.onCloseNotificationDrawer = (_event) => {
       this.setState((prevState) => {
         return {
           isDrawerExpanded: !prevState.isDrawerExpanded
@@ -860,7 +860,7 @@ class GroupedNotificationDrawer extends React.Component {
               <ToolbarItem visibility={{ default: 'visible' }} isSelected={isDrawerExpanded}>
                 <NotificationBadge
                   variant={this.getNumberUnread() === 0 ? 'read' : 'unread'}
-                  onClick={this.onCloseNotificationDrawer}
+                  onClick={(event) => this.onCloseNotificationDrawer(event)}
                   aria-label="Notifications"
                   isExpanded={isDrawerExpanded}
                 >
@@ -987,7 +987,7 @@ class GroupedNotificationDrawer extends React.Component {
 
     const notificationDrawer = (
       <NotificationDrawer ref={this.drawerRef}>
-        <NotificationDrawerHeader count={this.getNumberUnread()} onClose={this.onCloseNotificationDrawer}>
+        <NotificationDrawerHeader count={this.getNumberUnread()} onClose={(event) => this.onCloseNotificationDrawer(event)}>
           <DropdownDeprecated
             onSelect={this.onSelect}
             toggle={
diff --git a/packages/react-core/src/demos/examples/AlertGroup/AlertGroupToastWithNotificationDrawer.tsx b/packages/react-core/src/demos/examples/AlertGroup/AlertGroupToastWithNotificationDrawer.tsx
index 7267712cd70..9cbfa8b0690 100644
--- a/packages/react-core/src/demos/examples/AlertGroup/AlertGroupToastWithNotificationDrawer.tsx
+++ b/packages/react-core/src/demos/examples/AlertGroup/AlertGroupToastWithNotificationDrawer.tsx
@@ -238,7 +238,7 @@ export const AlertGroupToastWithNotificationDrawer: React.FunctionComponent = ()
 
   const notificationDrawer = (
     <NotificationDrawer>
-      <NotificationDrawerHeader count={getUnreadNotificationsNumber()} onClose={() => setDrawerExpanded(false)}>
+      <NotificationDrawerHeader count={getUnreadNotificationsNumber()} onClose={(_event) => setDrawerExpanded(false)}>
         <DropdownDeprecated
           onSelect={onDropdownSelect}
           toggle={
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/NotificationDrawerDemo/NotificationDrawerBasicDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/NotificationDrawerDemo/NotificationDrawerBasicDemo.tsx
index 7a52b7e6b35..27abf189ca1 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/NotificationDrawerDemo/NotificationDrawerBasicDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/NotificationDrawerDemo/NotificationDrawerBasicDemo.tsx
@@ -35,7 +35,7 @@ export class BasicNotificationDrawerDemo extends React.Component<
       isOpen: new Array(6).fill(false)
     };
   }
-  onDrawerClose = () => {
+  onDrawerClose = (_event: KeyboardEvent | React.MouseEvent<Element, MouseEvent>) => {
     this.setState({
       isDrawerOpen: false
     });
@@ -63,7 +63,7 @@ export class BasicNotificationDrawerDemo extends React.Component<
     ];
     return (
       <NotificationDrawer>
-        <NotificationDrawerHeader count={2} onClose={this.onDrawerClose}>
+        <NotificationDrawerHeader count={2} onClose={(event) => this.onDrawerClose(event)}>
           <DropdownDeprecated
             onSelect={this.onSelect}
             toggle={<KebabToggle onToggle={this.onToggle(0)} id="toggle-id-0" />}
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/NotificationDrawerDemo/NotificationDrawerGroupsDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/NotificationDrawerDemo/NotificationDrawerGroupsDemo.tsx
index 15a90e664f4..1ad60ababa6 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/NotificationDrawerDemo/NotificationDrawerGroupsDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/NotificationDrawerDemo/NotificationDrawerGroupsDemo.tsx
@@ -53,7 +53,7 @@ export class GroupsNotificationDrawerDemo extends React.Component<
     };
   }
 
-  onDrawerClose = () => {
+  onDrawerClose = (_event: KeyboardEvent | React.MouseEvent<Element, MouseEvent>) => {
     this.setState({
       isDrawerOpen: false
     });
@@ -99,7 +99,7 @@ export class GroupsNotificationDrawerDemo extends React.Component<
     ];
     return (
       <NotificationDrawer>
-        <NotificationDrawerHeader count={4} onClose={this.onDrawerClose}>
+        <NotificationDrawerHeader count={4} onClose={(event) => this.onDrawerClose(event)}>
           <DropdownDeprecated
             onSelect={this.onSelect}
             toggle={