pocket-state 0.1.13 → 0.1.14

package/package.json

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

package/src/globalState/hooks.ts

@@ -1,28 +1,29 @@
-import {useCallback, useSyncExternalStore} from 'react';
+import {useCallback, useRef, useSyncExternalStore} from 'react';
 import type {Store} from './type';
+import {shallow} from './shallowEqual';
 
 export function useStore<T, S = T>(
   store: Store<T>,
   selector?: (state: T) => S,
+  isEqual = shallow,
 ): S {
-  const getSnapshot = useCallback(
-    () =>
-      selector
-        ? selector(store.getValue())
-        : (store.getValue() as unknown as S),
-    [store, selector],
-  );
+  const select = (s: T): S => (selector ? selector(s) : (s as unknown as S));
+  const lastRef = useRef<S>(select(store.getValue()));
+  const getSnapshot = useCallback(() => {
+    const next = select(store.getValue());
+    if (!isEqual(next, lastRef.current)) {
+      lastRef.current = next;
+    }
+    return lastRef.current;
+  }, [store, selector, isEqual]);
 
   const subscribe = useCallback(
     (onChange: () => void) => {
-      if (selector && store.subscribe) {
-        return store.subscribe(selector, onChange);
-      }
       return store.subscribe(() => {
         onChange();
       });
     },
-    [store, selector],
+    [store],
   );
 
   return useSyncExternalStore(subscribe, getSnapshot, getSnapshot);