Don't bother showing redundant tooltip on space menu (#11276)

This commit is contained in:
Michael Telatynski 2023-07-17 19:36:58 +01:00 committed by GitHub
parent a62b1d1bec
commit 34532fbdd4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -45,7 +45,13 @@ import {
showCreateNewSubspace, showCreateNewSubspace,
showSpaceInvite, showSpaceInvite,
} from "../../../utils/space"; } from "../../../utils/space";
import { ChevronFace, ContextMenuTooltipButton, useContextMenu, MenuProps } from "../../structures/ContextMenu"; import {
ChevronFace,
ContextMenuTooltipButton,
useContextMenu,
MenuProps,
ContextMenuButton,
} from "../../structures/ContextMenu";
import { BetaPill } from "../beta/BetaCard"; import { BetaPill } from "../beta/BetaCard";
import IconizedContextMenu, { import IconizedContextMenu, {
IconizedContextMenuOption, IconizedContextMenuOption,
@ -390,21 +396,24 @@ const RoomListHeader: React.FC<IProps> = ({ onVisibilityChange }) => {
let contextMenuButton: JSX.Element = <div className="mx_RoomListHeader_contextLessTitle">{title}</div>; let contextMenuButton: JSX.Element = <div className="mx_RoomListHeader_contextLessTitle">{title}</div>;
if (canShowMainMenu) { if (canShowMainMenu) {
contextMenuButton = ( const commonProps = {
<ContextMenuTooltipButton inputRef: mainMenuHandle,
inputRef={mainMenuHandle} onClick: openMainMenu,
onClick={openMainMenu} isExpanded: mainMenuDisplayed,
isExpanded={mainMenuDisplayed} className: "mx_RoomListHeader_contextMenuButton",
className="mx_RoomListHeader_contextMenuButton" children: title,
title={ };
activeSpace
? _t("%(spaceName)s menu", { spaceName: spaceName ?? activeSpace.name }) if (!!activeSpace) {
: _t("Home options") contextMenuButton = (
} <ContextMenuButton
> {...commonProps}
{title} label={_t("%(spaceName)s menu", { spaceName: spaceName ?? activeSpace.name })}
</ContextMenuTooltipButton> />
); );
} else {
contextMenuButton = <ContextMenuTooltipButton {...commonProps} title={_t("Home options")} />;
}
} }
return ( return (