@syncfusion/ej2-filemanager 21.1.35 → 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);
@@ -5953,10 +5971,11 @@ class ContextMenu$2 {
         this.menuType = 'folder';
         this.contextMenu.items = this.getItemData(this.parent.contextMenuSettings.folder.map((item) => item.trim()));
         this.contextMenu.dataBind();
-        if (isTree) {
+        const selectedTreeNode = select('[data-uid="' + this.parent.navigationpaneModule.treeObj.selectedNodes[0] + '"]', this.parent.navigationpaneModule.treeObj.element);
+        if (this.parent.pathNames[this.parent.pathNames.length - 1] === selectedTreeNode.querySelector('.e-list-text').innerHTML && this.parent.activeModule === 'navigationpane') {
             this.disabledItems.push('Open');
         }
-        else if (this.parent.selectedItems.length !== 1) {
+        else if (this.parent.selectedItems.length !== 1 && this.parent.activeModule !== 'navigationpane') {
             this.disabledItems.push('Rename', 'Paste');
         }
     }
@@ -6099,10 +6118,13 @@ class ContextMenu$2 {
                         refresh(this.parent);
                         break;
                     case 'open':
-                        if (this.parent.visitedItem) {
+                        if (this.parent.visitedItem && this.parent.activeModule !== 'navigationpane') {
                             this.parent.notify(openInit, { target: this.parent.visitedItem });
                         }
                         else if (this.parent.activeModule === 'navigationpane') {
+                            if (this.parent.visitedItem) {
+                                this.parent.notify(openInit, { target: this.parent.visitedItem });
+                            }
                             this.parent.navigationpaneModule.openFileOnContextMenuClick(closest(this.targetNodeElement, 'li'));
                         }
                         break;
@@ -7888,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 : '';
@@ -8420,6 +8447,8 @@ class NavigationPane {
         this.isPathDragged = false;
         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;
@@ -8574,7 +8603,7 @@ class NavigationPane {
     }
     // Node Selecting event handler
     onNodeSelecting(args) {
-        if (!args.isInteracted && !this.isRightClick && !this.isPathDragged && !this.isRenameParent || this.restrictSelecting) {
+        if (!args.isInteracted && !this.isRightClick && !this.isSameNodeClicked && !this.isPathDragged && !this.isRenameParent || this.restrictSelecting) {
             this.restrictSelecting = false;
             this.isNodeClickCalled = false;
             return;
@@ -8583,19 +8612,30 @@ class NavigationPane {
             this.parent.activeModule = 'navigationpane';
             // eslint-disable-next-line
             const nodeData = this.getTreeData(getValue('id', args.nodeData));
-            const eventArgs = { cancel: false, fileDetails: nodeData[0], module: 'NavigationPane' };
-            this.parent.trigger('fileOpen', eventArgs);
-            const selecEventArgs = { action: args.action, fileDetails: nodeData[0], isInteracted: args.isInteracted };
-            this.parent.trigger('fileSelect', selecEventArgs);
-            args.cancel = eventArgs.cancel;
-            if (args.cancel) {
-                this.restrictSelecting = this.isNodeClickCalled ? this.previousSelected[0] !== args.node.getAttribute('data-uid') : false;
-                this.previousSelected = this.treeObj.selectedNodes;
-                this.treeObj.selectedNodes = [args.node.getAttribute("data-uid")];
-                if (!isNullOrUndefined(this.parent) && !isNullOrUndefined(this.parent.contextmenuModule)) {
-                    this.parent.contextmenuModule.contextMenu.enableItems(['Open'], true);
+            if (args.node.getAttribute('data-uid') !== this.parent.pathId[this.parent.pathId.length - 1] && !this.isRightClick && !this.isNodeClickCalled || this.isSameNodeClicked) {
+                this.isNodeClickCalled = false;
+                if (!this.isSameNodeClicked) {
+                    this.isSameNodeClicked = true;
+                    const selecEventArgs = { action: args.action, fileDetails: nodeData[0], isInteracted: args.isInteracted };
+                    this.parent.trigger('fileSelect', selecEventArgs);
+                }
+                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;
+                }
+                if (args.cancel) {
+                    this.restrictSelecting = this.isNodeClickCalled ? this.previousSelected[0] !== args.node.getAttribute('data-uid') : false;
+                    this.isNodeClickCalled = true;
+                    this.isSameNodeClicked = false;
+                    this.previousSelected = this.treeObj.selectedNodes;
+                    this.treeObj.selectedNodes = [args.node.getAttribute("data-uid")];
                 }
             }
+            else if (this.previousSelected[0] !== args.node.getAttribute('data-uid')) {
+                const selecEventArgs = { action: args.action, fileDetails: nodeData[0], isInteracted: args.isInteracted };
+                this.parent.trigger('fileSelect', selecEventArgs);
+            }
         }
     }
     // Opens the folder while clicking open context menu item in the treeview.
@@ -8606,19 +8646,25 @@ class NavigationPane {
         this.parent.itemData = data;
         this.activeNode = node;
         this.parent.activeModule = 'navigationpane';
-        updatePath(node, this.parent.itemData[0], this.parent);
-        read(this.parent, this.isPathDragged ? pasteEnd : pathChanged, this.parent.path);
-        this.parent.visitedItem = node;
-        this.isPathDragged = this.isRenameParent = this.isRightClick = false;
-        this.treeObj.selectedNodes = [node.getAttribute('data-uid')];
+        const eventArgs = { cancel: false, fileDetails: data[0], module: 'NavigationPane' };
+        this.parent.trigger('fileOpen', eventArgs);
+        this.isNodeClickCalled = true;
+        if (!eventArgs.cancel) {
+            updatePath(node, this.parent.itemData[0], this.parent);
+            read(this.parent, this.isPathDragged ? pasteEnd : pathChanged, this.parent.path);
+            this.parent.visitedItem = node;
+            this.isPathDragged = this.isRenameParent = this.isRightClick = false;
+            this.treeObj.selectedNodes = [node.getAttribute('data-uid')];
+        }
     }
     onNodeSelected(args) {
         if (this.parent.breadcrumbbarModule && this.parent.breadcrumbbarModule.searchObj && !this.renameParent) {
             this.parent.breadcrumbbarModule.searchObj.element.value = '';
             this.parent.isFiltered = false;
+            this.isNodeClickCalled = false;
         }
         this.parent.searchedItems = [];
-        if (!args.isInteracted && !this.isRightClick && !this.isPathDragged && !this.isRenameParent) {
+        if (!args.isInteracted && !this.isRightClick && !this.isSameNodeClicked && !this.isPathDragged && !this.isRenameParent) {
             this.parent.pathId = getPathId(args.node);
             return;
         }
@@ -8629,7 +8675,8 @@ class NavigationPane {
         this.parent.selectedItems = [];
         this.parent.itemData = nodeData;
         const previousPath = this.parent.path;
-        if (!this.isRightClick) {
+        const sNode = select('[data-uid="' + this.treeObj.selectedNodes[0] + '"]', this.treeObj.element);
+        if (!this.isRightClick && this.isSameNodeClicked && sNode.querySelector('.e-list-text').innerHTML !== this.parent.pathNames[this.parent.pathNames.length - 1]) {
             updatePath(args.node, this.parent.itemData[0], this.parent);
         }
         else {
@@ -8641,12 +8688,13 @@ class NavigationPane {
             if (args.node.querySelector('.' + ICONS) && args.node.querySelector('.' + LIST_ITEM) === null) {
                 this.expandNodeTarget = 'add';
             }
-            if (!this.isRightClick) {
+            if (!this.isRightClick && this.isSameNodeClicked) {
                 read(this.parent, this.isPathDragged ? pasteEnd : pathChanged, this.parent.path);
+                this.isNodeClickCalled = true;
             }
             this.parent.visitedItem = args.node;
         }
-        this.isPathDragged = this.isRenameParent = this.isRightClick = false;
+        this.isPathDragged = this.isRenameParent = this.isRightClick = this.isSameNodeClicked = false;
     }
     /* istanbul ignore next */
     // eslint-disable-next-line
@@ -8669,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';
@@ -8690,6 +8740,14 @@ 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 && !this.isNodeExpandCalled) {
+            if (args.event.which === 3) {
+                this.isRightClick = true;
+            }
+            this.isSameNodeClicked = true;
+            this.isNodeClickCalled = true;
+            this.treeObj.selectedNodes = [args.node.getAttribute('data-uid')];
+        }
     }
     /* istanbul ignore next */
     onNodeEditing(args) {