widenarrow-ui 1.1.12 → 1.1.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/index.d.ts +2 -2
- package/lib/index.esm.js +12 -15
- package/lib/index.esm.js.map +1 -1
- package/lib/index.js +12 -15
- package/lib/index.js.map +1 -1
- package/lib/types/common.types.d.ts +2 -2
- package/package.json +1 -1
- package/src/components/Pagination/Pagination.stories.tsx +2 -2
- package/src/components/Pagination/Pagination.tsx +5 -8
- package/src/types/common.types.ts +2 -2
- package/src/utils.ts +7 -7
package/lib/index.d.ts
CHANGED
|
@@ -524,11 +524,11 @@ declare const FacetButton: FC<FacetButtonProps>;
|
|
|
524
524
|
|
|
525
525
|
interface SearchResultInterface {
|
|
526
526
|
currentPage: number;
|
|
527
|
-
numberOfPages: number;
|
|
528
|
-
pages: number;
|
|
529
527
|
pageSize: number;
|
|
530
528
|
numberOfHits: number;
|
|
529
|
+
pages: number;
|
|
531
530
|
sortOrder: number;
|
|
531
|
+
skip?: number;
|
|
532
532
|
fetching?: boolean;
|
|
533
533
|
searchTerm?: string;
|
|
534
534
|
}
|
package/lib/index.esm.js
CHANGED
|
@@ -609,13 +609,13 @@ var isSortingAscending = function (state) { return path([0, 'ascending'], state)
|
|
|
609
609
|
* @returns {Array}
|
|
610
610
|
*/
|
|
611
611
|
var getPaginationArray = function (pagination) {
|
|
612
|
-
var
|
|
612
|
+
var pages = pagination.pages || 0;
|
|
613
613
|
var maxButtons = 5;
|
|
614
|
-
if (
|
|
614
|
+
if (pages <= maxButtons + 1) {
|
|
615
615
|
return __spreadArray([], times(function (i) { return ({
|
|
616
616
|
page: i + 1,
|
|
617
617
|
type: 'page'
|
|
618
|
-
}); },
|
|
618
|
+
}); }, pages), true);
|
|
619
619
|
}
|
|
620
620
|
var closeToStart = pagination.currentPage < maxButtons;
|
|
621
621
|
if (closeToStart) {
|
|
@@ -624,16 +624,16 @@ var getPaginationArray = function (pagination) {
|
|
|
624
624
|
type: 'page'
|
|
625
625
|
}); }, maxButtons), true), [
|
|
626
626
|
{ page: 0, type: 'dots' },
|
|
627
|
-
{ page:
|
|
627
|
+
{ page: pages, type: 'page' }
|
|
628
628
|
], false);
|
|
629
629
|
}
|
|
630
|
-
var closeToEnd = maxButtons - 1 >
|
|
630
|
+
var closeToEnd = maxButtons - 1 > pages - pagination.currentPage;
|
|
631
631
|
if (closeToEnd) {
|
|
632
632
|
return __spreadArray([
|
|
633
633
|
{ page: 1, type: 'page' },
|
|
634
634
|
{ page: 0, type: 'dots' }
|
|
635
635
|
], times(function (i) { return ({
|
|
636
|
-
page:
|
|
636
|
+
page: pages - i,
|
|
637
637
|
type: 'page'
|
|
638
638
|
}); }, maxButtons).reverse(), true);
|
|
639
639
|
}
|
|
@@ -644,7 +644,7 @@ var getPaginationArray = function (pagination) {
|
|
|
644
644
|
{ page: pagination.currentPage, type: 'page' },
|
|
645
645
|
{ page: pagination.currentPage + 1, type: 'page' },
|
|
646
646
|
{ page: 0, type: 'dots' },
|
|
647
|
-
{ page:
|
|
647
|
+
{ page: pages, type: 'page' }
|
|
648
648
|
];
|
|
649
649
|
};
|
|
650
650
|
|
|
@@ -2628,23 +2628,20 @@ var Pagination = function (_a) {
|
|
|
2628
2628
|
return null;
|
|
2629
2629
|
}
|
|
2630
2630
|
var isFirstPage = pagination.currentPage <= 1;
|
|
2631
|
-
var
|
|
2631
|
+
var getpages = function () {
|
|
2632
2632
|
if (is(Number, pagination.pages)) {
|
|
2633
2633
|
return pagination.pages;
|
|
2634
2634
|
}
|
|
2635
|
-
if (is(Number, pagination.numberOfPages)) {
|
|
2636
|
-
return pagination.numberOfPages;
|
|
2637
|
-
}
|
|
2638
2635
|
return 0;
|
|
2639
2636
|
};
|
|
2640
|
-
var
|
|
2641
|
-
var isLastPage = pagination.currentPage >=
|
|
2637
|
+
var pages = getpages();
|
|
2638
|
+
var isLastPage = pagination.currentPage >= pages;
|
|
2642
2639
|
var itemClassName = s$c('item', { item_slim: slim });
|
|
2643
2640
|
var buttonClassName = function (additionalClassName) {
|
|
2644
2641
|
var _a;
|
|
2645
2642
|
return s$c('button', (_a = { button_slim: slim }, _a[additionalClassName] = additionalClassName, _a));
|
|
2646
2643
|
};
|
|
2647
|
-
if (pagination.fetching && !
|
|
2644
|
+
if (pagination.fetching && !pages) {
|
|
2648
2645
|
return (jsx("ul", { className: s$c('container', (_b = {}, _b[className] = className, _b)), children: times(function (i) { return (jsx("li", { className: itemClassName, children: jsx("div", { className: buttonClassName() }) }, i)); }, 5) }));
|
|
2649
2646
|
}
|
|
2650
2647
|
var getPageInfoText = function () {
|
|
@@ -2664,7 +2661,7 @@ var Pagination = function (_a) {
|
|
|
2664
2661
|
onChange(__assign(__assign({}, pagination), { currentPage: pagination.currentPage + 1 }));
|
|
2665
2662
|
}, disabled: isLastPage, children: jsx(Icon, { icon: IconTypes.CHEVRON_RIGHT }) }) }));
|
|
2666
2663
|
var lastPageButton = withFastForwardButtons ? (jsx("li", { children: jsx("button", { title: lastPageTitle || 'Last page', className: buttonClassName(isLastPage ? 'button_disabled' : undefined), onClick: function () {
|
|
2667
|
-
onChange(__assign(__assign({}, pagination), { currentPage:
|
|
2664
|
+
onChange(__assign(__assign({}, pagination), { currentPage: pages }));
|
|
2668
2665
|
}, disabled: isLastPage, children: jsx(Icon, { icon: IconTypes.ARROW_LAST_PAGE }) }) })) : null;
|
|
2669
2666
|
/*
|
|
2670
2667
|
paginationMarkup
|