pocket-state 0.1.15 → 0.1.17

package/package.json

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

package/src/globalState/hooks.ts

@@ -1,31 +1,34 @@
-import {useCallback} from 'react';
+import {useCallback, useRef, useSyncExternalStore} from 'react';
 import type {Store} from './type';
-import {useSyncExternalStoreWithSelector} from 'use-sync-external-store/shim/with-selector';
 
-const identity = <T>(s: T) => s;
 export function useStore<T, S = T>(
   store: Store<T>,
   selector?: (state: T) => S,
-  isEqual?: (a: S, b: S) => boolean,
 ): 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(
-    (notify: () => void) => {
-      return store.subscribe(() => notify());
+    (onChange: () => void) => {
+      return store.subscribe(sel, (nextSlice: S) => {
+        lastStateRef.current = store.getValue();
+        lastSliceRef.current = nextSlice;
+        onChange();
+      });
     },
-    [store],
+    [store, sel],
   );
 
-  const getSnapshot = store.getValue;
-  const getServerSnapshot = store.getValue;
+  const getSnapshot = useCallback(() => {
+    const s = store.getValue();
+    if (s !== lastStateRef.current) {
+      lastStateRef.current = s;
+      lastSliceRef.current = sel(s);
+    }
+    return lastSliceRef.current;
+  }, [store, sel]);
 
-  const sel = selector ?? (identity as unknown as (t: T) => S);
-  const eq = isEqual ?? Object.is;
-
-  return useSyncExternalStoreWithSelector(
-    subscribe,
-    getSnapshot,
-    getServerSnapshot,
-    sel,
-    eq,
-  );
+  return useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
 }