@declarion/react 0.87.0 → 0.89.0

package/dist-lib/components/pages/list/useActiveView.js

@@ -64,17 +64,25 @@ function h({ screenCode: e, screen: r, entity: c, searchParams: u, setSearchPara
 		u,
 		h
 	]);
-	let F = E, I = !S && !v && !N && !D && (!j || !!P);
+	let F = E, I = !S && !v && !N && !D && (!j || !!P), L = o(() => {
+		if (I) return b ? P : r?.default_view ? y.find((e) => e.source === "system" && e.id === r.default_view) : void 0;
+	}, [
+		I,
+		b,
+		P,
+		r?.default_view,
+		y
+	]), R = T ?? L;
 	return {
 		all: y,
 		activeId: S,
 		active: T,
 		defaults: o(() => ({
-			...m(c, T, r),
-			columns: T?.columns?.length ? T.columns : r?.default_columns ?? r?.columns ?? l
+			...m(c, R, r),
+			columns: R?.columns?.length ? R.columns : r?.default_columns ?? r?.columns ?? l
 		}), [
 			c,
-			T,
+			R,
 			r
 		]),
 		clearedKey: M,
@@ -91,7 +99,8 @@ function h({ screenCode: e, screen: r, entity: c, searchParams: u, setSearchPara
 		]),
 		retryViews: x,
 		isUnresolved: !!S && !T && !E,
-		isHeld: F || I
+		isHeld: F || I,
+		prefetchWhileHeld: I && !F && !b
 	};
 }
 //#endregion

package/dist-lib/components/pages/list/useListQuery.js

@@ -1,101 +1,141 @@
-import { entityCountQueryKey as e, entityDataQueryKey as t, useEntityCount as n, useEntityData as r } from "../../../hooks/useEntityData.js";
-import { cursorEntityDataQueryKey as i, useCursorEntityData as a } from "../../../hooks/useCursorEntityData.js";
-import { useRegisterRetainedQuery as o } from "../../../hooks/usePageStateRuntime.js";
-import { useCallback as s, useEffect as c, useMemo as l, useState as u } from "react";
-import { useQueryClient as d } from "@tanstack/react-query";
+import { entityCountQueryKey as e, entityDataQueryKey as t, entityDataQueryOptions as n, useEntityCount as r, useEntityData as i } from "../../../hooks/useEntityData.js";
+import { cursorEntityDataQueryKey as a, useCursorEntityData as o } from "../../../hooks/useCursorEntityData.js";
+import { useRegisterRetainedQuery as s } from "../../../hooks/usePageStateRuntime.js";
+import { correctEstimateAgainstWindow as c } from "../../../lib/format-count.js";
+import { useCallback as l, useEffect as u, useMemo as d, useState as f } from "react";
+import { useQueryClient as p } from "@tanstack/react-query";
 //#region src/components/pages/list/useListQuery.ts
