@inertiajs/react 3.0.0-beta.2 → 3.0.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inertiajs/react",
-  "version": "3.0.0-beta.2",
+  "version": "3.0.0-beta.4",
   "license": "MIT",
   "description": "The React adapter for Inertia.js",
   "contributors": [
@@ -57,10 +57,9 @@
     "react-dom": "^19.0.0"
   },
   "dependencies": {
-    "@types/lodash-es": "^4.17.12",
-    "laravel-precognition": "2.0.0-beta.3",
-    "lodash-es": "^4.17.23",
-    "@inertiajs/core": "3.0.0-beta.2"
+    "es-toolkit": "^1.33.0",
+    "laravel-precognition": "2.0.0-beta.5",
+    "@inertiajs/core": "3.0.0-beta.4"
   },
   "scripts": {
     "build": "pnpm clean && ./build.js && tsc",
@@ -69,6 +68,6 @@
     "dev": "pnpx concurrently -c \"#ffcf00,#3178c6\" \"pnpm dev:build\" \"pnpm dev:types\" --names build,types",
     "dev:build": "./build.js --watch",
     "dev:types": "tsc --watch --preserveWatchOutput",
-    "es2020-check": "pnpm build:with-deps && es-check es2020 \"dist/index.js\" --checkFeatures --module --noCache --verbose"
+    "es2022-check": "pnpm build:with-deps && es-check es2022 \"dist/index.js\" --checkFeatures --module --noCache --verbose"
   }
 }

package/types/createInertiaApp.d.ts

@@ -1,4 +1,4 @@
-import { CreateInertiaAppOptions, CreateInertiaAppOptionsForCSR, CreateInertiaAppOptionsForSSR, InertiaAppSSRResponse, Page, PageProps } from '@inertiajs/core';
+import { CreateInertiaAppOptions, CreateInertiaAppOptionsForCSR, CreateInertiaAppOptionsForSSR, InertiaAppSSRResponse, Page, PageProps, SharedPageProps } from '@inertiajs/core';
 import { ReactElement } from 'react';
 import { renderToString } from 'react-dom/server';
 import { InertiaAppProps, type InertiaApp } from './App';
@@ -8,24 +8,33 @@ export type SetupOptions<ElementType, SharedProps extends PageProps> = {
     App: InertiaApp;
     props: InertiaAppProps<SharedProps>;
 };
