diff --git a/packages/client/src/HOCs/withHotkeys.js b/packages/client/src/HOCs/withHotkeys.js index ab45e8962c..d44590fa4f 100644 --- a/packages/client/src/HOCs/withHotkeys.js +++ b/packages/client/src/HOCs/withHotkeys.js @@ -89,6 +89,8 @@ const withHotkeys = (Component) => { security, copyToClipboard, uploadClipboardFiles, + + isGroupMenuBlocked, } = props; const navigate = useNavigate(); @@ -317,7 +319,7 @@ const withHotkeys = (Component) => { return; } - if (isAvailableOption("delete")) { + if (isAvailableOption("delete") && !isGroupMenuBlocked) { if (isRecentFolder) return; if (isFavoritesFolder) { @@ -460,6 +462,7 @@ const withHotkeys = (Component) => { setFavoriteAction, deleteRooms, archiveRooms, + isGroupMenuBlocked, } = filesActionsStore; const { visible: mediaViewerIsVisible } = mediaViewerDataStore; @@ -533,6 +536,8 @@ const withHotkeys = (Component) => { copyToClipboard, uploadClipboardFiles, + + isGroupMenuBlocked, }; }, )(observer(WithHotkeys)); diff --git a/packages/client/src/store/FilesActionsStore.js b/packages/client/src/store/FilesActionsStore.js index aaf5b3fd2f..0025e1bb7f 100644 --- a/packages/client/src/store/FilesActionsStore.js +++ b/packages/client/src/store/FilesActionsStore.js @@ -1690,12 +1690,7 @@ class FilesActionStore { case "delete": const canDelete = selection.every((s) => s.security?.Delete); - return ( - !allFilesIsEditing && - !this.isGroupMenuBlocked && - canDelete && - hasSelection - ); + return !allFilesIsEditing && canDelete && hasSelection; case "create-room": const canCreateRoom = selection.some((s) => s.security?.CreateRoomFrom); return canCreateRoom;