pocket-state 0.1.19 → 0.1.21
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/package.json +1 -1
- package/src/globalState/hooks.ts +11 -9
- package/src/globalState/store.ts +13 -11
- package/src/globalState/type.d.ts +1 -1
package/package.json
CHANGED
package/src/globalState/hooks.ts
CHANGED
|
@@ -7,17 +7,19 @@ export function useStore<T, S = T>(
|
|
|
7
7
|
): S {
|
|
8
8
|
const sel = selector ?? ((s: T) => s as unknown as S);
|
|
9
9
|
|
|
10
|
-
|
|
11
10
|
const lastStateRef = useRef<T>(store.getValue());
|
|
12
11
|
const lastSliceRef = useRef<S>(sel(lastStateRef.current));
|
|
13
12
|
|
|
14
|
-
const subscribe = useCallback(
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
13
|
+
const subscribe = useCallback(
|
|
14
|
+
(onChange: () => void) => {
|
|
15
|
+
return store.subscribe(sel, (prevSlice: S, nextSlice: S) => {
|
|
16
|
+
lastStateRef.current = store.getValue();
|
|
17
|
+
lastSliceRef.current = nextSlice;
|
|
18
|
+
onChange();
|
|
19
|
+
});
|
|
20
|
+
},
|
|
21
|
+
[store, sel],
|
|
22
|
+
);
|
|
21
23
|
|
|
22
24
|
const getSnapshot = useCallback(() => {
|
|
23
25
|
const s = store.getValue();
|
|
@@ -26,7 +28,7 @@ export function useStore<T, S = T>(
|
|
|
26
28
|
lastSliceRef.current = sel(s);
|
|
27
29
|
}
|
|
28
30
|
return lastSliceRef.current;
|
|
29
|
-
}, []);
|
|
31
|
+
}, [store, sel]);
|
|
30
32
|
|
|
31
33
|
return useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
|
|
32
34
|
}
|
package/src/globalState/store.ts
CHANGED
|
@@ -48,25 +48,27 @@ export function createStore<T>(
|
|
|
48
48
|
}) as UseStoreGet<T>;
|
|
49
49
|
|
|
50
50
|
function subscribe(selectorOrListener: any, maybeListener?: any) {
|
|
51
|
-
let wrapped:
|
|
51
|
+
let wrapped: (nextState: T) => void;
|
|
52
52
|
|
|
53
53
|
if (typeof maybeListener === 'function') {
|
|
54
54
|
const selector: (s: T) => any = selectorOrListener;
|
|
55
|
+
const listener: Listener<any> = maybeListener;
|
|
56
|
+
|
|
55
57
|
let prevSlice = selector(state);
|
|
56
|
-
wrapped = (
|
|
57
|
-
const
|
|
58
|
-
if (!areEqual(
|
|
59
|
-
prevSlice
|
|
60
|
-
|
|
58
|
+
wrapped = (nextState: T) => {
|
|
59
|
+
const nextSlice = selector(nextState);
|
|
60
|
+
if (!areEqual(nextSlice, prevSlice)) {
|
|
61
|
+
listener(prevSlice, nextSlice);
|
|
62
|
+
prevSlice = nextSlice;
|
|
61
63
|
}
|
|
62
64
|
};
|
|
63
65
|
} else {
|
|
64
66
|
const listener: Listener<T> = selectorOrListener;
|
|
65
|
-
let
|
|
66
|
-
wrapped = (
|
|
67
|
-
if (!areEqual(
|
|
68
|
-
|
|
69
|
-
|
|
67
|
+
let prevState = state;
|
|
68
|
+
wrapped = (nextState: T) => {
|
|
69
|
+
if (!areEqual(nextState, prevState)) {
|
|
70
|
+
listener(prevState, nextState);
|
|
71
|
+
prevState = nextState;
|
|
70
72
|
}
|
|
71
73
|
};
|
|
72
74
|
}
|
|
@@ -11,7 +11,7 @@ interface FileList {
|
|
|
11
11
|
* Keep listeners pure and fast. Long-running side effects should live in
|
|
12
12
|
* middleware/effects instead of listeners.
|
|
13
13
|
*/
|
|
14
|
-
export interface Listener<T =
|
|
14
|
+
export interface Listener<T = unknown> {
|
|
15
15
|
(prev: T, next: T): void;
|
|
16
16
|
}
|
|
17
17
|
|