@@ -391,50 +419,40 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => {
const SpaceSetupPublicShare = ({ space, onFinished }) => {
return
-
{ _t("Share your public space") }
-
{ _t("At the moment only you can see it.") }
+
{ _t("Share %(name)s", { name: space.name }) }
+
+ { _t("It's just you at the moment, it will be even better with others.") }
+
-
+
;
};
-const SpaceSetupPrivateScope = ({ onFinished }) => {
- const [option, setOption] = useState
(null);
-
+const SpaceSetupPrivateScope = ({ space, onFinished }) => {
return
{ _t("Who are you working with?") }
-
{ _t("Ensure the right people have access to the space.") }
-
-
- { _t("Just Me") }
- { _t("A private space just for you") }
- ,
- }, {
- value: "meAndMyTeammates",
- className: "mx_SpaceRoomView_privateScope_meAndMyTeammatesButton",
- label:
- { _t("Me and my teammates") }
- { _t("A private space for you and your teammates") }
- ,
- },
- ]}
- />
-
-
-
onFinished(option !== "justMe")} />
+
+ { _t("Make sure the right people have access to %(name)s", { name: space.name }) }
+
+ { onFinished(false) }}
+ >
+ { _t("Just me") }
+ { _t("A private space to organise your rooms") }
+
+ { onFinished(true) }}
+ >
+ { _t("Me and my teammates") }
+ { _t("A private space for you and your teammates") }
+
{ _t("Invite your teammates") }
-
{ _t("Ensure the right people have access to the space.") }
+
+ { _t("Make sure the right people have access. You can invite more later.") }
+
{ error &&
{ error }
}
{ fields }
@@ -518,8 +546,7 @@ const SpaceSetupPrivateInvite = ({ space, onFinished }) => {
-
{_t("Skip for now")}
-
+
;
};
@@ -547,17 +574,26 @@ export default class SpaceRoomView extends React.PureComponent {
this.state = {
phase,
showRightPanel: RightPanelStore.getSharedInstance().isOpenForRoom,
+ myMembership: this.props.space.getMyMembership(),
};
this.dispatcherRef = defaultDispatcher.register(this.onAction);
this.rightPanelStoreToken = RightPanelStore.getSharedInstance().addListener(this.onRightPanelStoreUpdate);
+ this.context.on("Room.myMembership", this.onMyMembership);
}
componentWillUnmount() {
defaultDispatcher.unregister(this.dispatcherRef);
this.rightPanelStoreToken.remove();
+ this.context.off("Room.myMembership", this.onMyMembership);
}
+ private onMyMembership = (room: Room, myMembership: string) => {
+ if (room.roomId === this.props.space.roomId) {
+ this.setState({ myMembership });
+ }
+ };
+
private onRightPanelStoreUpdate = () => {
this.setState({
showRightPanel: RightPanelStore.getSharedInstance().isOpenForRoom,
@@ -594,10 +630,43 @@ export default class SpaceRoomView extends React.PureComponent {
}
};
+ private goToFirstRoom = async () => {
+ const childRooms = SpaceStore.instance.getChildRooms(this.props.space.roomId);
+ if (childRooms.length) {
+ const room = childRooms[0];
+ defaultDispatcher.dispatch({
+ action: "view_room",
+ room_id: room.roomId,
+ });
+ return;
+ }
+
+ let suggestedRooms = SpaceStore.instance.suggestedRooms;
+ if (SpaceStore.instance.activeSpace !== this.props.space) {
+ // the space store has the suggested rooms loaded for a different space, fetch the right ones
+ suggestedRooms = (await SpaceStore.instance.fetchSuggestedRooms(this.props.space, 1)).rooms;
+ }
+
+ if (suggestedRooms.length) {
+ const room = suggestedRooms[0];
+ defaultDispatcher.dispatch({
+ action: "view_room",
+ room_id: room.room_id,
+ oobData: {
+ avatarUrl: room.avatar_url,
+ name: room.name || room.canonical_alias || room.aliases.pop() || _t("Empty room"),
+ },
+ });
+ return;
+ }
+
+ this.setState({ phase: Phase.Landing });
+ };
+
private renderBody() {
switch (this.state.phase) {
case Phase.Landing:
- if (this.props.space.getMyMembership() === "join") {
+ if (this.state.myMembership === "join") {
return ;
} else {
return {
return this.setState({ phase: Phase.PublicShare })}
/>;
case Phase.PublicShare:
- return this.setState({ phase: Phase.Landing })}
- />;
+ return ;
case Phase.PrivateScope:
return {
this.setState({ phase: invite ? Phase.PrivateInvite : Phase.PrivateCreateRooms });
}}
@@ -634,7 +702,8 @@ export default class SpaceRoomView extends React.PureComponent {
return this.setState({ phase: Phase.Landing })}
/>;
}
diff --git a/src/components/views/dialogs/AddExistingToSpaceDialog.tsx b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx
index 66efaefd9d..500637244a 100644
--- a/src/components/views/dialogs/AddExistingToSpaceDialog.tsx
+++ b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx
@@ -69,6 +69,7 @@ const AddExistingToSpaceDialog: React.FC = ({ matrixClient: cli, space,
const existingRoomsSet = new Set(existingRooms);
const rooms = cli.getVisibleRooms().filter(room => {
return !existingRoomsSet.has(room) // not already in space
+ && !room.isSpaceRoom() // not a space itself
&& room.name.toLowerCase().includes(lcQuery) // contains query
&& !DMRoomMap.shared().getUserIdForRoomId(room.roomId); // not a DM
});
diff --git a/src/components/views/spaces/SpaceCreateMenu.tsx b/src/components/views/spaces/SpaceCreateMenu.tsx
index 88098d1b66..879cf929e0 100644
--- a/src/components/views/spaces/SpaceCreateMenu.tsx
+++ b/src/components/views/spaces/SpaceCreateMenu.tsx
@@ -108,7 +108,7 @@ const SpaceCreateMenu = ({ onFinished }) => {
body =
{ _t("Create a space") }
{ _t("Spaces are new ways to group rooms and people. " +
- "To join an existing space you’ll need an invite") }
+ "To join an existing space you'll need an invite.") }
{
{
- _t("Give it a photo, name and description to help you identify it.")
+ _t("Add some details to help people recognise it.")
} {
- _t("You can change these at any point.")
+ _t("You can change these anytime.")
}
diff --git a/src/components/views/spaces/SpacePanel.tsx b/src/components/views/spaces/SpacePanel.tsx
index 48e2c86b2c..bacf1bd929 100644
--- a/src/components/views/spaces/SpacePanel.tsx
+++ b/src/components/views/spaces/SpacePanel.tsx
@@ -220,13 +220,19 @@ const SpacePanel = () => {
{
+ openMenu();
+ if (!isPanelCollapsed) setPanelCollapsed(true);
+ }}
isNarrow={isPanelCollapsed}
/>
setPanelCollapsed(!isPanelCollapsed)}
+ onClick={() => {
+ setPanelCollapsed(!isPanelCollapsed);
+ if (menuDisplayed) closeMenu();
+ }}
title={expandCollapseButtonTitle}
/>
{ contextMenu }
diff --git a/src/components/views/spaces/SpacePublicShare.tsx b/src/components/views/spaces/SpacePublicShare.tsx
index 3930c1db16..b2d3b7ce29 100644
--- a/src/components/views/spaces/SpacePublicShare.tsx
+++ b/src/components/views/spaces/SpacePublicShare.tsx
@@ -41,13 +41,13 @@ const SpacePublicShare = ({ space, onFinished }: IProps) => {
const success = await copyPlaintext(permalinkCreator.forRoom());
const text = success ? _t("Copied!") : _t("Failed to copy");
setCopiedText(text);
- await sleep(10);
+ await sleep(5000);
if (copiedText === text) { // if the text hasn't changed by another click then clear it after some time
setCopiedText(_t("Click to copy"));
}
}}
>
- { _t("Share invite link") }
+ { _t("Share invite link") }
{ copiedText }
{
onFinished();
}}
>
- { _t("Invite by email or username") }
+ { _t("Invite people") }
+ { _t("Invite with email or username") }