schummar-table 0.7.0 → 0.7.1

package/dist/es/index.js

@@ -308,10 +308,11 @@ function calcItems(state) {
     state2.activeColumns,
     state2.expanded
   ], ([items = [], id, parentId, revealFiltered, sort, filters, filterValues, activeColumns], draft) => {
-    const tableItems = items.map((item) => __spreadProps(__spreadValues({}, item), {
+    const tableItems = items.map((item) => ({
       id: id(item),
       parentId: parentId == null ? void 0 : parentId(item),
-      children: []
+      children: [],
+      value: item
     }));
     let sorted;
     if (sort.length === 0) {
@@ -326,7 +327,7 @@ function calcItems(state) {
           direction: sort2.direction
         }));
       }).filter(Boolean);
-      sorted = orderBy(tableItems, selectors.map((x) => x.selector), selectors.map((x) => x.direction));
+      sorted = orderBy(tableItems, selectors.map((x) => (item) => x.selector(item.value)), selectors.map((x) => x.direction));
     }
     const lookup = /* @__PURE__ */ new Map();
     for (const item of sorted) {
@@ -360,7 +361,7 @@ function calcItems(state) {
         if (filterValue === void 0 || !filter.isActive(filterValue))
           return true;
         const filterBy = (_a = filter.filterBy) != null ? _a : (x) => x;
-        const value = filterBy(column.value(item), item);
+        const value = filterBy(column.value(item.value), item.value);
         return castArray(value).some((value2) => filter.test(filterValue, value2));
       }));
       if (isActive && item.parentId !== void 0) {
@@ -868,7 +869,7 @@ function Export$1() {
       activeColumns,
       activeItems
     } = table.getState();
-    const data = [activeColumns.map((column) => String(column.id)), ...activeItems.map((item) => activeColumns.map((column) => column.exportCell(column.value(item), item)))];
+    const data = [activeColumns.map((column) => String(column.id)), ...activeItems.map((item) => activeColumns.map((column) => column.exportCell(column.value(item.value), item.value)))];
     return csvExport(data, options);
   };
   const copy = () => {
@@ -1088,11 +1089,11 @@ const Cell = memo(function Cell2({
   const className2 = useTheme((t) => cx(...calcClassNames(t.classes, item, rowIndex)));
   if (!column || !item)
     return null;
-  const content = column.renderCell(column.value(item), item);
+  const content = column.renderCell(column.value(item.value), item.value);
   return jsx("div", {
     className: className2,
     css: [defaultClasses.cell, columnStyleOverride],
-    children: wrapCell(content, column.value(item), item, rowIndex)
+    children: wrapCell(content, column.value(item.value), item.value, rowIndex)
   });
 });
 function ExpandControl({
@@ -1246,10 +1247,10 @@ const Row = memo(function Row2({
       className: cx(...calcClassNames(classes, item, rowIndex)),
       indent: item ? getAncestors(state.activeItemsById, item).size : 0,
       hasChildren: !!(item == null ? void 0 : item.children.length),
-      hasDeferredChildren: item && ((_b = (_a = state.props).hasDeferredChildren) == null ? void 0 : _b.call(_a, item)),
+      hasDeferredChildren: item && ((_b = (_a = state.props).hasDeferredChildren) == null ? void 0 : _b.call(_a, item.value)),
       columnIds: state.activeColumns.map((column) => column.id),
       enableSelection: state.props.enableSelection,
-      rowAction: state.props.rowAction instanceof Function ? item ? state.props.rowAction(item, rowIndex) : null : state.props.rowAction
+      rowAction: state.props.rowAction instanceof Function ? item ? state.props.rowAction(item.value, rowIndex) : null : state.props.rowAction
     };
   });
   useEffect(() => {
@@ -2627,7 +2628,7 @@ function SelectFilter(_m) {
     const column = state.activeColumns.find((column2) => column2.id === columnId);
     if (!column)
       return [];
-    return uniq(flatMap(state.items, (item) => castArray(filterBy(column.value(item), item))));
+    return uniq(flatMap(state.items, (item) => castArray(filterBy(column.value(item.value), item.value))));
   });
   const [query, setQuery] = useState("");
   const filtered = options.filter((option) => !query || stringValue(option).toLowerCase().includes(query.toLowerCase()));