From cc4eb133a75d77baa90dd6881ff9aa34330667eb Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Tue, 14 Apr 2020 19:39:22 +0200 Subject: [PATCH] fix - prevented double load --- packages/web/src/datagrid/DataGridCore.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/web/src/datagrid/DataGridCore.js b/packages/web/src/datagrid/DataGridCore.js index cd0f63593..f72b5822f 100644 --- a/packages/web/src/datagrid/DataGridCore.js +++ b/packages/web/src/datagrid/DataGridCore.js @@ -214,19 +214,19 @@ export default function DataGridCore(props) { const handleLoadRowCount = async () => { const rowCount = await loadRowCount(props); - setLoadProps({ - ...loadProps, + setLoadProps((oldLoadProps) => ({ + ...oldLoadProps, allRowCount: rowCount, - }); + })); }; const loadNextData = async () => { if (isLoading) return; - setLoadProps({ - ...loadProps, + setLoadProps((oldLoadProps) => ({ + ...oldLoadProps, isLoading: true, allRowCount: null, - }); + })); const loadStart = new Date().getTime(); loadedTimeRef.current = loadStart; @@ -246,11 +246,11 @@ export default function DataGridCore(props) { loadedTime, isLoadedAll: nextRows.length === 0, }; - setLoadProps({ - ...loadProps, + setLoadProps((oldLoadProps) => ({ + ...oldLoadProps, isLoading: false, ...loadedInfo, - }); + })); }; // const data = useFetch({