@glw907/cairn-cms 0.52.1 → 0.54.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glw907/cairn-cms",
-  "version": "0.52.1",
+  "version": "0.54.0",
   "description": "Embedded, magic-link, GitHub-committing CMS for SvelteKit/Cloudflare sites.",
   "type": "module",
   "sideEffects": [

package/src/lib/components/AdminLayout.svelte

@@ -11,6 +11,7 @@ identical on every host regardless of the site's own theme.
   import type { LayoutData } from '../sveltekit/content-routes.js';
   import CsrfField from './CsrfField.svelte';
   import { CSRF_CONTEXT_KEY } from './csrf-context.js';
+  import { provideTopbar, type TopbarHolder } from './topbar-context.js';
   import { MenuIcon, LogOutIcon, SunIcon, MoonIcon, ChevronRightIcon, SearchIcon } from './admin-icons.js';
   import CairnLogo from './CairnLogo.svelte';
   import { cairnFaviconHref } from './cairn-favicon.js';
@@ -225,6 +226,16 @@ identical on every host regardless of the site's own theme.
 
   // The browser-tab title: the deepest breadcrumb (the active concept or entry), then the brand.
   const pageTitle = $derived(crumbs.length ? crumbs[crumbs.length - 1].label : 'Admin');
+
+  // A desk route is an open document (/admin/<concept>/<id>): the third path segment is the entry.
+  // The band has one job there, so the topbar drops the palette trigger and the site-wide Publish
+  // button and renders the document's own desk controls instead.
+  const isDeskRoute = $derived(data.pathname.split('/').filter(Boolean).length > 2);
+
+  // The topbar context portal: a reactive holder a descendant document fills with its desk snippet.
+  // EditPage registers on mount and nulls it on teardown; the office routes leave it null.
+  let topbar = $state<TopbarHolder>({ desk: null, zen: false });
+  provideTopbar(topbar);
 </script>
 
 <svelte:head>
@@ -239,14 +250,30 @@ identical on every host regardless of the site's own theme.
      itself never matches. Keeping the drawer and its base/utility classes one level in lets the
      scoped sheet style them. -->
 <div data-theme={theme} bind:this={rootEl}>
-  <div class="drawer lg:drawer-open min-h-screen bg-base-200 text-base-content">
+  <!-- The persistent desktop sidebar (lg:drawer-open) recedes inside an open document: a desk route
+       renders the drawer shell without it, so the nav starts closed at desktop width and the
+       manuscript takes the shell. This resolves at SSR from data.pathname (isDeskRoute), never in an
+       effect, so the chrome-free state does not flash. The checkbox still governs the overlay, so the
+       toggle (and Cmd/Ctrl+B) reopens the nav over the document on demand. -->
+  <div class="drawer min-h-screen bg-base-200 text-base-content" class:lg:drawer-open={!isDeskRoute}>
     <input id="cairn-drawer" type="checkbox" class="drawer-toggle" bind:checked={drawerOpen} />
 
     <div class="drawer-content flex flex-col">
+      <!-- Zen (rung 4) drops the whole topbar element, not just its contents: a desk document
+           registers zen through the topbar holder and the band slides away entirely. The desk's
+           three clusters include AdminLayout-owned chrome (the drawer toggle, the breadcrumb), so
+           emptying the band would leave that chrome behind; the band must be GONE. The manuscript
+           and EditPage's own floating zen chip carry on below. -->
+      {#if !topbar.zen}
       <!-- The topbar is a flat, opaque continuation of the sidebar's brand band: same surface and the
-           same hairline, no shadow, so the two form one clean header strip across the sidebar seam. -->
-      <div class="navbar bg-base-100 border-b border-[var(--cairn-card-border)] sticky top-0 z-30 gap-2 px-4 lg:px-8">
-        <div class="flex-none lg:hidden">
+           same hairline, no shadow, so the two form one clean header strip across the sidebar seam.
+           The height is pinned to the brand band's h-16 (a content-driven navbar drifts with font
+           metrics, and the two border-bottoms stop meeting at the seam). -->
+      <div class="navbar bg-base-100 border-b border-[var(--cairn-card-border)] sticky top-0 z-30 h-16 min-h-16 gap-2 px-4 py-0 lg:px-8">
+        <!-- The drawer toggle is hidden at desktop width on the office routes (the persistent sidebar
+             stands in for it); on a desk route the sidebar is closed, so the toggle stays visible and
+             reopens the nav as an overlay. -->
+        <div class="flex-none" class:lg:hidden={!isDeskRoute}>
           <label for="cairn-drawer" aria-label="Open menu" class="btn btn-square btn-ghost">
             <MenuIcon class="h-5 w-5" />
           </label>
@@ -266,25 +293,32 @@ identical on every host regardless of the site's own theme.
             <span class="font-semibold tracking-tight">{data.siteName}</span>
           {/if}
         </div>
-        <!-- The command-palette trigger fills the center: a quick jump-to over the admin, opened here
-             or with Cmd/Ctrl+K. -->
-        <div class="flex min-w-0 flex-1 justify-center">
-          <button
-            type="button"
-            onclick={openPalette}
-            class="flex w-full max-w-md items-center gap-2 rounded-field border border-[var(--cairn-card-border)] bg-base-200/70 px-3 py-1.5 text-sm text-[var(--color-muted)] transition-colors hover:bg-base-200 hover:text-base-content"
-          >
-            <SearchIcon class="h-4 w-4 shrink-0" aria-hidden="true" />
-            <span class="truncate">Search or jump to&hellip;</span>
-            <kbd class="ml-auto hidden rounded border border-[var(--cairn-card-border)] px-1.5 text-[0.6875rem] font-medium sm:inline">&#8984;K</kbd>
-          </button>
-        </div>
-        {#if pendingCount > 0}
-          <div class="flex-none">
-            <button type="button" class="btn btn-primary btn-sm" aria-haspopup="dialog" onclick={() => publishAllDialog?.showModal()}>
-              Publish site ({pendingCount})
+        {#if isDeskRoute}
+          <!-- An open document takes the band: the registered desk snippet (the status and action
+               clusters) fills the row to the right of the breadcrumb. The palette trigger and the
+               site-wide Publish button stand down so the band has one job here. -->
+          {@render topbar.desk?.()}
+        {:else}
+          <!-- The command-palette trigger fills the center: a quick jump-to over the admin, opened
+               here or with Cmd/Ctrl+K. -->
+          <div class="flex min-w-0 flex-1 justify-center">
+            <button
+              type="button"
+              onclick={openPalette}
+              class="flex w-full max-w-md items-center gap-2 rounded-field border border-[var(--cairn-card-border)] bg-base-200/70 px-3 py-1.5 text-sm text-[var(--color-muted)] transition-colors hover:bg-base-200 hover:text-base-content"
+            >
+              <SearchIcon class="h-4 w-4 shrink-0" aria-hidden="true" />
+              <span class="truncate">Search or jump to&hellip;</span>
+              <kbd class="ml-auto hidden rounded border border-[var(--cairn-card-border)] px-1.5 text-[0.6875rem] font-medium sm:inline">&#8984;K</kbd>
             </button>
           </div>
+          {#if pendingCount > 0}
+            <div class="flex-none">
+              <button type="button" class="btn btn-primary btn-sm" aria-haspopup="dialog" onclick={() => publishAllDialog?.showModal()}>
+                Publish site ({pendingCount})
+              </button>
+            </div>
+          {/if}
         {/if}
         <div class="flex-none">
           <button type="button" class="btn btn-square btn-ghost" aria-label="Toggle theme" onclick={toggleTheme}>
@@ -292,8 +326,9 @@ identical on every host regardless of the site's own theme.
           </button>
         </div>
       </div>
+      {/if}
 
-      <main class="flex-1 p-4 lg:p-8">
+      <main class="flex-1 p-4 lg:px-10 lg:py-8">
         {@render children()}
       </main>
 
@@ -380,7 +415,7 @@ identical on every host regardless of the site's own theme.
 
     <div class="drawer-side">
       <label for="cairn-drawer" aria-label="Close menu" class="drawer-overlay"></label>
-      <nav class="bg-base-100 flex min-h-full w-64 flex-col border-r border-[var(--cairn-card-border)]" aria-label="Site content">
+      <nav class="bg-base-100 flex min-h-full w-56 flex-col border-r border-[var(--cairn-card-border)]" aria-label="Site content">
         <!-- Brand band, the same height as the topbar. The mark sits in a filled "app-icon" tile, which
              anchors the corner as a deliberate brand object rather than a washed box. The logo and
              wordmark link to the admin home. -->