@thisisagile/easy-react 10.15.0 → 11.0.0
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/dist/utils/Hooks.d.ts +1 -1
- package/dist/utils/Hooks.js +1 -4
- package/dist/utils/Hooks.js.map +1 -1
- package/package.json +4 -4
- package/src/utils/Hooks.ts +3 -7
package/dist/utils/Hooks.d.ts
CHANGED
|
@@ -7,4 +7,4 @@ export declare const useList: <E>(...items: E[]) => [List<E>, (e: List<E>) => Li
|
|
|
7
7
|
export declare const usePageList: <E>(...items: E[]) => [PageList<E>, (e: List<E>) => PageList<E>];
|
|
8
8
|
export declare const usePaging: <E>(f: (options?: PageOptions) => Promise<PageList<E>>, options?: PageOptions) => [PageList<E>, (options?: PageOptions) => Promise<PageList<E>>, boolean, number, number];
|
|
9
9
|
export declare const useGet: <E>(f: () => Promise<E>) => [E, () => Promise<E>];
|
|
10
|
-
export declare const useGetList: <E>(f: () => Promise<
|
|
10
|
+
export declare const useGetList: <E>(f: () => Promise<List<E> | List<never>>) => [List<E>, () => Promise<List<never> | PageList<E>>];
|
package/dist/utils/Hooks.js
CHANGED
|
@@ -65,10 +65,7 @@ const useGet = (f) => {
|
|
|
65
65
|
exports.useGet = useGet;
|
|
66
66
|
const useGetList = (f) => {
|
|
67
67
|
const [list, setList] = (0, exports.usePageList)();
|
|
68
|
-
const getter = () => f().then(l => {
|
|
69
|
-
setList(l);
|
|
70
|
-
return l;
|
|
71
|
-
});
|
|
68
|
+
const getter = () => f().then(l => setList((0, easy_1.isPageList)(l) ? l : (0, easy_1.toPageList)(l, { total: l.length })));
|
|
72
69
|
return [list, getter];
|
|
73
70
|
};
|
|
74
71
|
exports.useGetList = useGetList;
|
package/dist/utils/Hooks.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Hooks.js","sourceRoot":"","sources":["../../src/utils/Hooks.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"Hooks.js","sourceRoot":"","sources":["../../src/utils/Hooks.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@thisisagile/easy-react",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "11.0.0",
|
|
4
4
|
"description": "Straightforward library building micro applications in react",
|
|
5
5
|
"author": "Sander Hoogendoorn",
|
|
6
6
|
"license": "MIT",
|
|
@@ -34,15 +34,15 @@
|
|
|
34
34
|
"access": "public"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
|
-
"@thisisagile/easy-test": "
|
|
38
|
-
"@thisisagile/easy-test-react": "
|
|
37
|
+
"@thisisagile/easy-test": "11.0.0",
|
|
38
|
+
"@thisisagile/easy-test-react": "11.0.0",
|
|
39
39
|
"@types/copyfiles": "^2",
|
|
40
40
|
"copyfiles": "^2.4.1",
|
|
41
41
|
"jest-environment-jsdom": "^28.1.0",
|
|
42
42
|
"jest-transform-stub": "^2.0.0"
|
|
43
43
|
},
|
|
44
44
|
"dependencies": {
|
|
45
|
-
"@thisisagile/easy": "
|
|
45
|
+
"@thisisagile/easy": "11.0.0",
|
|
46
46
|
"next": "^12.1.6",
|
|
47
47
|
"next-transpile-modules": "^9.0.0",
|
|
48
48
|
"react": "^18.1.0",
|
package/src/utils/Hooks.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { List, PageList, PageOptions, toList, toPageList, Validatable } from '@thisisagile/easy';
|
|
1
|
+
import { isPageList, List, PageList, PageOptions, toList, toPageList, Validatable } from '@thisisagile/easy';
|
|
2
2
|
import { useState } from 'react';
|
|
3
3
|
|
|
4
4
|
export const useToggle = (initialState = false): [boolean, () => void] => {
|
|
@@ -68,12 +68,8 @@ export const useGet = <E>(f: () => Promise<E>): [E, () => Promise<E>] => {
|
|
|
68
68
|
return [item, getter];
|
|
69
69
|
};
|
|
70
70
|
|
|
71
|
-
export const useGetList = <E>(f: () => Promise<
|
|
71
|
+
export const useGetList = <E>(f: () => Promise<List<E> | List<never>>): [List<E>, () => Promise<PageList<E> | List<never>>] => {
|
|
72
72
|
const [list, setList] = usePageList<E>();
|
|
73
|
-
const getter = () =>
|
|
74
|
-
f().then(l => {
|
|
75
|
-
setList(l);
|
|
76
|
-
return l;
|
|
77
|
-
});
|
|
73
|
+
const getter = () => f().then(l => setList(isPageList(l) ? l : toPageList(l, { total: l.length })));
|
|
78
74
|
return [list, getter];
|
|
79
75
|
};
|