Skip to content

fix: [Enhanced navigation] Missing burger menu in embedded layout #36398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 4 commits into from
Jul 11, 2025
+39 −14
Merged

fix: [Enhanced navigation] Missing burger menu in embedded layout #36398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
676536b
fix: display sidebar toggler in page header
dougfabris Jul 10, 2025
b635616
test: add e2e test
dougfabris Jul 11, 2025
2e2058e
chore: changeset
dougfabris Jul 11, 2025
89c7daa
Merge branch 'develop' into fix/burger-menu-embedded
kodiakhq[bot] Jul 11, 2025
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
5 changes: 5 additions & 0 deletions .changeset/hot-crabs-invite.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixes missing burger menu in embedded layout page header when using enhanced navigation feature preview
23 changes: 15 additions & 8 deletions apps/meteor/client/components/Page/PageHeaderNoShadow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ type PageHeaderProps = {
const PageHeaderNoShadow = ({ children = undefined, title, onClickBack, ...props }: PageHeaderProps) => {
const { t } = useTranslation();

const { isMobile } = useLayout();
const { isMobile, isTablet, isEmbedded } = useLayout();

useDocumentTitle(typeof title === 'string' ? title : undefined);

Expand All @@ -32,16 +32,23 @@ const PageHeaderNoShadow = ({ children = undefined, title, onClickBack, ...props
alignItems='center'
color='default'
>
{isMobile && (
<FeaturePreview feature='newNavigation'>
<FeaturePreviewOff>
<FeaturePreview feature='newNavigation'>
<FeaturePreviewOff>
{isMobile ? (
<HeaderToolbar>
<SidebarToggler />
</HeaderToolbar>
</FeaturePreviewOff>
<FeaturePreviewOn>{null}</FeaturePreviewOn>
</FeaturePreview>
)}
) : null}
</FeaturePreviewOff>
<FeaturePreviewOn>
{isTablet && isEmbedded ? (
<HeaderToolbar>
<SidebarToggler />
</HeaderToolbar>
) : null}
</FeaturePreviewOn>
</FeaturePreview>

{onClickBack && <IconButton small mie={8} icon='arrow-back' onClick={onClickBack} title={t('Back')} />}
<Box is='h1' fontScale='h2' flexGrow={1} data-qa-type='PageHeader-title'>
{title}
Expand Down
21 changes: 15 additions & 6 deletions apps/meteor/tests/e2e/feature-preview.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,14 +215,23 @@ test.describe.serial('feature preview', () => {
await expect(poHomeChannel.sidebar.getItemUnreadBadge(collapser)).toBeVisible();
});

test('should not show NavBar in embedded layout', async ({ page }) => {
test('embedded layout', async ({ page }) => {
await page.goto('/home');

await poHomeChannel.navbar.openChat(targetChannel);
await expect(page.locator('role=navigation[name="header"]')).toBeVisible();
const embeddedLayoutURL = `${page.url()}?layout=embedded`;
await page.goto(embeddedLayoutURL);
await expect(page.locator('role=navigation[name="header"]')).not.toBeVisible();
await test.step('should not show NavBar', async () => {
await poHomeChannel.navbar.openChat(targetChannel);
await expect(page.locator('role=navigation[name="header"]')).toBeVisible();
const embeddedLayoutURL = `${page.url()}?layout=embedded`;
await page.goto(embeddedLayoutURL);
await expect(page.locator('role=navigation[name="header"]')).not.toBeVisible();
});

await test.step('should show burger menu', async () => {
await page.goto('admin/info?layout=embedded');
await page.setViewportSize({ width: 767, height: 510 });

await expect(poHomeChannel.content.burgerButton).toBeVisible();
});
});

test('should display the room header properly', async ({ page }) => {
Expand Down
4 changes: 4 additions & 0 deletions apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ export class HomeContent {
return this.page.locator('main header');
}

get burgerButton(): Locator {
return this.channelHeader.getByRole('button', { name: 'Open sidebar' });
}

get channelRetentionPolicyWarning(): Locator {
return this.page.locator('main').getByRole('alert', { name: 'Retention policy warning banner' });
}
Expand Down
Loading