Update DataViewLazyDemo.js

primefaces · Jun 4, 2021 · 49a26c7 · 49a26c7
1 parent 57b596a
commit 49a26c7
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/src/showcase/dataview/DataViewLazyDemo.js b/src/showcase/dataview/DataViewLazyDemo.js
@@ -48,11 +48,12 @@ export class DataViewLazyDemo extends Component {
         //imitate delay of a backend call
         setTimeout(() => {
             const startIndex = event.first;
-            const endIndex = event.first + this.rows;
+            const endIndex = Math.min(event.first + this.rows, this.state.totalRecords - 1);
+            const newProducts = startIndex === endIndex ? this.datasource.slice(startIndex) : this.datasource.slice(startIndex, endIndex);
 
             this.setState({
                 first: startIndex,
-                products: this.datasource.slice(startIndex, endIndex),
+                products: newProducts,
                 loading: false
             });
         }, 1000);
@@ -219,11 +220,12 @@ export class DataViewLazyDemo extends Component {
         //imitate delay of a backend call
         setTimeout(() => {
             const startIndex = event.first;
-            const endIndex = event.first + this.rows;
+            const endIndex = Math.min(event.first + this.rows, this.state.totalRecords - 1);
+            const newProducts = startIndex === endIndex ? this.datasource.slice(startIndex) : this.datasource.slice(startIndex, endIndex);
 
             this.setState({
                 first: startIndex,
-                products: this.datasource.slice(startIndex, endIndex),
+                products: newProducts,
                 loading: false
             });
         }, 1000);
@@ -362,18 +364,19 @@ const DataViewLazyDemo = () => {
                 setLoading(false);
             });
         }, 1000);
-    }
+    }, []); // eslint-disable-line react-hooks/exhaustive-deps
 
     const onPage = (event) => {
         setLoading(true);
 
         //imitate delay of a backend call
         setTimeout(() => {
             const startIndex = event.first;
-            const endIndex = event.first + this.rows;
+            const endIndex = Math.min(event.first + this.rows, this.state.totalRecords - 1);
+            const newProducts = startIndex === endIndex ? datasource.slice(startIndex) : datasource.slice(startIndex, endIndex);
 
             setFirst(startIndex);
-            setProducts(datasource.slice(startIndex, endIndex));
+            setProducts(newProducts);
             setLoading(false);
         }, 1000);
     }
@@ -502,18 +505,19 @@ const DataViewLazyDemo = () => {
                 setLoading(false);
             });
         }, 1000);
-    }
+    }, []); // eslint-disable-line react-hooks/exhaustive-deps
 
     const onPage = (event) => {
         setLoading(true);
 
         //imitate delay of a backend call
         setTimeout(() => {
             const startIndex = event.first;
-            const endIndex = event.first + this.rows;
+            const endIndex = Math.min(event.first + this.rows, this.state.totalRecords - 1);
+            const newProducts = startIndex === endIndex ? datasource.slice(startIndex) : datasource.slice(startIndex, endIndex);
 
             setFirst(startIndex);
-            setProducts(datasource.slice(startIndex, endIndex));
+            setProducts(newProducts);
             setLoading(false);
         }, 1000);
     }