@object-ui/plugin-form 16.1.0 → 17.1.0

package/dist/index.js

@@ -1,100 +1,60 @@
-import e, { useCallback as t, useContext as n, useEffect as r, useId as i, useMemo as a, useRef as o, useState as s } from "react";
-import { ComponentRegistry as c, resolveCrudAffordances as l, runBatchTransaction as u } from "@object-ui/core";
-import { SchemaRenderer as d, SchemaRendererContext as f, usePreviewMode as p, useRecordContext as m, useSafeFieldLabel as h, useSchemaContext as g } from "@object-ui/react";
-import { LineItemsField as _, buildValidationRules as v, formatFileSize as y, mapFieldTypeToFormType as b } from "@object-ui/fields";
-import { AlertDialog as x, AlertDialogAction as S, AlertDialogCancel as C, AlertDialogContent as w, AlertDialogDescription as T, AlertDialogFooter as E, AlertDialogHeader as D, AlertDialogTitle as O, Button as k, Card as A, CardContent as j, CardDescription as M, CardHeader as N, CardTitle as P, Dialog as F, DialogDescription as I, DialogHeader as L, DialogTitle as ee, MobileDialogContent as R, ResizableHandle as z, ResizablePanel as B, ResizablePanelGroup as V, Sheet as H, SheetContent as U, SheetDescription as W, SheetHeader as te, SheetTitle as ne, Skeleton as re, Tabs as ie, TabsContent as ae, TabsList as oe, TabsTrigger as se, cn as G, toast as K, useIsMobile as ce } from "@object-ui/components";
-import { usePermissions as le } from "@object-ui/permissions";
-import { Check as q, CheckCircle2 as ue, ChevronDown as de, ChevronLeft as fe, ChevronRight as pe, Loader2 as me, Lock as J, ShieldCheck as Y } from "lucide-react";
-import { Fragment as he, jsx as X, jsxs as Z } from "react/jsx-runtime";
-import { createSafeTranslation as ge } from "@object-ui/i18n";
-import { deriveFieldGroupLayout as _e } from "@objectstack/spec/data";
+import * as e from "react";
+import t, { useCallback as n, useContext as r, useEffect as i, useId as a, useMemo as o, useRef as s, useState as c } from "react";
+import { ComponentRegistry as l, evalFieldPredicate as u, resolveCrudAffordances as d, resolveFieldRuleState as f, runBatchTransaction as p } from "@object-ui/core";
+import { SchemaRenderer as m, SchemaRendererContext as h, usePreviewMode as g, useRecordContext as _, useSafeFieldLabel as v, useSchemaContext as y } from "@object-ui/react";
+import { LineItemsField as b, buildValidationRules as x, formatFileSize as S, mapFieldTypeToFormType as C } from "@object-ui/fields";
+import { AlertDialog as w, AlertDialogAction as T, AlertDialogCancel as E, AlertDialogContent as D, AlertDialogDescription as O, AlertDialogFooter as k, AlertDialogHeader as A, AlertDialogTitle as j, Button as M, Card as N, CardContent as P, CardDescription as F, CardHeader as I, CardTitle as L, Dialog as R, DialogDescription as z, DialogHeader as B, DialogTitle as V, MobileDialogContent as H, Sheet as ee, SheetContent as U, SheetDescription as W, SheetHeader as G, SheetTitle as te, Skeleton as ne, buttonVariants as K, cn as q, toast as J, useIsMobile as re } from "@object-ui/components";
+import { usePermissions as Y } from "@object-ui/permissions";
+import { AlertCircle as ie, AlertTriangle as ae, Check as oe, CheckCircle2 as se, ChevronDown as ce, ChevronLeft as le, ChevronRight as X, Loader2 as ue, Lock as de, ShieldCheck as fe } from "lucide-react";
+import { createSafeTranslation as pe } from "@object-ui/i18n";
+import { Fragment as me, jsx as Z, jsxs as Q } from "react/jsx-runtime";
+import { deriveFieldGroupLayout as he } from "@objectstack/spec/data";
 //#region src/successBehavior.ts
