{
{
private leaveRoomWarnings(roomId: string) {
const roomToLeave = MatrixClientPeg.get().getRoom(roomId);
- const isSpace = roomToLeave?.isSpaceRoom();
+ const isSpace = SettingsStore.getValue("feature_spaces") && roomToLeave?.isSpaceRoom();
// Show a warning if there are additional complications.
const warnings = [];
@@ -1134,7 +1134,7 @@ export default class MatrixChat extends React.PureComponent {
const roomToLeave = MatrixClientPeg.get().getRoom(roomId);
const warnings = this.leaveRoomWarnings(roomId);
- const isSpace = roomToLeave?.isSpaceRoom();
+ const isSpace = SettingsStore.getValue("feature_spaces") && roomToLeave?.isSpaceRoom();
Modal.createTrackedDialog(isSpace ? "Leave space" : "Leave room", '', QuestionDialog, {
title: isSpace ? _t("Leave space") : _t("Leave room"),
description: (
diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 5bcb3b2450..d8c763eabd 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -35,6 +35,7 @@ import {Action} from "../../dispatcher/actions";
import RoomSummaryCard from "../views/right_panel/RoomSummaryCard";
import WidgetCard from "../views/right_panel/WidgetCard";
import {replaceableComponent} from "../../utils/replaceableComponent";
+import SettingsStore from "../../settings/SettingsStore";
@replaceableComponent("structures.RightPanel")
export default class RightPanel extends React.Component {
@@ -85,7 +86,9 @@ export default class RightPanel extends React.Component {
return RightPanelPhases.GroupMemberList;
}
return rps.groupPanelPhase;
- } else if (this.props.room?.isSpaceRoom() && !RIGHT_PANEL_SPACE_PHASES.includes(rps.roomPanelPhase)) {
+ } else if (SettingsStore.getValue("feature_spaces") && this.props.room?.isSpaceRoom()
+ && !RIGHT_PANEL_SPACE_PHASES.includes(rps.roomPanelPhase)
+ ) {
return RightPanelPhases.SpaceMemberList;
} else if (userForPanel) {
// XXX FIXME AAAAAARGH: What is going on with this class!? It takes some of its state
diff --git a/src/components/structures/RoomSearch.tsx b/src/components/structures/RoomSearch.tsx
index 34682877e0..bda46aef07 100644
--- a/src/components/structures/RoomSearch.tsx
+++ b/src/components/structures/RoomSearch.tsx
@@ -27,8 +27,8 @@ import { Action } from "../../dispatcher/actions";
import RoomListStore from "../../stores/room-list/RoomListStore";
import { NameFilterCondition } from "../../stores/room-list/filters/NameFilterCondition";
import { getKeyBindingsManager, RoomListAction } from "../../KeyBindingsManager";
-import {replaceableComponent} from "../../utils/replaceableComponent";
-import SpaceStore, {UPDATE_SELECTED_SPACE, UPDATE_TOP_LEVEL_SPACES} from "../../stores/SpaceStore";
+import { replaceableComponent } from "../../utils/replaceableComponent";
+import SpaceStore, { UPDATE_SELECTED_SPACE, UPDATE_TOP_LEVEL_SPACES } from "../../stores/SpaceStore";
interface IProps {
isMinimized: boolean;
diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index 5108643673..58a87e6641 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -1750,7 +1750,10 @@ export default class RoomView extends React.Component {
}
const myMembership = this.state.room.getMyMembership();
- if (myMembership === "invite" && !this.state.room.isSpaceRoom()) { // SpaceRoomView handles invites itself
+ if (myMembership === "invite"
+ // SpaceRoomView handles invites itself
+ && (!SettingsStore.getValue("feature_spaces") || !this.state.room.isSpaceRoom())
+ ) {
if (this.state.joining || this.state.rejecting) {
return (
@@ -1892,7 +1895,7 @@ export default class RoomView extends React.Component {
room={this.state.room}
/>
);
- if (!this.state.canPeek && !this.state.room?.isSpaceRoom()) {
+ if (!this.state.canPeek && (!SettingsStore.getValue("feature_spaces") || !this.state.room?.isSpaceRoom())) {
return (
-
;
};
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index 35efd12c9c..365f2ab1de 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -78,8 +78,10 @@ export default class MessageContextMenu extends React.Component {
// We explicitly decline to show the redact option on ACL events as it has a potential
// to obliterate the room - https://github.com/matrix-org/synapse/issues/4042
+ // Similarly for encryption events, since redacting them "breaks everything"
const canRedact = room.currentState.maySendRedactionForEvent(this.props.mxEvent, cli.credentials.userId)
- && this.props.mxEvent.getType() !== EventType.RoomServerAcl;
+ && this.props.mxEvent.getType() !== EventType.RoomServerAcl
+ && this.props.mxEvent.getType() !== EventType.RoomEncryption;
let canPin = room.currentState.mayClientSendStateEvent('m.room.pinned_events', cli);
// HACK: Intentionally say we can't pin if the user doesn't want to use the functionality
diff --git a/src/components/views/dialogs/InviteDialog.tsx b/src/components/views/dialogs/InviteDialog.tsx
index 2ebc84ec7c..ec9c71ccbe 100644
--- a/src/components/views/dialogs/InviteDialog.tsx
+++ b/src/components/views/dialogs/InviteDialog.tsx
@@ -1312,7 +1312,7 @@ export default class InviteDialog extends React.PureComponent
{ previewBar }
diff --git a/src/components/structures/SpaceRoomDirectory.tsx b/src/components/structures/SpaceRoomDirectory.tsx
index db7fd13753..74415cc58f 100644
--- a/src/components/structures/SpaceRoomDirectory.tsx
+++ b/src/components/structures/SpaceRoomDirectory.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-import React, {useMemo, useState} from "react";
+import React, {ReactNode, useMemo, useState} from "react";
import {Room} from "matrix-js-sdk/src/models/room";
import {MatrixClient} from "matrix-js-sdk/src/client";
import {EventType, RoomType} from "matrix-js-sdk/src/@types/event";
@@ -24,7 +24,7 @@ import {sortBy} from "lodash";
import {MatrixClientPeg} from "../../MatrixClientPeg";
import dis from "../../dispatcher/dispatcher";
import {_t} from "../../languageHandler";
-import AccessibleButton from "../views/elements/AccessibleButton";
+import AccessibleButton, {ButtonEvent} from "../views/elements/AccessibleButton";
import BaseDialog from "../views/dialogs/BaseDialog";
import Spinner from "../views/elements/Spinner";
import SearchBox from "./SearchBox";
@@ -40,11 +40,13 @@ import InfoTooltip from "../views/elements/InfoTooltip";
import TextWithTooltip from "../views/elements/TextWithTooltip";
import {useStateToggle} from "../../hooks/useStateToggle";
import {getOrder} from "../../stores/SpaceStore";
+import AccessibleTooltipButton from "../views/elements/AccessibleTooltipButton";
interface IHierarchyProps {
space: Room;
initialText?: string;
refreshToken?: any;
+ additionalButtons?: ReactNode;
showRoom(room: ISpaceSummaryRoom, viaServers?: string[], autoJoin?: boolean): void;
}
@@ -107,8 +109,16 @@ const Tile: React.FC = ({
const cliRoom = cli.getRoom(room.room_id);
const myMembership = cliRoom?.getMyMembership();
- const onPreviewClick = () => onViewRoomClick(false);
- const onJoinClick = () => onViewRoomClick(true);
+ const onPreviewClick = (ev: ButtonEvent) => {
+ ev.preventDefault();
+ ev.stopPropagation();
+ onViewRoomClick(false);
+ }
+ const onJoinClick = (ev: ButtonEvent) => {
+ ev.preventDefault();
+ ev.stopPropagation();
+ onViewRoomClick(true);
+ }
let button;
if (myMembership === "join") {
@@ -355,6 +365,7 @@ export const SpaceHierarchy: React.FC = ({
initialText = "",
showRoom,
refreshToken,
+ additionalButtons,
children,
}) => {
const cli = MatrixClientPeg.get();
@@ -420,78 +431,83 @@ export const SpaceHierarchy: React.FC = ({
countsStr = _t("%(count)s rooms", { count: numRooms, numSpaces });
}
- let editSection;
+ let manageButtons;
if (space.getMyMembership() === "join" && space.currentState.maySendStateEvent(EventType.SpaceChild, userId)) {
const selectedRelations = Array.from(selected.keys()).flatMap(parentId => {
return [...selected.get(parentId).values()].map(childId => [parentId, childId]) as [string, string][];
});
- let buttons;
- if (selectedRelations.length) {
- const selectionAllSuggested = selectedRelations.every(([parentId, childId]) => {
- return parentChildMap.get(parentId)?.get(childId)?.content.suggested;
- });
+ const selectionAllSuggested = selectedRelations.every(([parentId, childId]) => {
+ return parentChildMap.get(parentId)?.get(childId)?.content.suggested;
+ });
- const disabled = removing || saving;
+ const disabled = !selectedRelations.length || removing || saving;
- buttons = <>
- {
- setRemoving(true);
- try {
- for (const [parentId, childId] of selectedRelations) {
- await cli.sendStateEvent(parentId, EventType.SpaceChild, {}, childId);
- parentChildMap.get(parentId).get(childId).content = {};
- parentChildMap.set(parentId, new Map(parentChildMap.get(parentId)));
- }
- } catch (e) {
- setError(_t("Failed to remove some rooms. Try again later"));
- }
- setRemoving(false);
- }}
- kind="danger_outline"
- disabled={disabled}
- >
- { removing ? _t("Removing...") : _t("Remove") }
-
- {
- setSaving(true);
- try {
- for (const [parentId, childId] of selectedRelations) {
- const suggested = !selectionAllSuggested;
- const existingContent = parentChildMap.get(parentId)?.get(childId)?.content;
- if (!existingContent || existingContent.suggested === suggested) continue;
-
- const content = {
- ...existingContent,
- suggested: !selectionAllSuggested,
- };
-
- await cli.sendStateEvent(parentId, EventType.SpaceChild, content, childId);
-
- parentChildMap.get(parentId).get(childId).content = content;
- parentChildMap.set(parentId, new Map(parentChildMap.get(parentId)));
- }
- } catch (e) {
- setError("Failed to update some suggestions. Try again later");
- }
- setSaving(false);
- }}
- kind="primary_outline"
- disabled={disabled}
- >
- { saving
- ? _t("Saving...")
- : (selectionAllSuggested ? _t("Mark as not suggested") : _t("Mark as suggested"))
- }
-
- ;
+ let Button: React.ComponentType> = AccessibleButton;
+ let props = {};
+ if (!selectedRelations.length) {
+ Button = AccessibleTooltipButton;
+ props = {
+ tooltip: _t("Select a room below first"),
+ yOffset: -40,
+ };
}
- editSection =
- { buttons }
- ;
+ manageButtons = <>
+
+
+ ;
}
let results;
@@ -537,7 +553,10 @@ export const SpaceHierarchy: React.FC = ({
content = <>
+
+ {
+ e.preventDefault();
+ e.stopPropagation();
+ closeMenu();
+
+ if (await showCreateNewRoom(cli, space)) {
+ onNewRoomAdded();
+ }
+ }}
+ />
+ {
+ e.preventDefault();
+ e.stopPropagation();
+ closeMenu();
+
+ const [added] = await showAddExistingRooms(cli, space);
+ if (added) {
+ onNewRoomAdded();
+ }
+ }}
+ />
+
+ ;
+ }
+
+ return <>
+
+ { _t("Add") }
+
+ { contextMenu }
+ ;
+};
+
const SpaceLanding = ({ space }) => {
const cli = useContext(MatrixClientContext);
const myMembership = useMyRoomMembership(space);
@@ -241,32 +308,20 @@ const SpaceLanding = ({ space }) => {
const [refreshToken, forceUpdate] = useStateToggle(false);
- let addRoomButtons;
+ let addRoomButton;
if (canAddRooms) {
- addRoomButtons =
- {
- const [added] = await showAddExistingRooms(cli, space);
- if (added) {
- forceUpdate();
- }
- }}>
- { _t("Add existing rooms & spaces") }
-
- {
- showCreateNewRoom(cli, space);
- }}>
- { _t("Create a new room") }
-
- ;
+ addRoomButton = {
- showSpaceSettings(cli, space);
- }}>
- { _t("Settings") }
- ;
+ settingsButton = {
+ showSpaceSettings(cli, space);
+ }}
+ title={_t("Settings")}
+ />;
}
const onMembersClick = () => {
@@ -293,17 +348,19 @@ const SpaceLanding = ({ space }) => {
{ countsStr }
- { editSection }
+
+ { additionalButtons }
+ { manageButtons }
+
{ error &&
{ error }
diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
index a7a95d711c..5db54815b7 100644
--- a/src/components/structures/SpaceRoomView.tsx
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -54,6 +54,12 @@ import FacePile from "../views/elements/FacePile";
import {AddExistingToSpace} from "../views/dialogs/AddExistingToSpaceDialog";
import {sleep} from "../../utils/promise";
import {calculateRoomVia} from "../../utils/permalinks/Permalinks";
+import {ChevronFace, ContextMenuButton, useContextMenu} from "./ContextMenu";
+import IconizedContextMenu, {
+ IconizedContextMenuOption,
+ IconizedContextMenuOptionList,
+} from "../views/context_menus/IconizedContextMenu";
+import AccessibleTooltipButton from "../views/elements/AccessibleTooltipButton";
interface IProps {
space: Room;
@@ -217,6 +223,67 @@ const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }) =>
;
};
+const SpaceLandingAddButton = ({ space, onNewRoomAdded }) => {
+ const cli = useContext(MatrixClientContext);
+ const [menuDisplayed, handle, openMenu, closeMenu] = useContextMenu();
+
+ let contextMenu;
+ if (menuDisplayed) {
+ const rect = handle.current.getBoundingClientRect();
+ contextMenu = -
- { addRoomButtons }
- { settingsButton }
-
-
- 
+ 
{this.props.file.name} ({filesize(this.props.file.size)})