-var f = 1e4, p = [];
-function m(c) {
-	let u = d(), { entity: f, entityCode: m, screen: g, screenCode: _, page: v, perPage: y, sortForRequest: b, debouncedSearch: x, filters: S, isHeld: C, retryHeld: w, includeDeleted: T, expand: E, select: D, runCountQuery: O, urlKey: k } = c, A = S.length > 0 ? S : void 0, j = {
-		page: v,
-		per_page: y,
-		sort: b,
-		search: x || void 0,
-		filters: A,
-		include_deleted: T || void 0,
-		expand: E,
-		select: D,
+var m = 1e4, h = [];
+function g(f) {
+	let m = p(), { entity: g, entityCode: v, screen: y, screenCode: b, page: x, perPage: S, sortForRequest: C, debouncedSearch: w, filters: T, isHeld: E, prefetchWhileHeld: D, retryHeld: O, includeDeleted: k, expand: A, select: j, runCountQuery: M, urlKey: N } = f, P = T.length > 0 ? T : void 0, F = y?.fixed_filters ? b : void 0, I = d(() => ({
+		page: x,
+		per_page: S,
+		sort: C,
+		search: w || void 0,
+		filters: P,
+		include_deleted: k || void 0,
+		expand: A,
+		select: j,
 		preview: !0,
-		screen: g?.fixed_filters ? _ : void 0
-	}, M = {
-		sort: b,
-		filters: A,
-		search: x || void 0,
-		select: D,
-		expand: E,
-		includeDeleted: T || void 0,
-		screen: g?.fixed_filters ? _ : void 0,
-		preview: !0,
-		limit: y
-	}, N = f?.list_pagination === "cursor", P = r(m, j, !N && !C), F = n(m, j, O && !N && !C), I = a(m, M, N && !C);
-	o(t(m, j), !N && !C), o(i(m, M), N && !C);
-	let L = C || (N ? I.isLoading : P.isLoading), R = l(() => C ? p : N ? I.rows : P.data?.data ?? [], [
+		screen: F
+	}), [
+		x,
+		S,
 		C,
-		N,
-		I.rows,
-		P.data?.data
-	]), z = N ? I.total : F.data?.meta?.total, B = l(() => {
-		if (!(N || z === void 0 || y <= 0)) return Math.max(1, Math.ceil(z / y));
+		w,
+		P,
+		k,
+		A,
+		j,
+		F
+	]), L = {
+		sort: C,
+		filters: P,
+		search: w || void 0,
+		select: j,
+		expand: A,
+		includeDeleted: k || void 0,
+		screen: y?.fixed_filters ? b : void 0,
+		preview: !0,
+		limit: S
+	}, R = g?.list_pagination === "cursor";
+	u(() => {
+		E && D && !R && v && m.prefetchQuery(n(v, I));
 	}, [
-		N,
-		z,
-		y
-	]), V = h(L, k), H = N ? i(m, M) : t(m, j), U = e(m, j), W = O && !N, G = s(async () => {
-		C ? w() : m && (await Promise.all([u.cancelQueries({
-			queryKey: H,
+		E,
+		D,
+		R,
+		v,
+		I,
+		m
+	]);
+	let z = i(v, I, !R && !E), B = r(v, I, M && !R && !E), V = o(v, L, R && !E);
+	s(t(v, I), !R && !E), s(a(v, L), R && !E);
+	let H = E || (R ? V.isLoading : z.isLoading), U = d(() => E ? h : R ? V.rows : z.data?.data ?? [], [
+		E,
+		R,
+		V.rows,
+		z.data?.data
+	]), W = d(() => {
+		let e = B.data?.meta?.total, t = B.data?.meta?.count_mode, n = z.data?.meta;
+		return e === void 0 || !t || !z.data || z.isPlaceholderData || n?.has_more === void 0 ? {
+			total: e,
+			mode: t
+		} : c(e, t, {
+			page: x,
+			perPage: S,
+			rows: z.data.data?.length ?? 0,
+			hasMore: n.has_more
+		});
+	}, [
+		B.data?.meta?.total,
+		B.data?.meta?.count_mode,
+		z.data,
+		z.isPlaceholderData,
+		x,
+		S
+	]), G = R ? V.total : W.total, K = d(() => {
+		if (!(R || G === void 0 || S <= 0)) return Math.max(1, Math.ceil(G / S));
+	}, [
+		R,
+		G,
+		S
+	]), q = _(H, N), J = R ? a(v, L) : t(v, I), Y = e(v, I), X = M && !R, Z = l(async () => {
+		E ? O() : v && (await Promise.all([m.cancelQueries({
+			queryKey: J,
 			exact: !0
-		}), W ? u.cancelQueries({
-			queryKey: U,
+		}), X ? m.cancelQueries({
+			queryKey: Y,
 			exact: !0
-		}) : void 0]), await Promise.all([N ? I.refetch() : P.refetch(), W ? F.refetch() : void 0]));
+		}) : void 0]), await Promise.all([R ? V.refetch() : z.refetch(), X ? B.refetch() : void 0]));
 	}, [
-		C,
-		w,
+		E,
+		O,
+		v,
 		m,
-		u,
-		H,
-		U,
-		W,
-		N,
-		I,
-		P,
-		F
-	]), K = s(() => {
-		I.fetchNextPage();
-	}, [I]);
+		J,
+		Y,
+		X,
+		R,
+		V,
+		z,
+		B
+	]), Q = l(() => {
+		V.fetchNextPage();
+	}, [V]);
 	return {
-		rows: R,
-		meta: C ? void 0 : P.data?.meta,
-		refs: C ? void 0 : N ? I.refs : P.data?.$refs,
-		isLoading: L,
-		isFetching: C || (N ? I.isFetching : P.isFetching),
-		isShowingPreviousRows: !C && (N ? I.isPlaceholderData : P.isPlaceholderData),
-		isError: C ? !1 : N ? I.isError : P.isError,
-		error: C ? void 0 : N ? I.error : P.error,
-		isLoadingStale: V,
-		retry: G,
-		countTotal: C ? void 0 : z,
-		countStrategy: C ? void 0 : N ? I.countMode : F.data?.meta?.count_mode,
-		countLoading: C || (N ? I.isLoading : F.isLoading),
-		countError: !C && !N && F.isError,
-		totalPages: B,
-		hasMorePages: N ? I.hasMore : P.data?.meta?.has_more ?? (B !== void 0 && v < B),
-		isCursor: N,
-		fetchNextPage: K,
-		isFetchingNextPage: I.isFetchingNextPage
+		rows: U,
+		meta: E ? void 0 : z.data?.meta,
+		refs: E ? void 0 : R ? V.refs : z.data?.$refs,
+		isLoading: H,
+		isFetching: E || (R ? V.isFetching : z.isFetching),
+		isShowingPreviousRows: !E && (R ? V.isPlaceholderData : z.isPlaceholderData),
+		isError: E ? !1 : R ? V.isError : z.isError,
+		error: E ? void 0 : R ? V.error : z.error,
+		isLoadingStale: q,
+		retry: Z,
+		countTotal: E ? void 0 : G,
+		countStrategy: E ? void 0 : R ? V.countMode : W.mode,
+		countLoading: E || (R ? V.isLoading : B.isLoading),
+		countError: !E && !R && B.isError,
+		totalPages: K,
+		hasMorePages: R ? V.hasMore : z.data?.meta?.has_more ?? (K !== void 0 && x < K),
+		isCursor: R,
+		fetchNextPage: Q,
+		isFetchingNextPage: V.isFetchingNextPage
 	};
 }
-function h(e, t) {
-	let [n, r] = u(!1);
-	return c(() => {
+function _(e, t) {
+	let [n, r] = f(!1);
+	return u(() => {
 		if (!e) {
 			r(!1);
 			return;
 		}
 		r(!1);
-		let t = window.setTimeout(() => r(!0), f);
+		let t = window.setTimeout(() => r(!0), m);
 		return () => window.clearTimeout(t);
 	}, [e, t]), n;
 }
 //#endregion
-export { m as useListQuery };
+export { g as useListQuery };

package/dist-lib/components/pages/list/useListRowInteraction.js

@@ -1,122 +1,122 @@
 import { coerceDisplayString as e } from "../../../lib/display-value.js";
-import { buildEntityDetailHref as t, extractPkValues as n, fieldDisplayName as r, getDisplayValue as i, pkValuesToDetailId as a, rowSetInTenant as o } from "../../../types/schema.js";
-import { useText as s } from "../../../hooks/useText.js";
+import { buildEntityDetailHref as t, extractPkValues as n, fieldDisplayName as r, getDisplayValue as i, isUserEditableField as a, pkValuesToDetailId as o, rowSetInTenant as s } from "../../../types/schema.js";
 import { buildActionBody as c, executeAction as l } from "../../../api/data.js";
-import { resolveSchemaFieldLabel as u } from "../../file-widgets/host.js";
-import { useRowTenant as d } from "../../../hooks/useRowTenant.js";
-import { effectiveScreenForRecord as f } from "../../../lib/variants.js";
-import { setPeekDraft as p } from "../../list/peekDraftStore.js";
-import { resolveQuickPeekFieldNames as m } from "./cardProjection.js";
-import { rowSelectionKey as h } from "./useListSelection.js";
-import { classifyRowClick as g, isInteractiveRowTarget as _ } from "../../../lib/rowClickGesture.js";
-import { useLongPress as v } from "../../../hooks/useLongPress.js";
-import { useCallback as y, useEffect as b, useMemo as x, useRef as S, useState as C } from "react";
+import { useText as u } from "../../../hooks/useText.js";
+import { resolveSchemaFieldLabel as d } from "../../file-widgets/host.js";
+import { useRowTenant as f } from "../../../hooks/useRowTenant.js";
+import { effectiveScreenForRecord as p } from "../../../lib/variants.js";
+import { setPeekDraft as m } from "../../list/peekDraftStore.js";
+import { resolveQuickPeekFieldNames as h } from "./cardProjection.js";
+import { rowSelectionKey as g } from "./useListSelection.js";
+import { classifyRowClick as _, isInteractiveRowTarget as v } from "../../../lib/rowClickGesture.js";
+import { useLongPress as y } from "../../../hooks/useLongPress.js";
+import { useCallback as b, useEffect as x, useMemo as S, useRef as C, useState as w } from "react";
 //#region src/components/pages/list/useListRowInteraction.ts
-function w({ entity: w, screen: T, screens: E, entities: D, searchParams: O, tabNavigate: k, commitScreenTabSearch: A, isPhone: j, canUpdate: M }) {
-	let N = s(), P = d(w), [F, I] = C(null), [L, R] = C(null), z = S(null), B = S(null);
-	b(() => () => {
-		B.current && clearTimeout(B.current.timer);
+function T({ entity: T, screen: E, screens: D, entities: O, searchParams: k, tabNavigate: A, commitScreenTabSearch: j, isPhone: M, canUpdate: N }) {
+	let P = u(), F = f(T), [I, L] = w(null), [R, z] = w(null), B = C(null), V = C(null);
+	x(() => () => {
+		V.current && clearTimeout(V.current.timer);
 	}, []);
-	let V = T?.on_row_click === "peek" && T.quick_peek?.enabled !== !1 && !j, H = y((e, r) => {
-		if (!w || !T) return;
-		let o = n(w, e), s = a(w, o), c = t(T, w, E, o);
+	let H = E?.on_row_click === "peek" && E.quick_peek?.enabled !== !1 && !M, U = b((e, r) => {
+		if (!T || !E) return;
+		let a = n(T, e), s = o(T, a), c = t(E, T, D, a);
 		if (!c) return;
 		if (r?.draft) {
-			p(s, r.draft);
+			m(s, r.draft);
 			let [e, t] = c.split("?", 2), n = new URLSearchParams(t ?? "");
 			n.set("edit", "true"), c = `${e}?${n.toString()}`;
 		}
-		let l = i(N, e, w) ?? N(w.display.name), u = T.display?.icon || w.display.icon;
-		A(O.toString()), k(c, {
+		let l = i(P, e, T) ?? P(T.display.name), u = E.display?.icon || T.display.icon;
+		j(k.toString()), A(c, {
 			title: l,
 			icon: u
 		});
 	}, [
-		N,
-		w,
+		P,
 		T,
 		E,
-		O,
+		D,
 		k,
-		A
-	]), U = v(y((e) => {
-		let t = z.current;
-		t && R({
+		A,
+		j
+	]), W = y(b((e) => {
+		let t = B.current;
+		t && z({
 			x: e.x,
 			y: e.y,
 			row: t
 		});
-	}, [])), W = y((e, t) => {
-		if (U.consumePressFired() || _(e.target)) return;
-		if (!V || !w) {
-			H(t);
+	}, [])), G = b((e, t) => {
+		if (W.consumePressFired() || v(e.target)) return;
+		if (!H || !T) {
+			U(t);
 			return;
 		}
-		let n = h(w, t);
-		if (g(B.current, n) === "double") {
-			clearTimeout(B.current.timer), B.current = null, I(null), H(t);
+		let n = g(T, t);
+		if (_(V.current, n) === "double") {
+			clearTimeout(V.current.timer), V.current = null, L(null), U(t);
 			return;
 		}
-		B.current && clearTimeout(B.current.timer);
+		V.current && clearTimeout(V.current.timer);
 		let r = setTimeout(() => {
-			B.current = null, I(t);
+			V.current = null, L(t);
 		}, 250);
-		B.current = {
+		V.current = {
 			rowId: n,
 			timer: r
 		};
 	}, [
-		w,
-		V,
+		T,
 		H,
-		U
+		U,
+		W
 	]);
 	return {
-		peekAllowed: V,
-		peekRow: F,
-		setPeekRow: I,
-		peekFields: x(() => {
-			if (!V || !w || !F) return [];
-			let e = f(w, T, F), t = M && o(w, F, P.tenantId);
-			return m(w, e, E).map((e) => {
-				if (w.files?.get(e)) return {
+		peekAllowed: H,
+		peekRow: I,
+		setPeekRow: L,
+		peekFields: S(() => {
+			if (!H || !T || !I) return [];
+			let e = p(T, E, I), t = N && s(T, I, F.tenantId);
+			return h(T, e, D).map((e) => {
+				if (T.files?.get(e)) return {
 					key: e,
-					label: u(N, w, e, D),
+					label: d(P, T, e, O),
 					kind: "file",
 					readOnly: !t
 				};
-				let n = w.fields.get(e), i = t && !n.primary && !n.auto && !n.ref && n.files?.mode !== "rich_text_inline";
+				let n = T.fields.get(e), i = t && a(n) && !n.ref && n.files?.mode !== "rich_text_inline";
 				return {
 					key: e,
-					label: r(N, n, e, D),
+					label: r(P, n, e, O),
 					kind: "field",
 					field: n,
 					readOnly: !i
 				};
 			});
 		}, [
-			N,
-			V,
-			F,
-			w,
+			P,
+			H,
+			I,
 			T,
-			D,
 			E,
-			M,
-			P
+			O,
+			D,
+			N,
+			F
 		]),
-		peekActions: x(() => w?.actions ?? {}, [w?.actions]),
-		peekExecute: y(async (t, n, r) => {
-			let i = w?.fields.names().find((e) => w.fields.get(e)?.primary), a = i && F ? [e(F[i])] : void 0, o = n.entity ? `${n.entity}.${t}` : t;
+		peekActions: S(() => T?.actions ?? {}, [T?.actions]),
+		peekExecute: b(async (t, n, r) => {
+			let i = T?.fields.names().find((e) => T.fields.get(e)?.primary), a = i && I ? [e(I[i])] : void 0, o = n.entity ? `${n.entity}.${t}` : t;
 			return l(o, c(r, a));
-		}, [w, F]),
-		contextMenu: L,
-		setContextMenu: R,
-		pressedRow: z,
-		longPress: U,
-		onRowClick: W,
-		navigateToDetail: H
+		}, [T, I]),
+		contextMenu: R,
+		setContextMenu: z,
+		pressedRow: B,
+		longPress: W,
+		onRowClick: G,
+		navigateToDetail: U
 	};
 }
 //#endregion
-export { w as useListRowInteraction };
+export { T as useListRowInteraction };

package/dist-lib/components/pages/list/useRowMenu.js

@@ -1,7 +1,7 @@
 import { buildDetailHrefFromId as e } from "../../../types/schema.js";
 import { useSchema as t } from "../../../hooks/useSchema.js";
-import { useText as n } from "../../../hooks/useText.js";
-import { buildActionBody as r, executeAction as i } from "../../../api/data.js";
+import { buildActionBody as n, executeAction as r } from "../../../api/data.js";
+import { useText as i } from "../../../hooks/useText.js";
 import { PEEK_ACTION_CODE as a, applyRowState as o, defaultFlatForSlot as s, filterLayoutForSlot as c } from "../../../lib/actions.js";
 import { useActionRunner as l } from "../../actions/ActionRunner.js";
 import { dispatchAction as u } from "../../../lib/action-dispatch.js";
@@ -30,7 +30,7 @@ function _(e, t) {
 	return !1;
 }
 function v({ row: v, rowId: y, screen: b, fullScreen: x, entity: S, entityCode: C, rowActions: w, tabNavigate: T, peekAllowed: E, hasDetailTarget: D, onPeek: O }) {
-	let k = n(), A = d(S), j = n("errors"), { run: M } = l(), { data: N } = t(), P = x.detail_screen === void 0 && b.detail_screen !== void 0 ? {
+	let k = i(), A = d(S), j = i("errors"), { run: M } = l(), { data: N } = t(), P = x.detail_screen === void 0 && b.detail_screen !== void 0 ? {
 		...x,
 		detail_screen: b.detail_screen
 	} : x, F = f(S, P, v) ?? P, I = h(() => {
@@ -50,7 +50,7 @@ function v({ row: v, rowId: y, screen: b, fullScreen: x, entity: S, entityCode:
 			icon: t?.icon,
 			search: t?.search
 		}),
-		runActionApi: (e, t) => i(e, t),
+		runActionApi: (e, t) => r(e, t),
 		openPeek: (e) => O(e ?? v),
 		recordHref: (t) => e(F, t, S, N?.screens)
 	}), [
@@ -86,12 +86,12 @@ function v({ row: v, rowId: y, screen: b, fullScreen: x, entity: S, entityCode:
 		layout: z,
 		entityActions: I,
 		runRowAction: m((e, t) => {
-			let n = u(j, e, t, { row: v });
-			if (n !== null) return M({
+			let i = u(j, e, t, { row: v });
+			if (i !== null) return M({
 				action: t,
 				title: k(t.display?.name) || e,
 				row: v,
-				execute: (e) => i(n, r(e, [y]))
+				execute: (e) => r(i, n(e, [y]))
 			});
 		}, [
 			k,