pocket-state 0.1.16 → 0.1.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pocket-state",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "description": "tiny global store",
   "main": "src/index",
   "codegenConfig": {

package/src/globalState/hooks.ts

@@ -5,26 +5,30 @@ export function useStore<T, S = T>(
   store: Store<T>,
   selector?: (state: T) => S,
 ): S {
-  const sliceRef = useRef<S>(
-    selector ? selector(store.getValue()) : (store.getValue() as unknown as S),
-  );
+  const sel = selector ?? ((s: T) => s as unknown as S);
+
+  const lastStateRef = useRef<T>(store.getValue());
+  const lastSliceRef = useRef<S>(sel(lastStateRef.current));
 
   const subscribe = useCallback(
     (onChange: () => void) => {
-      if (selector) {
-        return store.subscribe(selector, (nextSlice: S) => {
-          sliceRef.current = nextSlice;
-          onChange();
-        });
-      }
-      return store.subscribe((next: T) => {
-        sliceRef.current = next as unknown as S;
+      return store.subscribe(sel, (nextSlice: S) => {
+        lastStateRef.current = store.getValue();
+        lastSliceRef.current = nextSlice;
         onChange();
       });
     },
-    [store, selector],
+    [store, sel],
   );
-  const getSnapshot = useCallback(() => sliceRef.current, []);
+
+  const getSnapshot = useCallback(() => {
+    const s = store.getValue();
+    if (s !== lastStateRef.current) {
+      lastStateRef.current = s;
+      lastSliceRef.current = sel(s);
+    }
+    return lastSliceRef.current;
+  }, [store, sel]);
 
   return useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
 }