-type ComponentResolver = (name: string, page?: Page) => ReactComponent | Promise<ReactComponent> | {
+type ComponentResolver = (name: string, page?: Page<SharedPageProps>) => ReactComponent | Promise<ReactComponent> | {
     default: ReactComponent;
 };
 type InertiaAppOptionsForCSR<SharedProps extends PageProps> = CreateInertiaAppOptionsForCSR<SharedProps, ComponentResolver, SetupOptions<HTMLElement, SharedProps>, void, ReactInertiaAppConfig> & {
     strictMode?: undefined;
+    withApp?: (app: ReactElement, options: {
+        ssr: boolean;
+    }) => ReactElement;
 };
 type InertiaAppOptionsForSSR<SharedProps extends PageProps> = CreateInertiaAppOptionsForSSR<SharedProps, ComponentResolver, SetupOptions<null, SharedProps>, ReactElement, ReactInertiaAppConfig> & {
     render: typeof renderToString;
     strictMode?: undefined;
+    withApp?: (app: ReactElement, options: {
+        ssr: boolean;
+    }) => ReactElement;
 };
 type InertiaAppOptionsAuto<SharedProps extends PageProps> = CreateInertiaAppOptions<ComponentResolver, SetupOptions<HTMLElement | null, SharedProps>, ReactElement | void, ReactInertiaAppConfig> & {
     page?: Page<SharedProps>;
     render?: undefined;
     strictMode?: boolean;
+    withApp?: (app: ReactElement, options: {
+        ssr: boolean;
+    }) => ReactElement;
 };
 type RenderToString = (element: ReactElement) => string;
 type RenderFunction<SharedProps extends PageProps> = (page: Page<SharedProps>, renderToString: RenderToString) => Promise<InertiaAppSSRResponse>;
-export default function createInertiaApp<SharedProps extends PageProps = PageProps>(options: InertiaAppOptionsForCSR<SharedProps>): Promise<void>;
-export default function createInertiaApp<SharedProps extends PageProps = PageProps>(options: InertiaAppOptionsForSSR<SharedProps>): Promise<InertiaAppSSRResponse>;
-export default function createInertiaApp<SharedProps extends PageProps = PageProps>(options?: InertiaAppOptionsAuto<SharedProps>): Promise<void | RenderFunction<SharedProps>>;
+export default function createInertiaApp<SharedProps extends PageProps = PageProps & SharedPageProps>(options: InertiaAppOptionsForCSR<SharedProps>): Promise<void>;
+export default function createInertiaApp<SharedProps extends PageProps = PageProps & SharedPageProps>(options: InertiaAppOptionsForSSR<SharedProps>): Promise<InertiaAppSSRResponse>;
+export default function createInertiaApp<SharedProps extends PageProps = PageProps & SharedPageProps>(options?: InertiaAppOptionsAuto<SharedProps>): Promise<void | RenderFunction<SharedProps>>;
 export {};

package/types/index.d.ts

@@ -6,9 +6,9 @@ export { default as Deferred } from './Deferred';
 export { default as Form, useFormContext } from './Form';
 export { default as Head } from './Head';
 export { default as InfiniteScroll } from './InfiniteScroll';
-export { resetLayoutProps, setLayoutProps, setLayoutPropsFor, useLayoutProps } from './layoutProps';
+export { resetLayoutProps, setLayoutProps, setLayoutPropsFor } from './layoutProps';
 export { InertiaLinkProps, default as Link } from './Link';
-export { ReactComponent as ResolvedComponent } from './types';
+export { LayoutCallback, ReactComponent as ResolvedComponent } from './types';
 export { InertiaForm, InertiaFormProps, InertiaPrecognitiveFormProps, SetDataAction, SetDataByKeyValuePair, SetDataByMethod, SetDataByObject, default as useForm, } from './useForm';
 export { default as useHttp } from './useHttp';
 export { default as usePage } from './usePage';

package/types/layoutProps.d.ts

@@ -1,8 +1,5 @@
-export declare function setLayoutProps(props: Record<string, unknown>): void;
-export declare function setLayoutPropsFor(name: string, props: Record<string, unknown>): void;
+import { type LayoutProps, type NamedLayoutProps } from '@inertiajs/core';
+export declare const store: import("@inertiajs/core").LayoutPropsStore;
+export declare function setLayoutProps(props: Partial<LayoutProps>): void;
+export declare function setLayoutPropsFor<K extends keyof NamedLayoutProps>(name: K, props: Partial<NamedLayoutProps[K]>): void;
 export declare function resetLayoutProps(): void;
-export declare const LayoutPropsContext: import("react").Context<{
-    staticProps: Record<string, unknown>;
-    name?: string;
-}>;
-export declare function useLayoutProps<T extends Record<string, unknown>>(defaults: T): T;

package/types/types.d.ts

@@ -1,11 +1,12 @@
-import { PageHandler } from '@inertiajs/core';
+import { PageHandler, SharedPageProps } from '@inertiajs/core';
 import { ComponentType, ReactNode } from 'react';
 export type LayoutFunction = (page: ReactNode) => ReactNode;
+export type LayoutCallback = (props: SharedPageProps) => unknown;
 export type LayoutComponent = ComponentType<{
     children: ReactNode;
 }>;
 export type ReactComponent = ComponentType<any> & {
-    layout?: LayoutComponent | LayoutComponent[] | LayoutFunction;
+    layout?: LayoutComponent | LayoutComponent[] | LayoutFunction | LayoutCallback;
 };
 export type ReactPageHandlerArgs = Parameters<PageHandler<ComponentType>>[0];
 export type ReactInertiaAppConfig = {

package/types/useFormState.d.ts

@@ -62,8 +62,8 @@ export interface UseFormStateReturn<TForm extends object> {
     precognitionEndpointRef: React.MutableRefObject<(() => UrlMethodPair) | null>;
     dataRef: React.MutableRefObject<TForm>;
     isMounted: React.MutableRefObject<boolean>;
-    setProcessing: React.Dispatch<React.SetStateAction<boolean>>;
-    setProgress: React.Dispatch<React.SetStateAction<Progress | null>>;
+    setProcessing: (value: boolean) => void;
+    setProgress: (value: Progress | null) => void;
     markAsSuccessful: () => void;
     clearErrors: (...fields: string[]) => void;
     setError: (fieldOrFields: FormDataKeys<TForm> | FormDataErrors<TForm>, maybeValue?: ErrorValue) => void;

package/types/useHttp.d.ts

@@ -28,12 +28,12 @@ export interface UseHttpProps<TForm extends object, TResponse = unknown> {
         <K extends FormDataKeys<TForm>>(field: K, value: ErrorValue): void;
         (errors: FormDataErrors<TForm>): void;
     };
-    submit: (...args: UseHttpSubmitArguments<TResponse, TForm>) => Promise<TResponse>;
-    get: (url: string, options?: UseHttpSubmitOptions<TResponse, TForm>) => Promise<TResponse>;
-    post: (url: string, options?: UseHttpSubmitOptions<TResponse, TForm>) => Promise<TResponse>;
-    put: (url: string, options?: UseHttpSubmitOptions<TResponse, TForm>) => Promise<TResponse>;
-    patch: (url: string, options?: UseHttpSubmitOptions<TResponse, TForm>) => Promise<TResponse>;
-    delete: (url: string, options?: UseHttpSubmitOptions<TResponse, TForm>) => Promise<TResponse>;
+    submit: <R = TResponse>(...args: UseHttpSubmitArguments<R, TForm>) => Promise<R>;
+    get: <R = TResponse>(url: string, options?: UseHttpSubmitOptions<R, TForm>) => Promise<R>;
+    post: <R = TResponse>(url: string, options?: UseHttpSubmitOptions<R, TForm>) => Promise<R>;
+    put: <R = TResponse>(url: string, options?: UseHttpSubmitOptions<R, TForm>) => Promise<R>;
+    patch: <R = TResponse>(url: string, options?: UseHttpSubmitOptions<R, TForm>) => Promise<R>;
+    delete: <R = TResponse>(url: string, options?: UseHttpSubmitOptions<R, TForm>) => Promise<R>;
     cancel: () => void;
     dontRemember: <K extends FormDataKeys<TForm>>(...fields: K[]) => UseHttpProps<TForm, TResponse>;
     optimistic: (callback: (currentData: TForm) => Partial<TForm>) => UseHttpProps<TForm, TResponse>;