redux-paginator-immutable 17.0.29 → 17.0.32
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 +52 -20
- package/lib/LoadPaginator.js.map +1 -1
- package/lib/LoadPaginatorTypes.d.ts +1 -1
- package/package.json +1 -1
- package/src/LoadPaginator.tsx +68 -38
- package/src/LoadPaginatorTypes.ts +1 -1
package/lib/LoadPaginator.js
CHANGED
|
@@ -34,23 +34,53 @@ const selectors_1 = __importDefault(require("./selectors"));
|
|
|
34
34
|
const LoadingButton_1 = __importDefault(require("./LoadingButton"));
|
|
35
35
|
const words_1 = __importDefault(require("./words"));
|
|
36
36
|
const LoadPaginator = (props) => {
|
|
37
|
-
const { token, settings } = props, { list, entities } = (0, react_redux_1.useSelector)((state) => (selectors_1.default.getPaginators(state, settings.key))),
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
37
|
+
const { token, settings } = props, { list, entities } = (0, react_redux_1.useSelector)((state) => (selectors_1.default.getPaginators(state, settings.key))),
|
|
38
|
+
// paginator = useMemo(() => {
|
|
39
|
+
// const
|
|
40
|
+
// currentPage = selectors.getCurrentView(list, token),
|
|
41
|
+
// isFetching = selectors.isPageFetching(list, token, currentPage),
|
|
42
|
+
// isFetched = selectors.isPageFetched(list, token, currentPage),
|
|
43
|
+
// isNextFetching = selectors.isPageFetching(list, token, currentPage + 1),
|
|
44
|
+
// isNextFetched = selectors.isPageFetched(list, token, currentPage + 1),
|
|
45
|
+
// eslint-disable-next-line max-len
|
|
46
|
+
// resultsUpTo = selectors.getResultsUpToPage(list, token, entities, currentPage, settings.rowsPerLoad),
|
|
47
|
+
// items = settings.manipulateItems(resultsUpTo),
|
|
48
|
+
// total = selectors.getCurrentTotalResultsCount(list, token),
|
|
49
|
+
// // currentPage was previously given to the following function
|
|
50
|
+
// hasProblems = selectors.hasPageProblems(list, token),
|
|
51
|
+
// shouldLoadNext = !isNextFetched && !isNextFetching;
|
|
52
|
+
// return Immutable.Map({
|
|
53
|
+
// currentPage,
|
|
54
|
+
// hasProblems,
|
|
55
|
+
// isFetched,
|
|
56
|
+
// isFetching,
|
|
57
|
+
// items,
|
|
58
|
+
// shouldLoadNext,
|
|
59
|
+
// total,
|
|
60
|
+
// });
|
|
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), isNextFetching = selectors_1.default.isPageFetching(list, token, currentPage + 1), isNextFetched = selectors_1.default.isPageFetched(list, token, currentPage + 1),
|
|
63
|
+
// eslint-disable-next-line max-len
|
|
64
|
+
resultsUpTo = selectors_1.default.getResultsUpToPage(list, token, entities, currentPage, settings.rowsPerLoad), items = settings.manipulateItems(resultsUpTo), total = selectors_1.default.getCurrentTotalResultsCount(list, token),
|
|
65
|
+
// currentPage was previously given to the following function
|
|
66
|
+
hasProblems = selectors_1.default.hasPageProblems(list, token), shouldLoadNext = !isNextFetched && !isNextFetching, paginator = Immutable.Map({
|
|
67
|
+
currentPage,
|
|
68
|
+
hasProblems,
|
|
69
|
+
isFetched,
|
|
70
|
+
isFetching,
|
|
71
|
+
items,
|
|
72
|
+
shouldLoadNext,
|
|
73
|
+
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(page, token)),
|
|
75
|
+
// items = paginator.get("items"),
|
|
76
|
+
// hasProblems = paginator.get("hasProblems"),
|
|
77
|
+
// currentPage = paginator.get("currentPage"),
|
|
78
|
+
// isFetching = paginator.get("isFetching"),
|
|
79
|
+
showLoading = paginator.get("total") !== items.size,
|
|
80
|
+
// isFetched = paginator.get("isFetched"),
|
|
81
|
+
shouldFetch = !isFetched && !isFetching, handleLoadMoreClick = () => {
|
|
82
|
+
// const
|
|
83
|
+
// shouldLoadNext = paginator.get("shouldLoadNext");
|
|
54
84
|
if (hasProblems) {
|
|
55
85
|
loadData(currentPage);
|
|
56
86
|
}
|
|
@@ -65,14 +95,16 @@ const LoadPaginator = (props) => {
|
|
|
65
95
|
}
|
|
66
96
|
};
|
|
67
97
|
// eslint-disable-next-line no-console
|
|
68
|
-
console.log("paginator", paginator);
|
|
98
|
+
console.log("paginator", paginator ? paginator.toJS() : null);
|
|
69
99
|
// eslint-disable-next-line no-console
|
|
70
|
-
console.log("
|
|
100
|
+
console.log("list", list.toJS());
|
|
101
|
+
// eslint-disable-next-line no-console
|
|
102
|
+
console.log("entities", entities.toJS());
|
|
103
|
+
(0, react_1.useEffect)(() => (() => resetView(token)), []);
|
|
71
104
|
(0, react_1.useEffect)(() => {
|
|
72
105
|
if (shouldFetch) {
|
|
73
106
|
loadData(currentPage);
|
|
74
107
|
}
|
|
75
|
-
return () => resetView(token);
|
|
76
108
|
}, [shouldFetch, paginator]);
|
|
77
109
|
if (items.size === 0 && isFetching) {
|
|
78
110
|
return react_1.default.createElement(Messages_1.LoadingMessage, { message: words_1.default.LoadingData });
|
package/lib/LoadPaginator.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoadPaginator.js","sourceRoot":"","sources":["../src/LoadPaginator.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+
|
|
1
|
+
{"version":3,"file":"LoadPaginator.js","sourceRoot":"","sources":["../src/LoadPaginator.tsx"],"names":[],"mappings":"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"}
|
|
@@ -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/package.json
CHANGED
package/src/LoadPaginator.tsx
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
|
|
2
|
-
import React, { useEffect
|
|
2
|
+
import React, { useEffect } from "react";
|
|
3
3
|
import * as Immutable from "immutable";
|
|
4
4
|
import { useDispatch, useSelector } from "react-redux";
|
|
5
5
|
import { LargeErrorMessage, LoadingMessage } from "x25/Messages";
|
|
@@ -18,48 +18,72 @@ const
|
|
|
18
18
|
selectors.getPaginators(state, settings.key)
|
|
19
19
|
)),
|
|
20
20
|
|
|
21
|
-
paginator = useMemo(() => {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
}, [list, entities]),
|
|
21
|
+
// paginator = useMemo(() => {
|
|
22
|
+
// const
|
|
23
|
+
// currentPage = selectors.getCurrentView(list, token),
|
|
24
|
+
// isFetching = selectors.isPageFetching(list, token, currentPage),
|
|
25
|
+
// isFetched = selectors.isPageFetched(list, token, currentPage),
|
|
26
|
+
// isNextFetching = selectors.isPageFetching(list, token, currentPage + 1),
|
|
27
|
+
// isNextFetched = selectors.isPageFetched(list, token, currentPage + 1),
|
|
28
|
+
// eslint-disable-next-line max-len
|
|
29
|
+
// resultsUpTo = selectors.getResultsUpToPage(list, token, entities, currentPage, settings.rowsPerLoad),
|
|
30
|
+
// items = settings.manipulateItems(resultsUpTo),
|
|
31
|
+
// total = selectors.getCurrentTotalResultsCount(list, token),
|
|
32
|
+
// // currentPage was previously given to the following function
|
|
33
|
+
// hasProblems = selectors.hasPageProblems(list, token),
|
|
34
|
+
// shouldLoadNext = !isNextFetched && !isNextFetching;
|
|
35
|
+
|
|
36
|
+
// return Immutable.Map({
|
|
37
|
+
// currentPage,
|
|
38
|
+
// hasProblems,
|
|
39
|
+
// isFetched,
|
|
40
|
+
// isFetching,
|
|
41
|
+
// items,
|
|
42
|
+
// shouldLoadNext,
|
|
43
|
+
// total,
|
|
44
|
+
// });
|
|
45
|
+
// }, [list, entities, token]),
|
|
46
|
+
|
|
47
|
+
|
|
48
|
+
currentPage = selectors.getCurrentView(list, token),
|
|
49
|
+
isFetching = selectors.isPageFetching(list, token, currentPage),
|
|
50
|
+
isFetched = selectors.isPageFetched(list, token, currentPage),
|
|
51
|
+
isNextFetching = selectors.isPageFetching(list, token, currentPage + 1),
|
|
52
|
+
isNextFetched = selectors.isPageFetched(list, token, currentPage + 1),
|
|
53
|
+
// eslint-disable-next-line max-len
|
|
54
|
+
resultsUpTo = selectors.getResultsUpToPage(list, token, entities, currentPage, settings.rowsPerLoad),
|
|
55
|
+
items = settings.manipulateItems(resultsUpTo),
|
|
56
|
+
total = selectors.getCurrentTotalResultsCount(list, token),
|
|
57
|
+
// currentPage was previously given to the following function
|
|
58
|
+
hasProblems = selectors.hasPageProblems(list, token),
|
|
59
|
+
shouldLoadNext = !isNextFetched && !isNextFetching,
|
|
60
|
+
|
|
61
|
+
paginator = Immutable.Map({
|
|
62
|
+
currentPage,
|
|
63
|
+
hasProblems,
|
|
64
|
+
isFetched,
|
|
65
|
+
isFetching,
|
|
66
|
+
items,
|
|
67
|
+
shouldLoadNext,
|
|
68
|
+
total,
|
|
69
|
+
}),
|
|
46
70
|
|
|
47
71
|
dispatch = useDispatch(),
|
|
48
72
|
resetView : ResetView = (currentToken) => dispatch(settings.resetView(currentToken)),
|
|
49
73
|
changeView : ChangeView = (data) => dispatch(settings.changeView(data)),
|
|
50
|
-
loadData : LoadData = (page) => dispatch(settings.requestPage(
|
|
74
|
+
loadData : LoadData = (page) => dispatch(settings.requestPage(page, token)),
|
|
51
75
|
|
|
52
|
-
items = paginator.get("items"),
|
|
53
|
-
hasProblems = paginator.get("hasProblems"),
|
|
54
|
-
currentPage = paginator.get("currentPage"),
|
|
55
|
-
isFetching = paginator.get("isFetching"),
|
|
76
|
+
// items = paginator.get("items"),
|
|
77
|
+
// hasProblems = paginator.get("hasProblems"),
|
|
78
|
+
// currentPage = paginator.get("currentPage"),
|
|
79
|
+
// isFetching = paginator.get("isFetching"),
|
|
56
80
|
showLoading = paginator.get("total") !== items.size,
|
|
57
81
|
|
|
58
|
-
isFetched = paginator.get("isFetched"),
|
|
82
|
+
// isFetched = paginator.get("isFetched"),
|
|
59
83
|
shouldFetch = !isFetched && !isFetching,
|
|
60
84
|
handleLoadMoreClick = () => {
|
|
61
|
-
const
|
|
62
|
-
|
|
85
|
+
// const
|
|
86
|
+
// shouldLoadNext = paginator.get("shouldLoadNext");
|
|
63
87
|
|
|
64
88
|
if (hasProblems) {
|
|
65
89
|
loadData(currentPage);
|
|
@@ -76,16 +100,22 @@ const
|
|
|
76
100
|
};
|
|
77
101
|
|
|
78
102
|
// eslint-disable-next-line no-console
|
|
79
|
-
console.log("paginator", paginator);
|
|
103
|
+
console.log("paginator", paginator ? paginator.toJS() : null);
|
|
104
|
+
|
|
105
|
+
// eslint-disable-next-line no-console
|
|
106
|
+
console.log("list", list.toJS());
|
|
80
107
|
// eslint-disable-next-line no-console
|
|
81
|
-
console.log("
|
|
108
|
+
console.log("entities", entities.toJS());
|
|
109
|
+
|
|
110
|
+
|
|
111
|
+
useEffect(() => (
|
|
112
|
+
() => resetView(token)
|
|
113
|
+
), []);
|
|
82
114
|
|
|
83
115
|
useEffect(() => {
|
|
84
116
|
if (shouldFetch) {
|
|
85
117
|
loadData(currentPage);
|
|
86
118
|
}
|
|
87
|
-
|
|
88
|
-
return () => resetView(token);
|
|
89
119
|
}, [shouldFetch, paginator]);
|
|
90
120
|
|
|
91
121
|
if (items.size === 0 && isFetching) {
|
|
@@ -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;
|