useAttachedFileとuseObserveの変更を追加

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

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/src/hooks/useAttachedFile.ts b/src/hooks/useAttachedFile.ts
@@ -4,7 +4,6 @@ import { useDialogStore } from '../store/dialogStore';
 import { useAppStateStore } from '../store/appStateStore';
 import { useTreeStateStore } from '../store/treeStateStore';
 import { UniqueIdentifier } from '@dnd-kit/core';
-import { useDatabase } from './useDatabase';
 import { Capacitor } from '@capacitor/core';
 import { Filesystem, Directory } from '@capacitor/filesystem';
 import { Share } from '@capacitor/share';
@@ -14,9 +13,6 @@ export const useAttachedFile = () => {
   const showDialog = useDialogStore((state) => state.showDialog);
   const items = useTreeStateStore((state) => state.items);
   const setItems = useTreeStateStore((state) => state.setItems);
-  const currentTree = useTreeStateStore((state) => state.currentTree);
-
-  const { saveItemsDb } = useDatabase();
 
   // ファイルをFirebaseStorageにアップロードする処理 ------------------------------------------------
   const uploadFile = async (file: File, targetTree: UniqueIdentifier): Promise<string | undefined> => {
@@ -113,7 +109,6 @@ export const useAttachedFile = () => {
           const newItems: TreeItem[] = JSON.parse(JSON.stringify(items));
           const updatedItems = await deleteAttachedFile(newItems, fileName);
           setItems(updatedItems);
-          await saveItemsDb(updatedItems, currentTree!);
         }
       }
     }
@@ -147,7 +142,6 @@ export const useAttachedFile = () => {
       const updatedItems = await deleteAttachedFile(newItems, fileName);
       if (!isSilent) {
         setItems(updatedItems);
-        await saveItemsDb(updatedItems, currentTree!);
       }
       setIsLoading(false);
     } catch (error) {
@@ -162,7 +156,6 @@ export const useAttachedFile = () => {
         const newItems: TreeItem[] = JSON.parse(JSON.stringify(items));
         const updatedItems = await deleteAttachedFile(newItems, fileName);
         setItems(updatedItems);
-        await saveItemsDb(updatedItems, currentTree!);
       }
     }
   };

diff --git a/src/hooks/useObserve.ts b/src/hooks/useObserve.ts
@@ -20,6 +20,8 @@ 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);
@@ -151,6 +153,15 @@ 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,6 +25,7 @@ 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);
 
@@ -76,6 +77,7 @@ 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,6 +18,7 @@ type AppState = {
   searchKey: string;
   isEditingText: boolean;
   quickMemoText: string;
+  isLoadedItemsFromDb: boolean;
   isLoadedMemoFromDb: boolean;
   setIsOffline: (isOffline: boolean) => void;
   setLocalTimestamp: (localTimestamp: number) => void;
@@ -36,6 +37,7 @@ type AppState = {
   setSearchKey: (searchKey: string) => void;
   setIsEditingText: (isEditingText: boolean) => void;
   setQuickMemoText: (quickMemoText: string) => void;
+  setIsLoadedItemsFromDb: (isLoadedItemsFromDb: boolean) => void;
   setIsLoadedMemoFromDb: (isLoadedMemoFromDb: boolean) => void;
 };
 
@@ -57,6 +59,7 @@ export const useAppStateStore = create<AppState>((set) => ({
   searchKey: '',
   isEditingText: false,
   quickMemoText: '',
+  isLoadedItemsFromDb: false,
   isLoadedMemoFromDb: false,
   setIsOffline: (isOffline) => set({ isOffline }),
   setLocalTimestamp: (localTimestamp) => set({ localTimestamp }),
@@ -75,5 +78,6 @@ 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 }),
 }));