easy-file-system 2.1.145 → 2.1.148

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "easy-file-system",
   "author": "James Smith",
-  "version": "2.1.145",
+  "version": "2.1.148",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/easy-file-system",
   "description": "A file system explorer and a rubbish bin.",
@@ -10,8 +10,9 @@
     "url": "https://github.com/djalbat/easy-file-system"
   },
   "dependencies": {
-    "easy": "^15.1.1",
-    "easy-drag-and-drop": "^1.3.79",
+    "easy": "^15.1.10",
+    "easy-drag-and-drop": "^1.3.84",
+    "easy-layout": "^6.0.85",
     "easy-with-style": "^3.0.273",
     "necessary": "^13.1.4"
   },

package/src/customEventTypes.js

@@ -0,0 +1,10 @@
+"use strict";
+
+export const OPEN_CUSTOM_EVENT_TYPE = "open-custom";
+export const MOVE_CUSTOM_EVENT_TYPE = "move-custom";
+export const CHANGE_CUSTOM_EVENT_TYPE = "change-custom";
+export const CANCEL_CUSTOM_EVENT_TYPE = "cancel-custom";
+export const SELECT_CUSTOM_EVENT_TYPE = "select-custom";
+export const RENAME_CUSTOM_EVENT_TYPE = "rename-custom";
+export const REMOVE_CUSTOM_EVENT_TYPE = "remove-custom";
+export const CREATE_CUSTOM_EVENT_TYPE = "create-custom";

package/src/example/view.js

@@ -35,35 +35,35 @@ export default class View extends Element {
     firstExplorer.renameSelectedPath();
   }
 
