Fixed #2493 - DataTable issue related to restoreState with nextjs

primefaces · Dec 3, 2021 · a307133 · a307133
1 parent 8461882
commit a307133
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/components/datatable/DataTable.js b/src/components/datatable/DataTable.js
@@ -290,10 +290,6 @@ export class DataTable extends Component {
             this.state.filters = props.filters;
         }
 
-        if (this.isStateful()) {
-            this.restoreState(this.state);
-        }
-
         this.attributeSelector = UniqueComponentId();
 
         // header
@@ -1531,8 +1527,12 @@ export class DataTable extends Component {
             this.createResponsiveStyle();
         }
 
-        if (this.isStateful() && this.props.resizableColumns) {
-            this.restoreColumnWidths();
+        if (this.isStateful()) {
+            this.setState(this.restoreState(this.state));
+
+            if (this.props.resizableColumns) {
+                this.restoreColumnWidths();
+            }
         }
     }