imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not render tooltip when RA is displayed on TAC (#12472)

Browse source
This commit is contained in:
Florian Duros 2024-05-01 22:39:08 +02:00 • committed by GitHub
parent 5dc3ad546c
commit ad7f626e22
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/components/views/spaces/threads-activity-centre/ThreadsActivityCentre.tsx
View file

@ -82,6 +82,7 @@ export function ThreadsActivityCentre({ displayButtonLabel }: ThreadsActivityCen
closeLabel={_t("action|ok")}
>
<ThreadsActivityCentreButton
disableTooltip={true}
displayLabel={displayButtonLabel}
notificationLevel={roomsAndNotifications.greatestNotificationLevel}
/>

11
src/components/views/spaces/threads-activity-centre/ThreadsActivityCentreButton.tsx
View file

@ -26,6 +26,10 @@ import { NotificationLevel } from "../../../../stores/notifications/Notification
import { notificationLevelToIndicator } from "../../../../utils/notifications";
interface ThreadsActivityCentreButtonProps extends ComponentProps<typeof IconButton> {
/**
* Whether to disable the tooltip.
*/
disableTooltip?: boolean;
/**
* Display the `Threads` label next to the icon.
*/
@ -40,9 +44,12 @@ interface ThreadsActivityCentreButtonProps extends ComponentProps<typeof IconBut
* A button to open the thread activity centre.
*/
export const ThreadsActivityCentreButton = forwardRef<HTMLButtonElement, ThreadsActivityCentreButtonProps>(
function ThreadsActivityCentreButton({ displayLabel, notificationLevel, ...props }, ref): React.JSX.Element {
function ThreadsActivityCentreButton(
{ displayLabel, notificationLevel, disableTooltip, ...props },
ref,
): React.JSX.Element {
// Disable tooltip when the label is displayed
const openTooltip = displayLabel ? false : undefined;
const openTooltip = disableTooltip || displayLabel ? false : undefined;
return (
<Tooltip label={_t("common|threads")} placement="right" open={openTooltip}>