Client: fix
This commit is contained in:
parent
e6a0aeaf7f
commit
f7dc448104
@ -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));
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user