@declarion/react 0.66.0 → 0.80.0

package/dist-lib/components/file-widgets/ImageWidget.js

@@ -3,32 +3,31 @@ import { useText as n } from "../../hooks/useText.js";
 import { UploadError as r, discardFile as i, uploadCheckFailure as ee, uploadFailure as te, uploadFile as ne, validateClientSide as re } from "./upload.js";
 import { UploadFailureText as a } from "./UploadFailureText.js";
 import { getImageCropper as ie } from "./cropper.js";
-import { focalPointObjectPosition as o, preferredListThumbnailURL as s, preferredThumbnailVariant as ae, readFocalPoint as oe, resolveFileAltText as se, withFocalPoint as ce } from "./helpers.js";
-import { useDraftRegistration as le } from "./draft-scope.js";
-import { useEmbedFileSrc as ue } from "./useEmbedFileSrc.js";
-import { singleFileFromValue as de } from "./value.js";
-import { useCallback as c, useEffect as fe, useMemo as pe, useRef as l, useState as u } from "react";
-import { jsx as d, jsxs as f } from "react/jsx-runtime";
+import { fileFieldLabel as ae, focalPointObjectPosition as o, preferredListThumbnail as oe, previewFileURL as se, readFocalPoint as ce, resolveFileAltText as le, withFocalPoint as ue } from "./helpers.js";
+import { useDraftRegistration as de } from "./draft-scope.js";
+import { useEmbedFileSrc as fe } from "./useEmbedFileSrc.js";
+import { singleFileFromValue as pe } from "./value.js";
+import { useCallback as s, useEffect as me, useMemo as he, useRef as c, useState as l } from "react";
+import { jsx as u, jsxs as d } from "react/jsx-runtime";
 //#region src/components/file-widgets/ImageWidget.tsx
