Improve nested displays and clean up UI for small displays
This commit is contained in:
1 parent
e69fc1250f
commit
10a2c400b2
5 files changed
+124
-28
No files matched your search
@@ -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': {
|
||||
|
||||
@@ -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(
|
||||
<path
|
||||
d={pathStrings.join(" ")}
|
||||
fill="none"
|
||||
stroke={color.Surface.ContainerLine}
|
||||
strokeWidth={config.borderWidth.B300}
|
||||
display="block"
|
||||
/>
|
||||
);
|
||||
|
||||
aY = vItem.end;
|
||||
});
|
||||
|
||||
return (
|
||||
<svg
|
||||
style={{
|
||||
position: 'absolute',
|
||||
inset: 0,
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
pointerEvents: 'none',
|
||||
}}
|
||||
>
|
||||
{pathHolder}
|
||||
</svg>
|
||||
);
|
||||
}, [hierarchy, vItems]);
|
||||
|
||||
return (
|
||||
<PowerLevelsContextProvider value={spacePowerLevels}>
|
||||
<Box grow="Yes">
|
||||
@@ -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 (
|
||||
<VirtualTile
|
||||
virtualItem={vItem}
|
||||
style={{
|
||||
paddingTop: vItem.index === 0 ? 0 : config.space.S500,
|
||||
paddingTop: getPaddingTop(hierarchy, vItem),
|
||||
paddingLeft,
|
||||
}}
|
||||
ref={virtualizer.measureElement}
|
||||
key={vItem.index}
|
||||
>
|
||||
<SpaceHierarchy
|
||||
<SpaceHierarchyItem
|
||||
spaceItem={item.space}
|
||||
summary={spacesItems.get(item.space.roomId)}
|
||||
roomItems={item.rooms}
|
||||
@@ -605,6 +673,7 @@ export function Lobby() {
|
||||
</VirtualTile>
|
||||
);
|
||||
})}
|
||||
{getConnectorSVG(hierarchy, vItems)}
|
||||
</div>
|
||||
{reordering && (
|
||||
<Box
|
||||
|
||||
@@ -2,7 +2,10 @@ import { style } from '@vanilla-extract/css';
|
||||
import { config, toRem } from 'folds';
|
||||
|
||||
export const RoomItemCard = style({
|
||||
padding: config.space.S400,
|
||||
paddingLeft: config.space.S400,
|
||||
paddingRight: config.space.S400,
|
||||
paddingTop: config.space.S300,
|
||||
paddingBottom: config.space.S300,
|
||||
borderRadius: 0,
|
||||
position: 'relative',
|
||||
selectors: {
|
||||
|
||||
+7
-10
@@ -18,7 +18,7 @@ import { AfterItemDropTarget, CanDropCallback } from './DnD';
|
||||
import { HierarchyItemMenu } from './HierarchyItemMenu';
|
||||
import { RoomItemCard } from './RoomItem';
|
||||
|
||||
type SpaceHierarchyProps = {
|
||||
type SpaceHierarchyItemProps = {
|
||||
summary: IHierarchyRoom | undefined;
|
||||
spaceItem: HierarchyItemSpace;
|
||||
roomItems?: HierarchyItemRoom[];
|
||||
@@ -39,7 +39,7 @@ type SpaceHierarchyProps = {
|
||||
onSpacesFound: (spaceItems: IHierarchyRoom[]) => void;
|
||||
onOpenRoom: MouseEventHandler<HTMLButtonElement>;
|
||||
};
|
||||
export const SpaceHierarchy = forwardRef<HTMLDivElement, SpaceHierarchyProps>(
|
||||
export const SpaceHierarchyItem = forwardRef<HTMLDivElement, SpaceHierarchyItemProps>(
|
||||
(
|
||||
{
|
||||
summary,
|
||||
@@ -109,7 +109,7 @@ export const SpaceHierarchy = forwardRef<HTMLDivElement, SpaceHierarchyProps>(
|
||||
}
|
||||
|
||||
return (
|
||||
<Box direction="Column" gap="100" ref={ref}>
|
||||
<Box direction="Column" gap="0" ref={ref}>
|
||||
<SpaceItemCard
|
||||
summary={rooms.get(spaceItem.roomId) ?? summary}
|
||||
loading={fetching}
|
||||
@@ -152,7 +152,7 @@ export const SpaceHierarchy = forwardRef<HTMLDivElement, SpaceHierarchyProps>(
|
||||
data-dragging={draggingSpace}
|
||||
/>
|
||||
{childItems && childItems.length > 0 ? (
|
||||
<Box direction="Column" gap="100">
|
||||
<Box direction="Column" gap="0">
|
||||
{childItems.map((roomItem, index) => {
|
||||
const roomSummary = rooms.get(roomItem.roomId);
|
||||
|
||||
@@ -204,22 +204,19 @@ export const SpaceHierarchy = forwardRef<HTMLDivElement, SpaceHierarchyProps>(
|
||||
</Box>
|
||||
) : (
|
||||
childItems && (
|
||||
<SequenceCard variant="SurfaceVariant" gap="300" alignItems="Center">
|
||||
<SequenceCard variant="SurfaceVariant" gap="300" alignItems="Center" radii="0">
|
||||
<Box
|
||||
grow="Yes"
|
||||
style={{
|
||||
padding: config.space.S700,
|
||||
padding: config.space.S100,
|
||||
}}
|
||||
direction="Column"
|
||||
alignItems="Center"
|
||||
justifyContent="Center"
|
||||
gap="100"
|
||||
>
|
||||
<Text size="H5" align="Center">
|
||||
No Rooms
|
||||
</Text>
|
||||
<Text align="Center" size="T300" priority="300">
|
||||
This space does not contains rooms yet.
|
||||
This space does not contain any rooms.
|
||||
</Text>
|
||||
</Box>
|
||||
</SequenceCard>
|
||||
@@ -306,15 +306,42 @@ function AddRoomButton({ item }: { item: HierarchyItem }) {
|
||||
</FocusTrap>
|
||||
}
|
||||
>
|
||||
<Chip
|
||||
variant="Primary"
|
||||
radii="Pill"
|
||||
before={<Icon src={Icons.Plus} size="50" />}
|
||||
onClick={handleAddRoom}
|
||||
aria-pressed={!!cords}
|
||||
{item.parentId === undefined ? (
|
||||
<Chip
|
||||
variant="Primary"
|
||||
radii="Pill"
|
||||
before={<Icon src={Icons.Plus} size="50" />}
|
||||
onClick={handleAddRoom}
|
||||
aria-pressed={!!cords}
|
||||
>
|
||||
<Text size="B300">Add Room</Text>
|
||||
</Chip>
|
||||
) : (
|
||||
<TooltipProvider
|
||||
position="Bottom"
|
||||
offset={4}
|
||||
tooltip={
|
||||
<Tooltip>
|
||||
<Text>Add Room</Text>
|
||||
</Tooltip>
|
||||
}
|
||||
>
|
||||
<Text size="B300">Add Room</Text>
|
||||
</Chip>
|
||||
{(triggerRef) => (
|
||||
<IconButton
|
||||
ref={triggerRef}
|
||||
onClick={handleAddRoom}
|
||||
aria-pressed={!!cords}
|
||||
aria-label="Add Room"
|
||||
variant="Primary"
|
||||
fill="Soft"
|
||||
size="300"
|
||||
radii="300"
|
||||
>
|
||||
<Icon size="50" src={Icons.HashPlus} />
|
||||
</IconButton>
|
||||
)}
|
||||
</TooltipProvider>
|
||||
)}
|
||||
{addExisting && (
|
||||
<AddExistingModal parentId={item.roomId} requestClose={() => setAddExisting(false)} />
|
||||
)}
|
||||
|
||||
Reference in new issue
Block a user