@bindu-dashing/dam-solution-v2 5.8.29 → 5.8.30
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -317,7 +317,6 @@ function FolderTree({ currentRootId, expandedKeys, selectedKeys, handleExpand, s
|
|
|
317
317
|
setSelectedKeys(selected);
|
|
318
318
|
if (get(selected, "length") > 0) {
|
|
319
319
|
const selectedId = selected[get(selected, "length", 0) - 1];
|
|
320
|
-
// navigate(SUBFOLDERS_SCREEN.replace(":folderId", selectedId));
|
|
321
320
|
console.log('## selectedId', selectedId);
|
|
322
321
|
// If the selected folder is not the root folder, fetch its children
|
|
323
322
|
if (selectedId !== rootFolderId && selectedId !== currentRootId) {
|
|
@@ -38,9 +38,17 @@ export default function MyDriveMainContainer({ folders, setFolders }) {
|
|
|
38
38
|
: selectedKeys
|
|
39
39
|
? selectedKeys
|
|
40
40
|
: ((params === null || params === void 0 ? void 0 : params.folderId) || (params === null || params === void 0 ? void 0 : params.id) || (params === null || params === void 0 ? void 0 : params.parentId) || rootFolderId);
|
|
41
|
-
|
|
41
|
+
// Get the currently selected folder ID for DriveContainer
|
|
42
|
+
const selectedFolderId = isArray(selectedKeys)
|
|
43
|
+
? selectedKeys.length
|
|
44
|
+
? selectedKeys[selectedKeys.length - 1]
|
|
45
|
+
: ((params === null || params === void 0 ? void 0 : params.folderId) || (params === null || params === void 0 ? void 0 : params.id) || (params === null || params === void 0 ? void 0 : params.parentId) || rootFolderId)
|
|
46
|
+
: selectedKeys
|
|
47
|
+
? selectedKeys
|
|
48
|
+
: ((params === null || params === void 0 ? void 0 : params.folderId) || (params === null || params === void 0 ? void 0 : params.id) || (params === null || params === void 0 ? void 0 : params.parentId) || rootFolderId);
|
|
49
|
+
console.log('## MyDriveMainContainer - selectedKeys:', selectedKeys, 'currentRootId:', currentRootId, 'selectedFolderId:', selectedFolderId, 'rootFolderId:', rootFolderId);
|
|
42
50
|
const handleExpand = (keys) => {
|
|
43
51
|
setExpandedKeys(map(keys, (k) => k.toString()));
|
|
44
52
|
};
|
|
45
|
-
return (_jsxs(FoldersProvider, { value: { setFolders, folders, globalSearch }, children: [_jsx(FolderTree, { currentRootId: currentRootId, handleExpand: handleExpand, setSelectedKeys: setSelectedKeys, expandedKeys: expandedKeys, selectedKeys: selectedKeys, folders: folders, setExpandedKeys: setExpandedKeys, setFolders: setFolders, setGlobalSearch: setGlobalSearch, globalSearch: globalSearch }), _jsx("div", { className: "md-lib-h-[inherit] md-lib-overflow-x-auto", children: _jsx(DriveContainer, { globalSearch: globalSearch, setGlobalSearch: setGlobalSearch }) })] }));
|
|
53
|
+
return (_jsxs(FoldersProvider, { value: { setFolders, folders, globalSearch }, children: [_jsx(FolderTree, { currentRootId: currentRootId, handleExpand: handleExpand, setSelectedKeys: setSelectedKeys, expandedKeys: expandedKeys, selectedKeys: selectedKeys, folders: folders, setExpandedKeys: setExpandedKeys, setFolders: setFolders, setGlobalSearch: setGlobalSearch, globalSearch: globalSearch }), _jsx("div", { className: "md-lib-h-[inherit] md-lib-overflow-x-auto", children: _jsx(DriveContainer, { parentFolderId: selectedFolderId, globalSearch: globalSearch, setGlobalSearch: setGlobalSearch }) })] }));
|
|
46
54
|
}
|