Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/components/AppShell.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,11 @@ export function AppShell({
{sidebar ? (
<div className="flex flex-1">
<aside className="sidebar-panel hidden md:block">{sidebar}</aside>
<main className="shell min-w-0 flex-1 py-8 sm:py-14" id="content">
{children}
</main>
<div className="min-w-0 flex-1">
<main className="shell py-8 sm:py-14" id="content">
{children}
</main>
</div>
</div>
) : (
<main className="shell flex-1 py-8 sm:py-14" id="content">
Expand Down
5 changes: 4 additions & 1 deletion test/workspace.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,10 @@ describe('Sidebar and AppShell', () => {
const sidebar = container.querySelector('aside nav[aria-label="Areas"]')!;
expect(sidebar.querySelector('[aria-current="page"]')?.textContent).toBe('Home');
expect(sidebar.textContent).toContain('99+');
expect(container.querySelector('aside + main#content')?.textContent).toBe('Page');
const main = container.querySelector('aside + div > main#content')!;
expect(main.textContent).toBe('Page');
expect(main.classList.contains('shell')).toBe(true);
expect(main.classList.contains('flex-1')).toBe(false);
});
});

Expand Down
Loading