schummar-table 0.10.1 → 0.10.4

package/dist/es/index.js

@@ -541,6 +541,35 @@ function filterColumns(state) {
     draft.activeColumns = orderBy(columns.filter((column) => !hiddenColumns.has(column.id)), [(column) => columnOrder.indexOf(column.id)]);
   }, { runNow: true }), [state]);
 }
+function normalizeExpanded(table) {
+  useEffect(() => table.addReaction((state) => [state.props.expandOnlyOne, state.expanded, state.itemsById], ([expandOnlyOne, , itemsById], state) => {
+    var _a, _b;
+    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;
+      }
+    } 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;
+          }
+        }
+      }
+    }
+    if (hasChanged) {
+      (_b = (_a = state.props).onExpandedChange) == null ? void 0 : _b.call(_a, new Set(expanded));
+    }
+  }, { runNow: true }), [table]);
+}
 function syncSelections(table) {
   useEffect(() => table.addReaction((state) => [state.props.selectSyncChildren, state.selection, state.activeItems], ([selectSyncChildren, selection, activeItems], state) => {
     if (!selectSyncChildren)
@@ -585,6 +614,7 @@ function useTableState(_props) {
     });
   }, []);
   filterColumns(state);
+  normalizeExpanded(state);
   calcItems(state);
   syncSelections(state);
   cleanupState(state);
@@ -1266,17 +1296,18 @@ function ExpandControl({
       activeItemsById
     } = table.getState();
     const newExpanded = new Set(expanded);
-    if (expandOnlyOne)
+    if (expandOnlyOne) {
       newExpanded.clear();
-    if (isExpanded)
-      newExpanded.delete(itemId);
-    else {
-      newExpanded.add(itemId);
       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 == null ? void 0 : onExpandedChange(newExpanded);
     if (!controlledExpanded) {
       table.update((state) => {
@@ -1698,7 +1729,11 @@ const TableInner = memo(function TableInner2({
       }), /* @__PURE__ */ jsxs("div", {
         className: classes == null ? void 0 : classes.headerCell,
         css: [defaultClasses.headerCell, stickyHeader && defaultClasses.sticky, stickyHeader instanceof Object && stickyHeader],
-        children: [enableSelection && /* @__PURE__ */ jsx(SelectComponent, {}), enableColumnSelection && /* @__PURE__ */ jsx(ColumnSelection, {}), enableExport && /* @__PURE__ */ jsx(Export$1, {}), /* @__PURE__ */ jsx(ResizeHandleView, {})]
+        children: [enableSelection && /* @__PURE__ */ jsx(SelectComponent, {}), enableColumnSelection && /* @__PURE__ */ jsx(ColumnSelection, {}), enableExport && /* @__PURE__ */ jsx(Export$1, {}), /* @__PURE__ */ jsx("div", {
+          css: {
+            flex: 1
+          }
+        }), /* @__PURE__ */ jsx(ResizeHandleView, {})]
       }), /* @__PURE__ */ jsx(ColumnHeaderContext.Provider, {
         children: activeColumns.map((column) => /* @__PURE__ */ jsx(ColumnContext.Provider, {
           value: column.id,