diff --git a/packages/app/src/shell/shell.tsx b/packages/app/src/shell/shell.tsx index e421c3a96f9..67d9564be45 100644 --- a/packages/app/src/shell/shell.tsx +++ b/packages/app/src/shell/shell.tsx @@ -125,7 +125,8 @@ export default function Layout(props: ParentProps) { paintSidebarContents() paintCollapsedSlots(closed) }, - measure: () => measureSidebarToggles(state.tabsWidth * sidebarHidden()), + // The contents slide by their own width, which a peek widens past the docked sidebar's. + measure: () => measureSidebarToggles((state.tabsMount?.offsetWidth ?? state.tabsWidth) * sidebarHidden()), // A dock from a peek already shows the sidebar, so reduced motion has nothing to fade in. element: () => (peek.handedOff() ? undefined : state.tabsPanel), distance: () => state.tabsWidth, @@ -248,7 +249,11 @@ export default function Layout(props: ParentProps) { data-slot="vertical-tabs-sidebar" data-state={preferences.appearance.sidebarOpen() ? "open" : "closed"} data-peek={peek.shown() ? "" : undefined} - style={{ "--sidebar-peek-width": `${state.tabsWidth}px` }} + style={{ + "--sidebar-peek-width": peek.shown() + ? `calc(${state.tabsWidth}px + var(--shell-inline-inset, 8px))` + : `${state.tabsWidth}px`, + }} ref={(element) => setState("tabsAside", element)} class="relative z-10 h-full min-h-0 shrink-0" > @@ -270,14 +275,14 @@ export default function Layout(props: ParentProps) { data-slot="vertical-tabs-peek-surface" aria-hidden="true" class="pointer-events-none absolute inset-y-0 end-0 bg-v2-background-bg-deep shadow-[var(--v2-elevation-floating)]" - style={{ width: `${state.tabsWidth}px` }} + style={{ width: "var(--sidebar-peek-width)" }} />