camox 0.57.0 → 0.58.1

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

@@ -6,14 +6,13 @@ 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 { RenameDraftDialog } from "./RenameDraftDialog.js";
 import { DeleteDraftDialog, ReviewDraftSheet, useLeaveDraft } from "./ReviewDraftSheet.js";
 import { c } from "react/compiler-runtime";
 import * as React from "react";
 import { useSelector } from "@xstate/store-react";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { Button } from "@camox/ui/button";
-import { ChevronsUpDown, Pencil } from "lucide-react";
+import { ChevronsUpDown } from "lucide-react";
 import { toast } from "@camox/ui/toaster";
 import { Badge } from "@camox/ui/badge";
 import { DropdownMenu, DropdownMenuContent, DropdownMenuGroup, DropdownMenuLabel, DropdownMenuRadioGroup, DropdownMenuRadioItem, DropdownMenuSeparator, DropdownMenuTrigger } from "@camox/ui/dropdown-menu";
@@ -103,7 +102,7 @@ function useDrafts() {
 * still names what the studio is viewing.
 */
 function DraftPicker(t0) {
-	const $ = c(57);
+	const $ = c(52);
 	const { disabled: t1 } = t0;
 	const disabled = t1 === void 0 ? false : t1;
 	const { draftScope, draftId, developmentMode, projectId, list, current } = useDrafts();
@@ -111,8 +110,6 @@ function DraftPicker(t0) {
 	const leaveDraft = useLeaveDraft();
 	const review = useSelector(studioStore, _temp);
 	const deleting = useSelector(studioStore, _temp2);
-	const [menuOpen, setMenuOpen] = React.useState(false);
-	const [renaming, setRenaming] = React.useState(null);
 	let t2;
 	let t3;
 	if ($[0] !== draftScope) {
@@ -273,13 +270,7 @@ function DraftPicker(t0) {
 							})]
 						})
 					}),
-					regular.map((listed_0) => /* @__PURE__ */ jsx(DraftItem, {
-						draft: listed_0,
-						onRename: () => {
-							setMenuOpen(false);
-							setRenaming(listed_0);
-						}
-					}, listed_0.id))
+					regular.map(_temp7)
 				] })
 			})] })
 		});
@@ -291,70 +282,50 @@ function DraftPicker(t0) {
 		$[39] = t18;
 	} else t18 = $[39];
 	let t19;
-	if ($[40] !== menuOpen || $[41] !== t17 || $[42] !== t18) {
-		t19 = /* @__PURE__ */ jsxs(DropdownMenu, {
-			open: menuOpen,
-			onOpenChange: setMenuOpen,
-			children: [t17, t18]
-		});
-		$[40] = menuOpen;
-		$[41] = t17;
-		$[42] = t18;
-		$[43] = t19;
-	} else t19 = $[43];
+	if ($[40] !== t17 || $[41] !== t18) {
+		t19 = /* @__PURE__ */ jsxs(DropdownMenu, { children: [t17, t18] });
+		$[40] = t17;
+		$[41] = t18;
+		$[42] = t19;
+	} else t19 = $[42];
 	let t20;
