Skip to content

chore: Replace some SidebarV1 components in favor of SidebarV2 #41498

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
dionisio-bot merged 4 commits into from
Jul 21, 2026
Merged

chore: Replace some SidebarV1 components in favor of SidebarV2 #41498

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
996b90c
replace `Sidebar` component
yash-rajpal Jul 21, 2026
c4575b7
replace `SidebarGenericItem` component
yash-rajpal Jul 21, 2026
d74255e
replace sidebar footer
yash-rajpal Jul 21, 2026
c0ae698
lint
yash-rajpal Jul 21, 2026
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
6 changes: 2 additions & 4 deletions apps/meteor/client/components/Sidebar/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import { Sidebar as FuselageSidebar } from '@rocket.chat/fuselage';
import { SidebarV2 as FuselageSidebar } from '@rocket.chat/fuselage';
import type { ComponentPropsWithoutRef } from 'react';

export type SidebarProps = ComponentPropsWithoutRef<typeof FuselageSidebar>;

const Sidebar = (props: SidebarProps) => (
<FuselageSidebar {...props} role='navigation' display='flex' flexDirection='column' height='full' />
);
const Sidebar = (props: SidebarProps) => <FuselageSidebar {...props} />;

export default Sidebar;
14 changes: 3 additions & 11 deletions apps/meteor/client/components/Sidebar/SidebarGenericItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,20 @@
import { Box, SidebarItem } from '@rocket.chat/fuselage';
import { Box, SidebarV2Item } from '@rocket.chat/fuselage';
import type { ReactNode } from 'react';
import { memo } from 'react';

export type SidebarGenericItemProps = {
href?: string;
active?: boolean;
featured?: boolean;
children: ReactNode;
externalUrl?: boolean;
};
Comment thread
yash-rajpal marked this conversation as resolved.

const SidebarGenericItem = ({ href, active, externalUrl, children, ...props }: SidebarGenericItemProps) => (
<SidebarItem
selected={active}
clickable
is='a'
href={href}
{...(externalUrl && { target: '_blank', rel: 'noopener noreferrer' })}
{...props}
>
<SidebarV2Item selected={active} is='a' href={href} {...(externalUrl && { target: '_blank', rel: 'noopener noreferrer' })} {...props}>
<Box display='flex' flexDirection='row' alignItems='center' paddingBlock={8} width='100%'>
{children}
</Box>
</SidebarItem>
</SidebarV2Item>
);

export default memo(SidebarGenericItem);
6 changes: 2 additions & 4 deletions apps/meteor/client/sidebar/footer/SidebarFooterDefault.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { css } from '@rocket.chat/css-in-js';
import { Box, SidebarDivider, Palette, SidebarFooter as Footer } from '@rocket.chat/fuselage';
import { Box, SidebarV2Divider, Palette, SidebarV2Footer as Footer } from '@rocket.chat/fuselage';
import { useThemeMode } from '@rocket.chat/ui-client';
import { useSetting } from '@rocket.chat/ui-contexts';
import DOMPurify from 'dompurify';
Expand All @@ -23,11 +23,9 @@ const SidebarFooterDefault = () => {

return (
<Footer>
<SidebarDivider />
<SidebarV2Divider />
<Box
is='footer'
paddingBlock={12}
paddingInline={16}
height='x48'
width='auto'
className={sidebarFooterStyle}
Expand Down
10 changes: 5 additions & 5 deletions apps/meteor/client/sidebar/footer/SidebarFooterWatermark.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Box } from '@rocket.chat/fuselage';
import { Box, SidebarV2FooterContent as FooterContent } from '@rocket.chat/fuselage';
import { useLicense, useLicenseName } from '@rocket.chat/ui-client';
import { useTranslation } from 'react-i18next';

Expand Down Expand Up @@ -26,15 +26,15 @@ export const SidebarFooterWatermark = () => {
}

return (
<Box paddingInline={16} paddingBlockEnd={8}>
<FooterContent paddingBlockEnd={8}>
<Box is='a' href={links.rocketChat} target='_blank' rel='noopener noreferrer'>
<Box fontScale='micro' color='hint' paddingBlockEnd={4}>
<Box color='hint' paddingBlockEnd={4}>
{t('Powered_by_RocketChat')}
</Box>
<Box fontScale='micro' color='pure-white' paddingBlockEnd={4}>
<Box color='pure-white' paddingBlockEnd={4}>
{licenseName.data}
</Box>
</Box>
</Box>
</FooterContent>
);
};
Loading