@spoosh/react 0.1.1 → 0.1.3

package/dist/index.js

@@ -101,7 +101,11 @@ function createUseRead(options) {
       controller.getState,
       controller.getState
     );
-    const [requestState, setRequestState] = (0, import_react.useState)({ isPending: false, error: void 0 });
+    const [requestState, setRequestState] = (0, import_react.useState)(() => {
+      const cachedEntry = stateManager.getCache(queryKey);
+      const hasCachedData = cachedEntry?.state?.data !== void 0;
+      return { isPending: enabled && !hasCachedData, error: void 0 };
+    });
     const abortRef = (0, import_react.useRef)(controller.abort);
     abortRef.current = controller.abort;
     const pluginOptsKey = JSON.stringify(pluginOpts);
@@ -436,11 +440,15 @@ function createUseInfiniteRead(options) {
       controller.getState,
       controller.getState
     );
+    const [isPending, setIsPending] = (0, import_react3.useState)(() => {
+      return enabled && state.data === void 0;
+    });
     const fetchingDirection = controller.getFetchingDirection();
     const fetching = fetchingDirection !== null;
     const fetchingNext = fetchingDirection === "next";
     const fetchingPrev = fetchingDirection === "prev";
-    const loading = fetching && state.data === void 0;
+    const hasData = state.data !== void 0;
+    const loading = (isPending || fetching) && !hasData;
     const lifecycleRef = (0, import_react3.useRef)({
       initialized: false,
       prevContext: null
@@ -461,7 +469,8 @@ function createUseInfiniteRead(options) {
             (tag) => resolvedTags.includes(tag)
           );
           if (hasMatch) {
-            controller.refetch();
+            setIsPending(true);
+            controller.refetch().finally(() => setIsPending(false));
           }
         }
       );
@@ -475,7 +484,8 @@ function createUseInfiniteRead(options) {
         const currentState = controller.getState();
         const isFetching = controller.getFetchingDirection() !== null;
         if (currentState.data === void 0 && !isFetching) {
-          controller.fetchNext();
+          setIsPending(true);
+          controller.fetchNext().finally(() => setIsPending(false));
         }
       }
     }, [enabled]);

package/dist/index.mjs

@@ -85,7 +85,11 @@ function createUseRead(options) {
       controller.getState,
       controller.getState
     );
-    const [requestState, setRequestState] = useState({ isPending: false, error: void 0 });
+    const [requestState, setRequestState] = useState(() => {
+      const cachedEntry = stateManager.getCache(queryKey);
+      const hasCachedData = cachedEntry?.state?.data !== void 0;
+      return { isPending: enabled && !hasCachedData, error: void 0 };
+    });
     const abortRef = useRef(controller.abort);
     abortRef.current = controller.abort;
     const pluginOptsKey = JSON.stringify(pluginOpts);
@@ -326,7 +330,13 @@ function createUseWrite(options) {
 }
 
 // src/useInfiniteRead/index.ts
-import { useRef as useRef3, useEffect as useEffect2, useSyncExternalStore as useSyncExternalStore3, useId as useId3 } from "react";
+import {
+  useRef as useRef3,
+  useEffect as useEffect2,
+  useSyncExternalStore as useSyncExternalStore3,
+  useId as useId3,
+  useState as useState3
+} from "react";
 import {
   createInfiniteReadController,
   createSelectorProxy as createSelectorProxy3,
@@ -436,11 +446,15 @@ function createUseInfiniteRead(options) {
       controller.getState,
       controller.getState
     );
+    const [isPending, setIsPending] = useState3(() => {
+      return enabled && state.data === void 0;
+    });
     const fetchingDirection = controller.getFetchingDirection();
     const fetching = fetchingDirection !== null;
     const fetchingNext = fetchingDirection === "next";
     const fetchingPrev = fetchingDirection === "prev";
-    const loading = fetching && state.data === void 0;
+    const hasData = state.data !== void 0;
+    const loading = (isPending || fetching) && !hasData;
     const lifecycleRef = useRef3({
       initialized: false,
       prevContext: null
@@ -461,7 +475,8 @@ function createUseInfiniteRead(options) {
             (tag) => resolvedTags.includes(tag)
           );
           if (hasMatch) {
-            controller.refetch();
+            setIsPending(true);
+            controller.refetch().finally(() => setIsPending(false));
           }
         }
       );
@@ -475,7 +490,8 @@ function createUseInfiniteRead(options) {
         const currentState = controller.getState();
         const isFetching = controller.getFetchingDirection() !== null;
         if (currentState.data === void 0 && !isFetching) {
-          controller.fetchNext();
+          setIsPending(true);
+          controller.fetchNext().finally(() => setIsPending(false));
         }
       }
     }, [enabled]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spoosh/react",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "license": "MIT",
   "description": "React hooks for Spoosh API client",
   "keywords": [
@@ -34,7 +34,7 @@
     }
   },
   "dependencies": {
-    "@spoosh/core": "0.2.0"
+    "@spoosh/core": "0.2.1"
   },
   "peerDependencies": {
     "react": "^18 || ^19"