ding-react-admin 1.0.2 → 2.0.0

package/dist/index.js

@@ -1,32 +1,32 @@
 import { Children as e, createContext as t, createElement as n, isValidElement as r, useCallback as i, useContext as a, useEffect as o, useMemo as s, useRef as c, useState as l } from "react";
 import { Link as u, Navigate as d, Outlet as f, RouterProvider as p, createBrowserRouter as m, useLocation as h, useNavigate as g, useParams as _, useSearchParams as v } from "react-router-dom";
-import { App as y, Avatar as b, Button as x, Card as S, ConfigProvider as C, DatePicker as w, Drawer as T, Dropdown as ee, Flex as E, Form as D, Grid as O, Input as k, InputNumber as A, Layout as j, Menu as te, Modal as M, Popover as ne, Segmented as N, Select as P, Space as F, Spin as I, Steps as L, Switch as re, Table as ie, Tabs as ae, Typography as R, theme as z } from "antd";
+import { App as y, Avatar as b, Button as x, Card as S, ConfigProvider as C, DatePicker as w, Drawer as ee, Dropdown as T, Flex as E, Form as D, Grid as O, Image as k, Input as A, InputNumber as te, Layout as j, Menu as ne, Modal as M, Popover as N, Segmented as re, Select as P, Space as F, Spin as I, Steps as ie, Switch as ae, Table as oe, Tabs as L, Typography as R, theme as z } from "antd";
 import { Fragment as B, jsx as V, jsxs as H } from "react/jsx-runtime";
-import { ArrowLeftOutlined as U, CaretDownOutlined as oe, CaretUpOutlined as se, ColumnHeightOutlined as W, DesktopOutlined as ce, LayoutOutlined as le, LogoutOutlined as ue, MenuOutlined as de, MoonOutlined as fe, SettingOutlined as pe, SunOutlined as me, UserOutlined as he } from "@ant-design/icons";
-import { Controller as ge, FormProvider as _e, useFieldArray as ve, useForm as ye, useFormContext as G, useFormState as K, useWatch as be } from "react-hook-form";
-import xe from "dayjs";
+import { ArrowLeftOutlined as U, CaretDownOutlined as se, CaretUpOutlined as ce, ColumnHeightOutlined as le, DeleteOutlined as ue, DesktopOutlined as de, LayoutOutlined as fe, LogoutOutlined as pe, MenuOutlined as me, MoonOutlined as he, PaperClipOutlined as ge, SettingOutlined as _e, SunOutlined as ve, UploadOutlined as ye, UserOutlined as be } from "@ant-design/icons";
+import { Controller as xe, FormProvider as W, useFieldArray as Se, useForm as Ce, useFormContext as G, useFormState as we, useWatch as Te } from "react-hook-form";
+import Ee from "dayjs";
 //#region src/context/AppThemeProvider.tsx
