easy-file-system 2.1.223 → 2.1.225

package/src/example/view.js

@@ -29,36 +29,36 @@ export default class View extends Element {
     firstExplorer.createFilePath();
   }
 
-  openCustomHandler = (filePath, explorer) => {
-    console.log("open", filePath)
-  }
-
-  moveCustomHandler = (pathMaps, explorer, element, done) => {
-    console.log("move", JSON.stringify(pathMaps, null, "  "))
+  renameCustomHandler = (event, element, pathMaps, explorer, done) => {
+    console.log("rename", JSON.stringify(pathMaps, null, "  "))
 
     done();
   }
 
-  removeCustomHandler = (pathMaps, explorer, element, done) => {
-    console.log("remove", JSON.stringify(pathMaps, null, "  "))
+  createCustomHandler = (event, element, pathMaps, explorer, done) => {
+    console.log("create", JSON.stringify(pathMaps, null, "  "))
 
     done();
   }
 
-  renameCustomHandler = (pathMaps, explorer, element, done) => {
-    console.log("rename", JSON.stringify(pathMaps, null, "  "))
+  selectCustomHandler = (event, element, path, selected, readOnly, explorer) => {
+    console.log("select", path, selected, readOnly)
+  }
+
+  removeCustomHandler = (event, element, pathMaps, explorer, done) => {
+    console.log("remove", JSON.stringify(pathMaps, null, "  "))
 
     done();
   }
 
-  createCustomHandler = (pathMaps, explorer, element, done) => {
-    console.log("create", JSON.stringify(pathMaps, null, "  "))
+  moveCustomHandler = (event, element, pathMaps, explorer, done) => {
+    console.log("move", JSON.stringify(pathMaps, null, "  "))
 
     done();
   }
 
-  selectCustomHandler = (path, selected, readOnly, explorer) => {
-    console.log("select", path, selected, readOnly)
+  openCustomHandler = (event, element, filePath, explorer) => {
+    console.log("open", filePath)
   }
 
   getExplorers() {

package/src/explorer.js

@@ -29,7 +29,7 @@ const { first } = arrayUtilities,
       { concatenatePaths, pathWithoutBottommostNameFromPath } = pathUtilities;
 
 class Explorer extends Element {
-  dragOverCustomHandler = (dragElement, element) => {
+  dragOverCustomHandler = (event, element, dragElement) => {
     const dragEntryItem = dragElement,  ///
           markerEntryItem = this.retrieveMarkerEntryItem(),
           dragEntryItemName = dragEntryItem.getName();
@@ -52,7 +52,7 @@ class Explorer extends Element {
     }
   }
 
-  dropCustomHandler = (dragElement, aborted, element, done) => {
+  dropCustomHandler = (event, element, dragElement, aborted, done) => {
     const markerEntryItem = this.retrieveMarkerEntryItem(),
           markerEntryItemExplorer = markerEntryItem.getExplorer();
 
@@ -66,7 +66,7 @@ class Explorer extends Element {
 
     const dragEntryItem = dragElement;  ///
 
-    markerEntryItemExplorer.dropDragEntryItem(dragEntryItem, done);
+    markerEntryItemExplorer.dropDragEntryItem(event, element, dragEntryItem, done);
   }
 
   getExplorer() {
@@ -229,14 +229,14 @@ class Explorer extends Element {
     return selectedPath;
   }
 
-  clickDragEntryItem(dragEntryItem) {
+  clickDragEntryItem(event, element, dragEntryItem) {
     const singleClick = this.isSingleClick();
 
     if (singleClick) {
-      const selected = dragEntryItem.click();
+      const selected = dragEntryItem.click(event, element);
 
       if (selected) {
-        dragEntryItem.singleClick();
+        dragEntryItem.singleClick(event, element);
       }
 
       return;
@@ -263,7 +263,7 @@ class Explorer extends Element {
 
               this.clearClickedDragEntryItem();
 
-              dragEntryItem.click();
+              dragEntryItem.click(event, element);
             }, delay),
             clickedDragEntryItem = dragEntryItem; ///
 
@@ -280,10 +280,10 @@ class Explorer extends Element {
 
     this.clearClickedDragEntryItem();
 
-    dragEntryItem.doubleClick();
+    dragEntryItem.doubleClick(event, element);
   }
 
-  openFileNameDragEntryItem(fileNameDragEntryItem) {
+  openFileNameDragEntryItem(event, element, fileNameDragEntryItem) {
     const disabled = this.isDisabled();
 
     if (disabled) {
@@ -295,10 +295,10 @@ class Explorer extends Element {
           explorer = fileNameDragEntryItem.getExplorer(),
           customEventType = OPEN_CUSTOM_EVENT_TYPE;
 
-    this.callCustomHandlers(customEventType, filePath, explorer);
+    this.callCustomHandlers(customEventType, event, element, filePath, explorer);
   }
 
-  selectOrDeselectDragEntryItem(dragEntryItem) {
+  selectOrDeselectDragEntryItem(event, element, dragEntryItem) {
     const disabled = this.isDisabled();
 
     if (disabled) {
@@ -323,23 +323,23 @@ class Explorer extends Element {
           explorer = dragEntryItem.getExplorer(),
           customEventType = SELECT_CUSTOM_EVENT_TYPE;
 
-    this.callCustomHandlers(customEventType, path, selected, readOnly, explorer);
+    this.callCustomHandlers(customEventType, event, element, path, selected, readOnly, explorer);
 
     return selected;
   }
 
-  createDragEntryItem(dragEntryItem, done) {
+  createDragEntryItem(event, element, dragEntryItem, done) {
     const sourceEntryPath = sourceEntryPathFromEntryItem(dragEntryItem),
           targetEntryPath = targetEntryPathFromEntryItem(dragEntryItem),
           pathMaps = dragEntryItem.getPathMaps(sourceEntryPath, targetEntryPath),
           explorer = this;  ///
 
-    this.createDragEntryItems(pathMaps, explorer, () => {
+    this.createDragEntryItems(event, element, pathMaps, explorer, () => {
       done();
     });
   }
 
-  renameDragEntryItem(dragEntryItem, done) {
+  renameDragEntryItem(event, element, dragEntryItem, done) {
     let sourceEntryPath,
         targetEntryPath;
 
@@ -360,12 +360,12 @@ class Explorer extends Element {
 
     const explorer = this;  ///
 
-    this.renameDragEntryItems(pathMaps, explorer, () => {
+    this.renameDragEntryItems(event, element, pathMaps, explorer, () => {
       done();
     });
   }
 
-  dropDragEntryItem(dragEntryItem, done) {
+  dropDragEntryItem(event, element, dragEntryItem, done) {
     const dragEntryItemExplorer = dragEntryItem.getExplorer(),
           markerEntryItem = this.retrieveMarkerEntryItem(),
           sourceEntryPath = sourceEntryPathFromEntryItem(dragEntryItem),
@@ -382,17 +382,17 @@ class Explorer extends Element {
     const pathMaps = dragEntryItem.getPathMaps(sourceEntryPath, targetEntryPath),
           explorer = dragEntryItemExplorer; ///
 
-    this.moveDragEntryItems(pathMaps, explorer, () => {
+    this.moveDragEntryItems(event, element, pathMaps, explorer, () => {
       this.removeMarker();
 
       done();
     });
   }
 
-  renameDragEntryItems(pathMaps, explorer, done) {
+  renameDragEntryItems(event, element, pathMaps, explorer, done) {
     const customEventType = RENAME_CUSTOM_EVENT_TYPE;
 
-    this.callCustomHandlersAsync(customEventType, pathMaps, explorer, () => {
+    this.callCustomHandlersAsync(customEventType, event, element, pathMaps, explorer, () => {
       pathMaps.forEach((pathMap) => {
         this.removeDragEntryItem(pathMap, explorer);
       });
@@ -405,10 +405,10 @@ class Explorer extends Element {
     });
   }
 
-  moveDragEntryItems(pathMaps, explorer, done) {
+  moveDragEntryItems(event, element, pathMaps, explorer, done) {
     const customEventType = MOVE_CUSTOM_EVENT_TYPE;
 
-    this.callCustomHandlersAsync(customEventType, pathMaps, explorer, () => {
+    this.callCustomHandlersAsync(customEventType, event, element, pathMaps, explorer, () => {
       pathMaps.forEach((pathMap) => {
         this.removeDragEntryItem(pathMap, explorer);
       });
@@ -421,10 +421,10 @@ class Explorer extends Element {
     });
   }
 
-  removeDragEntryItems(pathMaps, explorer, done) {
+  removeDragEntryItems(event, element, pathMaps, explorer, done) {
     const customEventType = REMOVE_CUSTOM_EVENT_TYPE;
 
-    this.callCustomHandlersAsync(customEventType, pathMaps, explorer, () => {
+    this.callCustomHandlersAsync(customEventType, event, element, pathMaps, explorer, () => {
       pathMaps.forEach((pathMap) => {
         this.removeDragEntryItem(pathMap, explorer);
       });
@@ -437,10 +437,10 @@ class Explorer extends Element {
     });
   }
 
-  createDragEntryItems(pathMaps, explorer, done) {
+  createDragEntryItems(event, element, pathMaps, explorer, done) {
     const customEventType = CREATE_CUSTOM_EVENT_TYPE;
 
-    this.callCustomHandlersAsync(customEventType, pathMaps, explorer, () => {
+    this.callCustomHandlersAsync(customEventType, event, element, pathMaps, explorer, () => {
       pathMaps.forEach((pathMap) => {
         this.removeDragEntryItem(pathMap, explorer);
       });

package/src/item/entry/drag/directoryName.js

@@ -14,7 +14,7 @@ import { FILE_NAME_DRAG_ENTRY_TYPE, FILE_NAME_MARKER_ENTRY_TYPE, DIRECTORY_NAME_
 const { concatenatePaths } = pathUtilities;
 
 export default class DirectoryNameDragEntryItem extends DragEntryItem {
-	dragOverCustomHandler = (dragElement, element) => {
+	dragOverCustomHandler = (event, element, dragElement) => {
 		const collapsed = this.isCollapsed();
 
 		if (collapsed) {
@@ -45,7 +45,7 @@ export default class DirectoryNameDragEntryItem extends DragEntryItem {
 		}
 	}
 
-	dropCustomHandler = (dragElement, aborted, element, done) => {
+	dropCustomHandler = (event, element, dragElement, aborted, done) => {
     const dragEntryItem = dragElement,  ///
           markerEntryItem = this.retrieveMarkerEntryItem(),
           markerEntryItemExplorer = markerEntryItem.getExplorer();
@@ -58,10 +58,10 @@ export default class DirectoryNameDragEntryItem extends DragEntryItem {
       return;
     }
 
-    markerEntryItemExplorer.dropDragEntryItem(dragEntryItem, done);
+    markerEntryItemExplorer.dropDragEntryItem(event, element, dragEntryItem, done);
   }
 
-	doubleClick() {
+	doubleClick(event, element) {
 		let collapsed = this.isCollapsed();
 
 		collapsed = !collapsed;
@@ -71,7 +71,7 @@ export default class DirectoryNameDragEntryItem extends DragEntryItem {
 				this.expand();
 	}
 
-	singleClick() {
+	singleClick(event, element) {
 		this.expand();
 	}
 

package/src/item/entry/drag/fileName.js

@@ -8,19 +8,19 @@ import { nameIsBeforeEntryItemName } from "../../../utilities/name";
 import { FILE_NAME_DRAG_ENTRY_TYPE, DIRECTORY_NAME_DRAG_ENTRY_TYPE, FILE_NAME_MARKER_ENTRY_TYPE, DIRECTORY_NAME_MARKER_ENTRY_TYPE } from "../../../entryTypes";
 
 export default class FileNameDragEntryItem extends DragEntryItem {
-	openFileNameDragEntryItem() {
+	openFileNameDragEntryItem(event, element) {
 		const explorer = this.getExplorer(),
 					fileNameDragEntryItem = this;	///
 
-		explorer.openFileNameDragEntryItem(fileNameDragEntryItem);
+		explorer.openFileNameDragEntryItem(event, element, fileNameDragEntryItem);
 	}
 
-	doubleClick() {
-		this.openFileNameDragEntryItem();
+	doubleClick(event, element) {
+		this.openFileNameDragEntryItem(event, element);
 	}
 
-	singleClick() {
-		this.openFileNameDragEntryItem();
+	singleClick(event, element) {
+		this.openFileNameDragEntryItem(event, element);
 	}
 
 	isBefore(entryItem) {

package/src/item/entry/drag.js

@@ -28,14 +28,14 @@ class DragEntryItem extends EntryItem {
     const dragEntryItem = this; ///
 
     if (created) {
-      explorer.createDragEntryItem(dragEntryItem, () => {
+      explorer.createDragEntryItem(event, element, dragEntryItem, () => {
         this.reset();
       });
 
       return;
     }
 
-    explorer.renameDragEntryItem(dragEntryItem, () => {
+    explorer.renameDragEntryItem(event, element, dragEntryItem, () => {
       this.reset();
     });
   }
@@ -49,7 +49,7 @@ class DragEntryItem extends EntryItem {
     this.cancel(created);
   }
 
-  startDragCustomHandler = (element) => {
+  startDragCustomHandler = (event, element) => {
     const path = this.getPath(),
           type = this.getType(),
           explorer = this.getExplorer(),
@@ -59,7 +59,7 @@ class DragEntryItem extends EntryItem {
     explorer.addMarker(markerEntryItemPath, dragEntryItemType);
   }
 
-  stopDragCustomHandler = (dropElement, aborted, element, done) => {
+  stopDragCustomHandler = (event, element, dropElement, aborted, done) => {
     if (dropElement !== null) {
       done();
 
@@ -77,15 +77,15 @@ class DragEntryItem extends EntryItem {
       return;
     }
 
-    const dragEntryItem = element;  ///
+    const dragEntryItem = this;  ///
 
-    markerEntryItemExplorer.dropDragEntryItem(dragEntryItem, done);
+    markerEntryItemExplorer.dropDragEntryItem(event, element, dragEntryItem, done);
   }
 
-  click() {
+  click(event, element) {
     const explorer = this.getExplorer(),
           dragEntryItem = this, ///
-          selected = explorer.selectOrDeselectDragEntryItem(dragEntryItem);
+          selected = explorer.selectOrDeselectDragEntryItem(event, element, dragEntryItem);
 
     return selected;
   }

package/src/rubbishBin.js

@@ -17,30 +17,14 @@ import { sourceEntryPathFromEntryItem } from "./utilities/pathMap";
 import { DIRECTORY_NAME_DRAG_ENTRY_TYPE, FILE_NAME_DRAG_ENTRY_TYPE } from "./entryTypes";
 
 class RubbishBin extends Element {
-  dropCustomHandler = (dragElement, aborted, element, done) => {
-    const dragEntryItem = dragElement,  ///
-          markerEntryItem = this.retrieveMarkerEntryItem(),
-          markerEntryItemExplorer = markerEntryItem.getExplorer();
-
-    if (aborted) {
-      markerEntryItemExplorer.removeMarker();
-
-      done();
-
-      return;
-    }
-
-    markerEntryItemExplorer.dropDragEntryItem(dragEntryItem, done);
-  }
-
-  dragOverCustomHandler = (dragElement, element) => {
+  dragOverCustomHandler = (event, element, dragElement) => {
     const dragEntryItem = dragElement,  ///
           markerEntryItem = this.retrieveMarkerEntryItem();
 
     let markerEntryItemPath = markerEntryItem.getPath(),
-        markerEntryItemExplorer = markerEntryItem.getExplorer(),
-        previousMarkerEntryItemPath = markerEntryItemPath, ///
-        previousMarkerEntryItemExplorer = markerEntryItemExplorer; ///
+          markerEntryItemExplorer = markerEntryItem.getExplorer(),
+          previousMarkerEntryItemPath = markerEntryItemPath, ///
+          previousMarkerEntryItemExplorer = markerEntryItemExplorer; ///
 
     markerEntryItemPath = null; ///
 
@@ -55,6 +39,22 @@ class RubbishBin extends Element {
     }
   }
 
+  dropCustomHandler = (event, element, dragElement, aborted, done) => {
+    const dragEntryItem = dragElement,  ///
+          markerEntryItem = this.retrieveMarkerEntryItem(),
+          markerEntryItemExplorer = markerEntryItem.getExplorer();
+
+    if (aborted) {
+      markerEntryItemExplorer.removeMarker();
+
+      done();
+
+      return;
+    }
+
+    markerEntryItemExplorer.dropDragEntryItem(event, element, dragEntryItem, done);
+  }
+
   getReference() {
     const { reference = null } = this.properties;
 
@@ -134,24 +134,24 @@ class RubbishBin extends Element {
     });
   }
 
-  dropDragEntryItem(dragEntryItem, done) {
+  dropDragEntryItem(event, element, dragEntryItem, done) {
     const dragEntryItemExplorer = dragEntryItem.getExplorer(),
           sourceEntryPath = sourceEntryPathFromEntryItem(dragEntryItem),
           targetEntryPath = null,
           pathMaps = dragEntryItem.getPathMaps(sourceEntryPath, targetEntryPath),
           explorer = dragEntryItemExplorer;  ///
 
-    this.removeDragEntryItems(pathMaps, explorer, () => {
+    this.removeDragEntryItems(event, element, pathMaps, explorer, () => {
       this.removeMarker();
 
       done();
     });
   }
 
-  removeDragEntryItems(pathMaps, explorer, done) {
+  removeDragEntryItems(event, element, pathMaps, explorer, done) {
     const customEventType = REMOVE_CUSTOM_EVENT_TYPE;
 
-    this.callCustomHandlersAsync(customEventType, pathMaps, explorer, () => {
+    this.callCustomHandlersAsync(customEventType, event, element, pathMaps, explorer, () => {
       pathMaps.forEach((pathMap) => {
         this.removeDragEntryItem(pathMap, explorer)
       });

package/src/span/name.js

@@ -20,7 +20,7 @@ class NameSpan extends Element {
     if (keyCode === ENTER_KEY_CODE) {
       const customEventType = CHANGE_CUSTOM_EVENT_TYPE;
 
-      this.callCustomHandlers(customEventType);
+      this.callCustomHandlers(customEventType, event, element);
 
       event.preventDefault();
     }
@@ -28,7 +28,7 @@ class NameSpan extends Element {
     if (keyCode === ESCAPE_KEY_CODE) {
       const customEventType = CANCEL_CUSTOM_EVENT_TYPE;
 
-      this.callCustomHandlers(customEventType);
+      this.callCustomHandlers(customEventType, event, element);
 
       event.preventDefault();
     }