@inertiajs/react 2.3.7 → 2.3.9

package/dist/index.js

@@ -42,6 +42,7 @@ __export(index_exports, {
   progress: () => progress,
   router: () => router3,
   useForm: () => useForm,
+  useFormContext: () => useFormContext,
   usePage: () => usePage,
   usePoll: () => usePoll,
   usePrefetch: () => usePrefetch,
@@ -415,8 +416,7 @@ function useForm(...args) {
           if (isMounted.current) {
             setProcessing(false);
             setProgress(null);
-            setErrors(errors2);
-            setHasErrors(true);
+            setError(errors2);
           }
           if (options.onError) {
             return options.onError(errors2);
@@ -690,6 +690,7 @@ var deferStateUpdate = (callback) => {
   typeof import_react11.default.startTransition === "function" ? import_react11.default.startTransition(callback) : setTimeout(callback, 0);
 };
 var noop = () => void 0;
+var FormContext = (0, import_react11.createContext)(void 0);
 var Form = (0, import_react11.forwardRef)(
   ({
     action = "",
@@ -836,7 +837,7 @@ var Form = (0, import_react11.forwardRef)(
       defaultData.current = getFormData();
       setIsDirty(false);
     };
-    const exposed = () => ({
+    const exposed = {
       errors: form.errors,
       hasErrors: form.hasErrors,
       processing: form.processing,
@@ -860,9 +861,9 @@ var Form = (0, import_react11.forwardRef)(
       validate: (field, config2) => form.validate(...import_core5.UseFormUtils.mergeHeadersForValidation(field, config2, headers)),
       touch: form.touch,
       touched: form.touched
-    });
-    (0, import_react11.useImperativeHandle)(ref, exposed, [form, isDirty, submit]);
-    return (0, import_react11.createElement)(
+    };
+    (0, import_react11.useImperativeHandle)(ref, () => exposed, [form, isDirty, submit]);
+    const formNode = (0, import_react11.createElement)(
       "form",
       {
         ...props,
@@ -879,11 +880,15 @@ var Form = (0, import_react11.forwardRef)(
         // See: https://github.com/inertiajs/inertia/pull/2536
         inert: disableWhileProcessing && form.processing && "true"
       },
-      typeof children === "function" ? children(exposed()) : children
+      typeof children === "function" ? children(exposed) : children
     );
+    return (0, import_react11.createElement)(FormContext.Provider, { value: exposed }, formNode);
   }
 );
 Form.displayName = "InertiaForm";
+function useFormContext() {
+  return (0, import_react11.useContext)(FormContext);
+}
 var Form_default = Form;
 
 // src/Head.ts
@@ -1028,6 +1033,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);
@@ -1078,6 +1085,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,
@@ -1096,16 +1108,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) {
@@ -1147,8 +1160,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,
@@ -1156,7 +1169,7 @@ var InfiniteScroll = (0, import_react13.forwardRef)(
       }),
       autoMode: headerAutoMode,
       manualMode: !headerAutoMode,
-      hasMore: dataManager?.hasPrevious() ?? false,
+      hasMore: hasPreviousPage,
       ...sharedExposed
     };
     const exposedNext = {
@@ -1165,7 +1178,7 @@ var InfiniteScroll = (0, import_react13.forwardRef)(
       }),
       autoMode: footerAutoMode,
       manualMode: !footerAutoMode,
-      hasMore: dataManager?.hasNext() ?? false,
+      hasMore: hasNextPage,
       ...sharedExposed
     };
     const exposedSlot = {
@@ -1514,6 +1527,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));
@@ -1526,6 +1540,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(
@@ -1541,7 +1556,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) => {
@@ -1577,7 +1592,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) {