schummar-table 0.10.4 → 0.10.5

package/dist/cjs/index.js

@@ -545,30 +545,34 @@ function filterColumns(state) {
 }
 function normalizeExpanded(table) {
   react.useEffect(() => table.addReaction((state) => [state.props.expandOnlyOne, state.expanded, state.itemsById], ([expandOnlyOne, , itemsById], state) => {
-    var _a, _b;
+    var _a, _b, _c, _d, _e;
     let expanded = state.expanded;
-    let last, lastItem;
     let hasChanged = false;
-    if (expandOnlyOne && (last = [...expanded][expanded.size - 1]) && (lastItem = itemsById.get(last))) {
-      const ancestors = getAncestors(itemsById, lastItem);
-      if ([...expanded].slice(0, -1).some((id) => !ancestors.has(id))) {
-        expanded = state.expanded = new Set([...ancestors].concat(last));
-        hasChanged = true;
+    const allAncestors = [...expanded].map((id) => {
+      const item = itemsById.get(id);
+      return {
+        id,
+        ancestors: item ? getAncestors(itemsById, item) : /* @__PURE__ */ new Set()
+      };
+    });
+    if (expandOnlyOne) {
+      const withMostAncestors = orderBy(allAncestors, [(x) => x.ancestors.size], ["desc"])[0];
+      if ([...expanded].some((id) => id !== (withMostAncestors == null ? void 0 : withMostAncestors.id) && !(withMostAncestors == null ? void 0 : withMostAncestors.ancestors.has(id)))) {
+        expanded = state.expanded = (_a = withMostAncestors == null ? void 0 : withMostAncestors.ancestors) != null ? _a : /* @__PURE__ */ new Set();
+        (_c = (_b = state.props).onExpandedChange) == null ? void 0 : _c.call(_b, expanded);
+        return;
       }
-    } else {
-      for (const id of expanded) {
-        const item = itemsById.get(id);
-        const ancestors = item && getAncestors(itemsById, item);
-        for (const ancestor of ancestors != null ? ancestors : []) {
-          if (!expanded.has(ancestor)) {
-            expanded.add(ancestor);
-            hasChanged = true;
-          }
+    }
+    for (const { ancestors } of allAncestors) {
+      for (const ancestor of ancestors != null ? ancestors : []) {
+        if (!expanded.has(ancestor)) {
+          expanded.add(ancestor);
+          hasChanged = true;
         }
       }
     }
     if (hasChanged) {
-      (_b = (_a = state.props).onExpandedChange) == null ? void 0 : _b.call(_a, new Set(expanded));
+      (_e = (_d = state.props).onExpandedChange) == null ? void 0 : _e.call(_d, new Set(expanded));
     }
   }, { runNow: true }), [table]);
 }
@@ -616,8 +620,8 @@ function useTableState(_props) {
     });
   }, []);
   filterColumns(state);
-  normalizeExpanded(state);
   calcItems(state);
+  normalizeExpanded(state);
   syncSelections(state);
   cleanupState(state);
   react.useEffect(() => {