fix: show first set of records

bettyblocks · Oct 7, 2020 · bfde0fd · bfde0fd
1 parent 06b69bb
commit bfde0fd
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/components/dataTable.js b/src/components/dataTable.js
@@ -58,6 +58,8 @@
     const displayError = showError === 'built-in';
     const [page, setPage] = useState(0);
     const takeNum = parseInt(take, 10);
+    const initialRender = useRef(true);
+    const [skip, setSkip] = useState(0);
     const autoLoadTakeAmountNum = parseInt(autoLoadTakeAmount, 10);
     const [rowsPerPage, setRowsPerPage] = useState(takeNum);
     const [search, setSearch] = useState('');
@@ -117,8 +119,6 @@
       }, {});
     };
 
-    const [skip, setSkip] = useState(0);
-
     const searchFilter = searchProperty
       ? searchPropertyArray.reduceRight(
           (acc, property, index) =>
@@ -367,7 +367,10 @@
     useEffect(() => {
       if (autoLoadOnScroll && !isDev) {
         const increaseSkipAmount = () => {
-          setSkip(prev => prev + autoLoadTakeAmountNum);
+          if (!initialRender.current) {
+            setSkip(prev => prev + autoLoadTakeAmountNum);
+          }
+          initialRender.current = false;
         };
         const fetchNextSet = () => {
           fetchingNextSet.current = true;
@@ -404,7 +407,7 @@
           window.addEventListener('scroll', scrollEvent);
         }
       }
-    }, [totalCount, results]);
+    }, [results]);
 
     return (
       <div className={classes.root}>