IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0

Browse Source
This commit is contained in:
Alexey Safronov 2023-03-21 12:32:52 +04:00
commit 7ebb7d1a75
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/client/src/components/Article/Body/Items.js
View File

@ -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,