From 5d8147a080451ccfb546cd55c1043947925820eb Mon Sep 17 00:00:00 2001
From: Daniel Aguilera <daniel.aguilera@aurea.com>
Date: Sat, 1 Aug 2020 19:46:12 -0300
Subject: [PATCH] DNN-28527: prevent Role Groups dropdown expand on delete

---
 .../Roles.Web/src/components/roles/FiltersBar/index.jsx   | 4 +++-
 .../components/roles/RoleEditor/RoleGroupEditor/index.jsx | 8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/FiltersBar/index.jsx b/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/FiltersBar/index.jsx
index 8d3dad595bb..39cb8d7d35b 100644
--- a/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/FiltersBar/index.jsx
+++ b/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/FiltersBar/index.jsx
@@ -26,7 +26,9 @@ class FiltersBar extends Component {
         };
         canEdit = util.settings.isHost || util.settings.isAdmin || util.settings.permissions.EDIT;
     }
-    onDeleteGroup() {
+    onDeleteGroup(e) {
+        e.stopPropagation();
+
         const {props} = this;
         this.closeDropDown();
         util.utilities.confirm(resx.get("DeleteRoleGroup.Confirm"), resx.get("Delete"), resx.get("Cancel"), () => {
diff --git a/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/RoleEditor/RoleGroupEditor/index.jsx b/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/RoleEditor/RoleGroupEditor/index.jsx
index 6acb47d00d5..e91a9df1772 100644
--- a/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/RoleEditor/RoleGroupEditor/index.jsx
+++ b/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/RoleEditor/RoleGroupEditor/index.jsx
@@ -58,7 +58,9 @@ class RoleGroupEditor extends Component {
         });
     }
 
-    onCancel() {
+    onCancel(e) {
+        e.stopPropagation();
+
         this.setState({
             group: {}
         }, () => {
@@ -68,7 +70,9 @@ class RoleGroupEditor extends Component {
         });
     }
 
-    onSave() {
+    onSave(e) {
+        e.stopPropagation();
+
         const {props, state} = this;
         this.submitted = true;
         if (this.validateForm()) {