camox 0.67.0 → 0.68.0

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

@@ -0,0 +1,139 @@
+import { cn } from "../../../lib/utils.js";
+import { studioStore } from "../studioStore.js";
+import { plural } from "../draftLabel.js";
+import { useDrafts } from "./DraftsControl.js";
+import { c } from "react/compiler-runtime";
+import * as React from "react";
+import { jsx, jsxs } from "react/jsx-runtime";
+import { Button } from "@camox/ui/button";
+import { FloatingToolbar } from "@camox/ui/floating-toolbar";
+
+//#region src/features/studio/components/DraftBar.tsx
+/**
+* How long a draft goes without a change before its bar shows, so it doesn't pop up mid-edit.
+*/
+const SETTLE_MS = 1500;
+/**
+* Asks what to do with the draft being viewed, once its edits settle: discard its changes or
+* publish them. `stacked` places it in the Preview toolbar's column, just above the toolbar;
+* otherwise it floats at the bottom of the screen on its own.
+*/
+function DraftBar(t0) {
+	const $ = c(15);
+	const { stacked: t1 } = t0;
+	const stacked = t1 === void 0 ? false : t1;
+	const { projectId, current } = useDrafts();
+	const settled = useSettled(current?.id ?? null, current?.lastChangedAt ?? null);
+	if (!projectId || !current || !settled) return null;
+	const empty = current.changeCount === 0;
+	const t2 = stacked ? "pointer-events-auto relative left-auto translate-x-0" : "fixed bottom-2";
+	let t3;
+	if ($[0] !== t2) {
+		t3 = cn("w-max gap-4", t2);
+		$[0] = t2;
+		$[1] = t3;
+	} else t3 = $[1];
+	let t4;
+	if ($[2] === Symbol.for("react.memo_cache_sentinel")) {
+		t4 = /* @__PURE__ */ jsx("span", {
+			"aria-hidden": true,
+			className: "size-2 shrink-0 rounded-full bg-blue-500"
+		});
+		$[2] = t4;
+	} else t4 = $[2];
+	let t5;
+	if ($[3] !== current.changeCount || $[4] !== empty) {
+		t5 = empty ? "No changes yet" : plural(current.changeCount, "pending change");
+		$[3] = current.changeCount;
+		$[4] = empty;
+		$[5] = t5;
+	} else t5 = $[5];
+	let t6;
+	if ($[6] !== t5) {
+		t6 = /* @__PURE__ */ jsxs("span", {
+			className: "flex items-center gap-2 px-2 text-sm",
+			children: [t4, t5]
+		});
+		$[6] = t5;
+		$[7] = t6;
+	} else t6 = $[7];
+	let t7;
+	if ($[8] === Symbol.for("react.memo_cache_sentinel")) {
+		t7 = /* @__PURE__ */ jsx(Button, {
+			type: "button",
+			variant: "outline",
+			onClick: _temp,
+			children: "Discard"
+		});
+		$[8] = t7;
+	} else t7 = $[8];
+	let t8;
+	if ($[9] !== empty) {
+		t8 = /* @__PURE__ */ jsxs("div", {
+			className: "flex items-center gap-2",
+			children: [t7, /* @__PURE__ */ jsx(Button, {
+				type: "button",
+				disabled: empty,
+				onClick: _temp2,
+				children: "Publish…"
+			})]
+		});
+		$[9] = empty;
+		$[10] = t8;
+	} else t8 = $[10];
+	let t9;
+	if ($[11] !== t3 || $[12] !== t6 || $[13] !== t8) {
+		t9 = /* @__PURE__ */ jsxs(FloatingToolbar, {
+			"aria-label": "Draft",
+			className: t3,
+			children: [t6, t8]
+		});
+		$[11] = t3;
+		$[12] = t6;
+		$[13] = t8;
+		$[14] = t9;
+	} else t9 = $[14];
+	return t9;
+}
+function _temp2() {
+	return studioStore.send({ type: "openReviewDraftSheet" });
+}
+function _temp() {
+	return studioStore.send({ type: "openDeleteDraftDialog" });
+}
+/**
+* Whether the draft went without a change for `SETTLE_MS`. Once settled it stays so for that
+* draft, so the bar doesn't hide again on the next edit.
+*/
+function useSettled(draftId, lastChangedAt) {
+	const $ = c(5);
+	const [settledDraft, setSettledDraft] = React.useState(null);
+	let t0;
+	let t1;
+	if ($[0] !== draftId || $[1] !== lastChangedAt || $[2] !== settledDraft) {
+		t0 = () => {
+			if (!draftId || settledDraft === draftId) return;
+			const wait = Math.max(0, (lastChangedAt ?? 0) + SETTLE_MS - Date.now());
+			const timer = setTimeout(() => setSettledDraft(draftId), wait);
+			return () => clearTimeout(timer);
+		};
+		t1 = [
+			draftId,
+			lastChangedAt,
+			settledDraft
+		];
+		$[0] = draftId;
+		$[1] = lastChangedAt;
+		$[2] = settledDraft;
+		$[3] = t0;
+		$[4] = t1;
+	} else {
+		t0 = $[3];
+		t1 = $[4];
+	}
+	React.useEffect(t0, t1);
+	return !!draftId && settledDraft === draftId;
+}
+
+//#endregion
+export { DraftBar, SETTLE_MS };

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

