Refactor #617

primefaces · Nov 28, 2019 · b28e657 · b28e657
1 parent c42543f
commit b28e657
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/components/datatable/DataTable.js b/src/components/datatable/DataTable.js
@@ -449,7 +449,7 @@ export class DataTable extends Component {
 
     onSort(event) {
         let sortField = event.sortField;
-        let sortOrder;
+        let sortOrder = this.props.defaultSortOrder;
         let multiSortMeta;
 
         this.columnSortable = event.sortable;
@@ -459,8 +459,10 @@ export class DataTable extends Component {
             let metaKey = event.originalEvent.metaKey || event.originalEvent.ctrlKey;
             multiSortMeta = this.getMultiSortMeta();
 
-            const sortMeta = multiSortMeta.find(sortMeta => sortMeta.field === sortField);
-            sortOrder = sortMeta ? sortMeta.order * -1 : this.props.defaultSortOrder;
+            if (multiSortMeta && multiSortMeta instanceof Array) {
+                const sortMeta = multiSortMeta.find(sortMeta => sortMeta.field === sortField);
+                sortOrder = sortMeta ? sortMeta.order * -1 : sortOrder;
+            }
 
             if(!multiSortMeta || !metaKey) {
                 multiSortMeta = [];
@@ -469,7 +471,7 @@ export class DataTable extends Component {
             this.addSortMeta({field: sortField, order: sortOrder}, multiSortMeta);
         }
         else {
-            sortOrder = (this.getSortField() === sortField) ? this.getSortOrder() * -1 : this.props.defaultSortOrder;
+            sortOrder = (this.getSortField() === sortField) ? this.getSortOrder() * -1 : sortOrder;
         }
 
         if (this.props.onSort) {