From f9b3691a58bb3cf957af79717f3ff932407ebe05 Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Thu, 24 Sep 2020 14:11:23 +0200
Subject: [PATCH] fixed potencial problem

---
 packages/web/src/datagrid/DataGridCore.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/web/src/datagrid/DataGridCore.js b/packages/web/src/datagrid/DataGridCore.js
index 921b93ce8..f712a9171 100644
--- a/packages/web/src/datagrid/DataGridCore.js
+++ b/packages/web/src/datagrid/DataGridCore.js
@@ -211,6 +211,7 @@ export default function DataGridCore(props) {
     allRowCount: null,
     errorMessage: null,
     jslStatsCounter: 0,
+    jslChangeIndex: 0,
   });
   const { isLoading, loadedRows, isLoadedAll, loadedTime, allRowCount, errorMessage } = loadProps;
 
@@ -381,6 +382,7 @@ export default function DataGridCore(props) {
       loadedTime: new Date().getTime(),
       errorMessage: null,
       jslStatsCounter: 0,
+      jslChangeIndex: 0,
     });
   };
 
@@ -421,11 +423,13 @@ export default function DataGridCore(props) {
   }, [columnSizes, gridScrollAreaWidth]);
 
   const handleJslDataStats = React.useCallback((stats) => {
+    if (stats.changeIndex < loadProps.jslChangeIndex) return;
     setLoadProps((oldProps) => ({
       ...oldProps,
       allRowCount: stats.rowCount,
       isLoadedAll: false,
       jslStatsCounter: oldProps.jslStatsCounter + 1,
+      jslChangeIndex: stats.changeIndex,
     }));
   }, []);