-	if ($[44] !== projectId || $[45] !== renaming) {
-		t20 = projectId && /* @__PURE__ */ jsx(RenameDraftDialog, {
-			projectId,
-			draft: renaming,
-			onOpenChange: (open) => {
-				if (!open) setRenaming(null);
-			}
-		});
-		$[44] = projectId;
-		$[45] = renaming;
-		$[46] = t20;
-	} else t20 = $[46];
-	let t21;
-	if ($[47] !== deleting || $[48] !== draftId || $[49] !== leaveDraft || $[50] !== projectId || $[51] !== review) {
-		t21 = draftId && projectId && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(ReviewDraftSheet, {
+	if ($[43] !== deleting || $[44] !== draftId || $[45] !== leaveDraft || $[46] !== projectId || $[47] !== review) {
+		t20 = draftId && projectId && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(ReviewDraftSheet, {
 			projectId,
 			draftId,
 			open: review.open,
 			startRenaming: review.startRenaming,
-			onOpenChange: _temp7
+			onOpenChange: _temp8
 		}), /* @__PURE__ */ jsx(DeleteDraftDialog, {
 			projectId,
 			open: deleting,
-			onOpenChange: _temp8,
+			onOpenChange: _temp9,
 			onDeleted: leaveDraft
 		})] });
-		$[47] = deleting;
-		$[48] = draftId;
-		$[49] = leaveDraft;
-		$[50] = projectId;
-		$[51] = review;
-		$[52] = t21;
-	} else t21 = $[52];
-	let t22;
-	if ($[53] !== t19 || $[54] !== t20 || $[55] !== t21) {
-		t22 = /* @__PURE__ */ jsxs(Fragment, { children: [
-			t19,
-			t20,
-			t21
-		] });
-		$[53] = t19;
-		$[54] = t20;
-		$[55] = t21;
-		$[56] = t22;
-	} else t22 = $[56];
-	return t22;
+		$[43] = deleting;
+		$[44] = draftId;
+		$[45] = leaveDraft;
+		$[46] = projectId;
+		$[47] = review;
+		$[48] = t20;
+	} else t20 = $[48];
+	let t21;
+	if ($[49] !== t19 || $[50] !== t20) {
+		t21 = /* @__PURE__ */ jsxs(Fragment, { children: [t19, t20] });
+		$[49] = t19;
+		$[50] = t20;
+		$[51] = t21;
+	} else t21 = $[51];
+	return t21;
+}
+function _temp9(open_0) {
+	if (!open_0) studioStore.send({ type: "closeDeleteDraftDialog" });
 }
