Skip to content

fix: NavBar in embedded layout #35326

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
Mar 10, 2025
Merged

fix: NavBar in embedded layout #35326

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
a0cac3e
fix: not show navbar for embedded layout
yash-rajpal Feb 24, 2025
eb6c637
add cs
yash-rajpal Feb 24, 2025
7230040
Merge branch 'develop' into fix/embedded-layout-navbar
kodiakhq[bot] Mar 10, 2025
f912a76
Merge branch 'develop' into fix/embedded-layout-navbar
kodiakhq[bot] Mar 10, 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/dull-onions-visit.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 an issue with embedded layout where the navigation bar was being shown when using new enhanced navigation.
2 changes: 1 addition & 1 deletion apps/meteor/client/views/root/MainLayout/LayoutWithSidebarV2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const LayoutWithSidebarV2 = ({ children }: { children: ReactNode }): ReactElemen
return (
<>
<AccessibilityShortcut />
<NavBar />
{!embeddedLayout && <NavBar />}
<Box
bg='surface-light'
id='rocket-chat'
Expand Down
10 changes: 10 additions & 0 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 @@ -161,6 +161,16 @@ test.describe.serial('feature preview', () => {
await collapser.click();
await expect(poHomeChannel.sidebar.getItemUnreadBadge(collapser)).toBeVisible();
});

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

await poHomeChannel.sidebar.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();
});
});

test.describe('Sidepanel', () => {
Expand Down
Loading