easy-file-system 2.1.98 → 2.1.101

package/src/explorer.js

@@ -4,7 +4,7 @@ import withStyle from "easy-with-style";  ///
 
 import { Element } from "easy";
 import { dropMixins } from "easy-drag-and-drop";
-import { pathUtilities, arrayUtilities } from "necessary";
+import { pathUtilities } from "necessary";
 
 import EntriesList from "./list/entries";
 import DragEntryItem from "./item/entry/drag";
@@ -20,8 +20,7 @@ import { explorerPadding } from "./styles";
 import { FILE_NAME_DRAG_ENTRY_TYPE, DIRECTORY_NAME_DRAG_ENTRY_TYPE } from "./entryTypes";
 import { sourceEntryPathFromEntryItem, targetEntryPathFromEntryItem } from "./utilities/pathMap";
 
-const { last } = arrayUtilities,
-      { concatenatePaths, pathWithoutBottommostNameFromPath } = pathUtilities;
+const { concatenatePaths, pathWithoutBottommostNameFromPath } = pathUtilities;
 
 class Explorer extends Element {
   dragOverHandler = (dragElement, element) => {
@@ -176,14 +175,6 @@ class Explorer extends Element {
     return directoryPaths;
   }
 
-  openFileNameDragEntryItem(fileNameDragEntryItem) {
-    const fileNameDragEntryItemPath = fileNameDragEntryItem.getPath(),
-          filePath = fileNameDragEntryItemPath, ///
-          explorer = fileNameDragEntryItem.getExplorer();
-
-    this.callOpenHandlers(filePath, explorer);
-  }
-
   collapse() {
     const directoryNameDragEntryItems = this.retrieveDirectoryNameDragEntryItems();
 
@@ -262,32 +253,45 @@ class Explorer extends Element {
     return selectedPath;
   }
 
-  selectDragEntryItem(dragEntryItem, callHandlers = true) {
-    const path = dragEntryItem.getPath();
+  openFileNameDragEntryItem(fileNameDragEntryItem) {
+    const disabled = this.isDisabled();
+
+    if (disabled) {
+      return;
+    }
 
-    this.deselectAllPaths();
+    const fileNameDragEntryItemPath = fileNameDragEntryItem.getPath(),
+          filePath = fileNameDragEntryItemPath, ///
+          explorer = fileNameDragEntryItem.getExplorer();
 
-    this.selectPath(path);
+    this.callOpenHandlers(filePath, explorer);
+  }
 
-    if (callHandlers) {
-      const selected = true,
-            readOnly = dragEntryItem.isReadOnly(),
-            explorer = dragEntryItem.getExplorer();
+  selectOrDeselectDragEntryItem(dragEntryItem) {
+    const disabled = this.isDisabled();
 
-      this.callSelectHandlers(path, selected, readOnly, explorer);
+    if (disabled) {
+      return;
     }
-  }
 
-  deselectDragEntryItem(dragEntryItem, callHandlers = true) {
-    const path = null;
+    let selected = dragEntryItem.isSelected();
+
+    const path = dragEntryItem.getPath();
 
-    if (callHandlers) {
-      const selected = false,
-            readOnly = dragEntryItem.isReadOnly(),
-            explorer = dragEntryItem.getExplorer();
+    if (selected) {
+      dragEntryItem.deselect();
+    } else {
+      this.deselectAllPaths();
 
-      this.callSelectHandlers(path, selected, readOnly, explorer);
+      this.selectPath(path);
     }
+
+    selected = !selected; ///
+
+    const readOnly = dragEntryItem.isReadOnly(),
+          explorer = dragEntryItem.getExplorer();
+
+    this.callSelectHandlers(path, selected, readOnly, explorer);
   }
 
   editDragEntryItem(dragEntryItem, done) {
@@ -321,16 +325,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 +387,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 +419,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 +509,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;