@@ -14,7 +14,6 @@ import { useSelector } from "@xstate/store-react";
 import { Button } from "@camox/ui/button";
 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";
 
 //#region src/features/studio/components/DraftsControl.tsx
@@ -374,7 +373,6 @@ function _temp5() {
 function _temp4() {
 	studioStore.send({ type: "closeReviewDraftSheet" });
 	studioStore.send({ type: "closeDeleteDraftDialog" });
-	studioStore.send({ type: "closeKeepDraft" });
 }
 function _temp3(t0) {
 	const { move } = t0;
@@ -387,47 +385,6 @@ function _temp(state) {
 	return state.context.reviewDraftSheet;
 }
 /**
-* The current draft's pending changes, which open its review to publish or delete them. Live
-* has none, so it shows nothing there. An unnamed draft shows the Unnamed Draft Bar instead.
-*/
-function PendingChanges() {
-	const $ = c(7);
-	const { current } = useDrafts();
-	if (!current || current.name === null) return null;
-	let t0;
-	if ($[0] !== current.changeCount) {
-		t0 = plural(current.changeCount, "change");
-		$[0] = current.changeCount;
-		$[1] = t0;
-	} else t0 = $[1];
-	const t1 = `Review ${t0}`;
-	let t2;
-	if ($[2] !== current.changeCount) {
-		t2 = /* @__PURE__ */ jsx(Badge, {
-			className: "bg-primary-foreground/20 text-primary-foreground min-w-5 px-1.5 tabular-nums",
-			children: current.changeCount
-		});
-		$[2] = current.changeCount;
-		$[3] = t2;
-	} else t2 = $[3];
-	let t3;
-	if ($[4] !== t1 || $[5] !== t2) {
-		t3 = /* @__PURE__ */ jsxs(Button, {
-			type: "button",
-			"aria-label": t1,
-			onClick: _temp9,
-			children: ["Review changes", t2]
-		});
-		$[4] = t1;
-		$[5] = t2;
-		$[6] = t3;
-	} else t3 = $[6];
-	return t3;
-}
-function _temp9() {
-	return studioStore.send({ type: "openReviewDraftSheet" });
-}
-/**
 * 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.
 */
@@ -453,7 +410,7 @@ function useDraftsActions(t0) {
 					],
 					groupLabel: "Drafts",
 					checkIfAvailable: () => inDraft,
-					execute: _temp10
+					execute: _temp9
 				},
 				{
 					id: "delete-draft",
@@ -469,22 +426,15 @@ function useDraftsActions(t0) {
 					],
 					groupLabel: "Drafts",
 					checkIfAvailable: () => inDraft,
-					execute: _temp11
+					execute: _temp10
 				},
 				{
 					id: "rename-draft",
-					label: unnamed ? "Keep as draft…" : "Rename draft…",
-					aliases: unnamed ? [
-						"Name draft",
-						"Rename draft",
-						"Save draft"
-					] : ["Name draft"],
+					label: unnamed ? "Name draft…" : "Rename draft…",
+					aliases: unnamed ? ["Rename draft", "Save draft"] : ["Name draft"],
 					groupLabel: "Drafts",
 					checkIfAvailable: () => inDraft,
-					execute: () => studioStore.send(unnamed ? { type: "openKeepDraft" } : {
-						type: "openReviewDraftSheet",
-						startRenaming: true
-					})
+					execute: _temp11
 				},
 				{
 					id: "switch-to-live",
@@ -561,9 +511,15 @@ function _temp13() {
 }
 function _temp12() {}
 function _temp11() {
-	return studioStore.send({ type: "openDeleteDraftDialog" });
+	return studioStore.send({
+		type: "openReviewDraftSheet",
+		startRenaming: true
+	});
 }
 function _temp10() {
+	return studioStore.send({ type: "openDeleteDraftDialog" });
+}
+function _temp9() {
 	return studioStore.send({ type: "openReviewDraftSheet" });
 }
 /** Who published Live last and when: a member, a release, or nobody yet. */
@@ -648,4 +604,4 @@ function DraftItem(t0) {
 }
 
 //#endregion
-export { DraftPicker, PendingChanges, useDrafts };
+export { DraftPicker, useDrafts };

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

@@ -7,7 +7,8 @@ import { useLocalePath, useLocalizedPath } from "../../../lib/view-locale.js";
 import { STUDIO_BASE_PATH, STUDIO_CONTENT_PATH, STUDIO_SETTINGS_PATH } from "../routes.js";
 import { studioStore } from "../studioStore.js";
 import { UserButton } from "./UserButton.js";
-import { DraftPicker, PendingChanges } from "./DraftsControl.js";
+import { ConnectAgent } from "./ConnectAgent.js";
+import { DraftPicker } from "./DraftsControl.js";
 import { LocalePicker } from "./LocalePicker.js";
 import { ProjectMenu } from "./ProjectMenu.js";
 import { c } from "react/compiler-runtime";
@@ -144,7 +145,7 @@ const Navbar = (t0) => {
 	if ($[23] === Symbol.for("react.memo_cache_sentinel")) {
 		t10 = /* @__PURE__ */ jsxs("div", {
 			className: "flex items-center gap-2",
-			children: [/* @__PURE__ */ jsx(PendingChanges, {}), /* @__PURE__ */ jsx(UserButton, {})]
+			children: [/* @__PURE__ */ jsx(ConnectAgent, {}), /* @__PURE__ */ jsx(UserButton, {})]
 		});
 		$[23] = t10;
 	} else t10 = $[23];

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

@@ -9,7 +9,6 @@ import { useApplyTheme } from "../useTheme.js";
 import { c } from "react/compiler-runtime";
 import { jsx, jsxs } from "react/jsx-runtime";
 import { useSelector } from "@xstate/store-react";
-import { Button } from "@camox/ui/button";
 import { Check, Command, EyeOff, LogOut, Monitor, Moon, Settings, Sun, User } from "lucide-react";
 import { Avatar, AvatarFallback, AvatarImage } from "@camox/ui/avatar";
 import { DropdownMenu, DropdownMenuContent, DropdownMenuGroup, DropdownMenuItem, DropdownMenuLabel, DropdownMenuSeparator, DropdownMenuShortcut, DropdownMenuSub, DropdownMenuSubContent, DropdownMenuSubTrigger, DropdownMenuTrigger } from "@camox/ui/dropdown-menu";
@@ -22,11 +21,7 @@ const UserButton = () => {
 	if (!isAuthenticated || isLoading) {
 		let t0;
 		if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
-			t0 = /* @__PURE__ */ jsx(Button, {
-				variant: "outline",
-				size: "icon",
-				children: /* @__PURE__ */ jsx(User, { className: "h-4 w-4" })
-			});
+			t0 = /* @__PURE__ */ jsx(Avatar, { children: /* @__PURE__ */ jsx(AvatarFallback, { children: /* @__PURE__ */ jsx(User, { className: "size-4" }) }) });
 			$[0] = t0;
 		} else t0 = $[0];
 		return t0;
@@ -62,11 +57,12 @@ function AuthenticatedUserButton({ theme, setTheme }) {
 	const userImage = session?.user?.image;
 	const userInitials = userName.split(" ").map((n) => n[0]).join("").toUpperCase().slice(0, 2);
 	return /* @__PURE__ */ jsxs(DropdownMenu, { children: [/* @__PURE__ */ jsx(DropdownMenuTrigger, {
-		render: /* @__PURE__ */ jsx(Button, {
-			variant: "outline",
-			size: "icon"
-		}),
-		children: /* @__PURE__ */ jsx(User, { className: "text-muted-foreground" })
+		"aria-label": "Account",
+		className: "focus-visible:ring-ring/50 rounded-full outline-none focus-visible:ring-3",
+		children: /* @__PURE__ */ jsxs(Avatar, { children: [userImage && /* @__PURE__ */ jsx(AvatarImage, {
+			src: userImage,
+			alt: userName
+		}), /* @__PURE__ */ jsx(AvatarFallback, { children: userInitials })] })
 	}), /* @__PURE__ */ jsxs(DropdownMenuContent, {
 		className: "w-72",
 		align: "end",

package/dist/features/studio/studioStore.js

@@ -10,7 +10,6 @@ const studioStore = createStore({
 			startRenaming: false
 		},
 		isDeleteDraftDialogOpen: false,
-		isKeepDraftOpen: false,
 		localeDialog: null,
 		websiteLocation: null,
 		agentAsk: null,
@@ -79,18 +78,6 @@ const studioStore = createStore({
 				isDeleteDraftDialogOpen: false
 			};
 		},
-		openKeepDraft: (context) => {
-			return {
-				...context,
-				isKeepDraftOpen: true
-			};
-		},
-		closeKeepDraft: (context) => {
-			return {
-				...context,
-				isKeepDraftOpen: false
-			};
-		},
 		openLocaleDialog: (context, event) => {
 			return {
 				...context,

package/dist/package.js

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