mirrors/cinny
1
0
Fork 0
mirror of https://github.com/cinnyapp/cinny.git synced 2025-11-04 22:40:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

clean up conflicts

Browse source
This commit is contained in:
Gimle Larpes 2025-09-17 00:06:36 +02:00
parent b9ce2519db
commit 24b3b9cf52
2 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/app/features/lobby/Lobby.tsx
View file

@ -194,16 +194,6 @@ export function Lobby() {
const getRoom = useGetRoom(allJoinedRooms); const getRoom = useGetRoom(allJoinedRooms);
const canEditSpaceChild = useCallback(
(powerLevels: IPowerLevels) =>
powerLevelAPI.canSendStateEvent(
powerLevels,
StateEvent.SpaceChild,
powerLevelAPI.getPowerLevel(powerLevels, mx.getUserId() ?? undefined)
),
[mx]
);
const closedCategoriesCache = useRef(new Map()); const closedCategoriesCache = useRef(new Map());
useEffect(() => { useEffect(() => {
closedCategoriesCache.current.clear(); closedCategoriesCache.current.clear();

7
src/app/features/lobby/SpaceItem.tsx
View file

@ -362,7 +362,6 @@ function AddSpaceButton({ item }: { item: HierarchyItem }) {
</FocusTrap> </FocusTrap>
} }
> >
{item.parentId === undefined ? ( {item.parentId === undefined ? (
<Chip <Chip
variant="SurfaceVariant" variant="SurfaceVariant"
@ -373,9 +372,6 @@ function AddSpaceButton({ item }: { item: HierarchyItem }) {
> >
<Text size="B300">Add Space</Text> <Text size="B300">Add Space</Text>
</Chip> </Chip>
{addExisting && (
<AddExistingModal space parentId={item.roomId} requestClose={() => setAddExisting(false)} />
)}
) : ( ) : (
<TooltipProvider <TooltipProvider
position="Bottom" position="Bottom"
@ -402,6 +398,9 @@ function AddSpaceButton({ item }: { item: HierarchyItem }) {
)} )}
</TooltipProvider> </TooltipProvider>
)} )}
{addExisting && (
<AddExistingModal space parentId={item.roomId} requestClose={() => setAddExisting(false)} />
)}
</PopOut> </PopOut>
); );
} }