Merge pull request mbrn#1258 from sshanzel/bugfix/sortConfigConflict

bugfix: disable defaultSorting when sorting = false
datarefuge · Nov 8, 2019 · 90c28a7 · 90c28a7
2 parents 87d0bb7 + 52b0ae9
commit 90c28a7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/material-table.js b/src/material-table.js
@@ -55,8 +55,8 @@ export default class MaterialTable extends React.Component {
   setDataManagerFields(props, isInit) {
     let defaultSortColumnIndex = -1;
     let defaultSortDirection = '';
-    if (props) {
-      defaultSortColumnIndex = props.columns.findIndex(a => a.defaultSort);
+    if (props && props.options.sorting !== false) {
+      defaultSortColumnIndex = props.columns.findIndex(a => a.defaultSort && a.sorting !== false);
       defaultSortDirection = defaultSortColumnIndex > -1 ? props.columns[defaultSortColumnIndex].defaultSort : '';
     }