@drawnagency/primitives 0.1.16 → 0.1.18

package/dist/components/shell/EditorShell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EditorShell.d.ts","sourceRoot":"","sources":["../../../src/components/shell/EditorShell.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAYjD,OAAO,sBAAsB,CAAC;AAmC9B,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAcxD,UAAU,KAAK;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,YAAY,EAAE;QACZ,KAAK,EAAE,OAAO,CAAC;QACf,aAAa,EAAE,OAAO,CAAC;QACvB,YAAY,EAAE,OAAO,CAAC;QACtB,cAAc,EAAE,OAAO,CAAC;QACxB,kBAAkB,EAAE,OAAO,CAAC;QAC5B,cAAc,EAAE,OAAO,CAAC;KACzB,CAAC;IACF,WAAW,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,GAAG,QAAQ,CAAA;KAAE,GAAG,IAAI,CAAC;CACjE;AAED,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,OAAO,EACP,MAAM,EACN,SAAS,EAAE,gBAAgB,EAC3B,YAAY,EACZ,WAAW,GACZ,EAAE,KAAK,2CAukBP"}
+{"version":3,"file":"EditorShell.d.ts","sourceRoot":"","sources":["../../../src/components/shell/EditorShell.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAYjD,OAAO,sBAAsB,CAAC;AAkC9B,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAcxD,UAAU,KAAK;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,YAAY,EAAE;QACZ,KAAK,EAAE,OAAO,CAAC;QACf,aAAa,EAAE,OAAO,CAAC;QACvB,YAAY,EAAE,OAAO,CAAC;QACtB,cAAc,EAAE,OAAO,CAAC;QACxB,kBAAkB,EAAE,OAAO,CAAC;QAC5B,cAAc,EAAE,OAAO,CAAC;KACzB,CAAC;IACF,WAAW,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,GAAG,QAAQ,CAAA;KAAE,GAAG,IAAI,CAAC;CACjE;AAED,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,OAAO,EACP,MAAM,EACN,SAAS,EAAE,gBAAgB,EAC3B,YAAY,EACZ,WAAW,GACZ,EAAE,KAAK,2CAqkBP"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drawnagency/primitives",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "type": "module",
   "exports": {
     "./package.json": "./package.json",

package/src/components/shell/EditorShell.tsx

@@ -37,7 +37,6 @@ import { useEditorPersistence } from "../../hooks/useEditorPersistence";
 import { useEditorPublish } from "../../hooks/useEditorPublish";
 import { useContentLifecycle } from "../../hooks/useContentLifecycle";
 import { useBuildStatus } from "../../hooks/useBuildStatus";
-import { BuildStatusIndicator } from "./BuildStatusIndicator";
 import { useMediaPipeline } from "../../hooks/useMediaPipeline";
 import { formatTimestamp } from "../../lib/timestamp";
 import { generateNavLinks } from "../../lib/nav";
@@ -234,6 +233,7 @@ export default function EditorShell({
         loadedConfig = SiteConfigSchema.parse(cached.siteConfig);
         const savedManifest = await getMediaManifest();
         if (savedManifest) loadedManifest = savedManifest;
+        setMainIndex(loadedIndex);
       } else {
         const response = await fetch("/api/content?branch=saved");
         if (!response.ok) throw new Error(`Failed to load content: ${response.status}`);
@@ -249,9 +249,7 @@ export default function EditorShell({
         setSavedSha(data.savedBranchSha ?? null);
         setMainSha(data.sha);
         setChangedSectionIds(new Set(data.changedSectionIds ?? []));
-        if (data.mainIndex) {
-          setMainIndex(data.mainIndex);
-        }
+        setMainIndex(data.mainIndex ?? data.index);
       }
 
       if (cancelled) return;
@@ -587,7 +585,6 @@ export default function EditorShell({
             }}
             processingItems={mediaPipeline.processingItems}
             buildState={buildStatus.state}
-            buildDeployUrl={buildStatus.deployUrl}
           />
 
           <EditorContent
@@ -874,6 +871,43 @@ function GlobalModal() {
   );
 }
 
+function StatusText({
+  publishAction,
+  publishFeedback,
+  buildState,
+}: {
+  publishAction: "idle" | "saving" | "publishing";
+  publishFeedback: string | null;
+  buildState: "idle" | "building" | "ready" | "error";
+}) {
+  if (publishAction === "saving") {
+    return <span className="text-xs font-medium text-base-content/60">Saving...</span>;
+  }
+  if (publishAction === "publishing") {
+    return <span className="text-xs font-medium text-base-content/60">Publishing...</span>;
+  }
+  if (buildState === "building") {
+    return <span className="text-xs font-medium text-orange-600">Publishing...</span>;
+  }
+  if (buildState === "ready") {
+    return <span className="text-xs font-medium text-green-600">Published</span>;
+  }
+  if (buildState === "error") {
+    return <span className="text-xs font-medium text-red-600">Publish failed</span>;
+  }
+  if (publishFeedback) {
+    return (
+      <span className={cn(
+        "text-xs font-medium",
+        publishFeedback === "Saved" ? "text-green-600" : "text-red-600",
+      )}>
+        {publishFeedback}
+      </span>
+    );
+  }
+  return null;
+}
+
 function EditorToolbar({
   buttonState,
   localChangesExist,
@@ -887,7 +921,6 @@ function EditorToolbar({
   onMediaClick,
   processingItems,
   buildState,
-  buildDeployUrl,
 }: {
   buttonState: "synced" | "publish" | "saveAndPublish";
   localChangesExist: boolean;
@@ -901,31 +934,19 @@ function EditorToolbar({
   onMediaClick: () => void;
   processingItems: QueueItem[];
   buildState: "idle" | "building" | "ready" | "error";
-  buildDeployUrl: string | null;
 }) {
   const { isEditMode, viewBranch, setViewBranch, toggleEditMode } = useEditorContext();
 
   return (
     <>
       {isEditMode && (
-        <div className="fixed top-0 right-0 left-0 z-50 flex items-center justify-between border-b border-base-200 bg-base px-4 py-2">
+        <div className="fixed top-0 right-0 left-0 z-50 grid grid-cols-3 items-center border-b border-base-200 bg-base px-4 py-2">
           <div className="flex items-center gap-2">
-            {publishFeedback && (
-              <span className={cn(
-                "text-xs font-medium",
-                publishFeedback === "Saved"
-                  ? "text-green-600"
-                  : "text-red-600",
-              )}>
-                {publishFeedback}
-              </span>
-            )}
             {buttonState === "saveAndPublish" && (
               <SplitButton
                 label="Save & Publish"
                 onClick={onSaveAndPublish}
-                isLoading={publishAction !== "idle"}
-                loadingLabel={publishAction === "saving" ? "Saving..." : "Publishing..."}
+                disabled={publishAction !== "idle"}
                 options={[{ label: "Save", onClick: onSave }]}
               />
             )}
@@ -933,14 +954,13 @@ function EditorToolbar({
               <SplitButton
                 label="Publish"
                 onClick={onPublish}
-                isLoading={publishAction !== "idle"}
-                loadingLabel="Publishing..."
+                disabled={publishAction !== "idle"}
                 options={[]}
               />
             )}
             {buttonState === "synced" && (
               <SplitButton
-                label="Everything up-to-date"
+                label="Up to date"
                 onClick={() => {}}
                 disabled
                 options={[]}
@@ -955,12 +975,15 @@ function EditorToolbar({
                 Discard Changes
               </Button>
             )}
-            <BuildStatusIndicator
-              state={buildState}
-              deployUrl={buildDeployUrl}
+          </div>
+          <div className="flex items-center justify-center">
+            <StatusText
+              publishAction={publishAction}
+              publishFeedback={publishFeedback}
+              buildState={buildState}
             />
           </div>
-          <div className="flex items-center gap-2">
+          <div className="flex items-center justify-end gap-2">
             <ProcessingIndicator items={processingItems} />
             <IconButton
               icon={<ImageIcon size={16} />}