@legendapp/state 3.0.0-alpha.4 → 3.0.0-alpha.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legendapp/state",
-  "version": "3.0.0-alpha.4",
+  "version": "3.0.0-alpha.5",
   "description": "legend-state",
   "sideEffects": false,
   "private": false,

package/react.js

@@ -111,15 +111,6 @@ function useSelector(selector, options) {
     const { subscribe, getVersion, run } = selectorFn;
     value = run(selector);
     index_js.useSyncExternalStore(subscribe, getVersion, getVersion);
-    if (options == null ? void 0 : options.suspense) {
-      if (state.isPromise(value) || !value && state.isObservable(selector) && state.syncState(selector).isLoaded.get() === false) {
-        if (React__default.default.use) {
-          React__default.default.use(value);
-        } else {
-          throw value;
-        }
-      }
-    }
   } catch (err) {
     if ((process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test") && ((_a = err == null ? void 0 : err.message) == null ? void 0 : _a.includes("Rendered more"))) {
       console.warn(
@@ -128,6 +119,17 @@ function useSelector(selector, options) {
     }
     throw err;
   }
+  if (options == null ? void 0 : options.suspense) {
+    const isProm = state.isPromise(value);
+    if (state.isPromise(value) || !value && state.isObservable(selector)) {
+      const vProm = isProm ? value : state.when(selector);
+      if (React__default.default.use) {
+        React__default.default.use(vProm);
+      } else {
+        throw vProm;
+      }
+    }
+  }
   return value;
 }
 

package/react.mjs

@@ -1,4 +1,4 @@
-import { isFunction, isEmpty, observable, isPromise, isObservable, syncState, computeSelector, isArray, isMap, isObservableValueReady, linked, observe, when, whenReady, internal, trackSelector, isPrimitive } from '@legendapp/state';
+import { isFunction, isEmpty, observable, isPromise, isObservable, when, computeSelector, isArray, isMap, isObservableValueReady, linked, observe, whenReady, internal, trackSelector, isPrimitive } from '@legendapp/state';
 import React, { memo, forwardRef, createElement, useState, useContext, useMemo, useRef, useEffect, createContext, useCallback } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim/index.js';
 
@@ -105,15 +105,6 @@ function useSelector(selector, options) {
     const { subscribe, getVersion, run } = selectorFn;
     value = run(selector);
     useSyncExternalStore(subscribe, getVersion, getVersion);
-    if (options == null ? void 0 : options.suspense) {
-      if (isPromise(value) || !value && isObservable(selector) && syncState(selector).isLoaded.get() === false) {
-        if (React.use) {
-          React.use(value);
-        } else {
-          throw value;
-        }
-      }
-    }
   } catch (err) {
     if ((process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test") && ((_a = err == null ? void 0 : err.message) == null ? void 0 : _a.includes("Rendered more"))) {
       console.warn(
@@ -122,6 +113,17 @@ function useSelector(selector, options) {
     }
     throw err;
   }
+  if (options == null ? void 0 : options.suspense) {
+    const isProm = isPromise(value);
+    if (isPromise(value) || !value && isObservable(selector)) {
+      const vProm = isProm ? value : when(selector);
+      if (React.use) {
+        React.use(vProm);
+      } else {
+        throw vProm;
+      }
+    }
+  }
   return value;
 }