-function _temp8(open_1) {
-	if (!open_1) studioStore.send({ type: "closeDeleteDraftDialog" });
+function _temp8(open) {
+	if (!open) studioStore.send({ type: "closeReviewDraftSheet" });
 }
-function _temp7(open_0) {
-	if (!open_0) studioStore.send({ type: "closeReviewDraftSheet" });
+function _temp7(listed_0) {
+	return /* @__PURE__ */ jsx(DraftItem, { draft: listed_0 }, listed_0.id);
 }
 function _temp6(listed) {
 	return listed.kind === "regular";
@@ -405,7 +376,7 @@ function PendingChanges() {
 		t3 = /* @__PURE__ */ jsxs(Button, {
 			type: "button",
 			"aria-label": t1,
-			onClick: _temp9,
+			onClick: _temp10,
 			children: ["Review changes", t2]
 		});
 		$[4] = t1;
@@ -414,7 +385,7 @@ function PendingChanges() {
 	} else t3 = $[6];
 	return t3;
 }
-function _temp9() {
+function _temp10() {
 	return studioStore.send({ type: "openReviewDraftSheet" });
 }
 /**
@@ -443,7 +414,7 @@ function useDraftsActions(t0) {
 					],
 					groupLabel: "Drafts",
 					checkIfAvailable: () => inDraft,
-					execute: _temp10
+					execute: _temp11
 				},
 				{
 					id: "delete-draft",
@@ -455,7 +426,7 @@ function useDraftsActions(t0) {
 					],
 					groupLabel: "Drafts",
 					checkIfAvailable: () => inDraft,
-					execute: _temp11
+					execute: _temp12
 				},
 				{
 					id: "rename-draft",
@@ -463,7 +434,7 @@ function useDraftsActions(t0) {
 					aliases: ["Name draft"],
 					groupLabel: "Drafts",
 					checkIfAvailable: () => inDraft && !developmentMode,
-					execute: _temp12
+					execute: _temp13
 				},
 				{
 					id: "switch-to-live",
@@ -489,7 +460,7 @@ function useDraftsActions(t0) {
 					groupLabel: "Drafts",
 					checkIfAvailable: () => others.length > 0,
 					hasChildren: true,
-					execute: _temp13
+					execute: _temp14
 				},
 				...others.map((other) => ({
 					id: `${SWITCH_TO_DRAFT_ID}-${other.id}`,
@@ -497,7 +468,7 @@ function useDraftsActions(t0) {
 					label: `Switch to "${draftLabel(other)}"`,
 					aliases: [other.createdBy.name],
 					groupLabel: "Drafts",
-					checkIfAvailable: _temp14,
+					checkIfAvailable: _temp15,
 					execute: () => switchTo(other.id)
 				}))
 			];
@@ -508,7 +479,7 @@ function useDraftsActions(t0) {
 			return () => {
 				actionsStore.send({
 					type: "unregisterManyActions",
-					ids: actions.map(_temp15)
+					ids: actions.map(_temp16)
 				});
 			};
 		};
@@ -532,23 +503,23 @@ function useDraftsActions(t0) {
 	}
 	React.useEffect(t1, t2);
 }
-function _temp15(a) {
+function _temp16(a) {
 	return a.id;
 }
-function _temp14() {
+function _temp15() {
 	return true;
 }
-function _temp13() {}
-function _temp12() {
+function _temp14() {}
+function _temp13() {
 	return studioStore.send({
 		type: "openReviewDraftSheet",
 		startRenaming: true
 	});
 }
-function _temp11() {
+function _temp12() {
 	return studioStore.send({ type: "openDeleteDraftDialog" });
 }
-function _temp10() {
+function _temp11() {
 	return studioStore.send({ type: "openReviewDraftSheet" });
 }
 /** Who published Live last and when: a member, a release, or nobody yet. */
@@ -557,11 +528,10 @@ function liveLine(live) {
 	const by = live.publishedBy ? live.publishedBy.name : "a release";
 	return `Published ${timeAgo(live.publishedAt)} by ${by}`;
 }
-/** A draft to switch to, with a button to rename it that leaves the selection alone. */
+/** A draft to switch to. */
 function DraftItem(t0) {
-	const $ = c(27);
-	const { draft, onRename } = t0;
-	const keep = _temp16;
+	const $ = c(18);
+	const { draft } = t0;
 	const t1 = draft.id;
 	let t2;
 	if ($[0] !== draft) {
@@ -620,61 +590,17 @@ function DraftItem(t0) {
 		$[14] = t8;
 	} else t8 = $[14];
 	let t9;
-	if ($[15] !== draft) {
-		t9 = draftLabel(draft);
-		$[15] = draft;
-		$[16] = t9;
-	} else t9 = $[16];
-	const t10 = `Rename "${t9}"`;
-	let t11;
-	if ($[17] !== onRename) {
-		t11 = (event_0) => {
-			keep(event_0);
-			onRename();
-		};
-		$[17] = onRename;
-		$[18] = t11;
-	} else t11 = $[18];
-	let t12;
-	if ($[19] === Symbol.for("react.memo_cache_sentinel")) {
-		t12 = /* @__PURE__ */ jsx(Pencil, {});
-		$[19] = t12;
-	} else t12 = $[19];
-	let t13;
-	if ($[20] !== t10 || $[21] !== t11) {
-		t13 = /* @__PURE__ */ jsx(Button, {
-			type: "button",
-			variant: "ghost",
-			size: "icon-xs",
-			"aria-label": t10,
-			className: "opacity-0 group-data-highlighted/draft-item:opacity-100 focus-visible:opacity-100",
-			onPointerDown: keep,
-			onPointerUp: keep,
-			onMouseUp: keep,
-			onClick: t11,
-			children: t12
-		});
-		$[20] = t10;
-		$[21] = t11;
-		$[22] = t13;
-	} else t13 = $[22];
-	let t14;
-	if ($[23] !== draft.id || $[24] !== t13 || $[25] !== t8) {
-		t14 = /* @__PURE__ */ jsxs(DropdownMenuRadioItem, {
+	if ($[15] !== draft.id || $[16] !== t8) {
+		t9 = /* @__PURE__ */ jsx(DropdownMenuRadioItem, {
 			value: t1,
 			closeOnClick: true,
-			className: "group/draft-item",
-			children: [t8, t13]
+			children: t8
 		});
-		$[23] = draft.id;
-		$[24] = t13;
-		$[25] = t8;
-		$[26] = t14;
-	} else t14 = $[26];
-	return t14;
-}
-function _temp16(event) {
-	return event.stopPropagation();
+		$[15] = draft.id;
+		$[16] = t8;
+		$[17] = t9;
+	} else t9 = $[17];
+	return t9;
 }
 
 //#endregion

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

@@ -1,11 +1,11 @@
+import { getDraftReadClient } from "../../../lib/api-client.js";
 import { useDraftScope } from "../../../lib/draft-scope.js";
-import { reads, useReadQuery } from "../../../lib/studio-reads.js";
+import { reads, useReadQuery, useStudioCache } from "../../../lib/studio-reads.js";
 import { cn } from "../../../lib/utils.js";
 import { draftMutations } from "../../../lib/queries.js";
 import { previewStore } from "../../preview/previewStore.js";
 import { localeLabel } from "../localeOptions.js";
 import { draftLabel, plural, timeAgo } from "../draftLabel.js";
-import { useRenameDraft } from "./RenameDraftDialog.js";
 import { useShowInCanvas } from "../showInCanvas.js";
 import { c } from "react/compiler-runtime";
 import * as React from "react";
@@ -981,6 +981,54 @@ function useLeaveDraft() {
 	return t0;
 }
 /**
+* Renames a regular draft, whichever draft the studio views: the request names the draft it
+* renames. A blank name clears it, so the draft shows its computed label again.
+*/
+function useRenameDraft(projectId) {
+	const $ = c(8);
+	const studioCache = useStudioCache();
+	let t0;
+	if ($[0] !== projectId) {
+		t0 = (t1) => {
+			const { draftId, name } = t1;
+			return getDraftReadClient(draftId).drafts.rename({
+				projectId,
+				name
+			});
+		};
+		$[0] = projectId;
+		$[1] = t0;
+	} else t0 = $[1];
+	let t1;
+	if ($[2] !== projectId || $[3] !== studioCache) {
+		t1 = (renamed) => {
+			studioCache.set(reads.draft({
+				projectId,
+				draftId: renamed.id
+			}), renamed);
+			studioCache.invalidate(reads.draftList({ projectId }));
+		};
+		$[2] = projectId;
+		$[3] = studioCache;
+		$[4] = t1;
+	} else t1 = $[4];
+	let t2;
+	if ($[5] !== t0 || $[6] !== t1) {
+		t2 = {
+			mutationFn: t0,
+			onSuccess: t1,
+			onError: _temp10
+		};
+		$[5] = t0;
+		$[6] = t1;
+		$[7] = t2;
+	} else t2 = $[7];
+	return useMutation(t2);
+}
+function _temp10(error) {
+	return toast.error(error.message || "Could not rename the draft");
+}
+/**
 * The draft's name in the review's header, renamed in place by any member (#203), like a page
 * nickname in the Canvas Inspector: a title whose border shows on hover or focus, without
 * moving the text. An unnamed draft shows its computed label until focused. Saves on Enter or
@@ -1545,7 +1593,7 @@ function DeleteDraftDialog(t0) {
 				onOpenChange(false);
 				onDeleted(ended);
 			},
-			onError: _temp10
+			onError: _temp11
 		};
 		$[1] = onDeleted;
 		$[2] = onOpenChange;
@@ -1624,7 +1672,7 @@ function DeleteDraftDialog(t0) {
 	} else t10 = $[25];
 	return t10;
 }
-function _temp10(error) {
+function _temp11(error) {
 	return toast.error(error.message || "Could not delete the draft");
 }
 

package/dist/package.js

@@ -1,5 +1,5 @@
 //#region package.json
-var version = "0.57.0";
+var version = "0.58.1";
 
 //#endregion
 export { version };