camox 0.68.0 → 0.71.0

package/dist/features/studio/components/DraftsControl.js

@@ -6,7 +6,8 @@ import { reads, useReadQuery } from "../../../lib/studio-reads.js";
 import { cn } from "../../../lib/utils.js";
 import { studioStore } from "../studioStore.js";
 import { draftLabel, plural, timeAgo } from "../draftLabel.js";
-import { DeleteDraftDialog, ReviewDraftSheet, useLeaveDraft } from "./ReviewDraftSheet.js";
+import { useLeaveDraft, useSwitchView } from "../viewSwitch.js";
+import { DeleteDraftDialog, ReviewDraftSheet } from "./ReviewDraftSheet.js";
 import { c } from "react/compiler-runtime";
 import * as React from "react";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
@@ -103,7 +104,8 @@ function DraftPicker(t0) {
 	const { draftScope, draftId, projectId, list, current } = useDrafts();
 	const navigate = useNavigate();
 	const leaveDraft = useLeaveDraft();
-	const review = useSelector(studioStore, _temp);
+	const switchView = useSwitchView();
+	const reviewing = useSelector(studioStore, _temp);
 	const deleting = useSelector(studioStore, _temp2);
 	let t2;
 	let t3;
@@ -134,229 +136,230 @@ function DraftPicker(t0) {
 	} else t5 = $[6];
 	const drafts = t5;
 	let t6;
-	if ($[7] !== draftId || $[8] !== navigate) {
+	if ($[7] !== draftId || $[8] !== drafts || $[9] !== navigate || $[10] !== switchView) {
 		t6 = (next) => {
 			if (next === draftId) return;
-			navigate({
+			const target = next ? drafts.find((draft) => draft.id === next) : void 0;
+			const label = next ? target ? draftLabel(target) : "the draft" : "Live";
+			switchView(() => navigate({
 				to: window.location.href,
 				draft: next
+			}), {
+				loading: `Switching to ${label}…`,
+				success: `You're now viewing ${label}.`
 			});
 		};
 		$[7] = draftId;
-		$[8] = navigate;
-		$[9] = t6;
-	} else t6 = $[9];
+		$[8] = drafts;
+		$[9] = navigate;
+		$[10] = switchView;
+		$[11] = t6;
+	} else t6 = $[11];
 	const switchTo = t6;
 	const t7 = !!projectId;
-	const t8 = current?.name === null;
-	let t9;
-	if ($[10] !== draftId || $[11] !== drafts || $[12] !== switchTo || $[13] !== t7 || $[14] !== t8) {
-		t9 = {
+	let t8;
+	if ($[12] !== draftId || $[13] !== drafts || $[14] !== switchTo || $[15] !== t7) {
+		t8 = {
 			enabled: t7,
 			draftId,
-			unnamed: t8,
 			drafts,
 			switchTo
 		};
-		$[10] = draftId;
-		$[11] = drafts;
-		$[12] = switchTo;
-		$[13] = t7;
-		$[14] = t8;
-		$[15] = t9;
-	} else t9 = $[15];
-	useDraftsActions(t9);
+		$[12] = draftId;
+		$[13] = drafts;
+		$[14] = switchTo;
+		$[15] = t7;
+		$[16] = t8;
+	} else t8 = $[16];
+	useDraftsActions(t8);
 	if (draftId && !current) return null;
-	let t10;
-	if ($[16] === Symbol.for("react.memo_cache_sentinel")) {
-		t10 = /* @__PURE__ */ jsx(Button, {
+	let t9;
+	if ($[17] === Symbol.for("react.memo_cache_sentinel")) {
+		t9 = /* @__PURE__ */ jsx(Button, {
 			type: "button",
 			variant: "ghost"
 		});
-		$[16] = t10;
-	} else t10 = $[16];
-	const t11 = draftId ? "bg-blue-500" : "bg-emerald-500";
+		$[17] = t9;
+	} else t9 = $[17];
+	const t10 = draftId ? "bg-blue-500" : "bg-emerald-500";
+	let t11;
+	if ($[18] !== t10) {
+		t11 = cn("size-2 shrink-0 rounded-full", t10);
+		$[18] = t10;
+		$[19] = t11;
+	} else t11 = $[19];
 	let t12;
-	if ($[17] !== t11) {
-		t12 = cn("size-2 shrink-0 rounded-full", t11);
-		$[17] = t11;
-		$[18] = t12;
-	} else t12 = $[18];
-	let t13;
-	if ($[19] !== t12) {
-		t13 = /* @__PURE__ */ jsx("span", {
+	if ($[20] !== t11) {
+		t12 = /* @__PURE__ */ jsx("span", {
 			"aria-hidden": true,
-			className: t12
+			className: t11
 		});
-		$[19] = t12;
-		$[20] = t13;
-	} else t13 = $[20];
+		$[20] = t11;
+		$[21] = t12;
+	} else t12 = $[21];
+	let t13;
+	if ($[22] !== current || $[23] !== draftId) {
+		t13 = draftId ? draftLabel(current) : "Live";
+		$[22] = current;
+		$[23] = draftId;
+		$[24] = t13;
+	} else t13 = $[24];
 	let t14;
-	if ($[21] !== current || $[22] !== draftId) {
-		t14 = draftId ? draftLabel(current) : "Live";
-		$[21] = current;
-		$[22] = draftId;
-		$[23] = t14;
-	} else t14 = $[23];
-	let t15;
-	if ($[24] !== t14) {
-		t15 = /* @__PURE__ */ jsx("span", {
+	if ($[25] !== t13) {
+		t14 = /* @__PURE__ */ jsx("span", {
 			className: "max-w-48 truncate",
-			children: t14
+			children: t13
 		});
-		$[24] = t14;
-		$[25] = t15;
-	} else t15 = $[25];
-	let t16;
-	if ($[26] === Symbol.for("react.memo_cache_sentinel")) {
-		t16 = /* @__PURE__ */ jsx(ChevronsUpDown, {
+		$[25] = t13;
+		$[26] = t14;
+	} else t14 = $[26];
+	let t15;
+	if ($[27] === Symbol.for("react.memo_cache_sentinel")) {
+		t15 = /* @__PURE__ */ jsx(ChevronsUpDown, {
 			"aria-hidden": true,
 			className: "size-4 opacity-50"
 		});
-		$[26] = t16;
-	} else t16 = $[26];
-	let t17;
-	if ($[27] !== disabled || $[28] !== t13 || $[29] !== t15) {
-		t17 = /* @__PURE__ */ jsxs(DropdownMenuTrigger, {
+		$[27] = t15;
+	} else t15 = $[27];
+	let t16;
+	if ($[28] !== disabled || $[29] !== t12 || $[30] !== t14) {
+		t16 = /* @__PURE__ */ jsxs(DropdownMenuTrigger, {
 			disabled,
-			render: t10,
+			render: t9,
 			children: [
-				t13,
-				t15,
-				t16
+				t12,
+				t14,
+				t15
 			]
 		});
-		$[27] = disabled;
-		$[28] = t13;
-		$[29] = t15;
-		$[30] = t17;
-	} else t17 = $[30];
-	let t18;
-	if ($[31] !== draftId) {
-		t18 = !draftId && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(DropdownMenuGroup, { children: /* @__PURE__ */ jsx(DropdownMenuLabel, {
+		$[28] = disabled;
+		$[29] = t12;
+		$[30] = t14;
+		$[31] = t16;
+	} else t16 = $[31];
+	let t17;
+	if ($[32] !== draftId) {
+		t17 = !draftId && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(DropdownMenuGroup, { children: /* @__PURE__ */ jsx(DropdownMenuLabel, {
 			className: "text-muted-foreground font-normal",
 			children: "Live is read-only. Your first edit starts a new draft."
 		}) }), /* @__PURE__ */ jsx(DropdownMenuSeparator, {})] });
-		$[31] = draftId;
-		$[32] = t18;
-	} else t18 = $[32];
-	const t19 = draftId ?? LIVE;
+		$[32] = draftId;
+		$[33] = t17;
+	} else t17 = $[33];
+	const t18 = draftId ?? LIVE;
+	let t19;
+	if ($[34] !== switchTo) {
+		t19 = (value) => switchTo(value === LIVE ? null : String(value));
+		$[34] = switchTo;
+		$[35] = t19;
+	} else t19 = $[35];
 	let t20;
-	if ($[33] !== switchTo) {
-		t20 = (value) => switchTo(value === LIVE ? null : String(value));
-		$[33] = switchTo;
-		$[34] = t20;
-	} else t20 = $[34];
+	if ($[36] === Symbol.for("react.memo_cache_sentinel")) {
+		t20 = /* @__PURE__ */ jsx(DropdownMenuLabel, { children: "Switch to" });
+		$[36] = t20;
+	} else t20 = $[36];
 	let t21;
-	if ($[35] === Symbol.for("react.memo_cache_sentinel")) {
-		t21 = /* @__PURE__ */ jsx(DropdownMenuLabel, { children: "Switch to" });
-		$[35] = t21;
-	} else t21 = $[35];
+	if ($[37] === Symbol.for("react.memo_cache_sentinel")) {
+		t21 = /* @__PURE__ */ jsx("span", { children: "Live" });
+		$[37] = t21;
+	} else t21 = $[37];
 	let t22;
-	if ($[36] === Symbol.for("react.memo_cache_sentinel")) {
-		t22 = /* @__PURE__ */ jsx("span", { children: "Live" });
-		$[36] = t22;
-	} else t22 = $[36];
-	let t23;
-	if ($[37] !== list) {
-		t23 = list && /* @__PURE__ */ jsx("span", {
+	if ($[38] !== list) {
+		t22 = list && /* @__PURE__ */ jsx("span", {
 			className: "text-muted-foreground text-xs",
 			children: liveLine(list.live)
 		});
-		$[37] = list;
-		$[38] = t23;
-	} else t23 = $[38];
-	let t24;
-	if ($[39] !== t23) {
-		t24 = /* @__PURE__ */ jsx(DropdownMenuRadioItem, {
+		$[38] = list;
+		$[39] = t22;
+	} else t22 = $[39];
+	let t23;
+	if ($[40] !== t22) {
+		t23 = /* @__PURE__ */ jsx(DropdownMenuRadioItem, {
 			value: LIVE,
 			closeOnClick: true,
 			children: /* @__PURE__ */ jsxs("div", {
 				className: "flex flex-col",
-				children: [t22, t23]
+				children: [t21, t22]
 			})
 		});
-		$[39] = t23;
-		$[40] = t24;
-	} else t24 = $[40];
+		$[40] = t22;
+		$[41] = t23;
+	} else t23 = $[41];
+	let t24;
+	if ($[42] !== drafts) {
+		t24 = drafts.map(_temp6);
+		$[42] = drafts;
+		$[43] = t24;
+	} else t24 = $[43];
 	let t25;
-	if ($[41] !== drafts) {
-		t25 = drafts.map(_temp6);
-		$[41] = drafts;
-		$[42] = t25;
-	} else t25 = $[42];
-	let t26;
-	if ($[43] !== t24 || $[44] !== t25) {
-		t26 = /* @__PURE__ */ jsxs(DropdownMenuGroup, { children: [
-			t21,
-			t24,
-			t25
+	if ($[44] !== t23 || $[45] !== t24) {
+		t25 = /* @__PURE__ */ jsxs(DropdownMenuGroup, { children: [
+			t20,
+			t23,
+			t24
 		] });
-		$[43] = t24;
-		$[44] = t25;
-		$[45] = t26;
-	} else t26 = $[45];
-	let t27;
-	if ($[46] !== t19 || $[47] !== t20 || $[48] !== t26) {
-		t27 = /* @__PURE__ */ jsx(DropdownMenuRadioGroup, {
-			value: t19,
-			onValueChange: t20,
-			children: t26
+		$[44] = t23;
+		$[45] = t24;
+		$[46] = t25;
+	} else t25 = $[46];
+	let t26;
+	if ($[47] !== t18 || $[48] !== t19 || $[49] !== t25) {
+		t26 = /* @__PURE__ */ jsx(DropdownMenuRadioGroup, {
+			value: t18,
+			onValueChange: t19,
+			children: t25
 		});
-		$[46] = t19;
-		$[47] = t20;
-		$[48] = t26;
-		$[49] = t27;
-	} else t27 = $[49];
-	let t28;
-	if ($[50] !== t18 || $[51] !== t27) {
-		t28 = /* @__PURE__ */ jsx(DropdownMenuContent, {
+		$[47] = t18;
+		$[48] = t19;
+		$[49] = t25;
+		$[50] = t26;
+	} else t26 = $[50];
+	let t27;
+	if ($[51] !== t17 || $[52] !== t26) {
+		t27 = /* @__PURE__ */ jsx(DropdownMenuContent, {
 			className: "w-80",
 			align: "start",
-			children: /* @__PURE__ */ jsxs(Fragment, { children: [t18, t27] })
+			children: /* @__PURE__ */ jsxs(Fragment, { children: [t17, t26] })
 		});
-		$[50] = t18;
-		$[51] = t27;
-		$[52] = t28;
-	} else t28 = $[52];
+		$[51] = t17;
+		$[52] = t26;
+		$[53] = t27;
+	} else t27 = $[53];
+	let t28;
+	if ($[54] !== t16 || $[55] !== t27) {
+		t28 = /* @__PURE__ */ jsxs(DropdownMenu, { children: [t16, t27] });
+		$[54] = t16;
+		$[55] = t27;
+		$[56] = t28;
+	} else t28 = $[56];
 	let t29;
-	if ($[53] !== t17 || $[54] !== t28) {
-		t29 = /* @__PURE__ */ jsxs(DropdownMenu, { children: [t17, t28] });
-		$[53] = t17;
-		$[54] = t28;
-		$[55] = t29;
-	} else t29 = $[55];
-	let t30;
-	if ($[56] !== current?.name || $[57] !== deleting || $[58] !== draftId || $[59] !== leaveDraft || $[60] !== projectId || $[61] !== review) {
-		t30 = draftId && projectId && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(ReviewDraftSheet, {
+	if ($[57] !== deleting || $[58] !== draftId || $[59] !== leaveDraft || $[60] !== projectId || $[61] !== reviewing) {
+		t29 = draftId && projectId && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(ReviewDraftSheet, {
 			projectId,
 			draftId,
-			open: review.open,
-			startRenaming: review.startRenaming,
+			open: reviewing,
 			onOpenChange: _temp7
 		}), /* @__PURE__ */ jsx(DeleteDraftDialog, {
 			projectId,
 			open: deleting,
-			discard: current?.name === null,
 			onOpenChange: _temp8,
-			onDeleted: (ended) => leaveDraft(ended, { discarded: current?.name === null })
+			onDeleted: leaveDraft
 		})] });
-		$[56] = current?.name;
 		$[57] = deleting;
 		$[58] = draftId;
 		$[59] = leaveDraft;
 		$[60] = projectId;
-		$[61] = review;
-		$[62] = t30;
-	} else t30 = $[62];
-	let t31;
-	if ($[63] !== t29 || $[64] !== t30) {
-		t31 = /* @__PURE__ */ jsxs(Fragment, { children: [t29, t30] });
-		$[63] = t29;
-		$[64] = t30;
-		$[65] = t31;
-	} else t31 = $[65];
-	return t31;
+		$[61] = reviewing;
+		$[62] = t29;
+	} else t29 = $[62];
+	let t30;
+	if ($[63] !== t28 || $[64] !== t29) {
+		t30 = /* @__PURE__ */ jsxs(Fragment, { children: [t28, t29] });
+		$[63] = t28;
+		$[64] = t29;
+		$[65] = t30;
+	} else t30 = $[65];
+	return t30;
 }
 function _temp8(open_0) {
 	if (!open_0) studioStore.send({ type: "closeDeleteDraftDialog" });
@@ -364,8 +367,8 @@ function _temp8(open_0) {
 function _temp7(open) {
 	if (!open) studioStore.send({ type: "closeReviewDraftSheet" });
 }
-function _temp6(draft) {
-	return /* @__PURE__ */ jsx(DraftItem, { draft }, draft.id);
+function _temp6(draft_0) {
+	return /* @__PURE__ */ jsx(DraftItem, { draft: draft_0 }, draft_0.id);
 }
 function _temp5() {
 	return _temp4;
@@ -382,18 +385,18 @@ function _temp2(state_0) {
 	return state_0.context.isDeleteDraftDialogOpen;
 }
 function _temp(state) {
-	return state.context.reviewDraftSheet;
+	return state.context.isReviewDraftSheetOpen;
 }
 /**
 * The drafts controls' actions in the command palette, offered where the controls offer them. The palette only opens the review and the delete confirmation; it never publishes or
 * deletes by itself.
 */
 function useDraftsActions(t0) {
-	const $ = c(7);
-	const { enabled, draftId, unnamed, drafts, switchTo } = t0;
+	const $ = c(6);
+	const { enabled, draftId, drafts, switchTo } = t0;
 	let t1;
 	let t2;
-	if ($[0] !== draftId || $[1] !== drafts || $[2] !== enabled || $[3] !== switchTo || $[4] !== unnamed) {
+	if ($[0] !== draftId || $[1] !== drafts || $[2] !== enabled || $[3] !== switchTo) {
 		t1 = () => {
 			const inDraft = enabled && !!draftId;
 			const others = drafts.filter((listed) => listed.id !== draftId);
@@ -414,12 +417,8 @@ function useDraftsActions(t0) {
 				},
 				{
 					id: "delete-draft",
-					label: unnamed ? "Discard changes…" : "Delete draft…",
-					aliases: unnamed ? [
-						"Delete draft",
-						"Throw away changes",
-						"Revert changes"
-					] : [
+					label: "Delete draft…",
+					aliases: [
 						"Discard changes",
 						"Throw away changes",
 						"Revert changes"
@@ -428,14 +427,6 @@ function useDraftsActions(t0) {
 					checkIfAvailable: () => inDraft,
 					execute: _temp10
 				},
-				{
-					id: "rename-draft",
-					label: unnamed ? "Name draft…" : "Rename draft…",
-					aliases: unnamed ? ["Rename draft", "Save draft"] : ["Name draft"],
-					groupLabel: "Drafts",
-					checkIfAvailable: () => inDraft,
-					execute: _temp11
-				},
 				{
 					id: "switch-to-live",
 					label: "Switch to Live",
@@ -460,7 +451,7 @@ function useDraftsActions(t0) {
 					groupLabel: "Drafts",
 					checkIfAvailable: () => others.length > 0,
 					hasChildren: true,
-					execute: _temp12
+					execute: _temp11
 				},
 				...others.map((other) => ({
 					id: `${SWITCH_TO_DRAFT_ID}-${other.id}`,
@@ -468,7 +459,7 @@ function useDraftsActions(t0) {
 					label: `Switch to "${draftLabel(other)}"`,
 					aliases: [other.createdBy.name],
 					groupLabel: "Drafts",
-					checkIfAvailable: _temp13,
+					checkIfAvailable: _temp12,
 					execute: () => switchTo(other.id)
 				}))
 			];
@@ -479,14 +470,13 @@ function useDraftsActions(t0) {
 			return () => {
 				actionsStore.send({
 					type: "unregisterManyActions",
-					ids: actions.map(_temp14)
+					ids: actions.map(_temp13)
 				});
 			};
 		};
 		t2 = [
 			enabled,
 			draftId,
-			unnamed,
 			drafts,
 			switchTo
 		];
@@ -494,28 +484,21 @@ function useDraftsActions(t0) {
 		$[1] = drafts;
 		$[2] = enabled;
 		$[3] = switchTo;
-		$[4] = unnamed;
-		$[5] = t1;
-		$[6] = t2;
+		$[4] = t1;
+		$[5] = t2;
 	} else {
-		t1 = $[5];
-		t2 = $[6];
+		t1 = $[4];
+		t2 = $[5];
 	}
 	React.useEffect(t1, t2);
 }
-function _temp14(a) {
+function _temp13(a) {
 	return a.id;
 }
-function _temp13() {
+function _temp12() {
 	return true;
 }
-function _temp12() {}
-function _temp11() {
-	return studioStore.send({
-		type: "openReviewDraftSheet",
-		startRenaming: true
-	});
-}
+function _temp11() {}
 function _temp10() {
 	return studioStore.send({ type: "openDeleteDraftDialog" });
 }

package/dist/features/studio/components/LocalePicker.js

@@ -9,6 +9,7 @@ import { usePageDestinations } from "../../../hooks/use-page-destinations.js";
 import { useLocalePath } from "../../../lib/view-locale.js";
 import { studioStore } from "../studioStore.js";
 import { localeLabel, localeOptions } from "../localeOptions.js";
+import { useSwitchView } from "../viewSwitch.js";
 import { pathInLocale } from "../localeSwitch.js";
 import { c } from "react/compiler-runtime";
 import * as React from "react";
@@ -283,7 +284,7 @@ function LocalePicker(t0) {
 			projectId,
 			locales,
 			open: dialog === "add",
-			onAdded: (added) => void switchTo(added)
+			onAdded: (added) => switchTo(added)
 		}), !viewed.isDefault && /* @__PURE__ */ jsx(RemoveLocaleDialog, {
 			projectId,
 			locale: viewed,
@@ -385,7 +386,7 @@ function TranslatingSpinner(t0) {
 * its home.
 */
 function useSwitchLocale(recordPage) {
-	const $ = c(10);
+	const $ = c(15);
 	const navigate = useNavigate();
 	const cache = useStudioCache();
 	const projectUuid = useProjectUuid();
@@ -401,7 +402,6 @@ function useSwitchLocale(recordPage) {
 	let t1;
 	if ($[1] !== cache || $[2] !== destinations || $[3] !== navigate || $[4] !== path || $[5] !== projectUuid || $[6] !== recordPage || $[7] !== search || $[8] !== view.locale) {
 		t1 = async (target) => {
-			if (target.tag === view.locale.tag && target.isDefault === view.locale.isDefault) return;
 			const pagesIn = (locale) => cache.ensure(reads.pageList({ projectUuid }), { locale }).catch(_temp8);
 			const recordPath = recordPage ? cache.reload(reads.discoveredPath({
 				projectUuid,
@@ -426,7 +426,25 @@ function useSwitchLocale(recordPage) {
 		$[8] = view.locale;
 		$[9] = t1;
 	} else t1 = $[9];
-	return t1;
+	const switchTo = t1;
+	const switchView = useSwitchView();
+	let t2;
+	if ($[10] !== switchTo || $[11] !== switchView || $[12] !== view.locale.isDefault || $[13] !== view.locale.tag) {
+		t2 = (target_0) => {
+			if (target_0.tag === view.locale.tag && target_0.isDefault === view.locale.isDefault) return;
+			const label = localeLabel(target_0.tag);
+			switchView(() => switchTo(target_0), {
+				loading: `Switching to ${label}…`,
+				success: `You're now viewing ${label}.`
+			});
+		};
+		$[10] = switchTo;
+		$[11] = switchView;
+		$[12] = view.locale.isDefault;
+		$[13] = view.locale.tag;
+		$[14] = t2;
+	} else t2 = $[14];
+	return t2;
 }
 function _temp9() {
 	return null;