-function me(e, t) {
-	return s(e, t);
-}
-function p(e) {
+function f(e) {
 	let t = e.trim().split(/\s+/).filter(Boolean);
 	return t.length === 1 ? t[0].slice(0, 2).toUpperCase() : (t[0][0] + t[1][0]).toUpperCase();
 }
-function m(s) {
-	let { field: p, fieldName: m, value: ve, onChange: v, mode: ye, alt: y, recordTitle: be, disabled: b, visual: x, uploadFieldCode: S, uploadSlotCode: C } = s, w = de(ve), [T, E] = u("idle"), [D, O] = u(null), [k, A] = u(null), [j, M] = u(null), [N, P] = u(!1), F = l(null), I = l(!1), L = l(null), { register: R, unregister: z, isDraft: B } = le(), V = n(), H = n("errors");
-	fe(() => () => {
+function p(f) {
+	let { field: p, fieldName: _, value: ye, onChange: v, mode: be, alt: y, recordTitle: xe, disabled: b, visual: x, uploadFieldCode: S, uploadSlotCode: C } = f, w = pe(ye), [T, E] = l("idle"), [D, O] = l(null), [k, A] = l(null), [j, M] = l(null), [N, P] = l(!1), F = c(null), I = c(!1), L = c(null), { register: R, unregister: z, isDraft: B } = de(), V = n(), H = n("errors");
+	me(() => () => {
 		F.current && F.current.abort();
 	}, []);
-	let U = t(), W = e(), G = pe(() => se(w, y, m, U, W), [
+	let U = t(), W = e(), G = he(() => le(w, y, ae(V, p, _), U, W), [
 		y,
-		m,
+		V,
+		p,
+		_,
 		w,
 		U,
 		W
-	]), K = p.display?.initials ? be?.trim() : void 0, xe = (p.accepts ?? ["image/*"]).join(","), q = c(async (e) => {
+	]), K = p.display?.initials ? xe?.trim() : void 0, Se = (p.accepts ?? ["image/*"]).join(","), q = s(async (e) => {
 		let t = re(e, p.accepts, p.max_size_bytes);
 		if (t) {
 			A(ee(V, H, t)), E("error");
@@ -38,7 +37,7 @@ function m(s) {
 		if (p.display?.crop_on_upload) try {
 			let { blob: t, filename: r } = await ie()({
 				file: e,
-				aspectRatio: ge(p.display.aspect_ratio)
+				aspectRatio: _e(p.display.aspect_ratio)
 			});
 			n = new File([t], r, { type: t.type || e.type });
 		} catch {
@@ -58,8 +57,8 @@ function m(s) {
 		try {
 			let e = await ne({
 				file: n,
-				entityCode: s.entityCode,
-				fieldCode: S ?? m,
+				entityCode: f.entityCode,
+				fieldCode: S ?? _,
 				slotCode: C,
 				signal: a.signal,
 				onProgress: O
@@ -93,22 +92,22 @@ function m(s) {
 		p.display?.crop_on_upload,
 		p.display?.aspect_ratio,
 		p.mode,
-		m,
+		_,
 		v,
-		s.entityCode,
+		f.entityCode,
 		R,
 		B,
 		w,
 		z,
 		S,
 		C
-	]), Se = c(() => {
+	]), Ce = s(() => {
 		T === "uploading" && F.current && (I.current = !0, F.current.abort(), F.current = null, E("idle"), O(null)), j && (i(j).catch(() => {}), z(j), M(null));
 	}, [
 		T,
 		j,
 		z
-	]), Ce = c(() => {
+	]), we = s(() => {
 		w && B(w.id) && (i(w.id).catch(() => {}), z(w.id), M(null)), v?.(p.mode === "array" ? [] : null);
 	}, [
 		w,
@@ -116,30 +115,30 @@ function m(s) {
 		B,
 		v,
 		z
-	]), we = c(() => {
+	]), Te = s(() => {
 		A(null), E("idle"), L.current?.click();
-	}, []), J = c(() => {
+	}, []), J = s(() => {
 		b || L.current?.click();
-	}, [b]), Te = c((e) => {
+	}, [b]), Ee = s((e) => {
 		b || (e.key === "Enter" || e.key === " ") && (e.preventDefault(), J());
-	}, [b, J]), Ee = c((e) => {
+	}, [b, J]), De = s((e) => {
 		b || (e.preventDefault(), e.dataTransfer.dropEffect = "copy");
-	}, [b]), Y = c((e) => {
+	}, [b]), Oe = s((e) => {
 		if (b) return;
 		e.preventDefault();
 		let t = e.dataTransfer.files?.[0];
 		t && q(t);
-	}, [b, q]), De = c((e) => {
+	}, [b, q]), ke = s((e) => {
 		let t = e.target.files?.[0];
 		e.target.value = "", t && q(t);
-	}, [q]), Oe = x.aspectRatio ?? he(x.shape, p.display?.aspect_ratio), X = oe(w), Z = {
-		aspectRatio: Oe,
+	}, [q]), Ae = x.aspectRatio ?? ge(x.shape, p.display?.aspect_ratio), Y = ce(w), X = {
+		aspectRatio: Ae,
 		width: x.width ?? (x.shape === "wide" ? "100%" : "120px")
-	}, Q = !!w, ke = me(w, p.display?.listable_thumbnail), Ae = ae(w, p.display?.listable_thumbnail), $ = ue(w?.id, Ae, ke), je = ye === "display", Me = c((e) => {
+	}, Z = !!w, Q = oe(w, p.display?.listable_thumbnail), $ = fe(Q?.id, "preview", Q && se(Q)), je = be === "display", Me = s((e) => {
 		e.stopPropagation(), P((e) => !e);
-	}, []), Ne = c((e) => {
+	}, []), Ne = s((e) => {
 		if (!w || !N) return;
-		let t = e.currentTarget.getBoundingClientRect(), n = t.width > 0 ? (e.clientX - t.left) / t.width : .5, r = t.height > 0 ? (e.clientY - t.top) / t.height : .5, i = ce(w, {
+		let t = e.currentTarget.getBoundingClientRect(), n = t.width > 0 ? (e.clientX - t.left) / t.width : .5, r = t.height > 0 ? (e.clientY - t.top) / t.height : .5, i = ue(w, {
 			x: Math.max(0, Math.min(1, n)),
 			y: Math.max(0, Math.min(1, r))
 		});
@@ -150,74 +149,74 @@ function m(s) {
 		N,
 		v
 	]);
-	return je ? /* @__PURE__ */ d("div", {
-		className: h(x.shape, !1),
-		style: Z,
+	return je ? /* @__PURE__ */ u("div", {
+		className: m(x.shape, !1),
+		style: X,
 		"aria-label": G,
-		children: Q && $ ? /* @__PURE__ */ d("img", {
+		children: Z && $ ? /* @__PURE__ */ u("img", {
 			src: $,
 			alt: G,
-			className: g(x.shape),
-			style: { objectPosition: o(X) },
+			className: h(x.shape),
+			style: { objectPosition: o(Y) },
 			loading: "lazy"
-		}) : /* @__PURE__ */ d(_, {
+		}) : /* @__PURE__ */ u(g, {
 			shape: x.shape,
 			initialsTitle: K
 		})
-	}) : /* @__PURE__ */ f("div", {
-		className: h(x.shape, !b),
-		style: Z,
+	}) : /* @__PURE__ */ d("div", {
+		className: m(x.shape, !b),
+		style: X,
 		tabIndex: b ? -1 : 0,
 		role: "button",
 		"aria-label": G,
 		"aria-disabled": b || void 0,
 		"aria-busy": T === "uploading" || void 0,
 		"aria-invalid": T === "error" || void 0,
-		onClick: T === "idle" && !Q ? J : void 0,
+		onClick: T === "idle" && !Z ? J : void 0,
 		onMouseDown: N ? Ne : void 0,
-		onKeyDown: Te,
-		onDragOver: Ee,
-		onDrop: Y,
-		"data-testid": N ? "focal-point-target" : `file-widget-${m}`,
+		onKeyDown: Ee,
+		onDragOver: De,
+		onDrop: Oe,
+		"data-testid": N ? "focal-point-target" : `file-widget-${_}`,
 		children: [
-			/* @__PURE__ */ d("input", {
+			/* @__PURE__ */ u("input", {
 				ref: L,
 				type: "file",
-				accept: xe,
-				onChange: De,
+				accept: Se,
+				onChange: ke,
 				style: { display: "none" },
-				"data-testid": `file-input-${m}`
+				"data-testid": `file-input-${_}`
 			}),
-			Q && $ ? /* @__PURE__ */ d("img", {
+			Z && $ ? /* @__PURE__ */ u("img", {
 				src: $,
 				alt: G,
-				className: g(x.shape),
-				style: { objectPosition: o(X) },
+				className: h(x.shape),
+				style: { objectPosition: o(Y) },
 				loading: "lazy"
-			}) : T === "uploading" ? null : /* @__PURE__ */ d(_, {
+			}) : T === "uploading" ? null : /* @__PURE__ */ u(g, {
 				shape: x.shape,
 				initialsTitle: K
 			}),
-			T === "uploading" && /* @__PURE__ */ d(_e, {
+			T === "uploading" && /* @__PURE__ */ u(ve, {
 				pct: D?.pct ?? 0,
 				label: V("file.upload.progress", "Uploading {pct}%", { pct: Math.round(D?.pct ?? 0) })
 			}),
-			j && /* @__PURE__ */ d("span", {
+			j && /* @__PURE__ */ u("span", {
 				className: "absolute right-1 top-1 h-2 w-2 rounded-full bg-warning",
 				"aria-hidden": "true",
 				"data-testid": "draft-indicator"
 			}),
-			Q && T === "idle" && !b && /* @__PURE__ */ f("div", {
+			Z && T === "idle" && !b && /* @__PURE__ */ d("div", {
 				className: "absolute inset-0 flex items-center justify-center gap-2 bg-black/40 opacity-0 transition-opacity hover:opacity-100 focus-within:opacity-100",
 				children: [
-					p.display?.focal_point && /* @__PURE__ */ d("button", {
+					p.display?.focal_point && /* @__PURE__ */ u("button", {
 						type: "button",
 						className: "rounded-sm border border-border bg-card px-2 py-1 text-xs text-foreground hover:bg-surface-2",
 						onClick: Me,
 						"data-testid": "focal-point-toggle",
 						children: N ? V("file.image.focus_cancel", "Cancel focus") : V("file.image.focus_set", "Set focus")
 					}),
-					/* @__PURE__ */ d("button", {
+					/* @__PURE__ */ u("button", {
 						type: "button",
 						className: "rounded-sm border border-border bg-card px-2 py-1 text-xs text-foreground hover:bg-surface-2",
 						onClick: (e) => {
@@ -225,45 +224,45 @@ function m(s) {
 						},
 						children: V("file.image.change", "Change")
 					}),
-					/* @__PURE__ */ d("button", {
+					/* @__PURE__ */ u("button", {
 						type: "button",
 						className: "rounded-sm border border-border bg-card px-2 py-1 text-xs text-destructive hover:bg-surface-2",
 						onClick: (e) => {
-							e.stopPropagation(), Ce();
+							e.stopPropagation(), we();
 						},
 						children: V("file.remove", "Remove")
 					})
 				]
 			}),
-			X && Q && /* @__PURE__ */ d("span", {
+			Y && Z && /* @__PURE__ */ u("span", {
 				className: "absolute h-3 w-3 -translate-x-1/2 -translate-y-1/2 rounded-full border border-white bg-black/70",
 				style: {
-					left: `${X.x * 100}%`,
-					top: `${X.y * 100}%`
+					left: `${Y.x * 100}%`,
+					top: `${Y.y * 100}%`
 				},
 				"data-testid": "focal-point-marker"
 			}),
-			T === "uploading" && /* @__PURE__ */ d("button", {
+			T === "uploading" && /* @__PURE__ */ u("button", {
 				type: "button",
 				className: "absolute bottom-1 right-1 rounded-sm border border-border bg-card px-2 py-0.5 text-xs",
 				onClick: (e) => {
-					e.stopPropagation(), Se();
+					e.stopPropagation(), Ce();
 				},
 				"data-testid": "cancel-upload",
 				children: V("file.upload.cancel", "Cancel")
 			}),
-			T === "error" && k && /* @__PURE__ */ f("div", {
+			T === "error" && k && /* @__PURE__ */ d("div", {
 				className: "absolute inset-x-0 bottom-0 flex items-center justify-between gap-2 bg-destructive-soft px-2 py-1 text-xs text-destructive",
 				role: "alert",
-				children: [/* @__PURE__ */ d("span", {
+				children: [/* @__PURE__ */ u("span", {
 					className: "truncate",
 					title: k.message,
-					children: /* @__PURE__ */ d(a, { failure: k })
-				}), /* @__PURE__ */ d("button", {
+					children: /* @__PURE__ */ u(a, { failure: k })
+				}), /* @__PURE__ */ u("button", {
 					type: "button",
 					className: "underline",
 					onClick: (e) => {
-						e.stopPropagation(), we();
+						e.stopPropagation(), Te();
 					},
 					"data-testid": "retry-upload",
 					children: V("file.upload.retry", "Retry")
@@ -272,45 +271,45 @@ function m(s) {
 		]
 	});
 }
-function h(e, t) {
+function m(e, t) {
 	return [
 		"relative overflow-hidden border border-border bg-surface-2",
 		e === "circle" ? "rounded-full" : "rounded-md",
 		t ? "cursor-pointer focus-visible:outline focus-visible:outline-2 focus-visible:outline-accent" : ""
 	].filter(Boolean).join(" ");
 }
-function g(e) {
+function h(e) {
 	return "h-full w-full object-cover";
 }
-function he(e, t) {
+function ge(e, t) {
 	return t ? t.replace(":", " / ") : e === "wide" ? "16 / 9" : "1 / 1";
 }
-function ge(e) {
+function _e(e) {
 	if (!e) return;
 	let t = e.replace(/\s/g, "").match(/^(\d+(?:\.\d+)?)[:/](\d+(?:\.\d+)?)$/);
 	if (!t) return;
 	let n = Number(t[1]), r = Number(t[2]);
 	if (n && r) return n / r;
 }
-function _({ shape: e, initialsTitle: t }) {
+function g({ shape: e, initialsTitle: t }) {
 	let r = n();
-	return t ? /* @__PURE__ */ d("div", {
+	return t ? /* @__PURE__ */ u("div", {
 		className: "flex h-full w-full items-center justify-center bg-surface-3 text-text-3",
-		children: /* @__PURE__ */ d("span", {
+		children: /* @__PURE__ */ u("span", {
 			className: e === "circle" ? "text-lg font-medium" : "text-base font-medium",
-			children: p(t)
+			children: f(t)
 		})
-	}) : /* @__PURE__ */ d("div", {
+	}) : /* @__PURE__ */ u("div", {
 		className: "flex h-full w-full items-center justify-center bg-surface-3 text-text-4",
-		children: /* @__PURE__ */ d("span", {
+		children: /* @__PURE__ */ u("span", {
 			className: "text-xs",
 			children: e === "wide" ? r("file.image.drop", "Drop image here") : "+"
 		})
 	});
 }
-function _e({ pct: e, label: t }) {
+function ve({ pct: e, label: t }) {
 	let n = 2 * Math.PI * 18, r = n - Math.max(0, Math.min(100, e)) / 100 * n;
-	return /* @__PURE__ */ f("div", {
+	return /* @__PURE__ */ d("div", {
 		className: "absolute inset-0 flex items-center justify-center bg-black/30",
 		"data-testid": "upload-progress",
 		"aria-label": t,
@@ -318,11 +317,11 @@ function _e({ pct: e, label: t }) {
 		"aria-valuenow": Math.round(e),
 		"aria-valuemin": 0,
 		"aria-valuemax": 100,
-		children: [/* @__PURE__ */ f("svg", {
+		children: [/* @__PURE__ */ d("svg", {
 			width: "48",
 			height: "48",
 			viewBox: "0 0 48 48",
-			children: [/* @__PURE__ */ d("circle", {
+			children: [/* @__PURE__ */ u("circle", {
 				cx: "24",
 				cy: "24",
 				r: 18,
@@ -331,7 +330,7 @@ function _e({ pct: e, label: t }) {
 				strokeWidth: "4",
 				fill: "none",
 				className: "text-foreground"
-			}), /* @__PURE__ */ d("circle", {
+			}), /* @__PURE__ */ u("circle", {
 				cx: "24",
 				cy: "24",
 				r: 18,
@@ -344,11 +343,11 @@ function _e({ pct: e, label: t }) {
 				className: "text-accent",
 				transform: "rotate(-90 24 24)"
 			})]
-		}), /* @__PURE__ */ f("span", {
+		}), /* @__PURE__ */ d("span", {
 			className: "absolute text-xs text-foreground",
 			children: [Math.round(e), "%"]
 		})]
 	});
 }
 //#endregion
-export { m as ImageWidget };
+export { p as ImageWidget };

package/dist-lib/components/file-widgets/LabeledSlots.js

@@ -19,6 +19,7 @@ function s(e, t, n, r) {
 		slots: void 0,
 		display: {
 			...e.display ?? { widget: "document_card" },
+			name: n.name,
 			widget: o(n, r) ? "square_image" : "document_card",
 			aspect_ratio: n.aspect_ratio ?? e.display?.aspect_ratio
 		}

package/dist-lib/components/file-widgets/helpers.js

@@ -1,7 +1,10 @@
 import { pickLocalized as e } from "../../lib/language.js";
 //#region src/components/file-widgets/helpers.ts
 var t = ["thumb_200", "thumb_300"];
-function n(t, n, r, i, a) {
+function n(e, t, n) {
+	return e(t.display?.name) || n;
+}
+function r(t, n, r, i, a) {
 	if (n) return n;
 	let o = t?.metadata?.alt_text;
 	if (typeof o == "string" && o.length > 0) return o;
@@ -11,7 +14,7 @@ function n(t, n, r, i, a) {
 	}
 	return r;
 }
-var r = /* @__PURE__ */ new Set([
+var i = /* @__PURE__ */ new Set([
 	"image/png",
 	"image/jpeg",
 	"image/webp",
@@ -19,28 +22,21 @@ var r = /* @__PURE__ */ new Set([
 	"image/avif",
 	"application/pdf"
 ]);
-function i(e) {
-	let t = e.content_type?.toLowerCase().split(";")[0]?.trim() ?? "";
-	return r.has(t);
-}
 function a(e) {
-	return e.url ?? e.presigned_url;
+	let t = e.content_type?.toLowerCase().split(";")[0]?.trim() ?? "";
+	return i.has(t);
 }
 function o(e) {
-	return e.url ? l(e.url, "attachment") : e.presigned_url;
+	return e.url;
 }
-function s(e, n) {
-	if (!e) return;
-	let r = e.derivations ?? {};
-	if (n && r[n]) return r[n];
-	for (let e of t) if (r[e]) return r[e];
-	return e.url ?? e.presigned_url;
+function s(e) {
+	return l(e.url, "attachment");
 }
 function c(e, n) {
-	let r = e?.derivations ?? {};
-	if (n && r[n]) return { derivation: n };
-	for (let e of t) if (r[e]) return { derivation: e };
-	return "preview";
+	if (!e) return;
+	let r = e.derivations ?? {};
+	for (let e of [n, ...t]) if (e && r[e]) return r[e];
+	return e;
 }
 function l(e, t) {
 	try {
@@ -72,4 +68,4 @@ function f(e, t) {
 	};
 }
 //#endregion
-export { i as canPreviewFile, o as downloadFileURL, d as focalPointObjectPosition, s as preferredListThumbnailURL, c as preferredThumbnailVariant, a as previewFileURL, u as readFocalPoint, n as resolveFileAltText, f as withFocalPoint };
+export { a as canPreviewFile, s as downloadFileURL, n as fileFieldLabel, d as focalPointObjectPosition, c as preferredListThumbnail, o as previewFileURL, u as readFocalPoint, r as resolveFileAltText, f as withFocalPoint };

package/dist-lib/components/file-widgets/host.js

@@ -1,65 +1,66 @@
 import { fieldDisplayName as e, getDisplayValue as t } from "../../types/schema.js";
 import { createRichTextValue as n, richTextMarkdown as r } from "../../lib/rich-text.js";
 import { getFileWidget as i } from "./registry.js";
-import { UnknownFileWidget as a } from "./UnknownFileWidget.js";
-import { registerBuiltinFileWidgets as o } from "./builtins.js";
-import { renderField as s } from "../fields/index.js";
-import { jsx as c } from "react/jsx-runtime";
+import { fileFieldLabel as a } from "./helpers.js";
+import { UnknownFileWidget as o } from "./UnknownFileWidget.js";
+import { registerBuiltinFileWidgets as s } from "./builtins.js";
+import { renderField as c } from "../fields/index.js";
+import { jsx as l } from "react/jsx-runtime";
 //#region src/components/file-widgets/host.tsx
-o();
-function l(e, t) {
+s();
+function u(e, t) {
 	return e.files?.get(t);
 }
-function u(e, t) {
+function d(e, t) {
 	return Object.prototype.hasOwnProperty.call(e, t) ? e[t] ?? null : e.$files?.[t] ?? null;
 }
-function d(e, t, r) {
-	if (l(e, r)) return u(t, r);
+function f(e, t, r) {
+	if (u(e, r)) return d(t, r);
 	let i = e.fields.get(r);
-	return i?.type === "rich_text" && i.files?.mode === "rich_text_inline" ? n(t[r], u(t, r)) : t[r];
+	return i?.type === "rich_text" && i.files?.mode === "rich_text_inline" ? n(t[r], d(t, r)) : t[r];
 }
-function f(e, t, n) {
-	let r = d(e, t, n);
+function p(e, t, n) {
+	let r = f(e, t, n);
 	return r == null || r === "" ? !1 : Array.isArray(r) ? r.length > 0 : typeof r != "object" || Object.keys(r).length > 0;
 }
-function p(e, t, n) {
+function m(e, t, n) {
 	let i = e.fields.get(t);
 	return i?.type === "rich_text" && i.files?.mode === "rich_text_inline" ? r(n) : n;
 }
-function m(t, n, r, i) {
-	let a = l(n, r);
-	if (a) return a.name || r;
-	let o = n.fields.get(r);
-	return o ? e(t, o, r, i) : r;
+function h(t, n, r, i) {
+	let o = u(n, r);
+	if (o) return a(t, o, r);
+	let s = n.fields.get(r);
+	return s ? e(t, s, r, i) : r;
 }
-function h(e) {
-	let { entity: n, entityCode: r, fieldName: o, record: f, mode: p, onChange: m, refs: h, disabled: g, surface: _, entities: v, screens: y, t: b, fieldId: x, labelId: S, structure: C, detailScreen: w } = e, T = l(n, o);
+function g(e) {
+	let { entity: n, entityCode: r, fieldName: a, record: s, mode: p, onChange: m, refs: h, disabled: g, surface: _, entities: v, screens: y, t: b, fieldId: x, labelId: S, structure: C, detailScreen: w } = e, T = u(n, a);
 	if (T) {
-		let e = T.display?.widget ?? "", s = i(e);
-		return s ? /* @__PURE__ */ c(s, {
+		let e = T.display?.widget ?? "", c = i(e);
+		return c ? /* @__PURE__ */ l(c, {
 			field: T,
-			fieldName: o,
+			fieldName: a,
 			entityCode: r,
-			value: u(f, o),
-			recordTitle: t(b, f, n),
+			value: d(s, a),
+			recordTitle: t(b, s, n),
 			mode: p,
 			onChange: m,
 			disabled: g,
 			fieldId: x
-		}) : /* @__PURE__ */ c(a, { widgetCode: e });
+		}) : /* @__PURE__ */ l(o, { widgetCode: e });
 	}
-	let E = n.fields.get(o), D = C && p === "display" && E ? {
+	let E = n.fields.get(a), D = C && p === "display" && E ? {
 		...E,
 		structure: C
 	} : E;
-	return D ? s({
+	return D ? c({
 		field: D,
 		entityCode: r,
-		fieldName: o,
-		value: d(n, f, o),
+		fieldName: a,
+		value: f(n, s, a),
 		mode: p,
 		onChange: m,
-		record: f,
+		record: s,
 		refs: h,
 		surface: _,
 		entity: r && v ? v[r] : void 0,
@@ -72,4 +73,4 @@ function h(e) {
 	}) : null;
 }
 //#endregion
-export { l as getEntityFileField, u as getFileFieldValue, d as getSchemaFieldValue, h as renderSchemaField, m as resolveSchemaFieldLabel, f as schemaFieldHasValue, p as serializeSchemaFieldValue };
+export { u as getEntityFileField, d as getFileFieldValue, f as getSchemaFieldValue, g as renderSchemaField, h as resolveSchemaFieldLabel, p as schemaFieldHasValue, m as serializeSchemaFieldValue };

package/dist-lib/components/file-widgets/upload.js

@@ -98,18 +98,22 @@ function m(e, t, n) {
 	return i ? `/api/files/upload?${i}` : "/api/files/upload";
 }
 function h(e) {
-	return _(e) ? _(e.result) ? h(e.result) : _(e.file) ? g(e.file) : typeof e.id == "string" ? e : null : null;
+	return _(e) && _(e.file) ? g(e.file) : null;
 }
 function g(e) {
-	let t = v(e.file_id);
-	return t ? {
+	let t = v(e.file_id), n = v(e.url);
+	if (!t || !n) return null;
+	let r = v(e.filename_original) ?? v(e.filename_normalized) ?? t;
+	return {
 		id: t,
-		filename: v(e.filename_original) ?? v(e.filename_normalized) ?? t,
+		url: n,
+		presigned_url: v(e.presigned_url),
+		filename: r,
 		content_type: v(e.content_type) ?? "application/octet-stream",
 		size_bytes: y(e.size_bytes) ?? 0,
 		sha256: v(e.sha256) ?? "",
 		dedup: b(e.dedup)
-	} : null;
+	};
 }
 function _(e) {
 	return typeof e == "object" && !!e;
@@ -124,7 +128,7 @@ function b(e) {
 	return typeof e == "boolean" ? e : void 0;
 }
 async function x(e) {
-	await a("files.discard", { file_id: e });
+	await a("file.discard", { file_id: e });
 }
 var S = "This file is larger than the deployment allows.", C = "This file does not satisfy the field it was attached to.";
 function w(e, t, n) {