-var Se = t(null);
-function Ce(e) {
+var De = t(null);
+function Oe(e) {
 	try {
 		let t = localStorage.getItem(e);
 		if (t === "light" || t === "dark" || t === "system") return t;
 	} catch {}
 	return "system";
 }
-function we() {
+function ke() {
 	return window.matchMedia("(prefers-color-scheme: dark)").matches;
 }
-function Te(e) {
+function Ae(e) {
 	try {
 		let t = localStorage.getItem(e);
 		if (t === "comfortable" || t === "compact") return t;
 	} catch {}
 	return "comfortable";
 }
-var Ee = "ding-react-admin-theme-mode", De = "ding-react-admin-theme-density";
-function Oe({ children: e, modeStorageKey: t = Ee, densityStorageKey: n = De }) {
-	let [r, i] = l(() => Ce(t)), [a, c] = l(() => Te(n)), [u, d] = l(we);
+var je = "ding-react-admin-theme-mode", Me = "ding-react-admin-theme-density";
+function Ne({ children: e, modeStorageKey: t = je, densityStorageKey: n = Me }) {
+	let [r, i] = l(() => Oe(t)), [a, c] = l(() => Ae(n)), [u, d] = l(ke);
 	o(() => {
 		if (r !== "system") return;
 		let e = window.matchMedia("(prefers-color-scheme: dark)"), t = () => d(e.matches);
@@ -58,7 +58,7 @@ function Oe({ children: e, modeStorageKey: t = Ee, densityStorageKey: n = De })
 		f,
 		p
 	]);
-	return /* @__PURE__ */ V(Se.Provider, {
+	return /* @__PURE__ */ V(De.Provider, {
 		value: g,
 		children: /* @__PURE__ */ V(C, {
 			theme: h,
@@ -66,64 +66,64 @@ function Oe({ children: e, modeStorageKey: t = Ee, densityStorageKey: n = De })
 		})
 	});
 }
-function ke() {
-	let e = a(Se);
+function Pe() {
+	let e = a(De);
 	if (!e) throw Error("useThemeMode must be used within AppThemeProvider");
 	return e;
 }
 //#endregion
 //#region src/components/DensitySwitch.tsx
-var Ae = [{
+var Fe = [{
 	label: "Comfortable",
 	value: "comfortable",
-	icon: /* @__PURE__ */ V(le, {})
+	icon: /* @__PURE__ */ V(fe, {})
 }, {
 	label: "Compact",
 	value: "compact",
-	icon: /* @__PURE__ */ V(W, {})
+	icon: /* @__PURE__ */ V(le, {})
 }];
-function je() {
-	let { density: e, setDensity: t } = ke();
-	return /* @__PURE__ */ V(N, {
+function Ie() {
+	let { density: e, setDensity: t } = Pe();
+	return /* @__PURE__ */ V(re, {
 		size: "small",
 		value: e,
-		options: Ae,
+		options: Fe,
 		onChange: (e) => t(e)
 	});
 }
 //#endregion
 //#region src/components/ThemeSwitch.tsx
-var Me = [
+var Le = [
 	{
 		label: "Light",
 		value: "light",
-		icon: /* @__PURE__ */ V(me, {})
+		icon: /* @__PURE__ */ V(ve, {})
 	},
 	{
 		label: "Dark",
 		value: "dark",
-		icon: /* @__PURE__ */ V(fe, {})
+		icon: /* @__PURE__ */ V(he, {})
 	},
 	{
 		label: "Auto",
 		value: "system",
-		icon: /* @__PURE__ */ V(ce, {})
+		icon: /* @__PURE__ */ V(de, {})
 	}
 ];
-function Ne() {
-	let { mode: e, setMode: t } = ke();
-	return /* @__PURE__ */ V(N, {
+function Re() {
+	let { mode: e, setMode: t } = Pe();
+	return /* @__PURE__ */ V(re, {
 		size: "small",
 		value: e,
-		options: Me,
+		options: Le,
 		onChange: (e) => t(e)
 	});
 }
 //#endregion
 //#region src/components/ThemeToolbar.tsx
-function Pe() {
+function ze() {
 	let { token: e } = z.useToken();
-	return /* @__PURE__ */ V(ne, {
+	return /* @__PURE__ */ V(N, {
 		placement: O.useBreakpoint().lg ? "bottomRight" : "bottom",
 		trigger: "click",
 		content: /* @__PURE__ */ H(F, {
@@ -133,20 +133,20 @@ function Pe() {
 				minWidth: 240,
 				maxWidth: "min(92vw, 320px)"
 			},
-			children: [/* @__PURE__ */ V(Ne, {}), /* @__PURE__ */ V(je, {})]
+			children: [/* @__PURE__ */ V(Re, {}), /* @__PURE__ */ V(Ie, {})]
 		}),
 		styles: { content: { padding: e.paddingSM } },
 		children: /* @__PURE__ */ V(x, {
 			type: "default",
-			icon: /* @__PURE__ */ V(pe, {}),
+			icon: /* @__PURE__ */ V(_e, {}),
 			"aria-label": "Display and theme settings"
 		})
 	});
 }
 //#endregion
 //#region src/context/AuthProvider.tsx
-var Fe = t(null);
-function Ie({ children: e, adapter: t }) {
+var Be = t(null);
+function Ve({ children: e, adapter: t }) {
 	let [n, r] = l(() => t.getToken()), a = i(async (e) => {
 		await t.login(e), r(t.getToken());
 	}, [t]), o = i(() => {
@@ -160,18 +160,18 @@ function Ie({ children: e, adapter: t }) {
 		a,
 		o
 	]);
-	return /* @__PURE__ */ V(Fe.Provider, {
+	return /* @__PURE__ */ V(Be.Provider, {
 		value: c,
 		children: e
 	});
 }
-function Le() {
-	let e = a(Fe);
+function He() {
+	let e = a(Be);
 	if (!e) throw Error("useAuth must be used within AuthProvider");
 	return e;
 }
-var Re = "ding-react-admin-auth";
-function ze(e = Re) {
+var Ue = "ding-react-admin-auth";
+function We(e = Ue) {
 	return {
 		async login({ username: t, password: n }) {
 			if (!t.trim() || !n) throw Error("Invalid credentials");
@@ -187,37 +187,37 @@ function ze(e = Re) {
 }
 //#endregion
 //#region src/context/PermissionsProvider.tsx
-var Be = t(null);
-function Ve({ children: e, can: t }) {
+var Ge = t(null);
+function Ke({ children: e, can: t }) {
 	let n = s(() => t, [t]);
-	return /* @__PURE__ */ V(Be.Provider, {
+	return /* @__PURE__ */ V(Ge.Provider, {
 		value: n,
 		children: e
 	});
 }
-function q() {
-	let e = a(Be);
+function K() {
+	let e = a(Ge);
 	if (!e) throw Error("usePermissions must be used within PermissionsProvider");
 	return e;
 }
-function He(e) {
+function qe(e) {
 	return (t) => e()?.includes(t) ?? !1;
 }
-function Ue(e) {
-	let t = q();
+function Je(e) {
+	let t = K();
 	return i(() => t(e), [t, e]);
 }
 //#endregion
 //#region src/permissions/resourcePermissions.ts
-function J(e, t, n) {
+function q(e, t, n) {
 	if (!t) return !0;
 	let r = t[n];
 	return n === "read" && !r && (r = t.list), r ? e(r) : !1;
 }
-function We(e, t) {
+function Ye(e, t) {
 	return e.map((e) => {
 		if (e.children?.length) {
-			let n = We(e.children, t);
+			let n = Ye(e.children, t);
 			return n.length === 0 ? null : {
 				...e,
 				children: n
@@ -228,25 +228,25 @@ function We(e, t) {
 }
 //#endregion
 //#region src/layouts/AdminLayout.tsx
-var Ge = "#001529", Ke = "ding-react-admin-sider-collapsed";
-function qe(e) {
+var Xe = "#001529", Ze = "ding-react-admin-sider-collapsed";
+function Qe(e) {
 	try {
 		return localStorage.getItem(e) === "1";
 	} catch {
 		return !1;
 	}
 }
-function Je() {
+function $e() {
 	return O.useBreakpoint().lg !== !0;
 }
-function Ye(e) {
+function et(e) {
 	let t = /* @__PURE__ */ new Set();
 	function n(e) {
 		for (let r of e) r.children?.length ? n(r.children) : t.add(r.path);
 	}
 	return n(e), t;
 }
-function Xe(e, t) {
+function tt(e, t) {
 	function n(e) {
 		for (let r of e) if (r.children?.length) {
 			let e = n(r.children);
@@ -256,14 +256,14 @@ function Xe(e, t) {
 	}
 	return n(e) ?? [];
 }
-function Ze(e) {
+function nt(e) {
 	return e.map((e) => {
 		let t = e.Icon, n = t ? /* @__PURE__ */ V(t, {}) : void 0;
 		return e.children?.length ? {
 			key: e.path,
 			icon: n,
 			label: e.label,
-			children: Ze(e.children)
+			children: nt(e.children)
 		} : {
 			key: e.path,
 			icon: n,
@@ -271,8 +271,8 @@ function Ze(e) {
 		};
 	});
 }
-function Qe({ menuItems: e, selectedKeys: t, inlineCollapsed: n, openKeys: r, onOpenChange: i, onNavigate: a }) {
-	return /* @__PURE__ */ V(te, {
+function rt({ menuItems: e, selectedKeys: t, inlineCollapsed: n, openKeys: r, onOpenChange: i, onNavigate: a }) {
+	return /* @__PURE__ */ V(ne, {
 		mode: "inline",
 		theme: "dark",
 		inlineCollapsed: n,
@@ -289,10 +289,10 @@ function Qe({ menuItems: e, selectedKeys: t, inlineCollapsed: n, openKeys: r, on
 		}
 	});
 }
-function $e({ navItems: e, brand: t = "Admin", collapsedBrand: n = "A", mobileDrawerTitle: r, headerExtras: a, userMenuItems: c, onUserMenuClick: u, loginPath: d = "/login", siderCollapsedStorageKey: p = Ke }) {
-	let m = g(), _ = h(), { resolved: v } = ke(), y = v === "dark", { logout: S } = Le(), C = q(), [w, E] = l(() => qe(p)), [D, O] = l(!1), k = Je(), { token: A } = z.useToken(), te = r ?? t, M = () => {
+function it({ navItems: e, brand: t = "Admin", collapsedBrand: n = "A", mobileDrawerTitle: r, headerExtras: a, userMenuItems: c, onUserMenuClick: u, loginPath: d = "/login", siderCollapsedStorageKey: p = Ze }) {
+	let m = g(), _ = h(), { resolved: v } = Pe(), y = v === "dark", { logout: S } = He(), C = K(), [w, E] = l(() => Qe(p)), [D, O] = l(!1), k = $e(), { token: A } = z.useToken(), te = r ?? t, ne = () => {
 		S(), m(d, { replace: !0 });
-	}, ne = i((e) => {
+	}, M = i((e) => {
 		E(e);
 		try {
 			localStorage.setItem(p, e ? "1" : "0");
@@ -303,25 +303,25 @@ function $e({ navItems: e, brand: t = "Admin", collapsedBrand: n = "A", mobileDr
 	}, [k]), o(() => {
 		O(!1);
 	}, [_.pathname]);
-	let N = s(() => We(e, C), [e, C]), P = s(() => Ye(N), [N]), F = s(() => Ze(N), [N]), I = s(() => Xe(N, _.pathname), [N, _.pathname]), [L, re] = l(() => Xe(N, _.pathname));
+	let N = s(() => Ye(e, C), [e, C]), re = s(() => et(N), [N]), P = s(() => nt(N), [N]), F = s(() => tt(N, _.pathname), [N, _.pathname]), [I, ie] = l(() => tt(N, _.pathname));
 	o(() => {
-		re((e) => [...new Set([...e, ...I])]);
-	}, [I]);
-	let ie = i((e) => {
-		re(e);
-	}, []), ae = s(() => [{
+		ie((e) => [...new Set([...e, ...F])]);
+	}, [F]);
+	let ae = i((e) => {
+		ie(e);
+	}, []), oe = s(() => [{
 		key: "logout",
-		icon: /* @__PURE__ */ V(ue, {}),
+		icon: /* @__PURE__ */ V(pe, {}),
 		label: "Log out",
 		danger: !0
-	}], []), B = c ?? ae, U = (e) => {
+	}], []), L = c ?? oe, B = (e) => {
 		if (u) {
 			u(e);
 			return;
 		}
-		e.key === "logout" && M();
-	}, oe = y ? A.colorBgContainer : Ge, se = [_.pathname], W = (e) => {
-		P.has(e) && (m(e), k && O(!1));
+		e.key === "logout" && ne();
+	}, U = y ? A.colorBgContainer : Xe, se = [_.pathname], ce = (e) => {
+		re.has(e) && (m(e), k && O(!1));
 	};
 	return /* @__PURE__ */ H(j, {
 		style: {
@@ -333,10 +333,10 @@ function $e({ navItems: e, brand: t = "Admin", collapsedBrand: n = "A", mobileDr
 			!k && /* @__PURE__ */ H(j.Sider, {
 				collapsible: !0,
 				collapsed: w,
-				onCollapse: ne,
+				onCollapse: M,
 				collapsedWidth: 64,
 				style: {
-					background: oe,
+					background: U,
 					borderInlineEnd: y ? `1px solid ${A.colorSplit}` : void 0
 				},
 				children: [/* @__PURE__ */ V("div", {
@@ -352,16 +352,16 @@ function $e({ navItems: e, brand: t = "Admin", collapsedBrand: n = "A", mobileDr
 						style: { color: A.colorTextLightSolid },
 						children: w ? n : t
 					})
-				}), /* @__PURE__ */ V(Qe, {
-					menuItems: F,
+				}), /* @__PURE__ */ V(rt, {
+					menuItems: P,
 					selectedKeys: se,
 					inlineCollapsed: w,
-					openKeys: L,
-					onOpenChange: ie,
-					onNavigate: W
+					openKeys: I,
+					onOpenChange: ae,
+					onNavigate: ce
 				})]
 			}),
-			k && /* @__PURE__ */ V(T, {
+			k && /* @__PURE__ */ V(ee, {
 				title: /* @__PURE__ */ V(R.Text, {
 					strong: !0,
 					style: { color: A.colorTextLightSolid },
@@ -373,119 +373,125 @@ function $e({ navItems: e, brand: t = "Admin", collapsedBrand: n = "A", mobileDr
 				open: D,
 				styles: {
 					header: {
-						background: oe,
+						background: U,
 						borderBottom: `1px solid ${A.colorSplit}`
 					},
 					body: {
 						padding: 0,
-						background: oe
+						background: U
 					}
 				},
 				destroyOnHidden: !0,
-				children: /* @__PURE__ */ V(Qe, {
-					menuItems: F,
+				children: /* @__PURE__ */ V(rt, {
+					menuItems: P,
 					selectedKeys: se,
 					inlineCollapsed: !1,
-					openKeys: L,
-					onOpenChange: ie,
-					onNavigate: W
+					openKeys: I,
+					onOpenChange: ae,
+					onNavigate: ce
 				})
 			}),
-			/* @__PURE__ */ H(j, { children: [/* @__PURE__ */ H(j.Header, {
-				style: {
-					background: A.colorBgContainer,
-					paddingInline: A.paddingLG,
-					display: "flex",
-					alignItems: "center",
-					gap: A.marginSM,
-					lineHeight: "normal"
-				},
-				children: [
-					k && /* @__PURE__ */ V(x, {
-						type: "text",
-						icon: /* @__PURE__ */ V(de, {}),
-						onClick: () => O(!0),
-						"aria-label": "Open navigation"
-					}),
-					/* @__PURE__ */ V("div", { style: {
-						flex: 1,
-						minWidth: 0
-					} }),
-					a,
-					/* @__PURE__ */ V(Pe, {}),
-					/* @__PURE__ */ V(ee, {
-						menu: {
-							items: B,
-							onClick: U
-						},
-						trigger: ["click"],
-						children: /* @__PURE__ */ H(x, {
+			/* @__PURE__ */ H(j, {
+				style: { minWidth: 0 },
+				children: [/* @__PURE__ */ H(j.Header, {
+					style: {
+						background: A.colorBgContainer,
+						paddingInline: A.paddingLG,
+						display: "flex",
+						alignItems: "center",
+						gap: A.marginSM,
+						lineHeight: "normal"
+					},
+					children: [
+						k && /* @__PURE__ */ V(x, {
 							type: "text",
-							style: {
-								display: "inline-flex",
-								alignItems: "center",
-								gap: A.marginXS,
-								maxWidth: k ? 44 : void 0,
-								paddingInline: k ? A.paddingXS : void 0
+							icon: /* @__PURE__ */ V(me, {}),
+							onClick: () => O(!0),
+							"aria-label": "Open navigation"
+						}),
+						/* @__PURE__ */ V("div", { style: {
+							flex: 1,
+							minWidth: 0
+						} }),
+						a,
+						/* @__PURE__ */ V(ze, {}),
+						/* @__PURE__ */ V(T, {
+							menu: {
+								items: L,
+								onClick: B
 							},
-							"aria-label": "Account menu",
-							children: [/* @__PURE__ */ V(b, {
-								size: "small",
-								icon: /* @__PURE__ */ V(he, {})
-							}), !k && /* @__PURE__ */ V(R.Text, {
-								type: "secondary",
-								children: "User"
-							})]
+							trigger: ["click"],
+							children: /* @__PURE__ */ H(x, {
+								type: "text",
+								style: {
+									display: "inline-flex",
+									alignItems: "center",
+									gap: A.marginXS,
+									maxWidth: k ? 44 : void 0,
+									paddingInline: k ? A.paddingXS : void 0
+								},
+								"aria-label": "Account menu",
+								children: [/* @__PURE__ */ V(b, {
+									size: "small",
+									icon: /* @__PURE__ */ V(be, {})
+								}), !k && /* @__PURE__ */ V(R.Text, {
+									type: "secondary",
+									children: "User"
+								})]
+							})
 						})
-					})
-				]
-			}), /* @__PURE__ */ V(j.Content, {
-				style: { margin: k ? A.marginSM : A.marginLG },
-				children: /* @__PURE__ */ V(f, {})
-			})] })
+					]
+				}), /* @__PURE__ */ V(j.Content, {
+					style: {
+						margin: k ? A.marginSM : A.marginLG,
+						minWidth: 0
+					},
+					children: /* @__PURE__ */ V(f, {})
+				})]
+			})
 		]
 	});
 }
 //#endregion
 //#region src/router/guards.tsx
-function et({ when: e, redirect: t, children: n }) {
+function at({ when: e, redirect: t, children: n }) {
 	return e ? n : /* @__PURE__ */ V(d, {
 		to: t,
 		replace: !0
 	});
 }
-function tt({ children: e, redirectTo: t = "/login" }) {
-	let { isAuthenticated: n } = Le();
-	return /* @__PURE__ */ V(et, {
+function ot({ children: e, redirectTo: t = "/login" }) {
+	let { isAuthenticated: n } = He();
+	return /* @__PURE__ */ V(at, {
 		when: n,
 		redirect: t,
 		children: e
 	});
 }
-function nt({ children: e, redirectTo: t = "/" }) {
-	let { isAuthenticated: n } = Le();
-	return /* @__PURE__ */ V(et, {
+function st({ children: e, redirectTo: t = "/" }) {
+	let { isAuthenticated: n } = He();
+	return /* @__PURE__ */ V(at, {
 		when: !n,
 		redirect: t,
 		children: e
 	});
 }
-function rt({ permission: e, redirect: t, children: n }) {
-	return /* @__PURE__ */ V(et, {
-		when: q()(e),
+function ct({ permission: e, redirect: t, children: n }) {
+	return /* @__PURE__ */ V(at, {
+		when: K()(e),
 		redirect: t,
 		children: n
 	});
 }
 //#endregion
 //#region src/router/routeAccess.ts
-function it(e) {
+function lt(e) {
 	return e.access ?? "protected";
 }
-function at(e) {
+function ut(e) {
 	let t = [], n = [], r = [];
 	for (let i of e) {
-		let e = it(i);
+		let e = lt(i);
 		e === "guest" ? t.push(i) : e === "public" ? n.push(i) : r.push(i);
 	}
 	return {
@@ -494,24 +500,24 @@ function at(e) {
 		protected: r
 	};
 }
-function ot(e) {
+function dt(e) {
 	return e.replace(/^\/+/, "");
 }
-function st(e) {
-	return `/${ot(e)}`;
+function ft(e) {
+	return `/${dt(e)}`;
 }
-function ct(e, t) {
-	let { guest: n, protected: r } = at(e), i = n.find((e) => "path" in e && e.path), a = r.find((e) => "index" in e && e.index), o = r.find((e) => "path" in e && e.path), s = t?.unauthenticated;
-	!s && i && "path" in i && i.path && (s = st(i.path));
+function pt(e, t) {
+	let { guest: n, protected: r } = ut(e), i = n.find((e) => "path" in e && e.path), a = r.find((e) => "index" in e && e.index), o = r.find((e) => "path" in e && e.path), s = t?.unauthenticated;
+	!s && i && "path" in i && i.path && (s = ft(i.path));
 	let c = t?.afterLogin;
-	if (c || (a ? c = "/" : o && "path" in o && o.path && (c = st(o.path))), r.length > 0 && !s) throw Error("createAdminRouter: protected routes require redirects.unauthenticated or a guest route (access: \"guest\").");
+	if (c || (a ? c = "/" : o && "path" in o && o.path && (c = ft(o.path))), r.length > 0 && !s) throw Error("createAdminRouter: protected routes require redirects.unauthenticated or a guest route (access: \"guest\").");
 	if (n.length > 0 && !c) throw Error("createAdminRouter: guest routes require redirects.afterLogin or a protected route (index or path).");
 	return {
 		loginPath: s ?? "/",
 		homePath: c ?? "/"
 	};
 }
-function lt(e) {
+function mt(e) {
 	return "index" in e && e.index ? {
 		index: !0,
 		element: e.element
@@ -522,30 +528,30 @@ function lt(e) {
 }
 //#endregion
 //#region src/router/createAdminRouter.tsx
-function ut({ navItems: e, children: t, layoutProps: n, redirects: r }) {
-	let { loginPath: i, homePath: a } = ct(t, r), { guest: o, public: s, protected: c } = at(t), l = [];
+function ht({ navItems: e, children: t, layoutProps: n, redirects: r }) {
+	let { loginPath: i, homePath: a } = pt(t, r), { guest: o, public: s, protected: c } = ut(t), l = [];
 	for (let e of o) !("path" in e) || !e.path || l.push({
-		path: ot(e.path),
-		element: /* @__PURE__ */ V(nt, {
+		path: dt(e.path),
+		element: /* @__PURE__ */ V(st, {
 			redirectTo: a,
 			children: e.element
 		})
 	});
 	for (let e of s) !("path" in e) || !e.path || l.push({
-		path: ot(e.path),
+		path: dt(e.path),
 		element: e.element
 	});
 	return c.length > 0 && l.push({
 		path: "/",
-		element: /* @__PURE__ */ V(tt, {
+		element: /* @__PURE__ */ V(ot, {
 			redirectTo: i,
-			children: /* @__PURE__ */ V($e, {
+			children: /* @__PURE__ */ V(it, {
 				navItems: e,
 				loginPath: i,
 				...n
 			})
 		}),
-		children: c.map(lt)
+		children: c.map(mt)
 	}), l.push({
 		path: "*",
 		element: /* @__PURE__ */ V(d, {
@@ -556,8 +562,8 @@ function ut({ navItems: e, children: t, layoutProps: n, redirects: r }) {
 }
 //#endregion
 //#region src/app/AdminApp.tsx
-function dt({ navItems: e, routes: t, authRedirects: n, layoutProps: r, theme: i }) {
-	let a = s(() => ut({
+function gt({ navItems: e, routes: t, authRedirects: n, layoutProps: r, theme: i }) {
+	let a = s(() => ht({
 		navItems: e,
 		children: t,
 		layoutProps: r,
@@ -568,65 +574,72 @@ function dt({ navItems: e, routes: t, authRedirects: n, layoutProps: r, theme: i
 		r,
 		n
 	]);
-	return /* @__PURE__ */ V(Oe, {
+	return /* @__PURE__ */ V(Ne, {
 		...i,
 		children: /* @__PURE__ */ V(p, { router: a })
 	});
 }
 //#endregion
 //#region src/context/DataProvider.tsx
-var ft = t(null);
-function pt({ children: e, value: t }) {
+var _t = t(null);
+function vt({ children: e, value: t }) {
 	let n = s(() => t, [t]);
-	return /* @__PURE__ */ V(ft.Provider, {
+	return /* @__PURE__ */ V(_t.Provider, {
 		value: n,
 		children: e
 	});
 }
-function mt() {
-	let e = a(ft);
+function yt() {
+	let e = a(_t);
 	if (!e) throw Error("useDataProvider must be used within DataProvider");
 	return e;
 }
 //#endregion
 //#region src/data/resourceHandlers.ts
-function ht(e) {
+function bt(e) {
 	return "handlers" in e ? e : { handlers: e };
 }
-function gt(e, t, n) {
-	if (!(!e || !t) && !J(e, t, n)) throw Error("Forbidden");
+function J(e, t, n) {
+	if (!(!e || !t) && !q(e, t, n)) throw Error("Forbidden");
 }
-function _t(e, t) {
+function xt(e, t) {
 	let { can: n, guard: r, parseFormError: i } = t ?? {}, a = (t) => {
 		let n = e[t];
 		if (!n) throw Error(`Unknown resource: ${t}`);
-		return ht(n);
+		return bt(n);
 	};
 	return {
 		async getList(e, t) {
 			let { handlers: i, permissions: o } = a(e);
-			return r?.(e, "list"), gt(n, o, "list"), i.getList(t);
+			return r?.(e, "list"), J(n, o, "list"), i.getList(t);
 		},
-		async getOne(e, t) {
-			let { handlers: i, permissions: o } = a(e);
-			return r?.(e, "read"), gt(n, o, "read"), i.getOne(t);
+		async getOne(e, t, i) {
+			let { handlers: o, permissions: s } = a(e);
+			return r?.(e, "read"), J(n, s, "read"), o.getOne(t, i);
 		},
 		async create(e, t) {
 			let { handlers: i, permissions: o } = a(e);
-			return r?.(e, "add"), gt(n, o, "add"), i.create(t);
+			return r?.(e, "add"), J(n, o, "add"), i.create(t);
 		},
 		async update(e, t) {
 			let { handlers: i, permissions: o } = a(e);
-			return r?.(e, "change"), gt(n, o, "change"), i.update(t);
+			return r?.(e, "change"), J(n, o, "change"), i.update(t);
 		},
 		async delete(e, t) {
 			let { handlers: i, permissions: o } = a(e);
-			return r?.(e, "delete"), gt(n, o, "delete"), i.delete(t);
+			return r?.(e, "delete"), J(n, o, "delete"), i.delete(t);
 		},
 		parseFormError: i
 	};
 }
 //#endregion
+//#region src/data/abortError.ts
+function St(e) {
+	if (typeof e != "object" || !e) return !1;
+	let t = e;
+	return t.name === "AbortError" || t.name === "CanceledError" || t.code === "ERR_CANCELED";
+}
+//#endregion
 //#region src/data/parseFormErrorHelpers.ts
 function Y(e) {
 	if (typeof e == "string") return [e];
@@ -636,72 +649,104 @@ function Y(e) {
 	}
 	return [];
 }
-function vt(e) {
+function Ct(e) {
 	return e.length === 1 ? e[0] : e;
 }
-function yt(e) {
+function wt(e) {
+	return typeof e == "object" && !!e && !Array.isArray(e);
+}
+function Tt(e) {
+	return typeof Response < "u" && e instanceof Response ? !0 : typeof e == "object" && !!e && typeof e.json == "function" && typeof e.status == "number" && e.headers != null;
+}
+function Et(e) {
 	if (!e || typeof e != "object") return null;
 	let t = e;
-	if (t.body && typeof t.body == "object" && !Array.isArray(t.body)) return t.body;
+	if (wt(t.body)) return t.body;
+	if (wt(t.data)) return t.data;
 	let n = t.response;
 	if (n && typeof n == "object" && !Array.isArray(n)) {
 		let e = n.data;
-		if (e && typeof e == "object" && !Array.isArray(e)) return e;
+		if (wt(e)) return e;
 	}
 	return null;
 }
-function bt(e, t) {
-	if (t.inlineArrayName == null || t.rowIndex == null) return e;
-	let n = `${t.inlineArrayName}.${t.rowIndex}.`, r = {};
-	for (let [t, i] of Object.entries(e)) r[n + t] = i;
-	return r;
+async function Dt(e) {
+	let t = Et(e);
+	if (t) return t;
+	if (!e || typeof e != "object") return null;
+	let n = e.response;
+	if (!Tt(n)) return null;
+	let r = n.headers.get("content-type");
+	if (!r || !/application\/json/i.test(r)) return null;
+	try {
+		let e = await n.clone().json();
+		return wt(e) ? e : null;
+	} catch {
+		return null;
+	}
+}
+function Ot(e) {
+	return Array.isArray(e) ? e.some((e) => e && typeof e == "object" && !Array.isArray(e) && Object.values(e).some((e) => Y(e).length > 0)) : !1;
 }
-function xt(e, t, n) {
-	let r = bt(e, n);
+function kt(e, t, n) {
+	t.forEach((t, r) => {
+		if (!(!t || typeof t != "object" || Array.isArray(t))) for (let [i, a] of Object.entries(t)) {
+			let t = Y(a);
+			t.length && (n[`${e}.${r}.${i}`] = Ct(t));
+		}
+	});
+}
+function At(e, t) {
 	return {
-		fields: Object.keys(r).length ? r : void 0,
+		fields: Object.keys(e).length ? e : void 0,
 		global: t.length ? t : void 0
 	};
 }
-var St = new Set(["non_field_errors", "detail"]);
-function Ct(e, t) {
-	let n = yt(e);
-	if (!n) return null;
-	let r = {}, i = [];
-	for (let [e, t] of Object.entries(n)) {
-		if (St.has(e)) {
-			i.push(...Y(t));
+var jt = new Set(["non_field_errors", "detail"]);
+function Mt(e) {
+	let t = {}, n = [];
+	for (let [r, i] of Object.entries(e)) {
+		if (jt.has(r)) {
+			n.push(...Y(i));
+			continue;
+		}
+		if (Ot(i)) {
+			kt(r, i, t);
 			continue;
 		}
-		let n = Y(t);
-		n.length && (r[e] = vt(n));
+		let e = Y(i);
+		e.length && (t[r] = Ct(e));
 	}
-	return !Object.keys(r).length && !i.length ? null : xt(r, i, t);
+	return !Object.keys(t).length && !n.length ? null : At(t, n);
+}
+function Nt(e, t) {
+	let n = Et(e);
+	return n ? Mt(n) : null;
 }
-function wt(e, t, n) {
-	let r = yt(e);
+function Pt(e, t, n) {
+	let r = Et(e);
 	if (!r) return null;
 	let i = n?.camelCase ?? !0, a = n?.fieldMap, o = {}, s = [];
 	n?.includeSummary && (s.push(...Y(r.title)), s.push(...Y(r.message)));
 	let c = r.errors;
 	if (c && typeof c == "object" && !Array.isArray(c)) for (let [e, t] of Object.entries(c)) {
-		let n = a?.[e] ?? (i ? Dt(e) : e), r = Y(t);
-		r.length && (o[n] = vt(r));
+		let n = a?.[e] ?? (i ? Lt(e) : e), r = Y(t);
+		r.length && (o[n] = Ct(r));
 	}
-	return !Object.keys(o).length && !s.length ? null : xt(o, s, t);
+	return !Object.keys(o).length && !s.length ? null : At(o, s);
 }
-function Tt(e, t, n) {
-	let r = yt(e);
+function Ft(e, t, n) {
+	let r = Et(e);
 	if (!r) return null;
 	let i = {}, a = [], o = n?.fieldMap, s = r.errors;
 	if (Array.isArray(s)) for (let e of s) {
 		if (!e || typeof e != "object") continue;
 		let t = e, n = typeof t.path == "string" && t.path || typeof t.param == "string" && t.param || typeof t.field == "string" && t.field, r = Y(t.msg)[0] ?? Y(t.message)[0];
-		r && (n ? Et(i, o?.[n] ?? n, r) : a.push(r));
+		r && (n ? It(i, o?.[n] ?? n, r) : a.push(r));
 	}
 	else if (s && typeof s == "object") for (let [e, t] of Object.entries(s)) {
 		let n = o?.[e] ?? e, r = Y(t);
-		r.length && (i[n] = vt(r));
+		r.length && (i[n] = Ct(r));
 	}
 	let c = r.details;
 	if (Array.isArray(c)) for (let e of c) {
@@ -712,9 +757,9 @@ function Tt(e, t, n) {
 			i[e] = r;
 		} else a.push(r);
 	}
-	return a.push(...Y(r.error)), !Object.keys(i).length && !a.length ? null : xt(i, a, t);
+	return a.push(...Y(r.error)), !Object.keys(i).length && !a.length ? null : At(i, a);
 }
-function Et(e, t, n) {
+function It(e, t, n) {
 	let r = e[t];
 	if (!r) {
 		e[t] = n;
@@ -722,20 +767,20 @@ function Et(e, t, n) {
 	}
 	e[t] = Array.isArray(r) ? [...r, n] : [r, n];
 }
-function Dt(e) {
+function Lt(e) {
 	return e && e.charAt(0).toLowerCase() + e.slice(1);
 }
 //#endregion
 //#region src/data/inMemoryList.ts
-function Ot(e, t) {
+function Rt(e, t) {
 	return e === t || String(e) === String(t);
 }
-function kt(e, t) {
-	let n = e.find((e) => Ot(e.id, t));
+function zt(e, t) {
+	let n = e.find((e) => Rt(e.id, t));
 	if (!n) throw Error("Not found");
 	return n;
 }
-function At(e, t) {
+function Bt(e, t) {
 	if (t.length === 0) return e;
 	let n = (e) => e === "DESC" ? -1 : 1;
 	return [...e].sort((e, r) => {
@@ -751,33 +796,33 @@ function At(e, t) {
 		return 0;
 	});
 }
-function jt(e, t) {
+function Vt(e, t) {
 	return t == null || t === "" ? !0 : Array.isArray(t) ? t.length === 0 ? !0 : Array.isArray(e) ? t.some((t) => e.includes(t)) : t.includes(e) : Array.isArray(e) ? e.includes(t) : typeof t == "string" && typeof e == "string" ? e.toLowerCase().includes(t.toLowerCase()) : e === t;
 }
-function Mt(e, t) {
-	return t ? e.filter((e) => Object.entries(t).every(([t, n]) => jt(e[t], n))) : e;
+function Ht(e, t) {
+	return t ? e.filter((e) => Object.entries(t).every(([t, n]) => Vt(e[t], n))) : e;
 }
-function Nt(e, t, n) {
+function Ut(e, t, n) {
 	let r = (t - 1) * n;
 	return {
 		data: e.slice(r, r + n),
 		total: e.length
 	};
 }
-function Pt(e, t) {
-	let { pagination: n, sort: r, filter: i } = t, a = Mt(e, i);
+function Wt(e, t) {
+	let { pagination: n, sort: r, filter: i } = t, a = Ht(e, i);
 	if (r) {
 		let e = Array.isArray(r) ? r : [r];
-		e.length > 0 && e[0]?.field && (a = At(a, e));
+		e.length > 0 && e[0]?.field && (a = Bt(a, e));
 	}
-	return n ? Nt(a, n.page, n.perPage) : {
+	return n ? Ut(a, n.page, n.perPage) : {
 		data: a,
 		total: a.length
 	};
 }
 //#endregion
 //#region src/data/createMemoryResourceHandlers.ts
-function Ft(e) {
+function Gt(e) {
 	let t = (e) => e, n = e.mapCreate ?? ((e, t) => ({
 		...e,
 		id: t
@@ -788,21 +833,21 @@ function Ft(e) {
 	}));
 	return {
 		async getList(n) {
-			return Pt(t(e.scopeList ? e.scopeList(e.getRows(), n) : e.getRows()), n);
+			return Wt(t(e.scopeList ? e.scopeList(e.getRows(), n) : e.getRows()), n);
 		},
-		async getOne(t) {
-			return { data: kt(e.getRows(), t) };
+		async getOne(t, n) {
+			return { data: zt(e.getRows(), t) };
 		},
 		async create(t) {
 			let r = n(t, e.nextId());
 			return e.getRows().push(r), { data: r };
 		},
 		async update({ id: t, data: n }) {
-			let i = kt(e.getRows(), t), a = r(i, n);
+			let i = zt(e.getRows(), t), a = r(i, n);
 			return Object.assign(i, a), { data: i };
 		},
 		async delete(t) {
-			let n = e.getRows(), r = n.findIndex((e) => Ot(e.id, t));
+			let n = e.getRows(), r = n.findIndex((e) => Rt(e.id, t));
 			if (r < 0) return { data: null };
 			let [i] = n.splice(r, 1);
 			return e.afterDelete?.(i), { data: i };
@@ -811,20 +856,20 @@ function Ft(e) {
 }
 //#endregion
 //#region src/data/createRestResourceHandlers.ts
-function It(e) {
+function Kt(e) {
 	return {
 		async getList(t) {
 			return e.list(t);
 		},
-		async getOne(t) {
-			return { data: await e.retrieve(t) };
+		async getOne(t, n) {
+			return { data: await e.retrieve(t, n) };
 		},
 		async create(t) {
-			let n = e.transformCreate ? e.transformCreate(t) : t;
+			let n = t instanceof FormData ? t : e.transformCreate ? e.transformCreate(t) : t;
 			return { data: await e.create(n) };
 		},
 		async update({ id: t, data: n }) {
-			let r = e.transformUpdate ? e.transformUpdate(n) : n;
+			let r = n instanceof FormData ? n : e.transformUpdate ? e.transformUpdate(n) : n;
 			return { data: await e.update(t, r) };
 		},
 		async delete(t) {
@@ -834,24 +879,24 @@ function It(e) {
 }
 //#endregion
 //#region src/data/sortHelpers.ts
-function Lt(e) {
+function qt(e) {
 	return e ? Array.isArray(e) ? e : [e] : [];
 }
-function Rt(e) {
-	let t = Lt(e);
+function Jt(e) {
+	let t = qt(e);
 	if (t.length !== 0) return t.map((e) => e.order === "DESC" ? `-${e.field}` : e.field).join(",");
 }
-function zt(e) {
-	let t = Lt(e);
+function Yt(e) {
+	let t = qt(e);
 	if (t.length !== 0) return t.map((e) => `${e.field} ${e.order === "DESC" ? "desc" : "asc"}`).join(",");
 }
-function Bt(e) {
-	let t = Lt(e);
+function Xt(e) {
+	let t = qt(e);
 	if (t.length !== 0) return t.map((e) => e.order === "DESC" ? `-${e.field}` : e.field).join(",");
 }
 //#endregion
 //#region src/components/AuthAlternateLink.tsx
-function Vt({ prompt: e, linkText: t, to: n }) {
+function Zt({ prompt: e, linkText: t, to: n }) {
 	return /* @__PURE__ */ H(R.Paragraph, {
 		type: "secondary",
 		style: {
@@ -870,7 +915,7 @@ function Vt({ prompt: e, linkText: t, to: n }) {
 }
 //#endregion
 //#region src/layouts/AuthPageLayout.tsx
-function Ht({ children: e, brand: t, footer: n, showThemeToolbar: r = !0 }) {
+function Qt({ children: e, brand: t, footer: n, showThemeToolbar: r = !0 }) {
 	let { token: i } = z.useToken();
 	return /* @__PURE__ */ H(E, {
 		vertical: !0,
@@ -891,7 +936,7 @@ function Ht({ children: e, brand: t, footer: n, showThemeToolbar: r = !0 }) {
 					padding: 16,
 					background: i.colorBgLayout
 				},
-				children: /* @__PURE__ */ V(Pe, {})
+				children: /* @__PURE__ */ V(ze, {})
 			}) : null,
 			t ? /* @__PURE__ */ V("div", {
 				style: {
@@ -928,11 +973,11 @@ function Ht({ children: e, brand: t, footer: n, showThemeToolbar: r = !0 }) {
 }
 //#endregion
 //#region src/pages/LoginPage.tsx
-function Ut({ title: e = "Sign in", description: t = "Use any username and password to continue.", logo: n, brand: r, extraFields: i, showThemeToolbar: a = !0, afterLoginPath: o = "/", alternateAuth: s, footer: c }) {
-	let { login: l } = Le(), u = g();
-	return /* @__PURE__ */ V(Ht, {
+function $t({ title: e = "Sign in", description: t = "Use any username and password to continue.", logo: n, brand: r, extraFields: i, showThemeToolbar: a = !0, afterLoginPath: o = "/", alternateAuth: s, footer: c }) {
+	let { login: l } = He(), u = g();
+	return /* @__PURE__ */ V(Qt, {
 		brand: r ?? n,
-		footer: c ?? (s ? /* @__PURE__ */ V(Vt, {
+		footer: c ?? (s ? /* @__PURE__ */ V(Zt, {
 			prompt: s.prompt ?? "Don't have an account?",
 			linkText: s.linkText,
 			to: s.to
@@ -965,7 +1010,7 @@ function Ut({ title: e = "Sign in", description: t = "Use any username and passw
 							required: !0,
 							message: "Required"
 						}],
-						children: /* @__PURE__ */ V(k, { autoComplete: "username" })
+						children: /* @__PURE__ */ V(A, { autoComplete: "username" })
 					}),
 					/* @__PURE__ */ V(D.Item, {
 						name: "password",
@@ -974,7 +1019,7 @@ function Ut({ title: e = "Sign in", description: t = "Use any username and passw
 							required: !0,
 							message: "Required"
 						}],
-						children: /* @__PURE__ */ V(k.Password, { autoComplete: "current-password" })
+						children: /* @__PURE__ */ V(A.Password, { autoComplete: "current-password" })
 					}),
 					i,
 					/* @__PURE__ */ V(D.Item, {
@@ -993,7 +1038,7 @@ function Ut({ title: e = "Sign in", description: t = "Use any username and passw
 }
 //#endregion
 //#region src/pages/PlaceholderPage.tsx
-function Wt({ title: e }) {
+function en({ title: e }) {
 	return /* @__PURE__ */ V(R.Title, {
 		level: 3,
 		style: { marginTop: 0 },
@@ -1002,7 +1047,7 @@ function Wt({ title: e }) {
 }
 //#endregion
 //#region src/crud/utils/sortQueryParam.ts
-function Gt(e) {
+function tn(e) {
 	if (!e) return [];
 	let t = [];
 	for (let n of e.split(",").map((e) => e.trim()).filter(Boolean)) {
@@ -1026,17 +1071,17 @@ function Gt(e) {
 	}
 	return t;
 }
-function Kt(e) {
+function nn(e) {
 	return e.length === 0 ? null : e.map((e) => e.order === "DESC" ? `-${e.field}` : e.field).join(",");
 }
-function qt(e) {
+function rn(e) {
 	return new Map(e.map((e, t) => [e.field, t + 1]));
 }
 //#endregion
 //#region src/crud/context/ListContext.tsx
-var Jt = t(null);
-function Yt({ children: e, toggleSort: t, sort: n }) {
-	let [r, a] = l([]), o = s(() => new Set(n.map((e) => e.field)), [n]), c = s(() => new Map(n.map((e) => [e.field, e.order])), [n]), u = s(() => qt(n), [n]), d = i((e) => (a((t) => {
+var an = t(null);
+function on({ children: e, toggleSort: t, sort: n }) {
+	let [r, a] = l([]), o = s(() => new Set(n.map((e) => e.field)), [n]), c = s(() => new Map(n.map((e) => [e.field, e.order])), [n]), u = s(() => rn(n), [n]), d = i((e) => (a((t) => {
 		let n = t.findIndex((t) => t.key === e.key);
 		if (n < 0) return [...t, e];
 		if (t[n] === e) return t;
@@ -1059,24 +1104,24 @@ function Yt({ children: e, toggleSort: t, sort: n }) {
 		u,
 		d
 	]);
-	return /* @__PURE__ */ V(Jt.Provider, {
+	return /* @__PURE__ */ V(an.Provider, {
 		value: f,
 		children: e
 	});
 }
-function Xt() {
-	let e = a(Jt);
+function sn() {
+	let e = a(an);
 	if (!e) throw Error("Column components must be used within ResourceList");
 	return e;
 }
 function X(e) {
-	let { registerColumn: t } = Xt();
+	let { registerColumn: t } = sn();
 	o(() => t(e), [t, e]);
 }
 //#endregion
 //#region src/crud/context/FilterContext.tsx
-var Zt = t(null);
-function Qt({ children: e, values: t, setFilterValue: n }) {
+var cn = t(null);
+function ln({ children: e, values: t, setFilterValue: n }) {
 	let [r, a] = l([]), o = i((e) => (a((t) => {
 		let n = t.findIndex((t) => t.key === e.key);
 		if (n < 0) return [...t, e];
@@ -1096,25 +1141,25 @@ function Qt({ children: e, values: t, setFilterValue: n }) {
 		n,
 		o
 	]);
-	return /* @__PURE__ */ V(Zt.Provider, {
+	return /* @__PURE__ */ V(cn.Provider, {
 		value: c,
 		children: e
 	});
 }
-function $t() {
-	return a(Zt);
+function un() {
+	return a(cn);
 }
 function Z(e) {
-	let t = $t()?.registerFilter;
+	let t = un()?.registerFilter;
 	o(() => {
 		if (t) return t(e);
 	}, [t, e]);
 }
 //#endregion
 //#region src/crud/context/FormContext.tsx
-var en = t(null);
-function tn({ children: e, resource: t, isNew: n, disabled: r }) {
-	return /* @__PURE__ */ V(en.Provider, {
+var dn = t(null);
+function fn({ children: e, resource: t, isNew: n, disabled: r }) {
+	return /* @__PURE__ */ V(dn.Provider, {
 		value: {
 			resource: t,
 			isNew: n,
@@ -1123,56 +1168,60 @@ function tn({ children: e, resource: t, isNew: n, disabled: r }) {
 		children: e
 	});
 }
-function nn() {
-	return a(en);
+function pn() {
+	return a(dn);
 }
 //#endregion
 //#region src/crud/context/FormSectionContext.tsx
-var rn = t(null);
-function an({ sourcesRef: e, children: t }) {
-	return /* @__PURE__ */ V(rn.Provider, {
+var mn = t(null);
+function hn({ sourcesRef: e, children: t }) {
+	return /* @__PURE__ */ V(mn.Provider, {
 		value: e,
 		children: t
 	});
 }
-function on() {
-	return a(rn);
-}
-//#endregion
-//#region src/crud/context/FormFieldsContext.tsx
-var sn = t(null);
-function cn({ children: e, sourcesRef: t }) {
-	let n = c(/* @__PURE__ */ new Set()), r = t ?? n, a = i((e) => (r.current.add(e), () => {
-		r.current.delete(e);
-	}), [r]), o = i(() => Array.from(r.current), [r]), l = s(() => ({
-		registerSource: a,
-		getSources: o
-	}), [a, o]);
-	return /* @__PURE__ */ V(sn.Provider, {
-		value: l,
+function gn() {
+	return a(mn);
+}
+//#endregion
+//#region src/crud/context/PayloadFieldsContext.tsx
+var _n = t(null);
+function vn({ children: e, fieldsRef: t }) {
+	return /* @__PURE__ */ V(_n.Provider, {
+		value: t,
 		children: e
 	});
 }
-function ln() {
-	return a(sn);
+function yn() {
+	return a(_n);
 }
-function un(e) {
-	let t = ln()?.registerSource, n = on();
+function bn(e, t = !0) {
+	let n = yn();
 	o(() => {
-		if (!t) return;
-		let r = t(e);
-		return n?.current.add(e), () => {
-			r(), n?.current.delete(e);
+		if (!(!t || !n)) return n.current.add(e), () => {
+			n.current.delete(e);
 		};
 	}, [
-		t,
 		n,
-		e
+		e,
+		t
+	]);
+}
+function xn(e, t = !0) {
+	let n = gn();
+	o(() => {
+		if (!(!t || !n)) return n.current.add(e), () => {
+			n.current.delete(e);
+		};
+	}, [
+		n,
+		e,
+		t
 	]);
 }
 //#endregion
-//#region src/crud/utils/getByPath.ts
-function dn(e, t) {
+//#region src/crud/utils/getFormValue.ts
+function Sn(e, t) {
 	let n = t.split("."), r = e;
 	for (let e of n) {
 		if (typeof r != "object" || !r) return;
@@ -1181,8 +1230,8 @@ function dn(e, t) {
 	return r;
 }
 //#endregion
-//#region src/crud/utils/setByPath.ts
-function fn(e, t, n) {
+//#region src/crud/utils/setFormValue.ts
+function Cn(e, t, n) {
 	let r = t.split("."), i = e;
 	for (let e = 0; e < r.length - 1; e++) {
 		let t = r[e], n = i[t];
@@ -1191,23 +1240,101 @@ function fn(e, t, n) {
 	i[r[r.length - 1]] = n;
 }
 //#endregion
-//#region src/crud/utils/pickBySources.ts
-function pn(e, t) {
+//#region src/crud/utils/buildFormPayload.ts
+function wn(e, t) {
 	if (t.length === 0) return { ...e };
 	let n = {};
 	for (let r of t) {
-		let t = dn(e, r);
-		t !== void 0 && fn(n, r, t);
+		let t = Sn(e, r);
+		t !== void 0 && Cn(n, r, t);
 	}
 	return n;
 }
 //#endregion
+//#region src/crud/utils/buildInlineRowsPayload.ts
+function Tn(e, t, n) {
+	if (!Array.isArray(e)) return [];
+	let r = e.map((e) => {
+		if (!e || typeof e != "object") return {};
+		let n = e, r = {};
+		for (let e of t) {
+			let t = n[e];
+			t !== void 0 && (r[e] = t);
+		}
+		let i = n.id;
+		return i != null && (r.id = i), r;
+	});
+	return n?.transformRows ? n.transformRows(r) : r;
+}
+//#endregion
+//#region src/crud/utils/hasUploadValues.ts
+function En(e) {
+	return e instanceof Blob ? !0 : Array.isArray(e) ? e.some(En) : e && typeof e == "object" ? Object.values(e).some(En) : !1;
+}
+//#endregion
+//#region src/crud/utils/toFormData.ts
+function Dn(e) {
+	return /^https?:\/\//i.test(e);
+}
+function On(e, t, n, r) {
+	if (n !== void 0) {
+		if (n === null) {
+			e.append(t, "");
+			return;
+		}
+		if (n instanceof Blob) {
+			e.append(t, n);
+			return;
+		}
+		if (typeof n == "boolean" || typeof n == "number") {
+			e.append(t, String(n));
+			return;
+		}
+		if (typeof n == "string") {
+			if (r.skipExistingUploadUrls && Dn(n)) return;
+			e.append(t, n);
+			return;
+		}
+		if (Array.isArray(n)) {
+			n.forEach((n, i) => {
+				On(e, `${t}[${i}]`, n, r);
+			});
+			return;
+		}
+		if (typeof n == "object") {
+			for (let [i, a] of Object.entries(n)) On(e, `${t}[${i}]`, a, r);
+			return;
+		}
+		e.append(t, String(n));
+	}
+}
+function kn(e, t) {
+	let n = { skipExistingUploadUrls: t?.skipExistingUploadUrls ?? !0 }, r = new FormData();
+	for (let [t, i] of Object.entries(e)) On(r, t, i, n);
+	return r;
+}
+//#endregion
+//#region src/crud/utils/prepareFormSubmitBody.ts
+function An(e, t) {
+	return En(e) ? kn(e, t) : e;
+}
+//#endregion
+//#region src/crud/utils/buildResourceFormSubmitBody.ts
+function jn(e, t, n, r) {
+	let i = wn(e, t);
+	if (n) for (let t of n) {
+		let n = e[t.field], r = t.payloadKey ?? t.field;
+		i[r] = Tn(n, t.sources, { transformRows: t.transformRows });
+	}
+	return An(i, r);
+}
+//#endregion
 //#region src/crud/utils/formErrors.ts
-function mn(e) {
+function Mn(e) {
 	return e ? Array.isArray(e) ? e : [e] : [];
 }
-function hn(e, t, n) {
-	for (let e of mn(t.global)) n.error(e);
+function Nn(e, t, n) {
+	for (let e of Mn(t.global)) n.error(e);
 	for (let [n, r] of Object.entries(t.fields ?? {})) {
 		let t = Array.isArray(r) ? r.join(", ") : r;
 		e.setError(n, {
@@ -1216,71 +1343,80 @@ function hn(e, t, n) {
 		});
 	}
 }
-function gn(e, t, n, r, i) {
-	let a = e.parseFormError?.(r, i);
-	if (!a) return !1;
-	let o = Object.keys(a.fields ?? {}).length > 0, s = mn(a.global).length > 0;
-	return !o && !s ? !1 : (hn(t, a, n), !0);
+async function Pn(e, t, n, r, i) {
+	let a = await Dt(r), o = a == null ? r : { body: a }, s = e.parseFormError?.(o, i);
+	if (!s) return !1;
+	let c = Object.keys(s.fields ?? {}).length > 0, l = Mn(s.global).length > 0;
+	return !c && !l ? !1 : (Nn(t, s, n), !0);
+}
+//#endregion
+//#region src/crud/utils/useAbortableEffect.ts
+function Fn(e, t) {
+	o(() => {
+		let t = new AbortController();
+		return e(t.signal), () => t.abort();
+	}, t);
 }
 //#endregion
 //#region src/crud/ResourceFormModal.tsx
-function _n({ resource: e, editId: t, onClose: n, children: r, title: a }) {
-	let s = t === "new" || t == null, u = t != null, d = mt(), { message: f } = y.useApp(), [p, m] = l(!s), h = ye(), g = c(/* @__PURE__ */ new Set()), _ = i(async () => {
-		if (s || !t) {
-			h.reset({}), m(!1);
+function In({ resource: e, editId: t, onClose: n, children: r, title: a }) {
+	let o = t === "new" || t == null, s = t != null, u = yt(), { message: d } = y.useApp(), [f, p] = l(!o), m = Ce(), h = c(/* @__PURE__ */ new Set()), g = i(async (n) => {
+		if (o || !t) {
+			m.reset({}), p(!1);
 			return;
 		}
-		m(!0);
+		p(!0);
 		try {
-			let n = await d.getOne(e, t);
-			h.reset(n.data);
+			let r = await u.getOne(e, t, { signal: n });
+			if (n?.aborted) return;
+			m.reset(r.data);
 		} catch (e) {
-			f.error(e instanceof Error ? e.message : "Load failed");
+			St(e) || d.error(e instanceof Error ? e.message : "Load failed");
 		} finally {
-			m(!1);
+			n?.aborted || p(!1);
 		}
 	}, [
-		d,
+		u,
 		e,
 		t,
-		s,
-		h,
-		f
+		o,
+		m,
+		d
 	]);
-	o(() => {
-		u && _();
-	}, [u, _]);
-	async function v(r) {
+	Fn((e) => {
+		if (s) return g(e);
+	}, [s, g]);
+	async function _(r) {
 		try {
-			let i = pn(r, Array.from(g.current));
-			s ? (await d.create(e, i), f.success("Created")) : t && (await d.update(e, {
+			let i = jn(r, Array.from(h.current));
+			o ? (await u.create(e, i), d.success("Created")) : t && (await u.update(e, {
 				id: t,
 				data: i
-			}), f.success("Updated")), n();
+			}), d.success("Updated")), n();
 		} catch (t) {
-			gn(d, h, f, t, {
+			await Pn(u, m, d, t, {
 				resource: e,
-				mutation: s ? "create" : "update"
-			}) || f.error(t instanceof Error ? t.message : "Save failed");
+				mutation: o ? "create" : "update"
+			}) || d.error(t instanceof Error ? t.message : "Save failed");
 		}
 	}
 	return /* @__PURE__ */ V(M, {
-		open: u,
-		title: a ?? (s ? `New ${e}` : `Edit ${e}`),
+		open: s,
+		title: a ?? (o ? `New ${e}` : `Edit ${e}`),
 		onCancel: n,
 		footer: null,
 		destroyOnHidden: !0,
 		width: 560,
-		children: p ? /* @__PURE__ */ V(I, {}) : /* @__PURE__ */ V(tn, {
+		children: f ? /* @__PURE__ */ V(I, {}) : /* @__PURE__ */ V(fn, {
 			resource: e,
-			isNew: s,
-			children: /* @__PURE__ */ V(cn, {
-				sourcesRef: g,
-				children: /* @__PURE__ */ V(_e, {
-					...h,
+			isNew: o,
+			children: /* @__PURE__ */ V(vn, {
+				fieldsRef: h,
+				children: /* @__PURE__ */ V(W, {
+					...m,
 					children: /* @__PURE__ */ H(D, {
 						layout: "vertical",
-						onFinish: () => void h.handleSubmit(v)(),
+						onFinish: () => void m.handleSubmit(_)(),
 						children: [r, /* @__PURE__ */ H(D.Item, {
 							style: {
 								marginTop: 16,
@@ -1304,7 +1440,7 @@ function _n({ resource: e, editId: t, onClose: n, children: r, title: a }) {
 }
 //#endregion
 //#region src/crud/ListActionsBar.tsx
-function vn({ selectedCount: e, total: t, allPageSelected: n, allMatchingSelected: r, onSelectAllMatching: a, onClearSelection: o, actions: c, onExecute: u, selectedIds: d, running: f = !1 }) {
+function Ln({ selectedCount: e, total: t, allPageSelected: n, allMatchingSelected: r, onSelectAllMatching: a, onClearSelection: o, actions: c, onExecute: u, selectedIds: d, running: f = !1 }) {
 	let [p, m] = l(), h = s(() => c.map((e) => ({
 		value: e.key,
 		label: e.label
@@ -1388,14 +1524,14 @@ function vn({ selectedCount: e, total: t, allPageSelected: n, allMatchingSelecte
 }
 //#endregion
 //#region src/crud/types.ts
-var yn = new Set([
+var Rn = new Set([
 	"page",
 	"perPage",
 	"sort",
 	"create",
 	"edit"
-]), bn = 1, xn = 10;
-function Sn(e) {
+]), zn = 1, Bn = 10;
+function Vn(e) {
 	if (e.includes(",")) {
 		let t = e.split(",").map((e) => e.trim()), n = t.map(Number);
 		return n.every((e) => Number.isFinite(e)) ? n : t;
@@ -1403,16 +1539,16 @@ function Sn(e) {
 	let t = Number(e);
 	return e !== "" && Number.isFinite(t) && String(t) === e ? t : e === "true" ? !0 : e === "false" ? !1 : e;
 }
-function Cn(e) {
+function Hn(e) {
 	return e == null || e === "" ? null : Array.isArray(e) ? e.length === 0 ? null : e.map(String).join(",") : String(e);
 }
-function wn(e) {
+function Un(e) {
 	let [t, n] = v(), r = s(() => {
-		let n = t.get("page"), r = t.get("perPage"), i = n ? Math.max(1, Number(n) || bn) : bn, a = r ? Math.max(1, Number(r) || xn) : xn, o = t.getAll("sort"), s = o.length > 0 ? o.flatMap((e) => Gt(e)) : Gt(t.get("sort")), c = { ...e };
+		let n = t.get("page"), r = t.get("perPage"), i = n ? Math.max(1, Number(n) || zn) : zn, a = r ? Math.max(1, Number(r) || Bn) : Bn, o = t.getAll("sort"), s = o.length > 0 ? o.flatMap((e) => tn(e)) : tn(t.get("sort")), c = { ...e };
 		return t.forEach((e, n) => {
-			if (yn.has(n)) return;
+			if (Rn.has(n)) return;
 			let r = c[n];
-			r === void 0 ? t.getAll(n).length > 1 ? c[n] = t.getAll(n).map(Sn) : c[n] = Sn(e) : c[n] = [...Array.isArray(r) ? r : [r], Sn(e)];
+			r === void 0 ? t.getAll(n).length > 1 ? c[n] = t.getAll(n).map(Vn) : c[n] = Vn(e) : c[n] = [...Array.isArray(r) ? r : [r], Vn(e)];
 		}), {
 			page: i,
 			perPage: a,
@@ -1435,19 +1571,19 @@ function wn(e) {
 		},
 		setPerPage: (e) => {
 			a((t) => {
-				e === xn ? t.delete("perPage") : t.set("perPage", String(e)), t.delete("page");
+				e === Bn ? t.delete("perPage") : t.set("perPage", String(e)), t.delete("page");
 			});
 		},
 		setSort: (e) => {
 			a((t) => {
 				t.delete("sort");
-				let n = Kt(e);
+				let n = nn(e);
 				n && t.set("sort", n);
 			});
 		},
 		toggleSort: (e) => {
 			a((t) => {
-				let n = t.getAll("sort").flatMap((e) => Gt(e)), r = n.findIndex((t) => t.field === e), i;
+				let n = t.getAll("sort").flatMap((e) => tn(e)), r = n.findIndex((t) => t.field === e), i;
 				i = r < 0 ? [...n, {
 					field: e,
 					order: "ASC"
@@ -1455,22 +1591,22 @@ function wn(e) {
 					...e,
 					order: "DESC"
 				} : e) : n.filter((e, t) => t !== r), t.delete("sort");
-				let a = Kt(i);
+				let a = nn(i);
 				a && t.set("sort", a);
 			});
 		},
 		setFilter: (e, t) => {
 			a((n) => {
 				n.delete(e);
-				let r = Cn(t);
+				let r = Hn(t);
 				r != null && n.set(e, r), n.delete("page");
 			});
 		},
 		setFilters: (e) => {
 			a((t) => {
-				for (let e of [...t.keys()]) yn.has(e) || t.delete(e);
+				for (let e of [...t.keys()]) Rn.has(e) || t.delete(e);
 				for (let [n, r] of Object.entries(e)) {
-					let e = Cn(r);
+					let e = Hn(r);
 					e != null && t.set(n, e);
 				}
 				t.delete("page");
@@ -1495,66 +1631,66 @@ function wn(e) {
 }
 //#endregion
 //#region src/crud/ResourceList.tsx
-var Tn = t(null);
-function En() {
-	return a(Tn);
+var Wn = t(null);
+function Gn() {
+	return a(Wn);
 }
-function Dn({ resource: e, title: t, pathPrefix: n, newPath: r, editMode: a = "page", formChildren: c, actions: d, rowActions: f, headerExtra: p, bulkActions: m, bulkDelete: h = !0, bulkActionsEnabled: g = !0, permissions: _, queryState: v, queryActions: b }) {
-	let C = mt(), w = q(), { message: T, modal: ee } = y.useApp(), { columns: E, sortOrders: D, sortPriorities: O } = Xt(), [k, A] = l(!1), [j, te] = l([]), [M, ne] = l(0), [N, P] = l(() => /* @__PURE__ */ new Set()), [I, L] = l(!1), re = r ?? `${n}/new`, ae = J(w, _, "add"), z = J(w, _, "change"), U = J(w, _, "delete"), W = z && (a === "page" || a === "both") && d?.edit !== !1, ce = z && (a === "modal" || a === "both") && d?.quickEdit !== !1, le = U && d?.delete !== !1, ue = W || ce || le || f, de = i(() => {
-		P(/* @__PURE__ */ new Set());
+function Kn({ resource: e, title: t, pathPrefix: n, newPath: r, editMode: a = "page", formChildren: o, actions: c, rowActions: d, headerExtra: f, bulkActions: p, bulkDelete: m = !0, bulkActionsEnabled: h = !0, permissions: g, queryState: _, queryActions: v }) {
+	let b = yt(), C = K(), { message: w, modal: ee } = y.useApp(), { columns: T, sortOrders: E, sortPriorities: D } = sn(), [O, k] = l(!1), [A, te] = l([]), [j, ne] = l(0), [M, N] = l(() => /* @__PURE__ */ new Set()), [re, P] = l(!1), I = r ?? `${n}/new`, ie = q(C, g, "add"), ae = q(C, g, "change"), L = q(C, g, "delete"), z = ae && (a === "page" || a === "both") && c?.edit !== !1, U = ae && (a === "modal" || a === "both") && c?.quickEdit !== !1, le = L && c?.delete !== !1, ue = z || U || le || d, de = i(() => {
+		N(/* @__PURE__ */ new Set());
 	}, []), fe = s(() => {
-		if (!g) return [];
+		if (!h) return [];
 		let t = [];
-		return h && U && t.push({
+		return m && L && t.push({
 			key: "__delete",
 			label: "Delete selected",
 			confirm: (e) => `Delete ${e.length} selected item(s)? This cannot be undone.`,
 			execute: async (t, { reload: n, clearSelection: r }) => {
-				await Promise.all(t.map((t) => C.delete(e, t))), r(), n(), T.success(`Deleted ${t.length} item(s)`);
+				await Promise.all(t.map((t) => b.delete(e, t))), r(), n(), w.success(`Deleted ${t.length} item(s)`);
 			}
-		}), [...t, ...m ?? []];
+		}), [...t, ...p ?? []];
 	}, [
-		g,
 		h,
-		U,
 		m,
-		C,
+		L,
+		p,
+		b,
 		e,
-		T
-	]), pe = fe.length > 0, me = N.size, he = j.length > 0 && j.every((e) => N.has(e.id)), ge = M > 0 && me >= M, _e = s(() => j.filter((e) => N.has(e.id)).map((e) => e.id), [j, N]), ve = i((e) => {
-		P((t) => {
-			let n = new Set(t), r = j.map((e) => e.id);
+		w
+	]), pe = fe.length > 0, me = M.size, he = A.length > 0 && A.every((e) => M.has(e.id)), ge = j > 0 && me >= j, _e = s(() => A.filter((e) => M.has(e.id)).map((e) => e.id), [A, M]), ve = i((e) => {
+		N((t) => {
+			let n = new Set(t), r = A.map((e) => e.id);
 			for (let t of r) e.includes(t) || n.delete(t);
 			for (let t of e) n.add(t);
 			return n;
 		});
-	}, [j]), ye = i(async () => {
-		if (!(M <= 0)) {
-			L(!0);
+	}, [A]), ye = i(async () => {
+		if (!(j <= 0)) {
+			P(!0);
 			try {
-				let t = v.sort.length === 0 ? void 0 : v.sort.length === 1 ? v.sort[0] : v.sort, n = await C.getList(e, {
+				let t = _.sort.length === 0 ? void 0 : _.sort.length === 1 ? _.sort[0] : _.sort, n = await b.getList(e, {
 					pagination: {
 						page: 1,
-						perPage: M
+						perPage: j
 					},
 					sort: t,
-					filter: v.filter
+					filter: _.filter
 				});
-				P(new Set(n.data.map((e) => e.id)));
+				N(new Set(n.data.map((e) => e.id)));
 			} catch (e) {
-				T.error(e instanceof Error ? e.message : "Load failed");
+				w.error(e instanceof Error ? e.message : "Load failed");
 			} finally {
-				L(!1);
+				P(!1);
 			}
 		}
 	}, [
-		C,
+		b,
 		e,
-		M,
-		v.sort,
-		v.filter,
-		T
-	]), G = i((e) => {
+		j,
+		_.sort,
+		_.filter,
+		w
+	]), be = i((e) => {
 		let t = (e) => {
 			let t = e?.columnKey ?? e?.field;
 			return t == null ? null : String(Array.isArray(t) ? t[0] : t);
@@ -1563,50 +1699,55 @@ function Dn({ resource: e, title: t, pathPrefix: n, newPath: r, editMode: a = "p
 			let n = e.find((e) => e?.order);
 			if (n) {
 				let e = t(n);
-				e && b.toggleSort(e);
+				e && v.toggleSort(e);
 				return;
 			}
-			v.sort.length > 0 && b.setSort([]);
+			_.sort.length > 0 && v.setSort([]);
 			return;
 		}
 		let n = t(e);
 		if (n) {
-			b.toggleSort(n);
+			v.toggleSort(n);
 			return;
 		}
-		!e?.order && v.sort.length > 0 && b.setSort([]);
-	}, [b, v.sort.length]), K = i(async () => {
-		A(!0);
+		!e?.order && _.sort.length > 0 && v.setSort([]);
+	}, [v, _.sort.length]), xe = s(() => {
+		let e = _.sort.length === 0 ? void 0 : _.sort.length === 1 ? _.sort[0] : _.sort;
+		return {
+			pagination: {
+				page: _.page,
+				perPage: _.perPage
+			},
+			sort: e,
+			filter: _.filter
+		};
+	}, [_]), W = i(async (t) => {
+		k(!0);
 		try {
-			let t = v.sort.length === 0 ? void 0 : v.sort.length === 1 ? v.sort[0] : v.sort, n = await C.getList(e, {
-				pagination: {
-					page: v.page,
-					perPage: v.perPage
-				},
-				sort: t,
-				filter: v.filter
+			let n = await b.getList(e, {
+				...xe,
+				signal: t
 			});
+			if (t?.aborted) return;
 			te(n.data), ne(n.total);
 		} catch (e) {
-			T.error(e instanceof Error ? e.message : "Load failed");
+			St(e) || w.error(e instanceof Error ? e.message : "Load failed");
 		} finally {
-			A(!1);
+			t?.aborted || k(!1);
 		}
 	}, [
-		C,
+		b,
 		e,
-		v,
-		T
+		xe,
+		w
 	]);
-	o(() => {
-		K();
-	}, [K]);
-	let be = s(() => ({
-		reload: () => void K(),
+	Fn((e) => W(e), [W]);
+	let Se = s(() => ({
+		reload: () => void W(),
 		clearSelection: de
-	}), [K, de]), xe = i(async (e, t) => {
+	}), [W, de]), Ce = i(async (e, t) => {
 		if (e.confirm) {
-			let n = typeof e.confirm == "function" ? await e.confirm(t, be) : e.confirm;
+			let n = typeof e.confirm == "function" ? await e.confirm(t, Se) : e.confirm;
 			if (n === !1 || !await new Promise((t) => {
 				ee.confirm({
 					title: n,
@@ -1616,35 +1757,35 @@ function Dn({ resource: e, title: t, pathPrefix: n, newPath: r, editMode: a = "p
 				});
 			})) return;
 		}
-		L(!0);
+		P(!0);
 		try {
-			await e.execute(t, be);
+			await e.execute(t, Se);
 		} catch (e) {
-			T.error(e instanceof Error ? e.message : "Action failed");
+			w.error(e instanceof Error ? e.message : "Action failed");
 		} finally {
-			L(!1);
+			P(!1);
 		}
 	}, [
-		be,
+		Se,
 		ee,
-		T
-	]), Se = i(async (t) => {
-		if (U) try {
-			await C.delete(e, t.id), T.success("Deleted"), K();
+		w
+	]), G = i(async (t) => {
+		if (L) try {
+			await b.delete(e, t.id), w.success("Deleted"), W();
 		} catch (e) {
-			T.error(e instanceof Error ? e.message : "Delete failed");
+			w.error(e instanceof Error ? e.message : "Delete failed");
 		}
 	}, [
-		U,
-		C,
+		L,
+		b,
 		e,
-		K,
-		T
-	]), Ce = s(() => {
-		let e = E.map((e) => {
+		W,
+		w
+	]), we = s(() => {
+		let e = T.map((e) => {
 			let t = e.buildColumn();
 			if (e.sortable) {
-				let n = D.get(e.source), r = O.get(e.source), i = n === "ASC" ? "ascend" : n === "DESC" ? "descend" : void 0, a = i == null ? void 0 : /* @__PURE__ */ H("span", {
+				let n = E.get(e.source), r = D.get(e.source), i = n === "ASC" ? "ascend" : n === "DESC" ? "descend" : void 0, a = i == null ? void 0 : /* @__PURE__ */ H("span", {
 					style: {
 						display: "inline-flex",
 						alignItems: "center",
@@ -1661,7 +1802,7 @@ function Dn({ resource: e, title: t, pathPrefix: n, newPath: r, editMode: a = "p
 							textAlign: "center"
 						},
 						children: r
-					}), V(i === "ascend" ? se : oe, { style: { fontSize: 11 } })]
+					}), V(i === "ascend" ? ce : se, { style: { fontSize: 11 } })]
 				});
 				return {
 					...t,
@@ -1674,8 +1815,8 @@ function Dn({ resource: e, title: t, pathPrefix: n, newPath: r, editMode: a = "p
 		});
 		if (!ue) return e;
 		let t = {
-			reload: () => void K(),
-			openEditModal: b.openEditModal
+			reload: () => void W(),
+			openEditModal: v.openEditModal
 		}, r = {
 			title: "Actions",
 			key: "__actions",
@@ -1684,110 +1825,111 @@ function Dn({ resource: e, title: t, pathPrefix: n, newPath: r, editMode: a = "p
 				size: "small",
 				wrap: !0,
 				children: [
-					W ? /* @__PURE__ */ V(u, {
+					z ? /* @__PURE__ */ V(u, {
 						to: `${n}/${String(r.id)}`,
 						children: "Edit"
 					}) : null,
-					ce ? /* @__PURE__ */ V(x, {
+					U ? /* @__PURE__ */ V(x, {
 						type: "link",
 						size: "small",
 						style: { padding: 0 },
-						onClick: () => b.openEditModal(r.id),
+						onClick: () => v.openEditModal(r.id),
 						children: a === "both" ? "Quick edit" : "Edit"
 					}) : null,
 					le ? /* @__PURE__ */ V(x, {
 						type: "link",
 						danger: !0,
 						size: "small",
-						onClick: () => void Se(r),
+						onClick: () => void G(r),
 						style: { padding: 0 },
 						children: "Delete"
 					}) : null,
-					f?.(r, t)
+					d?.(r, t)
 				]
 			})
 		};
 		return [...e, r];
 	}, [
-		E,
+		T,
 		ue,
-		W,
-		ce,
+		z,
+		U,
 		le,
 		a,
 		n,
-		Se,
+		G,
+		E,
 		D,
-		O,
-		b,
-		f,
-		K
-	]), we = c && (v.createModal || v.editId != null) && (a === "modal" || a === "both");
+		v,
+		d,
+		W
+	]), Te = o && (_.createModal || _.editId != null) && (a === "modal" || a === "both");
 	return /* @__PURE__ */ H(B, { children: [/* @__PURE__ */ H(S, {
 		title: /* @__PURE__ */ V(R.Title, {
 			level: 5,
 			style: { margin: 0 },
 			children: t
 		}),
-		extra: p || ae ? /* @__PURE__ */ H(F, { children: [p, ae ? a === "modal" || a === "both" ? /* @__PURE__ */ H(B, { children: [a === "both" ? /* @__PURE__ */ V(u, {
-			to: re,
+		extra: f || ie ? /* @__PURE__ */ H(F, { children: [f, ie ? a === "modal" || a === "both" ? /* @__PURE__ */ H(B, { children: [a === "both" ? /* @__PURE__ */ V(u, {
+			to: I,
 			children: /* @__PURE__ */ V(x, { children: "New page" })
 		}) : null, /* @__PURE__ */ V(x, {
 			type: "primary",
-			onClick: () => b.openCreateModal(),
+			onClick: () => v.openCreateModal(),
 			children: "New"
 		})] }) : /* @__PURE__ */ V(u, {
-			to: re,
+			to: I,
 			children: /* @__PURE__ */ V(x, {
 				type: "primary",
 				children: "New"
 			})
 		}) : null] }) : null,
-		children: [pe ? /* @__PURE__ */ V(vn, {
+		children: [pe ? /* @__PURE__ */ V(Ln, {
 			selectedCount: me,
-			total: M,
+			total: j,
 			allPageSelected: he,
 			allMatchingSelected: ge,
 			onSelectAllMatching: () => void ye(),
 			onClearSelection: de,
 			actions: fe,
-			onExecute: xe,
-			selectedIds: [...N],
-			running: I || k
-		}) : null, /* @__PURE__ */ V(ie, {
+			onExecute: Ce,
+			selectedIds: [...M],
+			running: re || O
+		}) : null, /* @__PURE__ */ V(oe, {
 			rowKey: "id",
-			loading: k,
-			columns: Ce,
-			dataSource: j,
+			loading: O,
+			columns: we,
+			dataSource: A,
+			scroll: { x: "max-content" },
 			rowSelection: pe ? {
 				selectedRowKeys: _e,
 				onChange: ve,
 				preserveSelectedRowKeys: !0
 			} : void 0,
 			pagination: {
-				current: v.page,
-				pageSize: v.perPage,
-				total: M,
+				current: _.page,
+				pageSize: _.perPage,
+				total: j,
 				showSizeChanger: !0,
 				onChange: (e, t) => {
-					b.setPage(e), t && b.setPerPage(t);
+					v.setPage(e), t && v.setPerPage(t);
 				}
 			},
 			onChange: (e, t, n) => {
-				G(n);
+				be(n);
 			}
 		})]
-	}), we ? /* @__PURE__ */ V(_n, {
+	}), Te ? /* @__PURE__ */ V(In, {
 		resource: e,
-		editId: v.createModal ? "new" : v.editId,
+		editId: _.createModal ? "new" : _.editId,
 		onClose: () => {
-			b.closeModal(), K();
+			v.closeModal(), W();
 		},
-		children: c
+		children: o
 	}) : null] });
 }
-function On({ resource: e, title: t, pathPrefix: n, newPath: r, staticFilter: a, editMode: o = "page", syncQueryParams: c = !0, children: l, formChildren: u, actions: d, rowActions: f, headerExtra: p, bulkActions: m, bulkDelete: h, bulkActionsEnabled: g, permissions: _ }) {
-	let [v, y] = wn(a), b = s(() => {
+function qn({ resource: e, title: t, pathPrefix: n, newPath: r, staticFilter: a, editMode: o = "page", syncQueryParams: c = !0, children: l, formChildren: u, actions: d, rowActions: f, headerExtra: p, bulkActions: m, bulkDelete: h, bulkActionsEnabled: g, permissions: _ }) {
+	let [v, y] = Un(a), b = s(() => {
 		if (!c) return a ?? {};
 		let e = {};
 		for (let [t, n] of Object.entries(v.filter)) a && t in a || (e[t] = n);
@@ -1802,15 +1944,15 @@ function On({ resource: e, title: t, pathPrefix: n, newPath: r, staticFilter: a,
 		filterValues: b,
 		setFilterValue: x
 	}), [b, x]);
-	return /* @__PURE__ */ V(Tn.Provider, {
+	return /* @__PURE__ */ V(Wn.Provider, {
 		value: S,
-		children: /* @__PURE__ */ V(Qt, {
+		children: /* @__PURE__ */ V(ln, {
 			values: b,
 			setFilterValue: x,
-			children: /* @__PURE__ */ H(Yt, {
+			children: /* @__PURE__ */ H(on, {
 				toggleSort: y.toggleSort,
 				sort: v.sort,
-				children: [l, /* @__PURE__ */ V(Dn, {
+				children: [l, /* @__PURE__ */ V(Kn, {
 					resource: e,
 					title: t,
 					pathPrefix: n,
@@ -1833,8 +1975,8 @@ function On({ resource: e, title: t, pathPrefix: n, newPath: r, staticFilter: a,
 }
 //#endregion
 //#region src/crud/FilterBar.tsx
-function kn() {
-	let e = $t();
+function Jn() {
+	let e = un();
 	return !e || e.filters.length === 0 ? null : /* @__PURE__ */ V(F, {
 		wrap: !0,
 		size: "middle",
@@ -1853,91 +1995,258 @@ function kn() {
 		}, t.key))
 	});
 }
-function An({ children: e }) {
-	return /* @__PURE__ */ H(B, { children: [e, /* @__PURE__ */ V(kn, {})] });
+function Yn({ children: e }) {
+	return /* @__PURE__ */ H(B, { children: [e, /* @__PURE__ */ V(Jn, {})] });
 }
 //#endregion
-//#region src/crud/context/InlineFormContext.tsx
-var jn = t(null), Mn = t([]);
-function Nn({ children: e, arrayName: t, layout: n = "tabular" }) {
-	let [r, a] = l([]), o = i((e) => (a((t) => t.some((t) => t.key === e.key) ? t : [...t, e]), () => {
-		a((t) => t.filter((t) => t.key !== e.key));
-	}), []), c = s(() => ({
-		arrayName: t,
-		registerField: o,
-		layout: n
-	}), [
+//#region src/crud/context/InlineFieldsRegistry.tsx
+var Xn = t(null);
+function Zn({ children: e, registryRef: t }) {
+	return /* @__PURE__ */ V(Xn.Provider, {
+		value: t,
+		children: e
+	});
+}
+function Qn() {
+	return a(Xn);
+}
+function $n(e, t, n, r, i = !0) {
+	let a = Qn();
+	o(() => {
+		if (!(!i || !a)) return a.current.set(e, {
+			field: e,
+			sources: t,
+			payloadKey: n,
+			transformRows: r
+		}), () => {
+			a.current.delete(e);
+		};
+	}, [
+		a,
+		e,
+		t,
+		n,
+		r,
+		i
+	]);
+}
+//#endregion
+//#region src/crud/utils/useFormRecord.ts
+function er({ dp: e, resource: t, id: n, isNew: r, form: a, message: o, defaultValues: s }) {
+	let [c, u] = l(!r), [d, f] = l(0), p = i(async (i) => {
+		if (r || !n) {
+			s && a.reset({ ...s }), u(!1);
+			return;
+		}
+		u(!0);
+		try {
+			let r = await e.getOne(t, n, { signal: i });
+			if (i?.aborted) return;
+			a.reset(r.data), f((e) => e + 1);
+		} catch (e) {
+			St(e) || o.error(e instanceof Error ? e.message : "Load failed");
+		} finally {
+			i?.aborted || u(!1);
+		}
+	}, [
+		e,
 		t,
+		n,
+		r,
+		a,
 		o,
-		n
+		s
 	]);
-	return /* @__PURE__ */ V(jn.Provider, {
-		value: c,
-		children: /* @__PURE__ */ V(Mn.Provider, {
-			value: r,
-			children: e
+	return Fn((e) => p(e), [p]), {
+		loading: c,
+		formVersion: d
+	};
+}
+function tr({ dp: e, resource: t, id: n, isNew: r, form: a, message: o, navigate: s, listPath: c, payloadFieldsRef: l, inlineRegistryRef: u, onSaved: d, stayOnPage: f }) {
+	return i(async (i) => {
+		try {
+			let a = jn(i, Array.from(l.current), u.current.values()), p;
+			if (r) p = (await e.create(t, a)).data, o.success("Created");
+			else if (n) p = (await e.update(t, {
+				id: n,
+				data: a
+			})).data, o.success("Updated");
+			else return;
+			d?.(p), f || s(c);
+		} catch (n) {
+			let i = Array.from(u.current.keys());
+			await Pn(e, a, o, n, {
+				resource: t,
+				mutation: r ? "create" : "update",
+				inlineFieldPaths: i
+			}) || o.error(n instanceof Error ? n.message : "Save failed");
+		}
+	}, [
+		e,
+		t,
+		n,
+		r,
+		a,
+		o,
+		s,
+		c,
+		l,
+		u,
+		d,
+		f
+	]);
+}
+//#endregion
+//#region src/crud/ResourceForm.tsx
+function nr({ resource: e, title: t, listPath: r, children: i, defaultValues: a, onSaved: s, stayOnPage: l, permissions: d }) {
+	let { id: f } = _(), p = f === "new" || !f, m = yt(), h = K(), v = g(), { message: b } = y.useApp(), { token: C } = z.useToken(), w = c(/* @__PURE__ */ new Set()), ee = c(/* @__PURE__ */ new Map()), T = Ce({ defaultValues: a }), { loading: E, formVersion: O } = er({
+		dp: m,
+		resource: e,
+		id: f,
+		isNew: p,
+		form: T,
+		message: b,
+		defaultValues: a
+	}), k = tr({
+		dp: m,
+		resource: e,
+		id: f,
+		isNew: p,
+		form: T,
+		message: b,
+		navigate: v,
+		listPath: r,
+		payloadFieldsRef: w,
+		inlineRegistryRef: ee,
+		onSaved: s,
+		stayOnPage: l
+	});
+	o(() => {
+		d && (q(h, d, p ? "add" : "change") || v(r, { replace: !0 }));
+	}, [
+		d,
+		p,
+		h,
+		v,
+		r
+	]);
+	let A = d ? q(h, d, p ? "add" : "change") : !0;
+	return /* @__PURE__ */ V(S, {
+		title: /* @__PURE__ */ H(F, { children: [/* @__PURE__ */ H(u, {
+			to: r,
+			style: { color: C.colorText },
+			children: [/* @__PURE__ */ V(U, {}), " Back"]
+		}), /* @__PURE__ */ V(R.Title, {
+			level: 5,
+			style: { margin: 0 },
+			children: t
+		})] }),
+		children: /* @__PURE__ */ V(fn, {
+			resource: e,
+			isNew: p,
+			children: /* @__PURE__ */ V(vn, {
+				fieldsRef: w,
+				children: /* @__PURE__ */ V(Zn, {
+					registryRef: ee,
+					children: /* @__PURE__ */ H("div", {
+						style: { position: "relative" },
+						children: [E ? /* @__PURE__ */ V("div", {
+							style: {
+								position: "absolute",
+								inset: 0,
+								display: "flex",
+								alignItems: "center",
+								justifyContent: "center",
+								zIndex: 1
+							},
+							children: /* @__PURE__ */ V(I, {})
+						}) : null, /* @__PURE__ */ n(W, {
+							...T,
+							key: O
+						}, /* @__PURE__ */ H(D, {
+							layout: "vertical",
+							onFinish: () => void T.handleSubmit(k)(),
+							style: {
+								opacity: E ? .4 : 1,
+								pointerEvents: E ? "none" : void 0
+							},
+							children: [i, /* @__PURE__ */ V(D.Item, {
+								style: { marginTop: 16 },
+								children: /* @__PURE__ */ H(F, { children: [/* @__PURE__ */ V(x, {
+									type: "primary",
+									htmlType: "submit",
+									disabled: E || !A,
+									children: "Save"
+								}), /* @__PURE__ */ V(u, {
+									to: r,
+									children: /* @__PURE__ */ V(x, {
+										disabled: E,
+										children: "Cancel"
+									})
+								})] })
+							})]
+						}))]
+					})
+				})
+			})
 		})
 	});
 }
-function Pn() {
-	let e = a(jn), t = a(Mn);
-	return e ? {
-		...e,
-		fields: t
-	} : null;
-}
 //#endregion
-//#region src/crud/utils/inlineArrayName.ts
-function Fn(e, t) {
-	return t ?? `__inline_${e.replace(/[^a-z0-9]/gi, "_")}`;
+//#region src/crud/utils/nestedFieldPath.ts
+function rr(e, t, n) {
+	return `${e}.${t}.${n}`;
 }
 //#endregion
 //#region src/crud/InlineFormSet.tsx
-function In(e) {
-	let t = Pn(), { control: n } = G(), { fields: r, append: i, remove: a } = ve({
+function ir(e) {
+	let t = {};
+	for (let n of e) t[n] = void 0;
+	return t;
+}
+function ar(e, t) {
+	let { control: n } = G(), { fields: r, append: i, remove: a } = Se({
 		control: n,
-		name: e
+		name: e,
+		keyName: "rowKey"
 	});
 	return {
-		ctx: t,
 		fields: r,
 		remove: a,
-		appendEmpty: () => {
-			if (!t) return;
-			let e = {};
-			for (let n of t.fields) e[n.source] = void 0;
-			i(e);
-		}
+		appendEmpty: () => i(ir(t))
 	};
 }
-function Ln({ arrayName: e, label: t }) {
-	let { ctx: n, fields: r, remove: i, appendEmpty: a } = In(e), o = s(() => n ? n.fields.map((t) => ({
+function or({ field: e, label: t, payloadKey: n, transformRows: r, columns: i }) {
+	let a = s(() => i.map((e) => e.source), [i]), { fields: o, remove: c, appendEmpty: l } = ar(e, a);
+	bn(e), $n(e, a, n, r);
+	let u = s(() => i.map((t) => ({
 		title: t.label ?? t.source,
 		key: t.source,
 		width: t.width,
 		onHeaderCell: () => t.minWidth == null ? {} : { style: { minWidth: t.minWidth } },
 		onCell: () => t.minWidth == null ? {} : { style: { minWidth: t.minWidth } },
-		render: (n, r, i) => t.render({
-			name: `${e}.${i}.${t.source}`,
-			index: i
+		render: (n, r, i) => t.cell({
+			name: rr(e, i, t.source),
+			index: i,
+			field: e
 		})
-	})) : [], [n, e]);
-	return n ? /* @__PURE__ */ H("div", {
+	})), [i, e]);
+	return /* @__PURE__ */ H("div", {
 		style: { marginTop: 24 },
 		children: [
 			/* @__PURE__ */ V(R.Title, {
 				level: 5,
 				children: t ?? "Related items"
 			}),
-			/* @__PURE__ */ V(ie, {
+			/* @__PURE__ */ V(oe, {
 				size: "small",
 				pagination: !1,
 				scroll: { x: "max-content" },
-				dataSource: r.map((e) => ({
+				dataSource: o.map((e) => ({
 					...e,
-					key: e.id
+					key: e.rowKey
 				})),
-				columns: [...o, {
+				columns: [...u, {
 					title: "",
 					key: "__remove",
 					width: 80,
@@ -1945,7 +2254,7 @@ function Ln({ arrayName: e, label: t }) {
 						type: "link",
 						danger: !0,
 						size: "small",
-						onClick: () => i(n),
+						onClick: () => c(n),
 						children: "Remove"
 					})
 				}]
@@ -1953,15 +2262,15 @@ function Ln({ arrayName: e, label: t }) {
 			/* @__PURE__ */ V(x, {
 				type: "dashed",
 				style: { marginTop: 8 },
-				onClick: a,
+				onClick: l,
 				children: "Add row"
 			})
 		]
-	}) : null;
+	});
 }
-function Rn({ arrayName: e, label: t }) {
-	let { ctx: n, fields: r, remove: i, appendEmpty: a } = In(e);
-	return n ? /* @__PURE__ */ H("div", {
+function sr({ field: e, label: t, payloadKey: n, transformRows: r, sources: i, renderRow: a }) {
+	let { fields: o, remove: s, appendEmpty: c } = ar(e, i);
+	return bn(e), $n(e, i, n, r), /* @__PURE__ */ H("div", {
 		style: { marginTop: 24 },
 		children: [
 			/* @__PURE__ */ V(R.Title, {
@@ -1972,256 +2281,50 @@ function Rn({ arrayName: e, label: t }) {
 				orientation: "vertical",
 				size: "middle",
 				style: { width: "100%" },
-				children: r.map((t, r) => /* @__PURE__ */ V(S, {
+				children: o.map((t, n) => /* @__PURE__ */ V(S, {
 					size: "small",
-					title: `Item ${r + 1}`,
+					title: `Item ${n + 1}`,
 					extra: /* @__PURE__ */ V(x, {
 						type: "link",
 						danger: !0,
 						size: "small",
-						onClick: () => i(r),
+						onClick: () => s(n),
 						children: "Remove"
 					}),
-					children: n.fields.map((t) => /* @__PURE__ */ V("div", { children: t.render({
-						name: `${e}.${r}.${t.source}`,
-						index: r
-					}) }, t.source))
-				}, t.id))
+					children: a({
+						field: e,
+						index: n,
+						name: (t) => rr(e, n, t)
+					})
+				}, t.rowKey))
 			}),
 			/* @__PURE__ */ V(x, {
 				type: "dashed",
 				style: { marginTop: 8 },
-				onClick: a,
+				onClick: c,
 				children: "Add item"
 			})
 		]
-	}) : null;
-}
-function zn({ resource: e, label: t, children: n, name: r, layout: i = "tabular" }) {
-	let a = Fn(e, r);
-	return /* @__PURE__ */ H(Nn, {
-		arrayName: a,
-		layout: i,
-		children: [n, V(i === "stacked" ? Rn : Ln, {
-			arrayName: a,
-			label: t
-		})]
-	});
-}
-async function Bn(e, t) {
-	let { resource: n, foreignKey: r, parentId: i, rows: a, existingIds: o = [], onRowError: s } = t, c = [];
-	for (let t = 0; t < a.length; t++) {
-		let l = a[t];
-		try {
-			let { id: t, ...a } = l, s = {
-				...a,
-				[r]: i
-			}, u = l.id;
-			if (u != null && o.some((e) => e === u)) await e.update(n, {
-				id: u,
-				data: s
-			}), c.push(u);
-			else {
-				let t = (await e.create(n, s)).data;
-				c.push(t.id);
-			}
-		} catch (e) {
-			if (s?.(e, t)) return !1;
-			throw e;
-		}
-	}
-	for (let t of o) c.some((e) => e === t) || await e.delete(n, t);
-	return !0;
-}
-async function Vn(e, t, n, r) {
-	let i = await e.getList(t, {
-		filter: { [n]: Number(r) || r },
-		pagination: {
-			page: 1,
-			perPage: 500
-		}
-	});
-	return {
-		rows: i.data,
-		ids: i.data.map((e) => e.id)
-	};
-}
-//#endregion
-//#region src/crud/ResourceForm.tsx
-function Hn(e) {
-	return Fn(e.resource, e.name);
-}
-function Un({ resource: e, title: t, listPath: r, children: a, defaultValues: s, onSaved: d, stayOnPage: f, inlines: p, permissions: m }) {
-	let { id: h } = _(), v = h === "new" || !h, b = mt(), C = q(), w = g(), { message: T } = y.useApp(), { token: ee } = z.useToken(), [E, O] = l(!v), [k, A] = l(0), [j, te] = l({}), M = ye({ defaultValues: s }), ne = c(/* @__PURE__ */ new Set()), N = i(async () => {
-		if (v || !h) {
-			s && M.reset({ ...s }), O(!1);
-			return;
-		}
-		O(!0);
-		try {
-			let t = (await b.getOne(e, h)).data;
-			if (p?.length) {
-				let e = { ...t }, n = {};
-				for (let t of p) {
-					let r = Hn(t), { rows: i, ids: a } = await Vn(b, t.resource, t.foreignKey, h);
-					e[r] = i, n[r] = a;
-				}
-				M.reset(e), te(n), A((e) => e + 1);
-			} else M.reset(t), A((e) => e + 1);
-		} catch (e) {
-			T.error(e instanceof Error ? e.message : "Load failed");
-		} finally {
-			O(!1);
-		}
-	}, [
-		b,
-		e,
-		h,
-		v,
-		M,
-		T,
-		s,
-		i(async (e) => {
-			if (!p?.length) return;
-			let t = {};
-			for (let n of p) {
-				let r = Hn(n), { rows: i, ids: a } = await Vn(b, n.resource, n.foreignKey, e);
-				M.setValue(r, i), t[r] = a;
-			}
-			te(t);
-		}, [
-			b,
-			p,
-			M
-		])
-	]);
-	o(() => {
-		N();
-	}, [N]), o(() => {
-		m && (J(C, m, v ? "add" : "change") || w(r, { replace: !0 }));
-	}, [
-		m,
-		v,
-		C,
-		w,
-		r
-	]);
-	let P = m ? J(C, m, v ? "add" : "change") : !0;
-	async function L(t) {
-		try {
-			let n = pn(t, Array.from(ne.current));
-			if (p?.length) for (let e of p) delete n[Hn(e)];
-			let i;
-			if (v) i = (await b.create(e, n)).data, T.success("Created");
-			else if (h) i = (await b.update(e, {
-				id: h,
-				data: n
-			})).data, T.success("Updated");
-			else return;
-			let a = i.id;
-			if (p?.length && a != null) for (let e of p) {
-				let t = Hn(e), n = M.getValues(t) ?? [];
-				if (!await Bn(b, {
-					resource: e.resource,
-					foreignKey: e.foreignKey,
-					parentId: a,
-					rows: n,
-					existingIds: j[t] ?? [],
-					onRowError: (r, i) => {
-						let a = n[i]?.id;
-						return gn(b, M, T, r, {
-							resource: e.resource,
-							mutation: a != null && (j[t] ?? []).some((e) => e === a) ? "update" : "create",
-							inlineArrayName: t,
-							rowIndex: i
-						});
-					}
-				})) return;
-			}
-			d?.(i), f || w(r);
-		} catch (t) {
-			gn(b, M, T, t, {
-				resource: e,
-				mutation: v ? "create" : "update"
-			}) || T.error(t instanceof Error ? t.message : "Save failed");
-		}
-	}
-	return /* @__PURE__ */ V(S, {
-		title: /* @__PURE__ */ H(F, { children: [/* @__PURE__ */ H(u, {
-			to: r,
-			style: { color: ee.colorText },
-			children: [/* @__PURE__ */ V(U, {}), " Back"]
-		}), /* @__PURE__ */ V(R.Title, {
-			level: 5,
-			style: { margin: 0 },
-			children: t
-		})] }),
-		children: /* @__PURE__ */ V(tn, {
-			resource: e,
-			isNew: v,
-			children: /* @__PURE__ */ V(cn, {
-				sourcesRef: ne,
-				children: /* @__PURE__ */ H("div", {
-					style: { position: "relative" },
-					children: [E ? /* @__PURE__ */ V("div", {
-						style: {
-							position: "absolute",
-							inset: 0,
-							display: "flex",
-							alignItems: "center",
-							justifyContent: "center",
-							zIndex: 1
-						},
-						children: /* @__PURE__ */ V(I, {})
-					}) : null, /* @__PURE__ */ n(_e, {
-						...M,
-						key: k
-					}, /* @__PURE__ */ H(D, {
-						layout: "vertical",
-						onFinish: () => void M.handleSubmit(L)(),
-						style: {
-							opacity: E ? .4 : 1,
-							pointerEvents: E ? "none" : void 0
-						},
-						children: [a, /* @__PURE__ */ V(D.Item, {
-							style: { marginTop: 16 },
-							children: /* @__PURE__ */ H(F, { children: [/* @__PURE__ */ V(x, {
-								type: "primary",
-								htmlType: "submit",
-								disabled: E || !P,
-								children: "Save"
-							}), /* @__PURE__ */ V(u, {
-								to: r,
-								children: /* @__PURE__ */ V(x, {
-									disabled: E,
-									children: "Cancel"
-								})
-							})] })
-						})]
-					}))]
-				})
-			})
-		})
 	});
 }
 //#endregion
 //#region src/crud/utils/formSectionErrors.ts
-function Wn(e, t, n) {
+function cr(e, t, n) {
 	for (let r of e) if (t(r, n).invalid) return !0;
 	return !1;
 }
-function Gn(e) {
+function lr(e) {
 	let t = c([]);
 	for (; t.current.length < e;) t.current.push({ current: /* @__PURE__ */ new Set() });
 	return t.current.length > e && (t.current.length = e), t.current;
 }
-function Kn(e, t) {
-	let { control: n, getFieldState: r, setFocus: i } = G(), a = K({ control: n }), s = c(0), l = c(0);
+function ur(e, t) {
+	let { control: n, getFieldState: r, setFocus: i } = G(), a = we({ control: n }), s = c(0), l = c(0);
 	o(() => {
 		if (a.submitCount === 0) return;
 		let n = Object.keys(a.errors).length, o = a.submitCount !== s.current, c = !o && n > 0 && l.current === 0;
 		if (s.current = a.submitCount, l.current = n, !o && !c || n === 0) return;
-		let u = e.findIndex((e) => Wn(e.current, r, a));
+		let u = e.findIndex((e) => cr(e.current, r, a));
 		if (u < 0) return;
 		t(u);
 		let d = [...e[u].current].find((e) => r(e, a).invalid);
@@ -2240,30 +2343,30 @@ function Kn(e, t) {
 }
 //#endregion
 //#region src/crud/FormTabs.tsx
-function qn(e) {
+function dr(e) {
 	return null;
 }
-function Jn(e) {
-	return r(e) && e.type === qn;
+function fr(e) {
+	return r(e) && e.type === dr;
 }
-function Yn({ children: t, defaultActiveKey: n, activeKey: r, onChange: a, ...o }) {
-	let { token: c } = z.useToken(), u = s(() => e.toArray(t).filter(Jn).map((e, t) => ({
+function pr({ children: t, defaultActiveKey: n, activeKey: r, onChange: a, ...o }) {
+	let { token: c } = z.useToken(), u = s(() => e.toArray(t).filter(fr).map((e, t) => ({
 		key: e.key ?? String(t),
 		label: e.props.label,
 		disabled: e.props.disabled,
 		children: e.props.children
-	})), [t]), d = Gn(u.length), f = r !== void 0, [p, m] = l(() => n ?? u[0]?.key ?? "0"), h = f ? r : p, g = i((e) => {
+	})), [t]), d = lr(u.length), f = r !== void 0, [p, m] = l(() => n ?? u[0]?.key ?? "0"), h = f ? r : p, g = i((e) => {
 		f || m(e), a?.(e);
 	}, [f, a]);
-	Kn(d, i((e) => {
+	ur(d, i((e) => {
 		let t = u[e]?.key;
 		t != null && g(t);
 	}, [g, u]));
-	let { control: _, getFieldState: v } = G(), y = K({ control: _ });
-	return /* @__PURE__ */ V(ae, {
+	let { control: _, getFieldState: v } = G(), y = we({ control: _ });
+	return /* @__PURE__ */ V(L, {
 		destroyOnHidden: !1,
 		items: s(() => u.map((e, t) => {
-			let n = Wn(d[t].current, v, y);
+			let n = cr(d[t].current, v, y);
 			return {
 				key: e.key,
 				label: n ? /* @__PURE__ */ V("span", {
@@ -2271,7 +2374,7 @@ function Yn({ children: t, defaultActiveKey: n, activeKey: r, onChange: a, ...o
 					children: e.label
 				}) : e.label,
 				disabled: e.disabled,
-				children: /* @__PURE__ */ V(an, {
+				children: /* @__PURE__ */ V(hn, {
 					sourcesRef: d[t],
 					children: e.children
 				})
@@ -2290,17 +2393,17 @@ function Yn({ children: t, defaultActiveKey: n, activeKey: r, onChange: a, ...o
 }
 //#endregion
 //#region src/crud/FormSteps.tsx
-function Xn(e) {
+function mr(e) {
 	return null;
 }
-function Zn(e) {
-	return r(e) && e.type === Xn;
+function hr(e) {
+	return r(e) && e.type === mr;
 }
-function Qn({ children: t, initialStep: n = 0, showNavigation: r = !0, allowStepSelect: a = !1, stepsStyle: o, navigationStyle: c, size: u, direction: d, type: f, status: p }) {
-	let m = s(() => e.toArray(t).filter(Zn), [t]), h = Gn(m.length), [g, _] = l(n), v = m.length - 1;
-	Kn(h, _);
-	let { control: y, getFieldState: b } = G(), S = K({ control: y }), C = s(() => m.map((e, t) => {
-		let n = Wn(h[t].current, b, S);
+function gr({ children: t, initialStep: n = 0, showNavigation: r = !0, allowStepSelect: a = !1, stepsStyle: o, navigationStyle: c, size: u, direction: d, type: f, status: p }) {
+	let m = s(() => e.toArray(t).filter(hr), [t]), h = lr(m.length), [g, _] = l(n), v = m.length - 1;
+	ur(h, _);
+	let { control: y, getFieldState: b } = G(), S = we({ control: y }), C = s(() => m.map((e, t) => {
+		let n = cr(h[t].current, b, S);
 		return {
 			title: e.props.title,
 			description: e.props.description,
@@ -2315,7 +2418,7 @@ function Qn({ children: t, initialStep: n = 0, showNavigation: r = !0, allowStep
 		_(e);
 	}, []);
 	return /* @__PURE__ */ H(B, { children: [
-		/* @__PURE__ */ V(L, {
+		/* @__PURE__ */ V(ie, {
 			current: g,
 			items: C,
 			style: {
@@ -2330,7 +2433,7 @@ function Qn({ children: t, initialStep: n = 0, showNavigation: r = !0, allowStep
 		}),
 		m.map((e, t) => /* @__PURE__ */ V("div", {
 			style: { display: g === t ? void 0 : "none" },
-			children: /* @__PURE__ */ V(an, {
+			children: /* @__PURE__ */ V(hn, {
 				sourcesRef: h[t],
 				children: e.props.children
 			})
@@ -2355,183 +2458,131 @@ function Qn({ children: t, initialStep: n = 0, showNavigation: r = !0, allowStep
 }
 //#endregion
 //#region src/crud/fields/FieldWrapper.tsx
-function $n({ source: e, label: t, required: n, rules: r, children: i }) {
-	let { control: a } = G(), o = nn(), s = t ?? e;
-	return un(e), /* @__PURE__ */ V(ge, {
-		name: e,
-		control: a,
+function Q({ source: e, name: t, label: n, required: r, rules: i, hideLabel: a, children: o }) {
+	let s = t ?? e, c = !s.includes("."), { control: l } = G(), u = pn(), d = a ? void 0 : n ?? e, f = n ?? e;
+	return bn(e, c), xn(e, c), /* @__PURE__ */ V(xe, {
+		name: s,
+		control: l,
 		rules: {
-			required: n ? `${s} is required` : !1,
-			...r
+			required: r ? `${f} is required` : !1,
+			...i
 		},
 		render: ({ field: e, fieldState: t }) => /* @__PURE__ */ V(D.Item, {
-			label: s,
+			label: d,
 			validateStatus: t.error ? "error" : void 0,
 			help: t.error?.message,
-			required: n,
-			children: i({
+			required: r && !a,
+			style: a ? { marginBottom: 0 } : void 0,
+			children: o({
 				value: e.value,
 				onChange: e.onChange,
 				onBlur: e.onBlur,
-				disabled: o?.disabled
-			})
-		})
-	});
-}
-function er({ name: e, label: t, required: n, rules: r, hideLabel: i, children: a }) {
-	let { control: o } = G(), s = i ? void 0 : t;
-	return /* @__PURE__ */ V(ge, {
-		name: e,
-		control: o,
-		rules: {
-			required: n ? `${t ?? "This field"} is required` : !1,
-			...r
-		},
-		render: ({ field: e, fieldState: t }) => /* @__PURE__ */ V(D.Item, {
-			label: s,
-			validateStatus: t.error ? "error" : void 0,
-			help: t.error?.message,
-			required: n && !i,
-			style: { marginBottom: 0 },
-			children: a({
-				value: e.value,
-				onChange: e.onChange,
-				onBlur: e.onBlur
+				disabled: u?.disabled,
+				name: s
 			})
 		})
 	});
 }
 //#endregion
-//#region src/crud/fields/useInlineOrFormField.tsx
-function Q(e, t, n, r, i, a) {
-	let l = Pn(), u = l?.registerField, d = u != null, f = c(i);
-	f.current = i;
-	let p = s(() => u ? {
-		key: e,
+//#region src/crud/fields/TextField.tsx
+function _r({ source: e, name: t, label: n, required: r, rules: i, placeholder: a, inputStyle: o, hideLabel: s }) {
+	return /* @__PURE__ */ V(Q, {
 		source: e,
-		label: t,
-		width: a?.width,
-		minWidth: a?.minWidth,
-		render: ({ name: e, index: i }) => /* @__PURE__ */ V(er, {
-			name: e,
-			label: t,
-			required: n,
-			rules: r,
-			hideLabel: l?.layout !== "stacked",
-			children: ({ value: t, onChange: n, onBlur: r }) => f.current({
-				value: t,
-				onChange: n,
-				onBlur: r,
-				name: e,
-				index: i
-			})
-		})
-	} : null, [
-		u,
-		e,
-		t,
-		n,
-		r,
-		l?.layout,
-		a?.width,
-		a?.minWidth
-	]), m = c(p);
-	return m.current = p, o(() => {
-		if (!u) return;
-		let e = m.current;
-		if (e) return u(e);
-	}, [u, e]), d ? { mode: "inline" } : {
-		mode: "form",
-		element: /* @__PURE__ */ V($n, {
-			source: e,
-			label: t,
-			required: n,
-			rules: r,
-			children: ({ value: e, onChange: t, onBlur: n, disabled: r }) => i({
-				value: e,
-				onChange: t,
-				onBlur: n,
-				disabled: r
-			})
+		name: t,
+		label: n,
+		required: r,
+		rules: i,
+		hideLabel: s,
+		children: ({ value: e, onChange: t, onBlur: n, disabled: r }) => /* @__PURE__ */ V(A, {
+			value: e,
+			onChange: (e) => t(e.target.value),
+			onBlur: n,
+			placeholder: a,
+			disabled: r,
+			style: o
 		})
-	};
-}
-//#endregion
-//#region src/crud/fields/TextField.tsx
-function tr({ source: e, label: t, required: n, rules: r, placeholder: i, width: a, minWidth: o, inputStyle: s }) {
-	let c = Q(e, t, n, r, ({ value: e, onChange: t, onBlur: n, disabled: r }) => /* @__PURE__ */ V(k, {
-		value: e,
-		onChange: (e) => t(e.target.value),
-		onBlur: n,
-		placeholder: i,
-		disabled: r,
-		style: s
-	}), {
-		width: a,
-		minWidth: o
 	});
-	return c.mode === "inline" ? null : c.element;
 }
 //#endregion
 //#region src/crud/fields/NumberField.tsx
-function nr({ source: e, label: t, required: n, rules: r, min: i, max: a, step: o, width: s, minWidth: c, inputStyle: l }) {
-	let u = Q(e, t, n, r, ({ value: e, onChange: t, onBlur: n, disabled: r }) => /* @__PURE__ */ V(A, {
-		value: e,
-		onChange: (e) => t(e),
-		onBlur: n,
-		min: i,
-		max: a,
-		step: o,
-		disabled: r,
-		style: {
-			width: "100%",
-			...l
-		}
-	}), {
-		width: s,
-		minWidth: c
+function vr({ source: e, name: t, label: n, required: r, rules: i, min: a, max: o, step: s, inputStyle: c, hideLabel: l }) {
+	return /* @__PURE__ */ V(Q, {
+		source: e,
+		name: t,
+		label: n,
+		required: r,
+		rules: i,
+		hideLabel: l,
+		children: ({ value: e, onChange: t, onBlur: n, disabled: r }) => /* @__PURE__ */ V(te, {
+			value: e,
+			onChange: (e) => t(e),
+			onBlur: n,
+			min: a,
+			max: o,
+			step: s,
+			disabled: r,
+			style: {
+				width: "100%",
+				...c
+			}
+		})
 	});
-	return u.mode === "inline" ? null : u.element;
 }
 //#endregion
 //#region src/crud/fields/BooleanField.tsx
-function rr({ source: e, label: t, required: n, rules: r }) {
-	let i = Q(e, t, n, r, ({ value: e, onChange: t, disabled: n }) => /* @__PURE__ */ V(re, {
-		checked: !!e,
-		onChange: t,
-		disabled: n
-	}));
-	return i.mode === "inline" ? null : i.element;
+function yr({ source: e, name: t, label: n, required: r, rules: i, hideLabel: a }) {
+	return /* @__PURE__ */ V(Q, {
+		source: e,
+		name: t,
+		label: n,
+		required: r,
+		rules: i,
+		hideLabel: a,
+		children: ({ value: e, onChange: t, disabled: n }) => /* @__PURE__ */ V(ae, {
+			checked: !!e,
+			onChange: t,
+			disabled: n
+		})
+	});
 }
 //#endregion
 //#region src/crud/fields/DateField.tsx
-var ir = "YYYY-MM-DD";
-function ar({ source: e, label: t, required: n, rules: r, showTime: i }) {
-	let a = Q(e, t, n, r, ({ value: e, onChange: t, onBlur: n, disabled: r }) => /* @__PURE__ */ V(w, {
-		value: e ? xe(String(e)) : null,
-		onChange: (e) => t(e ? e.format(i ? `${ir} HH:mm:ss` : ir) : null),
-		onBlur: n,
-		showTime: i,
-		disabled: r,
-		format: i ? `${ir} HH:mm:ss` : ir,
-		style: { width: "100%" }
-	}));
-	return a.mode === "inline" ? null : a.element;
+var br = "YYYY-MM-DD";
+function xr({ source: e, name: t, label: n, required: r, rules: i, showTime: a, hideLabel: o }) {
+	return /* @__PURE__ */ V(Q, {
+		source: e,
+		name: t,
+		label: n,
+		required: r,
+		rules: i,
+		hideLabel: o,
+		children: ({ value: e, onChange: t, onBlur: n, disabled: r }) => /* @__PURE__ */ V(w, {
+			value: e ? Ee(String(e)) : null,
+			onChange: (e) => t(e ? e.format(a ? `${br} HH:mm:ss` : br) : null),
+			onBlur: n,
+			showTime: a,
+			disabled: r,
+			format: a ? `${br} HH:mm:ss` : br,
+			style: { width: "100%" }
+		})
+	});
 }
 //#endregion
 //#region src/crud/fields/SelectField.tsx
-function or({ source: e, label: t, required: n, rules: r, choices: i, mode: a, allowClear: o }) {
-	return /* @__PURE__ */ V($n, {
+function Sr({ source: e, name: t, label: n, required: r, rules: i, choices: a, mode: o, allowClear: s, hideLabel: c }) {
+	return /* @__PURE__ */ V(Q, {
 		source: e,
-		label: t,
-		required: n,
-		rules: r,
+		name: t,
+		label: n,
+		required: r,
+		rules: i,
+		hideLabel: c,
 		children: ({ value: e, onChange: t, disabled: n }) => /* @__PURE__ */ V(P, {
 			value: e,
 			onChange: t,
-			options: i,
-			mode: a,
-			allowClear: o,
+			options: a,
+			mode: o,
+			allowClear: s,
 			disabled: n,
 			style: { width: "100%" }
 		})
@@ -2539,60 +2590,63 @@ function or({ source: e, label: t, required: n, rules: r, choices: i, mode: a, a
 }
 //#endregion
 //#region src/crud/fields/PasswordField.tsx
-function sr({ source: e, label: t, required: n, rules: r, autoComplete: i, width: a, minWidth: o }) {
-	let s = Q(e, t, n, r, ({ value: e, onChange: t, onBlur: n, disabled: r }) => /* @__PURE__ */ V(k.Password, {
-		value: e,
-		onChange: (e) => t(e.target.value),
-		onBlur: n,
-		disabled: r,
-		autoComplete: i
-	}), {
-		width: a,
-		minWidth: o
+function Cr({ source: e, name: t, label: n, required: r, rules: i, autoComplete: a, hideLabel: o }) {
+	return /* @__PURE__ */ V(Q, {
+		source: e,
+		name: t,
+		label: n,
+		required: r,
+		rules: i,
+		hideLabel: o,
+		children: ({ value: e, onChange: t, onBlur: n, disabled: r }) => /* @__PURE__ */ V(A.Password, {
+			value: e,
+			onChange: (e) => t(e.target.value),
+			onBlur: n,
+			disabled: r,
+			autoComplete: a
+		})
 	});
-	return s.mode === "inline" ? null : s.element;
 }
-function cr({ source: e, label: t, required: n, rules: r, confirmSource: i, confirmLabel: a = "Confirm password", autoComplete: o = "new-password", width: s, minWidth: c }) {
-	let l = be({
-		name: e,
-		disabled: !i
+function wr({ source: e, name: t, label: n, required: r, rules: i, confirmSource: a, confirmLabel: o = "Confirm password", autoComplete: s = "new-password", hideLabel: c }) {
+	let l = Te({
+		name: t ?? e,
+		disabled: !a
 	});
-	return i ? /* @__PURE__ */ H(B, { children: [/* @__PURE__ */ V(sr, {
+	return a ? /* @__PURE__ */ H(B, { children: [/* @__PURE__ */ V(Cr, {
 		source: e,
-		label: t,
-		required: n,
-		rules: r,
-		autoComplete: o,
-		width: s,
-		minWidth: c
-	}), /* @__PURE__ */ V(sr, {
-		source: i,
-		label: a,
-		required: n,
-		autoComplete: o,
-		width: s,
-		minWidth: c,
+		name: t,
+		label: n,
+		required: r,
+		rules: i,
+		autoComplete: s,
+		hideLabel: c
+	}), /* @__PURE__ */ V(Cr, {
+		source: a,
+		label: o,
+		required: r,
+		autoComplete: s,
+		hideLabel: c,
 		rules: { validate: (e) => !l || e === l || "Passwords do not match" }
-	})] }) : /* @__PURE__ */ V(sr, {
+	})] }) : /* @__PURE__ */ V(Cr, {
 		source: e,
-		label: t,
-		required: n,
-		rules: r,
-		autoComplete: o,
-		width: s,
-		minWidth: c
+		name: t,
+		label: n,
+		required: r,
+		rules: i,
+		autoComplete: s,
+		hideLabel: c
 	});
 }
 //#endregion
 //#region src/crud/utils/useChoices.ts
-var lr = /* @__PURE__ */ new Map(), ur = /* @__PURE__ */ new Map();
-function dr(e, t) {
+var Tr = /* @__PURE__ */ new Map(), Er = /* @__PURE__ */ new Map();
+function Dr(e, t) {
 	return typeof e == "function" ? `fn:${t ?? ""}` : Array.isArray(e) ? `static:${e.length}` : `res:${e.resource}:${JSON.stringify(e.filter ?? {})}:${t ?? ""}`;
 }
-function fr(e, t) {
+function Or(e, t) {
 	return typeof t == "function" ? t(e) : String(e[t] ?? "");
 }
-async function pr(e, t, n, r, i) {
+async function kr(e, t, n, r, i) {
 	return typeof e == "function" ? e({
 		dataProvider: t,
 		search: i
@@ -2606,23 +2660,23 @@ async function pr(e, t, n, r, i) {
 			perPage: 500
 		}
 	})).data.map((e) => ({
-		label: fr(e, n),
+		label: Or(e, n),
 		value: e[r],
 		record: e
 	}));
 }
-function mr(e, t, n, r, i) {
-	let a = dr(e, i), o = lr.get(a);
+function Ar(e, t, n, r, i) {
+	let a = Dr(e, i), o = Tr.get(a);
 	if (o && !i) return Promise.resolve(o);
-	let s = ur.get(a);
+	let s = Er.get(a);
 	if (s) return s;
-	let c = pr(e, t, n, r, i).then((e) => (i || lr.set(a, e), e)).finally(() => {
-		ur.delete(a);
+	let c = kr(e, t, n, r, i).then((e) => (i || Tr.set(a, e), e)).finally(() => {
+		Er.delete(a);
 	});
-	return ur.set(a, c), c;
+	return Er.set(a, c), c;
 }
 function $(e, t, n = "name", r = "id", a) {
-	let c = mt(), u = s(() => {
+	let c = yt(), u = s(() => {
 		if (e) return e;
 		if (t) return {
 			resource: t,
@@ -2632,19 +2686,19 @@ function $(e, t, n = "name", r = "id", a) {
 		e,
 		t,
 		a
-	]), d = u ? dr(u, a) : void 0, [f, p] = l(() => !d || a ? [] : lr.get(d) ?? []), [m, h] = l(() => !d || a ? !!u : !lr.has(d)), g = i(async () => {
+	]), d = u ? Dr(u, a) : void 0, [f, p] = l(() => !d || a ? [] : Tr.get(d) ?? []), [m, h] = l(() => !d || a ? !!u : !Tr.has(d)), g = i(async () => {
 		if (!u) {
 			p([]), h(!1);
 			return;
 		}
-		let e = dr(u, a), t = lr.get(e);
+		let e = Dr(u, a), t = Tr.get(e);
 		if (t && !a) {
 			p(t), h(!1);
 			return;
 		}
 		h(!0);
 		try {
-			p(await mr(u, c, n, r, a));
+			p(await Ar(u, c, n, r, a));
 		} catch {
 			p([]);
 		} finally {
@@ -2672,62 +2726,230 @@ function $(e, t, n = "name", r = "id", a) {
 }
 //#endregion
 //#region src/crud/fields/ReferenceField.tsx
-function hr({ source: e, label: t, reference: n, choices: r, optionLabel: i = "name", optionValue: a = "id", required: o, rules: c, search: u, allowClear: d, disabled: f, width: p, minWidth: m, inputStyle: h, onValueChange: g }) {
-	let [_, v] = l(), { options: y, loading: b, optionForValue: x } = $(r, n, i, a, u ? _ : void 0), S = s(() => y.map((e) => ({
+function jr({ source: e, name: t, label: n, reference: r, choices: i, optionLabel: a = "name", optionValue: o = "id", required: c, rules: u, search: d, allowClear: f, disabled: p, hideLabel: m, inputStyle: h, onValueChange: g }) {
+	let [_, v] = l(), { options: y, loading: b, optionForValue: x } = $(i, r, a, o, d ? _ : void 0), S = s(() => y.map((e) => ({
 		label: e.label,
 		value: e.value
-	})), [y]), C = Q(e, t, o, c, ({ value: e, onChange: t, disabled: n, name: r, index: i }) => /* @__PURE__ */ V(P, {
-		value: e,
-		onChange: (e) => {
-			t(e), g?.(e, x(e), {
-				name: r,
-				index: i
-			});
-		},
-		options: S,
-		loading: b && y.length === 0,
-		showSearch: u,
-		filterOption: u ? !1 : void 0,
-		onSearch: u ? v : void 0,
-		allowClear: d,
-		disabled: n || f,
-		optionFilterProp: "label",
-		style: {
-			width: "100%",
-			minWidth: 160,
-			...h
-		}
-	}), {
-		width: p,
-		minWidth: m
+	})), [y]);
+	return /* @__PURE__ */ V(Q, {
+		source: e,
+		name: t,
+		label: n,
+		required: c,
+		rules: u,
+		hideLabel: m,
+		children: ({ value: e, onChange: t, disabled: n, name: r }) => /* @__PURE__ */ V(P, {
+			value: e,
+			onChange: (e) => {
+				t(e), g?.(e, x(e), { name: r });
+			},
+			options: S,
+			loading: b && y.length === 0,
+			showSearch: d,
+			filterOption: d ? !1 : void 0,
+			onSearch: d ? v : void 0,
+			allowClear: f,
+			disabled: n || p,
+			optionFilterProp: "label",
+			style: {
+				width: "100%",
+				minWidth: 160,
+				...h
+			}
+		})
 	});
-	return C.mode === "inline" ? null : C.element;
 }
 //#endregion
 //#region src/crud/fields/ReferenceManyField.tsx
-function gr({ source: e, label: t, reference: n, choices: r, optionLabel: i = "name", optionValue: a = "id", required: o, rules: c, search: u, allowClear: d = !0 }) {
-	let [f, p] = l(), { options: m, loading: h } = $(r, n, i, a, u ? f : void 0), g = s(() => m.map((e) => ({
+function Mr({ source: e, name: t, label: n, reference: r, choices: i, optionLabel: a = "name", optionValue: o = "id", required: c, rules: u, search: d, allowClear: f = !0, hideLabel: p }) {
+	let [m, h] = l(), { options: g, loading: _ } = $(i, r, a, o, d ? m : void 0), v = s(() => g.map((e) => ({
 		label: e.label,
 		value: e.value
-	})), [m]), _ = Q(e, t, o, c, ({ value: e, onChange: t, disabled: n }) => /* @__PURE__ */ V(P, {
-		mode: "multiple",
-		value: e ?? [],
-		onChange: t,
-		options: g,
-		loading: h,
-		showSearch: u,
-		filterOption: u ? !1 : void 0,
-		onSearch: u ? p : void 0,
-		allowClear: d,
-		disabled: n,
-		optionFilterProp: "label",
-		style: { width: "100%" }
-	}));
-	return _.mode === "inline" ? null : _.element;
+	})), [g]);
+	return /* @__PURE__ */ V(Q, {
+		source: e,
+		name: t,
+		label: n,
+		required: c,
+		rules: u,
+		hideLabel: p,
+		children: ({ value: e, onChange: t, disabled: n }) => /* @__PURE__ */ V(P, {
+			mode: "multiple",
+			value: e ?? [],
+			onChange: t,
+			options: v,
+			loading: _,
+			showSearch: d,
+			filterOption: d ? !1 : void 0,
+			onSearch: d ? h : void 0,
+			allowClear: f,
+			disabled: n,
+			optionFilterProp: "label",
+			style: { width: "100%" }
+		})
+	});
+}
+//#endregion
+//#region src/crud/fields/uploadFieldUtils.ts
+function Nr(e) {
+	return e instanceof File ? !0 : typeof e == "string" && e.length > 0;
+}
+function Pr(e) {
+	if (e instanceof File) return e.name;
+	if (typeof e == "string" && e.length > 0) try {
+		return new URL(e, "http://local").pathname.split("/").filter(Boolean).pop() || e;
+	} catch {
+		return e.split("/").filter(Boolean).pop() || e;
+	}
+}
+//#endregion
+//#region src/crud/fields/useUploadPreviewUrl.ts
+function Fr(e) {
+	let [t, n] = l();
+	if (o(() => {
+		if (e instanceof File) {
+			let t = URL.createObjectURL(e);
+			return n(t), () => URL.revokeObjectURL(t);
+		}
+		n(void 0);
+	}, [e]), e instanceof File) return t;
+	if (typeof e == "string" && e.length > 0) return e;
+}
+//#endregion
+//#region src/crud/fields/ImageField.tsx
+function Ir({ value: e, onChange: t, disabled: n, clearable: r, accept: i = "image/*", previewWidth: a = 200 }) {
+	let o = c(null), s = Fr(e), l = r && Nr(e);
+	return /* @__PURE__ */ H(F, {
+		direction: "vertical",
+		size: "middle",
+		style: { width: "100%" },
+		children: [
+			s ? /* @__PURE__ */ V(k, {
+				src: s,
+				alt: "",
+				style: {
+					maxWidth: a,
+					maxHeight: a,
+					objectFit: "contain"
+				}
+			}) : null,
+			/* @__PURE__ */ H(F, {
+				wrap: !0,
+				children: [/* @__PURE__ */ V(x, {
+					icon: /* @__PURE__ */ V(ye, {}),
+					disabled: n,
+					onClick: () => o.current?.click(),
+					children: "Choose image"
+				}), l ? /* @__PURE__ */ V(x, {
+					icon: /* @__PURE__ */ V(ue, {}),
+					disabled: n,
+					onClick: () => {
+						t(null), o.current && (o.current.value = "");
+					},
+					children: "Clear"
+				}) : null]
+			}),
+			/* @__PURE__ */ V("input", {
+				ref: o,
+				type: "file",
+				accept: i,
+				disabled: n,
+				tabIndex: -1,
+				"aria-hidden": !0,
+				style: { display: "none" },
+				onChange: (e) => {
+					let n = e.target.files?.[0];
+					t(n ?? null), e.target.value = "";
+				}
+			})
+		]
+	});
+}
+function Lr({ source: e, name: t, label: n, required: r, rules: i, hideLabel: a, clearable: o, accept: s, previewWidth: c }) {
+	return /* @__PURE__ */ V(Q, {
+		source: e,
+		name: t,
+		label: n,
+		required: r,
+		rules: i,
+		hideLabel: a,
+		children: ({ value: e, onChange: t, disabled: n }) => /* @__PURE__ */ V(Ir, {
+			value: e,
+			onChange: t,
+			disabled: n,
+			clearable: o,
+			accept: s,
+			previewWidth: c
+		})
+	});
+}
+//#endregion
+//#region src/crud/fields/FileField.tsx
+function Rr({ value: e, onChange: t, disabled: n, clearable: r, accept: i }) {
+	let a = c(null), o = Pr(e), s = typeof e == "string" && e.length > 0 ? e : void 0, l = r && Nr(e);
+	return /* @__PURE__ */ H(F, {
+		direction: "vertical",
+		size: "middle",
+		style: { width: "100%" },
+		children: [
+			o ? /* @__PURE__ */ H(F, { children: [/* @__PURE__ */ V(ge, {}), s ? /* @__PURE__ */ V(R.Link, {
+				href: s,
+				target: "_blank",
+				rel: "noopener noreferrer",
+				children: o
+			}) : /* @__PURE__ */ V(R.Text, { children: o })] }) : null,
+			/* @__PURE__ */ H(F, {
+				wrap: !0,
+				children: [/* @__PURE__ */ V(x, {
+					icon: /* @__PURE__ */ V(ye, {}),
+					disabled: n,
+					onClick: () => a.current?.click(),
+					children: "Choose file"
+				}), l ? /* @__PURE__ */ V(x, {
+					icon: /* @__PURE__ */ V(ue, {}),
+					disabled: n,
+					onClick: () => {
+						t(null), a.current && (a.current.value = "");
+					},
+					children: "Clear"
+				}) : null]
+			}),
+			/* @__PURE__ */ V("input", {
+				ref: a,
+				type: "file",
+				accept: i,
+				disabled: n,
+				tabIndex: -1,
+				"aria-hidden": !0,
+				style: { display: "none" },
+				onChange: (e) => {
+					let n = e.target.files?.[0];
+					t(n ?? null), e.target.value = "";
+				}
+			})
+		]
+	});
+}
+function zr({ source: e, name: t, label: n, required: r, rules: i, hideLabel: a, clearable: o, accept: s }) {
+	return /* @__PURE__ */ V(Q, {
+		source: e,
+		name: t,
+		label: n,
+		required: r,
+		rules: i,
+		hideLabel: a,
+		children: ({ value: e, onChange: t, disabled: n }) => /* @__PURE__ */ V(Rr, {
+			value: e,
+			onChange: t,
+			disabled: n,
+			clearable: o,
+			accept: s
+		})
+	});
 }
 //#endregion
 //#region src/crud/columns/TextColumn.tsx
-function _r({ source: e, label: t, sortable: n = !0 }) {
+function Br({ source: e, label: t, sortable: n = !0 }) {
 	return X(s(() => ({
 		key: e,
 		source: e,
@@ -2745,12 +2967,12 @@ function _r({ source: e, label: t, sortable: n = !0 }) {
 		n
 	])), null;
 }
-function vr(e, t, n) {
-	return typeof n == "function" ? n(e) : n ? dn(e, n) : e[t];
+function Vr(e, t, n) {
+	return typeof n == "function" ? n(e) : n ? Sn(e, n) : e[t];
 }
 //#endregion
 //#region src/crud/columns/NumberColumn.tsx
-function yr({ source: e, label: t, sortable: n = !0 }) {
+function Hr({ source: e, label: t, sortable: n = !0 }) {
 	return X(s(() => ({
 		key: e,
 		source: e,
@@ -2770,7 +2992,7 @@ function yr({ source: e, label: t, sortable: n = !0 }) {
 }
 //#endregion
 //#region src/crud/columns/BooleanColumn.tsx
-function br({ source: e, label: t, sortable: n = !0 }) {
+function Ur({ source: e, label: t, sortable: n = !0 }) {
 	return X(s(() => ({
 		key: e,
 		source: e,
@@ -2791,7 +3013,7 @@ function br({ source: e, label: t, sortable: n = !0 }) {
 }
 //#endregion
 //#region src/crud/columns/DateColumn.tsx
-function xr({ source: e, label: t, sortable: n = !0 }) {
+function Wr({ source: e, label: t, sortable: n = !0 }) {
 	return X(s(() => ({
 		key: e,
 		source: e,
@@ -2812,16 +3034,16 @@ function xr({ source: e, label: t, sortable: n = !0 }) {
 }
 //#endregion
 //#region src/crud/columns/ReferenceColumn.tsx
-function Sr({ record: e, source: t, display: n, reference: r, choices: i, optionLabel: a, optionValue: o }) {
+function Gr({ record: e, source: t, display: n, reference: r, choices: i, optionLabel: a, optionValue: o }) {
 	let { labelForValue: s } = $(i, r, a, o), c = e[t];
 	if (typeof n == "function") return /* @__PURE__ */ V(B, { children: n(e) });
 	if (n && n !== t) {
-		let r = vr(e, t, n);
+		let r = Vr(e, t, n);
 		return /* @__PURE__ */ V(B, { children: r == null ? "—" : String(r) });
 	}
 	return /* @__PURE__ */ V(B, { children: s(c) });
 }
-function Cr({ source: e, label: t, reference: n, choices: r, optionLabel: i = "name", optionValue: a = "id", display: o, sortable: c = !0 }) {
+function Kr({ source: e, label: t, reference: n, choices: r, optionLabel: i = "name", optionValue: a = "id", display: o, sortable: c = !0 }) {
 	return X(s(() => ({
 		key: e,
 		source: e,
@@ -2832,7 +3054,7 @@ function Cr({ source: e, label: t, reference: n, choices: r, optionLabel: i = "n
 			dataIndex: e,
 			key: e,
 			sorter: c ? !0 : void 0,
-			render: (s, c) => /* @__PURE__ */ V(Sr, {
+			render: (s, c) => /* @__PURE__ */ V(Gr, {
 				record: c,
 				source: e,
 				label: t,
@@ -2856,11 +3078,11 @@ function Cr({ source: e, label: t, reference: n, choices: r, optionLabel: i = "n
 }
 //#endregion
 //#region src/crud/columns/ReferenceManyColumn.tsx
-function wr({ record: e, source: t, reference: n, choices: r, optionLabel: i, optionValue: a }) {
+function qr({ record: e, source: t, reference: n, choices: r, optionLabel: i, optionValue: a }) {
 	let { labelsForValues: o } = $(r, n, i, a), s = e[t];
 	return /* @__PURE__ */ V(B, { children: o(Array.isArray(s) ? s : []) });
 }
-function Tr({ source: e, label: t, reference: n, choices: r, optionLabel: i = "name", optionValue: a = "id", sortable: o = !1 }) {
+function Jr({ source: e, label: t, reference: n, choices: r, optionLabel: i = "name", optionValue: a = "id", sortable: o = !1 }) {
 	return X(s(() => ({
 		key: e,
 		source: e,
@@ -2871,7 +3093,7 @@ function Tr({ source: e, label: t, reference: n, choices: r, optionLabel: i = "n
 			dataIndex: e,
 			key: e,
 			sorter: o ? !0 : void 0,
-			render: (t, o) => /* @__PURE__ */ V(wr, {
+			render: (t, o) => /* @__PURE__ */ V(qr, {
 				record: o,
 				source: e,
 				reference: n,
@@ -2891,8 +3113,43 @@ function Tr({ source: e, label: t, reference: n, choices: r, optionLabel: i = "n
 	])), null;
 }
 //#endregion
+//#region src/crud/columns/ImageColumn.tsx
+function Yr({ source: e, label: t, sortable: n = !1, width: r = 40, height: i = 40, objectFit: a = "cover", borderRadius: o = 4, alt: c = "" }) {
+	return X(s(() => ({
+		key: e,
+		source: e,
+		label: t,
+		sortable: n,
+		buildColumn: () => ({
+			title: t ?? e,
+			dataIndex: e,
+			key: e,
+			sorter: n ? !0 : void 0,
+			render: (e) => e == null || e === "" ? null : /* @__PURE__ */ V("img", {
+				src: String(e),
+				alt: c,
+				style: {
+					width: r,
+					height: i,
+					objectFit: a,
+					borderRadius: o
+				}
+			})
+		})
+	}), [
+		e,
+		t,
+		n,
+		r,
+		i,
+		a,
+		o,
+		c
+	])), null;
+}
+//#endregion
 //#region src/crud/columns/CustomColumn.tsx
-function Er({ source: e, label: t, sortable: n = !1, render: r }) {
+function Xr({ source: e, label: t, sortable: n = !1, render: r }) {
 	return X(s(() => ({
 		key: e,
 		source: e,
@@ -2912,12 +3169,12 @@ function Er({ source: e, label: t, sortable: n = !1, render: r }) {
 }
 //#endregion
 //#region src/crud/filters/TextFilter.tsx
-function Dr({ source: e, label: t, placeholder: n }) {
+function Zr({ source: e, label: t, placeholder: n }) {
 	return Z(s(() => ({
 		key: e,
 		source: e,
 		label: t,
-		render: ({ value: r, onChange: i }) => /* @__PURE__ */ V(k, {
+		render: ({ value: r, onChange: i }) => /* @__PURE__ */ V(A, {
 			allowClear: !0,
 			placeholder: n ?? t ?? e,
 			value: r ?? "",
@@ -2932,12 +3189,12 @@ function Dr({ source: e, label: t, placeholder: n }) {
 }
 //#endregion
 //#region src/crud/filters/NumberFilter.tsx
-function Or({ source: e, label: t }) {
+function Qr({ source: e, label: t }) {
 	return Z(s(() => ({
 		key: e,
 		source: e,
 		label: t,
-		render: ({ value: n, onChange: r }) => /* @__PURE__ */ V(A, {
+		render: ({ value: n, onChange: r }) => /* @__PURE__ */ V(te, {
 			placeholder: t ?? e,
 			value: n,
 			onChange: (e) => r(e ?? void 0),
@@ -2947,7 +3204,7 @@ function Or({ source: e, label: t }) {
 }
 //#endregion
 //#region src/crud/filters/BooleanFilter.tsx
-function kr({ source: e, label: t }) {
+function $r({ source: e, label: t }) {
 	return Z(s(() => ({
 		key: e,
 		source: e,
@@ -2970,7 +3227,7 @@ function kr({ source: e, label: t }) {
 }
 //#endregion
 //#region src/crud/filters/DateFilter.tsx
-function Ar({ source: e, label: t }) {
+function ei({ source: e, label: t }) {
 	return Z(s(() => ({
 		key: e,
 		source: e,
@@ -2978,7 +3235,7 @@ function Ar({ source: e, label: t }) {
 		render: ({ value: n, onChange: r }) => /* @__PURE__ */ V(w, {
 			allowClear: !0,
 			placeholder: t ?? e,
-			value: n ? xe(String(n)) : null,
+			value: n ? Ee(String(n)) : null,
 			onChange: (e) => r(e ? e.format("YYYY-MM-DD") : void 0),
 			style: { minWidth: 160 }
 		})
@@ -2986,7 +3243,7 @@ function Ar({ source: e, label: t }) {
 }
 //#endregion
 //#region src/crud/filters/SelectFilter.tsx
-function jr({ source: e, label: t, choices: n, multiple: r }) {
+function ti({ source: e, label: t, choices: n, multiple: r }) {
 	return Z(s(() => ({
 		key: e,
 		source: e,
@@ -3009,7 +3266,7 @@ function jr({ source: e, label: t, choices: n, multiple: r }) {
 }
 //#endregion
 //#region src/crud/filters/ReferenceFilter.tsx
-function Mr({ source: e, label: t, reference: n, choices: r, optionLabel: i, optionValue: a, multiple: o, search: s, value: c, onChange: u }) {
+function ni({ source: e, label: t, reference: n, choices: r, optionLabel: i, optionValue: a, multiple: o, search: s, value: c, onChange: u }) {
 	let [d, f] = l(), { options: p, loading: m } = $(r, n, i, a, s ? d : void 0);
 	return /* @__PURE__ */ V(P, {
 		allowClear: !0,
@@ -3029,12 +3286,12 @@ function Mr({ source: e, label: t, reference: n, choices: r, optionLabel: i, opt
 		style: { minWidth: 180 }
 	});
 }
-function Nr({ source: e, label: t, reference: n, choices: r, optionLabel: i = "name", optionValue: a = "id", multiple: o, search: c }) {
+function ri({ source: e, label: t, reference: n, choices: r, optionLabel: i = "name", optionValue: a = "id", multiple: o, search: c }) {
 	return Z(s(() => ({
 		key: e,
 		source: e,
 		label: t,
-		render: ({ value: s, onChange: l }) => /* @__PURE__ */ V(Mr, {
+		render: ({ value: s, onChange: l }) => /* @__PURE__ */ V(ni, {
 			source: e,
 			label: t,
 			reference: n,
@@ -3057,11 +3314,11 @@ function Nr({ source: e, label: t, reference: n, choices: r, optionLabel: i = "n
 		c
 	])), null;
 }
-function Pr(e) {
-	return /* @__PURE__ */ V(Nr, {
+function ii(e) {
+	return /* @__PURE__ */ V(ri, {
 		...e,
 		multiple: !0
 	});
 }
 //#endregion
-export { dt as AdminApp, $e as AdminLayout, Oe as AppThemeProvider, Vt as AuthAlternateLink, Ht as AuthPageLayout, Ie as AuthProvider, br as BooleanColumn, rr as BooleanField, kr as BooleanFilter, Er as CustomColumn, pt as DataProvider, xr as DateColumn, ar as DateField, Ar as DateFilter, je as DensitySwitch, An as FilterBar, Xn as FormStep, Qn as FormSteps, qn as FormTab, Yn as FormTabs, et as Guard, nt as GuestOnly, zn as InlineFormSet, Ut as LoginPage, yr as NumberColumn, nr as NumberField, Or as NumberFilter, cr as PasswordField, Ve as PermissionsProvider, Wt as PlaceholderPage, tt as Protected, Cr as ReferenceColumn, hr as ReferenceField, Nr as ReferenceFilter, Tr as ReferenceManyColumn, gr as ReferenceManyField, Pr as ReferenceManyFilter, rt as RequirePermission, Un as ResourceForm, _n as ResourceFormModal, On as ResourceList, or as SelectField, jr as SelectFilter, _r as TextColumn, tr as TextField, Dr as TextFilter, Ne as ThemeSwitch, Pe as ThemeToolbar, Pt as applyInMemoryListParams, bt as applyInlineFieldPaths, Y as asStringMessages, _t as combineResourceHandlers, ut as createAdminRouter, Ft as createMemoryResourceHandlers, He as createPermissionsChecker, It as createRestResourceHandlers, ze as createSessionStorageAuthAdapter, ct as deriveAuthPaths, We as filterNavByPermission, Mt as filterRows, xt as finalizeFormErrors, dn as getByPath, yt as getErrorBody, it as getRouteAccess, kt as getRowById, Fn as inlineArrayName, Vn as loadInlineRows, Ct as parseDjangoDRFFormErrors, wt as parseDotNetFormErrors, Tt as parseNodeFormErrors, at as partitionAdminRoutes, pn as pickBySources, Bn as saveInlineRows, Rt as toDjangoRestOrdering, Bt as toJsonApiSort, zt as toODataOrderBy, Le as useAuth, Ue as useCan, $ as useChoices, mt as useDataProvider, wn as useListQueryState, q as usePermissions, un as useRegisterFormSource, En as useResourceListContext, ke as useThemeMode };
+export { gt as AdminApp, it as AdminLayout, Ne as AppThemeProvider, Zt as AuthAlternateLink, Qt as AuthPageLayout, Ve as AuthProvider, Ur as BooleanColumn, yr as BooleanField, $r as BooleanFilter, Xr as CustomColumn, vt as DataProvider, Wr as DateColumn, xr as DateField, ei as DateFilter, Ie as DensitySwitch, Q as FieldWrapper, zr as FileField, Yn as FilterBar, mr as FormStep, gr as FormSteps, dr as FormTab, pr as FormTabs, at as Guard, st as GuestOnly, Yr as ImageColumn, Lr as ImageField, or as InlineFormSet, sr as InlineFormSetStacked, $t as LoginPage, Hr as NumberColumn, vr as NumberField, Qr as NumberFilter, wr as PasswordField, Ke as PermissionsProvider, en as PlaceholderPage, ot as Protected, Kr as ReferenceColumn, jr as ReferenceField, ri as ReferenceFilter, Jr as ReferenceManyColumn, Mr as ReferenceManyField, ii as ReferenceManyFilter, ct as RequirePermission, nr as ResourceForm, In as ResourceFormModal, qn as ResourceList, Sr as SelectField, ti as SelectFilter, Br as TextColumn, _r as TextField, Zr as TextFilter, Re as ThemeSwitch, ze as ThemeToolbar, Wt as applyInMemoryListParams, Y as asStringMessages, wn as buildFormPayload, Tn as buildInlineRowsPayload, jn as buildResourceFormSubmitBody, xt as combineResourceHandlers, ht as createAdminRouter, Gt as createMemoryResourceHandlers, qe as createPermissionsChecker, Kt as createRestResourceHandlers, We as createSessionStorageAuthAdapter, pt as deriveAuthPaths, Ye as filterNavByPermission, Ht as filterRows, At as finalizeFormErrors, kt as flattenNestedArrayErrors, Et as getErrorBody, Sn as getFormValue, lt as getRouteAccess, zt as getRowById, En as hasUploadValues, St as isAbortError, rr as nestedFieldPath, Nt as parseDjangoDRFFormErrors, Pt as parseDotNetFormErrors, Ft as parseNodeFormErrors, ut as partitionAdminRoutes, An as prepareFormSubmitBody, Dt as resolveErrorBody, Cn as setFormValue, Jt as toDjangoRestOrdering, kn as toFormData, Xt as toJsonApiSort, Yt as toODataOrderBy, Fn as useAbortableEffect, He as useAuth, Je as useCan, $ as useChoices, yt as useDataProvider, Un as useListQueryState, K as usePermissions, bn as useRegisterPayloadField, xn as useRegisterSectionField, Gn as useResourceListContext, Pe as useThemeMode };