@tamagui/use-store 1.57.1 → 1.57.3

package/dist/cjs/reaction.js

@@ -31,14 +31,10 @@ const dispose = (d) => {
     d();
   }
 };
-function useReaction(store, selector, receiver, props, equalityFn = import_comparators.isEqualSubsetShallow, memoArgs) {
-  const storeInfo = (0, import_useStore.getStoreInfo)(store, props);
-  return (0, import_react.useMemo)(
-    () => reaction(storeInfo, selector, receiver, equalityFn),
-    [memoArgs]
-  );
+function useReaction(store, selector, receiver, equalityFn = import_comparators.isEqualSubsetShallow, memoArgs) {
+  return (0, import_react.useMemo)(() => reaction(store, selector, receiver, equalityFn), [memoArgs]);
 }
-function reaction({ store, subscribe }, selector, receiver, equalityFn = import_comparators.isEqualSubsetShallow) {
+function reaction(store, selector, receiver, equalityFn = import_comparators.isEqualSubsetShallow) {
   let last = void 0;
   let innerDispose;
   function updateReaction() {
@@ -67,7 +63,7 @@ function reaction({ store, subscribe }, selector, receiver, equalityFn = import_
       (0, import_useStore.setIsInReaction)(false);
     }
   }
-  const disposeSubscribe = subscribe(updateReaction);
+  const disposeSubscribe = store.subscribe(updateReaction);
   updateReaction();
   return () => {
     disposeSubscribe();

package/dist/cjs/reaction.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/reaction.tsx"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAwB;AAExB,yBAAqC;AACrC,uBAA6B;AAE7B,sBAA8C;AAE9C,MAAM,UAAU,CAAC,MAAW;AAC1B,MAAI,OAAO,MAAM,YAAY;AAC3B,MAAE;AAAA,EACJ;AACF;AAEO,SAAS,YACd,OACA,UACA,UAGA,OACA,aAA0C,yCAC1C,UACA;AACA,QAAM,gBAAY,8BAAa,OAAO,KAAK;AAC3C,aAAO;AAAA,IACL,MAAM,SAAS,WAAW,UAAiB,UAAU,UAAU;AAAA,IAC/D,CAAC,QAAQ;AAAA,EACX;AACF;AAEO,SAAS,SAId,EAAE,OAAO,UAAU,GACnB,UACA,UAGA,aAA0C,yCAC1C;AACA,MAAI,OAAY;AAChB,MAAI;AAEJ,WAAS,iBAAiB;AA5C5B;AA6CI,QAAI;AACF,2CAAgB,IAAI;AACpB,YAAM,gBAAgB,MAAM,6BAAY,KAAK;AAC7C,YAAM,OAAO,SAAS,aAAa;AACnC,UAAI,CAAC,WAAW,MAAM,IAAI,GAAG;AAC3B,YAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,kBAAQ;AAAA,YACN,uBAAW,SAAS,KAAK,SAAS,EAAE,CAAC,KAAK,cAAc,YAAY,IAAI,KACtE,WAAM,UAAN,mBAAa,MAAK,IAAI,MAAM,MAAM,EAAE,KAAK,EAC3C,KAAK,IAAI,OAAO,IAAI;AAAA,YACpB;AAAA,UACF;AACA,kBAAQ,eAAe,SAAS;AAChC,kBAAQ,MAAM;AACd,kBAAQ,SAAS;AAEjB,kBAAQ,IAAI,SAAS,IAAI;AACzB,kBAAQ,SAAS;AAAA,QACnB;AACA,gBAAQ,YAAY;AACpB,eAAO;AACP,uBAAe,SAAS,IAAI;AAAA,MAC9B;AAAA,IACF,UAAE;AACA,2CAAgB,KAAK;AAAA,IACvB;AAAA,EACF;AAEA,QAAM,mBAAmB,UAAU,cAAc;AACjD,iBAAe;AAEf,SAAO,MAAM;AACX,qBAAiB;AACjB,YAAQ,YAAY;AAAA,EACtB;AACF;",
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAwB;AAExB,yBAAqC;AACrC,uBAA6B;AAE7B,sBAAgC;AAEhC,MAAM,UAAU,CAAC,MAAW;AAC1B,MAAI,OAAO,MAAM,YAAY;AAC3B,MAAE;AAAA,EACJ;AACF;AAEO,SAAS,YAId,OACA,UACA,UAGA,aAA0C,yCAC1C,UACA;AACA,aAAO,sBAAQ,MAAM,SAAS,OAAO,UAAU,UAAU,UAAU,GAAG,CAAC,QAAQ,CAAC;AAClF;AAEO,SAAS,SAId,OACA,UACA,UAGA,aAA0C,yCAC1C;AACA,MAAI,OAAY;AAChB,MAAI;AAEJ,WAAS,iBAAiB;AA1C5B;AA2CI,QAAI;AACF,2CAAgB,IAAI;AACpB,YAAM,gBAAgB,MAAM,6BAAY,KAAK;AAC7C,YAAM,OAAO,SAAS,aAAa;AACnC,UAAI,CAAC,WAAW,MAAM,IAAI,GAAG;AAC3B,YAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,kBAAQ;AAAA,YACN,uBAAW,SAAS,KAAK,SAAS,EAAE,CAAC,KAAK,cAAc,YAAY,IAAI,KACtE,WAAM,UAAN,mBAAa,MAAK,IAAI,MAAM,MAAM,EAAE,KAAK,EAC3C,KAAK,IAAI,OAAO,IAAI;AAAA,YACpB;AAAA,UACF;AACA,kBAAQ,eAAe,SAAS;AAChC,kBAAQ,MAAM;AACd,kBAAQ,SAAS;AAEjB,kBAAQ,IAAI,SAAS,IAAI;AACzB,kBAAQ,SAAS;AAAA,QACnB;AACA,gBAAQ,YAAY;AACpB,eAAO;AACP,uBAAe,SAAS,IAAI;AAAA,MAC9B;AAAA,IACF,UAAE;AACA,2CAAgB,KAAK;AAAA,IACvB;AAAA,EACF;AAEA,QAAM,mBAAmB,MAAM,UAAU,cAAc;AACvD,iBAAe;AAEf,SAAO,MAAM;AACX,qBAAiB;AACjB,YAAQ,YAAY;AAAA,EACtB;AACF;",
   "names": []
 }

package/dist/cjs/selector.js

@@ -18,6 +18,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var selector_exports = {};
 __export(selector_exports, {
+  selector: () => selector,
   useSelector: () => useSelector
 });
 module.exports = __toCommonJS(selector_exports);
@@ -40,30 +41,64 @@ const logUpdate = process.env.NODE_ENV === "development" ? (fn, stores, last, ne
   console.log("  next", next);
   console.groupEnd();
 } : null;
+function selector(fn) {
+  let prev = runStoreSelector(fn);
+  let disposeValue = null;
+  const subscribe = () => {
+    return subscribeToStores([...prev.stores], () => {
+      try {
+        disposeValue == null ? void 0 : disposeValue();
+        (0, import_useStore.setIsInReaction)(true);
+        const next = runStoreSelector(fn);
+        if (typeof next.value === "function") {
+          disposeValue = next.value;
+          if (process.env.NODE_ENV === "development") {
+            logUpdate(fn, [...next.stores], "(fn)", "(fn)");
+          }
+          return;
+        }
+        if ((0, import_comparators.isEqualSubsetShallow)(prev.stores, next.stores) && (0, import_comparators.isEqualSubsetShallow)(prev.value, next.value)) {
+          return;
+        }
+        if (process.env.NODE_ENV === "development") {
+          logUpdate(fn, [...next.stores], prev.value, next.value);
+        }
+        prev = next;
+        dispose();
+        dispose = subscribe();
+      } finally {
+        (0, import_useStore.setIsInReaction)(false);
+      }
+    });
+  };
+  let dispose = subscribe();
+  return () => {
+    dispose();
+    disposeValue == null ? void 0 : disposeValue();
+  };
+}
 function useSelector(fn) {
   const [state, setState] = (0, import_react.useState)(() => {
     return runStoreSelector(fn);
   });
   (0, import_react.useEffect)(() => {
     let dispose;
-    const unsub = subscribeToStores([...state.storeInfos], () => {
+    const unsub = subscribeToStores([...state.stores], () => {
       dispose == null ? void 0 : dispose();
       const next = runStoreSelector(fn);
-      const nextStoreInfos = [...next.storeInfos];
-      const prevStoreInfos = [...state.storeInfos];
       if (typeof next.value === "function") {
         if (process.env.NODE_ENV === "development") {
-          logUpdate(fn, nextStoreInfos, "(fn)", "(fn)");
+          logUpdate(fn, [...next.stores], "(fn)", "(fn)");
         }
         dispose = next.value;
         return;
       }
       setState((prev) => {
-        if ((0, import_comparators.isEqualSubsetShallow)(prevStoreInfos, nextStoreInfos) && (0, import_comparators.isEqualSubsetShallow)(prev.value, next.value)) {
+        if ((0, import_comparators.isEqualSubsetShallow)(prev.stores, next.stores) && (0, import_comparators.isEqualSubsetShallow)(prev.value, next.value)) {
           return prev;
         }
         if (process.env.NODE_ENV === "development") {
-          logUpdate(fn, nextStoreInfos, prev.value, next.value);
+          logUpdate(fn, [...next.stores], prev.value, next.value);
         }
         return next;
       });
@@ -72,19 +107,19 @@ function useSelector(fn) {
       unsub();
       dispose == null ? void 0 : dispose();
     };
-  }, [[...state.storeInfos].map((i) => i.uid).join(",")]);
+  }, [...state.stores]);
   return state.value;
 }
-function runStoreSelector(selector) {
-  const storeInfos = /* @__PURE__ */ new Set();
-  const dispose = (0, import_useStore.trackStoresAccess)((storeInfo) => {
-    storeInfos.add(storeInfo);
+function runStoreSelector(selector2) {
+  const stores = /* @__PURE__ */ new Set();
+  const dispose = (0, import_useStore.trackStoresAccess)((store) => {
+    stores.add(store);
   });
-  const value = selector();
+  const value = selector2();
   dispose();
   return {
     value,
-    storeInfos
+    stores
   };
 }
 function subscribeToStores(stores, onUpdate) {
@@ -98,6 +133,7 @@ function subscribeToStores(stores, onUpdate) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  selector,
   useSelector
 });
 //# sourceMappingURL=selector.js.map

package/dist/cjs/selector.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/selector.tsx"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAoC;AAEpC,yBAAqC;AACrC,uBAA6B;AAE7B,sBAAkC;AAIlC,MAAM,YACJ,QAAQ,IAAI,aAAa,gBACrB,CAAC,IAAS,QAAe,MAAW,SAAc;AAChD,QAAM,kBAAkB,CAAC,UAAe;AAZhD;AAaU,UAAM,MAAM,MAAM,6BAAY,KAAK;AACnC,WAAO,GAAG,IAAI,YAAY,IAAI,KAAG,WAAM,UAAN,mBAAa,MAAK,IAAI,MAAM,MAAM,EAAE,KAAK,EAAE;AAAA,EAC9E;AACA,QAAM,aAAa,OAAO,IAAI,eAAe,EAAE,KAAK,IAAI;AACxD,QAAM,OAAO,6BAAY,GAAG,IAAI,IAAI,UAAU,OAAO,IAAI,OAAO,IAAI;AACpE,UAAQ,eAAe,MAAM,gBAAgB;AAC7C,UAAQ,eAAe,SAAS;AAChC,UAAQ,MAAM;AACd,UAAQ,SAAS;AAEjB,UAAQ,IAAI,UAAU,IAAI;AAC1B,UAAQ,SAAS;AACnB,IACA;AA2CC,SAAS,YAAe,IAAgB;AAC7C,QAAM,CAAC,OAAO,QAAQ,QAAI,uBAAS,MAAM;AACvC,WAAO,iBAAiB,EAAE;AAAA,EAC5B,CAAC;AAED,8BAAU,MAAM;AACd,QAAI;AACJ,UAAM,QAAQ,kBAAkB,CAAC,GAAG,MAAM,UAAU,GAAG,MAAM;AAC3D;AACA,YAAM,OAAO,iBAAiB,EAAE;AAEhC,YAAM,iBAAiB,CAAC,GAAG,KAAK,UAAU;AAC1C,YAAM,iBAAiB,CAAC,GAAG,MAAM,UAAU;AAG3C,UAAI,OAAO,KAAK,UAAU,YAAY;AACpC,YAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,oBAAW,IAAI,gBAAgB,QAAQ,MAAM;AAAA,QAC/C;AACA,kBAAU,KAAK;AACf;AAAA,MACF;AACA,eAAS,CAAC,SAAS;AACjB,gBACE,yCAAqB,gBAAgB,cAAc,SACnD,yCAAqB,KAAK,OAAO,KAAK,KAAK,GAC3C;AACA,iBAAO;AAAA,QACT;AACA,YAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,oBAAW,IAAI,gBAAgB,KAAK,OAAO,KAAK,KAAK;AAAA,QACvD;AACA,eAAO;AAAA,MACT,CAAC;AAAA,IACH,CAAC;AACD,WAAO,MAAM;AACX,YAAM;AACN;AAAA,IACF;AAAA,EACF,GAAG,CAAC,CAAC,GAAG,MAAM,UAAU,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC;AAEtD,SAAO,MAAM;AACf;AAEA,SAAS,iBAAoB,UAG3B;AACA,QAAM,aAAa,oBAAI,IAAe;AACtC,QAAM,cAAU,mCAAkB,CAAC,cAAc;AAC/C,eAAW,IAAI,SAAS;AAAA,EAC1B,CAAC;AACD,QAAM,QAAQ,SAAS;AACvB,UAAQ;AACR,SAAO;AAAA,IACL;AAAA,IACA;AAAA,EACF;AACF;AAEA,SAAS,kBAAkB,QAAqB,UAAqB;AACnE,QAAM,WAAuB,CAAC;AAC9B,aAAW,SAAS,QAAQ;AAC1B,aAAS,KAAK,MAAM,UAAU,QAAQ,CAAC;AAAA,EACzC;AACA,SAAO,MAAM;AACX,aAAS,QAAQ,CAAC,MAAM,EAAE,CAAC;AAAA,EAC7B;AACF;",
-  "names": []
+  "mappings": "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",
+  "names": ["selector"]
 }

package/dist/esm/reaction.js

@@ -1,20 +1,16 @@
 import { useMemo } from "react";
 import { isEqualSubsetShallow } from "./comparators";
 import { UNWRAP_PROXY } from "./constants";
-import { getStoreInfo, setIsInReaction } from "./useStore";
+import { setIsInReaction } from "./useStore";
 const dispose = (d) => {
   if (typeof d === "function") {
     d();
   }
 };
-function useReaction(store, selector, receiver, props, equalityFn = isEqualSubsetShallow, memoArgs) {
-  const storeInfo = getStoreInfo(store, props);
-  return useMemo(
-    () => reaction(storeInfo, selector, receiver, equalityFn),
-    [memoArgs]
-  );
+function useReaction(store, selector, receiver, equalityFn = isEqualSubsetShallow, memoArgs) {
+  return useMemo(() => reaction(store, selector, receiver, equalityFn), [memoArgs]);
 }
-function reaction({ store, subscribe }, selector, receiver, equalityFn = isEqualSubsetShallow) {
+function reaction(store, selector, receiver, equalityFn = isEqualSubsetShallow) {
   let last = void 0;
   let innerDispose;
   function updateReaction() {
@@ -43,7 +39,7 @@ function reaction({ store, subscribe }, selector, receiver, equalityFn = isEqual
       setIsInReaction(false);
     }
   }
-  const disposeSubscribe = subscribe(updateReaction);
+  const disposeSubscribe = store.subscribe(updateReaction);
   updateReaction();
   return () => {
     disposeSubscribe();

package/dist/esm/reaction.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/reaction.tsx"],
-  "mappings": "AAAA,SAAS,eAAe;AAExB,SAAS,4BAA4B;AACrC,SAAS,oBAAoB;AAE7B,SAAS,cAAc,uBAAuB;AAE9C,MAAM,UAAU,CAAC,MAAW;AAC1B,MAAI,OAAO,MAAM,YAAY;AAC3B,MAAE;AAAA,EACJ;AACF;AAEO,SAAS,YACd,OACA,UACA,UAGA,OACA,aAA0C,sBAC1C,UACA;AACA,QAAM,YAAY,aAAa,OAAO,KAAK;AAC3C,SAAO;AAAA,IACL,MAAM,SAAS,WAAW,UAAiB,UAAU,UAAU;AAAA,IAC/D,CAAC,QAAQ;AAAA,EACX;AACF;AAEO,SAAS,SAId,EAAE,OAAO,UAAU,GACnB,UACA,UAGA,aAA0C,sBAC1C;AACA,MAAI,OAAY;AAChB,MAAI;AAEJ,WAAS,iBAAiB;AA5C5B;AA6CI,QAAI;AACF,sBAAgB,IAAI;AACpB,YAAM,gBAAgB,MAAM,YAAY,KAAK;AAC7C,YAAM,OAAO,SAAS,aAAa;AACnC,UAAI,CAAC,WAAW,MAAM,IAAI,GAAG;AAC3B,YAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,kBAAQ;AAAA,YACN,uBAAW,SAAS,KAAK,SAAS,EAAE,CAAC,KAAK,cAAc,YAAY,IAAI,KACtE,WAAM,UAAN,mBAAa,MAAK,IAAI,MAAM,MAAM,EAAE,KAAK,EAC3C,KAAK,IAAI,OAAO,IAAI;AAAA,YACpB;AAAA,UACF;AACA,kBAAQ,eAAe,SAAS;AAChC,kBAAQ,MAAM;AACd,kBAAQ,SAAS;AAEjB,kBAAQ,IAAI,SAAS,IAAI;AACzB,kBAAQ,SAAS;AAAA,QACnB;AACA,gBAAQ,YAAY;AACpB,eAAO;AACP,uBAAe,SAAS,IAAI;AAAA,MAC9B;AAAA,IACF,UAAE;AACA,sBAAgB,KAAK;AAAA,IACvB;AAAA,EACF;AAEA,QAAM,mBAAmB,UAAU,cAAc;AACjD,iBAAe;AAEf,SAAO,MAAM;AACX,qBAAiB;AACjB,YAAQ,YAAY;AAAA,EACtB;AACF;",
+  "mappings": "AAAA,SAAS,eAAe;AAExB,SAAS,4BAA4B;AACrC,SAAS,oBAAoB;AAE7B,SAAS,uBAAuB;AAEhC,MAAM,UAAU,CAAC,MAAW;AAC1B,MAAI,OAAO,MAAM,YAAY;AAC3B,MAAE;AAAA,EACJ;AACF;AAEO,SAAS,YAId,OACA,UACA,UAGA,aAA0C,sBAC1C,UACA;AACA,SAAO,QAAQ,MAAM,SAAS,OAAO,UAAU,UAAU,UAAU,GAAG,CAAC,QAAQ,CAAC;AAClF;AAEO,SAAS,SAId,OACA,UACA,UAGA,aAA0C,sBAC1C;AACA,MAAI,OAAY;AAChB,MAAI;AAEJ,WAAS,iBAAiB;AA1C5B;AA2CI,QAAI;AACF,sBAAgB,IAAI;AACpB,YAAM,gBAAgB,MAAM,YAAY,KAAK;AAC7C,YAAM,OAAO,SAAS,aAAa;AACnC,UAAI,CAAC,WAAW,MAAM,IAAI,GAAG;AAC3B,YAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,kBAAQ;AAAA,YACN,uBAAW,SAAS,KAAK,SAAS,EAAE,CAAC,KAAK,cAAc,YAAY,IAAI,KACtE,WAAM,UAAN,mBAAa,MAAK,IAAI,MAAM,MAAM,EAAE,KAAK,EAC3C,KAAK,IAAI,OAAO,IAAI;AAAA,YACpB;AAAA,UACF;AACA,kBAAQ,eAAe,SAAS;AAChC,kBAAQ,MAAM;AACd,kBAAQ,SAAS;AAEjB,kBAAQ,IAAI,SAAS,IAAI;AACzB,kBAAQ,SAAS;AAAA,QACnB;AACA,gBAAQ,YAAY;AACpB,eAAO;AACP,uBAAe,SAAS,IAAI;AAAA,MAC9B;AAAA,IACF,UAAE;AACA,sBAAgB,KAAK;AAAA,IACvB;AAAA,EACF;AAEA,QAAM,mBAAmB,MAAM,UAAU,cAAc;AACvD,iBAAe;AAEf,SAAO,MAAM;AACX,qBAAiB;AACjB,YAAQ,YAAY;AAAA,EACtB;AACF;",
   "names": []
 }

package/dist/esm/selector.js

@@ -1,7 +1,7 @@
 import { useEffect, useState } from "react";
 import { isEqualSubsetShallow } from "./comparators";
 import { UNWRAP_PROXY } from "./constants";
-import { trackStoresAccess } from "./useStore";
+import { setIsInReaction, trackStoresAccess } from "./useStore";
 const logUpdate = process.env.NODE_ENV === "development" ? (fn, stores, last, next) => {
   const getStoreLogName = (store) => {
     var _a;
@@ -17,30 +17,64 @@ const logUpdate = process.env.NODE_ENV === "development" ? (fn, stores, last, ne
   console.log("  next", next);
   console.groupEnd();
 } : null;
+function selector(fn) {
+  let prev = runStoreSelector(fn);
+  let disposeValue = null;
+  const subscribe = () => {
+    return subscribeToStores([...prev.stores], () => {
+      try {
+        disposeValue == null ? void 0 : disposeValue();
+        setIsInReaction(true);
+        const next = runStoreSelector(fn);
+        if (typeof next.value === "function") {
+          disposeValue = next.value;
+          if (process.env.NODE_ENV === "development") {
+            logUpdate(fn, [...next.stores], "(fn)", "(fn)");
+          }
+          return;
+        }
+        if (isEqualSubsetShallow(prev.stores, next.stores) && isEqualSubsetShallow(prev.value, next.value)) {
+          return;
+        }
+        if (process.env.NODE_ENV === "development") {
+          logUpdate(fn, [...next.stores], prev.value, next.value);
+        }
+        prev = next;
+        dispose();
+        dispose = subscribe();
+      } finally {
+        setIsInReaction(false);
+      }
+    });
+  };
+  let dispose = subscribe();
+  return () => {
+    dispose();
+    disposeValue == null ? void 0 : disposeValue();
+  };
+}
 function useSelector(fn) {
   const [state, setState] = useState(() => {
     return runStoreSelector(fn);
   });
   useEffect(() => {
     let dispose;
-    const unsub = subscribeToStores([...state.storeInfos], () => {
+    const unsub = subscribeToStores([...state.stores], () => {
       dispose == null ? void 0 : dispose();
       const next = runStoreSelector(fn);
-      const nextStoreInfos = [...next.storeInfos];
-      const prevStoreInfos = [...state.storeInfos];
       if (typeof next.value === "function") {
         if (process.env.NODE_ENV === "development") {
-          logUpdate(fn, nextStoreInfos, "(fn)", "(fn)");
+          logUpdate(fn, [...next.stores], "(fn)", "(fn)");
         }
         dispose = next.value;
         return;
       }
       setState((prev) => {
-        if (isEqualSubsetShallow(prevStoreInfos, nextStoreInfos) && isEqualSubsetShallow(prev.value, next.value)) {
+        if (isEqualSubsetShallow(prev.stores, next.stores) && isEqualSubsetShallow(prev.value, next.value)) {
           return prev;
         }
         if (process.env.NODE_ENV === "development") {
-          logUpdate(fn, nextStoreInfos, prev.value, next.value);
+          logUpdate(fn, [...next.stores], prev.value, next.value);
         }
         return next;
       });
@@ -49,19 +83,19 @@ function useSelector(fn) {
       unsub();
       dispose == null ? void 0 : dispose();
     };
-  }, [[...state.storeInfos].map((i) => i.uid).join(",")]);
+  }, [...state.stores]);
   return state.value;
 }
-function runStoreSelector(selector) {
-  const storeInfos = /* @__PURE__ */ new Set();
-  const dispose = trackStoresAccess((storeInfo) => {
-    storeInfos.add(storeInfo);
+function runStoreSelector(selector2) {
+  const stores = /* @__PURE__ */ new Set();
+  const dispose = trackStoresAccess((store) => {
+    stores.add(store);
   });
-  const value = selector();
+  const value = selector2();
   dispose();
   return {
     value,
-    storeInfos
+    stores
   };
 }
 function subscribeToStores(stores, onUpdate) {
@@ -74,6 +108,7 @@ function subscribeToStores(stores, onUpdate) {
   };
 }
 export {
+  selector,
   useSelector
 };
 //# sourceMappingURL=selector.js.map

package/dist/esm/selector.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/selector.tsx"],
-  "mappings": "AAAA,SAAS,WAAW,gBAAgB;AAEpC,SAAS,4BAA4B;AACrC,SAAS,oBAAoB;AAE7B,SAAS,yBAAyB;AAIlC,MAAM,YACJ,QAAQ,IAAI,aAAa,gBACrB,CAAC,IAAS,QAAe,MAAW,SAAc;AAChD,QAAM,kBAAkB,CAAC,UAAe;AAZhD;AAaU,UAAM,MAAM,MAAM,YAAY,KAAK;AACnC,WAAO,GAAG,IAAI,YAAY,IAAI,KAAG,WAAM,UAAN,mBAAa,MAAK,IAAI,MAAM,MAAM,EAAE,KAAK,EAAE;AAAA,EAC9E;AACA,QAAM,aAAa,OAAO,IAAI,eAAe,EAAE,KAAK,IAAI;AACxD,QAAM,OAAO,6BAAY,GAAG,IAAI,IAAI,UAAU,OAAO,IAAI,OAAO,IAAI;AACpE,UAAQ,eAAe,MAAM,gBAAgB;AAC7C,UAAQ,eAAe,SAAS;AAChC,UAAQ,MAAM;AACd,UAAQ,SAAS;AAEjB,UAAQ,IAAI,UAAU,IAAI;AAC1B,UAAQ,SAAS;AACnB,IACA;AA2CC,SAAS,YAAe,IAAgB;AAC7C,QAAM,CAAC,OAAO,QAAQ,IAAI,SAAS,MAAM;AACvC,WAAO,iBAAiB,EAAE;AAAA,EAC5B,CAAC;AAED,YAAU,MAAM;AACd,QAAI;AACJ,UAAM,QAAQ,kBAAkB,CAAC,GAAG,MAAM,UAAU,GAAG,MAAM;AAC3D;AACA,YAAM,OAAO,iBAAiB,EAAE;AAEhC,YAAM,iBAAiB,CAAC,GAAG,KAAK,UAAU;AAC1C,YAAM,iBAAiB,CAAC,GAAG,MAAM,UAAU;AAG3C,UAAI,OAAO,KAAK,UAAU,YAAY;AACpC,YAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,oBAAW,IAAI,gBAAgB,QAAQ,MAAM;AAAA,QAC/C;AACA,kBAAU,KAAK;AACf;AAAA,MACF;AACA,eAAS,CAAC,SAAS;AACjB,YACE,qBAAqB,gBAAgB,cAAc,KACnD,qBAAqB,KAAK,OAAO,KAAK,KAAK,GAC3C;AACA,iBAAO;AAAA,QACT;AACA,YAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,oBAAW,IAAI,gBAAgB,KAAK,OAAO,KAAK,KAAK;AAAA,QACvD;AACA,eAAO;AAAA,MACT,CAAC;AAAA,IACH,CAAC;AACD,WAAO,MAAM;AACX,YAAM;AACN;AAAA,IACF;AAAA,EACF,GAAG,CAAC,CAAC,GAAG,MAAM,UAAU,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC;AAEtD,SAAO,MAAM;AACf;AAEA,SAAS,iBAAoB,UAG3B;AACA,QAAM,aAAa,oBAAI,IAAe;AACtC,QAAM,UAAU,kBAAkB,CAAC,cAAc;AAC/C,eAAW,IAAI,SAAS;AAAA,EAC1B,CAAC;AACD,QAAM,QAAQ,SAAS;AACvB,UAAQ;AACR,SAAO;AAAA,IACL;AAAA,IACA;AAAA,EACF;AACF;AAEA,SAAS,kBAAkB,QAAqB,UAAqB;AACnE,QAAM,WAAuB,CAAC;AAC9B,aAAW,SAAS,QAAQ;AAC1B,aAAS,KAAK,MAAM,UAAU,QAAQ,CAAC;AAAA,EACzC;AACA,SAAO,MAAM;AACX,aAAS,QAAQ,CAAC,MAAM,EAAE,CAAC;AAAA,EAC7B;AACF;",
-  "names": []
+  "mappings": "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",
+  "names": ["selector"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/use-store",
-  "version": "1.57.1",
+  "version": "1.57.3",
   "types": "./types/index.d.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -27,10 +27,10 @@
     }
   },
   "dependencies": {
-    "@tamagui/simple-hash": "1.57.1"
+    "@tamagui/simple-hash": "1.57.3"
   },
   "devDependencies": {
-    "@tamagui/build": "1.57.1",
+    "@tamagui/build": "1.57.3",
     "@testing-library/react": "^13.4.0",
     "react": "^18.2.0",
     "vitest": "^0.26.3"

package/types/Store.d.ts

@@ -1,23 +0,0 @@
-export declare const TRIGGER_UPDATE: unique symbol;
-export declare const ADD_TRACKER: unique symbol;
-export declare const TRACK: unique symbol;
-export declare const SHOULD_DEBUG: unique symbol;
-export type StoreTracker = {
-    tracked: Set<string>;
-    component?: any;
-    last?: any;
-    lastKeys?: any;
-};
-export declare const disableTracking: WeakMap<object, any>;
-export declare const setDisableStoreTracking: (storeInstance: any, val: boolean) => void;
-export declare class Store<Props extends Object = {}> {
-    props: Props;
-    private _listeners;
-    private _trackers;
-    _version: number;
-    constructor(props: Props);
-    subscribe: (onChanged: Function) => () => void;
-    [TRIGGER_UPDATE](): void;
-    [SHOULD_DEBUG](): boolean;
-}
-//# sourceMappingURL=Store.d.ts.map

package/types/Store.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Store.d.ts","sourceRoot":"","sources":["../src/Store.tsx"],"names":[],"mappings":"AAGA,eAAO,MAAM,cAAc,eAAW,CAAA;AACtC,eAAO,MAAM,WAAW,eAAW,CAAA;AACnC,eAAO,MAAM,KAAK,eAAW,CAAA;AAC7B,eAAO,MAAM,YAAY,eAAW,CAAA;AAEpC,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACpB,SAAS,CAAC,EAAE,GAAG,CAAA;IACf,IAAI,CAAC,EAAE,GAAG,CAAA;IACV,QAAQ,CAAC,EAAE,GAAG,CAAA;CACf,CAAA;AAED,eAAO,MAAM,eAAe,sBAAgB,CAAA;AAE5C,eAAO,MAAM,uBAAuB,kBAAmB,GAAG,OAAO,OAAO,SAGvE,CAAA;AAED,qBAAa,KAAK,CAAC,KAAK,SAAS,MAAM,GAAG,EAAE;IAKvB,KAAK,EAAE,KAAK;IAJ/B,OAAO,CAAC,UAAU,CAAsB;IACxC,OAAO,CAAC,SAAS,CAA0B;IAC3C,QAAQ,SAAI;gBAEO,KAAK,EAAE,KAAK;IAE/B,SAAS,cAAe,QAAQ,gBAK9B;IAEF,CAAC,cAAc,CAAC;IAOhB,CAAC,YAAY,CAAC;CAMf"}

package/types/reaction.d.ts

@@ -1 +0,0 @@
-//# sourceMappingURL=reaction.d.ts.map

package/types/reaction.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"reaction.d.ts","sourceRoot":"","sources":["../src/reaction.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AASxC,wBAAgB,WAAW,CAAC,aAAa,EAAE,QAAQ,SAAS,CAAC,CAAC,EAAE,aAAa,KAAK,GAAG,EACnF,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,SAAS,CAAC,CAAC,EAAE,aAAa,KAAK,MAAM,OAAO,GAC1D,CAAC,CAAC,EAAE,OAAO,KAAK,GAAG,GACnB,OAAO,EACX,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3B,UAAU,GAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,OAA8B,EAC9D,QAAQ,CAAC,EAAE,GAAG,EAAE,cAOjB;AAED,wBAAgB,QAAQ,CACtB,aAAa,SAAS,SAAS,EAC/B,QAAQ,SAAS,CAAC,CAAC,EAAE,aAAa,KAAK,GAAG,EAE1C,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,aAAa,EACnC,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,SAAS,CAAC,CAAC,EAAE,aAAa,KAAK,MAAM,OAAO,GAC1D,CAAC,CAAC,EAAE,OAAO,KAAK,GAAG,GACnB,OAAO,EACX,UAAU,GAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,OAA8B,cAyC/D"}

package/types/selector.d.ts

@@ -1,6 +0,0 @@
-export declare function observe(fn: () => any): {
-    dispose: () => void;
-    getValue: () => any;
-};
-export declare function useObserve<A>(fn: () => A): A;
-//# sourceMappingURL=selector.d.ts.map

package/types/selector.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"selector.d.ts","sourceRoot":"","sources":["../src/selector.tsx"],"names":[],"mappings":"AAqEA,wBAAgB,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CA0C7C"}

package/types/useAsyncExternalStore.d.ts

@@ -1,2 +0,0 @@
-export declare function useAsyncExternalStore(subscribe: (cb: Function) => () => void, getSnapshot: (state: any) => any, getServerSnapshot?: (state: any) => any): any;
-//# sourceMappingURL=useAsyncExternalStore.d.ts.map

package/types/useAsyncExternalStore.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useAsyncExternalStore.d.ts","sourceRoot":"","sources":["../src/useAsyncExternalStore.tsx"],"names":[],"mappings":"AAEA,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,MAAM,IAAI,EACvC,WAAW,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,EAChC,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,OAexC"}