Fixed #636 - Add currentPageReportTemplate property to Paginator

primefaces · Nov 28, 2018 · f4e96e5 · f4e96e5
1 parent a76e5f8
commit f4e96e5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/src/components/paginator/CurrentPageReport.js b/src/components/paginator/CurrentPageReport.js
@@ -6,19 +6,18 @@ export class CurrentPageReport extends Component {
     static defaultProps = {
         pageCount: null,
         page: null,
-        template: '({currentPage} of {totalPages})'
+        currentPageReportTemplate: null
     }
 
     static propsTypes = {
         pageCount: PropTypes.number,
         page: PropTypes.number,
-        template: PropTypes.string
+        currentPageReportTemplate: PropTypes.any
     }
 
     render() {
-        let text = this.props.template
-            .replace("{currentPage}", this.props.page + 1)
-            .replace("{totalPages}", this.props.pageCount);
+        let text = this.props.currentPageReportTemplate ? this.props.currentPageReportTemplate :
+            '('+(this.props.page + 1)+' of '+(this.props.pageCount)+')';
 
         return <span className="p-paginator-current">{text}</span>
     }

diff --git a/src/components/paginator/Paginator.js b/src/components/paginator/Paginator.js
@@ -22,7 +22,8 @@ export class Paginator extends Component {
         template: 'FirstPageLink PrevPageLink PageLinks NextPageLink LastPageLink RowsPerPageDropdown',
         onPageChange: null,
         leftContent: null,
-        rightContent: null
+        rightContent: null,
+        currentPageReportTemplate: null
     }
 
     static propsTypes = {
@@ -36,7 +37,8 @@ export class Paginator extends Component {
         template: PropTypes.string,
         onPageChange: PropTypes.func,
         leftContent: PropTypes.any,
-        rightContent: PropTypes.any
+        rightContent: PropTypes.any,
+        currentPageReportTemplate: PropTypes.any
     }
 
     constructor(props) {
@@ -172,7 +174,7 @@ export class Paginator extends Component {
                 break;
 
                 case 'CurrentPageReport':
-                    element = <CurrentPageReport key={key} page={this.getPage()} pageCount={this.getPageCount()} />;
+                    element = <CurrentPageReport currentPageReportTemplate={this.props.currentPageReportTemplate} key={key} page={this.getPage()} pageCount={this.getPageCount()} />;
                 break;
 
                 default:

diff --git a/src/showcase/paginator/PaginatorDemo.js b/src/showcase/paginator/PaginatorDemo.js
@@ -194,6 +194,12 @@ import {Paginator} from 'primereact/paginator';
                             <td>null</td>
                             <td>Content to inject into the right side of the paginator.</td>
                         </tr>
+                        <tr>
+                            <td>currentPageReportTemplate</td>
+                            <td>any</td>
+                            <td>null</td>
+                            <td>Content to CurrentPageReport template of the paginator.</td>
+                        </tr>
                     </tbody>
                 </table>
             </div>