Augment the custom event types and make the dep arrays honest. [skip build]
This commit is contained in:
@@ -18,7 +18,6 @@ import FocusTrap from 'focus-trap-react';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import { Icon, Icons } from '../../../components/icons';
|
||||
import { useMatrixClient } from '../../../hooks/useMatrixClient';
|
||||
import { factoryRoomIdByActivity } from '../../../utils/sort';
|
||||
import {
|
||||
NavButton,
|
||||
NavCategory,
|
||||
@@ -251,15 +250,14 @@ export function Direct() {
|
||||
const [closedCategories, setClosedCategories] = useAtom(useClosedNavCategoriesAtom());
|
||||
const scrollRef = useRef<HTMLDivElement>(null);
|
||||
|
||||
const reorderTrigger = useRoomListReorder(mx, directs);
|
||||
const activityOrder = useRoomListReorder(mx, directs);
|
||||
|
||||
const sortedDirects = useMemo(() => {
|
||||
const items = Array.from(directs).sort(factoryRoomIdByActivity(mx));
|
||||
if (closedCategories.has(DEFAULT_CATEGORY_ID)) {
|
||||
return items.filter((rId) => roomToUnread.has(rId) || rId === selectedRoomId);
|
||||
return activityOrder.filter((rId) => roomToUnread.has(rId) || rId === selectedRoomId);
|
||||
}
|
||||
return items;
|
||||
}, [mx, directs, closedCategories, roomToUnread, selectedRoomId, reorderTrigger]);
|
||||
return activityOrder;
|
||||
}, [activityOrder, closedCategories, roomToUnread, selectedRoomId]);
|
||||
|
||||
const animationRef = useListReorderAnimation(sortedDirects);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user