re-arrange state atom

src/app/organisms/room/RoomInput.tsx

@@ -68,7 +68,7 @@ import {
   roomIdToReplyDraftAtomFamily,
   roomIdToUploadItemsAtomFamily,
   roomUploadAtomFamily,
-} from '../../state/roomInputDrafts';
+} from '../../state/room/roomInputDrafts';
 import { UploadCardRenderer } from '../../components/upload-card';
 import {
   UploadBoard,
@@ -307,7 +307,7 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
       mx.sendMessage(roomId, content);
       resetEditor(editor);
       resetEditorHistory(editor);
-      setReplyDraft();
+      setReplyDraft(undefined);
       sendTypingStatus(false);
     }, [mx, roomId, editor, replyDraft, sendTypingStatus, setReplyDraft, isMarkdown, commands]);
 
@@ -319,7 +319,7 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
         }
         if (isKeyHotkey('escape', evt)) {
           evt.preventDefault();
-          setReplyDraft();
+          setReplyDraft(undefined);
         }
       },
       [submit, setReplyDraft, enterForNewline]
@@ -475,7 +475,7 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
                   style={{ padding: `${config.space.S200} ${config.space.S300} 0` }}
                 >
                   <IconButton
-                    onClick={() => setReplyDraft()}
+                    onClick={() => setReplyDraft(undefined)}
                     variant="SurfaceVariant"
                     size="300"
                     radii="300"

src/app/organisms/room/RoomTimeline.tsx

@@ -132,7 +132,7 @@ import { getResizeObserverEntry, useResizeObserver } from '../../hooks/useResize
 import * as css from './RoomTimeline.css';
 import { inSameDay, minuteDifference, timeDayMonthYear, today, yesterday } from '../../utils/time';
 import { createMentionElement, isEmptyEditor, moveCursor } from '../../components/editor';
-import { roomIdToReplyDraftAtomFamily } from '../../state/roomInputDrafts';
+import { roomIdToReplyDraftAtomFamily } from '../../state/room/roomInputDrafts';
 import { usePowerLevelsAPI } from '../../hooks/usePowerLevels';
 import { MessageEvent } from '../../../types/matrix/room';
 import initMatrix from '../../../client/initMatrix';

src/app/organisms/room/msgContent.ts

@@ -10,7 +10,7 @@ import {
   loadVideoElement,
 } from '../../utils/dom';
 import { encryptFile, getImageInfo, getThumbnailContent, getVideoInfo } from '../../utils/matrix';
-import { TUploadItem } from '../../state/roomInputDrafts';
+import { TUploadItem } from '../../state/room/roomInputDrafts';
 import { encodeBlurHash } from '../../utils/blurHash';
 import { scaleYDimension } from '../../utils/common';
 

src/app/state/hooks/inviteList.ts

@@ -3,9 +3,9 @@ import { selectAtom } from 'jotai/utils';
 import { MatrixClient } from 'matrix-js-sdk';
 import { useCallback } from 'react';
 import { isDirectInvite, isRoom, isSpace, isUnsupportedRoom } from '../../utils/room';
-import { compareRoomsEqual } from '../utils';
+import { compareRoomsEqual } from '../room-list/utils';
 import { mDirectAtom } from '../mDirectList';
