Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Prevent soft crash around room list header context menu when space changes #8289

Merged
t3chguy merged 4 commits into from
Apr 12, 2022
Merged

Prevent soft crash around room list header context menu when space changes #8289

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cc15cd6
Prevent soft crash around room list header context menu when space ch…
t3chguy Apr 12, 2022
c6e8f0a
Tidy
t3chguy Apr 12, 2022
c2340ba
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Apr 12, 2022
2ff9557
Add tests
t3chguy Apr 12, 2022
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
13 changes: 11 additions & 2 deletions src/components/views/rooms/RoomListHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,15 @@ const RoomListHeader = ({ onVisibilityChange }: IProps) => {
}
});

const canShowMainMenu = activeSpace || spaceKey === MetaSpace.Home;

useEffect(() => {
if (mainMenuDisplayed && !canShowMainMenu) {
// Space changed under us and we no longer has a main menu to draw
closeMainMenu();
}
}, [closeMainMenu, canShowMainMenu, mainMenuDisplayed]);

// we pass null for the queryLength to inhibit the metrics hook for when there is no filterCondition
useWebSearchMetrics(count, filterCondition ? filterCondition.search.length : null, false);

Expand Down Expand Up @@ -168,7 +177,7 @@ const RoomListHeader = ({ onVisibilityChange }: IProps) => {
const canShowPlusMenu = canCreateRooms || canExploreRooms || activeSpace;

let contextMenu: JSX.Element;
if (mainMenuDisplayed) {
if (mainMenuDisplayed && mainMenuHandle.current) {
let ContextMenuComponent;
if (activeSpace) {
ContextMenuComponent = SpaceContextMenu;
Expand Down Expand Up @@ -364,7 +373,7 @@ const RoomListHeader = ({ onVisibilityChange }: IProps) => {
.join("\n");

let contextMenuButton: JSX.Element = <div className="mx_RoomListHeader_contextLessTitle">{ title }</div>;
if (activeSpace || spaceKey === MetaSpace.Home) {
if (canShowMainMenu) {
contextMenuButton = <ContextMenuTooltipButton
inputRef={mainMenuHandle}
onClick={openMainMenu}
Expand Down