@tamagui/use-store 1.50.0 → 1.50.2

package/dist/esm/index.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/index.ts"],
-  "mappings": "AAAA,cAAc;AACd,SAAS,yBAAyB;AAClC,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,SAAS,oBAAoB;AAC7B,cAAc;AACd,cAAc;",
+  "mappings": "AAAA,cAAc;AACd,SAAS,yBAAyB;AAClC,cAAc;AACd,cAAc;AACd,cAAc;AACd,SAAS,oBAAoB;AAC7B,cAAc;AACd,cAAc;AAGP,MAAM,MAAyC;AAAA,EACpD,YAAmB,OAAc;AAAd;AAAA,EAAe;AACpC;",
   "names": []
 }

package/dist/esm/reaction.js

@@ -1,16 +1,20 @@
 import { useMemo } from "react";
 import { isEqualSubsetShallow } from "./comparators";
 import { UNWRAP_PROXY } from "./constants";
-import { setIsInReaction } from "./useStore";
+import { getStoreInfo, setIsInReaction } from "./useStore";
 const dispose = (d) => {
   if (typeof d === "function") {
     d();
   }
 };
-function useReaction(store, selector, receiver, equalityFn = isEqualSubsetShallow, memoArgs) {
-  return useMemo(() => reaction(store, selector, receiver, equalityFn), [memoArgs]);
+function useReaction(store, selector, receiver, props, equalityFn = isEqualSubsetShallow, memoArgs) {
+  const storeInfo = getStoreInfo(store, props);
+  return useMemo(
+    () => reaction(storeInfo, selector, receiver, equalityFn),
+    [memoArgs]
+  );
 }
-function reaction(store, selector, receiver, equalityFn = isEqualSubsetShallow) {
+function reaction({ store, subscribe }, selector, receiver, equalityFn = isEqualSubsetShallow) {
   let last = void 0;
   let innerDispose;
   function updateReaction() {
@@ -39,7 +43,7 @@ function reaction(store, selector, receiver, equalityFn = isEqualSubsetShallow)
       setIsInReaction(false);
     }
   }
-  const disposeSubscribe = store.subscribe(updateReaction);
+  const disposeSubscribe = 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,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,MAAM,cAAc,YAAY,SAClE,WAAM,UAAN,mBAAa,MAAK,IAAI,MAAM,MAAM,OAAO,OACtC,WAAW;AAAA,YAChB;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;",
+  "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,MAAM,cAAc,YAAY,SAClE,WAAM,UAAN,mBAAa,MAAK,IAAI,MAAM,MAAM,OAAO,OACtC,WAAW;AAAA,YAChB;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;",
   "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 { setIsInReaction, trackStoresAccess } from "./useStore";
+import { trackStoresAccess } from "./useStore";
 const logUpdate = process.env.NODE_ENV === "development" ? (fn, stores, last, next) => {
   const getStoreLogName = (store) => {
     var _a;
@@ -17,64 +17,30 @@ 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.stores], () => {
+    const unsub = subscribeToStores([...state.storeInfos], () => {
       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, [...next.stores], "(fn)", "(fn)");
+          logUpdate(fn, nextStoreInfos, "(fn)", "(fn)");
         }
         dispose = next.value;
         return;
       }
       setState((prev) => {
-        if (isEqualSubsetShallow(prev.stores, next.stores) && isEqualSubsetShallow(prev.value, next.value)) {
+        if (isEqualSubsetShallow(prevStoreInfos, nextStoreInfos) && isEqualSubsetShallow(prev.value, next.value)) {
           return prev;
         }
         if (process.env.NODE_ENV === "development") {
-          logUpdate(fn, [...next.stores], prev.value, next.value);
+          logUpdate(fn, nextStoreInfos, prev.value, next.value);
         }
         return next;
       });
@@ -83,19 +49,19 @@ function useSelector(fn) {
       unsub();
       dispose == null ? void 0 : dispose();
     };
-  }, [...state.stores]);
+  }, [[...state.storeInfos].map((i) => i.uid).join(",")]);
   return state.value;
 }
