fix: Disables GenericMenu without any sections or items (#30319)

RocketChat · Sep 19, 2023 · 696bbc4 · 696bbc4
1 parent 5f165f0
commit 696bbc4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.changeset/strange-papayas-yell.md b/.changeset/strange-papayas-yell.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+fix: Disables GenericMenu without any sections or items
diff --git a/apps/meteor/client/components/GenericMenu/GenericMenu.tsx b/apps/meteor/client/components/GenericMenu/GenericMenu.tsx
@@ -1,5 +1,4 @@
-import type { IconButton } from '@rocket.chat/fuselage';
-import { MenuItem, MenuSection, MenuV2 } from '@rocket.chat/fuselage';
+import { IconButton, MenuItem, MenuSection, MenuV2 } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactNode } from 'react';
 import React from 'react';
@@ -43,6 +42,12 @@ const GenericMenu = ({ title, icon = 'menu', onAction, ...props }: GenericMenuPr
 	const handleItems = (items: GenericMenuItemProps[]) =>
 		hasIcon ? items.map((item) => ({ ...item, gap: !item.icon && !item.status })) : items;
 
+	const isMenuEmpty = !(sections && sections.length > 0) && !(items && items.length > 0);
+
+	if (isMenuEmpty) {
+		return <IconButton icon={icon} disabled />;
+	}
+
 	return (
 		<>
 			{sections && (