@syncfusion/ej2-filemanager 21.1.37 → 21.1.39

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

@@ -1313,7 +1313,7 @@ function sortbyClickHandler(parent, args) {
         tick = false;
     }
     if (!tick) {
-        parent.sortBy = getSortField(args.item.id);
+        parent.sortBy = getSortField(args.item.id, parent);
     }
     else {
         parent.sortOrder = getSortField(args.item.id);
@@ -1340,12 +1340,24 @@ function sortbyClickHandler(parent, args) {
  * @returns {string} - returns the sorted fields
  * @private
  */
-function getSortField(id) {
+function getSortField(id, parent) {
     const text = id.substring(id.lastIndexOf('_') + 1);
     let field = text;
+    let column;
+    if (parent) {
+        column = parent.detailsViewSettings.columns;
+    }
     switch (text) {
         case 'date':
-            field = '_fm_modified';
+            for (let i = 0, len = column.length; i < len; i++) {
+                if (column[i].field === 'dateModified' || column[i].field === 'dateCreated') {
+                    field = column[i].field;
+                    break;
+                }
+                else {
+                    field = '_fm_modified';
+                }
+            }
             break;
         case 'ascending':
             field = 'Ascending';
@@ -2545,10 +2557,15 @@ function renameSuccess(parent, result, path) {
         const args = { action: 'rename', result: result };
         parent.trigger('success', args);
         parent.renamedItem = result.files[0];
+        if (getValue('filterPath', parent.renamedItem) === getValue('filterPath', parent.itemData[0]) && parent.pathNames.length > 1) {
+            parent.pathNames[parent.pathNames.length - 1] = parent.renameText;
+        }
         if (parent.activeModule === 'navigationpane') {
             parent.pathId.pop();
             parent.itemData = [getValue(parent.pathId[parent.pathId.length - 1], parent.feParent)];
-            read(parent, renameEndParent, getParentPath(parent.path));
+            read(parent, renameEndParent, getValue('filterPath', parent.renamedItem).replace(/\\/g, '/'));
+            parent.itemData[0] = parent.renamedItem;
+            read(parent, pathChanged, parent.path === '/' ? parent.path : getValue('filterPath', parent.renamedItem).replace(/\\/g, '/') + parent.renamedItem.name + '/');
         }
         else {
             parent.itemData = [getPathObject(parent)];
@@ -3563,7 +3580,8 @@ function onReSubmit(parent) {
         parent.dialogObj.hide();
         return;
     }
-    const newPath = (parent.activeModule === 'navigationpane') ? getParentPath(parent.path) : parent.path;
+    const newPath = (parent.activeModule === 'navigationpane') ? getValue('filterPath', parent.itemData[0]).replace(/\\/g, '/') : parent.path;
+    parent.renamedId = getValue('id', parent.itemData[0]);
     parent.renamedId = getValue('id', parent.itemData[0]);
     if (parent.isFile) {
         const oldExtension = (oIndex === -1) ? '' : parent.currentItemText.substr(oIndex);
@@ -7892,7 +7910,12 @@ class Toolbar$1 {
                     items[itemCount].iconCss = this.parent.sortBy === 'size' ? TB_OPTION_DOT : '';
                 }
                 else if (items[itemCount].id === this.getPupupId('date')) {
-                    items[itemCount].iconCss = this.parent.sortBy === '_fm_modified' ? TB_OPTION_DOT : '';
+                    if (this.parent.sortBy === 'dateModified' || this.parent.sortBy === 'dateCreated') {
+                        items[itemCount].iconCss = this.parent.sortBy === this.parent.sortBy ? TB_OPTION_DOT : '';
+                    }
+                    else {
+                        items[itemCount].iconCss = this.parent.sortBy === '_fm_modified' ? TB_OPTION_DOT : '';
+                    }
                 }
                 else if (items[itemCount].id === this.getPupupId('ascending')) {
                     items[itemCount].iconCss = this.parent.sortOrder === 'Ascending' ? TB_OPTION_TICK : '';
@@ -8425,6 +8448,7 @@ class NavigationPane {
         this.isRenameParent = false;
         this.isRightClick = false;
         this.isSameNodeClicked = false;
+        this.isNodeExpandCalled = false;
         this.renameParent = null;
         // Specifies the previously selected nodes in the treeview control.
         this.previousSelected = null;
@@ -8595,7 +8619,7 @@ class NavigationPane {
                     const selecEventArgs = { action: args.action, fileDetails: nodeData[0], isInteracted: args.isInteracted };
                     this.parent.trigger('fileSelect', selecEventArgs);
                 }
-                if (!this.isRightClick) {
+                if (!this.isRightClick && args.node.getAttribute('data-uid') !== this.parent.pathId[this.parent.pathId.length - 1]) {
                     const eventArgs = { cancel: false, fileDetails: nodeData[0], module: 'NavigationPane' };
                     this.parent.trigger('fileOpen', eventArgs);
                     args.cancel = eventArgs.cancel;
@@ -8693,12 +8717,14 @@ class NavigationPane {
             this.parent.expandedId = this.expandNodeTarget;
             this.parent.itemData = this.getTreeData(getValue('id', args.nodeData));
             read(this.parent, nodeExpand, path);
+            this.isNodeExpandCalled = true;
         }
     }
     /* istanbul ignore next */
     onNodeExpanded(args) {
         this.addChild(args.files, this.expandNodeTarget, false);
         this.parent.expandedId = null;
+        this.isNodeExpandCalled = false;
     }
     onNodeClicked(args) {
         this.parent.activeModule = 'navigationpane';
@@ -8714,7 +8740,7 @@ class NavigationPane {
             const layout = (this.parent.view === 'LargeIcons') ? 'largeiconsview' : 'detailsview';
             this.parent.notify(modelChanged, { module: layout, newProp: { selectedItems: [] } });
         }
-        else if (args.node.getAttribute('data-uid') === this.treeObj.selectedNodes[0] && !this.isNodeClickCalled) {
+        else if (args.node.getAttribute('data-uid') === this.treeObj.selectedNodes[0] && !this.isNodeClickCalled && !this.isNodeExpandCalled) {
             if (args.event.which === 3) {
                 this.isRightClick = true;
             }