-  openHandler = (filePath, explorer) => {
+  openCustomHandler = (filePath, explorer) => {
     console.log("open", filePath)
   }
 
-  moveHandler = (pathMaps, explorer, done) => {
+  moveCustomHandler = (pathMaps, explorer, element, done) => {
     console.log("move", JSON.stringify(pathMaps, null, "  "))
 
     done();
   }
 
-  removeHandler = (pathMaps, explorer, done) => {
+  removeCustomHandler = (pathMaps, explorer, element, done) => {
     console.log("remove", JSON.stringify(pathMaps, null, "  "))
 
     done();
   }
 
-  renameHandler = (pathMaps, explorer, done) => {
+  renameCustomHandler = (pathMaps, explorer, element, done) => {
     console.log("rename", JSON.stringify(pathMaps, null, "  "))
 
     done();
   }
 
-  createHandler = (pathMaps, explorer, done) => {
+  createCustomHandler = (pathMaps, explorer, element, done) => {
     console.log("create", JSON.stringify(pathMaps, null, "  "))
 
     done();
   }
 
-  selectHandler = (path, selected, readOnly, explorer) => {
+  selectCustomHandler = (path, selected, readOnly, explorer) => {
     console.log("select", path, selected, readOnly)
   }
 
@@ -91,19 +91,19 @@ export default class View extends Element {
   childElements() {
     return ([
 
-      <RubbishBin onRemove={this.removeHandler} />,
-      <FirstExplorer onOpen={this.openHandler}
-                     onMove={this.moveHandler}
-                     onRemove={this.removeHandler}
-                     onRename={this.renameHandler}
-                     onCreate={this.createHandler}
-                     onSelect={this.selectHandler}
+      <RubbishBin onCustomRemove={this.removeCustomHandler} />,
+      <FirstExplorer onCustomOpen={this.openCustomHandler}
+                     onCustomMove={this.moveCustomHandler}
+                     onCustomRemove={this.removeCustomHandler}
+                     onCustomRename={this.renameCustomHandler}
+                     onCustomCreate={this.createCustomHandler}
+                     onCustomSelect={this.selectCustomHandler}
       />,
-      <SecondExplorer onOpen={this.openHandler}
-                      onMove={this.moveHandler}
-                      onRename={this.renameHandler}
-                      onRemove={this.removeHandler}
-                      onCreate={this.createHandler}
+      <SecondExplorer onCustomOpen={this.openCustomHandler}
+                      onCustomMove={this.moveCustomHandler}
+                      onCustomRename={this.renameCustomHandler}
+                      onCustomRemove={this.removeCustomHandler}
+                      onCustomCreate={this.createCustomHandler}
       />,
       <Button onClick={this.renameSelectedButtonClickHandler}>
         Rename selected path

package/src/explorer.js

@@ -18,11 +18,17 @@ import { explorerPadding } from "./styles";
 import { PERIOD, DOUBLE_CLICK_DELAY } from "./constants";
 import { FILE_NAME_DRAG_ENTRY_TYPE, DIRECTORY_NAME_DRAG_ENTRY_TYPE } from "./entryTypes";
 import { sourceEntryPathFromEntryItem, targetEntryPathFromEntryItem } from "./utilities/pathMap";
+import { MOVE_CUSTOM_EVENT_TYPE,
+         OPEN_CUSTOM_EVENT_TYPE,
+         REMOVE_CUSTOM_EVENT_TYPE,
+         RENAME_CUSTOM_EVENT_TYPE,
+         SELECT_CUSTOM_EVENT_TYPE,
+         CREATE_CUSTOM_EVENT_TYPE } from "./customEventTypes";
 
 const { concatenatePaths, pathWithoutBottommostNameFromPath } = pathUtilities;
 
 class Explorer extends Element {
-  dragOverHandler = (dragElement, element) => {
+  dragOverCustomHandler = (dragElement, element) => {
     const dragEntryItem = dragElement,  ///
           markerEntryItem = this.retrieveMarkerEntryItem(),
           dragEntryItemName = dragEntryItem.getName();
@@ -45,7 +51,7 @@ class Explorer extends Element {
     }
   }
 
-  dropHandler = (dragElement, aborted, element, done) => {
+  dropCustomHandler = (dragElement, aborted, element, done) => {
     const markerEntryItem = this.retrieveMarkerEntryItem(),
           markerEntryItemExplorer = markerEntryItem.getExplorer();
 
@@ -285,9 +291,10 @@ class Explorer extends Element {
 
     const fileNameDragEntryItemPath = fileNameDragEntryItem.getPath(),
           filePath = fileNameDragEntryItemPath, ///
-          explorer = fileNameDragEntryItem.getExplorer();
+          explorer = fileNameDragEntryItem.getExplorer(),
+          customEventType = OPEN_CUSTOM_EVENT_TYPE;
 
-    this.callOpenHandlers(filePath, explorer);
+    this.callCustomHandlers(customEventType, filePath, explorer);
   }
 
   selectOrDeselectDragEntryItem(dragEntryItem) {
@@ -312,9 +319,10 @@ class Explorer extends Element {
     selected = !selected; ///
 
     const readOnly = dragEntryItem.isReadOnly(),
-          explorer = dragEntryItem.getExplorer();
+          explorer = dragEntryItem.getExplorer(),
+          customEventType = SELECT_CUSTOM_EVENT_TYPE;
 
-    this.callSelectHandlers(path, selected, readOnly, explorer);
+    this.callCustomHandlers(customEventType, path, selected, readOnly, explorer);
 
     return selected;
   }
@@ -382,7 +390,9 @@ class Explorer extends Element {
   }
 
   renameDragEntryItems(pathMaps, explorer, done) {
-    this.callRenameHandlersAsync(pathMaps, explorer, () => {
+    const customEventType = RENAME_CUSTOM_EVENT_TYPE;
+
+    this.callCustomHandlersAsync(customEventType, pathMaps, explorer, () => {
       pathMaps.forEach((pathMap) => {
         this.removeDragEntryItem(pathMap, explorer);
       });
@@ -396,7 +406,9 @@ class Explorer extends Element {
   }
 
   moveDragEntryItems(pathMaps, explorer, done) {
-    this.callMoveHandlersAsync(pathMaps, explorer, () => {
+    const customEventType = MOVE_CUSTOM_EVENT_TYPE;
+
+    this.callCustomHandlersAsync(customEventType, pathMaps, explorer, () => {
       pathMaps.forEach((pathMap) => {
         this.removeDragEntryItem(pathMap, explorer);
       });
@@ -410,7 +422,9 @@ class Explorer extends Element {
   }
 
   removeDragEntryItems(pathMaps, explorer, done) {
-    this.callRemoveHandlersAsync(pathMaps, explorer, () => {
+    const customEventType = REMOVE_CUSTOM_EVENT_TYPE;
+
+    this.callCustomHandlersAsync(customEventType, pathMaps, explorer, () => {
       pathMaps.forEach((pathMap) => {
         this.removeDragEntryItem(pathMap, explorer);
       });
@@ -424,7 +438,9 @@ class Explorer extends Element {
   }
 
   createDragEntryItems(pathMaps, explorer, done) {
-    this.callCreateHandlersAsync(pathMaps, explorer, () => {
+    const customEventType = CREATE_CUSTOM_EVENT_TYPE;
+
+    this.callCustomHandlersAsync(customEventType, pathMaps, explorer, () => {
       pathMaps.forEach((pathMap) => {
         this.removeDragEntryItem(pathMap, explorer);
       });
@@ -558,30 +574,15 @@ class Explorer extends Element {
   }
 
   didMount() {
-    const { onMove, onOpen, onSelect, onCreate, onRename, singleClick = false } = this.properties,
-          moveHandler = onMove, ///
-          openHandler = onOpen, ///
-          createHandler = onCreate, ///
-          renameHandler = onRename, ///
-          selectHandler = onSelect; ///
+    const { singleClick = false } = this.properties;
 
     this.setSingleClick(singleClick);
 
     this.enableDrop();
 
-    this.onDragOver(this.dragOverHandler);
-
-    this.onDrop(this.dropHandler);
-
-    moveHandler && this.onMove(moveHandler);
-
-    openHandler && this.onOpen(openHandler);
-
-    createHandler && this.onCreate(createHandler);
+    this.onCustomDragOver(this.dragOverCustomHandler);
 
-    renameHandler && this.onRename(renameHandler);
-
-    selectHandler && this.onSelect(selectHandler);
+    this.onCustomDrop(this.dropCustomHandler);
 
     const mounted = true;
 
@@ -589,28 +590,11 @@ class Explorer extends Element {
   }
 
   willUnmount() {
-    const { onMove, onOpen, onSelect, onCreate, onRename } = this.properties,
-          moveHandler = onMove, ///
-          openHandler = onOpen, ///
-          createHandler = onCreate, ///
-          renameHandler = onRename, ///
-          selectHandler = onSelect; ///
-
     this.disableDrop();
 
-    this.offDragOver(this.dragOverHandler);
-
-    this.offDrop(this.dropHandler);
-
-    moveHandler && this.offMove(moveHandler);
-
-    openHandler && this.offOpen(openHandler);
-
-    createHandler && this.offCreate(createHandler);
-
-    renameHandler && this.offRename(renameHandler);
+    this.offCustomDragOver(this.dragOverCustomHandler);
 
-    selectHandler && this.offSelect(selectHandler);
+    this.offCustomDrop(this.dropCustomHandler);
 
     const mounted = false;
 
@@ -662,11 +646,6 @@ class Explorer extends Element {
   static tagName = "div";
 
   static ignoredProperties = [
-    "onMove",
-    "onOpen",
-    "onRename",
-    "onSelect",
-    "onCreate",
     "reference",
     "references",
     "singleClick"

package/src/index.js

@@ -3,8 +3,6 @@
 export { default as Explorer } from "./explorer";
 export { default as RubbishBin } from "./rubbishBin";
 
-export { default as eventTypes } from "./eventTypes";
-
 export { default as NameSpan } from "./span/name";
 export { default as EntriesList } from "./list/entries";
 export { default as ToggleButton } from "./button/toggle";

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 {
-	dragOverHandler = (dragElement, element) => {
+	dragOverCustomHandler = (dragElement, element) => {
 		const collapsed = this.isCollapsed();
 
 		if (collapsed) {
@@ -45,7 +45,7 @@ export default class DirectoryNameDragEntryItem extends DragEntryItem {
 		}
 	}
 
-	dropHandler = (dragElement, aborted, element, done) => {
+	dropCustomHandler = (dragElement, aborted, element, done) => {
     const dragEntryItem = dragElement,  ///
           markerEntryItem = this.retrieveMarkerEntryItem(),
           markerEntryItemExplorer = markerEntryItem.getExplorer();
@@ -172,9 +172,9 @@ export default class DirectoryNameDragEntryItem extends DragEntryItem {
 
 		this.enableDrop();
 
-		this.onDrop(this.dropHandler);
+		this.onCustomDrop(this.dropCustomHandler);
 
-		this.onDragOver(this.dragOverHandler);
+		this.onCustomDragOver(this.dragOverCustomHandler);
 
 		super.didMount();
 	}
@@ -182,9 +182,9 @@ export default class DirectoryNameDragEntryItem extends DragEntryItem {
 	willUnmount() {
 		this.disableDrop();
 
-		this.offDrop(this.dropHandler);
+		this.offCustomDrop(this.dropCustomHandler);
 
-		this.offDragOver(this.dragOverHandler);
+		this.offCustomDragOver(this.dragOverCustomHandler);
 
 		super.willUnmount();
 	}

package/src/item/entry/drag.js

@@ -12,7 +12,7 @@ import { DIRECTORY_NAME_DRAG_ENTRY_TYPE } from "../../entryTypes";
 import { adjustSourceEntryPath, adjustTargetEntryPath } from "../../utilities/pathMap";
 
 class DragEntryItem extends EntryItem {
-  nameSpanChangeHandler = (event, element) => {
+  nameSpanChangeCustomHandler = (event, element) => {
     const created = this.isCreated(),
           explorer = this.getExplorer(),
           nameSpanName = this.getNameSpanName();
@@ -40,7 +40,7 @@ class DragEntryItem extends EntryItem {
     });
   }
 
-  nameSpanCancelHandler = (event, element) => {
+  nameSpanCancelCustomHandler = (event, element) => {
     const created = this.isCreated(),
           explorer = this.getExplorer();
 
@@ -49,7 +49,7 @@ class DragEntryItem extends EntryItem {
     this.cancel(created);
   }
 
-  startDragHandler = (element) => {
+  startDragCustomHandler = (element) => {
     const path = this.getPath(),
           type = this.getType(),
           explorer = this.getExplorer(),
@@ -59,7 +59,7 @@ class DragEntryItem extends EntryItem {
     explorer.addMarker(markerEntryItemPath, dragEntryItemType);
   }
 
-  stopDragHandler = (dropElement, aborted, element, done) => {
+  stopDragCustomHandler = (dropElement, aborted, element, done) => {
     if (dropElement !== null) {
       done();
 
@@ -227,25 +227,25 @@ class DragEntryItem extends EntryItem {
   }
 
   didMount() {
-    this.onStopDrag(this.stopDragHandler);
+    this.onCustomStopDrag(this.stopDragCustomHandler);
 
-    this.onStartDrag(this.startDragHandler);
+    this.onCustomStartDrag(this.startDragCustomHandler);
 
-    this.onNameSpanChange(this.nameSpanChangeHandler);
+    this.onCustomNameSpanChange(this.nameSpanChangeCustomHandler);
 
-    this.onNameSpanCancel(this.nameSpanCancelHandler);
+    this.onCustomNameSpanCancel(this.nameSpanCancelCustomHandler);
 
     this.enableDrag();
 	}
 
 	willUnmount() {
-    this.offStopDrag(this.stopDragHandler);
+    this.offCustomStopDrag(this.stopDragCustomHandler);
 
-    this.offStartDrag(this.startDragHandler);
+    this.offCustomStartDrag(this.startDragCustomHandler);
 
-    this.offNameSpanChange(this.nameSpanChangeHandler);
+    this.offCustomNameSpanChange(this.nameSpanChangeCustomHandler);
 
-    this.offNameSpanCancel(this.nameSpanCancelHandler);
+    this.offCustomNameSpanCancel(this.nameSpanCancelCustomHandler);
 
     this.disableDrag();
 	}

package/src/list/entries.js

@@ -80,11 +80,14 @@ class EntriesList extends Element {
   }
 
   selectPath(path) {
+    let dragEntryItem = null;
+
     const topmostDirectoryName = topmostDirectoryNameFromPath(path);
 
     if (topmostDirectoryName === null) {
-      const name = path,  ///
-            dragEntryItem = this.findDragEntryItem(name);
+      const name = path;  ///
+
+      dragEntryItem = this.findDragEntryItem(name);
 
       if (dragEntryItem !== null) {
         dragEntryItem.select();
@@ -99,9 +102,11 @@ class EntriesList extends Element {
 
         topmostDirectoryNameDragEntryItem.expand();
 
-        topmostDirectoryNameDragEntryItem.selectPath(path);
+        dragEntryItem = topmostDirectoryNameDragEntryItem.selectPath(path);
       }
     }
+
+    return dragEntryItem;
   }
 
   addFilePath(filePath, readOnly = false) {