Fixed #2070 - PageParams TypeScript interface improvement on DataTabl…

…e, TreeTable and DataView
primefaces · Jun 10, 2021 · 97d0bff · 97d0bff
1 parent 438e468
commit 97d0bff
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 13 deletions.
diff --git a/src/components/datatable/DataTable.d.ts b/src/components/datatable/DataTable.d.ts
@@ -53,6 +53,13 @@ interface DataTableEditingRows {
 interface DataTablePageParams {
     first: number;
     rows: number;
+    page: number;
+    pageCount: number;
+}
+
+interface DataTableVirtualScrollParams {
+    first: number;
+    rows: number;
 }
 
 interface DataTableRowToggleParams {
@@ -232,7 +239,7 @@ export interface DataTableProps {
     onSort?(e: DataTableSortParams): void;
     onPage?(e: DataTablePageParams): void;
     onFilter?(e: DataTableFilterParams): void;
-    onVirtualScroll?(e: DataTablePageParams): void;
+    onVirtualScroll?(e: DataTableVirtualScrollParams): void;
     onAllRowsSelect?(e: DataTableSelectParams): void;
     onAllRowsUnselect?(e: DataTableUnselectParams): void;
     onRowClick?(e: DataTableRowClickEventParams): void;

diff --git a/src/components/datatable/DataTable.js b/src/components/datatable/DataTable.js
@@ -431,10 +431,15 @@ export class DataTable extends Component {
         if (restoredState && Object.keys(restoredState).length) {
             if (this.props.paginator) {
                 if (this.props.onPage) {
-                    this.props.onPage({
-                        first: restoredState.first,
-                        rows: restoredState.rows
-                    });
+                    const getOnPageParams = (first, rows) => {
+                        const totalRecords = this.getTotalRecords(this.processData());
+                        const pageCount = Math.ceil(totalRecords / rows) || 1;
+                        const page = Math.floor(first / rows);
+
+                        return { first, rows, page, pageCount };
+                    }
+
+                    this.props.onPage(getOnPageParams(restoredState.first, restoredState.rows));
                 }
                 else {
                     state.first = restoredState.first;

diff --git a/src/components/dataview/DataView.d.ts b/src/components/dataview/DataView.d.ts
@@ -10,9 +10,10 @@ type DataViewSortOrderType = 1 | 0 | -1 | undefined | null;
 type DataViewAppendToType = 'self' | HTMLElement | undefined | null;
 
 interface DataViewPageParams {
-    originalEvent: React.SyntheticEvent;
     first: number;
     rows: number;
+    page: number;
+    pageCount: number;
 }
 
 interface DataViewLayoutOptionsChangeParams {

diff --git a/src/components/dataview/DataView.js b/src/components/dataview/DataView.js
@@ -178,16 +178,12 @@ export class DataView extends Component {
 
     onPageChange(event) {
         if (this.props.onPage) {
-            this.props.onPage({
-                originalEvent: event,
-                first: event.first,
-                rows: event.rows
-            });
+            this.props.onPage(event);
         }
         else {
             this.setState({
-                first:event.first,
-                rows:event.rows
+                first: event.first,
+                rows: event.rows
             });
         }
     }

diff --git a/src/components/treetable/TreeTable.d.ts b/src/components/treetable/TreeTable.d.ts
@@ -60,6 +60,8 @@ interface TreeTableToggleParams {
 interface TreeTablePageParams {
     first: number;
     rows: number;
+    page: number;
+    pageCount: number;
 }
 
 interface TreeTableSortParams {