-function runStoreSelector(selector2) {
-  const stores = /* @__PURE__ */ new Set();
-  const dispose = trackStoresAccess((store) => {
-    stores.add(store);
+function runStoreSelector(selector) {
+  const storeInfos = /* @__PURE__ */ new Set();
+  const dispose = trackStoresAccess((storeInfo) => {
+    storeInfos.add(storeInfo);
   });
-  const value = selector2();
+  const value = selector();
   dispose();
   return {
     value,
-    stores
+    storeInfos
   };
 }
 function subscribeToStores(stores, onUpdate) {
@@ -108,7 +74,6 @@ 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": "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",
-  "names": ["selector"]
+  "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,SAAO,WAAM,UAAN,mBAAa,MAAK,IAAI,MAAM,MAAM,OAAO;AAAA,EAC5E;AACA,QAAM,aAAa,OAAO,IAAI,eAAe,EAAE,KAAK,IAAI;AACxD,QAAM,OAAO,6BAAY,GAAG,QAAQ,iBAAiB,WAAW;AAChE,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": []
 }

package/dist/esm/useStore.js

@@ -9,13 +9,7 @@ import {
   getStoreUid,
   simpleStr
 } from "./helpers";
-import {
-  SHOULD_DEBUG,
-  TRIGGER_UPDATE,
-  disableTracking,
-  setDisableStoreTracking
-} from "./Store";
-import { DebugStores, useCurrentComponent } from "./useStoreDebug";
+import { DebugStores, shouldDebug, useCurrentComponent } from "./useStoreDebug";
 const idFn = (_) => _;
 function useStore(StoreKlass, props, options = defaultOptions) {
   const selectorCb = useCallback(options.selector || idFn, []);
@@ -71,7 +65,12 @@ function trackStoresAccess(cb) {
   };
 }
 function getStore(StoreKlass, props) {
-  return getOrCreateStoreInfo(StoreKlass, props).store;
+  return getStoreInfo(StoreKlass, props).store;
+}
+function getStoreInfo(StoreKlass, props) {
+  return getOrCreateStoreInfo(StoreKlass, props, {
+    refuseCreation: true
+  });
 }
 function getOrCreateStoreInfo(StoreKlass, props, options, propsKeyCalculated) {
   var _a;
@@ -79,7 +78,11 @@ function getOrCreateStoreInfo(StoreKlass, props, options, propsKeyCalculated) {
   if (!(options == null ? void 0 : options.avoidCache) && cache.has(uid)) {
     return cache.get(uid);
   }
+  if (options == null ? void 0 : options.refuseCreation) {
+    throw new Error(`No store exists (${StoreKlass.name}) with props: ${props}`);
+  }
   const storeInstance = new StoreKlass(props);
+  storeInstance.props = props;
   const getters = {};
   const actions = {};
   const stateKeys = /* @__PURE__ */ new Set();
@@ -97,31 +100,50 @@ function getOrCreateStoreInfo(StoreKlass, props, options, propsKeyCalculated) {
     }
   }
   const keyComparators = storeInstance["_comparators"];
+  const listeners = /* @__PURE__ */ new Set();
   const storeInfo = {
+    uid: Math.random(),
     keyComparators,
     storeInstance,
     getters,
     stateKeys,
     actions,
     debug: options == null ? void 0 : options.debug,
+    disableTracking: false,
     gettersState: {
       getCache: /* @__PURE__ */ new Map(),
       depsToGetter: /* @__PURE__ */ new Map(),
       curGetKeys: /* @__PURE__ */ new Set(),
       isGetting: false
+    },
+    listeners,
+    trackers: /* @__PURE__ */ new Set(),
+    version: 0,
+    subscribe: (onChanged) => {
+      listeners.add(onChanged);
+      return () => {
+        listeners.delete(onChanged);
+      };
+    },
+    triggerUpdate: () => {
+      storeInfo.version = (storeInfo.version + 1) % Number.MAX_SAFE_INTEGER;
+      for (const cb of listeners) {
+        cb();
+      }
     }
   };
-  const store = createProxiedStore(storeInfo);
+  const store = createProxiedStore(
+    // we assign store right after and proxiedStore never accesses it until later on
+    storeInfo
+  );
   if (process.env.NODE_ENV === "development") {
     allStores[uid] = store;
   }
   (_a = store.mount) == null ? void 0 : _a.call(store);
-  const value = {
-    ...storeInfo,
-    store
-  };
-  cache.set(uid, value);
-  return value;
+  storeInfo.store = store;
+  const result = storeInfo;
+  cache.set(uid, result);
+  return result;
 }
 const allStores = {};
 const emptyObj = {};
@@ -159,21 +181,21 @@ function useStoreFromInfo(info, userSelector, options) {
   const getSnapshot = useCallback(() => {
     const curInternal2 = internal.current;
     const keys = [...!curInternal2.tracked.size ? info.stateKeys : curInternal2.tracked];
-    const nextKeys = `${store._version}${keys.join("")}${userSelector || ""}`;
+    const nextKeys = `${info.version}${keys.join("")}${userSelector || ""}`;
     const lastKeys = curInternal2.lastKeys;
     if (nextKeys === curInternal2.lastKeys) {
       return curInternal2.last;
     }
     curInternal2.lastKeys = nextKeys;
     let snap;
-    setDisableStoreTracking(store, true);
+    info.disableTracking = true;
     const last = curInternal2.last;
     if (userSelector) {
       snap = userSelector(store);
     } else {
       snap = selectKeys(store, keys);
     }
-    setDisableStoreTracking(store, false);
+    info.disableTracking = false;
     const isUnchanged = typeof last !== "undefined" && isEqualSubsetShallow(last, snap, {
       keyComparators: info.keyComparators
     });
@@ -186,7 +208,7 @@ function useStoreFromInfo(info, userSelector, options) {
     curInternal2.last = snap;
     return snap;
   }, []);
-  const state = useSyncExternalStore(store.subscribe, getSnapshot, getSnapshot);
+  const state = useSyncExternalStore(info.subscribe, getSnapshot, getSnapshot);
   if (userSelector) {
     return state;
   }
@@ -216,9 +238,8 @@ function createProxiedStore(storeInfo) {
   const { actions, storeInstance, getters, gettersState } = storeInfo;
   const { getCache, curGetKeys, depsToGetter } = gettersState;
   const constr = storeInstance.constructor;
-  const shouldDebug = storeInfo.debug ?? DebugStores.has(constr);
+  const shouldDebug2 = storeInfo.debug ?? DebugStores.has(constr);
   let didSet = false;
-  let isInAction = false;
   const wrappedActions = {};
   for (const key in actions) {
     if (key === "subscribe") {
@@ -231,10 +252,9 @@ function createProxiedStore(storeInfo) {
       if (isGetFn || gettersState.isGetting) {
         return Reflect.apply(actionFn, proxiedStore, args);
       }
-      if (process.env.NODE_ENV === "development" && shouldDebug) {
-        console.log("(debug) startAction", key, { isInAction });
+      if (process.env.NODE_ENV === "development" && shouldDebug2) {
+        console.log("(debug) startAction", key);
       }
-      isInAction = true;
       res = Reflect.apply(actionFn, proxiedStore, args);
       if (res instanceof Promise) {
         return res.then(finishAction);
@@ -257,7 +277,7 @@ function createProxiedStore(storeInfo) {
         const ogAction = wrappedActions[key];
         wrappedActions[key] = new Proxy(ogAction, {
           apply(target, thisArg, args) {
-            const isDebugging = shouldDebug || storeInfo.debug;
+            const isDebugging = shouldDebug2 || storeInfo.debug;
             const shouldLog = process.env.LOG_LEVEL !== "0" && (isDebugging || configureOpts.logLevel !== "error");
             if (!shouldLog) {
               return Reflect.apply(target, thisArg, args);
@@ -341,13 +361,11 @@ function createProxiedStore(storeInfo) {
     }
   }
   const finishAction = (val) => {
-    var _a;
-    if (process.env.NODE_ENV === "development" && shouldDebug) {
+    if (process.env.NODE_ENV === "development" && shouldDebug2) {
       console.log("(debug) finishAction", { didSet });
     }
-    isInAction = false;
     if (didSet) {
-      (_a = storeInstance[TRIGGER_UPDATE]) == null ? void 0 : _a.call(storeInstance);
+      storeInfo.triggerUpdate();
       didSet = false;
     }
     return val;
@@ -368,11 +386,11 @@ function createProxiedStore(storeInfo) {
       if (key === UNWRAP_STORE_INFO) {
         return storeInfo;
       }
-      const trackingDisabled = disableTracking.get(storeInstance);
+      const trackingDisabled = storeInfo.disableTracking;
       if (!trackingDisabled) {
         if (storeAccessTrackers.size && !storeAccessTrackers.has(storeInstance)) {
           for (const t of storeAccessTrackers) {
-            t(storeInstance);
+            t(storeInfo);
           }
         }
       }
@@ -416,22 +434,19 @@ function createProxiedStore(storeInfo) {
         if (typeof key === "string") {
           clearGetterCache(key);
         }
-        if (shouldDebug) {
+        if (shouldDebug2) {
           setters.add({ key, value });
-          if (storeInstance[SHOULD_DEBUG]()) {
+          if (getShouldDebug(storeInfo)) {
             console.log("(debug) SET", res, key, value);
           }
         }
-        if (process.env.NODE_ENV === "development" && shouldDebug) {
-          console.log("SET...", { key, value, isInAction });
+        if (process.env.NODE_ENV === "development" && shouldDebug2) {
+          console.log("SET...", { key, value });
         }
-        if (isInAction) {
-          didSet = true;
-        } else {
+        if (!isTriggering) {
           isTriggering = true;
-          queueMicrotask(() => {
-            var _a;
-            (_a = storeInstance[TRIGGER_UPDATE]) == null ? void 0 : _a.call(storeInstance);
+          waitForEventLoop(() => {
+            storeInfo.triggerUpdate();
             isTriggering = false;
           });
         }
@@ -440,12 +455,12 @@ function createProxiedStore(storeInfo) {
     }
   });
   function clearGetterCache(setKey) {
-    const getters2 = depsToGetter.get(setKey);
+    const parentGetters = depsToGetter.get(setKey);
     getCache.delete(setKey);
-    if (!getters2) {
+    if (!parentGetters) {
       return;
     }
-    for (const gk of getters2) {
+    for (const gk of parentGetters) {
       getCache.delete(gk);
       if (depsToGetter.has(gk)) {
         clearGetterCache(gk);
@@ -454,6 +469,7 @@ function createProxiedStore(storeInfo) {
   }
   return proxiedStore;
 }
+const waitForEventLoop = process.env.NODE_ENV === "test" ? (cb) => cb() : queueMicrotask;
 let counter = 0;
 const passThroughKeys = {
   subscribe: true,
@@ -463,12 +479,20 @@ const passThroughKeys = {
   _listeners: true,
   _enableTracking: true
 };
+function getShouldDebug(storeInfo) {
+  const info = { storeInstance: storeInfo.store };
+  const trackers = storeInfo.trackers;
+  return [...trackers].some(
+    (tracker) => tracker.component && shouldDebug(tracker.component, info)
+  );
+}
 export {
   allStores,
   createStore,
   createUseStore,
   createUseStoreSelector,
   getStore,
+  getStoreInfo,
   setIsInReaction,
   trackStoresAccess,
   useGlobalStore,

package/dist/esm/useStore.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/useStore.tsx"],
-  "mappings": "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",
-  "names": ["curInternal", "hashCode", "strColor", "key", "name", "getters"]
+  "mappings": "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",
+  "names": ["curInternal", "shouldDebug", "hashCode", "strColor", "key", "name"]
 }

package/package.json

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

package/src/index.ts

@@ -3,7 +3,11 @@ export { configureUseStore } from './configureUseStore'
 export * from './interfaces'
 export * from './selector'
 export * from './reaction'
-export * from './Store'
 export { UNWRAP_PROXY } from './constants'
 export * from './comparators'
 export * from './decorators'
+
+// to extend for prop types
+export class Store<Props extends Record<string, any>> {
+  constructor(public props: Props) {}
+}

package/src/interfaces.tsx

@@ -1,4 +1,4 @@
-import { Store } from './Store'
+import { StoreTracker } from './useStore'
 
 export type Selector<A = unknown, B = unknown> = (x: A) => B
 
@@ -9,7 +9,13 @@ export type UseStoreOptions<Store = any, SelectorRes = any> = {
   once?: boolean
 }
 
+export interface Store<Props = Record<string, any> | null | undefined> {
+  new (...args: any[]): any
+  props: Props
+}
+
 export type StoreInfo<A = Store> = {
+  uid: number
   keyComparators?: {
     [key: string]: (a: any, b: any) => boolean
   }
@@ -26,6 +32,12 @@ export type StoreInfo<A = Store> = {
     curGetKeys: Set<string>
     isGetting: boolean
   }
+  listeners: Set<Function>
+  trackers: Set<StoreTracker>
+  version: number
+  subscribe: (onChanged: () => void) => () => void
+  triggerUpdate: Function
+  disableTracking: boolean
 }
 
 export type UseStoreConfig = {

package/src/reaction.tsx

@@ -2,8 +2,8 @@ import { useMemo } from 'react'
 
 import { isEqualSubsetShallow } from './comparators'
 import { UNWRAP_PROXY } from './constants'
-import { Store } from './Store'
-import { setIsInReaction } from './useStore'
+import { StoreInfo } from './interfaces'
+import { getStoreInfo, setIsInReaction } from './useStore'
 
 const dispose = (d: any) => {
   if (typeof d === 'function') {
@@ -11,26 +11,28 @@ const dispose = (d: any) => {
   }
 }
 
-export function useReaction<
-  StoreInstance extends Store<any>,
-  Selector extends (a: StoreInstance) => any
->(
+export function useReaction<StoreInstance, Selector extends (a: StoreInstance) => any>(
   store: StoreInstance,
   selector: Selector,
   receiver: Selector extends (a: StoreInstance) => infer Derived
     ? (a: Derived) => any
     : unknown,
+  props?: Record<string, any>,
   equalityFn: (a: any, b: any) => boolean = isEqualSubsetShallow,
   memoArgs?: any[]
 ) {
-  return useMemo(() => reaction(store, selector, receiver, equalityFn), [memoArgs])
+  const storeInfo = getStoreInfo(store, props)
+  return useMemo(
+    () => reaction(storeInfo, selector as any, receiver, equalityFn),
+    [memoArgs]
+  )
 }
 
 export function reaction<
-  StoreInstance extends Store<any>,
+  StoreInstance extends StoreInfo,
   Selector extends (a: StoreInstance) => any
 >(
-  store: StoreInstance,
+  { store, subscribe }: StoreInstance,
   selector: Selector,
   receiver: Selector extends (a: StoreInstance) => infer Derived
     ? (a: Derived) => any
@@ -69,7 +71,7 @@ export function reaction<
     }
   }
 
-  const disposeSubscribe = store.subscribe(updateReaction)
+  const disposeSubscribe = subscribe(updateReaction)
   updateReaction()
 
   return () => {