fix: when collapsing an item, keep ancestors expanded

schummar · Aug 12, 2022 · 546df72 · 546df72
1 parent 8ae5af1
commit 546df72
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/components/expandControl.tsx b/src/components/expandControl.tsx
@@ -21,17 +21,22 @@ export function ExpandControl<T>({ itemId, hasDeferredChildren }: { itemId: Id;
     } = table.getState();
 
     const newExpanded = new Set(expanded);
-    if (expandOnlyOne) newExpanded.clear();
-    if (isExpanded) newExpanded.delete(itemId);
-    else {
-      newExpanded.add(itemId);
+
+    if (expandOnlyOne) {
+      newExpanded.clear();
 
       const item = activeItemsById.get(itemId);
       for (const ancestor of item ? getAncestors(activeItemsById, item) : []) {
         newExpanded.add(ancestor);
       }
     }
 
+    if (isExpanded) {
+      newExpanded.delete(itemId);
+    } else {
+      newExpanded.add(itemId);
+    }
+
     onExpandedChange?.(newExpanded);
 
     if (!controlledExpanded) {