-import { allInvitesAtom } from '../inviteList';
+import { allInvitesAtom } from '../room-list/inviteList';
 
 export const useSpaceInvites = (mx: MatrixClient, invitesAtom: typeof allInvitesAtom) => {
   const selector = useCallback(

src/app/state/hooks/roomList.ts

@@ -3,9 +3,9 @@ import { selectAtom } from 'jotai/utils';
 import { MatrixClient } from 'matrix-js-sdk';
 import { useCallback } from 'react';
 import { isRoom, isSpace, isUnsupportedRoom } from '../../utils/room';
-import { compareRoomsEqual } from '../utils';
+import { compareRoomsEqual } from '../room-list/utils';
 import { mDirectAtom } from '../mDirectList';
-import { allRoomsAtom } from '../roomList';
+import { allRoomsAtom } from '../room-list/roomList';
 
 export const useSpaces = (mx: MatrixClient, roomsAtom: typeof allRoomsAtom) => {
   const selector = useCallback(

src/app/state/hooks/useBindAtoms.ts

@@ -1,10 +1,10 @@
 import { MatrixClient } from 'matrix-js-sdk';
-import { allInvitesAtom, useBindAllInvitesAtom } from '../inviteList';
-import { allRoomsAtom, useBindAllRoomsAtom } from '../roomList';
+import { allInvitesAtom, useBindAllInvitesAtom } from '../room-list/inviteList';
+import { allRoomsAtom, useBindAllRoomsAtom } from '../room-list/roomList';
 import { mDirectAtom, useBindMDirectAtom } from '../mDirectList';
-import { muteChangesAtom, mutedRoomsAtom, useBindMutedRoomsAtom } from '../mutedRoomList';
-import { roomToUnreadAtom, useBindRoomToUnreadAtom } from '../roomToUnread';
-import { roomToParentsAtom, useBindRoomToParentsAtom } from '../roomToParents';
+import { muteChangesAtom, mutedRoomsAtom, useBindMutedRoomsAtom } from '../room-list/mutedRoomList';
+import { roomToUnreadAtom, useBindRoomToUnreadAtom } from '../room/roomToUnread';
+import { roomToParentsAtom, useBindRoomToParentsAtom } from '../room/roomToParents';
 
 export const useBindAtoms = (mx: MatrixClient) => {
   useBindMDirectAtom(mx, mDirectAtom);

src/app/state/room-list/inviteList.ts

@@ -1,7 +1,7 @@
 import { atom, WritableAtom } from 'jotai';
 import { MatrixClient } from 'matrix-js-sdk';
 import { useMemo } from 'react';
-import { Membership } from '../../types/matrix/room';
+import { Membership } from '../../../types/matrix/room';
 import { RoomsAction, useBindRoomsWithMembershipsAtom } from './utils';
 
 const baseRoomsAtom = atom<string[]>([]);

src/app/state/room-list/mutedRoomList.ts

@@ -1,8 +1,8 @@
 import { atom, useSetAtom } from 'jotai';
 import { ClientEvent, IPushRule, IPushRules, MatrixClient, MatrixEvent } from 'matrix-js-sdk';
 import { useEffect } from 'react';
-import { MuteChanges } from '../../types/matrix/room';
-import { findMutedRule, isMutedRule } from '../utils/room';
+import { MuteChanges } from '../../../types/matrix/room';
+import { findMutedRule, isMutedRule } from '../../utils/room';
 
 export type MutedRoomsUpdate =
   | {

src/app/state/room-list/roomList.ts

@@ -1,7 +1,7 @@
 import { atom } from 'jotai';
 import { MatrixClient } from 'matrix-js-sdk';
 import { useMemo } from 'react';
-import { Membership } from '../../types/matrix/room';
+import { Membership } from '../../../types/matrix/room';
 import { RoomsAction, useBindRoomsWithMembershipsAtom } from './utils';
 
 const baseRoomsAtom = atom<string[]>([]);

src/app/state/room-list/utils.ts

@@ -1,7 +1,7 @@
 import { useSetAtom, WritableAtom } from 'jotai';
 import { ClientEvent, MatrixClient, Room, RoomEvent } from 'matrix-js-sdk';
 import { useEffect } from 'react';
-import { Membership } from '../../types/matrix/room';
+import { Membership } from '../../../types/matrix/room';
 
 export type RoomsAction =
   | {

src/app/state/room/roomInputDrafts.ts

@@ -2,9 +2,9 @@ import { atom } from 'jotai';
 import { atomFamily } from 'jotai/utils';
 import { Descendant } from 'slate';
 import { EncryptedAttachmentInfo } from 'browser-encrypt-attachment';
-import { TListAtom, createListAtom } from './list';
-import { createUploadAtomFamily } from './upload';
-import { TUploadContent } from '../utils/matrix';
+import { TListAtom, createListAtom } from '../list';
+import { createUploadAtomFamily } from '../upload';
+import { TUploadContent } from '../../utils/matrix';
 
 export const roomUploadAtomFamily = createUploadAtomFamily();
 

src/app/state/room/roomToParents.ts

@@ -9,14 +9,14 @@ import {
   RoomStateEvent,
 } from 'matrix-js-sdk';
 import { useEffect } from 'react';
-import { Membership, RoomToParents, StateEvent } from '../../types/matrix/room';
+import { Membership, RoomToParents, StateEvent } from '../../../types/matrix/room';
 import {
   getRoomToParents,
   getSpaceChildren,
   isSpace,
   isValidChild,
   mapParentWithChildren,
-} from '../utils/room';
+} from '../../utils/room';
 
 export type RoomToParentsAction =
   | {

src/app/state/room/roomToUnread.ts

@@ -9,7 +9,7 @@ import {
   NotificationType,
   RoomToUnread,
   UnreadInfo,
-} from '../../types/matrix/room';
+} from '../../../types/matrix/room';
 import {
   getAllParents,
   getNotificationType,
@@ -17,7 +17,7 @@ import {
   getUnreadInfos,
   isNotificationEvent,
   roomHaveUnread,
-} from '../utils/room';
+} from '../../utils/room';
 import { roomToParentsAtom } from './roomToParents';
 
 export type RoomToUnreadAction =

src/app/state/selectedRoom.ts

@@ -1,3 +0,0 @@
-import { atom } from 'jotai';
-
-export const selectedRoomAtom = atom<string | undefined>(undefined);

src/app/state/selectedTab.ts

@@ -1,8 +0,0 @@
-import { atom } from 'jotai';
-
-export enum SidebarTab {
-  Home = 'Home',
-  People = 'People',
-}
-
-export const selectedTabAtom = atom<SidebarTab | string>(SidebarTab.Home);