redux-paginator-immutable 17.0.31 → 17.0.34
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/LoadPaginator.js +18 -8
- package/lib/LoadPaginator.js.map +1 -1
- package/lib/LoadPaginatorTypes.d.ts +1 -1
- package/lib/LoadingButton.d.ts +2 -5
- package/lib/LoadingButton.js +6 -12
- package/lib/LoadingButton.js.map +1 -1
- package/package.json +1 -1
- package/src/LoadPaginator.tsx +16 -9
- package/src/LoadPaginatorTypes.ts +1 -1
- package/src/LoadingButton.tsx +18 -28
package/lib/LoadPaginator.js
CHANGED
|
@@ -59,19 +59,23 @@ const LoadPaginator = (props) => {
|
|
|
59
59
|
// total,
|
|
60
60
|
// });
|
|
61
61
|
// }, [list, entities, token]),
|
|
62
|
-
currentPage = selectors_1.default.getCurrentView(list, token), isFetching = selectors_1.default.isPageFetching(list, token, currentPage), isFetched = selectors_1.default.isPageFetched(list, token, currentPage),
|
|
62
|
+
currentPage = selectors_1.default.getCurrentView(list, token), isFetching = selectors_1.default.isPageFetching(list, token, currentPage), isFetched = selectors_1.default.isPageFetched(list, token, currentPage),
|
|
63
|
+
// isNextFetching = selectors.isPageFetching(list, token, currentPage + 1),
|
|
64
|
+
// isNextFetched = selectors.isPageFetched(list, token, currentPage + 1),
|
|
63
65
|
// eslint-disable-next-line max-len
|
|
64
66
|
resultsUpTo = selectors_1.default.getResultsUpToPage(list, token, entities, currentPage, settings.rowsPerLoad), items = settings.manipulateItems(resultsUpTo), total = selectors_1.default.getCurrentTotalResultsCount(list, token),
|
|
65
67
|
// currentPage was previously given to the following function
|
|
66
|
-
hasProblems = selectors_1.default.hasPageProblems(list, token),
|
|
68
|
+
hasProblems = selectors_1.default.hasPageProblems(list, token),
|
|
69
|
+
// shouldLoadNext = !isNextFetched && !isNextFetching,
|
|
70
|
+
paginator = Immutable.Map({
|
|
67
71
|
currentPage,
|
|
68
72
|
hasProblems,
|
|
69
73
|
isFetched,
|
|
70
74
|
isFetching,
|
|
71
75
|
items,
|
|
72
|
-
shouldLoadNext,
|
|
76
|
+
// shouldLoadNext,
|
|
73
77
|
total,
|
|
74
|
-
}), dispatch = (0, react_redux_1.useDispatch)(), resetView = (currentToken) => dispatch(settings.resetView(currentToken)), changeView = (data) => dispatch(settings.changeView(data)), loadData = (page) => dispatch(settings.requestPage(
|
|
78
|
+
}), dispatch = (0, react_redux_1.useDispatch)(), resetView = (currentToken) => dispatch(settings.resetView(currentToken)), changeView = (data) => dispatch(settings.changeView(data)), loadData = (page) => dispatch(settings.requestPage(page, token)),
|
|
75
79
|
// items = paginator.get("items"),
|
|
76
80
|
// hasProblems = paginator.get("hasProblems"),
|
|
77
81
|
// currentPage = paginator.get("currentPage"),
|
|
@@ -89,19 +93,25 @@ const LoadPaginator = (props) => {
|
|
|
89
93
|
token,
|
|
90
94
|
view: currentPage + 1,
|
|
91
95
|
});
|
|
92
|
-
if (shouldLoadNext) {
|
|
93
|
-
|
|
94
|
-
}
|
|
96
|
+
// if (shouldLoadNext) {
|
|
97
|
+
// loadData(currentPage + 1);
|
|
98
|
+
// }
|
|
95
99
|
}
|
|
96
100
|
};
|
|
97
101
|
// eslint-disable-next-line no-console
|
|
98
102
|
console.log("paginator", paginator ? paginator.toJS() : null);
|
|
103
|
+
// eslint-disable-next-line no-console
|
|
104
|
+
console.log("currentPage", currentPage);
|
|
105
|
+
// eslint-disable-next-line no-console
|
|
106
|
+
console.log("list", list.toJS());
|
|
107
|
+
// eslint-disable-next-line no-console
|
|
108
|
+
console.log("entities", entities.toJS());
|
|
99
109
|
(0, react_1.useEffect)(() => (() => resetView(token)), []);
|
|
100
110
|
(0, react_1.useEffect)(() => {
|
|
101
111
|
if (shouldFetch) {
|
|
102
112
|
loadData(currentPage);
|
|
103
113
|
}
|
|
104
|
-
}, [shouldFetch, paginator]);
|
|
114
|
+
}, [shouldFetch, paginator, currentPage]);
|
|
105
115
|
if (items.size === 0 && isFetching) {
|
|
106
116
|
return react_1.default.createElement(Messages_1.LoadingMessage, { message: words_1.default.LoadingData });
|
|
107
117
|
}
|
package/lib/LoadPaginator.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoadPaginator.js","sourceRoot":"","sources":["../src/LoadPaginator.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+CAAyC;AACzC,qDAAuC;AACvC,6CAAuD;AACvD,2CAAiE;AACjE,4DAAoC;AACpC,oEAA4C;AAC5C,oDAA4B;AAI5B,MACE,aAAa,GAAG,CAAC,KAA8B,EAAE,EAAE;IACjD,MACE,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,KAAK,EAE3B,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAA,yBAAW,EAAC,CAAC,KAAa,EAAE,EAAE,CAAC,CAClD,mBAAS,CAAC,aAAa,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC,CAC7C,CAAC;IAEF,8BAA8B;IAC9B,UAAU;IACV,2DAA2D;IAC3D,uEAAuE;IACvE,qEAAqE;IACrE,+EAA+E;IAC/E,6EAA6E;IAC7E,mCAAmC;IACnC,4GAA4G;IAC5G,qDAAqD;IACrD,kEAAkE;IAClE,oEAAoE;IACpE,4DAA4D;IAC5D,0DAA0D;IAE1D,2BAA2B;IAC3B,mBAAmB;IACnB,mBAAmB;IACnB,iBAAiB;IACjB,kBAAkB;IAClB,aAAa;IACb,sBAAsB;IACtB,aAAa;IACb,QAAQ;IACR,+BAA+B;IAG/B,WAAW,GAAG,mBAAS,CAAC,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,EACnD,UAAU,GAAG,mBAAS,CAAC,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,CAAC,EAC/D,SAAS,GAAG,mBAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"LoadPaginator.js","sourceRoot":"","sources":["../src/LoadPaginator.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+CAAyC;AACzC,qDAAuC;AACvC,6CAAuD;AACvD,2CAAiE;AACjE,4DAAoC;AACpC,oEAA4C;AAC5C,oDAA4B;AAI5B,MACE,aAAa,GAAG,CAAC,KAA8B,EAAE,EAAE;IACjD,MACE,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,KAAK,EAE3B,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAA,yBAAW,EAAC,CAAC,KAAa,EAAE,EAAE,CAAC,CAClD,mBAAS,CAAC,aAAa,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC,CAC7C,CAAC;IAEF,8BAA8B;IAC9B,UAAU;IACV,2DAA2D;IAC3D,uEAAuE;IACvE,qEAAqE;IACrE,+EAA+E;IAC/E,6EAA6E;IAC7E,mCAAmC;IACnC,4GAA4G;IAC5G,qDAAqD;IACrD,kEAAkE;IAClE,oEAAoE;IACpE,4DAA4D;IAC5D,0DAA0D;IAE1D,2BAA2B;IAC3B,mBAAmB;IACnB,mBAAmB;IACnB,iBAAiB;IACjB,kBAAkB;IAClB,aAAa;IACb,sBAAsB;IACtB,aAAa;IACb,QAAQ;IACR,+BAA+B;IAG/B,WAAW,GAAG,mBAAS,CAAC,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,EACnD,UAAU,GAAG,mBAAS,CAAC,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,CAAC,EAC/D,SAAS,GAAG,mBAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,CAAC;IAC7D,2EAA2E;IAC3E,yEAAyE;IACzE,mCAAmC;IACnC,WAAW,GAAG,mBAAS,CAAC,kBAAkB,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC,EACpG,KAAK,GAAG,QAAQ,CAAC,eAAe,CAAC,WAAW,CAAC,EAC7C,KAAK,GAAG,mBAAS,CAAC,2BAA2B,CAAC,IAAI,EAAE,KAAK,CAAC;IAC1D,6DAA6D;IAC7D,WAAW,GAAG,mBAAS,CAAC,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC;IACpD,sDAAsD;IAEtD,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC;QACxB,WAAW;QACX,WAAW;QACX,SAAS;QACT,UAAU;QACV,KAAK;QACL,kBAAkB;QAClB,KAAK;KACN,CAAC,EAEF,QAAQ,GAAG,IAAA,yBAAW,GAAE,EACxB,SAAS,GAAe,CAAC,YAAY,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,EACpF,UAAU,GAAgB,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EACvE,QAAQ,GAAc,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAE3E,kCAAkC;IAClC,8CAA8C;IAC9C,8CAA8C;IAC9C,4CAA4C;IAC5C,WAAW,GAAG,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,KAAK,CAAC,IAAI;IAEnD,0CAA0C;IAC1C,WAAW,GAAG,CAAC,SAAS,IAAI,CAAC,UAAU,EACvC,mBAAmB,GAAG,GAAG,EAAE;QACzB,QAAQ;QACR,oDAAoD;QAEpD,IAAI,WAAW,EAAE;YACf,QAAQ,CAAC,WAAW,CAAC,CAAC;SACvB;aAAM;YACL,UAAU,CAAC;gBACT,KAAK;gBACL,IAAI,EAAE,WAAW,GAAG,CAAC;aACtB,CAAC,CAAC;YAEH,wBAAwB;YACxB,+BAA+B;YAC/B,IAAI;SACL;IACH,CAAC,CAAC;IAEJ,sCAAsC;IACtC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAE9D,sCAAsC;IACtC,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;IAExC,sCAAsC;IACtC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IACjC,sCAAsC;IACtC,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IAEzC,IAAA,iBAAS,EAAC,GAAG,EAAE,CAAC,CACd,GAAG,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CACvB,EAAE,EAAE,CAAC,CAAC;IAEP,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,WAAW,EAAE;YACf,QAAQ,CAAC,WAAW,CAAC,CAAC;SACvB;IACH,CAAC,EAAE,CAAC,WAAW,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;IAE1C,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,UAAU,EAAE;QAClC,OAAO,8BAAC,yBAAc,IAAC,OAAO,EAAE,eAAK,CAAC,WAAW,GAAI,CAAC;KACvD;IAED,IAAI,WAAW,IAAI,WAAW,KAAK,CAAC,EAAE;QACpC,OAAO,CACL,8BAAC,4BAAiB,IAChB,OAAO,EAAE,eAAK,CAAC,gBAAgB,EAC/B,OAAO,EAAE,mBAAmB,GAC5B,CACH,CAAC;KACH;IAED,OAAO,CACL;QAEI,eAAK,CAAC,YAAY,CAAC,KAAK,CAAC,QAAoC,EAAE;YAC7D,KAAK,EAAM,KAAK,CAAC,KAAK;YACtB,QAAQ,EAAG,KAAK,CAAC,QAAQ;YACzB,SAAS;YACT,UAAU;YACV,SAAS;YACT,QAAQ;SACT,CAAC;QAGF,WAAW,CAAC,CAAC,CAAC,CACZ,8BAAC,uBAAa,IACZ,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,mBAAmB,GACpC,CACH,CAAC,CAAC,CAAC,IAAI,CAET,CACJ,CAAC;AACJ,CAAC,CAAC;AAEJ,kBAAe,aAAa,CAAC"}
|
|
@@ -5,7 +5,7 @@ declare type Settings = {
|
|
|
5
5
|
manipulateItems: (items: any) => any;
|
|
6
6
|
resetView: (data: any) => any;
|
|
7
7
|
changeView: (data: any) => any;
|
|
8
|
-
requestPage: (page:
|
|
8
|
+
requestPage: (page: number, token: string) => any;
|
|
9
9
|
};
|
|
10
10
|
export declare type LoadPaginatorPropTypes = {
|
|
11
11
|
token: string;
|
package/lib/LoadingButton.d.ts
CHANGED
|
@@ -1,11 +1,8 @@
|
|
|
1
|
-
|
|
1
|
+
/// <reference types="react" />
|
|
2
2
|
declare type LoadingButtonPropTypes = {
|
|
3
3
|
isFetching: boolean;
|
|
4
4
|
hasProblems: boolean;
|
|
5
5
|
onLoadMoreClick: () => void;
|
|
6
6
|
};
|
|
7
|
-
declare
|
|
8
|
-
shouldComponentUpdate(nextProps: LoadingButtonPropTypes): boolean;
|
|
9
|
-
render(): JSX.Element;
|
|
10
|
-
}
|
|
7
|
+
declare const LoadingButton: (props: LoadingButtonPropTypes) => JSX.Element;
|
|
11
8
|
export default LoadingButton;
|
package/lib/LoadingButton.js
CHANGED
|
@@ -6,17 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const react_1 = __importDefault(require("react"));
|
|
7
7
|
const Messages_1 = require("x25/Messages");
|
|
8
8
|
const words_1 = __importDefault(require("./words"));
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
const { isFetching, hasProblems, onLoadMoreClick } = this.props;
|
|
16
|
-
return (react_1.default.createElement("div", { className: "text-center my-2" },
|
|
17
|
-
hasProblems ? react_1.default.createElement(Messages_1.ErrorMessage, { message: words_1.default.ThereWasAProblem }) : null,
|
|
18
|
-
isFetching ? react_1.default.createElement(Messages_1.LoadingMessage, { message: words_1.default.LoadingData, sm: true }) : (react_1.default.createElement("button", { className: "btn btn-outline-info d-print-none", disabled: isFetching, onClick: onLoadMoreClick, type: "button" }, isFetching ? words_1.default.LoadingData : words_1.default.LoadMore))));
|
|
19
|
-
}
|
|
20
|
-
}
|
|
9
|
+
const LoadingButton = (props) => {
|
|
10
|
+
const { isFetching, hasProblems, onLoadMoreClick } = props;
|
|
11
|
+
return (react_1.default.createElement("div", { className: "text-center my-2" },
|
|
12
|
+
hasProblems ? react_1.default.createElement(Messages_1.ErrorMessage, { message: words_1.default.ThereWasAProblem }) : null,
|
|
13
|
+
isFetching ? react_1.default.createElement(Messages_1.LoadingMessage, { message: words_1.default.LoadingData, sm: true }) : (react_1.default.createElement("button", { className: "btn btn-outline-info d-print-none", disabled: isFetching, onClick: onLoadMoreClick, type: "button" }, isFetching ? words_1.default.LoadingData : words_1.default.LoadMore))));
|
|
14
|
+
};
|
|
21
15
|
exports.default = LoadingButton;
|
|
22
16
|
//# sourceMappingURL=LoadingButton.js.map
|
package/lib/LoadingButton.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoadingButton.js","sourceRoot":"","sources":["../src/LoadingButton.tsx"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAC1B,2CAA4D;AAO5D,oDAA4B;AAE5B,MAAM,
|
|
1
|
+
{"version":3,"file":"LoadingButton.js","sourceRoot":"","sources":["../src/LoadingButton.tsx"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAC1B,2CAA4D;AAO5D,oDAA4B;AAE5B,MAAM,aAAa,GAAG,CAAC,KAA8B,EAAE,EAAE;IACvD,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,eAAe,EAAE,GAAG,KAAK,CAAC;IAE3D,OAAO,CACL,uCAAK,SAAS,EAAC,kBAAkB;QAC9B,WAAW,CAAC,CAAC,CAAC,8BAAC,uBAAY,IAAC,OAAO,EAAE,eAAK,CAAC,gBAAgB,GAAI,CAAC,CAAC,CAAC,IAAI;QACtE,UAAU,CAAC,CAAC,CAAC,8BAAC,yBAAc,IAAC,OAAO,EAAE,eAAK,CAAC,WAAW,EAAE,EAAE,SAAG,CAAC,CAAC,CAAC,CAChE,0CACE,SAAS,EAAC,mCAAmC,EAC7C,QAAQ,EAAE,UAAU,EACpB,OAAO,EAAE,eAAe,EACxB,IAAI,EAAC,QAAQ,IACZ,UAAU,CAAC,CAAC,CAAC,eAAK,CAAC,WAAW,CAAC,CAAC,CAAC,eAAK,CAAC,QAAQ,CACzC,CACV,CACG,CACP,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,aAAa,CAAC"}
|
package/package.json
CHANGED
package/src/LoadPaginator.tsx
CHANGED
|
@@ -48,15 +48,15 @@ const
|
|
|
48
48
|
currentPage = selectors.getCurrentView(list, token),
|
|
49
49
|
isFetching = selectors.isPageFetching(list, token, currentPage),
|
|
50
50
|
isFetched = selectors.isPageFetched(list, token, currentPage),
|
|
51
|
-
isNextFetching = selectors.isPageFetching(list, token, currentPage + 1),
|
|
52
|
-
isNextFetched = selectors.isPageFetched(list, token, currentPage + 1),
|
|
51
|
+
// isNextFetching = selectors.isPageFetching(list, token, currentPage + 1),
|
|
52
|
+
// isNextFetched = selectors.isPageFetched(list, token, currentPage + 1),
|
|
53
53
|
// eslint-disable-next-line max-len
|
|
54
54
|
resultsUpTo = selectors.getResultsUpToPage(list, token, entities, currentPage, settings.rowsPerLoad),
|
|
55
55
|
items = settings.manipulateItems(resultsUpTo),
|
|
56
56
|
total = selectors.getCurrentTotalResultsCount(list, token),
|
|
57
57
|
// currentPage was previously given to the following function
|
|
58
58
|
hasProblems = selectors.hasPageProblems(list, token),
|
|
59
|
-
shouldLoadNext = !isNextFetched && !isNextFetching,
|
|
59
|
+
// shouldLoadNext = !isNextFetched && !isNextFetching,
|
|
60
60
|
|
|
61
61
|
paginator = Immutable.Map({
|
|
62
62
|
currentPage,
|
|
@@ -64,14 +64,14 @@ const
|
|
|
64
64
|
isFetched,
|
|
65
65
|
isFetching,
|
|
66
66
|
items,
|
|
67
|
-
shouldLoadNext,
|
|
67
|
+
// shouldLoadNext,
|
|
68
68
|
total,
|
|
69
69
|
}),
|
|
70
70
|
|
|
71
71
|
dispatch = useDispatch(),
|
|
72
72
|
resetView : ResetView = (currentToken) => dispatch(settings.resetView(currentToken)),
|
|
73
73
|
changeView : ChangeView = (data) => dispatch(settings.changeView(data)),
|
|
74
|
-
loadData : LoadData = (page) => dispatch(settings.requestPage(
|
|
74
|
+
loadData : LoadData = (page) => dispatch(settings.requestPage(page, token)),
|
|
75
75
|
|
|
76
76
|
// items = paginator.get("items"),
|
|
77
77
|
// hasProblems = paginator.get("hasProblems"),
|
|
@@ -93,15 +93,22 @@ const
|
|
|
93
93
|
view: currentPage + 1,
|
|
94
94
|
});
|
|
95
95
|
|
|
96
|
-
if (shouldLoadNext) {
|
|
97
|
-
|
|
98
|
-
}
|
|
96
|
+
// if (shouldLoadNext) {
|
|
97
|
+
// loadData(currentPage + 1);
|
|
98
|
+
// }
|
|
99
99
|
}
|
|
100
100
|
};
|
|
101
101
|
|
|
102
102
|
// eslint-disable-next-line no-console
|
|
103
103
|
console.log("paginator", paginator ? paginator.toJS() : null);
|
|
104
104
|
|
|
105
|
+
// eslint-disable-next-line no-console
|
|
106
|
+
console.log("currentPage", currentPage);
|
|
107
|
+
|
|
108
|
+
// eslint-disable-next-line no-console
|
|
109
|
+
console.log("list", list.toJS());
|
|
110
|
+
// eslint-disable-next-line no-console
|
|
111
|
+
console.log("entities", entities.toJS());
|
|
105
112
|
|
|
106
113
|
useEffect(() => (
|
|
107
114
|
() => resetView(token)
|
|
@@ -111,7 +118,7 @@ const
|
|
|
111
118
|
if (shouldFetch) {
|
|
112
119
|
loadData(currentPage);
|
|
113
120
|
}
|
|
114
|
-
}, [shouldFetch, paginator]);
|
|
121
|
+
}, [shouldFetch, paginator, currentPage]);
|
|
115
122
|
|
|
116
123
|
if (items.size === 0 && isFetching) {
|
|
117
124
|
return <LoadingMessage message={words.LoadingData} />;
|
|
@@ -4,7 +4,7 @@ type Settings = {
|
|
|
4
4
|
manipulateItems: (items: any) => any;
|
|
5
5
|
resetView: (data: any) => any;
|
|
6
6
|
changeView: (data: any) => any;
|
|
7
|
-
requestPage: (page:
|
|
7
|
+
requestPage: (page: number, token: string) => any;
|
|
8
8
|
};
|
|
9
9
|
export type LoadPaginatorPropTypes = {
|
|
10
10
|
token: string;
|
package/src/LoadingButton.tsx
CHANGED
|
@@ -8,33 +8,23 @@ type LoadingButtonPropTypes = {
|
|
|
8
8
|
};
|
|
9
9
|
import words from "./words";
|
|
10
10
|
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
onClick={onLoadMoreClick}
|
|
30
|
-
type="button">
|
|
31
|
-
{isFetching ? words.LoadingData : words.LoadMore}
|
|
32
|
-
</button>
|
|
33
|
-
)}
|
|
34
|
-
</div>
|
|
35
|
-
);
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
}
|
|
11
|
+
const LoadingButton = (props : LoadingButtonPropTypes) => {
|
|
12
|
+
const { isFetching, hasProblems, onLoadMoreClick } = props;
|
|
13
|
+
|
|
14
|
+
return (
|
|
15
|
+
<div className="text-center my-2">
|
|
16
|
+
{hasProblems ? <ErrorMessage message={words.ThereWasAProblem} /> : null}
|
|
17
|
+
{isFetching ? <LoadingMessage message={words.LoadingData} sm /> : (
|
|
18
|
+
<button
|
|
19
|
+
className="btn btn-outline-info d-print-none"
|
|
20
|
+
disabled={isFetching}
|
|
21
|
+
onClick={onLoadMoreClick}
|
|
22
|
+
type="button">
|
|
23
|
+
{isFetching ? words.LoadingData : words.LoadMore}
|
|
24
|
+
</button>
|
|
25
|
+
)}
|
|
26
|
+
</div>
|
|
27
|
+
);
|
|
28
|
+
};
|
|
39
29
|
|
|
40
30
|
export default LoadingButton;
|