@djangocfg/layouts 2.1.607 → 2.1.608

package/src/layouts/PrivateLayout/brand.test.tsx

@@ -0,0 +1,208 @@
+// @vitest-environment jsdom
+import React, { act } from 'react';
+import { createRoot, type Root } from 'react-dom/client';
+import { afterEach, beforeAll, describe, expect, it, vi } from 'vitest';
+
+import { AuthContext } from '@djangocfg/api/auth';
+import { LinkProvider, type LinkComponentProps } from '@djangocfg/ui-core/components';
+
+import { ProjectNameProvider } from '../../shared/ProjectContext';
+import { PrivateLayout } from './PrivateLayout';
+
+vi.mock('next/navigation', () => ({ usePathname: () => '/', useRouter: () => ({ push: () => {}, replace: () => {} }), useSearchParams: () => new URLSearchParams() }));
+vi.mock('../SettingsLayout/SettingsDialog', () => ({ SettingsDialog: () => null }));
+vi.mock('@djangocfg/api/auth', async () => ({
+  AuthContext: (await import('react')).createContext(undefined),
+  useAuth: () => ({ user: null }),
+}));
+vi.mock('./hooks/useAuthGuard', () => ({ useAuthGuard: () => ({ isLoading: false, isForbidden: false, loadingText: '' }) }));
+
+(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true;
+
+let phone = true;
+let host: HTMLElement | null = null;
+let root: Root | null = null;
+const navigated: string[] = [];
+
+/** A router-style Link: records the navigation instead of loading a page. */
+function RouterLink({ href, children, onClick, ...rest }: LinkComponentProps) {
+  return (
+    <a
+      href={href}
+      {...(rest as object)}
+      onClick={(e) => {
+        onClick?.(e);
+        e.preventDefault();
+        navigated.push(href);
+      }}
+    >
+      {children}
+    </a>
+  );
+}
+
+beforeAll(() => {
+  window.matchMedia = ((query: string) => ({
+    matches: query.includes('hover: hover') ? !phone : phone,
+    media: query, onchange: null,
+    addEventListener: () => {}, removeEventListener: () => {}, addListener: () => {}, removeListener: () => {}, dispatchEvent: () => false,
+  })) as typeof window.matchMedia;
+});
+
+afterEach(() => {
+  act(() => root?.unmount());
+  host?.remove();
+  host = root = null;
+  phone = true;
+  navigated.length = 0;
+  document.cookie = 'sidebar_state=; path=/; max-age=0';
+});
+
+async function mount(props: Partial<React.ComponentProps<typeof PrivateLayout>>, project?: string, landing?: string) {
+  host = document.createElement('div');
+  document.body.appendChild(host);
+  root = createRoot(host);
+  await act(async () =>
+    root!.render(
+      <AuthContext.Provider value={(landing ? { routes: { auth: '/auth', defaultCallback: landing, defaultAuthCallback: '/auth' } } : undefined) as never}>
+      <LinkProvider value={RouterLink}>
+        <ProjectNameProvider value={project}>
+          <PrivateLayout requireAuth={false} sidebar={{ groups: [{ label: 'A', items: [{ label: 'Docs', href: '/docs' }] }] }} {...props}>
+            <p>page</p>
+          </PrivateLayout>
+        </ProjectNameProvider>
+      </LinkProvider>
+      </AuthContext.Provider>,
+    ),
+  );
+}
+
+const bar = () => document.querySelector('[data-sidebar="topbar"]');
+const barLink = () => bar()?.querySelector('a') ?? null;
+
+async function openDrawer() {
+  await act(async () => {
+    (document.querySelector('[data-sidebar="trigger"]') as HTMLElement).click();
+  });
+}
+const drawerBrand = () =>
+  document.querySelector('[data-sidebar="header"] a') as HTMLAnchorElement | null;
+
+describe('brand link and title resolution', () => {
+  it('bar title links to "/" by default', async () => {
+    await mount({ header: { title: 'Acme' } });
+    expect(barLink()?.getAttribute('href')).toBe('/');
+    expect(barLink()?.textContent).toBe('Acme');
+    expect(barLink()?.getAttribute('aria-label')).toBe('Acme');
+  });
+
+  it('header.href sets the target; click goes through the router link', async () => {
+    await mount({ header: { title: 'Acme', href: '/app' } });
+    expect(barLink()?.getAttribute('href')).toBe('/app');
+    await act(async () => barLink()!.click());
+    expect(navigated).toEqual(['/app']);
+  });
+
+  it('topBar.title stays as given, not linkified', async () => {
+    await mount({ header: { title: 'Acme' }, topBar: { title: 'Calls' } });
+    expect(bar()?.textContent).toContain('Calls');
+    expect(barLink()).toBeNull();
+  });
+
+  it('drawer brand links home and closes the drawer on click', async () => {
+    await mount({ header: { title: 'Acme', href: '/app' } });
+    await openDrawer();
+    const link = drawerBrand()!;
+    expect(link.getAttribute('href')).toBe('/app');
+    expect(link.textContent).toContain('Acme');
+    expect(document.querySelector('[data-sidebar="sidebar"][data-mobile="true"], [role="dialog"]')).not.toBeNull();
+    await act(async () => link.click());
+    expect(navigated).toEqual(['/app']);
+    expect(document.querySelector('[role="dialog"][data-state="open"]')).toBeNull();
+  });
+
+  it('a custom brand node is rendered as given, not wrapped in a link', async () => {
+    await mount({ header: { title: 'Acme', brand: <b data-testid="mine">Mine</b> } }, undefined);
+    phone = false;
+    await act(async () => root?.unmount());
+    host?.remove();
+    document.cookie = 'sidebar_state=true; path=/';
+    await mount({ header: { title: 'Acme', brand: <b data-testid="mine">Mine</b> } });
+    const mine = document.querySelector('[data-testid="mine"]')!;
+    expect(mine.closest('a')).toBeNull();
+  });
+
+  it('no header.title: the project name from the provider is shown and linked', async () => {
+    await mount({}, 'Proj');
+    expect(barLink()?.textContent).toBe('Proj');
+    expect(barLink()?.getAttribute('href')).toBe('/');
+  });
+
+  it('explicit header.title wins over the project name', async () => {
+    await mount({ header: { title: 'Acme' } }, 'Proj');
+    expect(barLink()?.textContent).toBe('Acme');
+  });
+
+  it('no provider and no title: no text, no crash, no empty bar link', async () => {
+    await mount({});
+    expect(bar()).not.toBeNull();
+    expect(barLink()).toBeNull();
+    await openDrawer();
+    const link = drawerBrand();
+    expect(link?.getAttribute('aria-label')).toBe('Home');
+    expect(link?.textContent?.trim().length).toBeLessThanOrEqual(1);
+  });
+
+  describe('home href resolution: header.href > sidebar.homeHref > auth defaultCallback > "/"', () => {
+    it('auth provider defaultCallback is the target when nothing else is set', async () => {
+      await mount({ header: { title: 'Acme' } }, undefined, '/workspace');
+      expect(barLink()?.getAttribute('href')).toBe('/workspace');
+      await openDrawer();
+      expect(drawerBrand()?.getAttribute('href')).toBe('/workspace');
+    });
+
+    it('sidebar.homeHref beats defaultCallback; header.href beats both', async () => {
+      await mount({ header: { title: 'Acme' }, sidebar: { homeHref: '/home', groups: [] } }, undefined, '/workspace');
+      expect(barLink()?.getAttribute('href')).toBe('/home');
+      await act(async () => root?.unmount());
+      host?.remove();
+      await mount({ header: { title: 'Acme', href: '/x' }, sidebar: { homeHref: '/home', groups: [] } }, undefined, '/workspace');
+      expect(barLink()?.getAttribute('href')).toBe('/x');
+    });
+
+    it('outside the auth provider: "/", no crash', async () => {
+      await mount({ header: { title: 'Acme' } });
+      expect(barLink()?.getAttribute('href')).toBe('/');
+    });
+  });
+
+  describe('sidebar header toggle', () => {
+    it('phone drawer header is the brand only: no toggle button, the link stays, accessible name present', async () => {
+      await mount({ header: { title: 'Acme' } });
+      await openDrawer();
+      const header = document.querySelector('[data-sidebar="header"]')!;
+      expect(header.querySelector('button')).toBeNull();
+      expect(header.querySelector('[data-sidebar="trigger"]')).toBeNull();
+      expect(header.querySelector('a')?.textContent).toContain('Acme');
+      // The primitive keeps an sr-only title for screen readers.
+      expect(document.querySelector('[role="dialog"] .sr-only')?.textContent).toContain('Sidebar');
+    });
+
+    it('phone drawer closes on Escape', async () => {
+      await mount({ header: { title: 'Acme' } });
+      await openDrawer();
+      expect(document.querySelector('[role="dialog"][data-state="open"]')).not.toBeNull();
+      await act(async () => {
+        document.dispatchEvent(new KeyboardEvent('keydown', { key: 'Escape', bubbles: true }));
+      });
+      expect(document.querySelector('[role="dialog"][data-state="open"]')).toBeNull();
+    });
+
+    it('desktop docked sidebar header keeps its toggle', async () => {
+      phone = false;
+      document.cookie = 'sidebar_state=true; path=/';
+      await mount({ header: { title: 'Acme' } });
+      expect(document.querySelector('[data-sidebar="header"] [data-sidebar="trigger"]')).not.toBeNull();
+    });
+  });
+});

package/src/layouts/PrivateLayout/components/PrivateContent.test.tsx

@@ -1,20 +1,24 @@
 // @vitest-environment jsdom
 import React, { act } from 'react';
 import { createRoot, type Root } from 'react-dom/client';
-import { afterEach, beforeAll, describe, expect, it } from 'vitest';
+import { afterEach, beforeAll, describe, expect, it, vi } from 'vitest';
 
 import { SidebarProvider } from '@djangocfg/ui-core/components';
 
 import { PrivateContent } from './PrivateContent';
 
+vi.mock('@djangocfg/api/auth', () => ({ useAuth: () => ({ user: { email: 'a@b.c', display_username: 'Mark', avatar: null } }) }));
+vi.mock('next/navigation', () => ({ usePathname: () => '/', useRouter: () => ({ push: () => {}, replace: () => {} }), useSearchParams: () => new URLSearchParams() }));
+
 (globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true;
 
+let phone = false;
 let host: HTMLElement | null = null;
 let root: Root | null = null;
 
 beforeAll(() => {
   window.matchMedia ??= ((query: string) => ({
-    matches: false,
+    matches: phone,
     media: query,
     onchange: null,
     addEventListener: () => {},
@@ -29,17 +33,19 @@ afterEach(() => {
   act(() => root?.unmount());
   host?.remove();
   host = root = null;
+  phone = false;
 });
 
-function render(defaultOpen: boolean, padding: 'none' | 'default') {
+function render(defaultOpen: boolean, padding: 'none' | 'default', title?: React.ReactNode, actions?: React.ReactNode, showAccount = false) {
   host = document.createElement('div');
   document.body.appendChild(host);
   root = createRoot(host);
   act(() =>
     root!.render(
       <SidebarProvider defaultOpen={defaultOpen}>
-        <PrivateContent padding={padding} scroll={padding === 'none' ? 'hidden' : 'auto'}>
+        <PrivateContent title={title} actions={actions} showAccount={showAccount} padding={padding} scroll={padding === 'none' ? 'hidden' : 'auto'}>
           <p>page</p>
+          <input aria-label="field" />
         </PrivateContent>
       </SidebarProvider>,
     ),
@@ -48,18 +54,177 @@ function render(defaultOpen: boolean, padding: 'none' | 'default') {
 }
 
 describe('PrivateContent top bar', () => {
-  it.each(['none', 'default'] as const)('reserves an in-flow, safe-area aware bar for the trigger (padding %s)', (padding) => {
+  it.each(['none', 'default'] as const)('desktop, sidebar collapsed: the same overlay bar, content offset by its real height (padding %s)', (padding) => {
     const el = render(false, padding);
     const bar = el.querySelector('[data-sidebar="topbar"]')!;
+    const col = bar.parentElement as HTMLElement;
     expect(bar).not.toBeNull();
-    expect(bar.className).toContain('env(safe-area-inset-top');
-    expect(bar.className).not.toMatch(/\babsolute\b/);
+    expect(col.style.getPropertyValue('--layout-bar-height')).toContain('3rem');
+    expect(bar.className).toContain('h-[var(--layout-bar-height)]');
+    expect(bar.className).toContain('pt-[var(--safe-top');
+    expect(bar.className).toMatch(/\babsolute\b/);
     expect(bar.querySelector('[data-sidebar="trigger"]')).not.toBeNull();
-    // The page is a sibling after the bar, never underneath it.
-    expect(bar.nextElementSibling?.textContent).toBe('page');
+    expect((bar.nextElementSibling as HTMLElement).className).toContain('layout-bar-height');
+  });
+
+  it('draws no bar while the sidebar is docked, and the bar height is 0', () => {
+    const el = render(true, 'default');
+    expect(el.querySelector('[data-sidebar="topbar"]')).toBeNull();
+    expect(el.querySelector<HTMLElement>('[style*="--layout-bar-height"]')!.style.getPropertyValue('--layout-bar-height')).toBe('0px');
+  });
+
+  it.each(['none', 'default'] as const)('phone + padding %s: one fixed-height in-flow bar, the same for every page', (padding) => {
+    phone = true;
+    const el = render(false, padding, 'Acme');
+    const bar = el.querySelector('[data-sidebar="topbar"]')!;
+    const col = bar.parentElement as HTMLElement;
+    expect(col.style.getPropertyValue('--layout-bar-height')).toBe('calc(var(--safe-top, env(safe-area-inset-top, 0px)) + 3rem)');
+    expect(bar.className).toContain('h-[var(--layout-bar-height)]');
+    expect(bar.className).toMatch(/\bborder-b\b/);
+    expect(bar.className).toContain('bg-background');
+    expect(bar.className).toContain('pt-[var(--safe-top');
+    expect(bar.className).toContain('pl-[calc(var(--safe-left');
+    expect(bar.className).toContain('pr-[calc(var(--safe-right');
+    // Overlays the column (transform-hidden), so hiding never reflows; the content pads by the bar height.
+    expect(bar.className).toMatch(/\babsolute\b/);
+    expect(bar.className).toContain('transition-transform');
+    expect((bar.nextElementSibling as HTMLElement).className).toContain('layout-bar-height');
+    expect(bar.querySelector('[data-sidebar="trigger"]')!.className).not.toMatch(/\b(rounded-full|border|shadow)/);
+    expect(bar.textContent).toBe('Acme');
+    expect(bar.getAttribute('data-hidden')).toBe('false');
+    // Content is the next sibling: it starts under the bar and carries no trigger offsets.
+    const scroller = bar.nextElementSibling as HTMLElement;
+    expect(scroller.className).not.toContain('layout-trigger');
+  });
+
+  it('phone without a title shows the toggle only; desktop sets the bar height to 0', () => {
+    phone = true;
+    expect(render(false, 'default').querySelector('[data-sidebar="topbar"]')!.textContent).toBe('');
+  });
+
+  it('top bar is shrink-0 and the content below it is flex-1 min-h-0 (document cannot grow)', () => {
+    const el = render(false, 'default');
+    const bar = el.querySelector('[data-sidebar="topbar"]')!;
+    const col = bar.parentElement!;
+    const scroller = bar.nextElementSibling as HTMLElement;
+    expect(bar.className).toMatch(/\bshrink-0\b/);
+    expect(col.className).toMatch(/\bmin-h-0\b/);
+    expect(scroller.className).toMatch(/\bmin-h-0\b/);
+    expect(scroller.className).toMatch(/\bflex-1\b/);
+    expect(scroller.className).toMatch(/\boverflow-y-auto\b/);
   });
 
-  it('draws no bar while the sidebar is docked', () => {
-    expect(render(true, 'default').querySelector('[data-sidebar="topbar"]')).toBeNull();
+  describe('phone auto-hide', () => {
+    function mountPhone(isPhone = true) {
+      phone = isPhone;
+      // Deferred like a real frame: useScroll's store expects the id to be assigned before the callback runs.
+      let id = 0;
+      vi.stubGlobal('requestAnimationFrame', (cb: FrameRequestCallback) => {
+        void Promise.resolve().then(() => cb(0));
+        return ++id;
+      });
+      const el = render(false, 'default', 'Acme');
+      const bar = el.querySelector('[data-sidebar="topbar"]') as HTMLElement;
+      const scroller = bar.nextElementSibling as HTMLElement;
+      Object.defineProperty(scroller, 'scrollHeight', { configurable: true, value: 3000 });
+      Object.defineProperty(scroller, 'clientHeight', { configurable: true, value: 800 });
+      const scrollTo = (top: number) =>
+        act(async () => {
+          scroller.scrollTop = top;
+          scroller.dispatchEvent(new Event('scroll'));
+          await Promise.resolve();
+          await Promise.resolve();
+        });
+      return { el, bar, scroller, scrollTo };
+    }
+    afterEach(() => vi.unstubAllGlobals());
+
+    it('hides on scroll down, shows on scroll up and at the top', async () => {
+      const { bar, scrollTo } = mountPhone();
+      expect(bar.getAttribute('data-hidden')).toBe('false');
+      await scrollTo(120);
+      await scrollTo(200);
+      expect(bar.getAttribute('data-hidden')).toBe('true');
+      await scrollTo(180);
+      await scrollTo(150);
+      expect(bar.getAttribute('data-hidden')).toBe('false');
+      await scrollTo(300);
+      await scrollTo(400);
+      expect(bar.getAttribute('data-hidden')).toBe('true');
+      await scrollTo(0);
+      expect(bar.getAttribute('data-hidden')).toBe('false');
+    });
+
+    it('desktop (sidebar collapsed): the bar is static and never hides', async () => {
+      const { bar, scrollTo } = mountPhone(false);
+      await scrollTo(120);
+      await scrollTo(400);
+      expect(bar.getAttribute('data-hidden')).toBe('false');
+    });
+
+    it('stays visible while the drawer is open', async () => {
+      const { bar, scrollTo } = mountPhone();
+      act(() => (bar.querySelector('[data-sidebar="trigger"]') as HTMLElement).click());
+      await scrollTo(120);
+      await scrollTo(400);
+      expect(bar.getAttribute('data-hidden')).toBe('false');
+    });
+
+    it('stays visible while a field has focus', async () => {
+      const { el, bar, scrollTo } = mountPhone();
+      act(() => (el.querySelector('input') as HTMLInputElement).focus());
+      await scrollTo(120);
+      await scrollTo(400);
+      expect(bar.getAttribute('data-hidden')).toBe('false');
+    });
+
+    it('never hides when the content is not scrollable', async () => {
+      const { bar, scroller, scrollTo } = mountPhone();
+      Object.defineProperty(scroller, 'scrollHeight', { configurable: true, value: 800 });
+      await scrollTo(120);
+      await scrollTo(400);
+      expect(bar.getAttribute('data-hidden')).toBe('false');
+    });
+  });
+
+  describe('topBar content', () => {
+    it('renders title and right-hand actions; the toggle stays first and does not shrink', () => {
+      phone = true;
+      const bar = render(false, 'default', 'Calls', <button>New</button>).querySelector('[data-sidebar="topbar"]')!;
+      const children = [...bar.children];
+      expect(children[0].getAttribute('data-sidebar')).toBe('trigger');
+      expect(children[0].className).toMatch(/\bshrink-0\b/);
+      const title = children[1] as HTMLElement;
+      expect(title.textContent).toBe('Calls');
+      expect(title.className).toContain('truncate');
+      expect(title.className).toContain('flex-1');
+      const actions = children[2] as HTMLElement;
+      expect(actions.className).toMatch(/\bshrink-0\b/);
+      expect(actions.className).toContain('items-center');
+      expect(actions.textContent).toBe('New');
+    });
+
+    it('desktop, sidebar collapsed: same markup, title and actions', () => {
+      const bar = render(false, 'default', 'Calls', <button>New</button>).querySelector('[data-sidebar="topbar"]')!;
+      expect(bar.children[0].getAttribute('data-sidebar')).toBe('trigger');
+      expect(bar.children[1].textContent).toBe('Calls');
+      expect(bar.children[2].textContent).toBe('New');
+    });
+
+    it('account avatar: after the actions, in the actions container, only with showAccount', () => {
+      phone = true;
+      const bar = render(false, 'default', 'Calls', <button>New</button>, true).querySelector('[data-sidebar="topbar"]')!;
+      const actions = bar.querySelector('[data-sidebar="topbar-actions"]')!;
+      expect(actions.children[0].textContent).toBe('New');
+      expect(actions.children[1].getAttribute('data-sidebar')).toBe('topbar-account');
+      expect(actions.children[1].getAttribute('aria-label')).toBe('User menu');
+    });
+
+    it('no avatar without showAccount', () => {
+      phone = true;
+      const bar = render(false, 'default', 'Calls').querySelector('[data-sidebar="topbar"]')!;
+      expect(bar.querySelector('[data-sidebar="topbar-account"]')).toBeNull();
+      expect(bar.querySelector('[data-sidebar="topbar-actions"]')).toBeNull();
+    });
   });
 });

package/src/layouts/PrivateLayout/components/PrivateContent.tsx

@@ -1,20 +1,25 @@
 /**
- * Private layout main column: the scroll surface, plus a top bar holding the sidebar trigger
- * whenever the sidebar is not docked (collapsed on desktop, always on mobile). The bar is in
- * flow and safe-area aware, so no page content (padded or full-bleed) sits under the trigger.
- * On desktop (fine pointer) the trigger sits in a hover zone that peeks the sidebar open after a short intent delay.
+ * Private layout main column: the scroll surface, plus ONE top bar whenever the sidebar is not visible: always on a
+ * phone (below md), on desktop while the sidebar is collapsed. Same markup and props at every width: sidebar toggle,
+ * title, actions, account avatar. Height `--layout-bar-height` = safe-top + 3rem; it overlays the column and the
+ * content has that height as top padding, so pages need to know nothing about it. Below md it slides away on
+ * scroll-down (same `useNavbarScroll` policy as PublicLayout, driven by the content scroller); on desktop it is static.
+ * `--layout-bar-height` is `0px` only when no bar is shown (docked sidebar, or no sidebar at all).
  */
 
 'use client';
 
 import React, { ReactNode } from 'react';
 
-import { useSidebar } from '@djangocfg/ui-core/components';
+import { Link, useSidebar } from '@djangocfg/ui-core/components';
 import { cn } from '@djangocfg/ui-core/lib';
 
 import type { LayoutVisualConfig } from '../../types';
-import { useSidebarPeek } from '../hooks';
+import type { HeaderConfig } from '../types';
+import { LAYOUT_BAR_HEIGHT } from '../geometry';
+import { useNavbarScroll } from '../../PublicLayout/hooks/useNavbarScroll';
 import { PrivateSidebarTrigger } from './PrivateSidebarTrigger';
+import { PrivateTopBarAccount } from './PrivateTopBarAccount';
 
 interface PrivateContentProps {
   children: ReactNode;
@@ -28,6 +33,18 @@ interface PrivateContentProps {
   scroll?: 'auto' | 'hidden';
   /** When false, no mobile hamburger (e.g. layout without a sidebar). Default true. */
   hasSidebar?: boolean;
+  /** A change scrolls the content surface back to the top (the document no longer scrolls, so the router cannot). */
+  pathname?: string;
+  /** Bar title next to the toggle (`topBar.title`, else `header.title`). */
+  title?: ReactNode;
+  /** When set, the title is a router link to this href (the default `header.title` fallback only). */
+  titleHref?: string;
+  /** Bar right-hand actions (`topBar.actions`), left of the account avatar. */
+  actions?: ReactNode;
+  /** Show the account avatar at the right end of the bar (signed-in user and `topBar.account !== false`). */
+  showAccount?: boolean;
+  /** Account menu config (links, plan) for the avatar. */
+  header?: HeaderConfig;
   /** Visual config from PrivateLayout — controls maxWidth in boxed mode. */
   visual?: LayoutVisualConfig;
 }
@@ -45,26 +62,52 @@ export function PrivateContent({
   scroll = 'auto',
   hasSidebar = true,
   visual,
+  pathname,
+  title,
+  titleHref,
+  actions,
+  showAccount = false,
+  header,
 }: PrivateContentProps) {
-  const { isMobile, state } = useSidebar();
-  const peek = useSidebarPeek();
+  const scrollRef = React.useRef<HTMLDivElement>(null);
+  const lastPath = React.useRef(pathname);
+  React.useEffect(() => {
+    if (lastPath.current === pathname) return;
+    lastPath.current = pathname;
+    scrollRef.current?.scrollTo?.({ top: 0 });
+  }, [pathname]);
 
-  const showTrigger = hasSidebar && (isMobile || state === 'collapsed');
+  const { isMobile, state, openMobile } = useSidebar();
 
-  // The trigger lives in its own in-flow bar (below), so content never sits under it, with or without
-  // content padding. Without a bar the scroll surface starts at the top edge, so keep the bar's room only.
-  const topPadding = showTrigger
-    ? 'pt-2 sm:pt-4 lg:pt-4'
+  const showBar = hasSidebar && (isMobile || state === 'collapsed');
+  const mobileBar = showBar && isMobile;
+
+  // Auto-hide: the content scroller (the document never scrolls) drives the shared navbar policy. The bar stays put
+  // while the drawer is open or a field has focus (iOS keyboard), and when there is nothing to scroll.
+  const { hidden: scrolledAway } = useNavbarScroll({ hideNavOnScroll: mobileBar, target: scrollRef, respectReducedMotion: false });
+  const [fieldFocused, setFieldFocused] = React.useState(false);
+  const onFocusChange = (e: React.FocusEvent) => {
+    const el = e.target as HTMLElement;
+    setFieldFocused(
+      e.type === 'focus' && (/^(INPUT|TEXTAREA|SELECT)$/.test(el.tagName) || el.isContentEditable),
+    );
+  };
+  const barHidden = mobileBar && scrolledAway && !openMobile && !fieldFocused;
+
+  const topPadding = showBar
+    ? 'pt-[calc(var(--layout-bar-height)+1rem)]'
     : hasSidebar
       ? 'pt-6 lg:pt-8'
       : 'pt-4 sm:pt-6 lg:pt-8';
 
   const scrollAreaClass = cn(
     'min-h-0 flex-1 bg-background',
+    // The bar overlays the column, so every page starts below it.
+    showBar && padding === 'none' && 'pt-[var(--layout-bar-height)]',
     scroll === 'auto' ? 'overflow-y-auto' : 'flex flex-col overflow-hidden',
     padding === 'default' && scroll === 'auto' && [
       'px-4 sm:px-6 lg:px-8',
-      'pb-[calc(1rem+env(safe-area-inset-bottom,0px))] sm:pb-[calc(1.5rem+env(safe-area-inset-bottom,0px))] lg:pb-[calc(2rem+env(safe-area-inset-bottom,0px))]',
+      'pb-[calc(1rem+var(--safe-bottom,env(safe-area-inset-bottom,0px)))] sm:pb-[calc(1.5rem+var(--safe-bottom,env(safe-area-inset-bottom,0px)))] lg:pb-[calc(2rem+var(--safe-bottom,env(safe-area-inset-bottom,0px)))]',
       topPadding,
     ],
   );
@@ -72,22 +115,39 @@ export function PrivateContent({
   const innerWidthClass = MAX_WIDTH_CLASS[visual?.maxWidth ?? 'none'];
 
   return (
-    <div className="relative flex min-h-0 min-w-0 flex-1 flex-col">
-      {showTrigger ? (
+    <div
+      className="relative flex min-h-0 min-w-0 flex-1 flex-col"
+      style={{ '--layout-bar-height': showBar ? LAYOUT_BAR_HEIGHT : '0px' } as React.CSSProperties}
+    >
+      {showBar ? (
         <div
           data-sidebar="topbar"
-          className="relative z-20 flex h-12 shrink-0 box-content items-center bg-background pl-2 pt-[env(safe-area-inset-top,0px)]"
+          data-hidden={barHidden ? 'true' : 'false'}
+          className="absolute inset-x-0 top-0 z-20 box-border flex h-[var(--layout-bar-height)] shrink-0 items-center gap-1 transition-transform duration-200 ease-out motion-reduce:transition-none data-[hidden=true]:-translate-y-full border-b border-border bg-background pl-[calc(var(--safe-left,env(safe-area-inset-left,0px))+0.75rem)] pr-[calc(var(--safe-right,env(safe-area-inset-right,0px))+0.75rem)] pt-[var(--safe-top,env(safe-area-inset-top,0px))]"
         >
-          <div
-            data-sidebar="trigger-zone"
-            {...(isMobile || !peek?.hoverEnabled ? undefined : peek.zoneProps)}
-            className="flex size-12 items-center justify-center"
-          >
-            <PrivateSidebarTrigger className="text-muted-foreground hover:text-foreground" />
-          </div>
+          <PrivateSidebarTrigger className="text-muted-foreground hover:text-foreground" />
+          <span className="min-w-0 flex-1 truncate text-base font-semibold tracking-tight">
+            {titleHref ? (
+              <Link
+                href={titleHref}
+                aria-label={typeof title === 'string' && title ? title : 'Home'}
+                className="rounded-md text-foreground no-underline outline-none ring-ring transition-opacity hover:no-underline hover:opacity-80 focus-visible:ring-2"
+              >
+                {title}
+              </Link>
+            ) : (
+              title
+            )}
+          </span>
+          {actions || showAccount ? (
+            <div data-sidebar="topbar-actions" className="flex shrink-0 items-center gap-2">
+              {actions}
+              {showAccount ? <PrivateTopBarAccount header={header} /> : null}
+            </div>
+          ) : null}
         </div>
       ) : null}
-      <div className={scrollAreaClass}>
+      <div ref={scrollRef} className={scrollAreaClass} onFocusCapture={onFocusChange} onBlurCapture={onFocusChange}>
         {innerWidthClass ? <div className={innerWidthClass}>{children}</div> : children}
       </div>
     </div>

package/src/layouts/PrivateLayout/components/PrivateSidebar.tsx

@@ -20,9 +20,11 @@ interface PrivateSidebarProps {
   header?: HeaderConfig;
   pathname?: string;
   variant?: 'sidebar' | 'inset';
+  /** The top bar shows the account avatar (phone drawer then has no footer account). */
+  accountInBar?: boolean;
 }
 
-export function PrivateSidebar({ sidebar, header, pathname = '', variant = 'sidebar' }: PrivateSidebarProps) {
+export function PrivateSidebar({ sidebar, header, pathname = '', variant = 'sidebar', accountInBar = false }: PrivateSidebarProps) {
   const { state, isMobile, setOpenMobile } = useSidebar();
   const { setSidebarRef, handleSidebarKeyDown } = useSidebarKeyboard();
 
@@ -31,7 +33,7 @@ export function PrivateSidebar({ sidebar, header, pathname = '', variant = 'side
   }, [pathname, isMobile, setOpenMobile]);
 
   return (
-    <PrivateLayoutProvider sidebar={sidebar} header={header} pathname={pathname} isMobile={isMobile}>
+    <PrivateLayoutProvider sidebar={sidebar} header={header} pathname={pathname} isMobile={isMobile} accountInBar={accountInBar}>
       <Sidebar
         ref={setSidebarRef}
         collapsible="offcanvas"