useObserve.tsとuseTreeManagement.tsの変更をコミット

Jun-Murakami · May 5, 2024 · 881b15d · 881b15d
1 parent 470024f
commit 881b15d
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 18 deletions.
diff --git a/src/hooks/useObserve.ts b/src/hooks/useObserve.ts
@@ -20,8 +20,6 @@ export const useObserve = () => {
   const setIsLoading = useAppStateStore((state) => state.setIsLoading);
   const quickMemoText = useAppStateStore((state) => state.quickMemoText);
   const setQuickMemoText = useAppStateStore((state) => state.setQuickMemoText);
-  const isLoadedItemsFromDb = useAppStateStore((state) => state.isLoadedItemsFromDb);
-  const setIsLoadedItemsFromDb = useAppStateStore((state) => state.setIsLoadedItemsFromDb);
   const isLoadedMemoFromDb = useAppStateStore((state) => state.isLoadedMemoFromDb);
   const setIsLoadedMemoFromDb = useAppStateStore((state) => state.setIsLoadedMemoFromDb);
   const setTreesList = useTreeStateStore((state) => state.setTreesList);
@@ -91,6 +89,7 @@ export const useObserve = () => {
       const serverTimestamp = snapshot.val();
       const currentLocalTimestamp = useAppStateStore.getState().localTimestamp;
       if (serverTimestamp && serverTimestamp > currentLocalTimestamp) {
+        setLocalTimestamp(serverTimestamp);
         const newTreesList = await loadTreesListFromDb(uid);
         setTreesList(newTreesList);
         await saveTreesListIdb(newTreesList);
@@ -127,7 +126,6 @@ export const useObserve = () => {
         }
 
       }
-      setLocalTimestamp(serverTimestamp);
       setIsLoading(false);
     });
   };
@@ -153,15 +151,6 @@ export const useObserve = () => {
       return;
     }
 
-    if (!isLoadedItemsFromDb) {
-      setIsLoadedItemsFromDb(false);
-      return;
-    }
-
-    if (items.length === 0) {
-      return;
-    }
-
     setPrevItems(items);
     const targetTree = currentTree;
     const debounceSave = setTimeout(() => {

diff --git a/src/hooks/useTreeManagement.ts b/src/hooks/useTreeManagement.ts
@@ -25,7 +25,6 @@ export const useTreeManagement = () => {
   const email = useAppStateStore((state) => state.email);
   const isLoading = useAppStateStore((state) => state.isLoading);
   const setIsLoading = useAppStateStore((state) => state.setIsLoading);
-  const setIsLoadedItemsFromDb = useAppStateStore((state) => state.setIsLoadedItemsFromDb);
   const setIsAccordionExpanded = useAppStateStore((state) => state.setIsAccordionExpanded);
   const setIsFocusedTreeName = useAppStateStore((state) => state.setIsFocusedTreeName);
 
@@ -77,7 +76,6 @@ export const useTreeManagement = () => {
           members.push({ uid: member, email: treeData.membersV2[member] });
         }
         setCurrentTreeMembers(members);
-        setIsLoadedItemsFromDb(true);
         setItems(treeData.items);
       }
 

diff --git a/src/store/appStateStore.ts b/src/store/appStateStore.ts
@@ -18,7 +18,6 @@ type AppState = {
   searchKey: string;
   isEditingText: boolean;
   quickMemoText: string;
-  isLoadedItemsFromDb: boolean;
   isLoadedMemoFromDb: boolean;
   setIsOffline: (isOffline: boolean) => void;
   setLocalTimestamp: (localTimestamp: number) => void;
@@ -37,7 +36,6 @@ type AppState = {
   setSearchKey: (searchKey: string) => void;
   setIsEditingText: (isEditingText: boolean) => void;
   setQuickMemoText: (quickMemoText: string) => void;
-  setIsLoadedItemsFromDb: (isLoadedItemsFromDb: boolean) => void;
   setIsLoadedMemoFromDb: (isLoadedMemoFromDb: boolean) => void;
 };
 
@@ -59,7 +57,6 @@ export const useAppStateStore = create<AppState>((set) => ({
   searchKey: '',
   isEditingText: false,
   quickMemoText: '',
-  isLoadedItemsFromDb: false,
   isLoadedMemoFromDb: false,
   setIsOffline: (isOffline) => set({ isOffline }),
   setLocalTimestamp: (localTimestamp) => set({ localTimestamp }),
@@ -78,6 +75,5 @@ export const useAppStateStore = create<AppState>((set) => ({
   setSearchKey: (searchKey) => set({ searchKey }),
   setIsEditingText: (isEditingText) => set({ isEditingText }),
   setQuickMemoText: (quickMemoText) => set({ quickMemoText }),
-  setIsLoadedItemsFromDb: (isLoadedItemsFromDb) => set({ isLoadedItemsFromDb }),
   setIsLoadedMemoFromDb: (isLoadedMemoFromDb) => set({ isLoadedMemoFromDb }),
 }));