From 11fbd081f146bce1ce53c07a064300afacf8036f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 24 Mar 2021 15:30:36 +0000
Subject: [PATCH] Iterate space panel context menu

---
 .../views/spaces/SpaceTreeLevel.tsx           | 32 +++++++++++++++----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/components/views/spaces/SpaceTreeLevel.tsx b/src/components/views/spaces/SpaceTreeLevel.tsx
index 83bc2296e7..1b86bb7898 100644
--- a/src/components/views/spaces/SpaceTreeLevel.tsx
+++ b/src/components/views/spaces/SpaceTreeLevel.tsx
@@ -30,7 +30,12 @@ import IconizedContextMenu, {
 import {_t} from "../../../languageHandler";
 import {ContextMenuTooltipButton} from "../../../accessibility/context_menu/ContextMenuTooltipButton";
 import {toRightOf} from "../../structures/ContextMenu";
-import {shouldShowSpaceSettings, showCreateNewRoom, showSpaceSettings} from "../../../utils/space";
+import {
+    shouldShowSpaceSettings,
+    showAddExistingRooms,
+    showCreateNewRoom,
+    showSpaceSettings,
+} from "../../../utils/space";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {ButtonEvent} from "../elements/AccessibleButton";
 import defaultDispatcher from "../../../dispatcher/dispatcher";
@@ -127,7 +132,7 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
 
         if (this.props.space.getJoinRule() === "public") {
             const modal = Modal.createTrackedDialog("Space Invite", "User Menu", InfoDialog, {
-                title: _t("Invite members"),
+                title: _t("Invite to %(spaceName)s", { spaceName: this.props.space.name }),
                 description: <React.Fragment>
                     <span>{ _t("Share your public space") }</span>
                     <SpacePublicShare space={this.props.space} onFinished={() => modal.close()} />
@@ -170,6 +175,14 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
         this.setState({contextMenuPosition: null}); // also close the menu
     };
 
+    private onAddExistingRoomClick = (ev: ButtonEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        showAddExistingRooms(this.context, this.props.space);
+        this.setState({contextMenuPosition: null}); // also close the menu
+    };
+
     private onMembersClick = (ev: ButtonEvent) => {
         ev.preventDefault();
         ev.stopPropagation();
@@ -236,15 +249,20 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
                 </IconizedContextMenuOptionList>;
             }
 
-            let newRoomOption;
+            let newRoomSection;
             if (this.props.space.currentState.maySendStateEvent(EventType.SpaceChild, userId)) {
-                newRoomOption = (
+                newRoomSection = <IconizedContextMenuOptionList first>
                     <IconizedContextMenuOption
                         iconClassName="mx_SpacePanel_iconPlus"
-                        label={_t("New room")}
+                        label={_t("Create new room")}
                         onClick={this.onNewRoomClick}
                     />
-                );
+                    <IconizedContextMenuOption
+                        iconClassName="mx_SpacePanel_iconPlus"
+                        label={_t("Add existing room")}
+                        onClick={this.onAddExistingRoomClick}
+                    />
+                </IconizedContextMenuOptionList>;
             }
 
             contextMenu = <IconizedContextMenu
@@ -274,8 +292,8 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
                         label={_t("Explore rooms")}
                         onClick={this.onExploreRoomsClick}
                     />
-                    { newRoomOption }
                 </IconizedContextMenuOptionList>
+                { newRoomSection }
                 { leaveSection }
             </IconizedContextMenu>;
         }