@inertiajs/react 2.2.8 → 2.2.9

package/dist/index.esm.js

@@ -2,22 +2,28 @@
 import { progress as Progress2, router as Router } from "@inertiajs/core";
 
 // src/createInertiaApp.ts
-import { router as router2, setupProgress } from "@inertiajs/core";
+import {
+  router as router2,
+  setupProgress
+} from "@inertiajs/core";
 import { createElement as createElement2 } from "react";
 
 // src/App.ts
-import { createHeadManager, router } from "@inertiajs/core";
+import {
+  createHeadManager,
+  router
+} from "@inertiajs/core";
 import { createElement, useEffect, useMemo, useState } from "react";
 
 // src/HeadContext.ts
 import { createContext } from "react";
-var headContext = createContext(void 0);
+var headContext = createContext(null);
 headContext.displayName = "InertiaHeadContext";
 var HeadContext_default = headContext;
 
 // src/PageContext.ts
 import { createContext as createContext2 } from "react";
-var pageContext = createContext2(void 0);
+var pageContext = createContext2(null);
 pageContext.displayName = "InertiaPageContext";
 var PageContext_default = pageContext;
 
@@ -77,13 +83,13 @@ function App({
       createElement(PageContext_default.Provider, { value: current.page }, null)
     );
   }
