diff --git a/src/app/pages/client/direct/Direct.tsx b/src/app/pages/client/direct/Direct.tsx index 6aa367f8..4908f850 100644 --- a/src/app/pages/client/direct/Direct.tsx +++ b/src/app/pages/client/direct/Direct.tsx @@ -28,7 +28,7 @@ import { useDirectCreateSelected } from '../../../hooks/router/useDirectSelected import { VirtualTile } from '../../../components/virtualizer'; import { RoomNavCategoryButton, RoomNavItem } from '../../../features/room-nav'; import { muteChangesAtom } from '../../../state/room-list/mutedRoomList'; -import { closedRoomCategories, makeRoomCategoryId } from '../../../state/closedRoomCategories'; +import { closedNavCategories, makeNavCategoryId } from '../../../state/closedNavCategories'; import { roomToUnreadAtom } from '../../../state/room/roomToUnread'; function DirectEmpty() { @@ -58,7 +58,7 @@ function DirectEmpty() { ); } -const DEFAULT_CATEGORY_ID = makeRoomCategoryId('direct', 'direct'); +const DEFAULT_CATEGORY_ID = makeNavCategoryId('direct', 'direct'); export function Direct() { const mx = useMatrixClient(); const scrollRef = useRef(null); @@ -71,7 +71,7 @@ export function Direct() { const selectedRoomId = useSelectedRoom(); const createSelected = useDirectCreateSelected(); const noRoomToDisplay = directs.length === 0; - const [closedCategories, setClosedCategory] = useAtom(closedRoomCategories); + const [closedCategories, setClosedCategory] = useAtom(closedNavCategories); const sortedDirects = useMemo(() => { const items = Array.from(directs).sort(factoryRoomIdByActivity(mx)); diff --git a/src/app/pages/client/home/Home.tsx b/src/app/pages/client/home/Home.tsx index 4b7e49ef..f303d919 100644 --- a/src/app/pages/client/home/Home.tsx +++ b/src/app/pages/client/home/Home.tsx @@ -36,7 +36,7 @@ import { useMatrixClient } from '../../../hooks/useMatrixClient'; import { VirtualTile } from '../../../components/virtualizer'; import { RoomNavCategoryButton, RoomNavItem } from '../../../features/room-nav'; import { muteChangesAtom } from '../../../state/room-list/mutedRoomList'; -import { closedRoomCategories, makeRoomCategoryId } from '../../../state/closedRoomCategories'; +import { closedNavCategories, makeNavCategoryId } from '../../../state/closedNavCategories'; import { roomToUnreadAtom } from '../../../state/room/roomToUnread'; function HomeEmpty() { @@ -80,7 +80,7 @@ function HomeEmpty() { ); } -const DEFAULT_CATEGORY_ID = makeRoomCategoryId('home', 'room'); +const DEFAULT_CATEGORY_ID = makeNavCategoryId('home', 'room'); export function Home() { const mx = useMatrixClient(); const scrollRef = useRef(null); @@ -94,7 +94,7 @@ export function Home() { const joinSelected = useHomeJoinSelected(); const searchSelected = useHomeSearchSelected(); const noRoomToDisplay = rooms.length === 0; - const [closedCategories, setClosedCategory] = useAtom(closedRoomCategories); + const [closedCategories, setClosedCategory] = useAtom(closedNavCategories); const sortedRooms = useMemo(() => { const items = Array.from(rooms).sort(factoryRoomIdByAtoZ(mx)); diff --git a/src/app/pages/client/space/Space.tsx b/src/app/pages/client/space/Space.tsx index 6aea84aa..05b2aa97 100644 --- a/src/app/pages/client/space/Space.tsx +++ b/src/app/pages/client/space/Space.tsx @@ -28,7 +28,7 @@ import { VirtualTile } from '../../../components/virtualizer'; import { useSpaceHierarchy } from './useSpaceHierarchy'; import { RoomNavCategoryButton, RoomNavItem } from '../../../features/room-nav'; import { muteChangesAtom } from '../../../state/room-list/mutedRoomList'; -import { closedRoomCategories, makeRoomCategoryId } from '../../../state/closedRoomCategories'; +import { closedNavCategories, makeNavCategoryId } from '../../../state/closedNavCategories'; import { roomToUnreadAtom } from '../../../state/room/roomToUnread'; export function Space() { @@ -45,15 +45,15 @@ export function Space() { const lobbySelected = useSpaceLobbySelected(spaceIdOrAlias); const searchSelected = useSpaceSearchSelected(spaceIdOrAlias); - const [closedCategories, setClosedCategory] = useAtom(closedRoomCategories); + const [closedCategories, setClosedCategory] = useAtom(closedNavCategories); const hierarchy = useSpaceHierarchy( space.roomId, useCallback( (spaceRoomId, directCategory) => { if (directCategory) { - return closedCategories.has(makeRoomCategoryId(space.roomId, spaceRoomId, 'direct')); + return closedCategories.has(makeNavCategoryId(space.roomId, spaceRoomId, 'direct')); } - return closedCategories.has(makeRoomCategoryId(space.roomId, spaceRoomId)); + return closedCategories.has(makeNavCategoryId(space.roomId, spaceRoomId)); }, [space.roomId, closedCategories] ), @@ -148,8 +148,8 @@ export function Space() { const dmCategory = lastSpaceId === roomId; lastSpaceId = roomId; const categoryId = dmCategory - ? makeRoomCategoryId(space.roomId, roomId, 'direct') - : makeRoomCategoryId(space.roomId, roomId); + ? makeNavCategoryId(space.roomId, roomId, 'direct') + : makeNavCategoryId(space.roomId, roomId); return ( >( - CLOSED_ROOM_CATEGORY, +const baseClosedNavCategories = atomWithLocalStorage>( + CLOSED_NAV_CATEGORY, (key) => { const arrayValue = getLocalStorageItem(key, []); return new Set(arrayValue); @@ -20,7 +20,7 @@ const baseClosedRoomCategories = atomWithLocalStorage>( } ); -type ClosedRoomCategoriesAction = +type ClosedNavCategoriesAction = | { type: 'PUT'; categoryId: string; @@ -30,13 +30,13 @@ type ClosedRoomCategoriesAction = categoryId: string; }; -export const closedRoomCategories = atom, [ClosedRoomCategoriesAction], undefined>( - (get) => get(baseClosedRoomCategories), +export const closedNavCategories = atom, [ClosedNavCategoriesAction], undefined>( + (get) => get(baseClosedNavCategories), (get, set, action) => { if (action.type === 'DELETE') { set( - baseClosedRoomCategories, - produce(get(baseClosedRoomCategories), (draft) => { + baseClosedNavCategories, + produce(get(baseClosedNavCategories), (draft) => { draft.delete(action.categoryId); }) ); @@ -44,8 +44,8 @@ export const closedRoomCategories = atom, [ClosedRoomCategoriesActio } if (action.type === 'PUT') { set( - baseClosedRoomCategories, - produce(get(baseClosedRoomCategories), (draft) => { + baseClosedNavCategories, + produce(get(baseClosedNavCategories), (draft) => { draft.add(action.categoryId); }) ); @@ -53,4 +53,4 @@ export const closedRoomCategories = atom, [ClosedRoomCategoriesActio } ); -export const makeRoomCategoryId = (...args: string[]): string => args.join('|'); +export const makeNavCategoryId = (...args: string[]): string => args.join('|');