initial modifiable version

This commit is contained in:
Shea Duma committed 2026-05-03 23:14:16 +03:00
1 parent 48cd173ccb
commit 7eb5767f35
9 files changed
+571 -453

No files matched your search

-3
View File
@@ -14,9 +14,6 @@ export const PageNav = recipe({
},
},
},
defaultVariants: {
size: '400',
},
});
export type PageNavVariants = RecipeVariants<typeof PageNav>;
+81 -74
View File
@@ -53,6 +53,7 @@ import {
} from '$hooks/useRoomsNotificationPreferences';
import { useDirectCreateSelected } from '$hooks/router/useDirectSelected';
import { useDirectRooms } from './useDirectRooms';
import { SidebarResizer } from '$pages/client/sidebar/SidebarResizer';
type DirectMenuProps = {
requestClose: () => void;
@@ -179,6 +180,7 @@ export function Direct() {
const roomToUnread = useAtomValue(roomToUnreadAtom);
const navigate = useNavigate();
const [customDMCards] = useSetting(settingsAtom, 'customDMCards');
const [roomSidebarWidth] = useSetting(settingsAtom, 'roomSidebarWidth');
const createDirectSelected = useDirectCreateSelected();
@@ -238,80 +240,85 @@ export function Direct() {
);
return (
<PageNav>
<DirectHeader />
{noRoomToDisplay ? (
<DirectEmpty />
) : (
<PageNavContent scrollRef={scrollRef}>
<Box direction="Column" gap="300">
<NavCategory>
<NavItem variant="Background" radii="400" aria-selected={createDirectSelected}>
<NavButton onClick={() => navigate(getDirectCreatePath())}>
<NavItemContent>
<Box as="span" grow="Yes" alignItems="Center" gap="200">
<Avatar size="200" radii="400">
<Icon src={Icons.Plus} size="100" />
</Avatar>
<Box as="span" grow="Yes">
<Text as="span" size="Inherit" truncate>
Create Chat
</Text>
</Box>
</Box>
</NavItemContent>
</NavButton>
</NavItem>
</NavCategory>
<NavCategory>
<NavCategoryHeader>
<RoomNavCategoryButton
closed={closedCategories.has(DEFAULT_CATEGORY_ID)}
data-category-id={DEFAULT_CATEGORY_ID}
onClick={handleCategoryClick}
>
Chats
</RoomNavCategoryButton>
</NavCategoryHeader>
<div
style={{
position: 'relative',
height: virtualizer.getTotalSize(),
}}
>
{virtualizer.getVirtualItems().map((vItem) => {
const roomId = sortedDirects[vItem.index];
if (!roomId) return null;
const room = mx.getRoom(roomId);
if (!room) return null;
const selected = selectedRoomId === roomId;
return (
<VirtualTile
virtualItem={vItem}
key={vItem.index}
ref={virtualizer.measureElement}
<>
<div style={{ width: toRem(roomSidebarWidth) }}>
<PageNav>
<DirectHeader />
{noRoomToDisplay ? (
<DirectEmpty />
) : (
<PageNavContent scrollRef={scrollRef}>
<Box direction="Column" gap="300">
<NavCategory>
<NavItem variant="Background" radii="400" aria-selected={createDirectSelected}>
<NavButton onClick={() => navigate(getDirectCreatePath())}>
<NavItemContent>
<Box as="span" grow="Yes" alignItems="Center" gap="200">
<Avatar size="200" radii="400">
<Icon src={Icons.Plus} size="100" />
</Avatar>
<Box as="span" grow="Yes">
<Text as="span" size="Inherit" truncate>
Create Chat
</Text>
</Box>
</Box>
</NavItemContent>
</NavButton>
</NavItem>
</NavCategory>
<NavCategory>
<NavCategoryHeader>
<RoomNavCategoryButton
closed={closedCategories.has(DEFAULT_CATEGORY_ID)}
data-category-id={DEFAULT_CATEGORY_ID}
onClick={handleCategoryClick}
>
<RoomNavItem
room={room}
selected={selected}
showAvatar
direct
customDMCards={customDMCards}
linkPath={getDirectRoomPath(getCanonicalAliasOrRoomId(mx, roomId))}
notificationMode={getRoomNotificationMode(
notificationPreferences,
room.roomId
)}
/>
</VirtualTile>
);
})}
</div>
</NavCategory>
</Box>
</PageNavContent>
)}
</PageNav>
Chats
</RoomNavCategoryButton>
</NavCategoryHeader>
<div
style={{
position: 'relative',
height: virtualizer.getTotalSize(),
}}
>
{virtualizer.getVirtualItems().map((vItem) => {
const roomId = sortedDirects[vItem.index];
if (!roomId) return null;
const room = mx.getRoom(roomId);
if (!room) return null;
const selected = selectedRoomId === roomId;
return (
<VirtualTile
virtualItem={vItem}
key={vItem.index}
ref={virtualizer.measureElement}
>
<RoomNavItem
room={room}
selected={selected}
showAvatar
direct
customDMCards={customDMCards}
linkPath={getDirectRoomPath(getCanonicalAliasOrRoomId(mx, roomId))}
notificationMode={getRoomNotificationMode(
notificationPreferences,
room.roomId
)}
/>
</VirtualTile>
);
})}
</div>
</NavCategory>
</Box>
</PageNavContent>
)}
</PageNav>
</div>
<SidebarResizer />
</>
);
}
+96 -82
View File
@@ -18,6 +18,7 @@ import {
Text,
color,
config,
toRem,
} from 'folds';
import { NavCategory, NavCategoryHeader, NavItem, NavItemContent, NavLink } from '$components/nav';
import { getExploreFeaturedPath, getExploreServerPath } from '$pages/pathUtils';
@@ -29,6 +30,9 @@ import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
import { useNavToActivePathMapper } from '$hooks/useNavToActivePathMapper';
import { PageNav, PageNavContent, PageNavHeader } from '$components/page';
import { stopPropagation } from '$utils/keyboard';
import { SidebarResizer } from '$pages/client/sidebar/SidebarResizer';
import { settingsAtom } from '$state/settings';
import { useSetting } from '$state/hooks/settings';
export function AddServer() {
const mx = useMatrixClient();
@@ -159,101 +163,111 @@ export function Explore() {
const featuredSelected = useExploreFeaturedSelected();
const selectedServer = useExploreServer();
const [roomSidebarWidth] = useSetting(settingsAtom, 'roomSidebarWidth');
return (
<PageNav>
<PageNavHeader>
<Box grow="Yes" gap="300">
<Box grow="Yes">
<Text size="H4" truncate>
Explore Community
</Text>
</Box>
</Box>
</PageNavHeader>
<PageNavContent>
<Box direction="Column" gap="300">
<NavCategory>
<NavItem variant="Background" radii="400" aria-selected={featuredSelected}>
<NavLink to={getExploreFeaturedPath()}>
<NavItemContent>
<Box as="span" grow="Yes" alignItems="Center" gap="200">
<Avatar size="200" radii="400">
<Icon src={Icons.Bulb} size="100" filled={featuredSelected} />
</Avatar>
<Box as="span" grow="Yes">
<Text as="span" size="Inherit" truncate>
Featured
</Text>
</Box>
</Box>
</NavItemContent>
</NavLink>
</NavItem>
{userServer && (
<NavItem
variant="Background"
radii="400"
aria-selected={selectedServer === userServer}
>
<NavLink to={getExploreServerPath(userServer)}>
<NavItemContent>
<Box as="span" grow="Yes" alignItems="Center" gap="200">
<Avatar size="200" radii="400">
<Icon
src={Icons.Server}
size="100"
filled={selectedServer === userServer}
/>
</Avatar>
<Box as="span" grow="Yes">
<Text as="span" size="Inherit" truncate>
{userServer}
</Text>
</Box>
</Box>
</NavItemContent>
</NavLink>
</NavItem>
)}
</NavCategory>
{servers.length > 0 && (
<NavCategory>
<NavCategoryHeader>
<Text size="O400" style={{ paddingLeft: config.space.S200 }}>
Servers
<>
<div style={{ width: toRem(roomSidebarWidth) }}>
<PageNav>
<PageNavHeader>
<Box grow="Yes" gap="300">
<Box grow="Yes">
<Text size="H4" truncate>
Explore Community
</Text>
</NavCategoryHeader>
{servers.map((server) => (
<NavItem
key={server}
variant="Background"
radii="400"
aria-selected={server === selectedServer}
>
<NavLink to={getExploreServerPath(server)}>
</Box>
</Box>
</PageNavHeader>
<PageNavContent>
<Box direction="Column" gap="300">
<NavCategory>
<NavItem variant="Background" radii="400" aria-selected={featuredSelected}>
<NavLink to={getExploreFeaturedPath()}>
<NavItemContent>
<Box as="span" grow="Yes" alignItems="Center" gap="200">
<Avatar size="200" radii="400">
<Icon src={Icons.Server} size="100" filled={server === selectedServer} />
<Icon src={Icons.Bulb} size="100" filled={featuredSelected} />
</Avatar>
<Box as="span" grow="Yes">
<Text as="span" size="Inherit" truncate>
{server}
Featured
</Text>
</Box>
</Box>
</NavItemContent>
</NavLink>
</NavItem>
))}
</NavCategory>
)}
<Box direction="Column">
<AddServer />
</Box>
</Box>
</PageNavContent>
</PageNav>
{userServer && (
<NavItem
variant="Background"
radii="400"
aria-selected={selectedServer === userServer}
>
<NavLink to={getExploreServerPath(userServer)}>
<NavItemContent>
<Box as="span" grow="Yes" alignItems="Center" gap="200">
<Avatar size="200" radii="400">
<Icon
src={Icons.Server}
size="100"
filled={selectedServer === userServer}
/>
</Avatar>
<Box as="span" grow="Yes">
<Text as="span" size="Inherit" truncate>
{userServer}
</Text>
</Box>
</Box>
</NavItemContent>
</NavLink>
</NavItem>
)}
</NavCategory>
{servers.length > 0 && (
<NavCategory>
<NavCategoryHeader>
<Text size="O400" style={{ paddingLeft: config.space.S200 }}>
Servers
</Text>
</NavCategoryHeader>
{servers.map((server) => (
<NavItem
key={server}
variant="Background"
radii="400"
aria-selected={server === selectedServer}
>
<NavLink to={getExploreServerPath(server)}>
<NavItemContent>
<Box as="span" grow="Yes" alignItems="Center" gap="200">
<Avatar size="200" radii="400">
<Icon
src={Icons.Server}
size="100"
filled={server === selectedServer}
/>
</Avatar>
<Box as="span" grow="Yes">
<Text as="span" size="Inherit" truncate>
{server}
</Text>
</Box>
</Box>
</NavItemContent>
</NavLink>
</NavItem>
))}
</NavCategory>
)}
<Box direction="Column">
<AddServer />
</Box>
</Box>
</PageNavContent>
</PageNav>
</div>
<SidebarResizer />
</>
);
}
+132 -124
View File
@@ -62,6 +62,7 @@ import {
import { UseStateProvider } from '$components/UseStateProvider';
import { JoinAddressPrompt } from '$components/join-address-prompt';
import { useHomeRooms } from './useHomeRooms';
import { SidebarResizer } from '$pages/client/sidebar/SidebarResizer';
type HomeMenuProps = {
requestClose: () => void;
@@ -200,6 +201,8 @@ export function Home() {
const roomToUnread = useAtomValue(roomToUnreadAtom);
const navigate = useNavigate();
const [roomSidebarWidth] = useSetting(settingsAtom, 'roomSidebarWidth');
const selectedRoomId = useSelectedRoom();
const createRoomSelected = useHomeCreateSelected();
const searchSelected = useHomeSearchSelected();
@@ -234,131 +237,136 @@ export function Home() {
);
return (
<PageNav>
<HomeHeader />
{noRoomToDisplay ? (
<HomeEmpty />
) : (
<PageNavContent scrollRef={scrollRef}>
<Box direction="Column" gap="300">
<NavCategory>
<NavItem variant="Background" radii="400" aria-selected={createRoomSelected}>
<NavButton onClick={() => navigate(getHomeCreatePath())}>
<NavItemContent>
<Box as="span" grow="Yes" alignItems="Center" gap="200">
<Avatar size="200" radii="400">
<Icon src={Icons.Plus} size="100" />
</Avatar>
<Box as="span" grow="Yes">
<Text as="span" size="Inherit" truncate>
Create Room
</Text>
</Box>
</Box>
</NavItemContent>
</NavButton>
</NavItem>
<UseStateProvider initial={false}>
{(open, setOpen) => (
<>
<NavItem variant="Background" radii="400">
<NavButton onClick={() => setOpen(true)}>
<NavItemContent>
<Box as="span" grow="Yes" alignItems="Center" gap="200">
<Avatar size="200" radii="400">
<Icon src={Icons.Link} size="100" />
</Avatar>
<Box as="span" grow="Yes">
<Text as="span" size="Inherit" truncate>
Join with Address
</Text>
</Box>
<>
<div style={{ width: toRem(roomSidebarWidth) }}>
<PageNav>
<HomeHeader />
{noRoomToDisplay ? (
<HomeEmpty />
) : (
<PageNavContent scrollRef={scrollRef}>
<Box direction="Column" gap="300">
<NavCategory>
<NavItem variant="Background" radii="400" aria-selected={createRoomSelected}>
<NavButton onClick={() => navigate(getHomeCreatePath())}>
<NavItemContent>
<Box as="span" grow="Yes" alignItems="Center" gap="200">
<Avatar size="200" radii="400">
<Icon src={Icons.Plus} size="100" />
</Avatar>
<Box as="span" grow="Yes">
<Text as="span" size="Inherit" truncate>
Create Room
</Text>
</Box>
</NavItemContent>
</NavButton>
</NavItem>
{open && (
<JoinAddressPrompt
onCancel={() => setOpen(false)}
onOpen={(roomIdOrAlias, viaServers, eventId) => {
setOpen(false);
const path = getHomeRoomPath(roomIdOrAlias, eventId);
navigate(
viaServers
? withSearchParam(path, {
viaServers: encodeSearchParamValueArray(viaServers),
})
: path
);
}}
/>
)}
</>
)}
</UseStateProvider>
<NavItem variant="Background" radii="400" aria-selected={searchSelected}>
<NavLink to={getHomeSearchPath()}>
<NavItemContent>
<Box as="span" grow="Yes" alignItems="Center" gap="200">
<Avatar size="200" radii="400">
<Icon src={Icons.Search} size="100" filled={searchSelected} />
</Avatar>
<Box as="span" grow="Yes">
<Text as="span" size="Inherit" truncate>
Message Search
</Text>
</Box>
</Box>
</NavItemContent>
</NavLink>
</NavItem>
</NavCategory>
<NavCategory>
<NavCategoryHeader>
<RoomNavCategoryButton
closed={closedCategories.has(DEFAULT_CATEGORY_ID)}
data-category-id={DEFAULT_CATEGORY_ID}
onClick={handleCategoryClick}
>
Rooms
</RoomNavCategoryButton>
</NavCategoryHeader>
<div
style={{
position: 'relative',
height: virtualizer.getTotalSize(),
}}
>
{virtualizer.getVirtualItems().map((vItem) => {
const roomId = sortedRooms[vItem.index];
if (!roomId) return null;
const room = mx.getRoom(roomId);
if (!room) return null;
const selected = selectedRoomId === roomId;
return (
<VirtualTile
virtualItem={vItem}
key={vItem.index}
ref={virtualizer.measureElement}
>
<RoomNavItem
room={room}
selected={selected}
linkPath={getHomeRoomPath(getCanonicalAliasOrRoomId(mx, roomId))}
notificationMode={getRoomNotificationMode(
notificationPreferences,
room.roomId
</Box>
</NavItemContent>
</NavButton>
</NavItem>
<UseStateProvider initial={false}>
{(open, setOpen) => (
<>
<NavItem variant="Background" radii="400">
<NavButton onClick={() => setOpen(true)}>
<NavItemContent>
<Box as="span" grow="Yes" alignItems="Center" gap="200">
<Avatar size="200" radii="400">
<Icon src={Icons.Link} size="100" />
</Avatar>
<Box as="span" grow="Yes">
<Text as="span" size="Inherit" truncate>
Join with Address
</Text>
</Box>
</Box>
</NavItemContent>
</NavButton>
</NavItem>
{open && (
<JoinAddressPrompt
onCancel={() => setOpen(false)}
onOpen={(roomIdOrAlias, viaServers, eventId) => {
setOpen(false);
const path = getHomeRoomPath(roomIdOrAlias, eventId);
navigate(
viaServers
? withSearchParam(path, {
viaServers: encodeSearchParamValueArray(viaServers),
})
: path
);
}}
/>
)}
/>
</VirtualTile>
);
})}
</div>
</NavCategory>
</Box>
</PageNavContent>
)}
</PageNav>
</>
)}
</UseStateProvider>
<NavItem variant="Background" radii="400" aria-selected={searchSelected}>
<NavLink to={getHomeSearchPath()}>
<NavItemContent>
<Box as="span" grow="Yes" alignItems="Center" gap="200">
<Avatar size="200" radii="400">
<Icon src={Icons.Search} size="100" filled={searchSelected} />
</Avatar>
<Box as="span" grow="Yes">
<Text as="span" size="Inherit" truncate>
Message Search
</Text>
</Box>
</Box>
</NavItemContent>
</NavLink>
</NavItem>
</NavCategory>
<NavCategory>
<NavCategoryHeader>
<RoomNavCategoryButton
closed={closedCategories.has(DEFAULT_CATEGORY_ID)}
data-category-id={DEFAULT_CATEGORY_ID}
onClick={handleCategoryClick}
>
Rooms
</RoomNavCategoryButton>
</NavCategoryHeader>
<div
style={{
position: 'relative',
height: virtualizer.getTotalSize(),
}}
>
{virtualizer.getVirtualItems().map((vItem) => {
const roomId = sortedRooms[vItem.index];
if (!roomId) return null;
const room = mx.getRoom(roomId);
if (!room) return null;
const selected = selectedRoomId === roomId;
return (
<VirtualTile
virtualItem={vItem}
key={vItem.index}
ref={virtualizer.measureElement}
>
<RoomNavItem
room={room}
selected={selected}
linkPath={getHomeRoomPath(getCanonicalAliasOrRoomId(mx, roomId))}
notificationMode={getRoomNotificationMode(
notificationPreferences,
room.roomId
)}
/>
</VirtualTile>
);
})}
</div>
</NavCategory>
</Box>
</PageNavContent>
)}
</PageNav>
</div>
<SidebarResizer />
</>
);
}
+48 -35
View File
@@ -1,4 +1,4 @@
import { Avatar, Box, Icon, Icons, Text } from 'folds';
import { Avatar, Box, Icon, Icons, Text, toRem } from 'folds';
import { useAtomValue } from 'jotai';
import { NavCategory, NavItem, NavItemContent, NavLink } from '$components/nav';
import { getInboxInvitesPath, getInboxNotificationsPath } from '$pages/pathUtils';
@@ -7,6 +7,9 @@ import { UnreadBadge } from '$components/unread-badge';
import { allInvitesAtom } from '$state/room-list/inviteList';
import { useNavToActivePathMapper } from '$hooks/useNavToActivePathMapper';
import { PageNav, PageNavContent, PageNavHeader } from '$components/page';
import { SidebarResizer } from '$pages/client/sidebar/SidebarResizer';
import { useSetting } from '$state/hooks/settings';
import { settingsAtom } from '$state/settings';
function InvitesNavItem() {
const invitesSelected = useInboxInvitesSelected();
@@ -43,41 +46,51 @@ export function Inbox() {
useNavToActivePathMapper('inbox');
const notificationsSelected = useInboxNotificationsSelected();
const [roomSidebarWidth] = useSetting(settingsAtom, 'roomSidebarWidth');
return (
<PageNav>
<PageNavHeader>
<Box grow="Yes" gap="300">
<Box grow="Yes">
<Text size="H4" truncate>
Inbox
</Text>
</Box>
</Box>
</PageNavHeader>
<>
<div style={{ width: toRem(roomSidebarWidth) }}>
<PageNav>
<PageNavHeader>
<Box grow="Yes" gap="300">
<Box grow="Yes">
<Text size="H4" truncate>
Inbox
</Text>
</Box>
</Box>
</PageNavHeader>
<PageNavContent>
<Box direction="Column" gap="300">
<NavCategory>
<NavItem variant="Background" radii="400" aria-selected={notificationsSelected}>
<NavLink to={getInboxNotificationsPath()}>
<NavItemContent>
<Box as="span" grow="Yes" alignItems="Center" gap="200">
<Avatar size="200" radii="400">
<Icon src={Icons.MessageUnread} size="100" filled={notificationsSelected} />
</Avatar>
<Box as="span" grow="Yes">
<Text as="span" size="Inherit" truncate>
Notifications
</Text>
</Box>
</Box>
</NavItemContent>
</NavLink>
</NavItem>
<InvitesNavItem />
</NavCategory>
</Box>
</PageNavContent>
</PageNav>
<PageNavContent>
<Box direction="Column" gap="300">
<NavCategory>
<NavItem variant="Background" radii="400" aria-selected={notificationsSelected}>
<NavLink to={getInboxNotificationsPath()}>
<NavItemContent>
<Box as="span" grow="Yes" alignItems="Center" gap="200">
<Avatar size="200" radii="400">
<Icon
src={Icons.MessageUnread}
size="100"
filled={notificationsSelected}
/>
</Avatar>
<Box as="span" grow="Yes">
<Text as="span" size="Inherit" truncate>
Notifications
</Text>
</Box>
</Box>
</NavItemContent>
</NavLink>
</NavItem>
<InvitesNavItem />
</NavCategory>
</Box>
</PageNavContent>
</PageNav>
</div>
<SidebarResizer />
</>
);
}
@@ -0,0 +1,20 @@
import { style } from '@vanilla-extract/css';
import { color } from 'folds';
export const SidebarResizer = style({
width: '4px',
backgroundColor: 'inherit',
transition: '0.2s',
selectors: {
'&:hover': {
height: '100%',
zIndex: '100',
boxShadow: `0px 0px 32px 8px ${color.Primary.Container}`,
},
},
});
export const SideBarResizerAnimation = style({
width: '100%',
backgroundColor: color.Primary.Container,
transition: '0.2s',
});
@@ -0,0 +1,49 @@
import { Box } from 'folds';
import * as css from '$pages/client/sidebar/SidebarResizer.css';
import type { SetStateAction } from 'react';
import React, { useCallback, useEffect, useState } from 'react';
import { settingsAtom } from '$state/settings';
import { useSetting } from '$state/hooks/settings';
export function SidebarResizer() {
const [roomSidebarWidth, setRoomSidebarWidth] = useSetting(settingsAtom, 'roomSidebarWidth');
const [isPointerOver, setIsPointerOver] = useState(false);
const [oldX, setOldX] = useState(0);
const [newX, setNewX] = useState(0);
useEffect(() => {
const change = oldX - newX;
if (change) setRoomSidebarWidth(Math.max(roomSidebarWidth - change, 0));
// The disable is because the position should only update whenever the new one is updated
// oxlint-disable-next-line eslint-plugin-react-hooks/exhaustive-deps
}, [newX]);
const onMouseUp = useCallback((e: { clientX: SetStateAction<number> }) => {
setNewX(e.clientX);
window.removeEventListener('pointerup', onMouseUp);
}, []);
const onMouseDown = useCallback(
(e: React.PointerEvent) => {
e.preventDefault();
setOldX(e.clientX);
window.addEventListener('pointerup', onMouseUp);
},
[onMouseUp]
);
return (
<Box
className={css.SidebarResizer}
onPointerEnter={() => setIsPointerOver(true)}
onPointerLeave={() => setIsPointerOver(false)}
onPointerDown={onMouseDown}
onPointerUp={onMouseUp}
>
<Box
className={css.SideBarResizerAnimation}
style={{ height: isPointerOver ? '100%' : '0px' }}
/>
</Box>
);
}
+143 -135
View File
@@ -80,6 +80,7 @@ import { lastVisitedRoomIdAtom } from '$state/room/lastRoom';
import { SwipeableOverlayWrapper } from '$components/SwipeableOverlayWrapper';
import { useCallEmbed } from '$hooks/useCallEmbed';
import { createDebugLogger } from '$utils/debugLogger';
import { SidebarResizer } from '$pages/client/sidebar/SidebarResizer';
const debugLog = createDebugLogger('Space');
@@ -389,6 +390,8 @@ export function Space() {
const allJoinedRooms = useMemo(() => new Set(allRooms), [allRooms]);
const notificationPreferences = useRoomsNotificationPreferencesContext();
const [roomSidebarWidth] = useSetting(settingsAtom, 'roomSidebarWidth');
const tombstoneEvent = useStateEvent(space, EventType.RoomTombstone);
const selectedRoomId = useSelectedRoom();
const lobbySelected = useSpaceLobbySelected(spaceIdOrAlias);
@@ -711,142 +714,147 @@ export function Space() {
}, [lastRoomId, spaceIdOrAlias, mx, navigate]);
return (
<PageNav>
<SwipeableOverlayWrapper direction="left" onClose={handleSwipeToRoom}>
<SpaceHeader />
<PageNavContent scrollRef={scrollRef}>
<Box direction="Column" gap="300">
{tombstoneEvent && (
<SpaceTombstone
roomId={space.roomId}
replacementRoomId={tombstoneEvent.getContent().replacement_room}
/>
)}
<NavCategory>
<NavItem variant="Background" radii="400" aria-selected={lobbySelected}>
<NavLink to={getSpaceLobbyPath(getCanonicalAliasOrRoomId(mx, space.roomId))}>
<NavItemContent>
<Box as="span" grow="Yes" alignItems="Center" gap="200">
<Avatar size="200" radii="400">
<Icon src={Icons.Flag} size="100" filled={lobbySelected} />
</Avatar>
<Box as="span" grow="Yes">
<Text as="span" size="Inherit" truncate>
Lobby
</Text>
</Box>
</Box>
</NavItemContent>
</NavLink>
</NavItem>
<NavItem variant="Background" radii="400" aria-selected={searchSelected}>
<NavLink to={getSpaceSearchPath(getCanonicalAliasOrRoomId(mx, space.roomId))}>
<NavItemContent>
<Box as="span" grow="Yes" alignItems="Center" gap="200">
<Avatar size="200" radii="400">
<Icon src={Icons.Search} size="100" filled={searchSelected} />
</Avatar>
<Box as="span" grow="Yes">
<Text as="span" size="Inherit" truncate>
Message Search
</Text>
</Box>
</Box>
</NavItemContent>
</NavLink>
</NavItem>
</NavCategory>
<NavCategory
style={{
height: virtualizer.getTotalSize(),
position: 'relative',
}}
>
{virtualizedItems.map((vItem) => {
const hierarchyItem = hierarchy[vItem.index];
if (!hierarchyItem) return null;
const { roomId, depth: itemDepth } = hierarchyItem;
const depth = itemDepth ?? 0;
const room = mx.getRoom(roomId);
const renderDepth = room?.isSpaceRoom() ? depth - 2 : depth - 1;
if (!room) return null;
if (depth === subspaceHierarchyLimit && room.isSpaceRoom()) {
return (
<VirtualTile
virtualItem={vItem}
key={vItem.index}
ref={virtualizer.measureElement}
>
<div
style={{
paddingLeft: `calc(${renderDepth} * ${config.space.S400})`,
}}
>
<SpaceNavItem
room={room}
selected={selectedRoomId === roomId}
linkPath={getSpaceLobbyPath(getCanonicalAliasOrRoomId(mx, roomId))}
/>
</div>
</VirtualTile>
);
}
const paddingTop = getCategoryPadding(depth);
const paddingLeft = `calc(${renderDepth} * ${config.space.S400})`;
if (room.isSpaceRoom()) {
const categoryId = makeNavCategoryId(space.roomId, roomId);
const closedViaCategory = getInClosedCategories(space.roomId, roomId);
return (
<VirtualTile
virtualItem={vItem}
key={vItem.index}
ref={virtualizer.measureElement}
>
<div style={{ paddingTop, paddingLeft }}>
<NavCategoryHeader>
<RoomNavCategoryButton
data-category-id={categoryId}
onClick={handleCategoryClick}
closed={closedCategories.has(categoryId) || closedViaCategory}
<>
<div style={{ width: toRem(roomSidebarWidth) }}>
<PageNav>
<SwipeableOverlayWrapper direction="left" onClose={handleSwipeToRoom}>
<SpaceHeader />
<PageNavContent scrollRef={scrollRef}>
<Box direction="Column" gap="300">
{tombstoneEvent && (
<SpaceTombstone
roomId={space.roomId}
replacementRoomId={tombstoneEvent.getContent().replacement_room}
/>
)}
<NavCategory>
<NavItem variant="Background" radii="400" aria-selected={lobbySelected}>
<NavLink to={getSpaceLobbyPath(getCanonicalAliasOrRoomId(mx, space.roomId))}>
<NavItemContent>
<Box as="span" grow="Yes" alignItems="Center" gap="200">
<Avatar size="200" radii="400">
<Icon src={Icons.Flag} size="100" filled={lobbySelected} />
</Avatar>
<Box as="span" grow="Yes">
<Text as="span" size="Inherit" truncate>
Lobby
</Text>
</Box>
</Box>
</NavItemContent>
</NavLink>
</NavItem>
<NavItem variant="Background" radii="400" aria-selected={searchSelected}>
<NavLink to={getSpaceSearchPath(getCanonicalAliasOrRoomId(mx, space.roomId))}>
<NavItemContent>
<Box as="span" grow="Yes" alignItems="Center" gap="200">
<Avatar size="200" radii="400">
<Icon src={Icons.Search} size="100" filled={searchSelected} />
</Avatar>
<Box as="span" grow="Yes">
<Text as="span" size="Inherit" truncate>
Message Search
</Text>
</Box>
</Box>
</NavItemContent>
</NavLink>
</NavItem>
</NavCategory>
<NavCategory
style={{
height: virtualizer.getTotalSize(),
position: 'relative',
}}
>
{virtualizedItems.map((vItem) => {
const hierarchyItem = hierarchy[vItem.index];
if (!hierarchyItem) return null;
const { roomId, depth: itemDepth } = hierarchyItem;
const depth = itemDepth ?? 0;
const room = mx.getRoom(roomId);
const renderDepth = room?.isSpaceRoom() ? depth - 2 : depth - 1;
if (!room) return null;
if (depth === subspaceHierarchyLimit && room.isSpaceRoom()) {
return (
<VirtualTile
virtualItem={vItem}
key={vItem.index}
ref={virtualizer.measureElement}
>
<div
style={{
paddingLeft: `calc(${renderDepth} * ${config.space.S400})`,
}}
>
{roomId === space.roomId ? 'Rooms' : room?.name}
</RoomNavCategoryButton>
</NavCategoryHeader>
</div>
</VirtualTile>
);
}
<SpaceNavItem
room={room}
selected={selectedRoomId === roomId}
linkPath={getSpaceLobbyPath(getCanonicalAliasOrRoomId(mx, roomId))}
/>
</div>
</VirtualTile>
);
}
return (
<VirtualTile
virtualItem={vItem}
key={vItem.index}
ref={virtualizer.measureElement}
>
<div style={{ paddingLeft }}>
<RoomNavItem
room={room}
selected={selectedRoomId === roomId}
showAvatar={mDirects.has(roomId)}
direct={mDirects.has(roomId)}
linkPath={getToLink(roomId)}
notificationMode={getRoomNotificationMode(
notificationPreferences,
room.roomId
)}
/>
</div>
</VirtualTile>
);
})}
{getConnectorSVG(hierarchy, virtualizedItems)}
</NavCategory>
</Box>
</PageNavContent>
</SwipeableOverlayWrapper>
</PageNav>
const paddingTop = getCategoryPadding(depth);
const paddingLeft = `calc(${renderDepth} * ${config.space.S400})`;
if (room.isSpaceRoom()) {
const categoryId = makeNavCategoryId(space.roomId, roomId);
const closedViaCategory = getInClosedCategories(space.roomId, roomId);
return (
<VirtualTile
virtualItem={vItem}
key={vItem.index}
ref={virtualizer.measureElement}
>
<div style={{ paddingTop, paddingLeft }}>
<NavCategoryHeader>
<RoomNavCategoryButton
data-category-id={categoryId}
onClick={handleCategoryClick}
closed={closedCategories.has(categoryId) || closedViaCategory}
>
{roomId === space.roomId ? 'Rooms' : room?.name}
</RoomNavCategoryButton>
</NavCategoryHeader>
</div>
</VirtualTile>
);
}
return (
<VirtualTile
virtualItem={vItem}
key={vItem.index}
ref={virtualizer.measureElement}
>
<div style={{ paddingLeft }}>
<RoomNavItem
room={room}
selected={selectedRoomId === roomId}
showAvatar={mDirects.has(roomId) || true}
direct={mDirects.has(roomId)}
linkPath={getToLink(roomId)}
notificationMode={getRoomNotificationMode(
notificationPreferences,
room.roomId
)}
/>
</div>
</VirtualTile>
);
})}
{getConnectorSVG(hierarchy, virtualizedItems)}
</NavCategory>
</Box>
</PageNavContent>
</SwipeableOverlayWrapper>
</PageNav>
</div>
<SidebarResizer />
</>
);
}
+2
View File
@@ -118,6 +118,7 @@ export interface Settings {
mentionInReplies: boolean;
showPersonaSetting: boolean;
closeFoldersByDefault: boolean;
roomSidebarWidth: number;
// furry stuff
renderAnimals: boolean;
@@ -219,6 +220,7 @@ const defaultSettings: Settings = {
mentionInReplies: true,
showPersonaSetting: false,
closeFoldersByDefault: false,
roomSidebarWidth: 400,
// furry stuff
renderAnimals: true,