diff --git a/src/app/features/lobby/DnD.css.ts b/src/app/features/lobby/DnD.css.ts
index 347382568..2b7e5e363 100644
--- a/src/app/features/lobby/DnD.css.ts
+++ b/src/app/features/lobby/DnD.css.ts
@@ -11,7 +11,7 @@ export const ItemDraggableTarget = style([
top: 0,
zIndex: 1,
cursor: 'grab',
- borderRadius: config.radii.R400,
+ borderRadius: 0,
opacity: config.opacity.P300,
':active': {
diff --git a/src/app/features/lobby/Lobby.tsx b/src/app/features/lobby/Lobby.tsx
index bbca2c1dd..dffb73044 100644
--- a/src/app/features/lobby/Lobby.tsx
+++ b/src/app/features/lobby/Lobby.tsx
@@ -1,6 +1,6 @@
-import { MouseEventHandler, useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { Box, Chip, Icon, IconButton, Icons, Line, Scroll, Spinner, Text, config } from 'folds';
-import { useVirtualizer } from '@tanstack/react-virtual';
+import { MouseEventHandler, ReactElement, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { Box, Chip, Icon, IconButton, Icons, Line, Scroll, Spinner, Text, color, config } from 'folds';
+import { useVirtualizer, VirtualItem } from '@tanstack/react-virtual';
import { useAtom, useAtomValue } from 'jotai';
import { useNavigate } from 'react-router-dom';
import {
@@ -13,7 +13,7 @@ import {
import { produce } from 'immer';
import { useSpace } from '$hooks/useSpace';
import { Page, PageContent, PageContentCenter, PageHeroSection } from '$components/page';
-import { HierarchyItem, HierarchyItemSpace, useSpaceHierarchy } from '$hooks/useSpaceHierarchy';
+import { HierarchyItem, HierarchyItemSpace, SpaceHierarchy, useSpaceHierarchy } from '$hooks/useSpaceHierarchy';
import { VirtualTile } from '$components/virtualizer';
import { spaceRoomsAtom } from '$state/spaceRooms';
import { useSetting } from '$state/hooks/settings';
@@ -52,7 +52,7 @@ import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { getRoomPermissionsAPI } from '$hooks/useRoomPermissions';
import { getRoomCreatorsForRoomId } from '$hooks/useRoomCreators';
import { MembersDrawer } from '$features/room/MembersDrawer';
-import { SpaceHierarchy } from './SpaceHierarchy';
+import { SpaceHierarchyItem } from './SpaceHierarchyItem';
import { CanDropCallback, useDnDMonitor } from './DnD';
import { LobbyHero } from './LobbyHero';
import { LobbyHeader } from './LobbyHeader';
@@ -520,6 +520,74 @@ export function Lobby() {
[mx, sidebarItems, sidebarSpaces]
);
+ const getPaddingTop = (hierarchy: SpaceHierarchy[], vItem: VirtualItem) => {
+ if (vItem.index === 0) return 0;
+ const prevDepth = hierarchy[vItem.index - 1]?.space.depth ?? 0;
+ const depth = hierarchy[vItem.index].space.depth;
+ if (depth !== 1 && depth >= prevDepth) return config.space.S200;
+ return config.space.S500;
+ };
+
+ const getConnectorSVG = useCallback((hierarchy: SpaceHierarchy[], virtualizedItems: VirtualItem[]): ReactElement => {
+ const PADDING_LEFT_DEPTH_OFFSET = 15.75;
+ const PADDING_LEFT_DEPTH_OFFSET_START = -15;
+
+ var aY: number = 0;
+ // Holder for the paths
+ const pathHolder: ReactElement[] = [];
+ virtualizedItems.forEach((vItem) => {
+ const { depth } = hierarchy[vItem.index].space ?? {};
+
+ // We will render spaces at a level above their normal depth, since we want their children to be "under" them
+ // for the root items, we are not doing anything with it.
+ if (depth < 1) {
+ return;
+ }
+ // for the sub-root items, we will not draw any arcs from root to it.
+ // however, we should capture the aX and aY to draw starter arcs for next depths.
+ if (depth === 1) {
+ aY = vItem.end;
+ return;
+ }
+
+ var pathStrings: string[] = [];
+
+ for (var iDepth = 0; iDepth < depth; iDepth++) {
+ var X = iDepth * PADDING_LEFT_DEPTH_OFFSET + PADDING_LEFT_DEPTH_OFFSET_START;
+
+ var bY = vItem.end;
+
+ pathStrings.push(`M ${X} ${aY} L ${X} ${bY}`);
+ }
+
+ pathHolder.push(
+
+ );
+
+ aY = vItem.end;
+ });
+
+ return (
+
+ );
+ }, [hierarchy, vItems]);
+
return (
@@ -567,19 +635,19 @@ export function Lobby() {
item.space.roomId
);
- const paddingLeft = `calc((${item.space.depth} - 1) * ${config.space.S200})`;
+ const paddingLeft = `calc((${item.space.depth} - 1) * ${config.space.S400})`;
return (
-
);
})}
+ {getConnectorSVG(hierarchy, vItems)}
{reordering && (
void;
onOpenRoom: MouseEventHandler;
};
-export const SpaceHierarchy = forwardRef(
+export const SpaceHierarchyItem = forwardRef(
(
{
summary,
@@ -109,7 +109,7 @@ export const SpaceHierarchy = forwardRef(
}
return (
-
+
(
data-dragging={draggingSpace}
/>
{childItems && childItems.length > 0 ? (
-
+
{childItems.map((roomItem, index) => {
const roomSummary = rooms.get(roomItem.roomId);
@@ -204,22 +204,19 @@ export const SpaceHierarchy = forwardRef(
) : (
childItems && (
-
+
-
- No Rooms
-
- This space does not contains rooms yet.
+ This space does not contain any rooms.
diff --git a/src/app/features/lobby/SpaceItem.tsx b/src/app/features/lobby/SpaceItem.tsx
index a6b3cd22b..9ddee7380 100644
--- a/src/app/features/lobby/SpaceItem.tsx
+++ b/src/app/features/lobby/SpaceItem.tsx
@@ -306,15 +306,42 @@ function AddRoomButton({ item }: { item: HierarchyItem }) {
}
>
- }
- onClick={handleAddRoom}
- aria-pressed={!!cords}
+ {item.parentId === undefined ? (
+ }
+ onClick={handleAddRoom}
+ aria-pressed={!!cords}
+ >
+ Add Room
+
+ ) : (
+
+ Add Room
+
+ }
>
- Add Room
-
+ {(triggerRef) => (
+
+
+
+ )}
+
+ )}
{addExisting && (
setAddExisting(false)} />
)}