@syncfusion/ej2-filemanager 28.1.33 → 28.1.39

package/dist/es6/ej2-filemanager.es2015.js

@@ -1712,9 +1712,9 @@ function getDirectoryPath(parent, args) {
     const fPath = getValue(parent.hasId && !isNullOrUndefined(parent.ajaxSettings.url) ? 'filterId' : 'filterPath', args.cwd);
     if (!isNullOrUndefined(fPath)) {
         if (fPath === '') {
-            return parent.hasId && !isNullOrUndefined(parent.ajaxSettings.url) ? filePath : '/';
+            return '/';
         }
-        return fPath.replace(/\\/g, '/') + filePath;
+        return fPath.replace(/\\/g, '/').replace(/^.*?(?=\/)/, '') + filePath;
     }
     else {
         return isFileSystemData(parent) ? filePath : parent.path + filePath;
@@ -2619,7 +2619,7 @@ function createNewItem(data, target, itemName, isCopy) {
         }
     }
     const currentDate = new Date();
-    const folderPath = target.id !== 0 ? target.filterPath + target.name : '\\';
+    const folderPath = String(target.id) !== String(0) && !isNullOrUndefined(target.parentId) ? target.filterPath + target.name + '\\' : '\\';
     Object.assign(newItem, {
         dateCreated: currentDate,
         dateModified: currentDate,
@@ -2753,7 +2753,9 @@ function triggerRenameOperation(parent, data, eventArgs) {
         if (isFileSystemData(parent)) {
             if (!isFileExists(parent.fileSystemData, args.newName)) {
                 const fileData = filterById(parent, args.itemData[0].id);
+                const oldName = fileData.name;
                 fileData.name = args.newName;
+                updateChildrenFilterPath(parent, fileData.id, oldName, args.newName);
             }
             else {
                 const message = 'Cannot rename' + args.itemData[0].name + 'to' + args.newName + ': destination already exists.';
@@ -2762,6 +2764,26 @@ function triggerRenameOperation(parent, data, eventArgs) {
         }
     });
 }
+/**
+ * Function to update child item filter path.
+ *
+ * @param {IFileManager} parent - specifies the parent element.
+ * @param {string | number} parentId - specifies the parent id.
+ * @param {string} oldName - specifies the previous name.
+ * @param {string} newName - specifies the new name.
+ * @returns {void}
+ * @private
+ */
+function updateChildrenFilterPath(parent, parentId, oldName, newName) {
+    parent.fileSystemData.forEach((item) => {
+        if (String(item.parentId) === String(parentId)) {
+            const oldPath = item.filterPath;
+            const newPath = oldPath.replace(oldName + '\\', newName + '\\');
+            item.filterPath = newPath;
+            updateChildrenFilterPath(parent, item.id, oldName, newName);
+        }
+    });
+}
 /**
  * Function to trigger move or copy operation.
  *
@@ -2824,11 +2846,16 @@ function triggerMoveOrCopyOperation(parent, data, eventArgs) {
                     if (!isFileExists(getTargetFiles, currItem.name) || getValue('renameFiles', data).length > 0) {
                         if (!target.hasChild) {
                             target.hasChild = !currItem.isFile;
+                            const targetItem = parent.fileSystemData
+                                .filter((item) => String(item.id) === String(target.id));
+                            if (targetItem.length > 0) {
+                                targetItem[0].hasChild = target.hasChild;
+                            }
                         }
                         if (!currItem.isFile) {
                             //Check whether the source folder include other sub folders or not.
                             const subItems = currItem.parentId !== 0
-                                ? filterByParent(parent, currItem.parentID) : [];
+                                ? filterByParent(parent, currItem.parentId) : [];
                             const itemData = filterById(parent, currItem.parentId);
                             itemData.hasChild = subItems.length > 1 ? true : false;
                         }
@@ -2951,7 +2978,6 @@ function createAjax(parent, data, fn, event, operation, targetPath) {
                     ? getValue('path', data) : parent.path;
                 const pathArray = filePath.replace(/^\/|\/$/g, '').split('/');
                 const idValue = event === 'rename-end-parent' || (event === 'path-changed' && getValue('data', data).length !== 0 && isNullOrUndefined(parent.renamedItem))
-                    || (event === 'paste-end' && (parent.targetModule === 'largeiconsview' || parent.targetModule === 'detailsview'))
                     ? getValue('data', data)[0].id : pathArray[pathArray.length - 1];
                 const action = getValue('action', data);
                 const isFileOperation = (action === 'move' || action === 'rename' || action === 'copy' || action === 'delete' || action === 'search') && event !== 'rename-end';
@@ -9972,7 +9998,7 @@ class NavigationPane {
         if (!this.renameParent) {
             this.parent.activeModule = 'navigationpane';
             const nodeData = this.getTreeData(getValue('id', args.nodeData));
-            if (args.node.getAttribute('data-uid') !== this.parent.pathId[this.parent.pathId.length - 1] && !this.isRightClick && !this.isNodeClickCalled || this.isSameNodeClicked) {
+            if (args.node.getAttribute('data-uid') !== this.parent.pathId[this.parent.pathId.length - 1] && !this.isRightClick && !this.isNodeClickCalled || this.isSameNodeClicked || this.isPathDragged) {
                 this.isNodeClickCalled = false;
                 if (!this.isSameNodeClicked) {
                     this.isSameNodeClicked = true;
@@ -9988,6 +10014,7 @@ class NavigationPane {
                     this.restrictSelecting = this.isNodeClickCalled ? this.previousSelected[0] !== args.node.getAttribute('data-uid') : false;
                     this.isNodeClickCalled = true;
                     this.isSameNodeClicked = false;
+                    this.isPathDragged = false;
                     this.previousSelected = this.treeObj.selectedNodes;
                     this.treeObj.setProperties({ selectedNodes: [args.node.getAttribute('data-uid')] });
                 }
@@ -10297,6 +10324,15 @@ class NavigationPane {
         this.removeChildNodes(e.selectedNode);
     }
     onDragEnd(args) {
+        if (isFileSystemData(this.parent)) {
+            this.moveNames = [];
+            const obj = this.parent.dragData;
+            for (let i = 0; i < obj.length; i++) {
+                if (getValue('isFile', obj[i]) === false) {
+                    this.moveNames.push(getValue('_fm_id', obj[i]));
+                }
+            }
+        }
         let moveNames = [];
         if (this.parent.isPasteError || this.parent.isSearchDrag) {
             moveNames = this.getMoveNames(args.files, this.parent.isSearchDrag, this.parent.dragPath);
@@ -10402,11 +10438,6 @@ class NavigationPane {
         if (isFileSystemData(this.parent) && (this.parent.path === this.parent.dropPath || this.parent.targetModule === 'navigationpane')) {
             return;
         }
-        if (this.parent.hasId) {
-            this.parent.isDropEnd = !this.parent.isPasteError;
-            readDropPath(this.parent);
-            return;
-        }
         if ((this.parent.dropPath.indexOf(getDirectoryPath(this.parent, args)) === -1)) {
             this.parent.isDropEnd = false;
             readDropPath(this.parent);