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
5 changes: 5 additions & 0 deletions .changeset/itchy-teachers-jam.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixes an issue where menus inside sidebar keeps opened even if the sidebar is collapsed
5 changes: 4 additions & 1 deletion apps/meteor/client/sidebar/header/UserMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
useHandleMenuAction,
type GenericMenuItemProps,
} from '@rocket.chat/ui-client';
import { useLayout } from '@rocket.chat/ui-contexts';
import { useState, memo } from 'react';
import { useTranslation } from 'react-i18next';

Expand All @@ -17,7 +18,7 @@ import { useUserMenu } from './hooks/useUserMenu';
const UserMenu = ({ user }: { user: IUser }) => {
const { t } = useTranslation();
const [isOpen, setIsOpen] = useState(false);

const { sidebar } = useLayout();
const sections = useUserMenu(user);
const items = sections.reduce((acc, { items }) => [...acc, ...items], [] as GenericMenuItemProps[]);

Expand All @@ -36,6 +37,7 @@ const UserMenu = ({ user }: { user: IUser }) => {
onAction={handleAction}
isOpen={isOpen}
onOpenChange={setIsOpen}
disabled={sidebar.isCollapsed}
/>
</FeaturePreviewOff>
<FeaturePreviewOn>
Expand All @@ -50,6 +52,7 @@ const UserMenu = ({ user }: { user: IUser }) => {
onAction={handleAction}
isOpen={isOpen}
onOpenChange={setIsOpen}
disabled={sidebar.isCollapsed}
/>
</FeaturePreviewOn>
</FeaturePreview>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Sidebar } from '@rocket.chat/fuselage';
import { GenericMenu } from '@rocket.chat/ui-client';
import { useLayout } from '@rocket.chat/ui-contexts';
import type { HTMLAttributes } from 'react';
import { useTranslation } from 'react-i18next';

Expand All @@ -9,10 +10,12 @@ type AdministrationProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;

const Administration = (props: AdministrationProps) => {
const { t } = useTranslation();

const { sidebar } = useLayout();
const sections = useAdministrationMenu();

return <GenericMenu sections={sections} title={t('Administration')} is={Sidebar.TopBar.Action} {...props} />;
return (
<GenericMenu sections={sections} title={t('Administration')} is={Sidebar.TopBar.Action} disabled={sidebar.isCollapsed} {...props} />
);
};

export default Administration;
14 changes: 12 additions & 2 deletions apps/meteor/client/sidebar/header/actions/CreateRoom.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Sidebar } from '@rocket.chat/fuselage';
import { GenericMenu } from '@rocket.chat/ui-client';
import { useLayout } from '@rocket.chat/ui-contexts';
import type { HTMLAttributes } from 'react';
import { useTranslation } from 'react-i18next';

Expand All @@ -9,10 +10,19 @@ type CreateRoomProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;

const CreateRoom = (props: CreateRoomProps) => {
const { t } = useTranslation();

const { sidebar } = useLayout();
const sections = useCreateRoom();

return <GenericMenu icon='edit-rounded' sections={sections} title={t('Create_new')} is={Sidebar.TopBar.Action} {...props} />;
return (
<GenericMenu
icon='edit-rounded'
sections={sections}
title={t('Create_new')}
is={Sidebar.TopBar.Action}
disabled={sidebar.isCollapsed}
{...props}
/>
);
};

export default CreateRoom;
13 changes: 11 additions & 2 deletions apps/meteor/client/sidebar/header/actions/Sort.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Sidebar } from '@rocket.chat/fuselage';
import { GenericMenu } from '@rocket.chat/ui-client';
import { useLayout } from '@rocket.chat/ui-contexts';
import type { HTMLAttributes } from 'react';
import { useTranslation } from 'react-i18next';

Expand All @@ -9,11 +10,19 @@ type SortProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;

const Sort = (props: SortProps) => {
const { t } = useTranslation();

const { sidebar } = useLayout();
const sections = useSortMenu();

return (
<GenericMenu icon='sort' sections={sections} title={t('Display')} selectionMode='multiple' is={Sidebar.TopBar.Action} {...props} />
<GenericMenu
icon='sort'
sections={sections}
title={t('Display')}
selectionMode='multiple'
is={Sidebar.TopBar.Action}
disabled={sidebar.isCollapsed}
{...props}
/>
);
};

Expand Down
Loading