@agorapulse/ui-components 20.1.5 → 20.1.7

package/fesm2022/agorapulse-ui-components-nav-selector.mjs

@@ -403,6 +403,18 @@ const computeNumberOfDisplayableChildrenOnUnfold = (entry) => {
     }
     return 0;
 };
+const computeSelectableUids = (entries) => {
+    return entries.flatMap(entry => computeSelectableUidsByEntry(entry));
+};
+const computeSelectableUidsByEntry = (entry) => {
+    if (isInternalNavSelectorEntryALeaf(entry) && !entry.disabled) {
+        return [entry.uid, ...entry.details.filter(detail => !detail.hidden).map(detail => detail.uid)];
+    }
+    if (isInternalNavSelectorEntryANode(entry)) {
+        return [entry.uid, ...entry.children.flatMap(child => computeSelectableUidsByEntry(child))];
+    }
+    return [];
+};
 
 /**
  * Class to handle the folding and unfolding of nav selector entries.
@@ -1718,15 +1730,47 @@ class NavSelectorState {
         if (!leaf.selectable) {
             return;
         }
-        if (this.multipleModeEnabled()) {
-            this.entries.update(entries => NavSelectorMultiSelect.selectInMultipleMode(entries, leaf.uid));
-        }
-        else {
-            this.entries.update(entries => NavSelectorSingleSelect.select(entries, leaf.uid));
-        }
+        this.entries.update(entries => {
+            let updatedEntries = entries;
+            if (leaf.foldable) {
+                const options = this.getFoldingOptions();
+                const unfoldedLeafUids = this.findUnfoldedLeafUids(entries);
+                for (const uid of unfoldedLeafUids) {
+                    updatedEntries = NavSelectorFolding.fold(updatedEntries, uid, options);
+                }
+            }
+            if (this.multipleModeEnabled()) {
+                return NavSelectorMultiSelect.selectInMultipleMode(updatedEntries, leaf.uid);
+            }
+            else {
+                return NavSelectorSingleSelect.select(updatedEntries, leaf.uid);
+            }
+        });
     }
     onLeafToggleFolding(leaf) {
-        this.entries.update(entries => NavSelectorFolding.toggleFolding(entries, leaf.uid, this.getFoldingOptions()));
+        this.entries.update(entries => {
+            const options = this.getFoldingOptions();
+            // Find all unfolded leaves and fold them first
+            let updatedEntries = entries;
+            const unfoldedLeafUids = this.findUnfoldedLeafUids(entries);
+            for (const uid of unfoldedLeafUids) {
+                updatedEntries = NavSelectorFolding.fold(updatedEntries, uid, options);
+            }
+            // Then unfold the clicked leaf
+            return NavSelectorFolding.toggleFolding(updatedEntries, leaf.uid, options);
+        });
+    }
+    findUnfoldedLeafUids(entries) {
+        const unfoldedUids = [];
+        for (const entry of entries) {
+            if (isInternalNavSelectorEntryALeaf(entry) && entry.foldable && !entry.folded) {
+                unfoldedUids.push(entry.uid);
+            }
+            else if (isInternalNavSelectorEntryANode(entry)) {
+                unfoldedUids.push(...this.findUnfoldedLeafUids(entry.children));
+            }
+        }
+        return unfoldedUids;
     }
     onLeafDetailClicked(leafDetail) {
         this.entries.update(entries => NavSelectorSingleSelect.select(entries, leafDetail.uid));
@@ -1776,12 +1820,18 @@ class NavSelectorState {
                 entries = NavSelectorMultiSelect.selectInMultipleMode(entries, uid);
             }
             for (const uid of uidToSelect) {
-                entries = NavSelectorFolding.unfoldParents(entries, uid, { multipleMode: true, minified: !this.expanded() });
+                entries = NavSelectorFolding.unfoldParents(entries, uid, {
+                    multipleMode: true,
+                    minified: !this.expanded(),
+                });
             }
         }
         else {
             entries = NavSelectorSingleSelect.select(entries, uids[0]);
-            entries = NavSelectorFolding.unfoldParents(entries, uids[0], { multipleMode: false, minified: !this.expanded() });
+            entries = NavSelectorFolding.unfoldParents(entries, uids[0], {
+                multipleMode: false,
+                minified: !this.expanded(),
+            });
         }
         this.entries.set(entries);
     }
@@ -2783,8 +2833,9 @@ class NavSelectorComponent {
             untracked(() => this.navSelectorState.updateDetailsDisplayedLimit(detailsDisplayedLimit));
         });
         effect(() => {
-            const selectedEntryUids = this.selectedEntryUids();
             const isInit = !!this.navSelectorState.entries().length;
+            const selectableEntryUids = computeSelectableUids(this.navSelectorState.entries());
+            const selectedEntryUids = this.selectedEntryUids().filter(uid => selectableEntryUids.includes(uid));
             untracked(() => isInit && this.navSelectorState.onSelectionChange(selectedEntryUids));
         });
         effect(() => {