Skip to content

feat: Add unread badges in sidebar filters items #36199

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
dougfabris merged 1 commit into from
Jun 11, 2025
Merged

feat: Add unread badges in sidebar filters items #36199

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions apps/meteor/client/sidebarv2/RoomList/RoomListFiltersItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { Icon, SidebarV2Item, SidebarV2ItemTitle } from '@rocket.chat/fuselage';
import { Icon, SidebarV2Item, SidebarV2ItemBadge, SidebarV2ItemTitle } from '@rocket.chat/fuselage';
import type { Keys as IconName } from '@rocket.chat/icons';
import { memo } from 'react';
import { useTranslation } from 'react-i18next';

// import { useUnreadDisplay } from './hooks/useUnreadDisplay';
import type { SidePanelFiltersKeys } from '../../views/navigation/contexts/RoomsNavigationContext';
// import { useUnreadGroupData } from '../views/navigation/contexts/RoomsNavigationContext';
import { useUnreadGroupData } from '../../views/navigation/contexts/RoomsNavigationContext';
import { useUnreadDisplay } from '../hooks/useUnreadDisplay';

type SidebarFiltersItemProps = {
title: SidePanelFiltersKeys;
Expand All @@ -16,14 +16,14 @@ type SidebarFiltersItemProps = {

const RoomListFiltersItem = ({ title, selected, icon, onClick }: SidebarFiltersItemProps) => {
const { t } = useTranslation();
// const unreadGroupCount = useUnreadGroupData(title);
// const { unreadTitle, unreadVariant, showUnread, unreadCount } = useUnreadDisplay(unreadGroupCount);
const unreadGroupCount = useUnreadGroupData(title);
const { unreadTitle, unreadVariant, showUnread, unreadCount, highlightUnread: highlighted } = useUnreadDisplay(unreadGroupCount);

return (
<SidebarV2Item tabIndex={0} role='tab' selected={selected} onClick={onClick}>
<Icon size='x20' name={icon} />
<SidebarV2ItemTitle>{t(title)}</SidebarV2ItemTitle>
{/* {showUnread && (
<SidebarV2ItemTitle unread={highlighted}>{t(title)}</SidebarV2ItemTitle>
{showUnread && (
<SidebarV2ItemBadge
variant={unreadVariant}
title={unreadTitle}
Expand All @@ -32,7 +32,7 @@ const RoomListFiltersItem = ({ title, selected, icon, onClick }: SidebarFiltersI
>
<span aria-hidden>{unreadCount.total}</span>
</SidebarV2ItemBadge>
)} */}
)}
</SidebarV2Item>
);
};
Expand Down
Loading