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

[Release] Fix add existing space not showing any spaces #7756

Merged
merged 2 commits into from
Feb 9, 2022
Merged

[Release] Fix add existing space not showing any spaces #7756

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ed6da5
Fix add existing space not showing any spaces
t3chguy Feb 8, 2022
53f0381
Simplify expression
t3chguy Feb 8, 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
10 changes: 6 additions & 4 deletions src/components/views/dialogs/AddExistingToSpaceDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,11 @@ export const AddExistingToSpace: React.FC<IAddExistingToSpaceProps> = ({

// only count spaces when alone as they're shown on a separate modal all on their own
const numSpaces = (spacesRenderer && !dmsRenderer && !roomsRenderer) ? spaces.length : 0;
const numRooms = roomsRenderer ? rooms.length : 0;
const numDms = dmsRenderer ? dms.length : 0;

let noResults = true;
if ((roomsRenderer && rooms.length > 0) || (dmsRenderer && dms.length > 0) || (numSpaces > 0)) {
if (numSpaces > 0 || numRooms > 0 || numDms > 0) {
noResults = false;
}

Expand All @@ -287,9 +289,9 @@ export const AddExistingToSpace: React.FC<IAddExistingToSpaceProps> = ({
});
};

const roomsScrollState = getScrollState(scrollState, rooms.length);
const spacesScrollState = getScrollState(scrollState, numSpaces, rooms.length);
const dmsScrollState = getScrollState(scrollState, dms.length, numSpaces, rooms.length);
const roomsScrollState = getScrollState(scrollState, numRooms);
const spacesScrollState = getScrollState(scrollState, numSpaces, numRooms);
const dmsScrollState = getScrollState(scrollState, numDms, numSpaces, numRooms);

return <div className="mx_AddExistingToSpace">
<SearchBox
Expand Down