Merge pull request #1245 from ONLYOFFICE/feature/dnd-to-trash

Web: Files: added drag-and-drop to trash folder

packages/client/src/components/Article/Body/Items.js

@@ -170,6 +170,7 @@ const Items = ({
 
   onHide,
   firstLoad,
+  deleteAction,
 }) => {
   useEffect(() => {
     data.forEach((elem) => {
@@ -279,7 +280,8 @@ const Items = ({
           (item.pathParts &&
             (item.pathParts[0] === myId || item.pathParts[0] === commonId)) ||
           item.rootFolderType === FolderType.USER ||
-          item.rootFolderType === FolderType.COMMON
+          item.rootFolderType === FolderType.COMMON ||
+          item.rootFolderType === FolderType.TRASH
         ) {
           return true;
         }
@@ -307,6 +309,18 @@ const Items = ({
     [moveDragItems, t]
   );
 
+  const onRemove = React.useCallback(() => {
+    const translations = {
+      deleteOperation: t("Translations:DeleteOperation"),
+      deleteFromTrash: t("Translations:DeleteFromTrash"),
+      deleteSelectedElem: t("Translations:DeleteSelectedElem"),
+      FileRemoved: t("Files:FileRemoved"),
+      FolderRemoved: t("Files:FolderRemoved"),
+    };
+
+    deleteAction(translations);
+  }, [deleteAction]);
+
   const onEmptyTrashAction = () => {
     isMobile && onHide();
     setEmptyTrashDialogVisible(true);
@@ -336,7 +350,7 @@ const Items = ({
             getEndOfBlock={getEndOfBlock}
             showText={showText}
             onClick={onClick}
-            onMoveTo={onMoveTo}
+            onMoveTo={isTrash ? onRemove : onMoveTo}
             onBadgeClick={isTrash ? onEmptyTrashAction : onBadgeClick}
             showDragItems={showDragItems}
             showBadge={showBadge}
@@ -419,7 +433,11 @@ export default inject(
     } = treeFoldersStore;
 
     const { id, pathParts, rootFolderType } = selectedFolderStore;
-    const { moveDragItems, uploadEmptyFolders } = filesActionsStore;
+    const {
+      moveDragItems,
+      uploadEmptyFolders,
+      deleteAction,
+    } = filesActionsStore;
     const { setEmptyTrashDialogVisible } = dialogsStore;
 
     return {
@@ -440,6 +458,7 @@ export default inject(
       setDragging,
       setStartDrag,
       moveDragItems,
+      deleteAction,
       startUpload,
       uploadEmptyFolders,
       setEmptyTrashDialogVisible,