Fixed #1691 - DataView throws an exception when the last page is reac…

…hed using Paginator
primefaces · Nov 26, 2020 · afae4f1 · afae4f1
1 parent c147001
commit afae4f1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/components/dataview/DataView.js b/src/components/dataview/DataView.js
@@ -283,7 +283,8 @@ export class DataView extends Component {
             if (this.props.paginator) {
                 const rows = this.props.onPage ? this.props.rows : this.state.rows;
                 const first = this.props.lazy ? 0 : this.props.onPage ? this.props.first : this.state.first;
-                const last = rows + first;
+                const totalRecords = this.getTotalRecords();
+                const last = Math.min(rows + first, totalRecords);
                 let items = [];
 
                 for (let i = first; i < last; i++) {