easy-file-system 1.5.17 → 1.5.19

package/lib/utilities/pathMap.js

@@ -9,11 +9,11 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    sourceEntryPathFromDragEntryItemPath: function() {
-        return sourceEntryPathFromDragEntryItemPath;
+    sourceEntryPathFromEntryItem: function() {
+        return sourceEntryPathFromEntryItem;
     },
-    targetEntryPathFromMarkerEntryItemPath: function() {
-        return targetEntryPathFromMarkerEntryItemPath;
+    targetEntryPathFromEntryItem: function() {
+        return targetEntryPathFromEntryItem;
     },
     adjustSourceEntryPath: function() {
         return adjustSourceEntryPath;
@@ -24,13 +24,13 @@ _export(exports, {
 });
 var _necessary = require("necessary");
 var _constants = require("../constants");
-var pathWithoutBottommostNameFromPath = _necessary.pathUtilities.pathWithoutBottommostNameFromPath;
-function sourceEntryPathFromDragEntryItemPath(dragEntryItemPath) {
-    var dragEntryItemPathWithoutBottommostName = pathWithoutBottommostNameFromPath(dragEntryItemPath), sourceEntryPath = nonNullPathFromName(dragEntryItemPathWithoutBottommostName); ///
+var concatenatePaths = _necessary.pathUtilities.concatenatePaths, pathWithoutBottommostNameFromPath = _necessary.pathUtilities.pathWithoutBottommostNameFromPath;
+function sourceEntryPathFromEntryItem(entryItem) {
+    var entryItemPath = entryItem.getPath(), entryItemPathWithoutBottommostName = pathWithoutBottommostNameFromPath(entryItemPath), sourceEntryPath = nonNullPathFromName(entryItemPathWithoutBottommostName); ///
     return sourceEntryPath;
 }
-function targetEntryPathFromMarkerEntryItemPath(markerEntryItemPath) {
-    var markerEntryItemPathWithoutBottommostName = pathWithoutBottommostNameFromPath(markerEntryItemPath), targetEntryPath = nonNullPathFromName(markerEntryItemPathWithoutBottommostName); ///
+function targetEntryPathFromEntryItem(entryItem) {
+    var entryItemPath = entryItem.getPath(), entryItemPathWithoutBottommostName = pathWithoutBottommostNameFromPath(entryItemPath), targetEntryPath = nonNullPathFromName(entryItemPathWithoutBottommostName); ///
     return targetEntryPath;
 }
 function adjustSourceEntryPath(sourceEntryPath, name) {
@@ -39,19 +39,19 @@ function adjustSourceEntryPath(sourceEntryPath, name) {
     } else if (sourceEntryPath === _constants.EMPTY_STRING) {
         sourceEntryPath = name; ///
     } else {
-        sourceEntryPath = "".concat(sourceEntryPath, "/").concat(name);
+        sourceEntryPath = concatenatePaths(sourceEntryPath, name);
     }
     return sourceEntryPath;
 }
-function adjustTargetEntryPath(targetEntryPath, name) {
+function adjustTargetEntryPath(targetEntryPath, nameInputName) {
     if (false) {
     ///
     } else if (targetEntryPath === null) {
         targetEntryPath = null;
     } else if (targetEntryPath === _constants.EMPTY_STRING) {
-        targetEntryPath = name; ///
+        targetEntryPath = nameInputName; ///
     } else {
-        targetEntryPath = "".concat(targetEntryPath, "/").concat(name);
+        targetEntryPath = concatenatePaths(targetEntryPath, nameInputName);
     }
     return targetEntryPath;
 }
@@ -60,4 +60,4 @@ function nonNullPathFromName(name) {
     return path;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvcGF0aE1hcC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgcGF0aFV0aWxpdGllcyB9IGZyb20gXCJuZWNlc3NhcnlcIjtcblxuaW1wb3J0IHsgRU1QVFlfU1RSSU5HIH0gZnJvbSBcIi4uL2NvbnN0YW50c1wiO1xuXG5jb25zdCB7IHBhdGhXaXRob3V0Qm90dG9tbW9zdE5hbWVGcm9tUGF0aCB9ID0gcGF0aFV0aWxpdGllcztcblxuZXhwb3J0IGZ1bmN0aW9uIHNvdXJjZUVudHJ5UGF0aEZyb21EcmFnRW50cnlJdGVtUGF0aChkcmFnRW50cnlJdGVtUGF0aCkge1xuICBjb25zdCBkcmFnRW50cnlJdGVtUGF0aFdpdGhvdXRCb3R0b21tb3N0TmFtZSA9IHBhdGhXaXRob3V0Qm90dG9tbW9zdE5hbWVGcm9tUGF0aChkcmFnRW50cnlJdGVtUGF0aCksXG4gICAgICAgIHNvdXJjZUVudHJ5UGF0aCA9IG5vbk51bGxQYXRoRnJvbU5hbWUoZHJhZ0VudHJ5SXRlbVBhdGhXaXRob3V0Qm90dG9tbW9zdE5hbWUpOyAvLy9cblxuICByZXR1cm4gc291cmNlRW50cnlQYXRoO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gdGFyZ2V0RW50cnlQYXRoRnJvbU1hcmtlckVudHJ5SXRlbVBhdGgobWFya2VyRW50cnlJdGVtUGF0aCkge1xuICBjb25zdCBtYXJrZXJFbnRyeUl0ZW1QYXRoV2l0aG91dEJvdHRvbW1vc3ROYW1lID0gcGF0aFdpdGhvdXRCb3R0b21tb3N0TmFtZUZyb21QYXRoKG1hcmtlckVudHJ5SXRlbVBhdGgpLFxuICAgICAgICB0YXJnZXRFbnRyeVBhdGggPSBub25OdWxsUGF0aEZyb21OYW1lKG1hcmtlckVudHJ5SXRlbVBhdGhXaXRob3V0Qm90dG9tbW9zdE5hbWUpOyAvLy9cblxuICByZXR1cm4gdGFyZ2V0RW50cnlQYXRoO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gYWRqdXN0U291cmNlRW50cnlQYXRoKHNvdXJjZUVudHJ5UGF0aCwgbmFtZSkge1xuICBpZiAoZmFsc2UpIHtcbiAgICAvLy9cbiAgfSBlbHNlIGlmIChzb3VyY2VFbnRyeVBhdGggPT09IEVNUFRZX1NUUklORykge1xuICAgIHNvdXJjZUVudHJ5UGF0aCA9IG5hbWU7ICAvLy9cbiAgfSBlbHNlIHtcbiAgICBzb3VyY2VFbnRyeVBhdGggPSBgJHtzb3VyY2VFbnRyeVBhdGh9LyR7bmFtZX1gO1xuICB9XG5cbiAgcmV0dXJuIHNvdXJjZUVudHJ5UGF0aDtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGFkanVzdFRhcmdldEVudHJ5UGF0aCh0YXJnZXRFbnRyeVBhdGgsIG5hbWUpIHtcbiAgaWYgKGZhbHNlKSB7XG4gICAgLy8vXG4gIH0gZWxzZSBpZiAodGFyZ2V0RW50cnlQYXRoID09PSBudWxsKSB7XG4gICAgdGFyZ2V0RW50cnlQYXRoID0gbnVsbDtcbiAgfSBlbHNlIGlmICh0YXJnZXRFbnRyeVBhdGggPT09IEVNUFRZX1NUUklORykge1xuICAgIHRhcmdldEVudHJ5UGF0aCA9IG5hbWU7ICAvLy9cbiAgfSBlbHNlIHtcbiAgICB0YXJnZXRFbnRyeVBhdGggPSBgJHt0YXJnZXRFbnRyeVBhdGh9LyR7bmFtZX1gO1xuICB9XG5cbiAgcmV0dXJuIHRhcmdldEVudHJ5UGF0aDtcbn1cblxuZnVuY3Rpb24gbm9uTnVsbFBhdGhGcm9tTmFtZShuYW1lKSB7XG4gIGNvbnN0IHBhdGggPSAobmFtZSAhPT0gbnVsbCkgP1xuICAgICAgICAgICAgICAgICAgbmFtZSA6ICAvLy9cbiAgICAgICAgICAgICAgICAgICAgRU1QVFlfU1RSSU5HO1xuXG4gIHJldHVybiBwYXRoO1xufVxuIl0sIm5hbWVzIjpbInNvdXJjZUVudHJ5UGF0aEZyb21EcmFnRW50cnlJdGVtUGF0aCIsInRhcmdldEVudHJ5UGF0aEZyb21NYXJrZXJFbnRyeUl0ZW1QYXRoIiwiYWRqdXN0U291cmNlRW50cnlQYXRoIiwiYWRqdXN0VGFyZ2V0RW50cnlQYXRoIiwicGF0aFdpdGhvdXRCb3R0b21tb3N0TmFtZUZyb21QYXRoIiwicGF0aFV0aWxpdGllcyIsImRyYWdFbnRyeUl0ZW1QYXRoIiwiZHJhZ0VudHJ5SXRlbVBhdGhXaXRob3V0Qm90dG9tbW9zdE5hbWUiLCJzb3VyY2VFbnRyeVBhdGgiLCJub25OdWxsUGF0aEZyb21OYW1lIiwibWFya2VyRW50cnlJdGVtUGF0aCIsIm1hcmtlckVudHJ5SXRlbVBhdGhXaXRob3V0Qm90dG9tbW9zdE5hbWUiLCJ0YXJnZXRFbnRyeVBhdGgiLCJuYW1lIiwiRU1QVFlfU1RSSU5HIiwicGF0aCJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7O0lBUWdCQSxvQ0FBb0M7ZUFBcENBOztJQU9BQyxzQ0FBc0M7ZUFBdENBOztJQU9BQyxxQkFBcUI7ZUFBckJBOztJQVlBQyxxQkFBcUI7ZUFBckJBOzs7eUJBaENjO3lCQUVEO0FBRTdCLElBQU0sQUFBRUMsb0NBQXNDQyx3QkFBYSxDQUFuREQ7QUFFRCxTQUFTSixxQ0FBcUNNLGlCQUFpQixFQUFFO0lBQ3RFLElBQU1DLHlDQUF5Q0gsa0NBQWtDRSxvQkFDM0VFLGtCQUFrQkMsb0JBQW9CRix5Q0FBeUMsR0FBRztJQUV4RixPQUFPQztBQUNUO0FBRU8sU0FBU1AsdUNBQXVDUyxtQkFBbUIsRUFBRTtJQUMxRSxJQUFNQywyQ0FBMkNQLGtDQUFrQ00sc0JBQzdFRSxrQkFBa0JILG9CQUFvQkUsMkNBQTJDLEdBQUc7SUFFMUYsT0FBT0M7QUFDVDtBQUVPLFNBQVNWLHNCQUFzQk0sZUFBZSxFQUFFSyxJQUFJLEVBQUU7SUFDM0QsSUFBSSxLQUFLLEVBQUU7SUFDVCxHQUFHO0lBQ0wsT0FBTyxJQUFJTCxvQkFBb0JNLHVCQUFZLEVBQUU7UUFDM0NOLGtCQUFrQkssTUFBTyxHQUFHO0lBQzlCLE9BQU87UUFDTEwsa0JBQWtCLEFBQUMsR0FBcUJLLE9BQW5CTCxpQkFBZ0IsS0FBUSxPQUFMSztJQUMxQyxDQUFDO0lBRUQsT0FBT0w7QUFDVDtBQUVPLFNBQVNMLHNCQUFzQlMsZUFBZSxFQUFFQyxJQUFJLEVBQUU7SUFDM0QsSUFBSSxLQUFLLEVBQUU7SUFDVCxHQUFHO0lBQ0wsT0FBTyxJQUFJRCxvQkFBb0IsSUFBSSxFQUFFO1FBQ25DQSxrQkFBa0IsSUFBSTtJQUN4QixPQUFPLElBQUlBLG9CQUFvQkUsdUJBQVksRUFBRTtRQUMzQ0Ysa0JBQWtCQyxNQUFPLEdBQUc7SUFDOUIsT0FBTztRQUNMRCxrQkFBa0IsQUFBQyxHQUFxQkMsT0FBbkJELGlCQUFnQixLQUFRLE9BQUxDO0lBQzFDLENBQUM7SUFFRCxPQUFPRDtBQUNUO0FBRUEsU0FBU0gsb0JBQW9CSSxJQUFJLEVBQUU7SUFDakMsSUFBTUUsT0FBTyxBQUFDRixTQUFTLElBQUksR0FDWEEsT0FDRUMsdUJBQVk7SUFFOUIsT0FBT0M7QUFDVCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvcGF0aE1hcC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgcGF0aFV0aWxpdGllcyB9IGZyb20gXCJuZWNlc3NhcnlcIjtcblxuaW1wb3J0IHsgRU1QVFlfU1RSSU5HIH0gZnJvbSBcIi4uL2NvbnN0YW50c1wiO1xuXG5jb25zdCB7IGNvbmNhdGVuYXRlUGF0aHMsIHBhdGhXaXRob3V0Qm90dG9tbW9zdE5hbWVGcm9tUGF0aCB9ID0gcGF0aFV0aWxpdGllcztcblxuZXhwb3J0IGZ1bmN0aW9uIHNvdXJjZUVudHJ5UGF0aEZyb21FbnRyeUl0ZW0oZW50cnlJdGVtKSB7XG4gIGNvbnN0IGVudHJ5SXRlbVBhdGggPSBlbnRyeUl0ZW0uZ2V0UGF0aCgpLFxuICAgICAgICBlbnRyeUl0ZW1QYXRoV2l0aG91dEJvdHRvbW1vc3ROYW1lID0gcGF0aFdpdGhvdXRCb3R0b21tb3N0TmFtZUZyb21QYXRoKGVudHJ5SXRlbVBhdGgpLFxuICAgICAgICBzb3VyY2VFbnRyeVBhdGggPSBub25OdWxsUGF0aEZyb21OYW1lKGVudHJ5SXRlbVBhdGhXaXRob3V0Qm90dG9tbW9zdE5hbWUpOyAvLy9cblxuICByZXR1cm4gc291cmNlRW50cnlQYXRoO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gdGFyZ2V0RW50cnlQYXRoRnJvbUVudHJ5SXRlbShlbnRyeUl0ZW0pIHtcbiAgY29uc3QgZW50cnlJdGVtUGF0aCA9IGVudHJ5SXRlbS5nZXRQYXRoKCksXG4gICAgICAgIGVudHJ5SXRlbVBhdGhXaXRob3V0Qm90dG9tbW9zdE5hbWUgPSBwYXRoV2l0aG91dEJvdHRvbW1vc3ROYW1lRnJvbVBhdGgoZW50cnlJdGVtUGF0aCksXG4gICAgICAgIHRhcmdldEVudHJ5UGF0aCA9IG5vbk51bGxQYXRoRnJvbU5hbWUoZW50cnlJdGVtUGF0aFdpdGhvdXRCb3R0b21tb3N0TmFtZSk7IC8vL1xuXG4gIHJldHVybiB0YXJnZXRFbnRyeVBhdGg7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBhZGp1c3RTb3VyY2VFbnRyeVBhdGgoc291cmNlRW50cnlQYXRoLCBuYW1lKSB7XG4gIGlmIChmYWxzZSkge1xuICAgIC8vL1xuICB9IGVsc2UgaWYgKHNvdXJjZUVudHJ5UGF0aCA9PT0gRU1QVFlfU1RSSU5HKSB7XG4gICAgc291cmNlRW50cnlQYXRoID0gbmFtZTsgIC8vL1xuICB9IGVsc2Uge1xuICAgIHNvdXJjZUVudHJ5UGF0aCA9IGNvbmNhdGVuYXRlUGF0aHMoc291cmNlRW50cnlQYXRoLCBuYW1lKTtcbiAgfVxuXG4gIHJldHVybiBzb3VyY2VFbnRyeVBhdGg7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBhZGp1c3RUYXJnZXRFbnRyeVBhdGgodGFyZ2V0RW50cnlQYXRoLCBuYW1lSW5wdXROYW1lKSB7XG4gIGlmIChmYWxzZSkge1xuICAgIC8vL1xuICB9IGVsc2UgaWYgKHRhcmdldEVudHJ5UGF0aCA9PT0gbnVsbCkge1xuICAgIHRhcmdldEVudHJ5UGF0aCA9IG51bGw7XG4gIH0gZWxzZSBpZiAodGFyZ2V0RW50cnlQYXRoID09PSBFTVBUWV9TVFJJTkcpIHtcbiAgICB0YXJnZXRFbnRyeVBhdGggPSBuYW1lSW5wdXROYW1lOyAgLy8vXG4gIH0gZWxzZSB7XG4gICAgdGFyZ2V0RW50cnlQYXRoID0gY29uY2F0ZW5hdGVQYXRocyh0YXJnZXRFbnRyeVBhdGgsIG5hbWVJbnB1dE5hbWUpO1xuICB9XG5cbiAgcmV0dXJuIHRhcmdldEVudHJ5UGF0aDtcbn1cblxuZnVuY3Rpb24gbm9uTnVsbFBhdGhGcm9tTmFtZShuYW1lKSB7XG4gIGNvbnN0IHBhdGggPSAobmFtZSAhPT0gbnVsbCkgP1xuICAgICAgICAgICAgICAgICAgbmFtZSA6ICAvLy9cbiAgICAgICAgICAgICAgICAgICAgRU1QVFlfU1RSSU5HO1xuXG4gIHJldHVybiBwYXRoO1xufVxuIl0sIm5hbWVzIjpbInNvdXJjZUVudHJ5UGF0aEZyb21FbnRyeUl0ZW0iLCJ0YXJnZXRFbnRyeVBhdGhGcm9tRW50cnlJdGVtIiwiYWRqdXN0U291cmNlRW50cnlQYXRoIiwiYWRqdXN0VGFyZ2V0RW50cnlQYXRoIiwiY29uY2F0ZW5hdGVQYXRocyIsInBhdGhVdGlsaXRpZXMiLCJwYXRoV2l0aG91dEJvdHRvbW1vc3ROYW1lRnJvbVBhdGgiLCJlbnRyeUl0ZW0iLCJlbnRyeUl0ZW1QYXRoIiwiZ2V0UGF0aCIsImVudHJ5SXRlbVBhdGhXaXRob3V0Qm90dG9tbW9zdE5hbWUiLCJzb3VyY2VFbnRyeVBhdGgiLCJub25OdWxsUGF0aEZyb21OYW1lIiwidGFyZ2V0RW50cnlQYXRoIiwibmFtZSIsIkVNUFRZX1NUUklORyIsIm5hbWVJbnB1dE5hbWUiLCJwYXRoIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7SUFRZ0JBLDRCQUE0QjtlQUE1QkE7O0lBUUFDLDRCQUE0QjtlQUE1QkE7O0lBUUFDLHFCQUFxQjtlQUFyQkE7O0lBWUFDLHFCQUFxQjtlQUFyQkE7Ozt5QkFsQ2M7eUJBRUQ7QUFFN0IsSUFBUUMsbUJBQXdEQyx3QkFBYSxDQUFyRUQsa0JBQWtCRSxvQ0FBc0NELHdCQUFhLENBQW5EQztBQUVuQixTQUFTTiw2QkFBNkJPLFNBQVMsRUFBRTtJQUN0RCxJQUFNQyxnQkFBZ0JELFVBQVVFLE9BQU8sSUFDakNDLHFDQUFxQ0osa0NBQWtDRSxnQkFDdkVHLGtCQUFrQkMsb0JBQW9CRixxQ0FBcUMsR0FBRztJQUVwRixPQUFPQztBQUNUO0FBRU8sU0FBU1YsNkJBQTZCTSxTQUFTLEVBQUU7SUFDdEQsSUFBTUMsZ0JBQWdCRCxVQUFVRSxPQUFPLElBQ2pDQyxxQ0FBcUNKLGtDQUFrQ0UsZ0JBQ3ZFSyxrQkFBa0JELG9CQUFvQkYscUNBQXFDLEdBQUc7SUFFcEYsT0FBT0c7QUFDVDtBQUVPLFNBQVNYLHNCQUFzQlMsZUFBZSxFQUFFRyxJQUFJLEVBQUU7SUFDM0QsSUFBSSxLQUFLLEVBQUU7SUFDVCxHQUFHO0lBQ0wsT0FBTyxJQUFJSCxvQkFBb0JJLHVCQUFZLEVBQUU7UUFDM0NKLGtCQUFrQkcsTUFBTyxHQUFHO0lBQzlCLE9BQU87UUFDTEgsa0JBQWtCUCxpQkFBaUJPLGlCQUFpQkc7SUFDdEQsQ0FBQztJQUVELE9BQU9IO0FBQ1Q7QUFFTyxTQUFTUixzQkFBc0JVLGVBQWUsRUFBRUcsYUFBYSxFQUFFO0lBQ3BFLElBQUksS0FBSyxFQUFFO0lBQ1QsR0FBRztJQUNMLE9BQU8sSUFBSUgsb0JBQW9CLElBQUksRUFBRTtRQUNuQ0Esa0JBQWtCLElBQUk7SUFDeEIsT0FBTyxJQUFJQSxvQkFBb0JFLHVCQUFZLEVBQUU7UUFDM0NGLGtCQUFrQkcsZUFBZ0IsR0FBRztJQUN2QyxPQUFPO1FBQ0xILGtCQUFrQlQsaUJBQWlCUyxpQkFBaUJHO0lBQ3RELENBQUM7SUFFRCxPQUFPSDtBQUNUO0FBRUEsU0FBU0Qsb0JBQW9CRSxJQUFJLEVBQUU7SUFDakMsSUFBTUcsT0FBTyxBQUFDSCxTQUFTLElBQUksR0FDWEEsT0FDRUMsdUJBQVk7SUFFOUIsT0FBT0U7QUFDVCJ9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "easy-file-system",
   "author": "James Smith",
-  "version": "1.5.17",
+  "version": "1.5.19",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/easy-file-system",
   "description": "A file system explorer and a rubbish bin.",

package/src/button/name.js

@@ -41,15 +41,11 @@ class NameButton extends Button {
 
   parentContext() {
     const showNameButton = this.show.bind(this), ///
-          hideNameButton = this.hide.bind(this), ///
-          getNameButtonName = this.getName.bind(this), ///
-          setNameButtonName = this.setName.bind(this);  ///
+          hideNameButton = this.hide.bind(this);  ///
 
     return ({
       showNameButton,
-      hideNameButton,
-      getNameButtonName,
-      setNameButtonName
+      hideNameButton
     });
   }
 

package/src/example/view.js

@@ -16,6 +16,7 @@ export default class View extends Element {
           secondExplorer = this.getSecondExplorer();
 
     firstExplorer.editSelectedPath();
+
     secondExplorer.editSelectedPath();
   }
 
@@ -35,10 +36,10 @@ export default class View extends Element {
     done();
   }
 
-  pathChangeHandler = (oldPath, newPath, callback) => {
-    const success = true;
+  pathChangeHandler = (pathMaps, done) => {
+    console.log("remove", JSON.stringify(pathMaps, null, "  "))
 
-    callback(success);
+    done();
   }
 
   getExplorers() {

package/src/explorer.js

@@ -5,9 +5,9 @@ import withStyle from "easy-with-style";  ///
 import { Element } from "easy";
 import { dropMixins } from "easy-drag-and-drop";
 
-import eventMixins from "./mixins/event";
 import EntriesList from "./list/entries";
 import DragEntryItem from "./item/entry/drag";
+import explorerMixins from "./mixins/explorer";
 import FileNameDragEntryItem from "./item/entry/drag/fileName";
 import FileNameMarkerEntryItem from "./item/entry/marker/fileName";
 import DirectoryNameDragEntryItem from "./item/entry/drag/directoryName";
@@ -15,7 +15,7 @@ import DirectoryNameMarkerEntryItem from "./item/entry/marker/directoryName";
 
 import { explorerPadding } from "./styles";
 import { FILE_NAME_DRAG_ENTRY_TYPE, DIRECTORY_NAME_DRAG_ENTRY_TYPE } from "./entryTypes";
-import { sourceEntryPathFromDragEntryItemPath, targetEntryPathFromMarkerEntryItemPath } from "./utilities/pathMap";
+import { sourceEntryPathFromEntryItem, targetEntryPathFromEntryItem } from "./utilities/pathMap";
 
 class Explorer extends Element {
   constructor(selector, mounted) {
@@ -213,13 +213,23 @@ class Explorer extends Element {
     this.callSelectHandlers(path, selected);
   }
 
+  renameDragEntryItem(dragEntryItem, done) {
+    const dragEntryItemExplorer = dragEntryItem.getExplorer(),
+          sourceEntryPath = sourceEntryPathFromEntryItem(dragEntryItem),
+          targetEntryPath = targetEntryPathFromEntryItem(dragEntryItem),
+          pathMaps = dragEntryItem.getPathMaps(sourceEntryPath, targetEntryPath),
+          explorer = dragEntryItemExplorer;  ///
+
+    this.moveDragEntryItems(pathMaps, explorer, () => {
+      done();
+    });
+  }
+
   dropDragEntryItem(dragEntryItem, done) {
     const markerEntryItem = this.retrieveMarkerEntryItem(),
-          dragEntryItemPath = dragEntryItem.getPath(),
-          markerEntryItemPath = markerEntryItem.getPath(),
           dragEntryItemExplorer = dragEntryItem.getExplorer(),
-          sourceEntryPath = sourceEntryPathFromDragEntryItemPath(dragEntryItemPath),
-          targetEntryPath = targetEntryPathFromMarkerEntryItemPath(markerEntryItemPath),
+          sourceEntryPath = sourceEntryPathFromEntryItem(dragEntryItem),
+          targetEntryPath = targetEntryPathFromEntryItem(markerEntryItem),
           pathMaps = dragEntryItem.getPathMaps(sourceEntryPath, targetEntryPath),
           explorer = dragEntryItemExplorer;  ///
 
@@ -415,7 +425,7 @@ class Explorer extends Element {
 }
 
 Object.assign(Explorer.prototype, dropMixins);
-Object.assign(Explorer.prototype, eventMixins);
+Object.assign(Explorer.prototype, explorerMixins);
 
 export default withStyle(Explorer)`
   

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

@@ -1,6 +1,7 @@
 "use strict";
 
 import { dropMixins } from "easy-drag-and-drop";
+import { pathUtilities } from "necessary";
 
 import ToggleButton from "../../../button/toggle";
 import DragEntryItem from "../../../item/entry/drag";
@@ -10,6 +11,8 @@ import DirectoryNameEntryItemDiv from "../../../div/item/entry/directoryName";
 import { adjustSourceEntryPath, adjustTargetEntryPath } from "../../../utilities/pathMap";
 import { FILE_NAME_DRAG_ENTRY_TYPE, FILE_NAME_MARKER_ENTRY_TYPE, DIRECTORY_NAME_DRAG_ENTRY_TYPE, DIRECTORY_NAME_MARKER_ENTRY_TYPE } from "../../../entryTypes";
 
+const { concatenatePaths } = pathUtilities;
+
 export default class DirectoryNameDragEntryItem extends DragEntryItem {
   dropHandler = (dragElement, aborted, element, done) => {
     const dragElementDragEntryItem = (dragElement instanceof DragEntryItem);
@@ -66,7 +69,7 @@ export default class DirectoryNameDragEntryItem extends DragEntryItem {
         previousMarkerEntryItemPath = markerEntryItemPath, ///
         previousMarkerEntryItemExplorer = markerEntryItemExplorer; ///
 
-    markerEntryItemPath = `${path}/${dragEntryItemName}`;
+    markerEntryItemPath = concatenatePaths(path, dragEntryItemName);
 
     markerEntryItemExplorer = explorer;  ///
 
@@ -104,19 +107,6 @@ export default class DirectoryNameDragEntryItem extends DragEntryItem {
 		return before;
 	}
 
-	getPathMap(sourceEntryPath, targetEntryPath) {
-		const pathMap = super.getPathMap(sourceEntryPath, targetEntryPath),
-					collapsed = this.isCollapsed(),
-					entryDirectory = true;
-
-		Object.assign(pathMap, {
-			collapsed,
-			entryDirectory
-		});
-
-		return pathMap;
-	}
-
 	isCollapsed() {
 		const entriesListCollapsed = this.isEntriesListCollapsed(),
 					collapsed = entriesListCollapsed;	///
@@ -124,14 +114,22 @@ export default class DirectoryNameDragEntryItem extends DragEntryItem {
 		return collapsed;
 	}
 
+  isEntryDirectory() {
+    const entryDirectory = true;
+
+    return entryDirectory;
+  }
+
 	retrievePathMaps(sourceEntryPath, targetEntryPath, pathMaps) {
 		const name = this.getName(),
-					pathMap = this.getPathMap(sourceEntryPath, targetEntryPath);
+					pathMap = this.getPathMap(sourceEntryPath, targetEntryPath),
+          nameInputName = this.getNameInputName();
 
 		pathMaps.push(pathMap);
 
 		sourceEntryPath = adjustSourceEntryPath(sourceEntryPath, name);
-		targetEntryPath = adjustTargetEntryPath(targetEntryPath, name);
+
+		targetEntryPath = adjustTargetEntryPath(targetEntryPath, nameInputName);
 
 		this.forEachDragEntryItem((dragEntryItem) => {
 			dragEntryItem.retrievePathMaps(sourceEntryPath, targetEntryPath, pathMaps);
@@ -209,11 +207,11 @@ export default class DirectoryNameDragEntryItem extends DragEntryItem {
 		]);
 	}
 
-	static ToggleButton = ToggleButton;
+  static type = DIRECTORY_NAME_DRAG_ENTRY_TYPE;
 
-	static DirectoryNameSVG = DirectoryNameSVG;
+  static ToggleButton = ToggleButton;
 
-	static type = DIRECTORY_NAME_DRAG_ENTRY_TYPE;
+	static DirectoryNameSVG = DirectoryNameSVG;
 
 	static defaultProperties = {
     className: "directory-name"

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

@@ -40,16 +40,17 @@ export default class FileNameDragEntryItem extends DragEntryItem {
 		return fileName;
 	}
 
-	getPathMap(sourceEntryPath, targetEntryPath) {
-		const pathMap = super.getPathMap(sourceEntryPath, targetEntryPath),
-					entryDirectory = false;
+  isCollapsed() {
+    const collapsed = null; ///
 
-		Object.assign(pathMap, {
-			entryDirectory
-		});
+    return collapsed;
+  }
 
-		return pathMap;
-	}
+  isEntryDirectory() {
+    const entryDirectory = false;
+
+    return entryDirectory;
+  }
 
 	retrievePathMaps(sourceEntryPath, targetEntryPath, pathMaps) {
 		const pathMap = this.getPathMap(sourceEntryPath, targetEntryPath);
@@ -76,10 +77,10 @@ export default class FileNameDragEntryItem extends DragEntryItem {
 		);
   }
 
-	static FileNameSVG = FileNameSVG;
-
   static type = FILE_NAME_DRAG_ENTRY_TYPE;
 
+  static FileNameSVG = FileNameSVG;
+
   static defaultProperties = {
     className: "file-name"
   };

package/src/item/entry/drag.js

@@ -32,14 +32,11 @@ class DragEntryItem extends EntryItem {
       return;
     }
 
-    const oldPath = this.getOldPath(),
-          newPath = this.getNewPath(),
-          explorer = this.getExplorer();
-
-    explorer.callPathChangeHandlersAsync(oldPath, newPath, (success) => {
-      success ?
-        this.update() :
-          this.cancel();
+    const explorer = this.getExplorer(),
+          dragEntryItem = this; ///
+
+    explorer.renameDragEntryItem(dragEntryItem, () => {
+      this.cancel();
     });
   }
 
@@ -80,56 +77,37 @@ class DragEntryItem extends EntryItem {
     markerEntryItemExplorer.dropDragEntryItem(dragEntryItem, done);
   }
 
-  getName() {
-    const nameButtonName = this.getNameButtonName(),
-          name = nameButtonName;  ///
-
-    return name;
-  }
-
-  getOldName() {
-    const nameButtonName = this.getNameButtonName(),
-          oldName = nameButtonName;  ///
-
-    return oldName;
-  }
-
-  getNewName() {
+  getInputName() {
     const nameInputName = this.getNameInputName(),
-          oldName = nameInputName;  ///
-
-    return oldName;
-  }
-
-  getOldPath() {
-    const path = this.getPath(),
-          oldName = this.getOldName(),
-          pathWithoutBottommostName = pathWithoutBottommostNameFromPath(path),
-          oldPath = (pathWithoutBottommostName === null) ?
-                      oldName :
-                        concatenatePaths(pathWithoutBottommostName, oldName);
+          inputName = nameInputName;  ///
 
-    return oldPath;
+    return inputName;
   }
 
-  getNewPath() {
+  getInputPath() {
     const path = this.getPath(),
-          newName = this.getNewName(),
+          inputName = this.getInputName(),
           pathWithoutBottommostName = pathWithoutBottommostNameFromPath(path),
-          newPath = (pathWithoutBottommostName === null) ?
-                      newName :
-                        concatenatePaths(pathWithoutBottommostName, newName);
+          inputPath = (pathWithoutBottommostName === null) ?
+                        inputName :
+                          concatenatePaths(pathWithoutBottommostName, inputName);
 
-    return newPath;
+    return inputPath;
   }
 
   getPathMap(sourceEntryPath, targetEntryPath) {
-    const name = this.getName();
+    const name = this.getName(),
+          collapsed = this.isCollapsed(),
+          nameInputName = this.getNameInputName(),
+          entryDirectory = this.isEntryDirectory();
 
     sourceEntryPath = adjustSourceEntryPath(sourceEntryPath, name);	///
-    targetEntryPath = adjustTargetEntryPath(targetEntryPath, name);	///
+
+    targetEntryPath = adjustTargetEntryPath(targetEntryPath, nameInputName);	///
 
     const pathMap = {
+      collapsed,
+      entryDirectory,
       sourceEntryPath,
       targetEntryPath
     };
@@ -148,9 +126,9 @@ class DragEntryItem extends EntryItem {
   }
 
   hasNameChanged() {
-    const newName = this.getOldName(),
-          oldName = this.getNewName(),
-          nameChanged = (newName !== oldName);
+    const name = this.getName(),
+          inputName = this.getInputName(),
+          nameChanged = (inputName !== name);
 
     return nameChanged;
   }
@@ -181,8 +159,8 @@ class DragEntryItem extends EntryItem {
   }
 
   cancel() {
-    const nameButtonName = this.getNameButtonName(),
-          nameInputName = nameButtonName; ///
+    const name = this.getName(),
+          nameInputName = name; ///
 
     this.setNameInputName(nameInputName);
 
@@ -190,24 +168,6 @@ class DragEntryItem extends EntryItem {
     this.hideNameInput();
   }
 
-  update() {
-    const nameInputName = this.getNameInputName(),
-          nameButtonName = nameInputName; ///
-
-    this.setNameButtonName(nameButtonName);
-
-    this.showNameButton();
-    this.hideNameInput();
-
-    const parentElement = this.getParentElement(),
-          entriesList = parentElement,  ///
-          entryItem = this; ///
-
-    entriesList.removeEntryItem(entryItem);
-
-    entriesList.addEntryItem(entryItem);
-  }
-
   didMount() {
     this.hideNameInput();
 

package/src/item/entry.js

@@ -2,11 +2,12 @@
 
 import withStyle from "easy-with-style";  ///
 
-import { arrayUtilities } from "necessary";
+import { pathUtilities, arrayUtilities } from "necessary";
 
 import { Element } from "easy";
 
-const { first } = arrayUtilities;
+const { first } = arrayUtilities,
+      { concatenatePaths } = pathUtilities;
 
 class EntryItem extends Element {
   getParentDirectoryNameDragEntryItem() {
@@ -36,7 +37,7 @@ class EntryItem extends Element {
   	} else {
   		const parentDirectoryNameDragEntryItemPath = parentDirectoryNameDragEntryItem.getPath();
 
-  		path = `${parentDirectoryNameDragEntryItemPath}/${name}`;
+  		path = concatenatePaths(parentDirectoryNameDragEntryItemPath, name);
   	}
 
   	return path;

package/src/mixins/{event.js → explorer.js}

@@ -92,33 +92,23 @@ function callMoveHandlersAsync(pathMaps, done) {
 
   forEach(eventListeners, (eventListener, next) => {
     const { handler, element } = eventListener,
-        moveHandler = handler,  ///
-        done = next;  ///
+          moveHandler = handler,  ///
+          done = next;  ///
 
     moveHandler.call(element, pathMaps, done);
   }, done);
 }
 
-function callPathChangeHandlersAsync(oldPath, newPath, callback) {
-  let notSuccess = false;
-
-  const done = () => {
-          const success = !notSuccess;
-
-          callback(success);
-        },
-        eventType = PATH_CHANGE_EVENT_TYPE,
+function callPathChangeHandlersAsync(pathMap, done) {
+  const eventType = PATH_CHANGE_EVENT_TYPE,
         eventListeners = this.findEventListeners(eventType);
 
   forEach(eventListeners, (eventListener, next) => {
     const { handler, element } = eventListener,
-          pathChangeHandler = handler;  ///
-
-    pathChangeHandler.call(element, oldPath, newPath, (success) => {
-      notSuccess = !success;
+          pathChangeHandler = handler,  ///
+          done = next;  ///
 
-      next();
-    });
+    pathChangeHandler.call(element, pathMap, done);
   }, done);
 }
 

package/src/mixins/rubbishBin.js

@@ -0,0 +1,42 @@
+"use strict";
+
+import { asynchronousUtilities } from "necessary";
+
+import { REMOVE_EVENT_TYPE } from "../eventTypes";
+
+const { forEach } = asynchronousUtilities;
+
+function onRemove(removeHandler, element) {
+  const eventType = REMOVE_EVENT_TYPE,
+      handler = removeHandler;  ///
+
+  this.addEventListener(eventType, handler, element);
+}
+
+function offRemove(removeHandler, element) {
+  const eventType = REMOVE_EVENT_TYPE,
+        handler = removeHandler;  ///
+
+  this.removeEventListener(eventType, handler, element);
+}
+
+function callRemoveHandlersAsync(pathMaps, done) {
+  const eventType = REMOVE_EVENT_TYPE,
+        eventListeners = this.findEventListeners(eventType);
+
+  forEach(eventListeners, (eventListener, next) => {
+    const { handler, element } = eventListener,
+          removeHandler = handler,  ///
+          done = next;  ///
+
+    removeHandler.call(element, pathMaps, done);
+  }, done);
+}
+
+const rubbishBinMixins = {
+  onRemove,
+  offRemove,
+  callRemoveHandlersAsync
+};
+
+export default rubbishBinMixins;

package/src/rubbishBin.js

@@ -4,21 +4,18 @@ import withStyle from "easy-with-style";  ///
 
 import { Element } from "easy";
 import { dropMixins } from "easy-drag-and-drop";
-import { asynchronousUtilities } from "necessary";
 
 import DragEntryItem from "./item/entry/drag";
+import rubbishBinMixins from "./mixins/rubbishBin";
 import OpenRubbishBinSVG from "./svg/rubbishBin/open";
 import ClosedRubbishBinSVG from "./svg/rubbishBin/closed";
 import FileNameMarkerEntryItem from "./item/entry/marker/fileName";
 import DirectoryNameMarkerEntryItem from "./item/entry/marker/directoryName";
 
-import { REMOVE_EVENT_TYPE } from "./eventTypes";
 import { nonNullPathFromName } from "./utilities/pathMap";
-import { sourceEntryPathFromDragEntryItemPath } from "./utilities/pathMap";
+import { sourceEntryPathFromEntryItem } from "./utilities/pathMap";
 import { DIRECTORY_NAME_DRAG_ENTRY_TYPE, FILE_NAME_DRAG_ENTRY_TYPE } from "./entryTypes";
 
-const { forEach } = asynchronousUtilities;
-
 class RubbishBin extends Element {
   dropHandler = (dragElement, aborted, element, done) => {
     const dragElementDragEntryItem = (dragElement instanceof DragEntryItem);
@@ -161,24 +158,9 @@ class RubbishBin extends Element {
     });
   }
 
-  onRemove(removeHandler, element) {
-    const eventType = REMOVE_EVENT_TYPE,
-          handler = removeHandler;  ///
-
-    this.addEventListener(eventType, handler, element);
-  }
-
-  offRemove(removeHandler, element) {
-    const eventType = REMOVE_EVENT_TYPE,
-          handler = removeHandler;  ///
-
-    this.removeEventListener(eventType, handler, element);
-  }
-
   dropDragEntryItem(dragEntryItem, done) {
-    const dragEntryItemPath = dragEntryItem.getPath(),
-          dragEntryItemExplorer = dragEntryItem.getExplorer(),
-          sourceEntryPath = sourceEntryPathFromDragEntryItemPath(dragEntryItemPath),
+    const dragEntryItemExplorer = dragEntryItem.getExplorer(),
+          sourceEntryPath = sourceEntryPathFromEntryItem(dragEntryItem),
           targetEntryPath = null,
           pathMaps = dragEntryItem.getPathMaps(sourceEntryPath, targetEntryPath),
           explorer = dragEntryItemExplorer;  ///
@@ -230,19 +212,6 @@ class RubbishBin extends Element {
     explorer.removeDirectoryPath(directoryPath);
   }
 
-  callRemoveHandlersAsync(pathMaps, done) {
-    const eventType = REMOVE_EVENT_TYPE,
-          eventListeners = this.findEventListeners(eventType);
-
-    forEach(eventListeners, (eventListener, next) => {
-      const { handler, element } = eventListener,
-          removeHandler = handler,  ///
-          done = next;  ///
-
-      removeHandler.call(element, pathMaps, done);
-    }, done);
-  }
-
   open() {
     this.showOpenRubbishBinSVG();
     this.hideClosedRubbishBinSVG();
@@ -347,6 +316,7 @@ class RubbishBin extends Element {
 }
 
 Object.assign(RubbishBin.prototype, dropMixins);
+Object.assign(RubbishBin.prototype, rubbishBinMixins);
 
 export default withStyle(RubbishBin)`
   

package/src/styles.js

@@ -1,7 +1,7 @@
 "use strict";
 
-export const markerSVGHeight = "2rem";
 export const explorerPadding = "2rem";
+export const markerSVGHeight = "2rem";
 export const toggleSVGHeight = "2rem";
 export const fileNameSVGHeight = "2rem";
 export const rubbishBinSVGHeight = "4rem";