- fix: default values for custom=true by default components set

- fix: CDataTable - set perPageItems select box, pagination
- update: CPagination with pages prop (more important than maxPage)

Author: Tomasz John

src/CBreadcrumb.js

@@ -131,6 +131,7 @@ CBreadcrumb.propTypes = {
 };
 
 CBreadcrumb.defaultProps = {
+  ...CBreadcrumbCustom.defaultProps,
   custom: true,
   tag: 'div',
   className: '',

src/CCarousel.js

@@ -119,6 +119,7 @@ CCarousel.propTypes = {
 };
 
 CCarousel.defaultProps = {
+  ...CCarouselCustom.defaultProps,
   custom: true,
   controls: true,
   indicators: true,

src/CCollapse.js

@@ -74,6 +74,7 @@ CCollapse.propTypes = {
 };
 
 CCollapse.defaultProps = {
+  ...CCollapseCustom.defaultProps,
   toggleEvents: defaultToggleEvents,
   custom: true
 };

src/CDataTable.js

@@ -356,7 +356,7 @@ const CDataTable = props=>{
                 <select
                   className="form-control"
                   onChange={paginationChange}
-                  value={0}
+                  value={perPageItems}
                 >
                   <option value="" disabled hidden>
                     {perPageItems}
@@ -589,6 +589,7 @@ const CDataTable = props=>{
       //v-bind={typeof pagination === 'object' ? {...pagination} : null}
       pagination ?
         <CPagination
+          custom={false}
           onClick={(e, type, n)=>{
             //alert(type, n);
             switch (type){

src/CDropdown.js

@@ -48,6 +48,7 @@ CDropdown.propTypes = {
 };
 
 CDropdown.defaultProps = {
+  ...CDropdownCustom.defaultProps,
   custom: true
 }
 

src/CPagination.js

@@ -23,7 +23,8 @@ const CPagination = props=>{
     pageFrom,
     pageTo,
     pageMin,
-    pageMax,
+    pageMax: pageMaxProp,
+    pages,
     activePage,
     size,
     firstButtonHtml,
@@ -40,6 +41,7 @@ const CPagination = props=>{
     ...attributes
   } = props;
 
+  let pageMax;
 
   const paginationClick = (e, type, n)=>{
     onClick && onClick(e, type, n);
@@ -61,6 +63,8 @@ const CPagination = props=>{
 
   let autoChildren;
 
+  pages ? pageMax = pageMin + pages - 1 : pageMax = pageMaxProp;
+
   if (!custom){
     let list=[];
     let pageAutoFrom = pageFrom;
@@ -112,6 +116,7 @@ CPagination.propTypes = {
   innerRef: PropTypes.oneOfType([PropTypes.object, PropTypes.func, PropTypes.string]),
   pageMin: PropTypes.number,
   pageMax: PropTypes.number,
+  pages: PropTypes.number,
   pageFrom: PropTypes.number,
   pageTo: PropTypes.number,
   activePage: PropTypes.number,
@@ -136,7 +141,7 @@ CPagination.defaultProps = {
   listTag: 'ul',
   'aria-label': 'pagination',
   pageMin: 1,
-  pageMax: 5,
+  pages: 5,
   activePage: 2,
   hideDots: true,
   firstButtonHtml: <React.Fragment>&laquo;</React.Fragment>,