diff --git a/packages/client/src/components/Article/Body/Items.js b/packages/client/src/components/Article/Body/Items.js index 854f8aef62..1331352af4 100644 --- a/packages/client/src/components/Article/Body/Items.js +++ b/packages/client/src/components/Article/Body/Items.js @@ -274,6 +274,10 @@ const Items = ({ ) return false; + const isArchive = draggableItems.find( + (f) => f.rootFolderType === FolderType.Archive + ); + if ( item.rootFolderType === FolderType.SHARE && item.access === ShareAccessRights.FullAccess @@ -287,7 +291,7 @@ const Items = ({ (item.pathParts[0] === myId || item.pathParts[0] === commonId)) || item.rootFolderType === FolderType.USER || item.rootFolderType === FolderType.COMMON || - (item.rootFolderType === FolderType.TRASH && startDrag) + (item.rootFolderType === FolderType.TRASH && startDrag && !isArchive) ) { return true; } @@ -422,6 +426,7 @@ export default inject( }) => { const { selection, + bufferSelection, dragging, setDragging, trashIsEmpty, @@ -460,7 +465,11 @@ export default inject( pathParts, data: treeFolders, selectedTreeNode, - draggableItems: dragging ? selection : null, + draggableItems: dragging + ? bufferSelection + ? [bufferSelection] + : selection + : null, dragging, setDragging, moveDragItems,