chore: add missing attributes

RocketChat · Oct 10, 2024 · 2e90359 · 2e90359
1 parent 6cb5934
commit 2e90359
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/apps/meteor/client/sidebar/Item/Condensed.tsx b/apps/meteor/client/sidebar/Item/Condensed.tsx
@@ -1,7 +1,7 @@
 import { IconButton, SidebarV2Item, SidebarV2ItemAvatarWrapper, SidebarV2ItemMenu, SidebarV2ItemTitle } from '@rocket.chat/fuselage';
 import { useEffectEvent, usePrefersReducedMotion } from '@rocket.chat/fuselage-hooks';
 import type { Keys as IconName } from '@rocket.chat/icons';
-import type { ReactElement } from 'react';
+import type { AllHTMLAttributes, ReactElement } from 'react';
 import React, { memo, useState } from 'react';
 
 type CondensedProps = {
@@ -17,9 +17,9 @@ type CondensedProps = {
 	selected?: boolean;
 	badges?: ReactElement;
 	clickable?: boolean;
-};
+} & Omit<AllHTMLAttributes<HTMLAnchorElement>, 'is'>;
 
-const Condensed = ({ icon, title, avatar, actions, href, unread, menu, badges, selected }: CondensedProps) => {
+const Condensed = ({ icon, title, avatar, actions, href, unread, menu, badges, selected, ...props }: CondensedProps) => {
 	const [menuVisibility, setMenuVisibility] = useState(!!window.DISABLE_ANIMATION);
 
 	const isReduceMotionEnabled = usePrefersReducedMotion();
@@ -32,7 +32,7 @@ const Condensed = ({ icon, title, avatar, actions, href, unread, menu, badges, s
 	};
 
 	return (
-		<SidebarV2Item href={href} selected={selected}>
+		<SidebarV2Item href={href} selected={selected} {...props}>
 			{avatar && <SidebarV2ItemAvatarWrapper>{avatar}</SidebarV2ItemAvatarWrapper>}
 			{icon && icon}
 			<SidebarV2ItemTitle unread={unread}>{title}</SidebarV2ItemTitle>

diff --git a/apps/meteor/client/sidebar/Item/Extended.tsx b/apps/meteor/client/sidebar/Item/Extended.tsx
@@ -11,6 +11,7 @@ import {
 } from '@rocket.chat/fuselage';
 import { useEffectEvent, usePrefersReducedMotion } from '@rocket.chat/fuselage-hooks';
 import type { Keys as IconName } from '@rocket.chat/icons';
+import type { AllHTMLAttributes } from 'react';
 import React, { memo, useState } from 'react';
 
 import { useShortTimeAgo } from '../../hooks/useTimeAgo';
@@ -30,7 +31,7 @@ type ExtendedProps = {
 	menuOptions?: any;
 	titleIcon?: React.ReactNode;
 	threadUnread?: boolean;
-};
+} & Omit<AllHTMLAttributes<HTMLAnchorElement>, 'is'>;
 
 const Extended = ({
 	icon,
@@ -47,6 +48,7 @@ const Extended = ({
 	threadUnread: _threadUnread,
 	unread,
 	selected,
+	...props
 }: ExtendedProps) => {
 	const formatDate = useShortTimeAgo();
 	const [menuVisibility, setMenuVisibility] = useState(!!window.DISABLE_ANIMATION);
@@ -61,7 +63,7 @@ const Extended = ({
 	};
 
 	return (
-		<SidebarV2Item href={href} selected={selected}>
+		<SidebarV2Item href={href} selected={selected} {...props}>
 			{avatar && <SidebarV2ItemAvatarWrapper>{avatar}</SidebarV2ItemAvatarWrapper>}
 
 			<SidebarV2ItemCol>

diff --git a/apps/meteor/client/sidebar/Item/Medium.tsx b/apps/meteor/client/sidebar/Item/Medium.tsx
@@ -1,6 +1,7 @@
 import { IconButton, SidebarV2Item, SidebarV2ItemAvatarWrapper, SidebarV2ItemMenu, SidebarV2ItemTitle } from '@rocket.chat/fuselage';
 import { useEffectEvent, usePrefersReducedMotion } from '@rocket.chat/fuselage-hooks';
 import type { Keys as IconName } from '@rocket.chat/icons';
+import type { AllHTMLAttributes } from 'react';
 import React, { memo, useState } from 'react';
 
 type MediumProps = {
@@ -15,9 +16,9 @@ type MediumProps = {
 	badges?: React.ReactNode;
 	selected?: boolean;
 	menuOptions?: any;
-};
+} & Omit<AllHTMLAttributes<HTMLAnchorElement>, 'is'>;
 
-const Medium = ({ icon, title, avatar, actions, href, badges, unread, menu, selected }: MediumProps) => {
+const Medium = ({ icon, title, avatar, actions, href, badges, unread, menu, selected, ...props }: MediumProps) => {
 	const [menuVisibility, setMenuVisibility] = useState(!!window.DISABLE_ANIMATION);
 
 	const isReduceMotionEnabled = usePrefersReducedMotion();
@@ -30,7 +31,7 @@ const Medium = ({ icon, title, avatar, actions, href, badges, unread, menu, sele
 	};
 
 	return (
-		<SidebarV2Item href={href} selected={selected}>
+		<SidebarV2Item href={href} selected={selected} {...props}>
 			<SidebarV2ItemAvatarWrapper>{avatar}</SidebarV2ItemAvatarWrapper>
 			{icon && icon}
 			<SidebarV2ItemTitle unread={unread}>{title}</SidebarV2ItemTitle>

diff --git a/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx b/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx
@@ -167,7 +167,7 @@ const SidebarItemTemplateWithData = ({
 	const badges = (
 		<>
 			{showBadge && isUnread && (
-				<SidebarV2ItemBadge variant={variant} title={badgeTitle}>
+				<SidebarV2ItemBadge variant={variant} title={badgeTitle} role='status'>
 					{unread + tunread?.length}
 				</SidebarV2ItemBadge>
 			)}

diff --git a/apps/meteor/client/sidebar/header/SearchSection.tsx b/apps/meteor/client/sidebar/header/SearchSection.tsx
@@ -106,6 +106,7 @@ const SearchSection = () => {
 					role='searchbox'
 					small
 					addon={<Icon name={isDirty ? 'cross' : 'magnifier'} size='x20' onClick={handleEscSearch} />}
+					aria-label={placeholder}
 				/>
 
 				{user && !isDirty && (