@bindu-dashing/dam-solution-v2 5.8.28 → 5.8.29

package/build/MyDrive/FolderTree.js

@@ -168,14 +168,53 @@ function FolderTree({ currentRootId, expandedKeys, selectedKeys, handleExpand, s
             });
         }
     });
+    // Helper to check if a folder exists in the current tree
+    const folderExistsInTree = (folderId, tree) => {
+        for (const folder of tree) {
+            if (folder._id === folderId) {
+                return true;
+            }
+            if (isArray(folder.children)) {
+                if (folderExistsInTree(folderId, folder.children)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    };
     // ✅ Load on mount & when currentRootId changes
     // Use ref to track previous currentRootId to prevent unnecessary fetches
     const prevCurrentRootIdRef = useRef(null);
     useEffect(() => {
         if (currentRootId && currentRootId !== prevCurrentRootIdRef.current) {
             console.log('## FolderTree useEffect - currentRootId changed from', prevCurrentRootIdRef.current, 'to', currentRootId, 'rootFolderId:', rootFolderId);
-            prevCurrentRootIdRef.current = currentRootId;
-            fetchFolders(currentRootId);
+            // If the folder is already in the tree, don't replace the entire tree
+            // Just fetch its children if needed
+            if (folders.length > 0 && folderExistsInTree(currentRootId, folders)) {
+                console.log('## Folder already in tree, fetching children only');
+                // Check if folder already has children loaded
+                const findFolder = (tree, id) => {
+                    for (const folder of tree) {
+                        if (folder._id === id)
+                            return folder;
+                        if (isArray(folder.children)) {
+                            const found = findFolder(folder.children, id);
+                            if (found)
+                                return found;
+                        }
+                    }
+                    return null;
+                };
+                const existingFolder = findFolder(folders, currentRootId);
+                if (!existingFolder || !isArray(existingFolder.children) || existingFolder.children.length === 0) {
+                    fetchFolderChildren(currentRootId);
+                }
+            }
+            else {
+                // Folder not in tree, fetch it as the new root
+                prevCurrentRootIdRef.current = currentRootId;
+                fetchFolders(currentRootId);
+            }
         }
         else if (globalSearch !== globalSearchValue && currentRootId === rootFolderId) {
             // Only refetch on global search change if we're on root folder

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bindu-dashing/dam-solution-v2",
-  "version": "5.8.28",
+  "version": "5.8.29",
   "dependencies": {
     "@ant-design/icons": "^5.0.1",
     "@emoji-mart/data": "^1.2.1",