From 6abd8ff6bf2632bfcf0287d8a8840856a03c88a9 Mon Sep 17 00:00:00 2001 From: Kris Hu Date: Mon, 14 Jul 2025 17:45:58 +0800 Subject: [PATCH] fix(to): load space list first --- src/app/pages/client/ToRoomEvent.tsx | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/app/pages/client/ToRoomEvent.tsx b/src/app/pages/client/ToRoomEvent.tsx index 6ca34c74..ebe1bef9 100644 --- a/src/app/pages/client/ToRoomEvent.tsx +++ b/src/app/pages/client/ToRoomEvent.tsx @@ -1,16 +1,31 @@ import React, { useEffect } from "react"; import { useParams } from "react-router-dom"; import { useRoomNavigate } from "../../hooks/useRoomNavigate"; +import { useMatrixClient } from "../../hooks/useMatrixClient"; +import { useAtomValue } from "jotai"; +import { roomToParentsAtom } from "../../state/room/roomToParents"; +import { mDirectAtom } from "../../state/mDirectList"; export function ToRoomEvent() { + const mx = useMatrixClient(); + const roomToParents = useAtomValue(roomToParentsAtom); + const mDirects = useAtomValue(mDirectAtom); const { room_id, event_id } = useParams(); const { navigateRoom } = useRoomNavigate(); useEffect(() => { - if (!room_id) { return; } + if (!room_id || !mx) { return; } + if (!roomToParents.size || !mDirects.size) { return; } navigateRoom(room_id, event_id); - }, [room_id, event_id, navigateRoom]); + }, [ + mx, + roomToParents, + mDirects, + room_id, + event_id, + navigateRoom + ]); return null; }