Apply the auto-fixable lint rules and the formatter, and drop the Vite build artifacts.
This commit is contained in:
@@ -22,7 +22,7 @@ export const useDraggableItem = (
|
||||
item: HierarchyItem,
|
||||
targetRef: RefObject<HTMLElement>,
|
||||
onDragging: (item?: HierarchyItem) => void,
|
||||
dragHandleRef?: RefObject<HTMLElement>
|
||||
dragHandleRef?: RefObject<HTMLElement>,
|
||||
): boolean => {
|
||||
const [dragging, setDragging] = useState(false);
|
||||
|
||||
@@ -122,7 +122,7 @@ export function AfterItemDropTarget({
|
||||
export const useDnDMonitor = (
|
||||
scrollRef: RefObject<HTMLElement>,
|
||||
onDragging: (item?: HierarchyItem) => void,
|
||||
onReorder: (item: HierarchyItem, container: DropContainerData) => void
|
||||
onReorder: (item: HierarchyItem, container: DropContainerData) => void,
|
||||
) => {
|
||||
useEffect(() => {
|
||||
const scrollElement = scrollRef.current;
|
||||
@@ -141,7 +141,7 @@ export const useDnDMonitor = (
|
||||
}),
|
||||
autoScrollForElements({
|
||||
element: scrollElement,
|
||||
})
|
||||
}),
|
||||
);
|
||||
}, [scrollRef, onDragging, onReorder]);
|
||||
};
|
||||
|
||||
@@ -1,6 +1,18 @@
|
||||
import React, { MouseEventHandler, useCallback, useEffect, useState } from 'react';
|
||||
import FocusTrap from 'focus-trap-react';
|
||||
import { Box, IconButton, PopOut, Menu, MenuItem, Text, RectCords, config, Line, Spinner, toRem } from 'folds';
|
||||
import {
|
||||
Box,
|
||||
IconButton,
|
||||
PopOut,
|
||||
Menu,
|
||||
MenuItem,
|
||||
Text,
|
||||
RectCords,
|
||||
config,
|
||||
Line,
|
||||
Spinner,
|
||||
toRem,
|
||||
} from 'folds';
|
||||
import { Icon, Icons } from '../../components/icons';
|
||||
import { HierarchyItem } from '../../hooks/useSpaceHierarchy';
|
||||
import { useMatrixClient } from '../../hooks/useMatrixClient';
|
||||
@@ -36,7 +48,7 @@ function SuggestMenuItem({
|
||||
useCallback(() => {
|
||||
const newContent: MSpaceChildContent = { ...content, suggested: !content.suggested };
|
||||
return mx.sendStateEvent(parentId, StateEvent.SpaceChild as any, newContent, roomId);
|
||||
}, [mx, parentId, roomId, content])
|
||||
}, [mx, parentId, roomId, content]),
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
@@ -73,8 +85,8 @@ function RemoveMenuItem({
|
||||
const [removeState, handleRemove] = useAsyncCallback(
|
||||
useCallback(
|
||||
() => mx.sendStateEvent(parentId, StateEvent.SpaceChild as any, {}, roomId),
|
||||
[mx, parentId, roomId]
|
||||
)
|
||||
[mx, parentId, roomId],
|
||||
),
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import React, { MouseEventHandler, useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||
import { Box, Chip, IconButton, Line, Scroll, Spinner, Text, config } from 'folds';
|
||||
import { Icon, Icons } from '../../components/icons';
|
||||
import { useVirtualizer } from '@tanstack/react-virtual';
|
||||
import { useAtom, useAtomValue } from 'jotai';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
@@ -8,6 +7,7 @@ import { JoinRule, RestrictedAllowType, Room } from 'matrix-js-sdk';
|
||||
import { RoomJoinRulesEventContent } from 'matrix-js-sdk/lib/types';
|
||||
import { IHierarchyRoom } from 'matrix-js-sdk/lib/@types/spaces';
|
||||
import { produce } from 'immer';
|
||||
import { Icon, Icons } from '../../components/icons';
|
||||
import { useSpace } from '../../hooks/useSpace';
|
||||
import { Page, PageContent, PageContentCenter, PageHeroSection } from '../../components/page';
|
||||
import {
|
||||
@@ -64,7 +64,7 @@ import { joiningProgressAtom } from '../../state/joiningProgress';
|
||||
const useCanDropLobbyItem = (
|
||||
space: Room,
|
||||
roomsPowerLevels: Map<string, IPowerLevels>,
|
||||
getRoom: (roomId: string) => Room | undefined
|
||||
getRoom: (roomId: string) => Room | undefined,
|
||||
): CanDropCallback => {
|
||||
const mx = useMatrixClient();
|
||||
|
||||
@@ -91,7 +91,7 @@ const useCanDropLobbyItem = (
|
||||
|
||||
return true;
|
||||
},
|
||||
[space, roomsPowerLevels, getRoom, mx]
|
||||
[space, roomsPowerLevels, getRoom, mx],
|
||||
);
|
||||
|
||||
const canDropRoom: CanDropCallback = useCallback(
|
||||
@@ -111,7 +111,7 @@ const useCanDropLobbyItem = (
|
||||
|
||||
const canChangeJoinRuleAllow = itemPermissions.stateEvent(
|
||||
StateEvent.RoomJoinRules,
|
||||
mx.getSafeUserId()
|
||||
mx.getSafeUserId(),
|
||||
);
|
||||
if (!canChangeJoinRuleAllow) {
|
||||
return false;
|
||||
@@ -129,7 +129,7 @@ const useCanDropLobbyItem = (
|
||||
}
|
||||
return true;
|
||||
},
|
||||
[mx, getRoom, roomsPowerLevels]
|
||||
[mx, getRoom, roomsPowerLevels],
|
||||
);
|
||||
|
||||
const canDrop: CanDropCallback = useCallback(
|
||||
@@ -146,7 +146,7 @@ const useCanDropLobbyItem = (
|
||||
|
||||
return canDropRoom(item, container);
|
||||
},
|
||||
[canDropSpace, canDropRoom]
|
||||
[canDropSpace, canDropRoom],
|
||||
);
|
||||
|
||||
return canDrop;
|
||||
@@ -179,7 +179,7 @@ function SpaceCardLobby() {
|
||||
const [onTop, setOnTop] = useState(true);
|
||||
const [closedCategories, setClosedCategories] = useAtom(useClosedLobbyCategoriesAtom());
|
||||
const [sidebarItems] = useSidebarItems(
|
||||
useOrphanSpaces(mx, allRoomsAtom, useAtomValue(roomToParentsAtom))
|
||||
useOrphanSpaces(mx, allRoomsAtom, useAtomValue(roomToParentsAtom)),
|
||||
);
|
||||
const sidebarSpaces = useMemo(() => {
|
||||
const sideSpaces = sidebarItems.flatMap((item) => {
|
||||
@@ -205,7 +205,7 @@ function SpaceCardLobby() {
|
||||
setSpacesItem((current) =>
|
||||
produce(current, (draft) => {
|
||||
all.forEach((r) => draft.set(r.room_id, r));
|
||||
})
|
||||
}),
|
||||
);
|
||||
} catch {
|
||||
// hierarchy may be unavailable for some memberships
|
||||
@@ -218,7 +218,7 @@ function SpaceCardLobby() {
|
||||
|
||||
useElementSizeObserver(
|
||||
useCallback(() => heroSectionRef.current, []),
|
||||
useCallback((w, height) => setHeroSectionHeight(height), [])
|
||||
useCallback((w, height) => setHeroSectionHeight(height), []),
|
||||
);
|
||||
|
||||
const getRoom = useGetRoom(allJoinedRooms);
|
||||
@@ -232,9 +232,9 @@ function SpaceCardLobby() {
|
||||
(childId) =>
|
||||
closedCategories.has(makeLobbyCategoryId(space.roomId, childId)) ||
|
||||
(draggingItem ? 'space' in draggingItem : false),
|
||||
[closedCategories, space.roomId, draggingItem]
|
||||
[closedCategories, space.roomId, draggingItem],
|
||||
),
|
||||
spacesItems
|
||||
spacesItems,
|
||||
);
|
||||
|
||||
const virtualizer = useVirtualizer({
|
||||
@@ -256,8 +256,8 @@ function SpaceCardLobby() {
|
||||
return [getRoom(i.space.roomId), ...childRooms];
|
||||
})
|
||||
.filter((r) => !!r) as Room[],
|
||||
[hierarchy, getRoom]
|
||||
)
|
||||
[hierarchy, getRoom],
|
||||
),
|
||||
);
|
||||
|
||||
const canDrop: CanDropCallback = useCanDropLobbyItem(space, roomsPowerLevels, getRoom);
|
||||
@@ -311,13 +311,13 @@ function SpaceCardLobby() {
|
||||
reorder.item.parentId,
|
||||
StateEvent.SpaceChild as any,
|
||||
{ ...reorder.item.content, order: reorder.orderKey },
|
||||
reorder.item.roomId
|
||||
reorder.item.roomId,
|
||||
);
|
||||
});
|
||||
}
|
||||
},
|
||||
[mx, hierarchy, lex, roomsPowerLevels]
|
||||
)
|
||||
[mx, hierarchy, lex, roomsPowerLevels],
|
||||
),
|
||||
);
|
||||
const reorderingSpace = reorderSpaceState.status === AsyncStatus.Loading;
|
||||
|
||||
@@ -346,7 +346,7 @@ function SpaceCardLobby() {
|
||||
// restricted room from one space to another
|
||||
const joinRuleContent = getStateEvent(
|
||||
itemRoom,
|
||||
StateEvent.RoomJoinRules
|
||||
StateEvent.RoomJoinRules,
|
||||
)?.getContent<RoomJoinRulesEventContent>();
|
||||
|
||||
if (joinRuleContent) {
|
||||
@@ -362,7 +362,7 @@ function SpaceCardLobby() {
|
||||
}
|
||||
|
||||
const itemSpaces = Array.from(
|
||||
hierarchy?.find((i) => i.space.roomId === containerParentId)?.rooms ?? []
|
||||
hierarchy?.find((i) => i.space.roomId === containerParentId)?.rooms ?? [],
|
||||
);
|
||||
|
||||
const beforeItem: HierarchyItem | undefined =
|
||||
@@ -398,13 +398,13 @@ function SpaceCardLobby() {
|
||||
containerParentId,
|
||||
StateEvent.SpaceChild as any,
|
||||
{ ...reorder.item.content, order: reorder.orderKey },
|
||||
reorder.item.roomId
|
||||
reorder.item.roomId,
|
||||
);
|
||||
});
|
||||
}
|
||||
},
|
||||
[mx, hierarchy, lex]
|
||||
)
|
||||
[mx, hierarchy, lex],
|
||||
),
|
||||
);
|
||||
const reorderingRoom = reorderRoomState.status === AsyncStatus.Loading;
|
||||
const reordering = reorderingRoom || reorderingSpace;
|
||||
@@ -423,8 +423,8 @@ function SpaceCardLobby() {
|
||||
reorderRoom(item, container.item);
|
||||
}
|
||||
},
|
||||
[reorderRoom, reorderSpace, canDrop]
|
||||
)
|
||||
[reorderRoom, reorderSpace, canDrop],
|
||||
),
|
||||
);
|
||||
|
||||
const handleSpacesFound = useCallback(
|
||||
@@ -436,14 +436,14 @@ function SpaceCardLobby() {
|
||||
setSpacesItem((current) =>
|
||||
produce(current, (draft) => {
|
||||
items.forEach((item) => draft.set(item.room_id, item));
|
||||
})
|
||||
}),
|
||||
);
|
||||
},
|
||||
[setSpaceRooms]
|
||||
[setSpaceRooms],
|
||||
);
|
||||
|
||||
const handleCategoryClick = useCategoryHandler(setClosedCategories, (categoryId) =>
|
||||
closedCategories.has(categoryId)
|
||||
closedCategories.has(categoryId),
|
||||
);
|
||||
|
||||
const handleOpenRoom: MouseEventHandler<HTMLButtonElement> = (evt) => {
|
||||
@@ -462,7 +462,7 @@ function SpaceCardLobby() {
|
||||
const newSpacesContent = makeCinnySpacesContent(mx, newItems);
|
||||
mx.setAccountData(AccountDataEvent.CinnySpaces as any, newSpacesContent as any);
|
||||
},
|
||||
[mx, sidebarItems, sidebarSpaces]
|
||||
[mx, sidebarItems, sidebarSpaces],
|
||||
);
|
||||
|
||||
return (
|
||||
|
||||
@@ -1,7 +1,22 @@
|
||||
import React, { MouseEventHandler, forwardRef, useEffect, useMemo, useRef, useState } from 'react';
|
||||
import { Avatar, Box, IconButton, Line, Menu, MenuItem, PopOut, RectCords, Text, Tooltip, TooltipProvider, config, toRem } from 'folds';
|
||||
import { Icon, Icons } from '../../components/icons';
|
||||
import {
|
||||
Avatar,
|
||||
Box,
|
||||
IconButton,
|
||||
Line,
|
||||
Menu,
|
||||
MenuItem,
|
||||
PopOut,
|
||||
RectCords,
|
||||
Text,
|
||||
Tooltip,
|
||||
TooltipProvider,
|
||||
config,
|
||||
toRem,
|
||||
} from 'folds';
|
||||
import FocusTrap from 'focus-trap-react';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import { Icon, Icons } from '../../components/icons';
|
||||
import { PageHeader } from '../../components/page';
|
||||
import { useSetSetting } from '../../state/hooks/settings';
|
||||
import { settingsAtom } from '../../state/settings';
|
||||
@@ -18,7 +33,7 @@ import { RemoveInaccessiblePrompt } from '../../components/remove-inaccessible-p
|
||||
import { stopPropagation } from '../../utils/keyboard';
|
||||
import { ScreenSize, useScreenSizeContext } from '../../hooks/useScreenSize';
|
||||
import { useBackRoute } from '../../hooks/useBackRoute';
|
||||
import { mxcUrlToHttp } from '../../utils/matrix';
|
||||
import { mxcUrlToHttp, getCanonicalAliasOrRoomId } from '../../utils/matrix';
|
||||
import { useMediaAuthentication } from '../../hooks/useMediaAuthentication';
|
||||
import { useOpenSpaceSettings } from '../../state/hooks/spaceSettings';
|
||||
import { useRoomCreators } from '../../hooks/useRoomCreators';
|
||||
@@ -28,8 +43,6 @@ import { AddExistingModal } from '../add-existing';
|
||||
import { SpeechBubble } from '../../components/speech-bubble/SpeechBubble';
|
||||
import { SpaceOptionsMenu, type OpenAddExistingOptions } from '../space/SpaceOptionsMenu';
|
||||
import type { HierarchyItemSpace } from '../../hooks/useSpaceHierarchy';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import { getCanonicalAliasOrRoomId } from '../../utils/matrix';
|
||||
import { getSpaceFeedPath } from '../../pages/pathUtils';
|
||||
import { shouldShowForumLobby } from '../../utils/room';
|
||||
import { useForumBoardContextOptionally } from '../forum/ForumBoardContext';
|
||||
@@ -176,7 +189,7 @@ const LobbyMenu = forwardRef<HTMLDivElement, LobbyMenuProps>(
|
||||
</Box>
|
||||
</Menu>
|
||||
);
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
type LobbyHeaderProps = {
|
||||
@@ -200,7 +213,7 @@ export function LobbyHeader({ showProfile, showSpaceToolbar, powerLevels }: Lobb
|
||||
const name = useRoomName(space);
|
||||
const avatarMxc = useRoomAvatar(space);
|
||||
const avatarUrl = avatarMxc
|
||||
? mxcUrlToHttp(mx, avatarMxc, useAuthentication, 96, 96, 'crop') ?? undefined
|
||||
? (mxcUrlToHttp(mx, avatarMxc, useAuthentication, 96, 96, 'crop') ?? undefined)
|
||||
: undefined;
|
||||
|
||||
const forumBoard = useForumBoardContextOptionally();
|
||||
@@ -228,11 +241,11 @@ export function LobbyHeader({ showProfile, showSpaceToolbar, powerLevels }: Lobb
|
||||
space: true,
|
||||
parentId: addParent.roomId === space.roomId ? undefined : space.roomId,
|
||||
}),
|
||||
[addParent.roomId, space.roomId]
|
||||
[addParent.roomId, space.roomId],
|
||||
);
|
||||
|
||||
const canEditChildren = Boolean(
|
||||
spacePermissions.stateEvent(StateEvent.SpaceChild, mx.getSafeUserId())
|
||||
spacePermissions.stateEvent(StateEvent.SpaceChild, mx.getSafeUserId()),
|
||||
);
|
||||
|
||||
const handleOpenMenu: MouseEventHandler<HTMLButtonElement> = (evt) => {
|
||||
@@ -259,7 +272,7 @@ export function LobbyHeader({ showProfile, showSpaceToolbar, powerLevels }: Lobb
|
||||
const isInside = (node: Node | null) => {
|
||||
if (!node) return false;
|
||||
return Boolean(
|
||||
menuWrapperRef.current?.contains(node) || menuTriggerElRef.current?.contains(node)
|
||||
menuWrapperRef.current?.contains(node) || menuTriggerElRef.current?.contains(node),
|
||||
);
|
||||
};
|
||||
|
||||
@@ -299,99 +312,99 @@ export function LobbyHeader({ showProfile, showSpaceToolbar, powerLevels }: Lobb
|
||||
if (showSpaceToolbar) {
|
||||
return (
|
||||
<>
|
||||
<PageHeader outlined>
|
||||
<Box grow="Yes" alignItems="Center" gap="300">
|
||||
{showInPageHeader && (
|
||||
<Box shrink="No">
|
||||
<IconButton onClick={goBack} aria-label="Back">
|
||||
<Icon src={Icons.ArrowLeft} />
|
||||
</IconButton>
|
||||
</Box>
|
||||
)}
|
||||
<Avatar size="300" shrink="No">
|
||||
<RoomAvatar
|
||||
roomId={space.roomId}
|
||||
src={avatarUrl}
|
||||
alt={name}
|
||||
renderFallback={() => <Text size="H4">{nameInitials(name)}</Text>}
|
||||
/>
|
||||
</Avatar>
|
||||
<Text size="H3" truncate style={{ minWidth: 0 }}>
|
||||
{name}
|
||||
</Text>
|
||||
<Box grow="Yes" />
|
||||
<TooltipProvider
|
||||
position="Bottom"
|
||||
align="End"
|
||||
offset={4}
|
||||
tooltip={
|
||||
<Tooltip>
|
||||
<Text>More Options</Text>
|
||||
</Tooltip>
|
||||
}
|
||||
>
|
||||
{(triggerRef) => (
|
||||
<IconButton
|
||||
onClick={handleOpenMenu}
|
||||
ref={triggerRef}
|
||||
aria-pressed={!!menuAnchor}
|
||||
variant="SurfaceVariant"
|
||||
fill="None"
|
||||
size="300"
|
||||
radii="300"
|
||||
>
|
||||
<Icon size="400" src={Icons.VerticalDots} />
|
||||
</IconButton>
|
||||
<PageHeader outlined>
|
||||
<Box grow="Yes" alignItems="Center" gap="300">
|
||||
{showInPageHeader && (
|
||||
<Box shrink="No">
|
||||
<IconButton onClick={goBack} aria-label="Back">
|
||||
<Icon src={Icons.ArrowLeft} />
|
||||
</IconButton>
|
||||
</Box>
|
||||
)}
|
||||
</TooltipProvider>
|
||||
<PopOut
|
||||
anchor={menuAnchor}
|
||||
position="Bottom"
|
||||
align="End"
|
||||
content={
|
||||
<FocusTrap
|
||||
focusTrapOptions={{
|
||||
initialFocus: false,
|
||||
returnFocusOnDeactivate: false,
|
||||
onDeactivate: () => setMenuAnchor(undefined),
|
||||
clickOutsideDeactivates: true,
|
||||
isKeyForward: (evt: KeyboardEvent) => evt.key === 'ArrowDown',
|
||||
isKeyBackward: (evt: KeyboardEvent) => evt.key === 'ArrowUp',
|
||||
escapeDeactivates: stopPropagation,
|
||||
}}
|
||||
>
|
||||
<div ref={menuWrapperRef}>
|
||||
<SpeechBubble variant="menu" tail="top" tailX="calc(100% - 22px)">
|
||||
<SpaceOptionsMenu
|
||||
room={space}
|
||||
requestClose={() => setMenuAnchor(undefined)}
|
||||
onOpenAddExisting={(options) => {
|
||||
setAddExisting(options);
|
||||
setMenuAnchor(undefined);
|
||||
}}
|
||||
forumAdd={
|
||||
forumBoard && canEditChildren
|
||||
? {
|
||||
item: addParentItem,
|
||||
showAddSpace: addParent.showAddSpace,
|
||||
}
|
||||
: undefined
|
||||
}
|
||||
/>
|
||||
</SpeechBubble>
|
||||
</div>
|
||||
</FocusTrap>
|
||||
}
|
||||
<Avatar size="300" shrink="No">
|
||||
<RoomAvatar
|
||||
roomId={space.roomId}
|
||||
src={avatarUrl}
|
||||
alt={name}
|
||||
renderFallback={() => <Text size="H4">{nameInitials(name)}</Text>}
|
||||
/>
|
||||
</Avatar>
|
||||
<Text size="H3" truncate style={{ minWidth: 0 }}>
|
||||
{name}
|
||||
</Text>
|
||||
<Box grow="Yes" />
|
||||
<TooltipProvider
|
||||
position="Bottom"
|
||||
align="End"
|
||||
offset={4}
|
||||
tooltip={
|
||||
<Tooltip>
|
||||
<Text>More Options</Text>
|
||||
</Tooltip>
|
||||
}
|
||||
>
|
||||
{(triggerRef) => (
|
||||
<IconButton
|
||||
onClick={handleOpenMenu}
|
||||
ref={triggerRef}
|
||||
aria-pressed={!!menuAnchor}
|
||||
variant="SurfaceVariant"
|
||||
fill="None"
|
||||
size="300"
|
||||
radii="300"
|
||||
>
|
||||
<Icon size="400" src={Icons.VerticalDots} />
|
||||
</IconButton>
|
||||
)}
|
||||
</TooltipProvider>
|
||||
<PopOut
|
||||
anchor={menuAnchor}
|
||||
position="Bottom"
|
||||
align="End"
|
||||
content={
|
||||
<FocusTrap
|
||||
focusTrapOptions={{
|
||||
initialFocus: false,
|
||||
returnFocusOnDeactivate: false,
|
||||
onDeactivate: () => setMenuAnchor(undefined),
|
||||
clickOutsideDeactivates: true,
|
||||
isKeyForward: (evt: KeyboardEvent) => evt.key === 'ArrowDown',
|
||||
isKeyBackward: (evt: KeyboardEvent) => evt.key === 'ArrowUp',
|
||||
escapeDeactivates: stopPropagation,
|
||||
}}
|
||||
>
|
||||
<div ref={menuWrapperRef}>
|
||||
<SpeechBubble variant="menu" tail="top" tailX="calc(100% - 22px)">
|
||||
<SpaceOptionsMenu
|
||||
room={space}
|
||||
requestClose={() => setMenuAnchor(undefined)}
|
||||
onOpenAddExisting={(options) => {
|
||||
setAddExisting(options);
|
||||
setMenuAnchor(undefined);
|
||||
}}
|
||||
forumAdd={
|
||||
forumBoard && canEditChildren
|
||||
? {
|
||||
item: addParentItem,
|
||||
showAddSpace: addParent.showAddSpace,
|
||||
}
|
||||
: undefined
|
||||
}
|
||||
/>
|
||||
</SpeechBubble>
|
||||
</div>
|
||||
</FocusTrap>
|
||||
}
|
||||
/>
|
||||
</Box>
|
||||
</PageHeader>
|
||||
{addExisting && (
|
||||
<AddExistingModal
|
||||
parentId={addExisting.parentId}
|
||||
space={addExisting.space}
|
||||
requestClose={() => setAddExisting(null)}
|
||||
/>
|
||||
</Box>
|
||||
</PageHeader>
|
||||
{addExisting && (
|
||||
<AddExistingModal
|
||||
parentId={addExisting.parentId}
|
||||
space={addExisting.space}
|
||||
requestClose={() => setAddExisting(null)}
|
||||
/>
|
||||
)}
|
||||
)}
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -22,7 +22,9 @@ export function LobbyHero() {
|
||||
const name = useRoomName(space);
|
||||
const topic = useRoomTopic(space);
|
||||
const avatarMxc = useRoomAvatar(space);
|
||||
const avatarUrl = avatarMxc ? mxcUrlToHttp(mx, avatarMxc, useAuthentication, 96, 96, 'crop') ?? undefined : undefined;
|
||||
const avatarUrl = avatarMxc
|
||||
? (mxcUrlToHttp(mx, avatarMxc, useAuthentication, 96, 96, 'crop') ?? undefined)
|
||||
: undefined;
|
||||
|
||||
return (
|
||||
<PageHero
|
||||
|
||||
@@ -1,9 +1,25 @@
|
||||
import React, { MouseEventHandler, ReactNode, useCallback, useRef } from 'react';
|
||||
import { Avatar, Badge, Box, Chip, Line, Overlay, OverlayBackdrop, OverlayCenter, Spinner, Text, Tooltip, TooltipProvider, as, color, toRem } from 'folds';
|
||||
import { Icon, Icons } from '../../components/icons';
|
||||
import {
|
||||
Avatar,
|
||||
Badge,
|
||||
Box,
|
||||
Chip,
|
||||
Line,
|
||||
Overlay,
|
||||
OverlayBackdrop,
|
||||
OverlayCenter,
|
||||
Spinner,
|
||||
Text,
|
||||
Tooltip,
|
||||
TooltipProvider,
|
||||
as,
|
||||
color,
|
||||
toRem,
|
||||
} from 'folds';
|
||||
import FocusTrap from 'focus-trap-react';
|
||||
import { JoinRule, MatrixError, Room } from 'matrix-js-sdk';
|
||||
import { IHierarchyRoom } from 'matrix-js-sdk/lib/@types/spaces';
|
||||
import { Icon, Icons } from '../../components/icons';
|
||||
import { RoomAvatar, RoomIcon } from '../../components/room-avatar';
|
||||
import { SequenceCard } from '../../components/sequence-card';
|
||||
import { useMatrixClient } from '../../hooks/useMatrixClient';
|
||||
@@ -30,7 +46,7 @@ function RoomJoinButton({ roomId, via }: RoomJoinButtonProps) {
|
||||
const mx = useMatrixClient();
|
||||
|
||||
const [joinState, join] = useAsyncCallback<Room, MatrixError, []>(
|
||||
useCallback(() => mx.joinRoom(roomId, { viaServers: via }), [mx, roomId, via])
|
||||
useCallback(() => mx.joinRoom(roomId, { viaServers: via }), [mx, roomId, via]),
|
||||
);
|
||||
|
||||
const canJoin = joinState.status === AsyncStatus.Idle || joinState.status === AsyncStatus.Error;
|
||||
@@ -292,7 +308,7 @@ export const RoomItemCard = as<'div', RoomItemCardProps>(
|
||||
getRoom,
|
||||
...props
|
||||
},
|
||||
ref
|
||||
ref,
|
||||
) => {
|
||||
const mx = useMatrixClient();
|
||||
const useAuthentication = useMediaAuthentication();
|
||||
@@ -383,8 +399,8 @@ export const RoomItemCard = as<'div', RoomItemCardProps>(
|
||||
topic={summary.topic}
|
||||
avatarUrl={
|
||||
summary?.avatar_url
|
||||
? mxcUrlToHttp(mx, summary.avatar_url, useAuthentication, 96, 96, 'crop') ??
|
||||
undefined
|
||||
? (mxcUrlToHttp(mx, summary.avatar_url, useAuthentication, 96, 96, 'crop') ??
|
||||
undefined)
|
||||
: undefined
|
||||
}
|
||||
memberCount={summary.num_joined_members}
|
||||
@@ -400,5 +416,5 @@ export const RoomItemCard = as<'div', RoomItemCardProps>(
|
||||
{after}
|
||||
</SequenceCard>
|
||||
);
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
@@ -67,7 +67,7 @@ export const SpaceHierarchy = forwardRef<HTMLDivElement, SpaceHierarchyProps>(
|
||||
onOpenRoom,
|
||||
onSpacesFound,
|
||||
},
|
||||
ref
|
||||
ref,
|
||||
) => {
|
||||
const mx = useMatrixClient();
|
||||
|
||||
@@ -132,7 +132,9 @@ export const SpaceHierarchy = forwardRef<HTMLDivElement, SpaceHierarchyProps>(
|
||||
return parentToSubRooms;
|
||||
}, [mx, roomItems]);
|
||||
|
||||
let childItems = roomItems?.filter((i) => !subspaces.has(i.roomId) && !globalSubRoomIds.has(i.roomId));
|
||||
let childItems = roomItems?.filter(
|
||||
(i) => !subspaces.has(i.roomId) && !globalSubRoomIds.has(i.roomId),
|
||||
);
|
||||
// Only hide when we know the user cannot edit children. If power levels are
|
||||
// still loading (spacePermissions undefined), keep inaccessible rows visible
|
||||
// so admins can clean them up.
|
||||
@@ -196,7 +198,8 @@ export const SpaceHierarchy = forwardRef<HTMLDivElement, SpaceHierarchyProps>(
|
||||
{childItems && childItems.length > 0 ? (
|
||||
<Box direction="Column" gap="100">
|
||||
{childItems.map((roomItem, index) => {
|
||||
const roomSummary = rooms.get(roomItem.roomId) ?? hierarchySummaries.get(roomItem.roomId);
|
||||
const roomSummary =
|
||||
rooms.get(roomItem.roomId) ?? hierarchySummaries.get(roomItem.roomId);
|
||||
|
||||
const roomPowerLevels = roomsPowerLevels.get(roomItem.roomId) ?? {};
|
||||
|
||||
@@ -249,7 +252,8 @@ export const SpaceHierarchy = forwardRef<HTMLDivElement, SpaceHierarchyProps>(
|
||||
<Box direction="Column" gap="100" style={{ marginLeft: config.space.S400 }}>
|
||||
{subRoomIds.map((subRoomId) => {
|
||||
const subRoom = mx.getRoom(subRoomId);
|
||||
const subRoomSummary = rooms.get(subRoomId) ?? hierarchySummaries.get(subRoomId);
|
||||
const subRoomSummary =
|
||||
rooms.get(subRoomId) ?? hierarchySummaries.get(subRoomId);
|
||||
const subRoomPowerLevels = roomsPowerLevels.get(subRoomId) ?? {};
|
||||
const subRoomItem: HierarchyItemRoom = {
|
||||
roomId: subRoomId,
|
||||
@@ -318,5 +322,5 @@ export const SpaceHierarchy = forwardRef<HTMLDivElement, SpaceHierarchyProps>(
|
||||
)}
|
||||
</Box>
|
||||
);
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
@@ -1,10 +1,24 @@
|
||||
import React, { MouseEventHandler, ReactNode, useCallback, useRef, useState } from 'react';
|
||||
import { Box, Avatar, Text, Chip, as, Badge, toRem, Spinner, PopOut, Menu, MenuItem, RectCords, config } from 'folds';
|
||||
import { Icon, Icons } from '../../components/icons';
|
||||
import {
|
||||
Box,
|
||||
Avatar,
|
||||
Text,
|
||||
Chip,
|
||||
as,
|
||||
Badge,
|
||||
toRem,
|
||||
Spinner,
|
||||
PopOut,
|
||||
Menu,
|
||||
MenuItem,
|
||||
RectCords,
|
||||
config,
|
||||
} from 'folds';
|
||||
import FocusTrap from 'focus-trap-react';
|
||||
import classNames from 'classnames';
|
||||
import { MatrixError, Room } from 'matrix-js-sdk';
|
||||
import { IHierarchyRoom } from 'matrix-js-sdk/lib/@types/spaces';
|
||||
import { Icon, Icons } from '../../components/icons';
|
||||
import { HierarchyItem } from '../../hooks/useSpaceHierarchy';
|
||||
import { useMatrixClient } from '../../hooks/useMatrixClient';
|
||||
import { RoomAvatar } from '../../components/room-avatar';
|
||||
@@ -94,7 +108,7 @@ function UnjoinedSpaceProfile({
|
||||
const mx = useMatrixClient();
|
||||
|
||||
const [joinState, join] = useAsyncCallback<Room, MatrixError, []>(
|
||||
useCallback(() => mx.joinRoom(roomId, { viaServers: via }), [mx, roomId, via])
|
||||
useCallback(() => mx.joinRoom(roomId, { viaServers: via }), [mx, roomId, via]),
|
||||
);
|
||||
|
||||
const canJoin = joinState.status === AsyncStatus.Idle || joinState.status === AsyncStatus.Error;
|
||||
@@ -259,7 +273,7 @@ export const SpaceItemCard = as<'div', SpaceItemCardProps>(
|
||||
getRoom,
|
||||
...props
|
||||
},
|
||||
ref
|
||||
ref,
|
||||
) => {
|
||||
const mx = useMatrixClient();
|
||||
const useAuthentication = useMediaAuthentication();
|
||||
@@ -320,8 +334,14 @@ export const SpaceItemCard = as<'div', SpaceItemCardProps>(
|
||||
name={summary.name || summary.canonical_alias || roomId}
|
||||
avatarUrl={
|
||||
summary?.avatar_url
|
||||
? mxcUrlToHttp(mx, summary.avatar_url, useAuthentication, 96, 96, 'crop') ??
|
||||
undefined
|
||||
? (mxcUrlToHttp(
|
||||
mx,
|
||||
summary.avatar_url,
|
||||
useAuthentication,
|
||||
96,
|
||||
96,
|
||||
'crop',
|
||||
) ?? undefined)
|
||||
: undefined
|
||||
}
|
||||
suggested={content.suggested}
|
||||
@@ -340,5 +360,5 @@ export const SpaceItemCard = as<'div', SpaceItemCardProps>(
|
||||
{after}
|
||||
</Box>
|
||||
);
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user