@inertiajs/react 2.3.6 → 2.3.8

package/dist/index.js

@@ -305,13 +305,20 @@ function useIsomorphicLayoutEffect(effect, deps) {
 // src/useRemember.ts
 var import_core3 = require("@inertiajs/core");
 var import_react8 = require("react");
-function useRemember(initialState, key) {
+function useRemember(initialState, key, excludeKeysRef) {
   const [state, setState] = (0, import_react8.useState)(() => {
     const restored = import_core3.router.restore(key);
     return restored !== void 0 ? restored : initialState;
   });
   (0, import_react8.useEffect)(() => {
-    import_core3.router.remember(state, key);
+    const keys = excludeKeysRef?.current;
+    if (keys && keys.length > 0 && typeof state === "object" && state !== null) {
+      const filtered = { ...state };
+      keys.forEach((k) => delete filtered[k]);
+      import_core3.router.remember(filtered, key);
+    } else {
+      import_core3.router.remember(state, key);
+    }
   }, [state, key]);
   return [state, setState];
 }
@@ -327,7 +334,8 @@ function useForm(...args) {
   );
   const cancelToken = (0, import_react9.useRef)(null);
   const recentlySuccessfulTimeoutId = (0, import_react9.useRef)(void 0);
-  const [data, setData] = rememberKey ? useRemember(defaults, `${rememberKey}:data`) : (0, import_react9.useState)(defaults);
+  const excludeKeysRef = (0, import_react9.useRef)([]);
+  const [data, setData] = rememberKey ? useRemember(defaults, `${rememberKey}:data`, excludeKeysRef) : (0, import_react9.useState)(defaults);
   const [errors, setErrors] = rememberKey ? useRemember({}, `${rememberKey}:errors`) : (0, import_react9.useState)({});
   const [hasErrors, setHasErrors] = (0, import_react9.useState)(false);
   const [processing, setProcessing] = (0, import_react9.useState)(false);
@@ -587,7 +595,11 @@ function useForm(...args) {
     put,
     patch,
     delete: deleteMethod,
-    cancel
+    cancel,
+    dontRemember: (...keys) => {
+      excludeKeysRef.current = keys;
+      return form;
+    }
   };
   const tap = (value, callback) => {
     callback(value);
@@ -1016,6 +1028,8 @@ var InfiniteScroll = (0, import_react13.forwardRef)(
     const [loadingPrevious, setLoadingPrevious] = (0, import_react13.useState)(false);
     const [loadingNext, setLoadingNext] = (0, import_react13.useState)(false);
     const [requestCount, setRequestCount] = (0, import_react13.useState)(0);
+    const [hasPreviousPage, setHasPreviousPage] = (0, import_react13.useState)(false);
+    const [hasNextPage, setHasNextPage] = (0, import_react13.useState)(false);
     const [resolvedStartElement, setResolvedStartElement] = (0, import_react13.useState)(null);
     const [resolvedEndElement, setResolvedEndElement] = (0, import_react13.useState)(null);
     const [resolvedItemsElement, setResolvedItemsElement] = (0, import_react13.useState)(null);
@@ -1066,6 +1080,11 @@ var InfiniteScroll = (0, import_react13.forwardRef)(
       if (!resolvedItemsElement) {
         return;
       }
+      function syncStateFromDataManager() {
+        setRequestCount(infiniteScrollInstance.dataManager.getRequestCount());
+        setHasPreviousPage(infiniteScrollInstance.dataManager.hasPrevious());
+        setHasNextPage(infiniteScrollInstance.dataManager.hasNext());
+      }
       const infiniteScrollInstance = (0, import_core6.useInfiniteScroll)({
         // Data
         getPropName: () => data,
@@ -1084,16 +1103,17 @@ var InfiniteScroll = (0, import_react13.forwardRef)(
         onBeforeNextRequest: () => setLoadingNext(true),
         onCompletePreviousRequest: () => {
           setLoadingPrevious(false);
-          setRequestCount(infiniteScrollInstance.dataManager.getRequestCount());
+          syncStateFromDataManager();
         },
         onCompleteNextRequest: () => {
           setLoadingNext(false);
-          setRequestCount(infiniteScrollInstance.dataManager.getRequestCount());
-        }
+          syncStateFromDataManager();
+        },
+        onDataReset: syncStateFromDataManager
       });
       setInfiniteScroll(infiniteScrollInstance);
       const { dataManager: dataManager2, elementManager: elementManager2 } = infiniteScrollInstance;
-      setRequestCount(dataManager2.getRequestCount());
+      syncStateFromDataManager();
       elementManager2.setupObservers();
       elementManager2.processServerLoadedElements(dataManager2.getLastLoadedPage());
       if (autoLoad) {
@@ -1135,8 +1155,8 @@ var InfiniteScroll = (0, import_react13.forwardRef)(
     const sharedExposed = {
       loadingPrevious,
       loadingNext,
-      hasPrevious: dataManager?.hasPrevious() ?? false,
-      hasNext: dataManager?.hasNext() ?? false
+      hasPrevious: hasPreviousPage,
+      hasNext: hasNextPage
     };
     const exposedPrevious = {
       loading: loadingPrevious,
@@ -1144,7 +1164,7 @@ var InfiniteScroll = (0, import_react13.forwardRef)(
       }),
       autoMode: headerAutoMode,
       manualMode: !headerAutoMode,
-      hasMore: dataManager?.hasPrevious() ?? false,
+      hasMore: hasPreviousPage,
       ...sharedExposed
     };
     const exposedNext = {
@@ -1153,7 +1173,7 @@ var InfiniteScroll = (0, import_react13.forwardRef)(
       }),
       autoMode: footerAutoMode,
       manualMode: !footerAutoMode,
-      hasMore: dataManager?.hasNext() ?? false,
+      hasMore: hasNextPage,
       ...sharedExposed
     };
     const exposedSlot = {
@@ -1502,6 +1522,7 @@ var WhenVisible = ({ children, data, params, buffer, as, always, fallback }) =>
   const fetching = (0, import_react17.useRef)(false);
   const ref = (0, import_react17.useRef)(null);
   const observer = (0, import_react17.useRef)(null);
+  const getReloadParamsRef = (0, import_react17.useRef)(() => ({}));
   (0, import_react17.useEffect)(() => {
     if (keys.length > 0) {
       setLoaded(keys.every((key) => pageProps[key] !== void 0));
@@ -1514,6 +1535,7 @@ var WhenVisible = ({ children, data, params, buffer, as, always, fallback }) =>
     }
     return reloadParams;
   }, [params, data]);
+  getReloadParamsRef.current = getReloadParams;
   const registerObserver = () => {
     observer.current?.disconnect();
     observer.current = new IntersectionObserver(
@@ -1529,7 +1551,7 @@ var WhenVisible = ({ children, data, params, buffer, as, always, fallback }) =>
         }
         fetching.current = true;
         setIsFetching(true);
-        const reloadParams = getReloadParams();
+        const reloadParams = getReloadParamsRef.current();
         import_core10.router.reload({
           ...reloadParams,
           onStart: (e) => {
@@ -1565,7 +1587,7 @@ var WhenVisible = ({ children, data, params, buffer, as, always, fallback }) =>
     return () => {
       observer.current?.disconnect();
     };
-  }, [always, loaded, ref, getReloadParams, buffer]);
+  }, [always, loaded, buffer]);
   const resolveChildren = () => typeof children === "function" ? children({ fetching: isFetching }) : children;
   const resolveFallback = () => typeof fallback === "function" ? fallback() : fallback;
   if (always || !loaded) {