mirror of
https://github.com/cinnyapp/cinny.git
synced 2025-02-15 10:00:06 +00:00
fix crash when adding existing room to space
This commit is contained in:
parent
653ddd9f11
commit
4c9c76f7ef
|
@ -26,6 +26,7 @@ import { useStore } from '../../hooks/useStore';
|
||||||
import { roomToParentsAtom } from '../../state/room/roomToParents';
|
import { roomToParentsAtom } from '../../state/room/roomToParents';
|
||||||
import { useDirects, useRooms, useSpaces } from '../../state/hooks/roomList';
|
import { useDirects, useRooms, useSpaces } from '../../state/hooks/roomList';
|
||||||
import { allRoomsAtom } from '../../state/room-list/roomList';
|
import { allRoomsAtom } from '../../state/room-list/roomList';
|
||||||
|
import { mDirectAtom } from '../../state/mDirectList';
|
||||||
|
|
||||||
function SpaceAddExistingContent({ roomId, spaces: onlySpaces }) {
|
function SpaceAddExistingContent({ roomId, spaces: onlySpaces }) {
|
||||||
const mountStore = useStore(roomId);
|
const mountStore = useStore(roomId);
|
||||||
|
@ -36,9 +37,10 @@ function SpaceAddExistingContent({ roomId, spaces: onlySpaces }) {
|
||||||
const [searchIds, setSearchIds] = useState(null);
|
const [searchIds, setSearchIds] = useState(null);
|
||||||
const mx = initMatrix.matrixClient;
|
const mx = initMatrix.matrixClient;
|
||||||
const roomIdToParents = useAtomValue(roomToParentsAtom);
|
const roomIdToParents = useAtomValue(roomToParentsAtom);
|
||||||
|
const mDirects = useAtomValue(mDirectAtom);
|
||||||
const spaces = useSpaces(mx, allRoomsAtom);
|
const spaces = useSpaces(mx, allRoomsAtom);
|
||||||
const rooms = useRooms(mx, allRoomsAtom);
|
const rooms = useRooms(mx, allRoomsAtom, mDirects);
|
||||||
const directs = useDirects(mx, allRoomsAtom);
|
const directs = useDirects(mx, allRoomsAtom, mDirects);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const roomIds = onlySpaces ? [...spaces] : [...rooms, ...directs];
|
const roomIds = onlySpaces ? [...spaces] : [...rooms, ...directs];
|
||||||
|
@ -152,9 +154,9 @@ function SpaceAddExistingContent({ roomId, spaces: onlySpaces }) {
|
||||||
name={room.name}
|
name={room.name}
|
||||||
parentName={parents}
|
parentName={parents}
|
||||||
roomId={rId}
|
roomId={rId}
|
||||||
imageSrc={directs.has(rId) ? imageSrc : null}
|
imageSrc={mDirects.has(rId) ? imageSrc : null}
|
||||||
iconSrc={
|
iconSrc={
|
||||||
directs.has(rId) ? null : joinRuleToIconSrc(room.getJoinRule(), room.isSpaceRoom())
|
mDirects.has(rId) ? null : joinRuleToIconSrc(room.getJoinRule(), room.isSpaceRoom())
|
||||||
}
|
}
|
||||||
isUnread={false}
|
isUnread={false}
|
||||||
notificationCount={0}
|
notificationCount={0}
|
||||||
|
|
Loading…
Reference in a new issue