-  const renderChildren = children || (({ Component, props, key }) => {
-    const child = createElement(Component, { key, ...props });
-    if (typeof Component.layout === "function") {
-      return Component.layout(child);
+  const renderChildren = children || (({ component, props, key }) => {
+    const child = createElement(component, { key, ...props });
+    if (typeof component.layout === "function") {
+      return component.layout(child);
     }
-    if (Array.isArray(Component.layout)) {
-      return Component.layout.concat(child).reverse().reduce((children2, Layout) => createElement(Layout, { children: children2, ...props }));
+    if (Array.isArray(component.layout)) {
+      return component.layout.concat(child).reverse().reduce((children2, Layout) => createElement(Layout, { children: children2, ...props }));
     }
     return child;
   });
@@ -94,7 +100,7 @@ function App({
       PageContext_default.Provider,
       { value: current.page },
       renderChildren({
-        Component: current.component,
+        component: current.component,
         key: current.key,
         props: current.page.props
       })
@@ -115,7 +121,7 @@ async function createInertiaApp({
 }) {
   const isServer = typeof window === "undefined";
   const el = isServer ? null : document.getElementById(id);
-  const initialPage = page || JSON.parse(el.dataset.page);
+  const initialPage = page || JSON.parse(el?.dataset.page || "{}");
   const resolveComponent = (name) => Promise.resolve(resolve(name)).then((module) => module.default || module);
   let head = [];
   const reactApp = await Promise.all([
@@ -123,23 +129,31 @@ async function createInertiaApp({
     router2.decryptHistory().catch(() => {
     })
   ]).then(([initialComponent]) => {
-    return setup({
-      // @ts-expect-error
+    const props = {
+      initialPage,
+      initialComponent,
+      resolveComponent,
+      titleCallback: title
+    };
+    if (isServer) {
+      const ssrSetup = setup;
+      return ssrSetup({
+        el: null,
+        App,
+        props: { ...props, onHeadUpdate: (elements) => head = elements }
+      });
+    }
+    const csrSetup = setup;
+    return csrSetup({
       el,
       App,
-      props: {
-        initialPage,
-        initialComponent,
-        resolveComponent,
-        titleCallback: title,
-        onHeadUpdate: isServer ? (elements) => head = elements : null
-      }
+      props
     });
   });
   if (!isServer && progress2) {
     setupProgress(progress2);
   }
-  if (isServer) {
+  if (isServer && render) {
     const body = await render(
       createElement2(
         "div",
@@ -147,7 +161,6 @@ async function createInertiaApp({
           id,
           "data-page": JSON.stringify(initialPage)
         },
-        // @ts-expect-error
         reactApp
       )
     );
@@ -254,13 +267,13 @@ function useRemember(initialState, key) {
 
 // src/useForm.ts
 function useForm(rememberKeyOrInitialValues, maybeInitialValues) {
-  const isMounted = useRef(null);
+  const isMounted = useRef(false);
   const rememberKey = typeof rememberKeyOrInitialValues === "string" ? rememberKeyOrInitialValues : null;
   const [defaults, setDefaults] = useState4(
     (typeof rememberKeyOrInitialValues === "string" ? maybeInitialValues : rememberKeyOrInitialValues) || {}
   );
   const cancelToken = useRef(null);
-  const recentlySuccessfulTimeoutId = useRef(null);
+  const recentlySuccessfulTimeoutId = useRef(void 0);
   const [data, setData] = rememberKey ? useRemember(defaults, `${rememberKey}:data`) : useState4(defaults);
   const [errors, setErrors] = rememberKey ? useRemember({}, `${rememberKey}:errors`) : useState4({});
   const [hasErrors, setHasErrors] = useState4(false);
@@ -307,7 +320,7 @@ function useForm(rememberKeyOrInitialValues, maybeInitialValues) {
           }
         },
         onProgress: (event) => {
-          setProgress(event);
+          setProgress(event || null);
           if (options.onProgress) {
             return options.onProgress(event);
           }
@@ -366,10 +379,11 @@ function useForm(rememberKeyOrInitialValues, maybeInitialValues) {
           }
         }
       };
+      const transformedData = transform.current(data);
       if (method === "delete") {
-        router5.delete(url, { ..._options, data: transform.current(data) });
+        router5.delete(url, { ..._options, data: transformedData });
       } else {
-        router5[method](url, transform.current(data), _options);
+        router5[method](url, transformedData, _options);
       }
     },
     [data, setErrors, transform]
@@ -467,7 +481,7 @@ function useForm(rememberKeyOrInitialValues, maybeInitialValues) {
     },
     [reset, clearErrors]
   );
-  const createSubmitMethod = (method) => (url, options) => {
+  const createSubmitMethod = (method) => (url, options = {}) => {
     submit(method, url, options);
   };
   const getMethod = useCallback(createSubmitMethod("get"), [submit]);
@@ -542,7 +556,7 @@ var Form = forwardRef(
     ...props
   }, ref) => {
     const form = useForm({});
-    const formElement = useRef2(null);
+    const formElement = useRef2(void 0);
     const resolvedMethod = useMemo4(() => {
       return isUrlMethodPair(action) ? action.method : method.toLowerCase();
     }, [action, method]);
@@ -560,7 +574,9 @@ var Form = forwardRef(
       return () => formEvents.forEach((e) => formElement.current?.removeEventListener(e, updateDirtyState));
     }, []);
     const reset = (...fields) => {
-      resetFormFields(formElement.current, defaultData.current, fields);
+      if (formElement.current) {
+        resetFormFields(formElement.current, defaultData.current, fields);
+      }
     };
     const resetAndClearErrors = (...fields) => {
       form.clearErrors(...fields);
@@ -673,7 +689,7 @@ var Head = function({ children, title }) {
     };
   }, [provider, children, title]);
   function isUnaryTag(node) {
-    return [
+    return typeof node.type === "string" && [
       "area",
       "base",
       "br",
@@ -699,14 +715,20 @@ var Head = function({ children, title }) {
       const value = String(node.props[name]);
       if (value === "") {
         return carry + ` ${name}`;
-      } else {
-        return carry + ` ${name}="${escape(value)}"`;
       }
+      return carry + ` ${name}="${escape(value)}"`;
     }, "");
-    return `<${node.type}${attrs}>`;
+    return `<${String(node.type)}${attrs}>`;
   }
   function renderTagChildren(node) {
-    return typeof node.props.children === "string" ? node.props.children : node.props.children.reduce((html, child) => html + renderTag(child), "");
+    const { children: children2 } = node.props;
+    if (typeof children2 === "string") {
+      return children2;
+    }
+    if (Array.isArray(children2)) {
+      return children2.reduce((html, child) => html + renderTag(child), "");
+    }
+    return "";
   }
   function renderTag(node) {
     let html = renderTagStart(node);
@@ -717,7 +739,7 @@ var Head = function({ children, title }) {
       html += node.props.dangerouslySetInnerHTML.__html;
     }
     if (!isUnaryTag(node)) {
-      html += `</${node.type}>`;
+      html += `</${String(node.type)}>`;
     }
     return html;
   }
@@ -730,11 +752,11 @@ var Head = function({ children, title }) {
     return renderTag(ensureNodeHasInertiaProp(node));
   }
   function renderNodes(nodes) {
-    const computed = React2.Children.toArray(nodes).filter((node) => node).map((node) => renderNode(node));
-    if (title && !computed.find((tag) => tag.startsWith("<title"))) {
-      computed.push(`<title inertia>${title}</title>`);
+    const elements = React2.Children.toArray(nodes).filter((node) => node).map((node) => renderNode(node));
+    if (title && !elements.find((tag) => tag.startsWith("<title"))) {
+      elements.push(`<title inertia>${title}</title>`);
     }
-    return computed;
+    return elements;
   }
   if (isServer) {
     provider.update(renderNodes(children));
@@ -1028,7 +1050,7 @@ var Link = forwardRef3(
     ...props
   }, ref) => {
     const [inFlightCount, setInFlightCount] = useState7(0);
-    const hoverTimeout = useRef4(null);
+    const hoverTimeout = useRef4(void 0);
     const _method = useMemo7(() => {
       return isUrlMethodPair2(href) ? href.method : method.toLowerCase();
     }, [href, method]);
@@ -1154,7 +1176,7 @@ var Link = forwardRef3(
         }
       },
       onKeyDown: (event) => {
-        if (shouldIntercept(event) && shouldNavigate(event)) {
+        if (shouldNavigate(event)) {
           event.preventDefault();
           doPrefetch();
         }