@bindu-dashing/dam-solution-v2 5.8.57 → 5.8.59

package/build/MyDrive/FolderTree.js

@@ -179,6 +179,21 @@ function FolderTree({ currentRootId, expandedKeys, selectedKeys, handleExpand, s
         }
         return false;
     };
+    // Helper to find the path (all parent IDs) to a folder in the tree
+    const findPathToFolder = (folderId, tree, path = []) => {
+        for (const folder of tree) {
+            const currentPath = [...path, folder._id];
+            if (folder._id === folderId) {
+                return currentPath;
+            }
+            if (isArray(folder.children)) {
+                const found = findPathToFolder(folderId, folder.children, currentPath);
+                if (found)
+                    return found;
+            }
+        }
+        return null;
+    };
     // ✅ Load on mount & when currentRootId changes
     // Use ref to track previous currentRootId to prevent unnecessary fetches
     const prevCurrentRootIdRef = useRef(null);
@@ -206,11 +221,38 @@ function FolderTree({ currentRootId, expandedKeys, selectedKeys, handleExpand, s
                 if (!existingFolder || !isArray(existingFolder.children) || existingFolder.children.length === 0) {
                     fetchFolderChildren(currentRootId);
                 }
+                // Expand the tree to show the path to the selected folder
+                const pathToFolder = findPathToFolder(currentRootId, folders);
+                if (pathToFolder && pathToFolder.length > 0) {
+                    // Remove the folder itself from the path (we only need to expand parents)
+                    const parentPath = pathToFolder.slice(0, -1);
+                    if (parentPath.length > 0) {
+                        const currentExpanded = isArray(expandedKeys) ? expandedKeys : [expandedKeys].filter(Boolean);
+                        const newExpanded = [...new Set([...currentExpanded, ...parentPath])];
+                        setExpandedKeys(newExpanded);
+                        console.log('## Expanding path to folder:', parentPath);
+                    }
+                }
+                // Update ref to prevent re-triggering
+                prevCurrentRootIdRef.current = currentRootId;
             }
             else {
-                // Folder not in tree, fetch it as the new root
-                prevCurrentRootIdRef.current = currentRootId;
-                fetchFolders(currentRootId);
+                // Folder not in tree - only replace tree if it's the root folder or folders is empty
+                // For subfolders clicked from list view, keep existing tree structure to avoid replacing it
+                if (currentRootId === rootFolderId || folders.length === 0) {
+                    // Root folder or empty tree - fetch as new root
+                    prevCurrentRootIdRef.current = currentRootId;
+                    fetchFolders(currentRootId);
+                }
+                else {
+                    // Subfolder not in tree but tree has content - keep existing tree structure
+                    // The DriveContainer will handle showing the folder contents based on parentFolderId
+                    // This prevents replacing the entire tree when clicking folders from list view
+                    console.log('## Folder not in tree but tree has content - keeping existing tree structure');
+                    prevCurrentRootIdRef.current = currentRootId;
+                    // Don't call fetchFolders here to avoid replacing the tree
+                    // The folder contents will be shown by DriveContainer based on parentFolderId
+                }
             }
         }
         else if (globalSearch !== globalSearchValue && currentRootId === rootFolderId) {

package/package.json

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