@bindu-dashing/dam-solution-v2 5.8.21 → 5.8.22
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.
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
import FolderTree from "./FolderTree";
|
|
3
|
-
import { useEffect, useState } from "react";
|
|
3
|
+
import { useEffect, useState, useRef } from "react";
|
|
4
4
|
import { useDamConfig } from "../hocs/DamConfigContext";
|
|
5
5
|
import { isArray, map } from "lodash";
|
|
6
6
|
import DriveContainer from "./DriveContainer";
|
|
@@ -14,25 +14,30 @@ export default function MyDriveMainContainer({ folders, setFolders }) {
|
|
|
14
14
|
const [selectedKeys, setSelectedKeys] = useState([]);
|
|
15
15
|
const [expandedKeys, setExpandedKeys] = useState([]);
|
|
16
16
|
const [globalSearch, setGlobalSearch] = useState("");
|
|
17
|
+
// Track if we've initialized from params to prevent rootFolderId from overriding
|
|
18
|
+
const initializedFromParamsRef = useRef(false);
|
|
17
19
|
useEffect(() => {
|
|
18
20
|
// Priority: URL params > Props from ParamsProvider > rootFolderId from config
|
|
19
21
|
if (params === null || params === void 0 ? void 0 : params.folderId) {
|
|
20
22
|
console.log('## Setting selectedKeys from params.folderId:', params.folderId);
|
|
21
23
|
setSelectedKeys(params.folderId);
|
|
24
|
+
initializedFromParamsRef.current = true;
|
|
22
25
|
}
|
|
23
|
-
else if (!(params === null || params === void 0 ? void 0 : params.folderId) && rootFolderId) {
|
|
24
|
-
//
|
|
25
|
-
console.log('## No params.folderId, using rootFolderId:', rootFolderId);
|
|
26
|
+
else if (!(params === null || params === void 0 ? void 0 : params.folderId) && rootFolderId && !selectedKeys && !initializedFromParamsRef.current) {
|
|
27
|
+
// Only set to rootFolderId if no params AND selectedKeys is empty AND we haven't initialized from params
|
|
28
|
+
console.log('## No params.folderId and no selectedKeys, using rootFolderId:', rootFolderId);
|
|
26
29
|
setSelectedKeys(rootFolderId);
|
|
27
30
|
}
|
|
28
|
-
}, [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
|
|
31
|
+
}, [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]);
|
|
32
|
+
// Priority: selectedKeys > params > rootFolderId
|
|
33
|
+
// Never fall back to rootFolderId if params.folderId is set
|
|
29
34
|
const currentRootId = isArray(selectedKeys)
|
|
30
35
|
? selectedKeys.length
|
|
31
36
|
? selectedKeys[selectedKeys.length - 1]
|
|
32
|
-
: rootFolderId
|
|
37
|
+
: ((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)
|
|
33
38
|
: selectedKeys
|
|
34
39
|
? selectedKeys
|
|
35
|
-
: rootFolderId;
|
|
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);
|
|
36
41
|
console.log('## MyDriveMainContainer - selectedKeys:', selectedKeys, 'currentRootId:', currentRootId, 'rootFolderId:', rootFolderId);
|
|
37
42
|
const handleExpand = (keys) => {
|
|
38
43
|
setExpandedKeys(map(keys, (k) => k.toString()));
|