Fixed #1989 - Non-sortable columns call onSort callback in DataTable

primefaces · Apr 26, 2021 · a34e7a3 · a34e7a3
1 parent 1b65e88
commit a34e7a3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/src/components/datatable/DataTable.js b/src/components/datatable/DataTable.js
@@ -565,23 +565,19 @@ export class DataTable extends Component {
         if (this.props.sortMode === 'multiple') {
             let metaKey = event.originalEvent.metaKey || event.originalEvent.ctrlKey;
             let sortableDisabledFields = event.sortableDisabledFields;
-            multiSortMeta = this.getMultiSortMeta();
+            multiSortMeta = [...(this.getMultiSortMeta()||[])];
 
-            if (multiSortMeta && multiSortMeta instanceof Array) {
-                const sortMeta = multiSortMeta.find(sortMeta => sortMeta.field === sortField);
-                sortOrder = sortMeta ? this.getCalculatedSortOrder(sortMeta.order) : sortOrder;
-            }
+            const sortMeta = multiSortMeta.find(sortMeta => sortMeta.field === sortField);
+            sortOrder = sortMeta ? this.getCalculatedSortOrder(sortMeta.order) : sortOrder;
 
             const newMetaData = {field: sortField, order: sortOrder};
 
             if (sortOrder) {
-                if(!multiSortMeta || !metaKey) {
-                    multiSortMeta = multiSortMeta ? multiSortMeta.filter((meta) => sortableDisabledFields.some((field) => field === meta.field)) : [];
-                }
+                multiSortMeta = metaKey ? multiSortMeta : multiSortMeta.filter((meta) => sortableDisabledFields.some((field) => field === meta.field));
 
                 this.addSortMeta(newMetaData, multiSortMeta);
             }
-            else if (this.props.removableSort && multiSortMeta) {
+            else if (this.props.removableSort) {
                 this.removeSortMeta(newMetaData, multiSortMeta);
             }
 

diff --git a/src/components/datatable/HeaderCell.js b/src/components/datatable/HeaderCell.js
@@ -133,7 +133,7 @@ export class HeaderCell extends Component {
     }
 
     isSortableDisabled() {
-        return this.props.columnProps.sortable && (this.props.allSortableDisabled || this.props.columnProps.sortableDisabled);
+        return !this.props.columnProps.sortable || (this.props.columnProps.sortable && (this.props.allSortableDisabled || this.props.columnProps.sortableDisabled));
     }
 
     isSingleSorted() {