@bigbinary/neeto-folders-frontend 2.0.42 → 2.0.43

package/dist/v2/components.js

@@ -1713,17 +1713,46 @@ var FoldersTree = function FoldersTree(_ref) {
   var treeData = useMemo(function () {
     return _toAtomsTreeData(buildTreeWithItems(folders, config));
   }, [folders, config.items]);
+  var treeMap = useMemo(function () {
+    return treeData ? treeToMap(treeData, "sid") : {};
+  }, [treeData]);
+
+  // Only hand react-arborist keys that actually exist in the current tree. A
+  // missing/undefined selection — no folder in the URL, or a stale sid during
+  // SPA navigation before the tree updates — makes its selectMulti call
+  // identify(undefined) and throw "Cannot read properties of undefined".
+  var selectedKeys = activeFolderSid && treeMap[activeFolderSid] ? [activeFolderSid] : [];
   var updateExpandedKeys = function updateExpandedKeys() {
-    var _activeFolder$meta;
     if (!treeData) return;
-    // When active folder changes from external sources, update expanded keys to auto expand tree.
-    var updatedExpandedKeys = new Set(expandedKeysSet);
-    var map = treeToMap(treeData, "sid");
-    var activeFolder = map[activeFolderSid];
-    var parentSid = activeFolder === null || activeFolder === void 0 || (_activeFolder$meta = activeFolder.meta) === null || _activeFolder$meta === void 0 || (_activeFolder$meta = _activeFolder$meta.parent) === null || _activeFolder$meta === void 0 ? void 0 : _activeFolder$meta.sid;
-    if (parentSid && !expandedKeysSet.has(parentSid)) {
-      updatedExpandedKeys.add(parentSid);
+
+    // Expand every ancestor of the active folder (not just the immediate
+    // parent) so the full path to it is visible — folders nest up to
+    // config.maxDepth. Walk up via treeMap, guarding against cycles.
+    var ancestorSids = [];
+    var seen = new Set();
+    var node = treeMap[activeFolderSid];
+    while ((_node = node) !== null && _node !== void 0 && (_node = _node.meta) !== null && _node !== void 0 && (_node = _node.parent) !== null && _node !== void 0 && _node.sid && !seen.has(node.meta.parent.sid)) {
+      var _node;
+      var parentSid = node.meta.parent.sid;
+      seen.add(parentSid);
+      ancestorSids.push(parentSid);
+      node = treeMap[parentSid];
     }
+    if (!ancestorSids.length) return;
+
+    // Functional update so the newly-expanded ancestors merge with the latest
+    // expansion state (e.g. folders the user opened manually); bail out when
+    // they're all already expanded to avoid a needless re-render.
+    setExpandedKeysSet(function (prev) {
+      if (ancestorSids.every(function (sid) {
+        return prev.has(sid);
+      })) return prev;
+      var next = new Set(prev);
+      ancestorSids.forEach(function (sid) {
+        return next.add(sid);
+      });
+      return next;
+    });
   };
   var handleExpand = function handleExpand(keys, _ref2) {
     var expanded = _ref2.expanded,
@@ -1761,7 +1790,7 @@ var FoldersTree = function FoldersTree(_ref) {
     className: "neeto-sidebar-folders-tree",
     indent: 20,
     rowHeight: 24,
-    selectedKeys: [activeFolderSid],
+    selectedKeys: selectedKeys,
     showLine: false,
     switcherIcon: SwitcherIcon,
     titleRender: function titleRender(node) {