easy-file-system 2.1.98 → 2.1.99

package/src/explorer.js

@@ -262,28 +262,29 @@ class Explorer extends Element {
     return selectedPath;
   }
 
-  selectDragEntryItem(dragEntryItem, callHandlers = true) {
-    const path = dragEntryItem.getPath();
+  selectOrDeselectDragEntryItem(dragEntryItem, callHandlers = true) {
+    const disabled = this.isDisabled();
 
-    this.deselectAllPaths();
+    if (disabled) {
+      return;
+    }
 
-    this.selectPath(path);
+    let selected = dragEntryItem.isSelected();
 
-    if (callHandlers) {
-      const selected = true,
-            readOnly = dragEntryItem.isReadOnly(),
-            explorer = dragEntryItem.getExplorer();
+    const path = dragEntryItem.getPath();
 
-      this.callSelectHandlers(path, selected, readOnly, explorer);
+    if (selected) {
+      dragEntryItem.deselect();
+    } else {
+      this.deselectAllPaths();
+
+      this.selectPath(path);
     }
-  }
 
-  deselectDragEntryItem(dragEntryItem, callHandlers = true) {
-    const path = null;
+    selected = !selected; ///
 
     if (callHandlers) {
-      const selected = false,
-            readOnly = dragEntryItem.isReadOnly(),
+      const readOnly = dragEntryItem.isReadOnly(),
             explorer = dragEntryItem.getExplorer();
 
       this.callSelectHandlers(path, selected, readOnly, explorer);
@@ -321,16 +322,8 @@ class Explorer extends Element {
           explorer = dragEntryItemExplorer;  ///
 
     this.moveDragEntryItems(pathMaps, explorer, () => {
-      const lastPathMap = last(pathMaps),
-            { targetEntryPath } = lastPathMap,
-            path = targetEntryPath;
-
       this.removeMarker();
 
-      if (path !== null) {
-        this.selectPath(path);
-      }
-
       done();
     });
   }
@@ -391,6 +384,22 @@ class Explorer extends Element {
     });
   }
 
+  enable() {
+    const disabled = false;
+
+    this.setDisabled(disabled);
+
+    this.enableDrag();
+  }
+
+  disable() {
+    const disabled = true;
+
+    this.setDisabled(disabled);
+
+    this.disableDrag();
+  }
+
   enableDrag() {
     const dragEntryItems = this.retrieveDragEntryItems();
 
@@ -407,6 +416,26 @@ class Explorer extends Element {
     });
   }
 
+  isDisabled() {
+    const { disabled } = this.getState();
+
+    return disabled;
+  }
+
+  setDisabled(disabled) {
+    this.updateState({
+      disabled
+    });
+  }
+
+  setInitialState() {
+    const disabled = false;
+
+    this.setState({
+      disabled
+    });
+  }
+
   didMount() {
     const { onMove, onOpen, onSelect } = this.properties,
           moveHandler = onMove, ///
@@ -477,6 +506,8 @@ class Explorer extends Element {
 
   initialise() {
   	this.assignContext();
+
+    this.setInitialState();
 	}
 
 	static EntriesList = EntriesList;

package/src/item/entry/drag.js

@@ -183,7 +183,7 @@ class DragEntryItem extends EntryItem {
 
     this.editNameSpan();
 
-    explorer.disableDrag();
+    explorer.disable();
   }
 
   edit() {
@@ -198,7 +198,7 @@ class DragEntryItem extends EntryItem {
 
     this.editNameSpan();
 
-    explorer.disableDrag();
+    explorer.disable();
   }
 
   reset() {
@@ -209,7 +209,7 @@ class DragEntryItem extends EntryItem {
 
     this.setCreated(created);
 
-    explorer.enableDrag();
+    explorer.enable();
   }
 
   cancel() {

package/src/rubbishBin.js

@@ -268,6 +268,16 @@ class RubbishBin extends Element {
     });
   }
 
+  setInitialState() {
+    const markerEntryItemPath = null,
+          markerEntryItemExplorer = null;
+
+    this.setState({
+      markerEntryItemPath,
+      markerEntryItemExplorer
+    });
+  }
+
   childElements() {
     const { OpenRubbishBinSVG, ClosedRubbishBinSVG } = this.constructor;
 
@@ -280,15 +290,9 @@ class RubbishBin extends Element {
   }
 
   initialise() {
-    const markerEntryItemPath = null,
-          markerEntryItemExplorer = null;
-
     this.assignContext();
 
-    this.setState({
-      markerEntryItemPath,
-      markerEntryItemExplorer
-    });
+    this.setInitialState();
   }
 
   static OpenRubbishBinSVG = OpenRubbishBinSVG;