Web: Files: fixed drag

products/ASC.Files/Client/src/components/pages/Home/Section/Body/FIleItem.js

@@ -39,6 +39,7 @@ const FileItem = (props) => {
     selectedFolderId,
     setSharingPanelVisible,
     setDragging,
+    setStartDrag,
     startUpload,
     viewAs,
     setTooltipPosition,
@@ -149,8 +150,7 @@ const FileItem = (props) => {
     }
 
     setTooltipPosition(e.pageX, e.pageY);
-    document.body.classList.add("drag-cursor");
+    setStartDrag(true);
-    setDragging(true);
   };
 
   let value = fileExst ? `file_${id}` : `folder_${id}`;
@@ -239,7 +239,12 @@ export default inject(
     },
     { item }
   ) => {
-    const { dragging, setDragging, setTooltipPosition } = initFilesStore;
+    const {
+      dragging,
+      setDragging,
+      setStartDrag,
+      setTooltipPosition,
+    } = initFilesStore;
 
     const {
       type: actionType,
@@ -296,6 +301,7 @@ export default inject(
       selectRowAction,
       selectedFolderId,
       setDragging,
+      setStartDrag,
       startUpload,
       onSelectItem,
       getContextOptions,

products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js

@@ -19,6 +19,8 @@ const SectionBodyContent = (props) => {
     isEmptyFilesList,
     folderId,
     dragging,
+    startDrag,
+    setStartDrag,
     setDragging,
     setTooltipPosition,
     isRecycleBinFolder,
@@ -34,8 +36,8 @@ const SectionBodyContent = (props) => {
       customScrollElm && customScrollElm.scrollTo(0, 0);
     }
 
-    dragging && window.addEventListener("mouseup", onMouseUp);
+    startDrag && window.addEventListener("mouseup", onMouseUp);
-    dragging && document.addEventListener("mousemove", onMouseMove);
+    startDrag && document.addEventListener("mousemove", onMouseMove);
 
     document.addEventListener("dragover", onDragOver);
     document.addEventListener("dragleave", onDragLeaveDoc);
@@ -48,10 +50,13 @@ const SectionBodyContent = (props) => {
       document.removeEventListener("dragleave", onDragLeaveDoc);
       document.removeEventListener("drop", onDropEvent);
     };
-  }, [onMouseUp, onMouseMove, dragging, folderId]);
+  }, [onMouseUp, onMouseMove, startDrag, folderId]);
 
   const onMouseMove = (e) => {
-    !dragging && setDragging(true);
+    if (!dragging) {
+      setDragging(true);
+      document.body.classList.add("drag-cursor");
+    }
 
     setTooltipPosition(e.pageX, e.pageY);
 
@@ -94,12 +99,15 @@ const SectionBodyContent = (props) => {
     const elem = e.target.closest(".droppable");
     const value = elem && elem.getAttribute("value");
     if ((!value && !treeValue) || isRecycleBinFolder) {
-      return setDragging(false);
+      setDragging(false);
+      setStartDrag(false);
+      return;
     }
 
     const folderId = value ? value.split("_")[1] : treeValue;
 
     setDragging(false);
+    setStartDrag(false);
     onMoveTo(folderId);
     return;
   };
@@ -154,11 +162,15 @@ export default inject(
       isLoading,
       viewAs,
       setTooltipPosition,
+      startDrag,
+      setStartDrag,
     } = initFilesStore;
     const { firstLoad, fileActionStore, filesList } = filesStore;
 
     return {
       dragging,
+      startDrag,
+      setStartDrag,
       fileActionId: fileActionStore.id,
       firstLoad,
       viewAs,

products/ASC.Files/Client/src/store/InitFilesStore.js

@@ -18,6 +18,7 @@ class InitFilesStore {
 
   tooltipPageX = 0;
   tooltipPageY = 0;
+  startDrag = false;
 
   constructor() {
     const pathname = window.location.pathname.toLowerCase();
@@ -42,6 +43,10 @@ class InitFilesStore {
     this.isLoading = isLoading;
   };
 
+  setStartDrag = (startDrag) => {
+    this.startDrag = startDrag;
+  };
+
   setTooltipPosition = (tooltipPageX, tooltipPageY) => {
     this.tooltipPageX = tooltipPageX;
     this.tooltipPageY = tooltipPageY;