-function Q(e) {
+function $(e) {
 	try {
 		return typeof window > "u" ? !1 : new URL(e, window.location.href).origin === window.location.origin;
 	} catch {
 		return !1;
 	}
 }
-function ve(e, t) {
+function ge(e, t) {
 	if (!e) return null;
 	let n = t?.id ?? t?.recordId ?? t?._id;
 	if (n == null || n === "") return null;
 	let r = e.replace(/\{(?:id|recordId)\}/g, String(n));
-	return Q(r) ? r : null;
+	return $(r) ? r : null;
 }
 //#endregion
-//#region src/FormSection.tsx
-var $ = ({ label: e, description: t, collapsible: n = !1, collapsed: r = !1, columns: i = 1, children: a, className: o, gridClassName: c, showBorder: l }) => {
-	let [u, d] = s(r), f = {
-		1: "grid-cols-1",
-		2: "grid-cols-1 md:grid-cols-2",
-		3: "grid-cols-1 md:grid-cols-2 lg:grid-cols-3",
-		4: "grid-cols-1 md:grid-cols-2 lg:grid-cols-4"
-	}, p = () => {
-		n && d(!u);
-	}, m = l ?? !!e, h = e || t ? /* @__PURE__ */ Z("div", {
-		className: G("flex items-start gap-2", !m && "mb-4", n && "cursor-pointer select-none"),
-		onClick: p,
-		role: n ? "button" : void 0,
-		"aria-expanded": n ? !u : void 0,
-		children: [n && /* @__PURE__ */ X("span", {
-			className: "mt-0.5 text-muted-foreground",
-			children: X(u ? pe : de, { className: "h-4 w-4" })
-		}), /* @__PURE__ */ Z("div", {
-			className: "flex-1",
-			children: [e && /* @__PURE__ */ X("h3", {
-				className: "text-sm font-semibold text-foreground",
-				children: e
-			}), t && /* @__PURE__ */ X("p", {
-				className: "text-sm text-muted-foreground mt-0.5",
-				children: t
-			})]
-		})]
-	}) : null, g = u ? null : /* @__PURE__ */ X("div", {
-		className: G("grid gap-4", c || f[i]),
-		children: a
-	});
-	return m ? /* @__PURE__ */ Z(A, {
-		className: G("form-section bg-muted/40 shadow-none", o),
-		children: [h && /* @__PURE__ */ X(N, {
-			className: "border-b border-border pb-3",
-			children: h
-		}), g && /* @__PURE__ */ X(j, {
-			className: "pt-4",
-			children: g
-		})]
-	}) : /* @__PURE__ */ Z("div", {
-		className: G("form-section", o),
-		children: [h, g]
-	});
-};
-//#endregion
 //#region src/sectionFields.ts
-function ye(e, t) {
+function _e(e, t) {
 	return typeof t == "string" && t.trim() || typeof t == "object" && t && typeof t.source == "string" && t.source.trim() ? {
 		...e,
 		visibleOn: t
 	} : e;
 }
+var ve = /* @__PURE__ */ new Set();
+function ye(e, t) {
+	if (typeof e.name != "string" || e.name === e.field) return;
+	let n = `${t}:${e.field}:${e.name}`;
+	ve.has(n) || (ve.add(n), console.warn(`[object-ui] section field { field: '${e.field}' } also carries name: '${e.name}' — mixed form-field vocabularies. The spec key wins (the runtime name becomes '${e.field}'); drop \`name\` from authored form views.`));
+}
 function be(e, t) {
 	let n = t.objectSchema?.fields?.[e];
 	return n ? {
 		name: e,
 		label: t.fieldLabel(t.objectName, e, n.label || e),
-		type: b(n.type),
+		type: C(n.type),
 		required: n.required || !1,
 		disabled: t.readOnly || t.mode === "view" || n.readonly,
 		placeholder: n.placeholder,
 		description: n.help || n.description,
-		validation: v(n),
+		validation: x(n),
 		field: n,
 		options: n.options,
 		multiple: n.multiple,
 		visibleWhen: n.visibleWhen,
 		readonlyWhen: n.readonlyWhen,
-		requiredWhen: n.requiredWhen,
-		conditionalRequired: n.conditionalRequired
+		requiredWhen: n.requiredWhen
 	} : {
 		name: e,
 		label: e,
@@ -104,14 +64,15 @@ function be(e, t) {
 function xe(e, t) {
 	if (typeof e == "string") {
 		let n = t.objectSchema?.fields?.[e];
-		return ye(be(e, t), n?.visible_on ?? n?.visibleOn);
+		return _e(be(e, t), n?.visible_on ?? n?.visibleOn);
 	}
 	let n = e;
-	if (typeof n.field != "string") return ye(n, n.visibleOn);
+	if (typeof n.field != "string") return _e(n, n.visibleOn);
+	ye(n, t.objectName);
 	let r = n.field, i = be(r, t);
-	n.type != null && (i.type = b(n.type)), n.widget != null && (i.widget = n.widget), n.label != null && (i.label = n.label), n.placeholder != null && (i.placeholder = n.placeholder), n.helpText != null && (i.description = n.helpText), n.required != null && (i.required = n.required), n.readonly != null && (i.disabled = n.readonly || i.disabled), n.immutable != null && (i.immutable = n.immutable), n.hidden != null && (i.hidden = n.hidden), n.colSpan != null && (i.colSpan = n.colSpan), n.span != null && (i.span = n.span), n.options != null && (i.options = n.options), n.multiple != null && (i.multiple = n.multiple);
+	n.type != null && (i.type = C(n.type)), n.widget != null && (i.widget = n.widget), n.label != null && (i.label = n.label), n.placeholder != null && (i.placeholder = n.placeholder), n.helpText != null && (i.description = n.helpText), n.required != null && (i.required = n.required), n.readonly != null && (i.disabled = n.readonly || i.disabled), n.immutable != null && (i.immutable = n.immutable), n.hidden != null && (i.hidden = n.hidden), n.colSpan != null && (i.colSpan = n.colSpan), n.span != null && (i.span = n.span), n.options != null && (i.options = n.options), n.multiple != null && (i.multiple = n.multiple);
 	let a = n.reference ?? n.reference_to;
-	return a != null && (i.reference = a, i.reference_to = a), n.maxLength != null && (i.maxLength = n.maxLength), n.minLength != null && (i.minLength = n.minLength), n.min != null && (i.min = n.min), n.max != null && (i.max = n.max), n.precision != null && (i.precision = n.precision), n.scale != null && (i.scale = n.scale), n.language != null && (i.language = n.language), Array.isArray(n.fields) && (i.fields = n.fields), ye(i, n.visibleOn);
+	return a != null && (i.reference = a, i.reference_to = a), n.maxLength != null && (i.maxLength = n.maxLength), n.minLength != null && (i.minLength = n.minLength), n.min != null && (i.min = n.min), n.max != null && (i.max = n.max), n.precision != null && (i.precision = n.precision), n.scale != null && (i.scale = n.scale), n.language != null && (i.language = n.language), Array.isArray(n.fields) && (i.fields = n.fields), n.dependsOn != null && (i.dependsOn = n.dependsOn), n.keyField != null && (i.keyField = n.keyField), n.disclosure != null && (i.disclosure = n.disclosure), _e(i, n.visibleWhen ?? n.visibleOn);
 }
 function Se(e, t) {
 	return (e.fields ?? []).map((e) => xe(e, t));
@@ -228,18 +189,10 @@ var Ie = {
 function Le(e) {
 	return Ie[e && e > 0 ? Math.min(Math.floor(e), 4) : 1];
 }
-function Re(e, t) {
-	let n = t && t > 1 ? Math.min(Math.floor(t), 4) : 1, r = n > 1 ? je(e, n) : e, i = Le(n);
-	return {
-		fields: r,
-		columns: n,
-		...i ? { fieldContainerClass: i } : {}
-	};
-}
-function ze(e) {
+function Re(e) {
 	return e <= 1 ? "default" : e === 2 ? "xl" : "full";
 }
-function Be(e, t, n, r) {
+function ze(e, t, n, r) {
 	let i = [...e];
 	if (i = Ne(i, t), r === "create" && (i = Fe(i, t)), n !== void 0) return i = je(i, n), {
 		fields: i,
@@ -252,509 +205,736 @@ function Be(e, t, n, r) {
 	};
 }
 //#endregion
+//#region src/occSave.tsx
+var Be = pe({
+	"form.conflictTitle": "Save conflict",
+	"form.conflictMessage": "This record was changed by someone else while you were editing. Overwriting will replace their changes with yours.",
+	"form.conflictLatestVersion": "Their save: {{time}}",
+	"form.conflictOverwrite": "Overwrite",
+	"form.keepEditing": "Keep editing"
+}, "form.conflictTitle");
+function Ve(e) {
+	let t = e?.updated_at;
+	return typeof t == "string" && t.length > 0 ? t : void 0;
+}
+function He(e) {
+	if (!e || typeof e != "object") return !1;
+	let t = e;
+	return t.code === "CONCURRENT_UPDATE" || t.name === "ConcurrentUpdateError";
+}
+function Ue(e) {
+	if (!e) return null;
+	let t = /\d{4}-\d{2}-\d{2}[ T]/.test(e) ? e.replace(" ", "T") : e, n = new Date(t);
+	return Number.isNaN(n.getTime()) ? null : n.toLocaleString();
+}
+function We() {
+	let { t } = Be(), [n, r] = e.useState(null), i = e.useRef(null), a = e.useCallback((e) => {
+		i.current?.(e), i.current = null, r(null);
+	}, []);
+	e.useEffect(() => () => i.current?.(!1), []);
+	let o = e.useCallback(async ({ dataSource: e, objectName: t, recordId: n, payload: a, baseRecord: o }) => {
+		let s = Ve(o);
+		try {
+			return {
+				status: "saved",
+				result: await e.update(t, n, a, s ? { ifMatch: s } : void 0)
+			};
+		} catch (o) {
+			if (!He(o)) throw o;
+			let s = o.currentVersion;
+			if (!await new Promise((e) => {
+				i.current = e, r({ currentVersion: typeof s == "string" ? s : void 0 });
+			})) return { status: "cancelled" };
+			let c = typeof s == "string" && s.length > 0 ? s : void 0;
+			return {
+				status: "saved",
+				result: await e.update(t, n, a, c ? { ifMatch: c } : void 0)
+			};
+		}
+	}, []), s = Ue(n?.currentVersion);
+	return {
+		saveWithOcc: o,
+		conflictDialog: /* @__PURE__ */ Z(w, {
+			open: !!n,
+			onOpenChange: (e) => {
+				e || a(!1);
+			},
+			children: /* @__PURE__ */ Q(D, { children: [/* @__PURE__ */ Q(A, { children: [/* @__PURE__ */ Q(j, {
+				className: "flex items-center gap-2",
+				children: [/* @__PURE__ */ Z(ae, {
+					className: "h-5 w-5 text-amber-500",
+					"aria-hidden": !0
+				}), t("form.conflictTitle")]
+			}), /* @__PURE__ */ Q(O, { children: [t("form.conflictMessage"), s && /* @__PURE__ */ Z("span", {
+				className: "mt-2 block text-xs text-muted-foreground",
+				children: t("form.conflictLatestVersion", { time: s })
+			})] })] }), /* @__PURE__ */ Q(k, { children: [/* @__PURE__ */ Z("button", {
+				type: "button",
+				className: q(K({ variant: "outline" })),
+				onClick: () => a(!1),
+				children: t("form.keepEditing")
+			}), /* @__PURE__ */ Z("button", {
+				type: "button",
+				className: q(K({ variant: "destructive" })),
+				onClick: () => a(!0),
+				children: t("form.conflictOverwrite")
+			})] })] })
+		})
+	};
+}
+//#endregion
 //#region src/TabbedForm.tsx
-var Ve = ({ schema: n, dataSource: r, className: i }) => {
-	let { fieldLabel: a } = h(), [o, c] = s(null), [l, u] = s({}), [f, p] = s(!0), [m, g] = s(null), [_, v] = s(n.defaultTab || n.sections[0]?.name || n.sections[0]?.label || "tab-0");
-	e.useEffect(() => {
+var Ge = ({ schema: e, dataSource: r, className: i }) => {
+	let { fieldLabel: a } = v(), [o, l] = c(null), [u, d] = c({}), { saveWithOcc: f, conflictDialog: p } = We(), [h, g] = c(!0), [_, y] = c(null), b = e.defaultTab || e.sections[0]?.name || e.sections[0]?.label || "tab-0";
+	t.useEffect(() => {
 		(async () => {
 			if (!r) {
-				p(!1);
+				g(!1);
 				return;
 			}
 			try {
-				let e = await r.getObjectSchema(n.objectName);
-				c(e);
+				let t = await r.getObjectSchema(e.objectName);
+				l(t);
 			} catch (e) {
-				g(e);
+				y(e);
 			}
 		})();
-	}, [n.objectName, r]), e.useEffect(() => {
-		(o || !r) && (async () => {
-			if (n.mode === "create" || !n.recordId || !r) {
-				u(n.initialData || n.initialValues || {}), p(!1);
+	}, [e.objectName, r]);
+	let x = s(void 0);
+	t.useEffect(() => {
+		let t = !1;
+		return (o || !r) && (async () => {
+			if (e.mode === "create" || !e.recordId || !r) {
+				d(e.initialData || e.initialValues || {}), g(!1);
 				return;
 			}
+			x.current !== e.recordId && g(!0);
 			try {
-				let e = await r.findOne(n.objectName, n.recordId);
-				u(e || {});
+				let n = await r.findOne(e.objectName, e.recordId);
+				if (t) return;
+				x.current = e.recordId, d(n || {});
 			} catch (e) {
-				g(e);
+				if (t) return;
+				y(e);
 			} finally {
-				p(!1);
+				t || g(!1);
 			}
-		})();
+		})(), () => {
+			t = !0;
+		};
 	}, [
 		o,
-		n.mode,
-		n.recordId,
-		n.initialData,
-		n.initialValues,
+		e.mode,
+		e.recordId,
+		e.initialData,
+		e.initialValues,
 		r,
-		n.objectName
+		e.objectName
 	]);
-	let y = t((e) => Se(e, {
+	let S = n((t) => Se(t, {
 		objectSchema: o,
-		objectName: n.objectName,
-		readOnly: n.readOnly,
-		mode: n.mode,
+		objectName: e.objectName,
+		readOnly: e.readOnly,
+		mode: e.mode,
 		fieldLabel: a
 	}), [
 		o,
-		n.readOnly,
-		n.mode,
-		n.objectName,
+		e.readOnly,
+		e.mode,
+		e.objectName,
 		a
-	]), b = t(async (e) => {
-		if (!r) return n.onSuccess && await n.onSuccess(e), e;
+	]), C = n(async (t) => {
+		if (!r) return e.onSuccess && await e.onSuccess(t), t;
 		try {
-			let t;
-			return n.mode === "create" ? t = await r.create(n.objectName, e) : n.mode === "edit" && n.recordId && (t = await r.update(n.objectName, n.recordId, e)), n.onSuccess && await n.onSuccess(t), t;
-		} catch (e) {
-			throw n.onError && n.onError(e), e;
+			let n;
+			if (e.mode === "create") n = await r.create(e.objectName, t);
+			else if (e.mode === "edit" && e.recordId) {
+				let i = await f({
+					dataSource: r,
+					objectName: e.objectName,
+					recordId: e.recordId,
+					payload: t,
+					baseRecord: u
+				});
+				if (i.status === "cancelled") return;
+				n = i.result;
+			}
+			return e.onSuccess && await e.onSuccess(n), n;
+		} catch (t) {
+			throw e.onError && e.onError(t), t;
 		}
-	}, [n, r]), x = t(() => {
-		n.onCancel && n.onCancel();
-	}, [n]), S = (e, t) => e.name || e.label || `tab-${t}`;
-	if (m) return /* @__PURE__ */ Z("div", {
+	}, [
+		e,
+		r,
+		f,
+		u
+	]), w = n(() => {
+		e.onCancel && e.onCancel();
+	}, [e]), T = (e, t) => e.name || e.label || `tab-${t}`;
+	if (_) return /* @__PURE__ */ Q("div", {
 		className: "p-4 border border-red-300 bg-red-50 rounded-md",
-		children: [/* @__PURE__ */ X("h3", {
+		children: [/* @__PURE__ */ Z("h3", {
 			className: "text-red-800 font-semibold",
 			children: "Error loading form"
-		}), /* @__PURE__ */ X("p", {
+		}), /* @__PURE__ */ Z("p", {
 			className: "text-red-600 text-sm mt-1",
-			children: m.message
+			children: _.message
 		})]
 	});
-	if (f) return /* @__PURE__ */ Z("div", {
+	if (h) return /* @__PURE__ */ Q("div", {
 		className: "p-8 text-center",
-		children: [/* @__PURE__ */ X("div", { className: "inline-block animate-spin rounded-full h-8 w-8 border-b-2 border-gray-900" }), /* @__PURE__ */ X("p", {
+		children: [/* @__PURE__ */ Z("div", { className: "inline-block animate-spin rounded-full h-8 w-8 border-b-2 border-gray-900" }), /* @__PURE__ */ Z("p", {
 			className: "mt-2 text-sm text-gray-600",
 			children: "Loading form..."
 		})]
 	});
-	let C = {
-		type: "form",
-		fields: n.sections.flatMap((e) => y(e)),
-		layout: "vertical",
-		defaultValues: l,
-		submitLabel: n.submitText || (n.mode === "create" ? "Create" : "Update"),
-		cancelLabel: n.cancelText,
-		showSubmit: n.showSubmit !== !1 && n.mode !== "view",
-		showCancel: n.showCancel !== !1,
-		onSubmit: b,
-		onCancel: x
-	}, w = n.tabPosition === "left" || n.tabPosition === "right";
-	return /* @__PURE__ */ X("div", {
-		className: G("w-full", i, n.className),
-		children: /* @__PURE__ */ Z(ie, {
-			value: _,
-			onValueChange: v,
-			orientation: w ? "vertical" : "horizontal",
-			className: G(w && "flex gap-4"),
-			children: [/* @__PURE__ */ X(oe, {
-				className: G(w ? "flex-col h-auto" : "", n.tabPosition === "bottom" && "order-last", n.tabPosition === "right" && "order-last"),
-				children: n.sections.map((e, t) => /* @__PURE__ */ X(se, {
-					value: S(e, t),
-					className: w ? "w-full justify-start" : "",
-					children: e.label || `Tab ${t + 1}`
-				}, S(e, t)))
-			}), /* @__PURE__ */ X("div", {
-				className: "flex-1",
-				children: n.sections.map((e, t) => /* @__PURE__ */ X(ae, {
-					value: S(e, t),
-					className: "mt-0",
-					children: /* @__PURE__ */ X($, {
-						description: e.description,
-						columns: 1,
-						className: e.className,
-						gridClassName: e.gridClassName,
-						children: /* @__PURE__ */ X(d, { schema: {
-							...C,
-							...Re(y(e), e.columns || 1),
-							showSubmit: n.showSubmit !== !1 && n.mode !== "view",
-							showCancel: n.showCancel !== !1
-						} })
-					})
-				}, S(e, t)))
+	let E = (e) => typeof e == "number" && e > 0 ? Math.min(Math.floor(e), 4) : void 0, D = e.sections.map((e) => E(e.columns)).filter((e) => e != null), O = E(e.columns) ?? (D.length ? Math.max(...D) : 1), k = Le(O), A = e.sections.map((e, t) => {
+		let n = S(e);
+		return {
+			key: T(e, t),
+			label: e.label || `Tab ${t + 1}`,
+			description: e.description,
+			containerClass: e.gridClassName,
+			fields: O > 1 ? je(n, O, E(e.columns)) : n
+		};
+	}), j = A.flatMap((e) => e.fields);
+	return /* @__PURE__ */ Q("div", {
+		className: q("w-full @container", i, e.className),
+		children: [/* @__PURE__ */ Z(m, { schema: {
+			type: "form",
+			objectName: e.objectName,
+			fields: j,
+			columns: O,
+			...k ? { fieldContainerClass: k } : {},
+			layout: "vertical",
+			defaultValues: u,
+			submitLabel: e.submitText || (e.mode === "create" ? "Create" : "Update"),
+			cancelLabel: e.cancelText,
+			showSubmit: e.showSubmit !== !1 && e.mode !== "view",
+			showCancel: e.showCancel !== !1,
+			onSubmit: C,
+			onCancel: w,
+			fieldTabs: A.map((e) => ({
+				key: e.key,
+				label: e.label,
+				description: e.description,
+				fields: e.fields.map((e) => e.name),
+				containerClass: e.containerClass
+			})),
+			defaultFieldTab: b,
+			fieldTabsPosition: e.tabPosition || "top"
+		} }), p]
+	});
+}, Ke = ({ label: e, description: t, collapsible: n = !1, collapsed: r = !1, columns: i = 1, children: a, className: o, gridClassName: s, showBorder: l }) => {
+	let [u, d] = c(r), f = {
+		1: "grid-cols-1",
+		2: "grid-cols-1 md:grid-cols-2",
+		3: "grid-cols-1 md:grid-cols-2 lg:grid-cols-3",
+		4: "grid-cols-1 md:grid-cols-2 lg:grid-cols-4"
+	}, p = () => {
+		n && d(!u);
+	}, m = l ?? !!e, h = e || t ? /* @__PURE__ */ Q("div", {
+		className: q("flex items-start gap-2", !m && "mb-4", n && "cursor-pointer select-none"),
+		onClick: p,
+		role: n ? "button" : void 0,
+		"aria-expanded": n ? !u : void 0,
+		children: [n && /* @__PURE__ */ Z("span", {
+			className: "mt-0.5 text-muted-foreground",
+			children: Z(u ? X : ce, { className: "h-4 w-4" })
+		}), /* @__PURE__ */ Q("div", {
+			className: "flex-1",
+			children: [e && /* @__PURE__ */ Z("h3", {
+				className: "text-sm font-semibold text-foreground",
+				children: e
+			}), t && /* @__PURE__ */ Z("p", {
+				className: "text-sm text-muted-foreground mt-0.5",
+				children: t
 			})]
-		})
+		})]
+	}) : null, g = u ? null : /* @__PURE__ */ Z("div", {
+		className: q("grid gap-4", s || f[i]),
+		children: a
 	});
-}, He = ({ schema: n, dataSource: r, className: i }) => {
-	let { fieldLabel: o } = h(), [c, l] = s(null), [u, f] = s({}), [p, m] = s(!0), [g, _] = s(null), [v, y] = s(0), [b, x] = s(/* @__PURE__ */ new Set()), [S, C] = s(!1), [w, T] = s(null), E = e.useId(), [D, O] = s(0), A = e.useRef(!1), j = n.sections.length, M = v === 0, N = v === j - 1;
-	e.useEffect(() => {
+	return m ? /* @__PURE__ */ Q(N, {
+		className: q("form-section bg-muted/40 shadow-none", o),
+		children: [h && /* @__PURE__ */ Z(I, {
+			className: "border-b border-border pb-3",
+			children: h
+		}), g && /* @__PURE__ */ Z(P, {
+			className: "pt-4",
+			children: g
+		})]
+	}) : /* @__PURE__ */ Q("div", {
+		className: q("form-section", o),
+		children: [h, g]
+	});
+}, qe = pe({ "wizard.missingRequired": "Please complete the required fields: {{fields}}" }, "wizard.missingRequired"), Je = (e) => e == null || e === "" || Array.isArray(e) && e.length === 0, Ye = ({ schema: e, dataSource: r, className: i }) => {
+	let { fieldLabel: a } = v(), { t: s } = qe(), [l, d] = c(null), [p, h] = c({}), { saveWithOcc: g, conflictDialog: _ } = We(), [y, b] = c(!0), [x, S] = c(null), [C, w] = c(0), [T, E] = c(/* @__PURE__ */ new Set()), [D, O] = c(!1), [k, A] = c(/* @__PURE__ */ new Set()), [j, N] = c(null), P = t.useId(), [F, I] = c(0), L = t.useRef(!1), R = e.sections.length, z = C === 0, B = C === R - 1;
+	t.useEffect(() => {
 		(async () => {
 			if (!r) {
-				m(!1);
+				b(!1);
 				return;
 			}
 			try {
-				let e = await r.getObjectSchema(n.objectName);
-				l(e);
+				let t = await r.getObjectSchema(e.objectName);
+				d(t);
 			} catch (e) {
-				_(e);
+				S(e);
 			}
 		})();
-	}, [n.objectName, r]), e.useEffect(() => {
-		(c || !r) && (async () => {
-			if (n.mode === "create" || !n.recordId || !r) {
-				A.current ||= (f(n.initialData || n.initialValues || {}), !0), m(!1);
+	}, [e.objectName, r]), t.useEffect(() => {
+		(l || !r) && (async () => {
+			if (e.mode === "create" || !e.recordId || !r) {
+				L.current ||= (h(e.initialData || e.initialValues || {}), !0), b(!1);
 				return;
 			}
 			try {
-				let e = await r.findOne(n.objectName, n.recordId);
-				f(e || {});
+				let t = await r.findOne(e.objectName, e.recordId);
+				h(t || {});
 			} catch (e) {
-				_(e);
+				S(e);
 			} finally {
-				m(!1);
+				b(!1);
 			}
 		})();
 	}, [
-		c,
-		n.mode,
-		n.recordId,
-		n.initialData,
-		n.initialValues,
+		l,
+		e.mode,
+		e.recordId,
+		e.initialData,
+		e.initialValues,
 		r,
-		n.objectName
+		e.objectName
 	]);
-	let P = t((e) => Se(e, {
-		objectSchema: c,
-		objectName: n.objectName,
-		readOnly: n.readOnly,
-		mode: n.mode,
-		fieldLabel: o
+	let V = n((t) => Se(t, {
+		objectSchema: l,
+		objectName: e.objectName,
+		readOnly: e.readOnly,
+		mode: e.mode,
+		fieldLabel: a
 	}), [
-		c,
-		n.readOnly,
-		n.mode,
-		n.objectName,
-		o
-	]), F = a(() => v >= 0 && v < j ? P(n.sections[v]) : [], [
-		v,
-		j,
-		n.sections,
-		P
-	]), I = t(async (e) => {
-		let t = {
-			...u,
-			...e
+		l,
+		e.readOnly,
+		e.mode,
+		e.objectName,
+		a
+	]), H = o(() => C >= 0 && C < R ? V(e.sections[C]) : [], [
+		C,
+		R,
+		e.sections,
+		V
+	]), ee = n((t) => {
+		let n = /* @__PURE__ */ new Map();
+		return e.sections.forEach((e, r) => {
+			for (let i of V(e)) {
+				let e = i?.name;
+				if (!e || i.hidden === !0) continue;
+				let a = f({
+					visibleWhen: i.visibleWhen,
+					readonlyWhen: i.readonlyWhen,
+					requiredWhen: i.requiredWhen
+				}, t, {
+					required: !!i.required,
+					readonly: i.readonly === !0
+				});
+				!(i.visibleOn == null || u(i.visibleOn, t, !0)) || !a.visible || a.readonly || !a.required || Je(t[e]) && n.set(r, [...n.get(r) ?? [], i.label || e]);
+			}
+		}), n;
+	}, [e.sections, V]), U = n(async (t) => {
+		let n = {
+			...p,
+			...t
 		};
-		if (f(t), x((e) => new Set(e).add(v)), N) {
-			C(!0);
+		if (h(n), E((e) => new Set(e).add(C)), A((e) => {
+			if (!e.has(C)) return e;
+			let t = new Set(e);
+			return t.delete(C), t;
+		}), B) {
+			let t = ee(n);
+			if (t.size > 0) {
+				A(new Set(t.keys()));
+				let e = [...t.values()].flat();
+				J.error(s("wizard.missingRequired", { fields: e.slice(0, 3).join(", ") + (e.length > 3 ? "…" : "") })), W(Math.min(...t.keys()));
+				return;
+			}
+			A(/* @__PURE__ */ new Set()), O(!0);
 			try {
-				if (!r) return n.onSuccess && await n.onSuccess(t), t;
-				let e;
-				if (n.mode === "create" ? e = await r.create(n.objectName, t) : n.mode === "edit" && n.recordId && (e = await r.update(n.objectName, n.recordId, t)), n.onSuccess) await n.onSuccess(e);
-				else if (n.submitBehavior) {
-					let e = n.submitBehavior;
-					switch (e.kind) {
+				if (!r) return e.onSuccess && await e.onSuccess(n), n;
+				let t;
+				if (e.mode === "create") t = await r.create(e.objectName, n);
+				else if (e.mode === "edit" && e.recordId) {
+					let i = await g({
+						dataSource: r,
+						objectName: e.objectName,
+						recordId: e.recordId,
+						payload: n,
+						baseRecord: p
+					});
+					if (i.status === "cancelled") return;
+					t = i.result;
+				}
+				if (e.onSuccess) await e.onSuccess(t);
+				else if (e.submitBehavior) {
+					let t = e.submitBehavior;
+					switch (t.kind) {
 						case "redirect":
-							Q(e.url) && setTimeout(() => window.location.assign(e.url), e.delayMs ?? 0);
+							$(t.url) && setTimeout(() => window.location.assign(t.url), t.delayMs ?? 0);
 							break;
 						case "continue":
-							f({}), x(/* @__PURE__ */ new Set()), y(0), O((e) => e + 1);
+							h({}), E(/* @__PURE__ */ new Set()), w(0), I((e) => e + 1);
 							break;
 						default: {
-							let t = e.kind === "thank-you" && e.message ? e.message : n.successMessage || (n.mode === "create" ? "Created" : "Saved");
-							K.success(t), T({
-								title: e.kind === "thank-you" ? e.title : void 0,
-								message: t
+							let n = t.kind === "thank-you" && t.message ? t.message : e.successMessage || (e.mode === "create" ? "Created" : "Saved");
+							J.success(n), N({
+								title: t.kind === "thank-you" ? t.title : void 0,
+								message: n
 							});
 							break;
 						}
 					}
 				} else {
-					let t = ve(n.navigateOnSuccess, e);
-					if (t) return window.location.assign(t), e;
-					K.success(n.successMessage || (n.mode === "create" ? "Created" : "Saved")), n.resetOnSuccess && n.mode === "create" && (f({}), x(/* @__PURE__ */ new Set()), y(0), O((e) => e + 1));
+					let n = ge(e.navigateOnSuccess, t);
+					if (n) return window.location.assign(n), t;
+					J.success(e.successMessage || (e.mode === "create" ? "Created" : "Saved")), e.resetOnSuccess && e.mode === "create" && (h({}), E(/* @__PURE__ */ new Set()), w(0), I((e) => e + 1));
 				}
-				return e;
-			} catch (e) {
-				throw n.onError && n.onError(e), e;
+				return t;
+			} catch (t) {
+				throw e.onError && e.onError(t), t;
 			} finally {
-				C(!1);
+				O(!1);
 			}
-		} else L(v + 1);
+		} else W(C + 1);
 	}, [
-		u,
-		v,
-		N,
-		n,
-		r
-	]), L = t((e) => {
-		e >= 0 && e < j && (y(e), n.onStepChange && n.onStepChange(e));
-	}, [j, n]), ee = t(() => {
-		L(v - 1);
-	}, [v, L]), R = t(() => {
-		n.onCancel && n.onCancel();
-	}, [n]), z = t((e) => {
-		(n.allowSkip || b.has(e) || e <= v) && L(e);
+		p,
+		C,
+		B,
+		e,
+		r,
+		ee,
+		s,
+		g
+	]), W = n((t) => {
+		t >= 0 && t < R && (w(t), e.onStepChange && e.onStepChange(t));
+	}, [R, e]), G = n(() => {
+		W(C - 1);
+	}, [C, W]), te = n(() => {
+		e.onCancel && e.onCancel();
+	}, [e]), ne = n((t) => {
+		(e.allowSkip || T.has(t) || t <= C) && W(t);
 	}, [
-		n.allowSkip,
-		b,
-		v,
-		L
+		e.allowSkip,
+		T,
+		C,
+		W
 	]);
-	if (g) return /* @__PURE__ */ Z("div", {
+	if (x) return /* @__PURE__ */ Q("div", {
 		className: "p-4 border border-red-300 bg-red-50 rounded-md",
-		children: [/* @__PURE__ */ X("h3", {
+		children: [/* @__PURE__ */ Z("h3", {
 			className: "text-red-800 font-semibold",
 			children: "Error loading form"
-		}), /* @__PURE__ */ X("p", {
+		}), /* @__PURE__ */ Z("p", {
 			className: "text-red-600 text-sm mt-1",
-			children: g.message
+			children: x.message
 		})]
 	});
-	if (p) return /* @__PURE__ */ Z("div", {
+	if (y) return /* @__PURE__ */ Q("div", {
 		className: "p-8 text-center",
-		children: [/* @__PURE__ */ X("div", { className: "inline-block animate-spin rounded-full h-8 w-8 border-b-2 border-gray-900" }), /* @__PURE__ */ X("p", {
+		children: [/* @__PURE__ */ Z("div", { className: "inline-block animate-spin rounded-full h-8 w-8 border-b-2 border-gray-900" }), /* @__PURE__ */ Z("p", {
 			className: "mt-2 text-sm text-gray-600",
 			children: "Loading form..."
 		})]
 	});
-	if (w) return /* @__PURE__ */ X("div", {
-		className: G("w-full", i, n.className),
-		children: /* @__PURE__ */ Z("div", {
+	if (j) return /* @__PURE__ */ Z("div", {
+		className: q("w-full", i, e.className),
+		children: /* @__PURE__ */ Q("div", {
 			className: "rounded-md border bg-card p-8 text-center",
-			children: [/* @__PURE__ */ X("h3", {
+			children: [/* @__PURE__ */ Z("h3", {
 				className: "text-lg font-semibold",
-				children: w.title ?? "Thanks!"
-			}), w.message && /* @__PURE__ */ X("p", {
+				children: j.title ?? "Thanks!"
+			}), j.message && /* @__PURE__ */ Z("p", {
 				className: "mt-2 text-sm text-muted-foreground",
-				children: w.message
+				children: j.message
 			})]
 		})
 	});
-	let B = n.sections[v];
-	return /* @__PURE__ */ Z("div", {
-		className: G("w-full", i, n.className),
+	let K = e.sections[C], re = (e) => typeof e == "number" && e > 0 ? Math.min(Math.floor(e), 4) : void 0, Y = re(e.columns) ?? re(K?.columns) ?? 1, ae = Le(Y);
+	return /* @__PURE__ */ Q("div", {
+		className: q("w-full @container", i, e.className),
 		children: [
-			n.showStepIndicator !== !1 && /* @__PURE__ */ X("nav", {
+			e.showStepIndicator !== !1 && /* @__PURE__ */ Z("nav", {
 				"aria-label": "Progress",
 				className: "mb-8",
-				children: /* @__PURE__ */ X("ol", {
+				children: /* @__PURE__ */ Z("ol", {
 					className: "flex items-center",
-					children: n.sections.map((e, t) => {
-						let r = t === v, i = b.has(t), a = n.allowSkip || i || t <= v;
-						return /* @__PURE__ */ Z("li", {
-							className: G("relative flex-1", t !== j - 1 && "pr-8 sm:pr-12"),
-							children: [t !== j - 1 && /* @__PURE__ */ X("div", {
+					children: e.sections.map((t, n) => {
+						let r = n === C, i = T.has(n), a = e.allowSkip || i || n <= C, o = k.has(n);
+						return /* @__PURE__ */ Q("li", {
+							className: q("relative flex-1", n !== R - 1 && "pr-8 sm:pr-12"),
+							children: [n !== R - 1 && /* @__PURE__ */ Z("div", {
 								className: "absolute top-3 sm:top-4 left-6 -right-4 sm:left-10 sm:-right-2 h-0.5",
 								"aria-hidden": "true",
-								children: /* @__PURE__ */ X("div", { className: G("h-full", i ? "bg-primary" : "bg-muted") })
-							}), /* @__PURE__ */ Z("button", {
+								children: /* @__PURE__ */ Z("div", { className: q("h-full", i ? "bg-primary" : "bg-muted") })
+							}), /* @__PURE__ */ Q("button", {
 								type: "button",
-								className: G("group relative flex items-center", a ? "cursor-pointer" : "cursor-not-allowed"),
-								onClick: () => z(t),
+								className: q("group relative flex items-center", a ? "cursor-pointer" : "cursor-not-allowed"),
+								onClick: () => ne(n),
 								disabled: !a,
-								children: [/* @__PURE__ */ X("span", {
-									className: G("flex h-6 w-6 sm:h-8 sm:w-8 items-center justify-center rounded-full text-xs sm:text-sm font-medium transition-colors", i && "bg-primary text-primary-foreground", r && !i && "border-2 border-primary bg-background text-primary", !r && !i && "border-2 border-muted bg-background text-muted-foreground"),
-									children: i ? /* @__PURE__ */ X(q, { className: "h-3 w-3 sm:h-4 sm:w-4" }) : t + 1
-								}), /* @__PURE__ */ X("span", {
+								"data-testid": `wizard-step:${t.name || n}`,
+								"data-error": o || void 0,
+								children: [/* @__PURE__ */ Z("span", {
+									className: q("flex h-6 w-6 sm:h-8 sm:w-8 items-center justify-center rounded-full text-xs sm:text-sm font-medium transition-colors", o && "border-2 border-destructive bg-background text-destructive", !o && i && "bg-primary text-primary-foreground", !o && r && !i && "border-2 border-primary bg-background text-primary", !o && !r && !i && "border-2 border-muted bg-background text-muted-foreground"),
+									children: o ? /* @__PURE__ */ Z(ie, {
+										className: "h-3 w-3 sm:h-4 sm:w-4",
+										"aria-hidden": !0
+									}) : i ? /* @__PURE__ */ Z(oe, { className: "h-3 w-3 sm:h-4 sm:w-4" }) : n + 1
+								}), /* @__PURE__ */ Z("span", {
 									className: "ml-2 sm:ml-3 text-xs sm:text-sm font-medium hidden sm:block",
-									children: /* @__PURE__ */ X("span", {
-										className: G(r ? "text-foreground" : "text-muted-foreground"),
-										children: e.label || `Step ${t + 1}`
+									children: /* @__PURE__ */ Z("span", {
+										className: q(o ? "text-destructive" : r ? "text-foreground" : "text-muted-foreground"),
+										children: t.label || `Step ${n + 1}`
 									})
 								})]
 							})]
-						}, t);
+						}, n);
 					})
 				})
 			}),
-			/* @__PURE__ */ X("div", {
+			/* @__PURE__ */ Z("div", {
 				className: "min-h-[200px]",
-				children: B && /* @__PURE__ */ X($, {
-					label: B.label,
-					description: B.description,
+				children: K && /* @__PURE__ */ Z(Ke, {
+					label: K.label,
+					description: K.description,
 					columns: 1,
-					className: B.className,
-					gridClassName: B.gridClassName,
-					children: F.length > 0 ? /* @__PURE__ */ X(d, { schema: {
+					className: K.className,
+					gridClassName: K.gridClassName,
+					children: H.length > 0 ? /* @__PURE__ */ Z(m, { schema: {
 						type: "form",
-						objectName: n.objectName,
-						id: E,
-						...Re(F, B.columns || 1),
+						objectName: e.objectName,
+						id: P,
+						fields: Y > 1 ? je(H, Y, re(K.columns)) : H,
+						columns: Y,
+						...ae ? { fieldContainerClass: ae } : {},
 						layout: "vertical",
-						defaultValues: u,
+						defaultValues: p,
 						showSubmit: !1,
 						showCancel: !1,
-						onSubmit: I
-					} }, D) : /* @__PURE__ */ X("div", {
-						className: "text-center py-8 text-muted-foreground",
-						children: "No fields configured for this step"
+						onSubmit: U
+					} }, F) : /* @__PURE__ */ Z("form", {
+						id: P,
+						onSubmit: (e) => {
+							e.preventDefault(), U({});
+						},
+						children: /* @__PURE__ */ Z("div", {
+							className: "text-center py-8 text-muted-foreground",
+							children: "No fields configured for this step"
+						})
 					})
 				})
 			}),
-			/* @__PURE__ */ Z("div", {
+			/* @__PURE__ */ Q("div", {
 				className: "flex items-center justify-between mt-6 pt-4 border-t",
-				children: [/* @__PURE__ */ X("div", { children: n.showCancel !== !1 && /* @__PURE__ */ X(k, {
+				children: [/* @__PURE__ */ Z("div", { children: e.showCancel !== !1 && /* @__PURE__ */ Z(M, {
 					variant: "ghost",
-					onClick: R,
-					children: n.cancelText || "Cancel"
-				}) }), /* @__PURE__ */ Z("div", {
+					onClick: te,
+					children: e.cancelText || "Cancel"
+				}) }), /* @__PURE__ */ Q("div", {
 					className: "flex items-center gap-2",
 					children: [
-						/* @__PURE__ */ Z("span", {
+						/* @__PURE__ */ Q("span", {
 							className: "text-sm text-muted-foreground mr-2",
 							children: [
 								"Step ",
-								v + 1,
+								C + 1,
 								" of ",
-								j
+								R
 							]
 						}),
-						!M && /* @__PURE__ */ Z(k, {
+						!z && /* @__PURE__ */ Q(M, {
 							variant: "outline",
-							onClick: ee,
-							children: [/* @__PURE__ */ X(fe, { className: "h-4 w-4 mr-1" }), n.prevText || "Back"]
+							onClick: G,
+							children: [/* @__PURE__ */ Z(le, { className: "h-4 w-4 mr-1" }), e.prevText || "Back"]
 						}),
-						N ? /* @__PURE__ */ Z(k, {
+						B ? /* @__PURE__ */ Q(M, {
 							type: "submit",
-							form: E,
-							disabled: S || n.mode === "view",
-							children: [S && /* @__PURE__ */ X(me, {
+							form: P,
+							disabled: D || e.mode === "view",
+							children: [D && /* @__PURE__ */ Z(ue, {
 								className: "mr-2 h-4 w-4 animate-spin",
 								"aria-hidden": !0
-							}), S ? "Submitting..." : n.submitText || (n.mode === "create" ? "Create" : "Update")]
-						}) : /* @__PURE__ */ Z(k, {
+							}), D ? "Submitting..." : e.submitText || (e.mode === "create" ? "Create" : "Update")]
+						}) : /* @__PURE__ */ Q(M, {
 							type: "submit",
-							form: E,
-							children: [n.nextText || "Next", /* @__PURE__ */ X(pe, { className: "h-4 w-4 ml-1" })]
+							form: P,
+							children: [e.nextText || "Next", /* @__PURE__ */ Z(X, { className: "h-4 w-4 ml-1" })]
 						})
 					]
 				})]
-			})
+			}),
+			_
 		]
 	});
-}, Ue = ({ schema: e, dataSource: n, className: i }) => {
-	let { fieldLabel: o } = h(), [c, l] = s(null), [u, f] = s({}), [p, m] = s(!0), [g, _] = s(null);
-	r(() => {
+}, Xe = ({ schema: e, dataSource: t, className: r }) => {
+	let { fieldLabel: a } = v(), [l, u] = c(null), [d, f] = c({}), { saveWithOcc: p, conflictDialog: h } = We(), [g, _] = c(!0), [y, b] = c(null);
+	i(() => {
 		(async () => {
-			if (!n) {
-				m(!1);
+			if (!t) {
+				_(!1);
 				return;
 			}
 			try {
-				let t = await n.getObjectSchema(e.objectName);
-				l(t);
+				let n = await t.getObjectSchema(e.objectName);
+				u(n);
 			} catch (e) {
-				_(e), m(!1);
+				b(e), _(!1);
 			}
 		})();
-	}, [e.objectName, n]), r(() => {
-		(c || !n) && (async () => {
+	}, [e.objectName, t]);
+	let x = s(void 0);
+	i(() => {
+		let n = !1;
+		return (l || !t) && (async () => {
 			if (e.mode === "create" || !e.recordId) {
-				f(e.initialData || e.initialValues || {}), m(!1);
+				f(e.initialData || e.initialValues || {}), _(!1);
 				return;
 			}
-			if (!n) {
-				f(e.initialData || e.initialValues || {}), m(!1);
+			if (!t) {
+				f(e.initialData || e.initialValues || {}), _(!1);
 				return;
 			}
+			x.current !== e.recordId && _(!0);
 			try {
-				let t = await n.findOne(e.objectName, e.recordId);
-				f(t || {});
+				let r = await t.findOne(e.objectName, e.recordId);
+				if (n) return;
+				x.current = e.recordId, f(r || {});
 			} catch (e) {
-				_(e);
+				if (n) return;
+				b(e);
 			} finally {
-				m(!1);
+				n || _(!1);
 			}
-		})();
+		})(), () => {
+			n = !0;
+		};
 	}, [
-		c,
+		l,
 		e.mode,
 		e.recordId,
 		e.initialData,
 		e.initialValues,
-		n,
+		t,
 		e.objectName
 	]);
-	let v = t((t) => Se(t, {
-		objectSchema: c,
+	let S = n((t) => Se(t, {
+		objectSchema: l,
 		objectName: e.objectName,
 		readOnly: e.readOnly,
 		mode: e.mode,
-		fieldLabel: o
+		fieldLabel: a
 	}), [
-		c,
+		l,
 		e.readOnly,
 		e.mode,
 		e.objectName,
-		o
-	]), y = t(async (t) => {
-		if (!n) return e.onSuccess && await e.onSuccess(t), t;
+		a
+	]), C = n(async (n) => {
+		if (!t) return e.onSuccess && await e.onSuccess(n), n;
 		try {
 			let r;
-			return e.mode === "create" ? r = await n.create(e.objectName, t) : e.mode === "edit" && e.recordId && (r = await n.update(e.objectName, e.recordId, t)), e.onSuccess && await e.onSuccess(r), r;
+			if (e.mode === "create") r = await t.create(e.objectName, n);
+			else if (e.mode === "edit" && e.recordId) {
+				let i = await p({
+					dataSource: t,
+					objectName: e.objectName,
+					recordId: e.recordId,
+					payload: n,
+					baseRecord: d
+				});
+				if (i.status === "cancelled") return;
+				r = i.result;
+			}
+			return e.onSuccess && await e.onSuccess(r), r;
 		} catch (t) {
 			throw e.onError && e.onError(t), t;
 		}
-	}, [e, n]), b = t(() => {
+	}, [
+		e,
+		t,
+		p,
+		d
+	]), w = n(() => {
 		e.onCancel && e.onCancel();
-	}, [e]), x = a(() => e.sections.slice(0, 1), [e.sections]), S = a(() => e.sections.slice(1), [e.sections]);
-	a(() => e.sections.flatMap((e) => v(e)), [e.sections, v]);
-	let C = e.splitDirection || "horizontal", w = e.splitSize || 50;
-	if (g) return /* @__PURE__ */ Z("div", {
+	}, [e]), T = (e, t) => e.pane === "primary" || e.pane === "secondary" ? e.pane : t === 0 ? "primary" : "secondary", E = o(() => e.sections.filter((e, t) => T(e, t) === "primary"), [e.sections]), D = o(() => e.sections.filter((e, t) => T(e, t) === "secondary"), [e.sections]), O = e.splitDirection || "horizontal", k = e.splitSize || 50;
+	if (y) return /* @__PURE__ */ Q("div", {
 		className: "p-4 border border-red-300 bg-red-50 rounded-md",
-		children: [/* @__PURE__ */ X("h3", {
+		children: [/* @__PURE__ */ Z("h3", {
 			className: "text-red-800 font-semibold",
 			children: "Error loading form"
-		}), /* @__PURE__ */ X("p", {
+		}), /* @__PURE__ */ Z("p", {
 			className: "text-red-600 text-sm mt-1",
-			children: g.message
+			children: y.message
 		})]
 	});
-	if (p) return /* @__PURE__ */ Z("div", {
+	if (g) return /* @__PURE__ */ Q("div", {
 		className: "p-8 text-center",
-		children: [/* @__PURE__ */ X("div", { className: "inline-block animate-spin rounded-full h-8 w-8 border-b-2 border-gray-900" }), /* @__PURE__ */ X("p", {
+		children: [/* @__PURE__ */ Z("div", { className: "inline-block animate-spin rounded-full h-8 w-8 border-b-2 border-gray-900" }), /* @__PURE__ */ Z("p", {
 			className: "mt-2 text-sm text-gray-600",
 			children: "Loading form..."
 		})]
 	});
-	let T = {
-		type: "form",
-		objectName: e.objectName,
-		layout: "vertical",
-		defaultValues: u,
-		onSubmit: y,
-		onCancel: b
-	}, E = (t, n) => /* @__PURE__ */ X("div", {
-		className: "space-y-6 p-4",
-		children: t.map((t, r) => /* @__PURE__ */ X($, {
-			label: t.label,
-			description: t.description,
-			columns: 1,
-			className: t.className,
-			gridClassName: t.gridClassName,
-			children: /* @__PURE__ */ X(d, { schema: {
-				...T,
-				...Re(v(t), t.columns || 1),
-				showSubmit: n && e.showSubmit !== !1 && e.mode !== "view",
-				showCancel: n && e.showCancel !== !1,
-				submitLabel: e.submitText || (e.mode === "create" ? "Create" : "Update"),
-				cancelLabel: e.cancelText
-			} })
-		}, t.name || t.label || r))
-	});
-	return /* @__PURE__ */ X("div", {
-		className: G("w-full", i, e.className),
-		children: /* @__PURE__ */ Z(V, {
-			orientation: C,
-			className: "min-h-[300px] rounded-lg border",
-			children: [/* @__PURE__ */ X(B, {
-				defaultSize: w,
-				minSize: 20,
-				children: E(x, S.length === 0)
-			}), S.length > 0 && /* @__PURE__ */ Z(he, { children: [/* @__PURE__ */ X(z, { withHandle: e.splitResizable !== !1 }), /* @__PURE__ */ X(B, {
-				defaultSize: 100 - w,
-				minSize: 20,
-				children: E(S, !0)
-			})] })]
-		})
+	let A = (e) => typeof e == "number" && e > 0 ? Math.min(Math.floor(e), 4) : void 0, j = e.sections.map((e) => A(e.columns)).filter((e) => e != null), M = A(e.columns) ?? (j.length ? Math.max(...j) : 1), N = Le(M), P = (e, t) => {
+		let n = [];
+		return e.forEach((e, r) => {
+			let i = S(e);
+			i.length && ((e.label || e.description) && n.push({
+				name: `__section_${e.name || `${t}_${r}`}`,
+				label: e.label,
+				description: e.description,
+				type: "section-divider",
+				colSpan: 4,
+				className: e.className
+			}), n.push(...M > 1 ? je(i, M, A(e.columns)) : i));
+		}), n;
+	}, F = [{
+		key: "primary",
+		sections: E,
+		defaultSize: k
+	}, {
+		key: "secondary",
+		sections: D,
+		defaultSize: 100 - k
+	}].map((e) => ({
+		...e,
+		fields: P(e.sections, e.key),
+		containerClass: e.sections.length === 1 ? e.sections[0].gridClassName : void 0
+	})).filter((e) => e.fields.length > 0);
+	return /* @__PURE__ */ Q("div", {
+		className: q("w-full @container", r, e.className),
+		children: [/* @__PURE__ */ Z(m, { schema: {
+			type: "form",
+			objectName: e.objectName,
+			fields: F.flatMap((e) => e.fields),
+			columns: M,
+			...N ? { fieldContainerClass: N } : {},
+			layout: "vertical",
+			defaultValues: d,
+			submitLabel: e.submitText || (e.mode === "create" ? "Create" : "Update"),
+			cancelLabel: e.cancelText,
+			showSubmit: e.showSubmit !== !1 && e.mode !== "view",
+			showCancel: e.showCancel !== !1,
+			onSubmit: C,
+			onCancel: w,
+			fieldPanes: F.map((e) => ({
+				key: e.key,
+				fields: e.fields.map((e) => e.name),
+				defaultSize: e.defaultSize,
+				...e.containerClass ? { containerClass: e.containerClass } : {}
+			})),
+			fieldPanesOrientation: O,
+			fieldPanesResizable: e.splitResizable !== !1
+		} }), h]
 	});
-}, We = /* @__PURE__ */ new Set([
+}, Ze = /* @__PURE__ */ new Set([
 	"id",
 	"_id",
 	"created_at",
@@ -763,7 +943,7 @@ var Ve = ({ schema: n, dataSource: r, className: i }) => {
 	"updatedAt",
 	"organization_id",
 	"organizationId"
-]), Ge = /* @__PURE__ */ new Set([
+]), Qe = /* @__PURE__ */ new Set([
 	"formula",
 	"summary",
 	"rollup",
@@ -772,15 +952,15 @@ var Ve = ({ schema: n, dataSource: r, className: i }) => {
 	"autonumber",
 	"computed"
 ]);
-function Ke(e, t) {
+function $e(e, t) {
 	if (!e || typeof e != "object") return e;
 	let n = {}, r = t?.fields;
-	for (let [t, i] of Object.entries(e)) if (!We.has(t)) {
+	for (let [t, i] of Object.entries(e)) if (!Ze.has(t)) {
 		if (r) {
 			let e = r[t];
 			if (!e) continue;
 			let n = String(e.type || "").toLowerCase();
-			if (Ge.has(n) || e.computed === !0 || e.formula || e.readOnly === !0 || e.readonly === !0) continue;
+			if (Qe.has(n) || e.computed === !0 || e.formula || e.readOnly === !0 || e.readonly === !0) continue;
 		}
 		n[t] = i;
 	}
@@ -788,31 +968,31 @@ function Ke(e, t) {
 }
 //#endregion
 //#region src/masterDetailTx.ts
-var qe = (e) => e == null ? void 0 : e.id ?? e._id ?? e.recordId, Je = (e, t) => t ? Ke(e, t) : e, Ye = /* @__PURE__ */ new Set([
+var et = (e) => e == null ? void 0 : e.id ?? e._id ?? e.recordId, tt = (e, t) => t ? $e(e, t) : e, nt = /* @__PURE__ */ new Set([
 	"id",
 	"_id",
 	"recordId"
 ]);
-function Xe(e, t) {
-	return !e || Object.entries(e).every(([e, n]) => e === t || Ye.has(e) ? !0 : n == null || n === "");
+function rt(e, t) {
+	return !e || Object.entries(e).every(([e, n]) => e === t || nt.has(e) ? !0 : n == null || n === "");
 }
-function Ze(e, t, n) {
+function it(e, t, n) {
 	let r = [{
 		object: e,
 		action: "create",
 		data: t
 	}];
-	for (let e of n) for (let t of e.rows) Xe(t, e.relationshipField) || r.push({
+	for (let e of n) for (let t of e.rows) rt(t, e.relationshipField) || r.push({
 		object: e.childObject,
 		action: "create",
 		data: {
-			...Je(t, e.childSchema),
+			...tt(t, e.childSchema),
 			[e.relationshipField]: { $ref: 0 }
 		}
 	});
 	return r;
 }
-function Qe(e, t, n, r) {
+function at(e, t, n, r) {
 	let i = [{
 		object: e,
 		action: "update",
@@ -823,21 +1003,21 @@ function Qe(e, t, n, r) {
 		let n = (e.rows || []).map((n) => ({
 			...n,
 			[e.relationshipField]: t
-		})), { toCreate: r, toUpdate: a, toDelete: o } = $e(e.original || [], n);
+		})), { toCreate: r, toUpdate: a, toDelete: o } = ot(e.original || [], n);
 		for (let t of r) {
-			if (Xe(t, e.relationshipField)) continue;
+			if (rt(t, e.relationshipField)) continue;
 			let { id: n, _id: r, recordId: a, ...o } = t;
 			i.push({
 				object: e.childObject,
 				action: "create",
-				data: Je(o, e.childSchema)
+				data: tt(o, e.childSchema)
 			});
 		}
 		for (let t of a) i.push({
 			object: e.childObject,
 			action: "update",
-			id: qe(t),
-			data: Je(t, e.childSchema)
+			id: et(t),
+			data: tt(t, e.childSchema)
 		});
 		for (let t of o) i.push({
 			object: e.childObject,
@@ -847,15 +1027,15 @@ function Qe(e, t, n, r) {
 	}
 	return i;
 }
-function $e(e, t) {
-	let n = new Set(t.map(qe).filter(Boolean));
+function ot(e, t) {
+	let n = new Set(t.map(et).filter(Boolean));
 	return {
-		toCreate: t.filter((e) => !qe(e)),
-		toUpdate: t.filter((e) => qe(e)),
-		toDelete: (e || []).map(qe).filter((e) => !!e && !n.has(e))
+		toCreate: t.filter((e) => !et(e)),
+		toUpdate: t.filter((e) => et(e)),
+		toDelete: (e || []).map(et).filter((e) => !!e && !n.has(e))
 	};
 }
-function et(e, t) {
+function st(e, t) {
 	return Array.isArray(e) ? e.reduce((e, n) => {
 		let r = Number(n?.[t]);
 		return e + (Number.isFinite(r) ? r : 0);
@@ -863,7 +1043,7 @@ function et(e, t) {
 }
 //#endregion
 //#region src/deriveMasterDetail.ts
-var tt = /* @__PURE__ */ new Set([
+var ct = /* @__PURE__ */ new Set([
 	"id",
 	"_id",
 	"recordId",
@@ -879,14 +1059,14 @@ var tt = /* @__PURE__ */ new Set([
 	"tenant_id",
 	"space",
 	"owner"
-]), nt = /* @__PURE__ */ new Set([
+]), lt = /* @__PURE__ */ new Set([
 	"position",
 	"sort_order",
 	"sequence",
 	"line_no",
 	"line_number",
 	"sort"
-]), rt = /* @__PURE__ */ new Set([
+]), ut = /* @__PURE__ */ new Set([
 	"formula",
 	"summary",
 	"rollup",
@@ -902,7 +1082,7 @@ var tt = /* @__PURE__ */ new Set([
 	"markdown",
 	"richtext"
 ]);
-function it(e) {
+function dt(e) {
 	switch (e) {
 		case "number":
 		case "percent":
@@ -925,11 +1105,11 @@ function it(e) {
 		default: return "text";
 	}
 }
-var at = /* @__PURE__ */ new Set(["image", "avatar"]);
-function ot(e, t) {
-	e.multiple == null && t?.multiple && (e.multiple = !0), e.accept ?? (Array.isArray(t?.accept) && t.accept.length > 0 ? e.accept = t.accept : at.has(t?.type) && (e.accept = ["image/*"]));
+var ft = /* @__PURE__ */ new Set(["image", "avatar"]);
+function pt(e, t) {
+	e.multiple == null && t?.multiple && (e.multiple = !0), e.accept ?? (Array.isArray(t?.accept) && t.accept.length > 0 ? e.accept = t.accept : ft.has(t?.type) && (e.accept = ["image/*"]));
 }
-function st(e) {
+function mt(e) {
 	if (e?.type === "boolean" || e?.type === "toggle") return [{
 		label: "Yes",
 		value: "true"
@@ -946,7 +1126,7 @@ function st(e) {
 		value: String(e)
 	});
 }
-function ct(e, t) {
+function ht(e, t) {
 	let n = e?.fields;
 	if (!n || typeof n != "object") return;
 	let r;
@@ -959,7 +1139,7 @@ function ct(e, t) {
 	}
 	return r;
 }
-var lt = [
+var gt = [
 	"name",
 	"title",
 	"subject",
@@ -967,7 +1147,7 @@ var lt = [
 	"full_name",
 	"display_name",
 	"code"
-], ut = {
+], _t = {
 	select: 0,
 	currency: 1,
 	number: 1,
@@ -975,15 +1155,18 @@ var lt = [
 	date: 3,
 	text: 4
 };
-function dt(e, t) {
+function vt(e) {
+	return (e.type ? _t[e.type] : void 0) ?? 5;
+}
+function yt(e, t) {
 	if (t <= 0 || e.length <= t) return e;
-	let n = /* @__PURE__ */ new Set(), r = e.find((e) => lt.includes(e.field)) ?? e[0];
+	let n = /* @__PURE__ */ new Set(), r = e.find((e) => gt.includes(e.field)) ?? e[0];
 	r && n.add(r.field);
 	for (let t of e) t.required && n.add(t.field);
 	let i = e.map((e, t) => ({
 		c: e,
 		i: t
-	})).filter(({ c: e }) => !n.has(e.field)).sort((e, t) => (ut[e.c.type] ?? 5) - (ut[t.c.type] ?? 5) || e.i - t.i);
+	})).filter(({ c: e }) => !n.has(e.field)).sort((e, t) => vt(e.c) - vt(t.c) || e.i - t.i);
 	for (let { c: e } of i) {
 		if (n.size >= t) break;
 		n.add(e.field);
@@ -993,60 +1176,60 @@ function dt(e, t) {
 		defaultHidden: !0
 	});
 }
-function ft(e, t = {}) {
+function bt(e, t = {}) {
 	let n = e?.fields;
 	if (!n || typeof n != "object") return [];
 	let r = /* @__PURE__ */ new Set([...t.exclude ?? [], ...t.relationshipField ? [t.relationshipField] : []]), i = [];
 	for (let [e, t] of Object.entries(n)) {
 		let n = t;
-		if (tt.has(e) || r.has(e) || nt.has(e) || n?.system || n?.readonly || n?.hidden || rt.has(n?.type)) continue;
+		if (ct.has(e) || r.has(e) || lt.has(e) || n?.system || n?.readonly || n?.hidden || ut.has(n?.type)) continue;
 		let a = {
 			field: e,
 			label: n?.label || e,
-			type: it(n?.type),
+			type: dt(n?.type),
 			required: !!n?.required
-		}, o = st(n);
-		a.type === "select" && o && (a.options = o), a.type === "lookup" && (a.reference = n?.reference, a.displayField = n?.display_field || n?.reference_field), a.type === "file" && ot(a, n), n?.readonlyWhen && (a.readonlyWhen = n.readonlyWhen), (n?.requiredWhen ?? n?.conditionalRequired) && (a.requiredWhen = n.requiredWhen ?? n.conditionalRequired);
+		}, o = mt(n);
+		a.type === "select" && o && (a.options = o), a.type === "lookup" && (a.reference = n?.reference, a.displayField = n?.display_field || n?.reference_field), a.type === "file" && pt(a, n), n?.readonlyWhen && (a.readonlyWhen = n.readonlyWhen), n?.requiredWhen && (a.requiredWhen = n.requiredWhen);
 		let s = typeof n?.expression == "string" ? n.expression : n?.expression?.source;
 		s && typeof s == "string" && (a.computed = !0, a.expr = s, a.required = !1, typeof n?.scale == "number" && (a.scale = n.scale)), i.push(a);
 	}
-	return dt(i, t.maxColumns ?? 6);
+	return yt(i, t.maxColumns ?? 6);
 }
-function pt(e, t) {
+function xt(e, t) {
 	let n = e ?? [], r = t?.fields;
 	return !n.length || !r || typeof r != "object" ? n : n.map((e) => {
 		if (e.type) return e;
 		let t = r[e.field];
 		if (!t) return e;
-		let n = it(t?.type), i = {
+		let n = dt(t?.type), i = {
 			...e,
 			type: n
 		};
 		i.label ??= t?.label || e.field, i.required ??= !!t?.required;
-		let a = st(t);
-		n === "select" && a && !i.options && (i.options = a), n === "lookup" && (i.reference ??= t?.reference, i.displayField ??= t?.display_field || t?.reference_field), n === "file" && ot(i, t), i.readonlyWhen == null && t?.readonlyWhen && (i.readonlyWhen = t.readonlyWhen), i.requiredWhen == null && (t?.requiredWhen ?? t?.conditionalRequired) && (i.requiredWhen = t.requiredWhen ?? t.conditionalRequired);
+		let a = mt(t);
+		n === "select" && a && !i.options && (i.options = a), n === "lookup" && (i.reference ??= t?.reference, i.displayField ??= t?.display_field || t?.reference_field), n === "file" && pt(i, t), i.readonlyWhen == null && t?.readonlyWhen && (i.readonlyWhen = t.readonlyWhen), i.requiredWhen == null && t?.requiredWhen && (i.requiredWhen = t.requiredWhen);
 		let o = typeof t?.expression == "string" ? t.expression : t?.expression?.source;
 		return !i.computed && o && typeof o == "string" && (i.computed = !0, i.expr = o, i.required = !1, typeof t?.scale == "number" && (i.scale = t.scale)), i;
 	});
 }
-var mt = /* @__PURE__ */ new Set([
+var St = /* @__PURE__ */ new Set([
 	"formula",
 	"summary",
 	"rollup",
 	"autonumber",
 	"auto_number"
 ]);
-function ht(e, t = {}) {
+function Ct(e, t = {}) {
 	let n = e?.fields;
 	if (!n || typeof n != "object") return [];
 	let r = /* @__PURE__ */ new Set([...t.exclude ?? [], ...t.relationshipField ? [t.relationshipField] : []]), i = [];
 	for (let [e, t] of Object.entries(n)) {
 		let n = t;
-		tt.has(e) || r.has(e) || nt.has(e) || n?.system || n?.hidden || mt.has(n?.type) || i.push(e);
+		ct.has(e) || r.has(e) || lt.has(e) || n?.system || n?.hidden || St.has(n?.type) || i.push(e);
 	}
 	return i;
 }
-var gt = /* @__PURE__ */ new Set([
+var wt = /* @__PURE__ */ new Set([
 	"textarea",
 	"richtext",
 	"html",
@@ -1055,17 +1238,17 @@ var gt = /* @__PURE__ */ new Set([
 	"json",
 	"location",
 	"address"
-]), _t = /* @__PURE__ */ new Set([
+]), Tt = /* @__PURE__ */ new Set([
 	"file",
 	"image",
 	"avatar"
 ]);
-function vt(e, t, n = {}) {
+function Et(e, t, n = {}) {
 	if (t === "grid" || t === "form") return t;
-	let r = e?.fields ?? {}, i = ht(e, { relationshipField: n.relationshipField });
-	return i.some((e) => gt.has(r[e]?.type)) || i.filter((e) => _t.has(r[e]?.type)).length >= 2 || i.length > 8 ? "form" : "grid";
+	let r = e?.fields ?? {}, i = Ct(e, { relationshipField: n.relationshipField });
+	return i.some((e) => wt.has(r[e]?.type)) || i.filter((e) => Tt.has(r[e]?.type)).length >= 2 || i.length > 8 ? "form" : "grid";
 }
-var yt = [
+var Dt = [
 	"amount",
 	"total",
 	"subtotal",
@@ -1073,33 +1256,33 @@ var yt = [
 	"line_amount",
 	"net_amount"
 ];
-function bt(e) {
+function Ot(e) {
 	let t = e.filter((e) => e.type === "number" || e.type === "currency");
 	if (t.length === 0) return;
 	let n = t.find((e) => e.computed);
 	if (n) return n.field;
-	let r = t.find((e) => yt.includes(e.field));
+	let r = t.find((e) => Dt.includes(e.field));
 	if (r) return r.field;
 	let i = [...t].reverse().find((e) => e.type === "currency");
 	return i ? i.field : t[t.length - 1].field;
 }
-function xt(e, t, n, r = {}) {
-	let i = r.relationshipField || ct(t, n);
+function kt(e, t, n, r = {}) {
+	let i = r.relationshipField || ht(t, n);
 	if (!i) throw Error(`MasterDetailForm: could not find a lookup/master_detail field on "${e}" referencing "${n}". Set relationshipField explicitly.`);
-	let a = r.columns?.length ? pt(r.columns, t) : ft(t, { relationshipField: i }), o = r.amountField || bt(a);
+	let a = r.columns?.length ? xt(r.columns, t) : bt(t, { relationshipField: i }), o = r.amountField || Ot(a);
 	return {
 		childObject: e,
 		relationshipField: i,
 		columns: a,
-		formFields: ht(t, { relationshipField: i }),
-		mode: vt(t, r.inlineEdit ?? (t?.fields)?.[i]?.inlineEdit, { relationshipField: i }),
+		formFields: Ct(t, { relationshipField: i }),
+		mode: Et(t, r.inlineEdit ?? (t?.fields)?.[i]?.inlineEdit, { relationshipField: i }),
 		amountField: o,
-		sortField: Object.keys(t?.fields ?? {}).find((e) => nt.has(e))
+		sortField: Object.keys(t?.fields ?? {}).find((e) => lt.has(e))
 	};
 }
 //#endregion
 //#region src/MasterDetailForm.tsx
-function St(e) {
+function At(e) {
 	if (!e) return {};
 	let t = {};
 	return e.querySelectorAll("[name]").forEach((e) => {
@@ -1131,13 +1314,13 @@ function St(e) {
 		}
 	}), t;
 }
-var Ct = ({ details: e, state: t, setRows: n, formHostRef: i, taxRateField: a, formKey: c, onRowExpand: l, onAddViaForm: u }) => {
-	let [d, f] = s({}), p = o("");
-	r(() => {
-		let e = i.current;
+var jt = ({ details: e, state: t, setRows: n, formHostRef: r, taxRateField: a, formKey: o, onRowExpand: l, onAddViaForm: u }) => {
+	let [d, f] = c({}), p = s("");
+	i(() => {
+		let e = r.current;
 		if (!e) return;
 		let t = () => {
-			let t = St(e), n;
+			let t = At(e), n;
 			try {
 				n = JSON.stringify(t);
 			} catch {
@@ -1148,29 +1331,29 @@ var Ct = ({ details: e, state: t, setRows: n, formHostRef: i, taxRateField: a, f
 		t();
 		let n = () => t();
 		e.addEventListener("input", n), e.addEventListener("change", n);
-		let r = [
+		let i = [
 			120,
 			360,
 			800
 		].map((e) => setTimeout(t, e));
 		return () => {
-			e.removeEventListener("input", n), e.removeEventListener("change", n), r.forEach(clearTimeout);
+			e.removeEventListener("input", n), e.removeEventListener("change", n), i.forEach(clearTimeout);
 		};
 	}, [
-		i,
-		c,
+		r,
+		o,
 		e.length
 	]);
-	let m = d[a], h = m === void 0 ? null : Number.isFinite(Number(m)) ? Number(m) : 0, g = e.reduce((e, n, r) => e + et(t[r]?.rows ?? [], n.amountField || "amount"), 0), v = h !== null && e.some((e) => !!e.amountField), y = h ?? 0, b = y / 100 * g, x = g + b, S = (e) => `¥${e.toLocaleString(void 0, {
+	let m = d[a], h = m === void 0 ? null : Number.isFinite(Number(m)) ? Number(m) : 0, g = e.reduce((e, n, r) => e + st(t[r]?.rows ?? [], n.amountField || "amount"), 0), _ = h !== null && e.some((e) => !!e.amountField), v = h ?? 0, y = v / 100 * g, x = g + y, S = (e) => `¥${e.toLocaleString(void 0, {
 		minimumFractionDigits: 2,
 		maximumFractionDigits: 2
 	})}`;
-	return /* @__PURE__ */ Z(he, { children: [e.map((e, r) => /* @__PURE__ */ Z("section", {
+	return /* @__PURE__ */ Q(me, { children: [e.map((e, r) => /* @__PURE__ */ Q("section", {
 		className: "space-y-2",
-		children: [/* @__PURE__ */ X("h3", {
+		children: [/* @__PURE__ */ Z("h3", {
 			className: "text-sm font-medium text-foreground",
 			children: e.title || "Line Items"
-		}), e.columns?.length ? /* @__PURE__ */ X(_, {
+		}), e.columns?.length ? /* @__PURE__ */ Z(b, {
 			value: t[r]?.rows ?? [],
 			onChange: (e) => n(r, e),
 			contextRecord: d,
@@ -1179,51 +1362,51 @@ var Ct = ({ details: e, state: t, setRows: n, formHostRef: i, taxRateField: a, f
 			...e.inlineMode === "form" ? { onAdd: () => u(r) } : {},
 			field: {
 				columns: e.columns,
-				total_field: v ? void 0 : e.amountField || (e.totalField ? "amount" : void 0),
+				total_field: _ ? void 0 : e.amountField || (e.totalField ? "amount" : void 0),
 				sort_field: e.sortField,
 				min_rows: e.minRows,
 				max_rows: e.maxRows,
 				add_label: e.inlineMode === "form" ? e.addLabel || "Add" : e.addLabel
 			}
-		}) : /* @__PURE__ */ X("p", {
+		}) : /* @__PURE__ */ Z("p", {
 			className: "py-4 text-sm text-muted-foreground",
 			children: "Loading columns…"
 		})]
-	}, `${e.childObject}-${r}`)), v && /* @__PURE__ */ X("div", {
+	}, `${e.childObject}-${r}`)), _ && /* @__PURE__ */ Z("div", {
 		className: "flex justify-end",
-		children: /* @__PURE__ */ Z("dl", {
+		children: /* @__PURE__ */ Q("dl", {
 			className: "w-64 space-y-1.5 text-sm",
 			"data-testid": "md-totals",
 			children: [
-				/* @__PURE__ */ Z("div", {
+				/* @__PURE__ */ Q("div", {
 					className: "flex items-center justify-between",
-					children: [/* @__PURE__ */ X("dt", {
+					children: [/* @__PURE__ */ Z("dt", {
 						className: "text-muted-foreground",
 						children: "Subtotal"
-					}), /* @__PURE__ */ X("dd", {
+					}), /* @__PURE__ */ Z("dd", {
 						className: "tabular-nums",
 						"data-testid": "md-subtotal",
 						children: S(g)
 					})]
 				}),
-				/* @__PURE__ */ Z("div", {
+				/* @__PURE__ */ Q("div", {
 					className: "flex items-center justify-between",
-					children: [/* @__PURE__ */ Z("dt", {
+					children: [/* @__PURE__ */ Q("dt", {
 						className: "text-muted-foreground",
 						children: [
 							"Tax (",
-							y,
+							v,
 							"%)"
 						]
-					}), /* @__PURE__ */ X("dd", {
+					}), /* @__PURE__ */ Z("dd", {
 						className: "tabular-nums",
 						"data-testid": "md-tax",
-						children: S(b)
+						children: S(y)
 					})]
 				}),
-				/* @__PURE__ */ Z("div", {
+				/* @__PURE__ */ Q("div", {
 					className: "flex items-center justify-between border-t border-border pt-1.5 text-base font-semibold",
-					children: [/* @__PURE__ */ X("dt", { children: "Total" }), /* @__PURE__ */ X("dd", {
+					children: [/* @__PURE__ */ Z("dt", { children: "Total" }), /* @__PURE__ */ Z("dd", {
 						className: "tabular-nums",
 						"data-testid": "md-grand-total",
 						children: S(x)
@@ -1232,96 +1415,96 @@ var Ct = ({ details: e, state: t, setRows: n, formHostRef: i, taxRateField: a, f
 			]
 		})
 	})] });
-}, wt = ({ schema: e, dataSource: n, className: i }) => {
-	let c = e.details || [], l = e.mode === "edit" && !!e.recordId, d = c.some((e) => !e.relationshipField || !e.columns?.length || e.columns.some((e) => !e.type)), [f, p] = s(d ? null : c), m = f ?? c;
-	r(() => {
-		if (!d) {
-			p(c);
+}, Mt = ({ schema: e, dataSource: t, className: r }) => {
+	let a = e.details || [], l = e.mode === "edit" && !!e.recordId, u = a.some((e) => !e.relationshipField || !e.columns?.length || e.columns.some((e) => !e.type)), [d, f] = c(u ? null : a), m = d ?? a;
+	i(() => {
+		if (!u) {
+			f(a);
 			return;
 		}
-		if (!n || typeof n.getObjectSchema != "function") return;
-		let t = !1;
+		if (!t || typeof t.getObjectSchema != "function") return;
+		let n = !1;
 		return (async () => {
-			let r = await Promise.all(c.map(async (t) => {
-				let r = t.columns?.length ? t.columns.every((e) => !!e.type) : !1;
-				if (t.relationshipField && r) return t;
+			let r = await Promise.all(a.map(async (n) => {
+				let r = n.columns?.length ? n.columns.every((e) => !!e.type) : !1;
+				if (n.relationshipField && r) return n;
 				try {
-					let r = await n.getObjectSchema(t.childObject);
-					if (t.relationshipField && t.columns?.length) return {
-						...t,
-						columns: pt(t.columns, r)
+					let r = await t.getObjectSchema(n.childObject);
+					if (n.relationshipField && n.columns?.length) return {
+						...n,
+						columns: xt(n.columns, r)
 					};
-					let i = xt(t.childObject, r, e.objectName, {
-						relationshipField: t.relationshipField,
-						columns: t.columns,
-						amountField: t.amountField
+					let i = kt(n.childObject, r, e.objectName, {
+						relationshipField: n.relationshipField,
+						columns: n.columns,
+						amountField: n.amountField
 					});
 					return {
-						...t,
+						...n,
 						relationshipField: i.relationshipField,
 						columns: i.columns,
-						formFields: t.formFields ?? i.formFields,
-						inlineMode: t.inlineMode ?? i.mode,
-						amountField: t.amountField ?? i.amountField,
-						sortField: t.sortField ?? i.sortField
+						formFields: n.formFields ?? i.formFields,
+						inlineMode: n.inlineMode ?? i.mode,
+						amountField: n.amountField ?? i.amountField,
+						sortField: n.sortField ?? i.sortField
 					};
 				} catch {
-					return t;
+					return n;
 				}
 			}));
-			t || p(r);
+			n || f(r);
 		})(), () => {
-			t = !0;
+			n = !0;
 		};
 	}, [
-		n,
+		t,
 		e.objectName,
 		e.details
 	]);
-	let [h, g] = s(() => c.map(() => ({
+	let [h, g] = c(() => a.map(() => ({
 		rows: [],
 		original: []
-	}))), _ = o(h);
+	}))), _ = s(h);
 	_.current = h;
-	let v = o({});
-	r(() => {
-		let e = n;
+	let v = s({});
+	i(() => {
+		let e = t;
 		if (!e || typeof e.getObjectSchema != "function") return;
-		let t = !1, r = Array.from(new Set(c.map((e) => e.childObject).filter(Boolean)));
+		let n = !1, r = Array.from(new Set(a.map((e) => e.childObject).filter(Boolean)));
 		return (async () => {
-			let n = await Promise.all(r.map(async (t) => {
+			let t = await Promise.all(r.map(async (t) => {
 				try {
 					return [t, await e.getObjectSchema(t)];
 				} catch {
 					return [t, null];
 				}
 			}));
-			if (t) return;
+			if (n) return;
 			let i = {};
-			for (let [e, t] of n) t && (i[e] = t);
+			for (let [e, n] of t) n && (i[e] = n);
 			v.current = i;
 		})(), () => {
-			t = !0;
+			n = !0;
 		};
 	}, [
-		n,
+		t,
 		e.objectName,
 		e.details
 	]);
-	let [y, b] = s(0), [x, S] = s(!1), C = o(!1), w = o(null), T = t(() => {
+	let [y, b] = c(0), [x, S] = c(!1), C = s(!1), w = s(null), T = n(() => {
 		C.current = !1, S(!1), w.current &&= (clearTimeout(w.current), null);
 	}, []);
-	r(() => {
-		let t = !1;
-		if (!(!l || !n)) return (async () => {
-			let r = await Promise.all(m.map(async (t) => {
-				if (!t.relationshipField) return {
+	i(() => {
+		let n = !1;
+		if (!(!l || !t)) return (async () => {
+			let r = await Promise.all(m.map(async (n) => {
+				if (!n.relationshipField) return {
 					rows: [],
 					original: []
 				};
 				try {
-					let r = (await n.find(t.childObject, {
-						$filter: { [t.relationshipField]: e.recordId },
+					let r = (await t.find(n.childObject, {
+						$filter: { [n.relationshipField]: e.recordId },
 						$top: 500
 					}))?.data ?? [];
 					return {
@@ -1335,22 +1518,22 @@ var Ct = ({ details: e, state: t, setRows: n, formHostRef: i, taxRateField: a, f
 					};
 				}
 			}));
-			t || g(r);
+			n || g(r);
 		})(), () => {
-			t = !0;
+			n = !0;
 		};
 	}, [
 		l,
-		n,
+		t,
 		e.recordId,
-		f
+		d
 	]);
-	let E = t((e, t) => {
+	let E = n((e, t) => {
 		g((n) => n.map((n, r) => r === e ? {
 			...n,
 			rows: t
 		} : n));
-	}, []), D = e.taxRateField || "tax_rate", [O, M] = s(null), F = O ? h[O.detailIdx]?.rows?.[O.rowIdx] : void 0, I = O ? m[O.detailIdx] : void 0, L = t((e, t, n) => {
+	}, []), D = e.taxRateField || "tax_rate", [O, k] = c(null), A = O ? h[O.detailIdx]?.rows?.[O.rowIdx] : void 0, j = O ? m[O.detailIdx] : void 0, F = n((e, t, n) => {
 		g((r) => r.map((r, i) => i === e ? {
 			...r,
 			rows: r.rows.map((e, r) => r === t ? {
@@ -1358,25 +1541,25 @@ var Ct = ({ details: e, state: t, setRows: n, formHostRef: i, taxRateField: a, f
 				...n
 			} : e)
 		} : r));
-	}, []), ee = t((e) => {
+	}, []), R = n((e) => {
 		g((t) => {
 			let n = t.map((t, n) => n === e ? {
 				...t,
 				rows: [...t.rows, {}]
 			} : t), r = n[e].rows.length - 1;
-			return M({
+			return k({
 				detailIdx: e,
 				rowIdx: r,
 				isNew: !0
 			}), n;
 		});
-	}, []), R = t(() => {
-		M((e) => (e?.isNew && g((t) => t.map((t, n) => n === e.detailIdx ? {
+	}, []), z = n(() => {
+		k((e) => (e?.isNew && g((t) => t.map((t, n) => n === e.detailIdx ? {
 			...t,
 			rows: t.rows.filter((t, n) => n !== e.rowIdx)
 		} : t)), null));
-	}, []), z = t(async (t) => {
-		T(), e.onSuccess || K.success(l ? e.title ? `${e.title} saved` : "Saved" : "Created"), l || (g(m.map(() => ({
+	}, []), B = n(async (t) => {
+		T(), e.onSuccess || J.success(l ? e.title ? `${e.title} saved` : "Saved" : "Created"), l || (g(m.map(() => ({
 			rows: [],
 			original: []
 		}))), b((e) => e + 1)), await e.onSuccess?.(t);
@@ -1386,20 +1569,20 @@ var Ct = ({ details: e, state: t, setRows: n, formHostRef: i, taxRateField: a, f
 		e.title,
 		m.length,
 		T
-	]), B = t((t) => {
-		T(), K.error(t?.message || "Save failed"), e.onError?.(t);
-	}, [e, T]), V = t(async (t) => {
-		if (!n) throw Error("MasterDetailForm: dataSource is required");
-		let r = { ...t };
+	]), V = n((t) => {
+		T(), J.error(t?.message || "Save failed"), e.onError?.(t);
+	}, [e, T]), H = n(async (n) => {
+		if (!t) throw Error("MasterDetailForm: dataSource is required");
+		let r = { ...n };
 		return m.forEach((e, t) => {
-			e.totalField && (r[e.totalField] = et(_.current[t]?.rows ?? [], e.amountField || "amount"));
-		}), (await u(n, l ? Qe(e.objectName, e.recordId, r, m.filter((e) => e.relationshipField).map((e, t) => ({
+			e.totalField && (r[e.totalField] = st(_.current[t]?.rows ?? [], e.amountField || "amount"));
+		}), (await p(t, l ? at(e.objectName, String(e.recordId), r, m.filter((e) => e.relationshipField).map((e, t) => ({
 			childObject: e.childObject,
 			relationshipField: e.relationshipField,
 			rows: _.current[t]?.rows ?? [],
 			original: _.current[t]?.original ?? [],
 			childSchema: v.current[e.childObject]
-		}))) : Ze(e.objectName, r, m.filter((e) => e.relationshipField).map((e, t) => ({
+		}))) : it(e.objectName, r, m.filter((e) => e.relationshipField).map((e, t) => ({
 			childObject: e.childObject,
 			relationshipField: e.relationshipField,
 			rows: _.current[t]?.rows ?? [],
@@ -1409,12 +1592,12 @@ var Ct = ({ details: e, state: t, setRows: n, formHostRef: i, taxRateField: a, f
 			id: e.recordId
 		};
 	}, [
-		n,
+		t,
 		m,
 		e.objectName,
 		e.recordId,
 		l
-	]), H = a(() => ({
+	]), ee = o(() => ({
 		type: "object-form",
 		objectName: e.objectName,
 		mode: e.mode ?? "create",
@@ -1427,273 +1610,307 @@ var Ct = ({ details: e, state: t, setRows: n, formHostRef: i, taxRateField: a, f
 		title: e.title,
 		showSubmit: !1,
 		showCancel: !1,
-		submitHandler: V,
-		onSuccess: z,
-		onError: B
+		submitHandler: H,
+		onSuccess: B,
+		onError: V
 	}), [
 		e,
-		V,
-		z,
-		B
-	]), U = o(null), W = e.submitText ?? (l ? "Save" : "Create"), te = t(() => {
+		H,
+		B,
+		V
+	]), U = s(null), W = e.submitText ?? (l ? "Save" : "Create"), G = n(() => {
 		C.current || U.current?.querySelector("form") && (C.current = !0, S(!0), setTimeout(() => {
 			(U.current?.querySelector("form"))?.requestSubmit();
 		}, 0), w.current = setTimeout(() => T(), 1500));
 	}, [T]);
-	return r(() => () => {
+	return i(() => () => {
 		w.current && clearTimeout(w.current);
-	}, []), /* @__PURE__ */ Z("div", {
-		className: G("space-y-6", i, e.className),
+	}, []), /* @__PURE__ */ Q("div", {
+		className: q("space-y-6", r, e.className),
 		children: [
-			/* @__PURE__ */ X("div", {
+			/* @__PURE__ */ Z("div", {
 				ref: U,
-				children: /* @__PURE__ */ X(Mt, {
-					schema: H,
-					dataSource: n
+				children: /* @__PURE__ */ Z(Vt, {
+					schema: ee,
+					dataSource: t
 				}, y)
 			}),
-			/* @__PURE__ */ X(Ct, {
+			/* @__PURE__ */ Z(jt, {
 				details: m,
 				state: h,
 				setRows: E,
 				formHostRef: U,
 				taxRateField: D,
 				formKey: y,
-				onRowExpand: (e, t) => M({
+				onRowExpand: (e, t) => k({
 					detailIdx: e,
 					rowIdx: t
 				}),
-				onAddViaForm: ee
+				onAddViaForm: R
 			}),
-			O && I && /* @__PURE__ */ Z(A, {
+			O && j && /* @__PURE__ */ Q(N, {
 				className: "border-primary/40 shadow-none ring-1 ring-primary/10",
 				"data-testid": "md-row-form",
-				children: [/* @__PURE__ */ Z(N, {
+				children: [/* @__PURE__ */ Q(I, {
 					className: "pb-2 flex flex-row items-center justify-between gap-2 space-y-0",
-					children: [/* @__PURE__ */ Z(P, {
+					children: [/* @__PURE__ */ Q(L, {
 						className: "text-sm font-medium",
 						children: [
-							I.title || "Line item",
+							j.title || "Line item",
 							" — row ",
 							O.rowIdx + 1
 						]
-					}), /* @__PURE__ */ X(k, {
+					}), /* @__PURE__ */ Z(M, {
 						type: "button",
 						variant: "ghost",
 						size: "sm",
 						className: "h-7 text-xs text-muted-foreground",
-						onClick: R,
+						onClick: z,
 						children: "Close"
 					})]
-				}), /* @__PURE__ */ X(j, { children: /* @__PURE__ */ X(Mt, {
+				}), /* @__PURE__ */ Z(P, { children: /* @__PURE__ */ Z(Vt, {
 					schema: {
 						type: "object-form",
-						objectName: I.childObject,
+						objectName: j.childObject,
 						mode: "edit",
-						initialData: F ?? {},
-						...I.formFields?.length ? { fields: I.formFields } : {},
+						initialData: A ?? {},
+						...j.formFields?.length ? { fields: j.formFields } : {},
 						submitText: "Apply",
 						submitHandler: async (e) => e,
 						onSuccess: (e) => {
-							L(O.detailIdx, O.rowIdx, e), M(null);
+							F(O.detailIdx, O.rowIdx, e), k(null);
 						},
-						onCancel: R
+						onCancel: z
 					},
-					dataSource: n
+					dataSource: t
 				}, `row-${O.detailIdx}-${O.rowIdx}`) })]
 			}),
-			e.showSubmit !== !1 && /* @__PURE__ */ Z("div", {
+			e.showSubmit !== !1 && /* @__PURE__ */ Q("div", {
 				className: "flex items-center justify-end gap-2 border-t border-border pt-4",
-				children: [e.onCancel && /* @__PURE__ */ X(k, {
+				children: [e.onCancel && /* @__PURE__ */ Z(M, {
 					type: "button",
 					variant: "outline",
 					onClick: e.onCancel,
 					disabled: x,
 					"data-testid": "md-form-cancel",
 					children: e.cancelText ?? "Cancel"
-				}), /* @__PURE__ */ X(k, {
+				}), /* @__PURE__ */ Z(M, {
 					type: "button",
-					onClick: te,
-					disabled: x || d && !f,
+					onClick: G,
+					disabled: x || u && !d,
 					"data-testid": "md-form-submit",
 					children: x ? "Saving…" : W
 				})]
 			})
 		]
 	});
-}, Tt = {
+}, Nt = {
 	1: void 0,
 	2: "grid gap-4 grid-cols-1 @md:grid-cols-2",
 	3: "grid gap-4 grid-cols-1 @md:grid-cols-2 @2xl:grid-cols-3",
 	4: "grid gap-4 grid-cols-1 @md:grid-cols-2 @2xl:grid-cols-3 @4xl:grid-cols-4"
-}, Et = ge({
+}, Pt = pe({
 	"form.discardTitle": "Discard changes?",
 	"form.discardMessage": "You have unsaved changes. If you close this form now, your edits will be lost.",
 	"form.keepEditing": "Keep editing",
 	"form.discard": "Discard"
-}, "form.discardTitle"), Dt = ({ schema: e, dataSource: n, className: c }) => {
-	let { fieldLabel: l } = h(), { t: u } = Et(), f = p(), [m, g] = s(null), [_, y] = s([]), [A, j] = s({}), [M, N] = s(!0), [P, F] = s(null), [I, L] = s(!1), [ee, R] = s(!1), [z, B] = s(!1), V = o(!1), re = e.confirmOnDiscard !== !1, ie = e.open !== !1, ae = e.drawerSide || "right", oe = i(), [se, K] = s(() => {
+}, "form.discardTitle"), Ft = ({ schema: e, dataSource: t, className: r }) => {
+	let { fieldLabel: l } = v(), { t: u } = Pt(), d = g(), [f, p] = c(null), [h, _] = c([]), [y, b] = c({}), [S, N] = c(!0), [P, F] = c(null), [I, L] = c(!1), [R, z] = c(!1), { saveWithOcc: B, conflictDialog: V } = We(), [H, ne] = c(!1), K = s(!1), J = e.confirmOnDiscard !== !1, re = e.open !== !1, Y = e.drawerSide || "right", ie = a(), [ae, oe] = c(() => {
 		let t = {};
 		return e.sections?.forEach((e, n) => {
 			let r = e.name || String(n);
 			e.collapsed && (t[r] = !0);
 		}), t;
 	});
-	r(() => {
+	i(() => {
 		(async () => {
-			if (!n) {
+			if (!t) {
 				N(!1);
 				return;
 			}
 			try {
-				let t = await n.getObjectSchema(e.objectName);
-				g(t);
+				let n = await t.getObjectSchema(e.objectName);
+				p(n);
 			} catch (e) {
 				F(e), N(!1);
 			}
 		})();
-	}, [e.objectName, n]), r(() => {
-		(m || !n) && (async () => {
+	}, [e.objectName, t]);
+	let se = s(void 0);
+	i(() => {
+		let n = !1;
+		return (f || !t) && (async () => {
 			if (e.mode === "create" || !e.recordId) {
-				j(e.initialData || e.initialValues || {}), N(!1);
+				b(e.initialData || e.initialValues || {}), N(!1);
 				return;
 			}
-			if (!n) {
-				j(e.initialData || e.initialValues || {}), N(!1);
+			if (!t) {
+				b(e.initialData || e.initialValues || {}), N(!1);
 				return;
 			}
+			se.current !== e.recordId && (N(!0), L(!1));
 			try {
-				let t = await n.findOne(e.objectName, e.recordId);
-				j(t || {});
+				let r = await t.findOne(e.objectName, e.recordId);
+				if (n) return;
+				se.current = e.recordId, b(r || {});
 			} catch (e) {
+				if (n) return;
 				F(e);
 			} finally {
-				N(!1);
+				n || N(!1);
 			}
-		})();
+		})(), () => {
+			n = !0;
+		};
 	}, [
-		m,
+		f,
 		e.mode,
 		e.recordId,
 		e.initialData,
 		e.initialValues,
-		n,
+		t,
 		e.objectName
 	]);
-	let ce = t((t) => Se(t, {
-		objectSchema: m,
+	let ce = n((t) => Se(t, {
+		objectSchema: f,
 		objectName: e.objectName,
 		readOnly: e.readOnly,
 		mode: e.mode,
 		fieldLabel: l
 	}), [
-		m,
+		f,
 		e.readOnly,
 		e.mode,
 		e.objectName,
 		l
 	]);
-	r(() => {
-		if (!m && n) return;
+	i(() => {
+		if (!f && t) return;
 		if (e.customFields?.length) {
-			y(e.customFields), N(!1);
+			_(e.customFields), N(!1);
 			return;
 		}
 		if (e.sections?.length) {
 			N(!1);
 			return;
 		}
-		if (!m) return;
-		let t = e.fields || Object.keys(m.fields || {}), r = [];
-		for (let n of t) {
-			let t = typeof n == "string" ? n : n.name;
-			if (!t) continue;
-			let i = m.fields?.[t];
+		if (!f) return;
+		let n = e.fields || Object.keys(f.fields || {}), r = [];
+		for (let t of n) {
+			let n = typeof t == "string" ? t : t.name;
+			if (!n) continue;
+			let i = f.fields?.[n];
 			i && r.push({
-				name: t,
-				label: l(e.objectName, t, i.label || t),
-				type: b(i.type),
+				name: n,
+				label: l(e.objectName, n, i.label || n),
+				type: C(i.type),
 				required: i.required || !1,
 				disabled: e.readOnly || e.mode === "view" || i.readonly,
 				placeholder: i.placeholder,
 				description: i.help || i.description,
-				validation: v(i),
+				validation: x(i),
 				field: i,
 				options: i.options,
 				multiple: i.multiple
 			});
 		}
-		y(r), N(!1);
+		_(r), N(!1);
 	}, [
-		m,
+		f,
 		e.fields,
 		e.customFields,
 		e.sections,
 		e.readOnly,
 		e.mode,
-		n
+		t
 	]);
-	let le = t(async (t) => {
-		B(!0);
+	let le = n(async (n) => {
+		ne(!0);
 		try {
-			if (!n) return e.onSuccess && await e.onSuccess(t), e.onOpenChange?.(!1), t;
-			let r, i = Ke(t, m);
-			return e.mode === "create" ? r = await n.create(e.objectName, i) : e.mode === "edit" && e.recordId && (r = await n.update(e.objectName, e.recordId, i)), e.onSuccess && await e.onSuccess(r), e.onOpenChange?.(!1), r;
+			if (!t) return e.onSuccess && await e.onSuccess(n), e.onOpenChange?.(!1), n;
+			let r, i = $e(n, f);
+			if (e.mode === "create") r = await t.create(e.objectName, i);
+			else if (e.mode === "edit" && e.recordId) {
+				let n = await B({
+					dataSource: t,
+					objectName: e.objectName,
+					recordId: e.recordId,
+					payload: i,
+					baseRecord: y
+				});
+				if (n.status === "cancelled") return;
+				r = n.result;
+			}
+			return e.onSuccess && await e.onSuccess(r), e.onOpenChange?.(!1), r;
 		} catch (t) {
 			throw e.onError && e.onError(t), t;
 		} finally {
-			B(!1);
+			ne(!1);
 		}
 	}, [
 		e,
-		n,
-		m
-	]), q = t(() => {
-		R(!1), V.current && (V.current = !1, e.onCancel?.()), e.onOpenChange?.(!1);
-	}, [e]), ue = t((e) => {
-		V.current = e, re && I ? R(!0) : q();
+		t,
+		f,
+		B,
+		y
+	]), X = n(() => {
+		z(!1), K.current && (K.current = !1, e.onCancel?.()), e.onOpenChange?.(!1);
+	}, [e]), de = n((e) => {
+		K.current = e, J && I ? z(!0) : X();
+	}, [
+		J,
+		I,
+		X
+	]);
+	i(() => {
+		if (!re || !I || !J) return;
+		let e = (e) => {
+			e.preventDefault(), e.returnValue = "";
+		};
+		return window.addEventListener("beforeunload", e), () => window.removeEventListener("beforeunload", e);
 	}, [
 		re,
 		I,
-		q
-	]), de = t(() => {
-		V.current = !0, q();
-	}, [q]), fe = a(() => {
-		if (e.drawerWidth) return ae === "left" || ae === "right" ? {
+		J
+	]);
+	let fe = n(() => {
+		K.current = !0, X();
+	}, [X]), pe = o(() => {
+		if (e.drawerWidth) return Y === "left" || Y === "right" ? {
 			width: e.drawerWidth,
 			maxWidth: e.drawerWidth
 		} : {
 			height: e.drawerWidth,
 			maxHeight: e.drawerWidth
 		};
-	}, [e.drawerWidth, ae]), pe = e.layout === "vertical" || e.layout === "horizontal" ? e.layout : "vertical", J = e.showSubmit !== !1 && e.mode !== "view", Y = e.showCancel !== !1, he = e.submitText || (e.mode === "create" ? "Create" : "Update"), ge = e.cancelText || "Cancel", _e = {
+	}, [e.drawerWidth, Y]), me = e.layout === "vertical" || e.layout === "horizontal" ? e.layout : "vertical", he = e.showSubmit !== !1 && e.mode !== "view", $ = e.showCancel !== !1, ge = e.submitText || (e.mode === "create" ? "Create" : "Update"), _e = e.cancelText || "Cancel", ve = {
 		type: "form",
 		objectName: e.objectName,
-		layout: pe,
-		defaultValues: A,
-		submitLabel: he,
-		cancelLabel: ge,
-		showSubmit: J,
-		showCancel: Y,
+		layout: me,
+		defaultValues: y,
+		submitLabel: ge,
+		cancelLabel: _e,
+		showSubmit: he,
+		showCancel: $,
 		onSubmit: le,
-		onCancel: de,
+		onCancel: fe,
 		onDirtyChange: L,
 		showActions: !1,
-		id: oe
-	}, Q = () => {
-		if (P) return /* @__PURE__ */ Z("div", {
+		id: ie
+	}, ye = () => {
+		if (P) return /* @__PURE__ */ Q("div", {
 			className: "p-4 border border-red-300 bg-red-50 rounded-md",
-			children: [/* @__PURE__ */ X("h3", {
+			children: [/* @__PURE__ */ Z("h3", {
 				className: "text-red-800 font-semibold",
 				children: "Error loading form"
-			}), /* @__PURE__ */ X("p", {
+			}), /* @__PURE__ */ Z("p", {
 				className: "text-red-600 text-sm mt-1",
 				children: P.message
 			})]
 		});
-		if (M) return /* @__PURE__ */ Z("div", {
+		if (S) return /* @__PURE__ */ Q("div", {
 			className: "p-8 text-center",
-			children: [/* @__PURE__ */ X("div", { className: "inline-block animate-spin rounded-full h-8 w-8 border-b-2 border-gray-900" }), /* @__PURE__ */ X("p", {
+			children: [/* @__PURE__ */ Z("div", { className: "inline-block animate-spin rounded-full h-8 w-8 border-b-2 border-gray-900" }), /* @__PURE__ */ Z("p", {
 				className: "mt-2 text-sm text-gray-600",
 				children: "Loading form..."
 			})]
@@ -1701,7 +1918,7 @@ var Ct = ({ details: e, state: t, setRows: n, formHostRef: i, taxRateField: a, f
 		if (e.sections?.length) {
 			let t = [];
 			return e.sections.forEach((e, n) => {
-				let r = e.name || String(n), i = se[r] ?? e.collapsed ?? !1;
+				let r = e.name || String(n), i = ae[r] ?? e.collapsed ?? !1;
 				t.push({
 					name: `__section_${r}`,
 					label: e.label || "",
@@ -1709,7 +1926,7 @@ var Ct = ({ details: e, state: t, setRows: n, formHostRef: i, taxRateField: a, f
 					colSpan: 4,
 					collapsible: e.collapsible,
 					collapsed: i,
-					onToggle: e.collapsible ? () => K((e) => ({
+					onToggle: e.collapsible ? () => oe((e) => ({
 						...e,
 						[r]: !i
 					})) : void 0,
@@ -1720,19 +1937,19 @@ var Ct = ({ details: e, state: t, setRows: n, formHostRef: i, taxRateField: a, f
 					...e,
 					hidden: !0
 				}))) : t.push(...a);
-			}), /* @__PURE__ */ X(d, { schema: {
-				..._e,
+			}), /* @__PURE__ */ Z(m, { schema: {
+				...ve,
 				fields: t
 			} });
 		}
-		let t = Be(_, m, e.columns, e.mode), n = Tt[t.columns || 1];
-		return /* @__PURE__ */ X(d, { schema: {
-			..._e,
+		let t = ze(h, f, e.columns, e.mode), n = Nt[t.columns || 1];
+		return /* @__PURE__ */ Z(m, { schema: {
+			...ve,
 			fields: t.fields,
 			columns: t.columns,
 			...n ? { fieldContainerClass: n } : {}
 		} });
-	}, ve = e.subforms, $ = ve?.length && e.mode !== "view" ? /* @__PURE__ */ X(wt, {
+	}, be = e.subforms, xe = be?.length && e.mode !== "view" ? /* @__PURE__ */ Z(Mt, {
 		schema: {
 			type: "object-master-detail-form",
 			objectName: e.objectName,
@@ -1741,92 +1958,93 @@ var Ct = ({ details: e, state: t, setRows: n, formHostRef: i, taxRateField: a, f
 			fields: e.fields,
 			sections: e.sections,
 			submitText: e.submitText,
-			cancelText: ge,
-			details: ve,
+			cancelText: _e,
+			details: be,
 			onSuccess: async (t) => {
 				await e.onSuccess?.(t), e.onOpenChange?.(!1);
 			},
 			onError: e.onError,
 			onCancel: () => e.onOpenChange?.(!1)
 		},
-		dataSource: n
-	}) : Q();
-	return f ? /* @__PURE__ */ Z("div", {
+		dataSource: t
+	}) : ye();
+	return d ? /* @__PURE__ */ Q("div", {
 		className: "@container rounded-md border bg-card p-4",
-		children: [(e.title || e.description) && /* @__PURE__ */ Z("div", {
+		children: [(e.title || e.description) && /* @__PURE__ */ Q("div", {
 			className: "mb-3 space-y-0.5",
-			children: [e.title && /* @__PURE__ */ X("div", {
+			children: [e.title && /* @__PURE__ */ Z("div", {
 				className: "text-sm font-semibold",
 				children: e.title
-			}), e.description && /* @__PURE__ */ X("p", {
+			}), e.description && /* @__PURE__ */ Z("p", {
 				className: "text-xs text-muted-foreground",
 				children: e.description
 			})]
-		}), $]
-	}) : /* @__PURE__ */ X(H, {
-		open: ie,
+		}), xe]
+	}) : /* @__PURE__ */ Z(ee, {
+		open: re,
 		onOpenChange: (t) => {
 			if (t) {
 				e.onOpenChange?.(!0);
 				return;
 			}
-			ue(!1);
+			de(!1);
 		},
-		children: /* @__PURE__ */ Z(U, {
-			side: ae,
-			className: G("overflow-y-auto", c, e.className),
-			style: fe,
+		children: /* @__PURE__ */ Q(U, {
+			side: Y,
+			className: q("overflow-y-auto", r, e.className),
+			style: pe,
 			children: [
-				(e.title || e.description) && /* @__PURE__ */ Z(te, { children: [e.title && /* @__PURE__ */ X(ne, { children: e.title }), e.description ? /* @__PURE__ */ X(W, { children: e.description }) : /* @__PURE__ */ X(W, {
+				(e.title || e.description) && /* @__PURE__ */ Q(G, { children: [e.title && /* @__PURE__ */ Z(te, { children: e.title }), e.description ? /* @__PURE__ */ Z(W, { children: e.description }) : /* @__PURE__ */ Z(W, {
 					className: "sr-only",
 					children: "Complete the form fields, then submit or cancel."
 				})] }),
-				/* @__PURE__ */ X("div", {
+				/* @__PURE__ */ Z("div", {
 					className: "@container py-4",
-					children: $
+					children: xe
 				}),
-				!P && !M && !(ve?.length && e.mode !== "view") && (J || Y) && /* @__PURE__ */ X("div", {
+				!P && !S && !(be?.length && e.mode !== "view") && (he || $) && /* @__PURE__ */ Z("div", {
 					className: "shrink-0 border-t px-4 py-3 bg-background",
 					"data-testid": "drawer-form-footer",
-					children: /* @__PURE__ */ Z("div", {
+					children: /* @__PURE__ */ Q("div", {
 						className: "flex flex-col sm:flex-row gap-2 sm:justify-end",
-						children: [Y && /* @__PURE__ */ X(k, {
+						children: [$ && /* @__PURE__ */ Z(M, {
 							type: "button",
 							variant: "outline",
-							onClick: de,
-							disabled: z,
+							onClick: fe,
+							disabled: H,
 							className: "w-full sm:w-auto",
-							children: ge
-						}), J && /* @__PURE__ */ Z(k, {
+							children: _e
+						}), he && /* @__PURE__ */ Q(M, {
 							type: "submit",
-							form: oe,
-							disabled: z,
+							form: ie,
+							disabled: H,
 							className: "w-full sm:w-auto",
-							children: [z && /* @__PURE__ */ X(me, { className: "mr-2 h-4 w-4 animate-spin" }), he]
+							children: [H && /* @__PURE__ */ Z(ue, { className: "mr-2 h-4 w-4 animate-spin" }), ge]
 						})]
 					})
 				}),
-				/* @__PURE__ */ X(x, {
-					open: ee,
-					onOpenChange: R,
-					children: /* @__PURE__ */ Z(w, { children: [/* @__PURE__ */ Z(D, { children: [/* @__PURE__ */ X(O, { children: u("form.discardTitle") }), /* @__PURE__ */ X(T, { children: u("form.discardMessage") })] }), /* @__PURE__ */ Z(E, { children: [/* @__PURE__ */ X(C, {
+				/* @__PURE__ */ Z(w, {
+					open: R,
+					onOpenChange: z,
+					children: /* @__PURE__ */ Q(D, { children: [/* @__PURE__ */ Q(A, { children: [/* @__PURE__ */ Z(j, { children: u("form.discardTitle") }), /* @__PURE__ */ Z(O, { children: u("form.discardMessage") })] }), /* @__PURE__ */ Q(k, { children: [/* @__PURE__ */ Z(E, {
 						onClick: () => {
-							V.current = !1;
+							K.current = !1;
 						},
 						children: u("form.keepEditing")
-					}), /* @__PURE__ */ X(S, {
-						onClick: q,
+					}), /* @__PURE__ */ Z(T, {
+						onClick: X,
 						children: u("form.discard")
 					})] })] })
-				})
+				}),
+				V
 			]
 		})
 	});
 };
 //#endregion
 //#region src/fieldGroups.ts
-function Ot(e, t) {
-	let n = _e({
+function It(e, t) {
+	let n = he({
 		fieldGroups: t,
 		fields: Object.fromEntries(e.map((e) => [e.name, { group: e.group }]))
 	});
@@ -1846,27 +2064,27 @@ function Ot(e, t) {
 }
 //#endregion
 //#region src/ModalForm.tsx
-var kt = ge({
+var Lt = pe({
 	"form.discardTitle": "Discard changes?",
 	"form.discardMessage": "You have unsaved changes. If you close this form now, your edits will be lost.",
 	"form.keepEditing": "Keep editing",
 	"form.discard": "Discard"
-}, "form.discardTitle"), At = {
+}, "form.discardTitle"), Rt = {
 	sm: "sm:max-w-sm",
 	default: "sm:max-w-lg",
 	lg: "sm:max-w-2xl",
 	xl: "sm:max-w-5xl",
 	full: "sm:max-w-[95vw] sm:w-full"
-}, jt = ({ schema: e, dataSource: n, className: c }) => {
-	let { fieldLabel: l, sectionLabel: u } = h(), { t: f } = kt(), m = p(), g = le(), _ = t((t) => {
-		if (!g?.isLoaded) return t;
+}, zt = ({ schema: e, dataSource: t, className: r }) => {
+	let { fieldLabel: l, sectionLabel: u } = v(), { t: d } = Lt(), f = g(), p = Y(), h = n((t) => {
+		if (!p?.isLoaded) return t;
 		let n = [];
 		for (let r of t) {
 			if (!r?.name) {
 				n.push(r);
 				continue;
 			}
-			g.checkField(e.objectName, r.name, "read") && (!g.checkField(e.objectName, r.name, "write") && e.mode !== "view" ? n.push({
+			p.checkField(e.objectName, r.name, "read") && (!p.checkField(e.objectName, r.name, "write") && e.mode !== "view" ? n.push({
 				...r,
 				readOnly: !0,
 				disabled: !0
@@ -1874,14 +2092,14 @@ var kt = ge({
 		}
 		return n;
 	}, [
-		g,
+		p,
 		e.objectName,
 		e.mode
-	]), [y, A] = s(null), [j, M] = s([]), [N, P] = s({}), [z, B] = s(!0), [V, H] = s(null), [U, W] = s(!1), [te, ne] = s(!1), [K, ce] = s(!1), q = o(!1), ue = e.confirmOnDiscard !== !1, de = e.open !== !1, fe = i(), pe = a(() => {
+	]), [_, y] = c(null), [b, S] = c([]), [N, P] = c({}), [F, I] = c(!0), [L, ee] = c(null), [U, W] = c(!1), [G, te] = c(!1), [K, J] = c(!1), { saveWithOcc: re, conflictDialog: ie } = We(), ae = s(!1), oe = e.confirmOnDiscard !== !1, se = e.open !== !1, ce = a(), le = o(() => {
 		if (e.sections?.length || e.customFields?.length) return null;
-		let t = Ne(j, y);
-		e.mode === "create" && (t = Fe(t, y));
-		let n = Ot(t, y?.fieldGroups);
+		let t = Ne(b, _);
+		e.mode === "create" && (t = Fe(t, _));
+		let n = It(t, _?.fieldGroups);
 		if (!n) return null;
 		let r = e.columns && e.columns > 0 ? Math.min(Math.floor(e.columns), 4) : Oe(t.length);
 		return n.map((e) => ({
@@ -1893,137 +2111,157 @@ var kt = ge({
 		e.customFields,
 		e.columns,
 		e.mode,
-		j,
-		y
-	]), J = e.sections?.length ? e.sections : pe ?? void 0, Y = a(() => J?.length || e.customFields?.length ? null : Be(j, y, e.columns, e.mode), [
-		j,
-		y,
+		b,
+		_
+	]), X = e.sections?.length ? e.sections : le ?? void 0, de = o(() => X?.length || e.customFields?.length ? null : ze(b, _, e.columns, e.mode), [
+		b,
+		_,
 		e.columns,
 		e.mode,
-		J,
+		X,
 		e.customFields
-	]), he = At[a(() => {
+	]), fe = Rt[o(() => {
 		if (e.modalSize) return e.modalSize;
-		if (Y?.columns && Y.columns > 1) return ze(Y.columns);
-		if (J?.length) {
-			let e = Math.max(...J.map((e) => Number(e.columns) || 1));
-			if (e > 1) return ze(e);
+		if (de?.columns && de.columns > 1) return Re(de.columns);
+		if (X?.length) {
+			let e = Math.max(...X.map((e) => Number(e.columns) || 1));
+			if (e > 1) return Re(e);
 		}
 		return "default";
 	}, [
 		e.modalSize,
-		Y,
-		J
-	])] || At.default;
-	r(() => {
+		de,
+		X
+	])] || Rt.default;
+	i(() => {
 		(async () => {
-			if (!n) {
-				B(!1);
+			if (!t) {
+				I(!1);
 				return;
 			}
 			try {
-				let t = await n.getObjectSchema(e.objectName);
-				A(t);
+				let n = await t.getObjectSchema(e.objectName);
+				y(n);
 			} catch (e) {
-				H(e), B(!1);
+				ee(e), I(!1);
 			}
 		})();
-	}, [e.objectName, n]), r(() => {
-		(y || !n) && (async () => {
+	}, [e.objectName, t]);
+	let pe = s(void 0);
+	i(() => {
+		let n = !1;
+		return (_ || !t) && (async () => {
 			if (e.mode === "create" || !e.recordId) {
-				P(e.initialData || e.initialValues || {}), B(!1);
+				P(e.initialData || e.initialValues || {}), I(!1);
 				return;
 			}
-			if (!n) {
-				P(e.initialData || e.initialValues || {}), B(!1);
+			if (!t) {
+				P(e.initialData || e.initialValues || {}), I(!1);
 				return;
 			}
+			pe.current !== e.recordId && (I(!0), te(!1));
 			try {
-				let t = await n.findOne(e.objectName, e.recordId);
-				P(t || {});
+				let r = await t.findOne(e.objectName, e.recordId);
+				if (n) return;
+				pe.current = e.recordId, P(r || {});
 			} catch (e) {
-				H(e);
+				if (n) return;
+				ee(e);
 			} finally {
-				B(!1);
+				n || I(!1);
 			}
-		})();
+		})(), () => {
+			n = !0;
+		};
 	}, [
-		y,
+		_,
 		e.mode,
 		e.recordId,
 		e.initialData,
 		e.initialValues,
-		n,
+		t,
 		e.objectName
 	]);
-	let ge = t((t) => Se(t, {
-		objectSchema: y,
+	let me = n((t) => Se(t, {
+		objectSchema: _,
 		objectName: e.objectName,
 		readOnly: e.readOnly,
 		mode: e.mode,
 		fieldLabel: l
 	}), [
-		y,
+		_,
 		e.readOnly,
 		e.mode,
 		e.objectName,
 		l
 	]);
-	r(() => {
-		if (!y && n) return;
+	i(() => {
+		if (!_ && t) return;
 		if (e.customFields?.length) {
-			M(e.customFields), B(!1);
+			S(e.customFields), I(!1);
 			return;
 		}
 		if (e.sections?.length) {
-			B(!1);
+			I(!1);
 			return;
 		}
-		if (!y) return;
-		let t = e.fields || Object.keys(y.fields || {}), r = [];
-		for (let n of t) {
-			let t = typeof n == "string" ? n : n.name;
-			if (!t) continue;
-			let i = y.fields?.[t];
+		if (!_) return;
+		let n = e.fields || Object.keys(_.fields || {}), r = [];
+		for (let t of n) {
+			let n = typeof t == "string" ? t : t.name;
+			if (!n) continue;
+			let i = _.fields?.[n];
 			i && r.push({
-				name: t,
-				label: l(e.objectName, t, i.label || t),
-				type: b(i.type),
+				name: n,
+				label: l(e.objectName, n, i.label || n),
+				type: C(i.type),
 				required: i.required || !1,
 				disabled: e.readOnly || e.mode === "view" || i.readonly,
 				placeholder: i.placeholder,
 				description: i.help || i.description,
-				validation: v(i),
+				validation: x(i),
 				field: i,
 				options: i.options,
 				multiple: i.multiple,
 				visibleWhen: i.visibleWhen,
 				readonlyWhen: i.readonlyWhen,
-				requiredWhen: i.requiredWhen ?? i.conditionalRequired,
+				requiredWhen: i.requiredWhen,
 				group: i.group
 			});
 		}
-		M(r), B(!1);
+		S(r), I(!1);
 	}, [
-		y,
+		_,
 		e.fields,
 		e.customFields,
 		e.sections,
 		e.readOnly,
 		e.mode,
-		n
+		t
 	]);
-	let _e = t(async (t) => {
+	let he = n(async (n) => {
 		W(!0);
 		try {
-			if (!n) return e.onSuccess && await e.onSuccess(t), e.onOpenChange?.(!1), t;
-			let r, i = Ke(t, y);
-			if (g?.isLoaded) {
+			if (!t) return e.onSuccess && await e.onSuccess(n), e.onOpenChange?.(!1), n;
+			let r, i = $e(n, _);
+			if (p?.isLoaded) {
 				let t = {};
-				for (let n of Object.keys(i)) g.checkField(e.objectName, n, "write") && (t[n] = i[n]);
+				for (let n of Object.keys(i)) p.checkField(e.objectName, n, "write") && (t[n] = i[n]);
 				i = t;
 			}
-			return e.mode === "create" ? r = await n.create(e.objectName, i) : e.mode === "edit" && e.recordId && (r = await n.update(e.objectName, e.recordId, i)), e.onSuccess && await e.onSuccess(r), e.onOpenChange?.(!1), r;
+			if (e.mode === "create") r = await t.create(e.objectName, i);
+			else if (e.mode === "edit" && e.recordId) {
+				let n = await re({
+					dataSource: t,
+					objectName: e.objectName,
+					recordId: e.recordId,
+					payload: i,
+					baseRecord: N
+				});
+				if (n.status === "cancelled") return;
+				r = n.result;
+			}
+			return e.onSuccess && await e.onSuccess(r), e.onOpenChange?.(!1), r;
 		} catch (t) {
 			throw e.onError && e.onError(t), t;
 		} finally {
@@ -2031,96 +2269,116 @@ var kt = ge({
 		}
 	}, [
 		e,
-		n,
-		y,
-		g
-	]), Q = t(() => {
-		ce(!1), q.current && (q.current = !1, e.onCancel?.()), e.onOpenChange?.(!1);
-	}, [e]), ve = t((e) => {
-		q.current = e, ue && te ? ce(!0) : Q();
+		t,
+		_,
+		p,
+		re,
+		N
+	]), $ = n(() => {
+		J(!1), ae.current && (ae.current = !1, e.onCancel?.()), e.onOpenChange?.(!1);
+	}, [e]), ge = n((e) => {
+		ae.current = e, oe && G ? J(!0) : $();
 	}, [
-		ue,
-		te,
-		Q
-	]), ye = t(() => {
-		q.current = !0, Q();
-	}, [Q]), be = e.layout === "vertical" || e.layout === "horizontal" ? e.layout : "vertical", xe = e.showSubmit !== !1 && e.mode !== "view", Ce = e.showCancel !== !1, we = e.submitText || (e.mode === "create" ? "Create" : "Update"), Te = e.cancelText || "Cancel", Ee = {
+		oe,
+		G,
+		$
+	]);
+	i(() => {
+		if (!se || !G || !oe) return;
+		let e = (e) => {
+			e.preventDefault(), e.returnValue = "";
+		};
+		return window.addEventListener("beforeunload", e), () => window.removeEventListener("beforeunload", e);
+	}, [
+		se,
+		G,
+		oe
+	]);
+	let _e = n(() => {
+		ae.current = !0, $();
+	}, [$]), ve = e.layout === "vertical" || e.layout === "horizontal" ? e.layout : "vertical", ye = e.showSubmit !== !1 && e.mode !== "view", be = e.showCancel !== !1, xe = e.submitText || (e.mode === "create" ? "Create" : "Update"), Ce = e.cancelText || "Cancel", we = {
 		type: "form",
 		objectName: e.objectName,
-		layout: be,
+		layout: ve,
 		defaultValues: N,
-		submitLabel: we,
-		cancelLabel: Te,
-		showSubmit: xe,
-		showCancel: Ce,
-		onSubmit: _e,
-		onCancel: ye,
-		onDirtyChange: ne,
+		submitLabel: xe,
+		cancelLabel: Ce,
+		showSubmit: ye,
+		showCancel: be,
+		onSubmit: he,
+		onCancel: _e,
+		onDirtyChange: te,
 		showActions: !1,
-		id: fe
-	}, De = () => {
-		if (V) return /* @__PURE__ */ Z("div", {
+		id: ce
+	}, Te = () => {
+		if (L) return /* @__PURE__ */ Q("div", {
 			className: "p-4 border border-red-300 bg-red-50 rounded-md",
-			children: [/* @__PURE__ */ X("h3", {
+			children: [/* @__PURE__ */ Z("h3", {
 				className: "text-red-800 font-semibold",
 				children: "Error loading form"
-			}), /* @__PURE__ */ X("p", {
+			}), /* @__PURE__ */ Z("p", {
 				className: "text-red-600 text-sm mt-1",
-				children: V.message
+				children: L.message
 			})]
 		});
-		if (z) return /* @__PURE__ */ X("div", {
+		if (F) return /* @__PURE__ */ Z("div", {
 			className: "space-y-4",
 			"data-testid": "modal-form-skeleton",
 			children: [
 				1,
 				2,
 				3
-			].map((e) => /* @__PURE__ */ Z("div", {
+			].map((e) => /* @__PURE__ */ Q("div", {
 				className: "space-y-2",
-				children: [/* @__PURE__ */ X(re, { className: "h-4 w-24" }), /* @__PURE__ */ X(re, { className: "h-10 w-full" })]
+				children: [/* @__PURE__ */ Z(ne, { className: "h-4 w-24" }), /* @__PURE__ */ Z(ne, { className: "h-10 w-full" })]
 			}, e))
 		});
 		if (e.sections?.length) {
-			let t = e.sections, n = (e, t) => e.name || e.label || String(t), r = (t) => t.name ? u(e.objectName, t.name, t.label || t.name) : t.label, i = (e) => /* @__PURE__ */ X(d, { schema: {
-				...Ee,
-				...Re(_(ge(e)), e.columns || 1)
-			} });
-			return e.contentLayout === "tabbed" && t.length > 1 ? /* @__PURE__ */ Z(ie, {
-				defaultValue: n(t[0], 0),
-				className: "w-full",
-				children: [/* @__PURE__ */ X(oe, {
-					className: "mb-4",
-					children: t.map((e, t) => /* @__PURE__ */ X(se, {
-						value: n(e, t),
-						children: r(e) || `Section ${t + 1}`
-					}, n(e, t)))
-				}), t.map((e, t) => /* @__PURE__ */ X(ae, {
-					value: n(e, t),
-					children: /* @__PURE__ */ X($, {
-						description: e.description,
-						columns: 1,
-						className: e.className,
-						gridClassName: e.gridClassName,
-						children: i(e)
-					})
-				}, n(e, t)))]
-			}) : /* @__PURE__ */ X("div", {
-				className: "space-y-6",
-				children: t.map((e, t) => /* @__PURE__ */ X($, {
-					label: r(e),
+			let t = e.sections, n = (e, t) => e.name || e.label || String(t), r = (t) => t.name ? u(e.objectName, t.name, t.label || t.name) : t.label, i = (e) => typeof e == "number" && e > 0 ? Math.min(Math.floor(e), 4) : void 0, a = t.map((e) => i(e.columns)).filter((e) => e != null), o = i(e.columns) ?? (a.length ? Math.max(...a) : 1), s = Ie[o], c = t.map((e, t) => {
+				let a = h(me(e));
+				return {
+					key: n(e, t),
+					title: r(e),
 					description: e.description,
-					columns: 1,
 					className: e.className,
 					gridClassName: e.gridClassName,
-					children: i(e)
-				}, n(e, t)))
-			});
+					fields: o > 1 ? je(a, o, i(e.columns)) : a
+				};
+			}).filter((e) => e.fields.length > 0), l = {
+				...we,
+				columns: o,
+				...s ? { fieldContainerClass: s } : {}
+			};
+			if (e.contentLayout === "tabbed" && c.length > 1) return /* @__PURE__ */ Z(m, { schema: {
+				...l,
+				fields: c.flatMap((e) => e.fields),
+				fieldTabs: c.map((e, t) => ({
+					key: e.key,
+					label: e.title || `Section ${t + 1}`,
+					description: e.description,
+					fields: e.fields.map((e) => e.name),
+					containerClass: e.gridClassName
+				}))
+			} });
+			let d = [];
+			return c.forEach((e) => {
+				(e.title || e.description) && d.push({
+					name: `__section_${e.key}`,
+					label: e.title,
+					description: e.description,
+					type: "section-divider",
+					colSpan: 4,
+					className: e.className
+				}), d.push(...e.fields);
+			}), /* @__PURE__ */ Z(m, { schema: {
+				...l,
+				fields: d
+			} });
 		}
-		if (pe?.length) {
-			let t = Number(pe[0]?.columns) || 1, n = [];
-			pe.forEach((r, i) => {
-				let a = _(ge(r));
+		if (le?.length) {
+			let t = Number(le[0]?.columns) || 1, n = [];
+			le.forEach((r, i) => {
+				let a = h(me(r));
 				if (!a.length) return;
 				let o = r.name ? u(e.objectName, r.name, r.label || r.name) : r.label;
 				o && n.push({
@@ -2130,48 +2388,48 @@ var kt = ge({
 				}), n.push(...t > 1 ? je(a, t) : a);
 			});
 			let r = Ie[t];
-			return /* @__PURE__ */ X(d, { schema: {
-				...Ee,
+			return /* @__PURE__ */ Z(m, { schema: {
+				...we,
 				fields: n,
 				columns: t,
 				...r ? { fieldContainerClass: r } : {}
 			} });
 		}
-		let t = Y ?? Be(j, y, e.columns, e.mode), n = Ie[t.columns || 1];
-		return /* @__PURE__ */ X(d, { schema: {
-			...Ee,
-			fields: _(t.fields),
+		let t = de ?? ze(b, _, e.columns, e.mode), n = Ie[t.columns || 1];
+		return /* @__PURE__ */ Z(m, { schema: {
+			...we,
+			fields: h(t.fields),
 			columns: t.columns,
 			...n ? { fieldContainerClass: n } : {}
 		} });
-	}, ke = e.subforms;
-	if (m) return /* @__PURE__ */ Z("div", {
+	}, Ee = e.subforms;
+	if (f) return /* @__PURE__ */ Q("div", {
 		className: "@container rounded-md border bg-card p-4",
-		children: [(e.title || e.description) && /* @__PURE__ */ Z("div", {
+		children: [(e.title || e.description) && /* @__PURE__ */ Q("div", {
 			className: "mb-3 space-y-0.5",
-			children: [e.title && /* @__PURE__ */ X("div", {
+			children: [e.title && /* @__PURE__ */ Z("div", {
 				className: "text-sm font-semibold",
 				children: e.title
-			}), e.description && /* @__PURE__ */ X("p", {
+			}), e.description && /* @__PURE__ */ Z("p", {
 				className: "text-xs text-muted-foreground",
 				children: e.description
 			})]
-		}), De()]
+		}), Te()]
 	});
-	if (ke?.length && e.mode !== "view") return /* @__PURE__ */ X(F, {
-		open: de,
+	if (Ee?.length && e.mode !== "view") return /* @__PURE__ */ Z(R, {
+		open: se,
 		onOpenChange: e.onOpenChange,
-		children: /* @__PURE__ */ Z(R, {
-			className: G(he, "flex flex-col h-[100dvh] sm:h-auto sm:max-h-[90vh] overflow-hidden p-0", c, e.className),
-			children: [(e.title || e.description) && /* @__PURE__ */ Z(L, {
+		children: /* @__PURE__ */ Q(H, {
+			className: q(fe, "flex flex-col h-[100dvh] sm:h-auto sm:max-h-[90vh] overflow-hidden p-0", r, e.className),
+			children: [(e.title || e.description) && /* @__PURE__ */ Q(B, {
 				className: "shrink-0 px-4 pt-4 sm:px-6 sm:pt-6 pb-2 border-b",
-				children: [e.title && /* @__PURE__ */ X(ee, { children: e.title }), e.description ? /* @__PURE__ */ X(I, { children: e.description }) : /* @__PURE__ */ X(I, {
+				children: [e.title && /* @__PURE__ */ Z(V, { children: e.title }), e.description ? /* @__PURE__ */ Z(z, { children: e.description }) : /* @__PURE__ */ Z(z, {
 					className: "sr-only",
 					children: "Enter the record and its line items, then save."
 				})]
-			}), /* @__PURE__ */ X("div", {
+			}), /* @__PURE__ */ Z("div", {
 				className: "@container flex-1 overflow-y-auto px-4 sm:px-6 py-4",
-				children: /* @__PURE__ */ X(wt, {
+				children: /* @__PURE__ */ Z(Mt, {
 					schema: {
 						type: "object-master-detail-form",
 						objectName: e.objectName,
@@ -2181,109 +2439,119 @@ var kt = ge({
 						sections: e.sections,
 						initialValues: e.initialValues,
 						initialData: e.initialData,
-						submitText: we,
-						cancelText: Te,
-						details: ke,
+						submitText: xe,
+						cancelText: Ce,
+						details: Ee,
 						onSuccess: async (t) => {
 							await e.onSuccess?.(t), e.onOpenChange?.(!1);
 						},
 						onError: e.onError,
 						onCancel: () => e.onOpenChange?.(!1)
 					},
-					dataSource: n
+					dataSource: t
 				})
 			})]
 		})
 	});
-	let Ae = !z && !V && (xe || Ce);
-	return /* @__PURE__ */ X(F, {
-		open: de,
+	let De = !F && !L && (ye || be);
+	return /* @__PURE__ */ Z(R, {
+		open: se,
 		onOpenChange: (t) => {
 			if (t) {
 				e.onOpenChange?.(!0);
 				return;
 			}
-			ve(!1);
+			ge(!1);
 		},
-		children: /* @__PURE__ */ Z(R, {
-			className: G(he, "flex flex-col h-[100dvh] sm:h-auto sm:max-h-[90vh] overflow-hidden p-0", c, e.className),
+		children: /* @__PURE__ */ Q(H, {
+			className: q(fe, "flex flex-col h-[100dvh] sm:h-auto sm:max-h-[90vh] overflow-hidden p-0", r, e.className),
 			children: [
-				(e.title || e.description) && /* @__PURE__ */ Z(L, {
+				(e.title || e.description) && /* @__PURE__ */ Q(B, {
 					className: "shrink-0 px-4 pt-4 sm:px-6 sm:pt-6 pb-2 border-b",
-					children: [e.title && /* @__PURE__ */ X(ee, { children: e.title }), e.description ? /* @__PURE__ */ X(I, { children: e.description }) : /* @__PURE__ */ X(I, {
+					children: [e.title && /* @__PURE__ */ Z(V, { children: e.title }), e.description ? /* @__PURE__ */ Z(z, { children: e.description }) : /* @__PURE__ */ Z(z, {
 						className: "sr-only",
 						children: "Complete the form fields, then submit or cancel."
 					})]
 				}),
-				/* @__PURE__ */ X("div", {
+				/* @__PURE__ */ Z("div", {
 					className: "@container flex-1 overflow-y-auto px-4 sm:px-6 py-4",
-					children: De()
+					children: Te()
 				}),
-				Ae && /* @__PURE__ */ X("div", {
+				De && /* @__PURE__ */ Z("div", {
 					className: "shrink-0 border-t px-4 sm:px-6 py-3 bg-background",
 					"data-testid": "modal-form-footer",
-					children: /* @__PURE__ */ Z("div", {
+					children: /* @__PURE__ */ Q("div", {
 						className: "flex flex-col sm:flex-row gap-2 sm:justify-end",
-						children: [Ce && /* @__PURE__ */ X(k, {
+						children: [be && /* @__PURE__ */ Z(M, {
 							type: "button",
 							variant: "outline",
-							onClick: ye,
+							onClick: _e,
 							disabled: U,
 							className: "w-full sm:w-auto",
-							children: Te
-						}), xe && /* @__PURE__ */ Z(k, {
+							children: Ce
+						}), ye && /* @__PURE__ */ Q(M, {
 							type: "submit",
-							form: fe,
+							form: ce,
 							disabled: U,
 							className: "w-full sm:w-auto",
-							children: [U && /* @__PURE__ */ X(me, { className: "mr-2 h-4 w-4 animate-spin" }), we]
+							children: [U && /* @__PURE__ */ Z(ue, { className: "mr-2 h-4 w-4 animate-spin" }), xe]
 						})]
 					})
 				}),
-				/* @__PURE__ */ X(x, {
+				/* @__PURE__ */ Z(w, {
 					open: K,
-					onOpenChange: ce,
-					children: /* @__PURE__ */ Z(w, { children: [/* @__PURE__ */ Z(D, { children: [/* @__PURE__ */ X(O, { children: f("form.discardTitle") }), /* @__PURE__ */ X(T, { children: f("form.discardMessage") })] }), /* @__PURE__ */ Z(E, { children: [/* @__PURE__ */ X(C, {
+					onOpenChange: J,
+					children: /* @__PURE__ */ Q(D, { children: [/* @__PURE__ */ Q(A, { children: [/* @__PURE__ */ Z(j, { children: d("form.discardTitle") }), /* @__PURE__ */ Z(O, { children: d("form.discardMessage") })] }), /* @__PURE__ */ Q(k, { children: [/* @__PURE__ */ Z(E, {
 						onClick: () => {
-							q.current = !1;
+							ae.current = !1;
 						},
-						children: f("form.keepEditing")
-					}), /* @__PURE__ */ X(S, {
-						onClick: Q,
-						children: f("form.discard")
+						children: d("form.keepEditing")
+					}), /* @__PURE__ */ Z(T, {
+						onClick: $,
+						children: d("form.discard")
 					})] })] })
-				})
+				}),
+				ie
 			]
 		})
 	});
-}, Mt = ({ schema: e, dataSource: t }) => {
-	let n = le(), r = a(() => {
-		let t = e.groups, r = !e.sections?.length && Array.isArray(t) && t.length ? {
-			...e,
-			sections: t.map((e) => ({
+};
+//#endregion
+//#region src/ObjectForm.tsx
+function Bt(e) {
+	let t = e.buttons, n = e.defaults;
+	if (!t && !n) return e;
+	let r = e, i = { ...r };
+	return t?.submit?.show !== void 0 && r.showSubmit === void 0 && (i.showSubmit = t.submit.show), t?.submit?.label != null && r.submitText === void 0 && (i.submitText = t.submit.label), t?.cancel?.show !== void 0 && r.showCancel === void 0 && (i.showCancel = t.cancel.show), t?.cancel?.label != null && r.cancelText === void 0 && (i.cancelText = t.cancel.label), t?.reset?.show !== void 0 && r.showReset === void 0 && (i.showReset = t.reset.show), n && r.initialValues === void 0 && (i.initialValues = n), i;
+}
+var Vt = ({ schema: e, dataSource: t }) => {
+	let n = Y(), r = o(() => {
+		let t = Bt(e), r = t.groups, i = !t.sections?.length && Array.isArray(r) && r.length ? {
+			...t,
+			sections: r.map((e) => ({
 				label: e.title ?? e.label,
 				description: e.description,
 				collapsible: e.collapsible,
 				collapsed: e.defaultCollapsed ?? e.collapsed,
 				fields: e.fields ?? []
 			}))
-		} : e;
-		if (!n?.isLoaded) return r;
-		let i = (e) => e?.name ? n.checkField(r.objectName, e.name, "read") ? !n.checkField(r.objectName, e.name, "write") && r.mode !== "view" ? {
+		} : t;
+		if (!n?.isLoaded) return i;
+		let a = (e) => e?.name ? n.checkField(i.objectName, e.name, "read") ? !n.checkField(i.objectName, e.name, "write") && i.mode !== "view" ? {
 			...e,
 			readOnly: !0,
 			disabled: !0
-		} : e : null : e, a = (e) => Array.isArray(e) ? e.map(i).filter(Boolean) : e;
+		} : e : null : e, o = (e) => Array.isArray(e) ? e.map(a).filter(Boolean) : e;
 		return {
-			...r,
-			fields: a(r.fields),
-			sections: r.sections?.map((e) => ({
+			...i,
+			fields: o(i.fields),
+			sections: i.sections?.map((e) => ({
 				...e,
-				fields: a(e.fields)
+				fields: o(e.fields)
 			}))
 		};
-	}, [e, n]), { sectionLabel: i } = h(), o = (e) => e?.name ? i(r.objectName, e.name, e.label || e.name) : e?.label;
-	if (r.subforms?.length && r.mode !== "view" && r.formType !== "drawer" && r.formType !== "modal") return /* @__PURE__ */ X(wt, {
+	}, [e, n]), { sectionLabel: i } = v(), a = (e) => e?.name ? i(r.objectName, e.name, e.label || e.name) : e?.label;
+	if (r.subforms?.length && r.mode !== "view" && r.formType !== "drawer" && r.formType !== "modal") return /* @__PURE__ */ Z(Mt, {
 		schema: {
 			type: "object-master-detail-form",
 			objectName: r.objectName,
@@ -2306,13 +2574,13 @@ var kt = ge({
 		},
 		dataSource: t
 	});
-	if (r.formType === "tabbed" && r.sections?.length) return /* @__PURE__ */ X(Ve, {
+	if (r.formType === "tabbed" && r.sections?.length) return /* @__PURE__ */ Z(Ge, {
 		schema: {
 			...r,
 			formType: "tabbed",
 			sections: r.sections.map((e) => ({
 				name: e.name,
-				label: o(e),
+				label: a(e),
 				description: e.description,
 				columns: e.columns,
 				fields: e.fields,
@@ -2325,13 +2593,13 @@ var kt = ge({
 		dataSource: t,
 		className: r.className
 	});
-	if (r.formType === "wizard" && r.sections?.length) return /* @__PURE__ */ X(He, {
+	if (r.formType === "wizard" && r.sections?.length) return /* @__PURE__ */ Z(Ye, {
 		schema: {
 			...r,
 			formType: "wizard",
 			sections: r.sections.map((e) => ({
 				name: e.name,
-				label: o(e),
+				label: a(e),
 				description: e.description,
 				columns: e.columns,
 				fields: e.fields,
@@ -2347,16 +2615,17 @@ var kt = ge({
 		dataSource: t,
 		className: r.className
 	});
-	if (r.formType === "split" && r.sections?.length) return /* @__PURE__ */ X(Ue, {
+	if (r.formType === "split" && r.sections?.length) return /* @__PURE__ */ Z(Xe, {
 		schema: {
 			...r,
 			formType: "split",
 			sections: r.sections.map((e) => ({
 				name: e.name,
-				label: o(e),
+				label: a(e),
 				description: e.description,
 				columns: e.columns,
 				fields: e.fields,
+				pane: e.pane,
 				className: e.className,
 				gridClassName: e.gridClassName
 			})),
@@ -2369,14 +2638,14 @@ var kt = ge({
 	});
 	if (r.formType === "drawer") {
 		let { layout: e, ...n } = r, i = r.layout === "vertical" || r.layout === "horizontal" ? r.layout : void 0;
-		return /* @__PURE__ */ X(Dt, {
+		return /* @__PURE__ */ Z(Ft, {
 			schema: {
 				...n,
 				layout: i,
 				formType: "drawer",
 				sections: r.sections?.map((e) => ({
 					name: e.name,
-					label: o(e),
+					label: a(e),
 					description: e.description,
 					columns: e.columns,
 					fields: e.fields,
@@ -2395,14 +2664,14 @@ var kt = ge({
 	}
 	if (r.formType === "modal") {
 		let { layout: e, ...n } = r, i = r.layout === "vertical" || r.layout === "horizontal" ? r.layout : void 0;
-		return /* @__PURE__ */ X(jt, {
+		return /* @__PURE__ */ Z(zt, {
 			schema: {
 				...n,
 				layout: i,
 				formType: "modal",
 				sections: r.sections?.map((e) => ({
 					name: e.name,
-					label: o(e),
+					label: a(e),
 					description: e.description,
 					columns: e.columns,
 					fields: e.fields,
@@ -2418,65 +2687,65 @@ var kt = ge({
 			className: r.className
 		});
 	}
-	return /* @__PURE__ */ X(Nt, {
+	return /* @__PURE__ */ Z(Ht, {
 		schema: r,
 		dataSource: t
 	});
-}, Nt = ({ schema: n, dataSource: i }) => {
-	let { fieldLabel: a, sectionLabel: o } = h(), c = ce(), u = le(), f = t((e) => {
-		if (!u?.isLoaded) return e;
-		let t = [];
-		for (let r of e) u.checkField(n.objectName, r.name, "read") && (!u.checkField(n.objectName, r.name, "write") && n.mode !== "view" ? t.push({
+}, Ht = ({ schema: e, dataSource: r }) => {
+	let { fieldLabel: a, sectionLabel: o } = v(), s = re(), l = Y(), u = n((t) => {
+		if (!l?.isLoaded) return t;
+		let n = [];
+		for (let r of t) l.checkField(e.objectName, r.name, "read") && (!l.checkField(e.objectName, r.name, "write") && e.mode !== "view" ? n.push({
 			...r,
 			readOnly: !0,
 			disabled: !0,
 			description: r.description ?? "You do not have edit access to this field."
-		}) : t.push(r));
-		return t;
+		}) : n.push(r));
+		return n;
 	}, [
-		u,
-		n.objectName,
-		n.mode
-	]), [p, m] = s(null), [g, _] = s([]), [x, S] = s(null), [C, w] = s(!0), [T, E] = s(null), [D, O] = s(null), k = n.customFields && n.customFields.length > 0;
-	r(() => {
-		k && (S(n.initialData || n.initialValues || {}), w(!1));
+		l,
+		e.objectName,
+		e.mode
+	]), [f, p] = c(null), [h, g] = c([]), [_, y] = c(null), [b, w] = c(!0), [T, E] = c(null), [D, O] = c(null), { saveWithOcc: k, conflictDialog: A } = We(), j = e.customFields && e.customFields.length > 0;
+	i(() => {
+		j && (y(e.initialData || e.initialValues || {}), w(!1));
 	}, [
-		k,
-		n.initialData,
-		n.initialValues
-	]), r(() => {
-		k ? m({
-			name: n.objectName,
+		j,
+		e.initialData,
+		e.initialValues
+	]), i(() => {
+		j ? p({
+			name: e.objectName,
 			fields: {}
-		}) : n.objectName && i ? (async () => {
+		}) : e.objectName && r ? (async () => {
 			try {
-				if (!i) throw Error("DataSource is required when using ObjectQL schema fetching (inline fields not provided)");
-				let e = await i.getObjectSchema(n.objectName);
-				if (!e) throw Error(`No schema found for object "${n.objectName}"`);
-				m(e);
+				if (!r) throw Error("DataSource is required when using ObjectQL schema fetching (inline fields not provided)");
+				let t = await r.getObjectSchema(e.objectName);
+				if (!t) throw Error(`No schema found for object "${e.objectName}"`);
+				p(t);
 			} catch (e) {
 				E(e), w(!1);
 			}
-		})() : k || w(!1);
+		})() : j || w(!1);
 	}, [
-		n.objectName,
-		i,
-		k
-	]), r(() => {
-		p && !k && (async () => {
-			if (!n.recordId || n.mode === "create") {
-				S(n.initialData || n.initialValues || {}), w(!1);
+		e.objectName,
+		r,
+		j
+	]), i(() => {
+		f && !j && (async () => {
+			if (!e.recordId || e.mode === "create") {
+				y(e.initialData || e.initialValues || {}), w(!1);
 				return;
 			}
-			if (!k) {
-				if (!i) {
+			if (!j) {
+				if (!r) {
 					E(/* @__PURE__ */ Error("DataSource is required for fetching record data (inline data not provided)")), w(!1);
 					return;
 				}
 				w(!0);
 				try {
-					let e = await i.findOne(n.objectName, n.recordId);
-					S(e);
+					let t = await r.findOne(e.objectName, e.recordId);
+					y(t);
 				} catch (e) {
 					console.error("Failed to fetch record:", e), E(e);
 				} finally {
@@ -2485,269 +2754,280 @@ var kt = ge({
 			}
 		})();
 	}, [
-		n.objectName,
-		n.recordId,
-		n.mode,
-		n.initialValues,
-		n.initialData,
-		i,
-		p,
-		k
+		e.objectName,
+		e.recordId,
+		e.mode,
+		e.initialValues,
+		e.initialData,
+		r,
+		f,
+		j
 	]);
-	let A = t((e) => e, []);
-	r(() => {
-		if (k && n.customFields) {
-			_(n.customFields.map(A)), w(!1);
+	let M = n((e) => e, []);
+	i(() => {
+		if (j && e.customFields) {
+			g(e.customFields.map(M)), w(!1);
 			return;
 		}
-		if (!p) return;
-		let e = [], t = l(p), r = !(n.mode === "edit" ? t.edit : n.mode !== "create" || t.create), o = n.fields || Object.keys(p.fields || {});
-		(Array.isArray(o) ? o : Object.keys(o)).forEach((t) => {
-			let i = typeof t == "string" ? t : t.name;
-			if (!i) return;
-			let o = p.fields?.[i];
-			if (!o && !k) return;
-			let s = !o?.permissions || o?.permissions.write !== !1;
-			if (n.mode !== "view" && !s) return;
-			let c = n.customFields?.find((e) => e.name === i);
-			if (c) e.push(A(c));
+		if (!f) return;
+		let t = [], n = d(f, l?.getObjectApiOperations?.(e.objectName)), i = !(e.mode === "edit" ? n.edit : e.mode !== "create" || n.create), o = e.fields || Object.keys(f.fields || {});
+		(Array.isArray(o) ? o : Object.keys(o)).forEach((n) => {
+			let r = typeof n == "string" ? n : n.name;
+			if (!r) return;
+			let o = f.fields?.[r];
+			if (!o && !j) return;
+			let s = e.customFields?.find((e) => e.name === r);
+			if (s) t.push(M(s));
 			else if (o) {
 				let s = {
-					name: i,
-					label: a(n.objectName, i, o.label || t),
-					type: b(o.type),
+					name: r,
+					label: a(e.objectName, r, o.label || n),
+					type: C(o.type),
 					required: o.required || !1,
-					disabled: n.readOnly || n.mode === "view" || o.readonly || r,
+					disabled: e.readOnly || e.mode === "view" || o.readonly || i,
 					placeholder: o.placeholder,
 					description: o.help || o.description,
-					validation: v(o),
+					validation: x(o),
 					visibleWhen: o.visibleWhen,
 					readonlyWhen: o.readonlyWhen,
-					requiredWhen: o.requiredWhen ?? o.conditionalRequired,
+					requiredWhen: o.requiredWhen,
 					group: o.group,
 					field: o,
 					widget: o.widget
 				};
-				if ((o.type === "select" || o.type === "lookup" || o.type === "master_detail") && (s.options = o.options || [], s.multiple = o.multiple), (o.type === "number" || o.type === "currency" || o.type === "percent") && (s.inputType = "number", s.min = o.min, s.max = o.max, s.step = o.precision ? 10 ** -o.precision : void 0), o.type === "date" && (s.inputType = "date"), o.type === "datetime" && (s.inputType = "datetime-local"), (o.type === "text" || o.type === "textarea" || o.type === "markdown" || o.type === "html") && (s.maxLength = o.max_length, s.minLength = o.min_length), (o.type === "file" || o.type === "image") && (s.inputType = "file", s.multiple = o.multiple, s.accept = o.accept ? o.accept.join(",") : void 0, o.max_size)) {
-					let e = `Max size: ${y(o.max_size)}`;
+				if ((o.type === "select" || o.type === "lookup" || o.type === "master_detail") && (s.options = o.options || [], s.multiple = o.multiple), (o.type === "number" || o.type === "currency" || o.type === "percent") && (s.inputType = "number", s.min = o.min, s.max = o.max, s.step = o.precision ? 10 ** -o.precision : void 0), o.type === "date" && (s.inputType = "date"), o.type === "datetime" && (s.inputType = "datetime-local"), (o.type === "text" || o.type === "textarea" || o.type === "markdown" || o.type === "html") && (s.maxLength = o.maxLength ?? o.max_length, s.minLength = o.minLength ?? o.min_length), (o.type === "file" || o.type === "image") && (s.inputType = "file", s.multiple = o.multiple, s.accept = o.accept ? o.accept.join(",") : void 0, o.max_size)) {
+					let e = `Max size: ${S(o.max_size)}`;
 					s.description = s.description ? `${s.description} (${e})` : e;
 				}
-				o.type === "email" && (s.inputType = "email"), o.type === "phone" && (s.inputType = "tel"), o.type === "url" && (s.inputType = "url"), o.type === "password" && (s.inputType = "password"), o.type === "time" && (s.inputType = "time"), (o.type === "formula" || o.type === "summary" || o.type === "auto_number") && (s.disabled = !0), o.visible_on && (s.visibleOn = o.visible_on), e.push(s);
+				o.type === "email" && (s.inputType = "email"), o.type === "phone" && (s.inputType = "tel"), o.type === "url" && (s.inputType = "url"), o.type === "password" && (s.inputType = "password"), o.type === "time" && (s.inputType = "time"), (o.type === "formula" || o.type === "summary" || o.type === "auto_number") && (s.disabled = !0), o.visible_on && (s.visibleOn = o.visible_on), t.push(s);
 			}
-		}), _(e), !k && n.recordId && n.mode !== "create" && i || w(!1);
+		}), g(t), !j && e.recordId && e.mode !== "create" && r || w(!1);
 	}, [
-		p,
-		n.fields,
-		n.customFields,
-		n.readOnly,
-		n.mode,
-		k,
-		n.recordId,
-		i
+		f,
+		e.fields,
+		e.customFields,
+		e.readOnly,
+		e.mode,
+		e.objectName,
+		j,
+		e.recordId,
+		r,
+		l
 	]);
-	let j = t(async (e, t) => {
-		if (e && (e.nativeEvent || e._reactName === "onSubmit") && (console.warn("ObjectForm: Received Event instead of data in handleSubmit! This suggests a Form renderer issue."), t === void 0 && (e = {})), k && !i) return n.onSuccess && await n.onSuccess(e), e;
-		if (!i) throw Error("DataSource is required for form submission (inline mode not configured)");
-		let r = Ke(e, k ? null : p);
-		if (u?.isLoaded && r && typeof r == "object") {
-			let e = {};
-			for (let t of Object.keys(r)) u.checkField(n.objectName, t, "write") && (e[t] = r[t]);
-			r = e;
+	let N = n(async (t, n) => {
+		if (t && (t.nativeEvent || t._reactName === "onSubmit") && (console.warn("ObjectForm: Received Event instead of data in handleSubmit! This suggests a Form renderer issue."), n === void 0 && (t = {})), j && !r) return e.onSuccess && await e.onSuccess(t), t;
+		if (!r) throw Error("DataSource is required for form submission (inline mode not configured)");
+		let i = $e(t, j ? null : f);
+		if (l?.isLoaded && i && typeof i == "object") {
+			let t = {};
+			for (let n of Object.keys(i)) l.checkField(e.objectName, n, "write") && (t[n] = i[n]);
+			i = t;
 		}
 		try {
-			let e;
-			if (n.submitHandler) e = await n.submitHandler(r);
-			else if (n.mode === "create") e = await i.create(n.objectName, r);
-			else if (n.mode === "edit" && n.recordId) e = await i.update(n.objectName, n.recordId, r);
-			else throw Error("Invalid form mode or missing record ID");
-			if (n.onSuccess) await n.onSuccess(e);
-			else if (!n.submitHandler && n.submitBehavior) {
-				let e = n.submitBehavior;
-				switch (e.kind) {
+			let t;
+			if (e.submitHandler) t = await e.submitHandler(i);
+			else if (e.mode === "create") t = await r.create(e.objectName, i);
+			else if (e.mode === "edit" && e.recordId) {
+				let n = await k({
+					dataSource: r,
+					objectName: e.objectName,
+					recordId: e.recordId,
+					payload: i,
+					baseRecord: _
+				});
+				if (n.status === "cancelled") return;
+				t = n.result;
+			} else throw Error("Invalid form mode or missing record ID");
+			if (e.onSuccess) await e.onSuccess(t);
+			else if (!e.submitHandler && e.submitBehavior) {
+				let t = e.submitBehavior;
+				switch (t.kind) {
 					case "redirect":
-						Q(e.url) && setTimeout(() => window.location.assign(e.url), e.delayMs ?? 0);
+						$(t.url) && setTimeout(() => window.location.assign(t.url), t.delayMs ?? 0);
 						break;
 					case "continue": break;
 					default: {
-						let t = e.kind === "thank-you" && e.message ? e.message : n.successMessage || (n.mode === "create" ? "Created" : "Saved");
-						K.success(t), O({
-							title: e.kind === "thank-you" ? e.title : void 0,
-							message: t
+						let n = t.kind === "thank-you" && t.message ? t.message : e.successMessage || (e.mode === "create" ? "Created" : "Saved");
+						J.success(n), O({
+							title: t.kind === "thank-you" ? t.title : void 0,
+							message: n
 						});
 						break;
 					}
 				}
-			} else if (!n.submitHandler) {
-				let t = ve(n.navigateOnSuccess, e);
-				if (t) return window.location.assign(t), e;
-				K.success(n.successMessage || (n.mode === "create" ? "Created" : "Saved"));
+			} else if (!e.submitHandler) {
+				let n = ge(e.navigateOnSuccess, t);
+				if (n) return window.location.assign(n), t;
+				J.success(e.successMessage || (e.mode === "create" ? "Created" : "Saved"));
 			}
-			return e;
-		} catch (e) {
-			throw console.error("Failed to submit form:", e), n.onError && n.onError(e), e;
+			return t;
+		} catch (t) {
+			throw console.error("Failed to submit form:", t), e.onError && e.onError(t), t;
 		}
 	}, [
-		n,
-		i,
+		e,
+		r,
+		j,
+		l,
+		f,
 		k,
-		u,
-		p
-	]), M = t(() => {
-		n.onCancel && n.onCancel();
-	}, [n]), N = {
-		...e.useMemo(() => {
-			if (!p?.fields) return {};
+		_
+	]), P = n(() => {
+		e.onCancel && e.onCancel();
+	}, [e]), F = {
+		...t.useMemo(() => {
+			if (!f?.fields) return {};
 			let e = {};
-			return Object.keys(p.fields).forEach((t) => {
-				let n = p.fields[t];
+			return Object.keys(f.fields).forEach((t) => {
+				let n = f.fields[t];
 				n.defaultValue !== void 0 && (e[t] = n.defaultValue);
 			}), e;
-		}, [p]),
-		...x
-	}, P = e.useMemo(() => {
-		let e = Ne(g, p);
-		return n.mode === "create" && (e = Fe(e, p)), e;
+		}, [f]),
+		..._
+	}, I = t.useMemo(() => {
+		let t = Ne(h, f);
+		return e.mode === "create" && (t = Fe(t, f)), t;
 	}, [
-		g,
-		p,
-		n.mode
-	]), F = e.useMemo(() => n.sections?.length ? null : Ot(P, p?.fieldGroups), [
-		n.sections,
-		P,
-		p
-	]), I = n.sections?.length ? n.sections : F, [L, ee] = s({});
-	if (T) return /* @__PURE__ */ Z("div", {
+		h,
+		f,
+		e.mode
+	]), L = t.useMemo(() => e.sections?.length ? null : It(I, f?.fieldGroups), [
+		e.sections,
+		I,
+		f
+	]), R = e.sections?.length ? e.sections : L, [z, B] = c({});
+	if (T) return /* @__PURE__ */ Q("div", {
 		className: "p-3 sm:p-4 border border-red-300 bg-red-50 rounded-md",
-		children: [/* @__PURE__ */ X("h3", {
+		children: [/* @__PURE__ */ Z("h3", {
 			className: "text-red-800 font-semibold",
 			children: "Error loading form"
-		}), /* @__PURE__ */ X("p", {
+		}), /* @__PURE__ */ Z("p", {
 			className: "text-red-600 text-sm mt-1",
 			children: T.message
 		})]
 	});
-	if (C) return /* @__PURE__ */ Z("div", {
+	if (b) return /* @__PURE__ */ Q("div", {
 		className: "p-4 sm:p-8 text-center",
-		children: [/* @__PURE__ */ X("div", { className: "inline-block animate-spin rounded-full h-8 w-8 border-b-2 border-gray-900" }), /* @__PURE__ */ X("p", {
+		children: [/* @__PURE__ */ Z("div", { className: "inline-block animate-spin rounded-full h-8 w-8 border-b-2 border-gray-900" }), /* @__PURE__ */ Z("p", {
 			className: "mt-2 text-sm text-gray-600",
 			children: "Loading form..."
 		})]
 	});
-	if (D) return /* @__PURE__ */ Z("div", {
+	if (D) return /* @__PURE__ */ Q("div", {
 		className: "rounded-md border bg-card p-6 sm:p-8 text-center",
-		children: [/* @__PURE__ */ X("h3", {
+		children: [/* @__PURE__ */ Z("h3", {
 			className: "text-lg font-semibold",
 			children: D.title ?? "Thanks!"
-		}), D.message && /* @__PURE__ */ X("p", {
+		}), D.message && /* @__PURE__ */ Z("p", {
 			className: "mt-2 text-sm text-muted-foreground",
 			children: D.message
 		})]
 	});
-	let R = n.layout === "vertical" || n.layout === "horizontal" ? n.layout : "vertical";
-	if (I?.length && (!n.formType || n.formType === "simple")) {
-		let e = F ? P : g, t = (e) => typeof e == "number" && e > 0 ? Math.min(Math.floor(e), 4) : void 0, r = I.map((e) => t(e.columns)).filter((e) => e != null), i = I.reduce((e, t) => e + (Array.isArray(t.fields) ? t.fields.length : 0), 0), a = t(n.columns) ?? (r.length ? Math.max(...r) : Oe(i)), s = [];
-		I.forEach((r, i) => {
-			let c = new Map(r.fields.map((e) => [typeof e == "string" ? e : e.field ?? e.name, e])), l = Array.from(c.keys()), u = f(e.filter((e) => l.includes(e.name))).map((e) => {
+	let V = e.layout === "vertical" || e.layout === "horizontal" ? e.layout : "vertical";
+	if (R?.length && (!e.formType || e.formType === "simple")) {
+		let t = L ? I : h, n = (e) => typeof e == "number" && e > 0 ? Math.min(Math.floor(e), 4) : void 0, r = R.map((e) => n(e.columns)).filter((e) => e != null), i = R.reduce((e, t) => e + (Array.isArray(t.fields) ? t.fields.length : 0), 0), a = n(e.columns) ?? (r.length ? Math.max(...r) : Oe(i)), s = [];
+		R.forEach((r, i) => {
+			let c = new Map(r.fields.map((e) => [typeof e == "string" ? e : e.field ?? e.name, e])), l = Array.from(c.keys()), d = u(t.filter((e) => l.includes(e.name))).map((e) => {
 				let t = c.get(e.name);
 				if (!t || typeof t != "object") return e;
 				let n = t, r = { ...e };
 				return n.visibleOn != null && (r.visibleOn = n.visibleOn), n.colSpan != null && (r.colSpan = n.colSpan), n.span != null && (r.span = n.span), r;
 			});
-			if (u.length === 0) return;
-			let d = r.name || r.label || String(i), p = r.name ? o(n.objectName, r.name, r.label || r.name) : r.label, m = L[d] ?? r.collapsed ?? !1;
+			if (d.length === 0) return;
+			let f = r.name || r.label || String(i), p = r.name ? o(e.objectName, r.name, r.label || r.name) : r.label, m = z[f] ?? r.collapsed ?? !1;
 			p && s.push({
-				name: `__section_${d}`,
+				name: `__section_${f}`,
 				label: p,
 				type: "section-divider",
 				colSpan: 4,
 				collapsible: r.collapsible,
 				collapsed: m,
-				onToggle: r.collapsible ? () => ee((e) => ({
+				onToggle: r.collapsible ? () => B((e) => ({
 					...e,
-					[d]: !m
+					[f]: !m
 				})) : void 0,
 				className: r.className
 			});
-			let h = t(r.columns), g = a > 1 ? je(u, a, h) : u;
+			let h = n(r.columns), g = a > 1 ? je(d, a, h) : d;
 			p && m ? s.push(...g.map((e) => ({
 				...e,
 				hidden: !0
 			}))) : s.push(...g);
 		});
 		let c = s, l = Le(a);
-		return /* @__PURE__ */ X("div", {
+		return /* @__PURE__ */ Q("div", {
 			className: "w-full @container",
-			children: /* @__PURE__ */ X(d, { schema: {
+			children: [/* @__PURE__ */ Z(m, { schema: {
 				type: "form",
-				objectName: n.objectName,
+				objectName: e.objectName,
 				fields: c,
-				layout: R,
+				layout: V,
 				columns: a,
 				...l ? { fieldContainerClass: l } : {},
-				defaultValues: N,
-				showSubmit: n.showSubmit !== !1 && n.mode !== "view",
-				showCancel: n.showCancel !== !1,
-				submitLabel: n.submitText || (n.mode === "create" ? "Create" : "Update"),
-				cancelLabel: n.cancelText,
-				onSubmit: j,
-				onCancel: M
-			} })
+				defaultValues: F,
+				showSubmit: e.showSubmit !== !1 && e.mode !== "view",
+				showCancel: e.showCancel !== !1,
+				submitLabel: e.submitText || (e.mode === "create" ? "Create" : "Update"),
+				cancelLabel: e.cancelText,
+				onSubmit: N,
+				onCancel: P
+			} }), A]
 		});
 	}
-	let z = n.sections?.length, B = f(g), V = z ? {
-		fields: B,
-		columns: n.columns
-	} : Be(B, p, n.columns, n.mode), H = n.mobile, U = H?.fullscreenLongText ? V.fields.map((e) => {
+	let H = e.sections?.length, ee = u(h), U = H ? {
+		fields: ee,
+		columns: e.columns
+	} : ze(ee, f, e.columns, e.mode), W = e.mobile, G = W?.fullscreenLongText ? U.fields.map((e) => {
 		let t = e.type;
 		return t === "textarea" || t === "field:textarea" || t === "string-multiline" || t === "field:markdown" || t === "field:html" ? {
 			...e,
 			mobile_fullscreen: !0
 		} : e;
-	}) : V.fields, W = H?.stepper, te = H?.stepperMinFields ?? 8, ne = Math.max(1, H?.stepperFieldsPerStep ?? 1);
-	if (!n.formType && !z && U.length >= 2 && (W === !0 || W === "auto" && c && U.length >= te)) {
-		let e = U, t = [];
-		for (let n = 0; n < e.length; n += ne) {
-			let r = e.slice(n, n + ne);
-			t.push({
-				name: `step-${Math.floor(n / ne) + 1}`,
-				label: r[0]?.label || r[0]?.name || `Step ${Math.floor(n / ne) + 1}`,
+	}) : U.fields, te = W?.stepper, ne = W?.stepperMinFields ?? 8, K = Math.max(1, W?.stepperFieldsPerStep ?? 1);
+	if (!e.formType && !H && G.length >= 2 && (te === !0 || te === "auto" && s && G.length >= ne)) {
+		let t = G, n = [];
+		for (let e = 0; e < t.length; e += K) {
+			let r = t.slice(e, e + K);
+			n.push({
+				name: `step-${Math.floor(e / K) + 1}`,
+				label: r[0]?.label || r[0]?.name || `Step ${Math.floor(e / K) + 1}`,
 				fields: r
 			});
 		}
-		return /* @__PURE__ */ X(He, {
+		return /* @__PURE__ */ Z(Ye, {
 			schema: {
-				...n,
+				...e,
 				formType: "wizard",
-				sections: t,
+				sections: n,
 				showStepIndicator: !0
 			},
-			dataSource: i,
-			className: n.className
+			dataSource: r,
+			className: e.className
 		});
 	}
-	let re = {
+	let q = {
 		type: "form",
-		objectName: n.objectName,
-		fields: U,
-		layout: R,
-		columns: V.columns,
-		submitLabel: n.submitText || (n.mode === "create" ? "Create" : "Update"),
-		cancelLabel: n.cancelText,
-		showSubmit: n.showSubmit !== !1 && n.mode !== "view",
-		showCancel: n.showCancel !== !1,
-		resetOnSubmit: n.showReset || n.submitBehavior?.kind === "continue" || !n.submitBehavior && n.resetOnSuccess && n.mode === "create",
-		defaultValues: N,
-		onSubmit: j,
-		onCancel: M,
-		className: n.className,
-		mobileStickyActions: !!H?.stickyActions
+		objectName: e.objectName,
+		fields: G,
+		layout: V,
+		columns: U.columns,
+		submitLabel: e.submitText || (e.mode === "create" ? "Create" : "Update"),
+		cancelLabel: e.cancelText,
+		showSubmit: e.showSubmit !== !1 && e.mode !== "view",
+		showCancel: e.showCancel !== !1,
+		resetOnSubmit: e.showReset || e.submitBehavior?.kind === "continue" || !e.submitBehavior && e.resetOnSuccess && e.mode === "create",
+		defaultValues: F,
+		onSubmit: N,
+		onCancel: P,
+		className: e.className,
+		mobileStickyActions: !!W?.stickyActions
 	};
-	return /* @__PURE__ */ X("div", {
-		className: H?.stickyActions ? "w-full pb-20 md:pb-0" : "w-full",
-		"data-mobile-form": H ? "true" : void 0,
-		children: /* @__PURE__ */ X(d, { schema: re })
+	return /* @__PURE__ */ Q("div", {
+		className: W?.stickyActions ? "w-full pb-20 md:pb-0" : "w-full",
+		"data-mobile-form": W ? "true" : void 0,
+		children: [/* @__PURE__ */ Z(m, { schema: q }), A]
 	});
-}, Pt = {
+}, Ut = {
 	text: 200,
 	email: 254,
 	url: 2048,
@@ -2755,8 +3035,8 @@ var kt = ge({
 	textarea: 5e3,
 	markdown: 5e3,
 	html: 5e3
-}, Ft = "_company_website_2", It = 1500;
-function Lt(e, t = []) {
+}, Wt = "_company_website_2", Gt = 1500;
+function Kt(e, t = []) {
 	try {
 		let n = new URL(e, typeof window < "u" ? window.location.href : "http://localhost");
 		return typeof window < "u" && n.origin === window.location.origin ? !0 : n.protocol !== "https:" && n.protocol !== "http:" ? !1 : t.some((e) => {
@@ -2771,36 +3051,36 @@ function Lt(e, t = []) {
 		return !1;
 	}
 }
-function Rt(e) {
+function qt(e) {
 	return e && e.map((e) => {
-		let t = Pt[String(e.type || "").toLowerCase()];
+		let t = Ut[String(e.type || "").toLowerCase()];
 		return !t || (e.maxLength ?? e.max_length) ? e : {
 			...e,
 			maxLength: t
 		};
 	});
 }
-var zt = ({ config: e, dataSource: n, prefillParams: i, className: c }) => {
-	let [l, u] = s(!1), [d, f] = s(!1), [p, m] = s(null), [h, g] = s(!(e.consent?.required ?? !!e.consent)), [_, v] = s(null), y = o(null), b = o(0);
-	r(() => {
+var Jt = ({ config: e, dataSource: t, prefillParams: r, className: a }) => {
+	let [l, u] = c(!1), [d, f] = c(!1), [p, m] = c(null), [h, g] = c(!(e.consent?.required ?? !!e.consent)), [_, v] = c(null), y = s(null), b = s(0);
+	i(() => {
 		l || (b.current = Date.now());
 	}, [l]);
-	let x = e.honeypot === !1 ? null : e.honeypot || Ft, S = e.minFillTime ?? It, C = a(() => Rt(e.customFields), [e.customFields]), w = a(() => {
-		if (!n || C && C.length > 0 || !e.fields || e.fields.length === 0) return;
-		let t = async (e, t) => t;
+	let x = e.honeypot === !1 ? null : e.honeypot || Wt, S = e.minFillTime ?? Gt, C = o(() => qt(e.customFields), [e.customFields]), w = o(() => {
+		if (!t || C && C.length > 0 || !e.fields || e.fields.length === 0) return;
+		let n = async (e, t) => t;
 		return {
-			...n,
-			create: t,
+			...t,
+			create: n,
 			update: (e, t, n) => Promise.resolve(n),
 			delete: () => Promise.reject(/* @__PURE__ */ Error("Not permitted on public form"))
 		};
 	}, [
-		n,
+		t,
 		C,
 		e.fields
-	]), T = a(() => {
+	]), T = o(() => {
 		let t = {};
-		if (i) for (let [e, n] of Object.entries(i)) t[e] = n;
+		if (r) for (let [e, n] of Object.entries(r)) t[e] = n;
 		if (typeof window < "u" && e.allowedPrefillFields?.length) {
 			let n = new Set(e.allowedPrefillFields);
 			new URLSearchParams(window.location.search).forEach((e, r) => {
@@ -2808,7 +3088,7 @@ var zt = ({ config: e, dataSource: n, prefillParams: i, className: c }) => {
 			});
 		}
 		return Object.keys(t).length > 0 ? t : void 0;
-	}, [i, e.allowedPrefillFields]), E = t(async (t) => {
+	}, [r, e.allowedPrefillFields]), E = n(async (n) => {
 		if (e.consent?.required && !h) {
 			v(e.texts?.consentRequired ?? "Please accept the privacy policy to continue.");
 			return;
@@ -2821,65 +3101,65 @@ var zt = ({ config: e, dataSource: n, prefillParams: i, className: c }) => {
 			m(e.texts?.rateLimited ?? "Please take a moment to review your answers before submitting.");
 			return;
 		}
-		let r = { ...t };
+		let r = { ...n };
 		x && delete r[x], e.captchaToken && (r._captcha = e.captchaToken), f(!0), m(null);
 		try {
-			n && await n.create(e.objectName, r), u(!0);
-			let t = e.thankYouPage?.redirectUrl;
-			if (t) if (Lt(t, e.allowedRedirectHosts)) {
-				let n = e.thankYouPage?.redirectDelay ?? 3e3;
+			t && await t.create(e.objectName, r), u(!0);
+			let n = e.thankYouPage?.redirectUrl;
+			if (n) if (Kt(n, e.allowedRedirectHosts)) {
+				let t = e.thankYouPage?.redirectDelay ?? 3e3;
 				setTimeout(() => {
-					window.location.href = t;
-				}, n);
-			} else console.warn("[EmbeddableForm] Blocked unsafe redirect target:", t), m(e.texts?.redirectBlocked ?? null);
+					window.location.href = n;
+				}, t);
+			} else console.warn("[EmbeddableForm] Blocked unsafe redirect target:", n), m(e.texts?.redirectBlocked ?? null);
 		} catch (e) {
 			m(e instanceof Error ? e.message : "Failed to submit form. Please try again.");
 		} finally {
 			f(!1);
 		}
 	}, [
-		n,
+		t,
 		e,
 		h,
 		x,
 		S
-	]), D = t(() => {
+	]), D = n(() => {
 		u(!1), m(null);
-	}, []), O = a(() => {
+	}, []), O = o(() => {
 		let t = {};
 		return e.branding?.backgroundColor && (t.backgroundColor = e.branding.backgroundColor), t;
 	}, [e.branding]);
 	if (l) {
 		let t = e.thankYouPage, n = e.texts ?? {}, r = Math.ceil((t?.redirectDelay ?? 3e3) / 1e3), i = (n.redirecting ?? "Redirecting in {{seconds}} seconds…").replace("{{seconds}}", String(r));
-		return /* @__PURE__ */ X("div", {
-			className: `min-h-screen flex items-center justify-center p-4 bg-gradient-to-b from-muted/40 via-background to-background ${c || ""}`,
+		return /* @__PURE__ */ Z("div", {
+			className: `min-h-screen flex items-center justify-center p-4 bg-gradient-to-b from-muted/40 via-background to-background ${a || ""}`,
 			style: O,
-			children: /* @__PURE__ */ Z("div", {
+			children: /* @__PURE__ */ Q("div", {
 				className: "max-w-md w-full bg-card border rounded-xl shadow-sm p-8 text-center space-y-4",
 				children: [
-					/* @__PURE__ */ X("div", {
+					/* @__PURE__ */ Z("div", {
 						className: "mx-auto inline-flex h-14 w-14 items-center justify-center rounded-full bg-emerald-50 text-emerald-600 dark:bg-emerald-500/10 dark:text-emerald-400",
-						children: /* @__PURE__ */ X(ue, {
+						children: /* @__PURE__ */ Z(se, {
 							className: "h-8 w-8",
 							"aria-hidden": "true"
 						})
 					}),
-					/* @__PURE__ */ X("h2", {
+					/* @__PURE__ */ Z("h2", {
 						className: "text-xl font-semibold text-foreground",
 						children: t?.title || n.thankYouTitle || "Thank You!"
 					}),
-					/* @__PURE__ */ X("p", {
+					/* @__PURE__ */ Z("p", {
 						className: "text-sm text-muted-foreground",
 						children: t?.message || n.thankYouMessage || "Your submission has been received successfully."
 					}),
-					e.allowMultiple && /* @__PURE__ */ X(k, {
+					e.allowMultiple && /* @__PURE__ */ Z(M, {
 						variant: "outline",
 						size: "sm",
 						onClick: D,
 						className: "mt-2",
 						children: n.submitAnother ?? "Submit Another Response"
 					}),
-					t?.redirectUrl && /* @__PURE__ */ X("p", {
+					t?.redirectUrl && /* @__PURE__ */ Z("p", {
 						className: "text-xs text-muted-foreground",
 						children: i
 					})
@@ -2887,52 +3167,52 @@ var zt = ({ config: e, dataSource: n, prefillParams: i, className: c }) => {
 			})
 		});
 	}
-	let A = e.texts ?? {}, j = !!e.consent?.required, M = `${e.formId}-consent`;
-	return /* @__PURE__ */ X("div", {
-		className: `min-h-screen flex items-center justify-center p-4 sm:p-6 bg-gradient-to-b from-muted/40 via-background to-background ${c || ""}`,
+	let k = e.texts ?? {}, A = !!e.consent?.required, j = `${e.formId}-consent`;
+	return /* @__PURE__ */ Z("div", {
+		className: `min-h-screen flex items-center justify-center p-4 sm:p-6 bg-gradient-to-b from-muted/40 via-background to-background ${a || ""}`,
 		style: O,
-		children: /* @__PURE__ */ Z("div", {
+		children: /* @__PURE__ */ Q("div", {
 			className: "max-w-2xl w-full bg-card border rounded-xl shadow-sm overflow-hidden",
 			children: [
-				e.branding?.coverImage && /* @__PURE__ */ X("div", {
+				e.branding?.coverImage && /* @__PURE__ */ Z("div", {
 					className: "h-28 sm:h-32 w-full bg-cover bg-center",
 					style: { backgroundImage: `url(${JSON.stringify(e.branding.coverImage)})` },
 					role: "presentation"
 				}),
-				/* @__PURE__ */ Z("div", {
+				/* @__PURE__ */ Q("div", {
 					className: "px-6 sm:px-8 pt-7 pb-5 border-b bg-muted/20",
 					style: e.branding?.primaryColor ? { borderBottomColor: e.branding.primaryColor } : void 0,
 					children: [
-						e.branding?.logo && /* @__PURE__ */ X("img", {
+						e.branding?.logo && /* @__PURE__ */ Z("img", {
 							src: e.branding.logo,
 							alt: "",
 							className: "h-8 mb-4"
 						}),
-						e.title && /* @__PURE__ */ X("h1", {
+						e.title && /* @__PURE__ */ Z("h1", {
 							className: "text-2xl font-semibold tracking-tight text-foreground",
 							children: e.title
 						}),
-						e.description && /* @__PURE__ */ X("p", {
+						e.description && /* @__PURE__ */ Z("p", {
 							className: "text-sm text-muted-foreground mt-2 leading-relaxed",
 							children: e.description
 						}),
-						/* @__PURE__ */ X("p", {
+						/* @__PURE__ */ Z("p", {
 							className: "text-[11px] text-muted-foreground/70 mt-3",
 							"aria-hidden": "true",
-							children: A.requiredHint ?? "* Required field"
+							children: k.requiredHint ?? "* Required field"
 						})
 					]
 				}),
-				/* @__PURE__ */ Z("div", {
+				/* @__PURE__ */ Q("div", {
 					className: "relative px-6 sm:px-8 py-6",
 					children: [
-						p && /* @__PURE__ */ X("div", {
+						p && /* @__PURE__ */ Z("div", {
 							role: "alert",
 							"aria-live": "assertive",
 							className: "mb-4 p-3 bg-destructive/10 border border-destructive/30 rounded-md text-sm text-destructive",
 							children: p
 						}),
-						/* @__PURE__ */ X(Mt, {
+						/* @__PURE__ */ Z(Vt, {
 							schema: {
 								type: "object-form",
 								objectName: e.objectName,
@@ -2941,17 +3221,17 @@ var zt = ({ config: e, dataSource: n, prefillParams: i, className: c }) => {
 								customFields: C,
 								initialData: T,
 								onSuccess: E,
-								submitText: d ? A.submitting ?? "Submitting..." : A.submit ?? "Submit"
+								submitText: d ? k.submitting ?? "Submitting..." : k.submit ?? "Submit"
 							},
 							dataSource: w
 						}),
-						x && /* @__PURE__ */ Z("div", {
+						x && /* @__PURE__ */ Q("div", {
 							"aria-hidden": "true",
 							className: "absolute left-[-10000px] top-auto h-px w-px overflow-hidden",
-							children: [/* @__PURE__ */ X("label", {
+							children: [/* @__PURE__ */ Z("label", {
 								htmlFor: `${e.formId}-${x}`,
 								children: "Do not fill this field"
-							}), /* @__PURE__ */ X("input", {
+							}), /* @__PURE__ */ Z("input", {
 								ref: y,
 								id: `${e.formId}-${x}`,
 								type: "text",
@@ -2961,75 +3241,75 @@ var zt = ({ config: e, dataSource: n, prefillParams: i, className: c }) => {
 								defaultValue: ""
 							})]
 						}),
-						e.consent && /* @__PURE__ */ Z("div", {
+						e.consent && /* @__PURE__ */ Q("div", {
 							className: "mt-4",
-							children: [/* @__PURE__ */ Z("label", {
+							children: [/* @__PURE__ */ Q("label", {
 								className: "flex items-start gap-2 text-sm text-foreground cursor-pointer select-none",
-								children: [/* @__PURE__ */ X("input", {
+								children: [/* @__PURE__ */ Z("input", {
 									type: "checkbox",
-									id: M,
+									id: j,
 									checked: h,
 									onChange: (e) => {
 										g(e.target.checked), e.target.checked && v(null);
 									},
-									"aria-required": j || void 0,
+									"aria-required": A || void 0,
 									"aria-invalid": _ ? "true" : void 0,
-									"aria-describedby": _ ? `${M}-error` : void 0,
+									"aria-describedby": _ ? `${j}-error` : void 0,
 									className: "mt-0.5 h-4 w-4 rounded border-input accent-primary"
-								}), /* @__PURE__ */ Z("span", {
+								}), /* @__PURE__ */ Q("span", {
 									className: "leading-relaxed",
 									children: [
-										e.consent.label ?? A.consentLabelDefault ?? "I agree to the privacy policy.",
-										j && /* @__PURE__ */ X("span", {
+										e.consent.label ?? k.consentLabelDefault ?? "I agree to the privacy policy.",
+										A && /* @__PURE__ */ Z("span", {
 											"aria-hidden": "true",
 											className: "text-destructive ml-0.5",
 											children: "*"
 										}),
-										e.consent.privacyUrl && /* @__PURE__ */ Z(he, { children: [" ", /* @__PURE__ */ X("a", {
+										e.consent.privacyUrl && /* @__PURE__ */ Q(me, { children: [" ", /* @__PURE__ */ Z("a", {
 											href: e.consent.privacyUrl,
 											target: "_blank",
 											rel: "noopener noreferrer",
 											className: "underline text-primary hover:opacity-80",
-											children: A.consentLink ?? "Privacy policy"
+											children: k.consentLink ?? "Privacy policy"
 										})] })
 									]
 								})]
-							}), _ && /* @__PURE__ */ X("p", {
-								id: `${M}-error`,
+							}), _ && /* @__PURE__ */ Z("p", {
+								id: `${j}-error`,
 								role: "alert",
 								className: "mt-1.5 text-xs text-destructive",
 								children: _
 							})]
 						}),
-						d && /* @__PURE__ */ Z("div", {
+						d && /* @__PURE__ */ Q("div", {
 							className: "mt-3 flex items-center gap-2 text-xs text-muted-foreground",
-							children: [/* @__PURE__ */ X(me, {
+							children: [/* @__PURE__ */ Z(ue, {
 								className: "h-3.5 w-3.5 animate-spin",
 								"aria-hidden": "true"
-							}), /* @__PURE__ */ X("span", { children: A.submitting ?? "Submitting…" })]
+							}), /* @__PURE__ */ Z("span", { children: k.submitting ?? "Submitting…" })]
 						})
 					]
 				}),
-				/* @__PURE__ */ Z("div", {
+				/* @__PURE__ */ Q("div", {
 					className: "px-6 sm:px-8 py-4 border-t bg-muted/20 flex flex-col sm:flex-row items-center justify-between gap-2",
-					children: [/* @__PURE__ */ Z("p", {
+					children: [/* @__PURE__ */ Q("p", {
 						className: "inline-flex items-center gap-1.5 text-xs text-muted-foreground",
-						children: [/* @__PURE__ */ X(J, {
+						children: [/* @__PURE__ */ Z(de, {
 							className: "h-3 w-3",
 							"aria-hidden": "true"
-						}), /* @__PURE__ */ X("span", { children: A.secureNotice ?? "Your information is transmitted securely and only used to respond to your request." })]
-					}), /* @__PURE__ */ Z("div", {
+						}), /* @__PURE__ */ Z("span", { children: k.secureNotice ?? "Your information is transmitted securely and only used to respond to your request." })]
+					}), /* @__PURE__ */ Q("div", {
 						className: "flex items-center gap-3 text-xs text-muted-foreground/80",
-						children: [e.privacyPolicyUrl && /* @__PURE__ */ Z("a", {
+						children: [e.privacyPolicyUrl && /* @__PURE__ */ Q("a", {
 							href: e.privacyPolicyUrl,
 							target: "_blank",
 							rel: "noopener noreferrer",
 							className: "inline-flex items-center gap-1 underline hover:text-foreground",
-							children: [/* @__PURE__ */ X(Y, {
+							children: [/* @__PURE__ */ Z(fe, {
 								className: "h-3 w-3",
 								"aria-hidden": "true"
-							}), A.consentLink ?? "Privacy policy"]
-						}), /* @__PURE__ */ X("span", { children: A.poweredBy ?? "Powered by ObjectStack" })]
+							}), k.consentLink ?? "Privacy policy"]
+						}), /* @__PURE__ */ Z("span", { children: k.poweredBy ?? "Powered by ObjectStack" })]
 					})]
 				})
 			]
@@ -3038,96 +3318,96 @@ var zt = ({ config: e, dataSource: n, prefillParams: i, className: c }) => {
 };
 //#endregion
 //#region src/FormAnalytics.tsx
-function Bt(e) {
+function Yt(e) {
 	return e < 60 ? `${Math.round(e)}s` : e < 3600 ? `${Math.floor(e / 60)}m ${Math.round(e % 60)}s` : `${Math.floor(e / 3600)}h ${Math.floor(e % 3600 / 60)}m`;
 }
-var Vt = ({ formId: e, formTitle: t, metrics: n, className: r }) => {
-	let i = a(() => {
+var Xt = ({ formId: e, formTitle: t, metrics: n, className: r }) => {
+	let i = o(() => {
 		if (!n.abandonedSubmissions) return 100;
 		let e = n.totalSubmissions + n.abandonedSubmissions;
 		return e === 0 ? 0 : Math.round(n.totalSubmissions / e * 100);
-	}, [n.totalSubmissions, n.abandonedSubmissions]), o = a(() => n.dailySubmissions?.length ? Math.max(...n.dailySubmissions.map((e) => e.count), 1) : 1, [n.dailySubmissions]);
-	return /* @__PURE__ */ Z("div", {
+	}, [n.totalSubmissions, n.abandonedSubmissions]), a = o(() => n.dailySubmissions?.length ? Math.max(...n.dailySubmissions.map((e) => e.count), 1) : 1, [n.dailySubmissions]);
+	return /* @__PURE__ */ Q("div", {
 		className: `space-y-4 ${r || ""}`,
 		children: [
-			/* @__PURE__ */ Z("div", { children: [/* @__PURE__ */ X("h2", {
+			/* @__PURE__ */ Q("div", { children: [/* @__PURE__ */ Z("h2", {
 				className: "text-lg font-semibold text-foreground",
 				children: t || "Form Analytics"
-			}), /* @__PURE__ */ Z("p", {
+			}), /* @__PURE__ */ Q("p", {
 				className: "text-sm text-muted-foreground",
 				children: ["Form ID: ", e]
 			})] }),
-			/* @__PURE__ */ Z("div", {
+			/* @__PURE__ */ Q("div", {
 				className: "grid grid-cols-1 sm:grid-cols-3 gap-4",
 				children: [
-					/* @__PURE__ */ X(A, { children: /* @__PURE__ */ Z(N, {
+					/* @__PURE__ */ Z(N, { children: /* @__PURE__ */ Q(I, {
 						className: "pb-2",
-						children: [/* @__PURE__ */ X(M, { children: "Total Submissions" }), /* @__PURE__ */ X(P, {
+						children: [/* @__PURE__ */ Z(F, { children: "Total Submissions" }), /* @__PURE__ */ Z(L, {
 							className: "text-2xl",
 							children: n.totalSubmissions.toLocaleString()
 						})]
 					}) }),
-					/* @__PURE__ */ Z(A, { children: [/* @__PURE__ */ Z(N, {
+					/* @__PURE__ */ Q(N, { children: [/* @__PURE__ */ Q(I, {
 						className: "pb-2",
-						children: [/* @__PURE__ */ X(M, { children: "Fill Rate" }), /* @__PURE__ */ Z(P, {
+						children: [/* @__PURE__ */ Z(F, { children: "Fill Rate" }), /* @__PURE__ */ Q(L, {
 							className: "text-2xl",
 							children: [i, "%"]
 						})]
-					}), /* @__PURE__ */ X(j, { children: /* @__PURE__ */ X("div", {
+					}), /* @__PURE__ */ Z(P, { children: /* @__PURE__ */ Z("div", {
 						className: "w-full bg-muted rounded-full h-2",
-						children: /* @__PURE__ */ X("div", {
+						children: /* @__PURE__ */ Z("div", {
 							className: "bg-primary rounded-full h-2 transition-all",
 							style: { width: `${i}%` }
 						})
 					}) })] }),
-					/* @__PURE__ */ X(A, { children: /* @__PURE__ */ Z(N, {
+					/* @__PURE__ */ Z(N, { children: /* @__PURE__ */ Q(I, {
 						className: "pb-2",
-						children: [/* @__PURE__ */ X(M, { children: "Avg. Completion Time" }), /* @__PURE__ */ X(P, {
+						children: [/* @__PURE__ */ Z(F, { children: "Avg. Completion Time" }), /* @__PURE__ */ Z(L, {
 							className: "text-2xl",
-							children: n.avgCompletionTime ? Bt(n.avgCompletionTime) : "—"
+							children: n.avgCompletionTime ? Yt(n.avgCompletionTime) : "—"
 						})]
 					}) })
 				]
 			}),
-			n.dailySubmissions && n.dailySubmissions.length > 0 && /* @__PURE__ */ Z(A, { children: [/* @__PURE__ */ X(N, { children: /* @__PURE__ */ X(P, {
+			n.dailySubmissions && n.dailySubmissions.length > 0 && /* @__PURE__ */ Q(N, { children: [/* @__PURE__ */ Z(I, { children: /* @__PURE__ */ Z(L, {
 				className: "text-sm font-medium",
 				children: "Daily Submissions"
-			}) }), /* @__PURE__ */ X(j, { children: /* @__PURE__ */ X("div", {
+			}) }), /* @__PURE__ */ Z(P, { children: /* @__PURE__ */ Z("div", {
 				className: "flex items-end gap-1 h-32",
-				children: n.dailySubmissions.map((e, t) => /* @__PURE__ */ Z("div", {
+				children: n.dailySubmissions.map((e, t) => /* @__PURE__ */ Q("div", {
 					className: "flex-1 flex flex-col items-center gap-1",
-					children: [/* @__PURE__ */ X("div", {
+					children: [/* @__PURE__ */ Z("div", {
 						className: "w-full bg-primary/80 rounded-t transition-all hover:bg-primary",
 						style: {
-							height: `${e.count / o * 100}%`,
+							height: `${e.count / a * 100}%`,
 							minHeight: e.count > 0 ? "4px" : "0"
 						},
 						title: `${e.date}: ${e.count} submissions`
-					}), /* @__PURE__ */ X("span", {
+					}), /* @__PURE__ */ Z("span", {
 						className: "text-[10px] text-muted-foreground truncate w-full text-center",
 						children: e.date.slice(-5)
 					})]
 				}, t))
 			}) })] }),
-			n.fieldDropOff && n.fieldDropOff.length > 0 && /* @__PURE__ */ Z(A, { children: [/* @__PURE__ */ Z(N, { children: [/* @__PURE__ */ X(P, {
+			n.fieldDropOff && n.fieldDropOff.length > 0 && /* @__PURE__ */ Q(N, { children: [/* @__PURE__ */ Q(I, { children: [/* @__PURE__ */ Z(L, {
 				className: "text-sm font-medium",
 				children: "Field Completion Rates"
-			}), /* @__PURE__ */ X(M, { children: "Percentage of users who completed each field" })] }), /* @__PURE__ */ X(j, { children: /* @__PURE__ */ X("div", {
+			}), /* @__PURE__ */ Z(F, { children: "Percentage of users who completed each field" })] }), /* @__PURE__ */ Z(P, { children: /* @__PURE__ */ Z("div", {
 				className: "space-y-3",
-				children: n.fieldDropOff.map((e, t) => /* @__PURE__ */ Z("div", {
+				children: n.fieldDropOff.map((e, t) => /* @__PURE__ */ Q("div", {
 					className: "space-y-1",
-					children: [/* @__PURE__ */ Z("div", {
+					children: [/* @__PURE__ */ Q("div", {
 						className: "flex justify-between text-sm",
-						children: [/* @__PURE__ */ X("span", {
+						children: [/* @__PURE__ */ Z("span", {
 							className: "text-foreground",
 							children: e.label
-						}), /* @__PURE__ */ Z("span", {
+						}), /* @__PURE__ */ Q("span", {
 							className: "text-muted-foreground",
 							children: [e.completionRate, "%"]
 						})]
-					}), /* @__PURE__ */ X("div", {
+					}), /* @__PURE__ */ Z("div", {
 						className: "w-full bg-muted rounded-full h-1.5",
-						children: /* @__PURE__ */ X("div", {
+						children: /* @__PURE__ */ Z("div", {
 							className: `rounded-full h-1.5 transition-all ${e.completionRate >= 80 ? "bg-green-500" : e.completionRate >= 50 ? "bg-yellow-500" : "bg-destructive"}`,
 							style: { width: `${e.completionRate}%` }
 						})
@@ -3136,76 +3416,76 @@ var Vt = ({ formId: e, formTitle: t, metrics: n, className: r }) => {
 			}) })] })
 		]
 	});
-}, Ht = ({ schema: e }) => {
-	let n = g()?.dataSource, i = m(), o = e.parentObject || i?.objectName, c = e.parentId || e.recordId || i?.recordId, [l, d] = s([]), [f, p] = s([]), [h, v] = s(!0), [y, b] = s(!1), [x, S] = s(!1), [C, w] = s(null), [T, E] = s(null);
-	r(() => {
-		let t = n;
-		if (!t || typeof t.getObjectSchema != "function") return;
+}, Zt = ({ schema: e }) => {
+	let t = y()?.dataSource, r = _(), a = e.parentObject || r?.objectName, s = e.parentId || e.recordId || r?.recordId, [l, u] = c([]), [d, f] = c([]), [m, h] = c(!0), [g, v] = c(!1), [x, S] = c(!1), [C, w] = c(null), [T, E] = c(null);
+	i(() => {
+		let n = t;
+		if (!n || typeof n.getObjectSchema != "function") return;
 		let r = !1;
-		return t.getObjectSchema(e.childObject).then((e) => {
+		return n.getObjectSchema(e.childObject).then((e) => {
 			r || E(e ?? null);
 		}).catch(() => {
 			r || E(null);
 		}), () => {
 			r = !0;
 		};
-	}, [n, e.childObject]);
-	let D = t(async () => {
-		if (!n || !c) {
-			v(!1);
+	}, [t, e.childObject]);
+	let D = n(async () => {
+		if (!t || !s) {
+			h(!1);
 			return;
 		}
-		v(!0);
+		h(!0);
 		try {
-			let t = (await n.find(e.childObject, {
-				$filter: { [e.relationshipField]: c },
+			let n = (await t.find(e.childObject, {
+				$filter: { [e.relationshipField]: s },
 				$top: 500
 			}))?.data ?? [];
-			d(t.map((e) => ({ ...e }))), p(t.map((e) => ({ ...e }))), S(!1);
+			u(n.map((e) => ({ ...e }))), f(n.map((e) => ({ ...e }))), S(!1);
 		} catch (e) {
 			w(e?.message || "Failed to load line items");
 		} finally {
-			v(!1);
+			h(!1);
 		}
 	}, [
-		n,
-		c,
+		t,
+		s,
 		e.childObject,
 		e.relationshipField
 	]);
-	r(() => {
+	i(() => {
 		D();
 	}, [D]);
-	let O = t((e) => {
-		d(e), S(!0);
-	}, []), M = t(async () => {
-		if (!(!n || !c)) {
-			b(!0), w(null);
+	let O = n((e) => {
+		u(e), S(!0);
+	}, []), k = n(async () => {
+		if (!(!t || !s)) {
+			v(!0), w(null);
 			try {
-				let t = !!(o && e.totalField), r = t ? { [e.totalField]: et(l, e.amountField || "amount") } : {}, i = Qe(o ?? "", c, r, [{
+				let n = !!(a && e.totalField), r = n ? { [e.totalField]: st(l, e.amountField || "amount") } : {}, i = at(a ?? "", s, r, [{
 					childObject: e.childObject,
 					relationshipField: e.relationshipField,
 					rows: l,
-					original: f,
+					original: d,
 					childSchema: T
 				}]);
-				t || (i = i.slice(1)), i.length && await u(n, i), await D();
+				n || (i = i.slice(1)), i.length && await p(t, i), await D();
 			} catch (e) {
 				w(e?.message || "Failed to save line items");
 			} finally {
-				b(!1);
+				v(!1);
 			}
 		}
 	}, [
-		n,
-		c,
+		t,
+		s,
 		l,
-		f,
+		d,
 		e,
-		o,
+		a,
 		D,
 		T
-	]), F = a(() => ({
+	]), A = o(() => ({
 		columns: e.columns,
 		total_field: e.totalField ? e.amountField || "amount" : void 0,
 		min_rows: e.minRows,
@@ -3213,41 +3493,41 @@ var Vt = ({ formId: e, formTitle: t, metrics: n, className: r }) => {
 		allow_add: !e.readonly,
 		allow_delete: !e.readonly
 	}), [e]);
-	return /* @__PURE__ */ Z(A, {
-		className: G("shadow-none"),
-		children: [/* @__PURE__ */ Z(N, {
+	return /* @__PURE__ */ Q(N, {
+		className: q("shadow-none"),
+		children: [/* @__PURE__ */ Q(I, {
 			className: "flex-row items-center justify-between gap-2 pb-2",
-			children: [/* @__PURE__ */ X(P, {
+			children: [/* @__PURE__ */ Z(L, {
 				className: "text-sm font-medium",
 				children: e.title || "Line Items"
-			}), !e.readonly && /* @__PURE__ */ X(k, {
+			}), !e.readonly && /* @__PURE__ */ Z(M, {
 				type: "button",
 				size: "sm",
-				onClick: M,
-				disabled: y || h || !x || !c,
-				children: y ? "Saving…" : "Save"
+				onClick: k,
+				disabled: g || m || !x || !s,
+				children: g ? "Saving…" : "Save"
 			})]
-		}), /* @__PURE__ */ Z(j, { children: [C && /* @__PURE__ */ X("p", {
+		}), /* @__PURE__ */ Q(P, { children: [C && /* @__PURE__ */ Z("p", {
 			className: "mb-2 text-sm text-destructive",
 			children: C
-		}), h ? /* @__PURE__ */ X("p", {
+		}), m ? /* @__PURE__ */ Z("p", {
 			className: "py-6 text-center text-sm text-muted-foreground",
 			children: "Loading…"
-		}) : c ? /* @__PURE__ */ X(_, {
+		}) : s ? /* @__PURE__ */ Z(b, {
 			value: l,
 			onChange: O,
-			field: F,
+			field: A,
 			readonly: e.readonly
-		}) : /* @__PURE__ */ X("p", {
+		}) : /* @__PURE__ */ Z("p", {
 			className: "py-6 text-center text-sm text-muted-foreground",
 			children: "Save the record first to add line items."
 		})] })]
 	});
-}, Ut = ({ schema: e }) => /* @__PURE__ */ X(Mt, {
+}, Qt = ({ schema: e }) => /* @__PURE__ */ Z(Vt, {
 	schema: e,
-	dataSource: n(f)?.dataSource ?? void 0
+	dataSource: r(h)?.dataSource ?? void 0
 });
-c.register("object-form", Ut, {
+l.register("object-form", Qt, {
 	namespace: "plugin-form",
 	label: "Object Form",
 	category: "plugin",
@@ -3388,7 +3668,7 @@ c.register("object-form", Ut, {
 			]
 		}
 	]
-}), c.register("form", Ut, {
+}), l.register("form", Qt, {
 	namespace: "view",
 	skipFallback: !0,
 	label: "Data Form View",
@@ -3416,7 +3696,7 @@ c.register("object-form", Ut, {
 			]
 		}
 	]
-}), c.register("embeddable-form", ({ schema: e }) => /* @__PURE__ */ X(zt, { config: e }), {
+}), l.register("embeddable-form", ({ schema: e }) => /* @__PURE__ */ Z(Jt, { config: e }), {
 	namespace: "plugin-form",
 	label: "Embeddable Form",
 	category: "plugin",
@@ -3454,7 +3734,7 @@ c.register("object-form", Ut, {
 			label: "Allow Multiple Submissions"
 		}
 	]
-}), c.register("form-analytics", ({ schema: e }) => /* @__PURE__ */ X(Vt, {
+}), l.register("form-analytics", ({ schema: e }) => /* @__PURE__ */ Z(Xt, {
 	formId: e.formId,
 	formTitle: e.formTitle,
 	metrics: e.metrics || { totalSubmissions: 0 }
@@ -3480,9 +3760,9 @@ c.register("object-form", Ut, {
 			label: "Submission Metrics"
 		}
 	]
-}), c.register("object-master-detail-form", ({ schema: e }) => /* @__PURE__ */ X(wt, {
+}), l.register("object-master-detail-form", ({ schema: e }) => /* @__PURE__ */ Z(Mt, {
 	schema: e,
-	dataSource: n(f)?.dataSource ?? void 0
+	dataSource: r(h)?.dataSource ?? void 0
 }), {
 	namespace: "plugin-form",
 	label: "Master-Detail Form",
@@ -3512,7 +3792,7 @@ c.register("object-form", Ut, {
 			required: !0
 		}
 	]
-}), c.register("line_items", ({ schema: e }) => /* @__PURE__ */ X(Ht, { schema: e }), {
+}), l.register("line_items", ({ schema: e }) => /* @__PURE__ */ Z(Zt, { schema: e }), {
 	namespace: "record",
 	skipFallback: !0,
 	label: "Line Items",
@@ -3549,4 +3829,4 @@ c.register("object-form", Ut, {
 	]
 });
 //#endregion
-export { Dt as DrawerForm, zt as EmbeddableForm, Vt as FormAnalytics, $ as FormSection, Ht as LineItemsPanel, wt as MasterDetailForm, jt as ModalForm, Mt as ObjectForm, Ue as SplitForm, Ve as TabbedForm, He as WizardForm, je as applyAutoColSpan, Be as applyAutoLayout, Le as containerGridColsFor, ft as deriveColumns, xt as deriveDetail, ht as deriveFormFields, Fe as filterAutoGeneratedFields, Pe as filterCreateModeFields, Ne as filterSystemFields, ct as findRelationshipField, Oe as inferColumns, ze as inferModalSize, De as isAutoGeneratedFieldType, Ee as isWideFieldType, vt as resolveInlineMode };
+export { Ft as DrawerForm, Jt as EmbeddableForm, Xt as FormAnalytics, Ke as FormSection, Zt as LineItemsPanel, Mt as MasterDetailForm, zt as ModalForm, Vt as ObjectForm, Xe as SplitForm, Ge as TabbedForm, Ye as WizardForm, je as applyAutoColSpan, ze as applyAutoLayout, Le as containerGridColsFor, bt as deriveColumns, kt as deriveDetail, Ct as deriveFormFields, Fe as filterAutoGeneratedFields, Pe as filterCreateModeFields, Ne as filterSystemFields, ht as findRelationshipField, Oe as inferColumns, Re as inferModalSize, De as isAutoGeneratedFieldType, Ee as isWideFieldType, Et as resolveInlineMode };