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

Say Joining space instead of Joining room where we know its a space #6818

Merged
t3chguy merged 5 commits into from
Sep 17, 2021
Merged

Say Joining space instead of Joining room where we know its a space #6818

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4bb9eeb
Convert RoomPreviewBar to Typescript
t3chguy Sep 16, 2021
28bc801
Say Joining space instead of Joining room where we know its a space
t3chguy Sep 16, 2021
1e04dfa
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Sep 16, 2021
6876800
use more generic room type instead of boolean flag
t3chguy Sep 17, 2021
af42a31
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Sep 17, 2021
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
37 changes: 25 additions & 12 deletions src/components/structures/SpaceHierarchy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,13 @@ interface IProps {
space: Room;
initialText?: string;
additionalButtons?: ReactNode;
showRoom(cli: MatrixClient, hierarchy: RoomHierarchy, roomId: string, autoJoin?: boolean): void;
showRoom(
cli: MatrixClient,
hierarchy: RoomHierarchy,
roomId: string,
autoJoin?: boolean,
isSpaceRoom?: boolean,
Comment thread
t3chguy marked this conversation as resolved.
Outdated
): void;
}

interface ITileProps {
Expand All @@ -72,7 +78,7 @@ interface ITileProps {
selected?: boolean;
numChildRooms?: number;
hasPermissions?: boolean;
onViewRoomClick(autoJoin: boolean): void;
onViewRoomClick(autoJoin: boolean, isSpaceRoom: boolean): void;
onToggleClick?(): void;
}

Expand All @@ -98,12 +104,12 @@ const Tile: React.FC<ITileProps> = ({
const onPreviewClick = (ev: ButtonEvent) => {
ev.preventDefault();
ev.stopPropagation();
onViewRoomClick(false);
onViewRoomClick(false, room.room_type === RoomType.Space);
};
const onJoinClick = (ev: ButtonEvent) => {
ev.preventDefault();
ev.stopPropagation();
onViewRoomClick(true);
onViewRoomClick(true, room.room_type === RoomType.Space);
};

let button;
Expand Down Expand Up @@ -280,7 +286,13 @@ const Tile: React.FC<ITileProps> = ({
</li>;
};

export const showRoom = (cli: MatrixClient, hierarchy: RoomHierarchy, roomId: string, autoJoin = false) => {
export const showRoom = (
cli: MatrixClient,
hierarchy: RoomHierarchy,
roomId: string,
autoJoin = false,
isSpaceRoom = false,
) => {
const room = hierarchy.roomMap.get(roomId);

// Don't let the user view a room they won't be able to either peek or join:
Expand All @@ -305,6 +317,7 @@ export const showRoom = (cli: MatrixClient, hierarchy: RoomHierarchy, roomId: st
avatarUrl: room.avatar_url,
// XXX: This logic is duplicated from the JS SDK which would normally decide what the name is.
name: room.name || roomAlias || _t("Unnamed room"),
isSpaceRoom,
},
});
};
Expand All @@ -315,7 +328,7 @@ interface IHierarchyLevelProps {
hierarchy: RoomHierarchy;
parents: Set<string>;
selectedMap?: Map<string, Set<string>>;
onViewRoomClick(roomId: string, autoJoin: boolean): void;
onViewRoomClick(roomId: string, autoJoin: boolean, isSpaceRoom: boolean): void;
onToggleClick?(parentId: string, childId: string): void;
}

Expand Down Expand Up @@ -353,8 +366,8 @@ export const HierarchyLevel = ({
room={room}
suggested={hierarchy.isSuggested(root.room_id, room.room_id)}
selected={selectedMap?.get(root.room_id)?.has(room.room_id)}
onViewRoomClick={(autoJoin) => {
onViewRoomClick(room.room_id, autoJoin);
onViewRoomClick={(autoJoin, isSpaceRoom) => {
onViewRoomClick(room.room_id, autoJoin, isSpaceRoom);
}}
hasPermissions={hasPermissions}
onToggleClick={onToggleClick ? () => onToggleClick(root.room_id, room.room_id) : undefined}
Expand All @@ -373,8 +386,8 @@ export const HierarchyLevel = ({
}).length}
suggested={hierarchy.isSuggested(root.room_id, space.room_id)}
selected={selectedMap?.get(root.room_id)?.has(space.room_id)}
onViewRoomClick={(autoJoin) => {
onViewRoomClick(space.room_id, autoJoin);
onViewRoomClick={(autoJoin, isSpaceRoom) => {
onViewRoomClick(space.room_id, autoJoin, isSpaceRoom);
}}
hasPermissions={hasPermissions}
onToggleClick={onToggleClick ? () => onToggleClick(root.room_id, space.room_id) : undefined}
Expand Down Expand Up @@ -652,8 +665,8 @@ const SpaceHierarchy = ({
parents={new Set()}
selectedMap={selected}
onToggleClick={hasPermissions ? onToggleClick : undefined}
onViewRoomClick={(roomId, autoJoin) => {
showRoom(cli, hierarchy, roomId, autoJoin);
onViewRoomClick={(roomId, autoJoin, isSpaceRoom) => {
showRoom(cli, hierarchy, roomId, autoJoin, isSpaceRoom);
}}
/>
</>;
Expand Down
Loading