From 755ff40edf2f0b3c95e5c59c143c2dd2ac39a148 Mon Sep 17 00:00:00 2001
From: melloware <mellowaredev@gmail.com>
Date: Wed, 21 Aug 2024 07:59:52 -0400
Subject: [PATCH] Fix #6855: ConfirmDialog group missing from typescript

---
 components/lib/confirmdialog/confirmdialog.d.ts |  4 ++++
 components/lib/panelmenu/PanelMenu.js           | 10 +++-------
 components/lib/panelmenu/PanelMenuSub.js        |  8 ++------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/components/lib/confirmdialog/confirmdialog.d.ts b/components/lib/confirmdialog/confirmdialog.d.ts
index dc816566f8..03a7f9c151 100644
--- a/components/lib/confirmdialog/confirmdialog.d.ts
+++ b/components/lib/confirmdialog/confirmdialog.d.ts
@@ -162,6 +162,10 @@ interface ConfirmDialogOptions {
  * @group Properties
  */
 export interface ConfirmDialogProps extends Omit<DialogProps, 'onHide' | 'footer' | 'pt'> {
+    /**
+     * Optional key to match the key of the confirmation, useful to target a specific confirm dialog instance.
+     */
+    group?: string | undefined;
     /**
      * Unique tag key used to separate the confirmDialog components in the page.
      */
diff --git a/components/lib/panelmenu/PanelMenu.js b/components/lib/panelmenu/PanelMenu.js
index f393af6322..0a26b933cb 100644
--- a/components/lib/panelmenu/PanelMenu.js
+++ b/components/lib/panelmenu/PanelMenu.js
@@ -290,13 +290,9 @@ export const PanelMenu = React.memo(
                 },
                 getPTOptions(item, 'headerSubmenuIcon', index)
             );
-            
-            const submenuIcon = item.items && IconUtils.getJSXIcon(
-                active 
-                    ? (props.collapseIcon || <ChevronDownIcon {...headerSubmenuIconProps} />) 
-                    : (props.expandIcon || <ChevronRightIcon {...headerSubmenuIconProps} />)
-            );
-        
+
+            const submenuIcon = item.items && IconUtils.getJSXIcon(active ? props.collapseIcon || <ChevronDownIcon {...headerSubmenuIconProps} /> : props.expandIcon || <ChevronRightIcon {...headerSubmenuIconProps} />);
+
             const headerLabelProps = mergeProps(
                 {
                     className: cx('headerLabel')
diff --git a/components/lib/panelmenu/PanelMenuSub.js b/components/lib/panelmenu/PanelMenuSub.js
index ad6036dc85..7360cf44ae 100644
--- a/components/lib/panelmenu/PanelMenuSub.js
+++ b/components/lib/panelmenu/PanelMenuSub.js
@@ -185,12 +185,8 @@ export const PanelMenuSub = React.memo(
                 getPTOptions(processedItem, 'submenuicon', index)
             );
 
-            const submenuIcon = item.items && IconUtils.getJSXIcon(
-                active 
-                    ? (props.collapseIcon || <ChevronDownIcon {...submenuIconProps} />) 
-                    : (props.expandIcon || <ChevronRightIcon {...submenuIconProps} />)
-            );
-            
+            const submenuIcon = item.items && IconUtils.getJSXIcon(active ? props.collapseIcon || <ChevronDownIcon {...submenuIconProps} /> : props.expandIcon || <ChevronRightIcon {...submenuIconProps} />);
+
             const submenu = createSubmenu(processedItem, active);
             const actionProps = mergeProps(
                 {