pocket-state 0.1.13 → 0.1.15

package/package.json

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

package/src/globalState/hooks.ts

@@ -1,29 +1,31 @@
-import {useCallback, useSyncExternalStore} from 'react';
+import {useCallback} 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 getSnapshot = useCallback(
-    () =>
-      selector
-        ? selector(store.getValue())
-        : (store.getValue() as unknown as S),
-    [store, selector],
-  );
-
   const subscribe = useCallback(
-    (onChange: () => void) => {
-      if (selector && store.subscribe) {
-        return store.subscribe(selector, onChange);
-      }
-      return store.subscribe(() => {
-        onChange();
-      });
+    (notify: () => void) => {
+      return store.subscribe(() => notify());
     },
-    [store, selector],
+    [store],
   );
 
-  return useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
+  const getSnapshot = store.getValue;
+  const getServerSnapshot = store.getValue;
+
+  const sel = selector ?? (identity as unknown as (t: T) => S);
+  const eq = isEqual ?? Object.is;
+
+  return useSyncExternalStoreWithSelector(
+    subscribe,
+    getSnapshot,
+    getServerSnapshot,
+    sel,
+    eq,
+  );
 }