@tanstack/table-core 8.0.0-alpha.20 → 8.0.0-alpha.23

package/build/cjs/utils/columnFilterRowsFn.js

@@ -12,17 +12,18 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var filterRowsUtils = require('./filterRowsUtils.js');
+
 function columnFilterRowsFn(instance, rowModel) {
   var columnFilters = instance.getState().columnFilters;
-  var newFilteredFlatRows = [];
-  var newFilteredRowsById = {};
-  var filterFromChildrenUp = instance.options.filterFromChildrenUp;
+  var filterFromLeafRows = instance.options.filterFromLeafRows;
 
   var filterRows = function filterRows(rowsToFilter, depth) {
-    columnFilters.forEach(function (_ref) {
-      var columnId = _ref.id,
-          filterValue = _ref.value;
-      // Find the columnFilters column
+    for (var i = 0; i < columnFilters.length; i++) {
+      var _columnFilters$i = columnFilters[i],
+          columnId = _columnFilters$i.id,
+          filterValue = _columnFilters$i.value; // Find the columnFilters column
+
       var column = instance.getColumn(columnId);
 
       if (!column) {
@@ -34,11 +35,13 @@ function columnFilterRowsFn(instance, rowModel) {
       }
 
       if (depth === 0) {
-        var preFilteredRows = [].concat(rowsToFilter);
+        (function () {
+          var preFilteredRows = [].concat(rowsToFilter);
 
-        column.getPreFilteredRows = function () {
-          return preFilteredRows;
-        };
+          column.getPreFilteredRows = function () {
+            return preFilteredRows;
+          };
+        })();
       }
 
       var filterFn = instance.getColumnFilterFn(column.id);
@@ -48,83 +51,22 @@ function columnFilterRowsFn(instance, rowModel) {
           console.warn("Could not find a valid 'column.filterType' for column with the ID: " + column.id + ".");
         }
 
-        return;
+        continue;
       } // Pass the rows, id, filterValue and column to the filterFn
       // to get the filtered rows back
 
 
       rowsToFilter = filterFn(rowsToFilter, [columnId], filterValue);
-    });
-    return rowsToFilter;
-  };
-
-  if (filterFromChildrenUp) {
-    var _recurseFilterRows = function _recurseFilterRows(rowsToFilter, depth) {
-      if (depth === void 0) {
-        depth = 0;
-      }
-
-      // Filter from children up
-      rowsToFilter = rowsToFilter.filter(function (row) {
-        var _row$subRows;
-
-        if (!((_row$subRows = row.subRows) != null && _row$subRows.length)) {
-          return true;
-        }
-
-        row.subRows = _recurseFilterRows(row.subRows, depth + 1);
-        return row.subRows.length;
-      });
-      rowsToFilter = filterRows(rowsToFilter, depth); // Apply the filter to any subRows
-
-      rowsToFilter.forEach(function (row) {
-        newFilteredFlatRows.push(row);
-        newFilteredRowsById[row.id] = row;
-      });
-      return rowsToFilter;
-    };
-
-    return {
-      rows: _recurseFilterRows(rowModel.rows),
-      flatRows: newFilteredFlatRows,
-      rowsById: newFilteredRowsById
-    };
-  } // Filters top level and nested rows
-
-
-  var recurseFilterRows = function recurseFilterRows(rowsToFilter, depth) {
-    if (depth === void 0) {
-      depth = 0;
     }
 
-    // Filter from parents downward
-    rowsToFilter = filterRows(rowsToFilter, depth); // Apply the filter to any subRows
-    // We technically could do this recursively in the above loop,
-    // but that would severely hinder the API for the user, since they
-    // would be required to do that recursion in some scenarios
-
-    rowsToFilter.forEach(function (row) {
-      newFilteredFlatRows.push(row);
-      newFilteredRowsById[row.id] = row;
-
-      if (!filterFromChildrenUp) {
-        var _row$subRows2;
-
-        if (!((_row$subRows2 = row.subRows) != null && _row$subRows2.length)) {
-          return;
-        }
-
-        row.subRows = recurseFilterRows(row.subRows, depth + 1);
-      }
-    });
     return rowsToFilter;
   };
 
-  return {
-    rows: recurseFilterRows(rowModel.rows),
-    flatRows: newFilteredFlatRows,
-    rowsById: newFilteredRowsById
-  };
+  if (filterFromLeafRows) {
+    return filterRowsUtils.filterRowModelFromLeafs(rowModel.rows, filterRows, instance);
+  }
+
+  return filterRowsUtils.filterRowModelFromRoot(rowModel.rows, filterRows, instance);
 }
 
 exports.columnFilterRowsFn = columnFilterRowsFn;

package/build/cjs/utils/columnFilterRowsFn.js.map

@@ -1 +1 @@
-{"version":3,"file":"columnFilterRowsFn.js","sources":["../../../src/utils/columnFilterRowsFn.ts"],"sourcesContent":["import {\n  AnyGenerics,\n  TableInstance,\n  Row,\n  RowModel,\n  PartialGenerics,\n} from '../types'\n\nexport function columnFilterRowsFn<TGenerics extends AnyGenerics>(\n  instance: TableInstance<TGenerics>,\n  rowModel: RowModel<TGenerics>\n): RowModel<TGenerics> {\n  const columnFilters = instance.getState().columnFilters\n\n  const newFilteredFlatRows: Row<TGenerics>[] = []\n  const newFilteredRowsById: Record<string, Row<TGenerics>> = {}\n\n  const filterFromChildrenUp = instance.options.filterFromChildrenUp\n\n  const filterRows = (rowsToFilter: Row<TGenerics>[], depth: number) => {\n    columnFilters.forEach(({ id: columnId, value: filterValue }) => {\n      // Find the columnFilters column\n      const column = instance.getColumn(columnId)\n\n      if (!column) {\n        if (process.env.NODE_ENV !== 'production') {\n          console.warn(`Table: Could not find a column with id: ${columnId}`)\n        }\n        throw new Error()\n      }\n\n      if (depth === 0) {\n        const preFilteredRows = [...rowsToFilter]\n        column.getPreFilteredRows = () => preFilteredRows\n      }\n\n      const filterFn = instance.getColumnFilterFn(column.id)\n\n      if (!filterFn) {\n        if (process.env.NODE_ENV !== 'production') {\n          console.warn(\n            `Could not find a valid 'column.filterType' for column with the ID: ${column.id}.`\n          )\n        }\n        return\n      }\n\n      // Pass the rows, id, filterValue and column to the filterFn\n      // to get the filtered rows back\n      rowsToFilter = filterFn(rowsToFilter, [columnId], filterValue)\n    })\n\n    return rowsToFilter\n  }\n\n  if (filterFromChildrenUp) {\n    const recurseFilterRows = (rowsToFilter: Row<TGenerics>[], depth = 0) => {\n      // Filter from children up\n      rowsToFilter = rowsToFilter.filter(row => {\n        if (!row.subRows?.length) {\n          return true\n        }\n\n        row.subRows = recurseFilterRows(row.subRows, depth + 1)\n\n        return row.subRows.length\n      })\n\n      rowsToFilter = filterRows(rowsToFilter, depth)\n\n      // Apply the filter to any subRows\n      rowsToFilter.forEach(row => {\n        newFilteredFlatRows.push(row)\n        newFilteredRowsById[row.id] = row\n      })\n\n      return rowsToFilter\n    }\n\n    return {\n      rows: recurseFilterRows(rowModel.rows),\n      flatRows: newFilteredFlatRows,\n      rowsById: newFilteredRowsById,\n    }\n  }\n\n  // Filters top level and nested rows\n  const recurseFilterRows = (rowsToFilter: Row<TGenerics>[], depth = 0) => {\n    // Filter from parents downward\n    rowsToFilter = filterRows(rowsToFilter, depth)\n\n    // Apply the filter to any subRows\n    // We technically could do this recursively in the above loop,\n    // but that would severely hinder the API for the user, since they\n    // would be required to do that recursion in some scenarios\n    rowsToFilter.forEach(row => {\n      newFilteredFlatRows.push(row)\n      newFilteredRowsById[row.id] = row\n\n      if (!filterFromChildrenUp) {\n        if (!row.subRows?.length) {\n          return\n        }\n\n        row.subRows = recurseFilterRows(row.subRows, depth + 1)\n      }\n    })\n\n    return rowsToFilter\n  }\n\n  return {\n    rows: recurseFilterRows(rowModel.rows),\n    flatRows: newFilteredFlatRows,\n    rowsById: newFilteredRowsById,\n  }\n}\n"],"names":["columnFilterRowsFn","instance","rowModel","columnFilters","getState","newFilteredFlatRows","newFilteredRowsById","filterFromChildrenUp","options","filterRows","rowsToFilter","depth","forEach","columnId","id","filterValue","value","column","getColumn","process","env","NODE_ENV","console","warn","Error","preFilteredRows","getPreFilteredRows","filterFn","getColumnFilterFn","recurseFilterRows","filter","row","subRows","length","push","rows","flatRows","rowsById"],"mappings":"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"}
+{"version":3,"file":"columnFilterRowsFn.js","sources":["../../../src/utils/columnFilterRowsFn.ts"],"sourcesContent":["import { AnyGenerics, TableInstance, Row, RowModel } from '../types'\nimport {\n  filterRowModelFromLeafs,\n  filterRowModelFromRoot,\n} from './filterRowsUtils'\n\nexport function columnFilterRowsFn<TGenerics extends AnyGenerics>(\n  instance: TableInstance<TGenerics>,\n  rowModel: RowModel<TGenerics>\n): RowModel<TGenerics> {\n  const columnFilters = instance.getState().columnFilters\n  const filterFromLeafRows = instance.options.filterFromLeafRows\n\n  const filterRows = (rowsToFilter: Row<TGenerics>[], depth: number) => {\n    for (let i = 0; i < columnFilters.length; i++) {\n      const { id: columnId, value: filterValue } = columnFilters[i]\n      // Find the columnFilters column\n      const column = instance.getColumn(columnId)\n\n      if (!column) {\n        if (process.env.NODE_ENV !== 'production') {\n          console.warn(`Table: Could not find a column with id: ${columnId}`)\n        }\n        throw new Error()\n      }\n\n      if (depth === 0) {\n        const preFilteredRows = [...rowsToFilter]\n        column.getPreFilteredRows = () => preFilteredRows\n      }\n\n      const filterFn = instance.getColumnFilterFn(column.id)\n\n      if (!filterFn) {\n        if (process.env.NODE_ENV !== 'production') {\n          console.warn(\n            `Could not find a valid 'column.filterType' for column with the ID: ${column.id}.`\n          )\n        }\n        continue\n      }\n\n      // Pass the rows, id, filterValue and column to the filterFn\n      // to get the filtered rows back\n      rowsToFilter = filterFn(rowsToFilter, [columnId], filterValue)\n    }\n\n    return rowsToFilter\n  }\n\n  if (filterFromLeafRows) {\n    return filterRowModelFromLeafs(rowModel.rows, filterRows, instance)\n  }\n\n  return filterRowModelFromRoot(rowModel.rows, filterRows, instance)\n}\n"],"names":["columnFilterRowsFn","instance","rowModel","columnFilters","getState","filterFromLeafRows","options","filterRows","rowsToFilter","depth","i","length","columnId","id","filterValue","value","column","getColumn","process","env","NODE_ENV","console","warn","Error","preFilteredRows","getPreFilteredRows","filterFn","getColumnFilterFn","filterRowModelFromLeafs","rows","filterRowModelFromRoot"],"mappings":";;;;;;;;;;;;;;;;AAMO,SAASA,kBAAT,CACLC,QADK,EAELC,QAFK,EAGgB;AACrB,MAAMC,aAAa,GAAGF,QAAQ,CAACG,QAAT,GAAoBD,aAA1C;AACA,MAAME,kBAAkB,GAAGJ,QAAQ,CAACK,OAAT,CAAiBD,kBAA5C;;AAEA,MAAME,UAAU,GAAG,SAAbA,UAAa,CAACC,YAAD,EAAiCC,KAAjC,EAAmD;AACpE,SAAK,IAAIC,CAAC,GAAG,CAAb,EAAgBA,CAAC,GAAGP,aAAa,CAACQ,MAAlC,EAA0CD,CAAC,EAA3C,EAA+C;AAC7C,6BAA6CP,aAAa,CAACO,CAAD,CAA1D;AAAA,UAAYE,QAAZ,oBAAQC,EAAR;AAAA,UAA6BC,WAA7B,oBAAsBC,KAAtB,CAD6C;;AAG7C,UAAMC,MAAM,GAAGf,QAAQ,CAACgB,SAAT,CAAmBL,QAAnB,CAAf;;AAEA,UAAI,CAACI,MAAL,EAAa;AACX,YAAIE,OAAO,CAACC,GAAR,CAAYC,QAAZ,KAAyB,YAA7B,EAA2C;AACzCC,UAAAA,OAAO,CAACC,IAAR,8CAAwDV,QAAxD;AACD;;AACD,cAAM,IAAIW,KAAJ,EAAN;AACD;;AAED,UAAId,KAAK,KAAK,CAAd,EAAiB;AAAA;AACf,cAAMe,eAAe,aAAOhB,YAAP,CAArB;;AACAQ,UAAAA,MAAM,CAACS,kBAAP,GAA4B;AAAA,mBAAMD,eAAN;AAAA,WAA5B;AAFe;AAGhB;;AAED,UAAME,QAAQ,GAAGzB,QAAQ,CAAC0B,iBAAT,CAA2BX,MAAM,CAACH,EAAlC,CAAjB;;AAEA,UAAI,CAACa,QAAL,EAAe;AACb,YAAIR,OAAO,CAACC,GAAR,CAAYC,QAAZ,KAAyB,YAA7B,EAA2C;AACzCC,UAAAA,OAAO,CAACC,IAAR,yEACwEN,MAAM,CAACH,EAD/E;AAGD;;AACD;AACD,OA1B4C;AA6B7C;;;AACAL,MAAAA,YAAY,GAAGkB,QAAQ,CAAClB,YAAD,EAAe,CAACI,QAAD,CAAf,EAA2BE,WAA3B,CAAvB;AACD;;AAED,WAAON,YAAP;AACD,GAnCD;;AAqCA,MAAIH,kBAAJ,EAAwB;AACtB,WAAOuB,uCAAuB,CAAC1B,QAAQ,CAAC2B,IAAV,EAAgBtB,UAAhB,EAA4BN,QAA5B,CAA9B;AACD;;AAED,SAAO6B,sCAAsB,CAAC5B,QAAQ,CAAC2B,IAAV,EAAgBtB,UAAhB,EAA4BN,QAA5B,CAA7B;AACD;;;;"}

package/build/cjs/utils/filterRowsUtils.js

@@ -0,0 +1,100 @@
+/**
+ * table-core
+ *
+ * Copyright (c) TanStack
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE.md file in the root directory of this source tree.
+ *
+ * @license MIT
+ */
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+function filterRowModelFromLeafs(rowsToFilter, filterRows, instance) {
+  var newFilteredFlatRows = [];
+  var newFilteredRowsById = {};
+
+  var recurseFilterRows = function recurseFilterRows(rowsToFilter, depth) {
+    if (depth === void 0) {
+      depth = 0;
+    }
+
+    rowsToFilter = rowsToFilter.slice(); // Filter from children up first
+
+    for (var i = 0; i < rowsToFilter.length; i++) {
+      var _row$subRows;
+
+      var row = rowsToFilter[i];
+
+      if (!((_row$subRows = row.subRows) != null && _row$subRows.length)) {
+        continue;
+      }
+
+      rowsToFilter[i] = instance.createRow(row.id, row.original, row.index, row.depth, row.values);
+      rowsToFilter[i].subRows = recurseFilterRows(row.subRows, depth + 1);
+
+      if (!rowsToFilter[i].subRows.length) {
+        rowsToFilter.splice(i, 1);
+        i--;
+      }
+    }
+
+    rowsToFilter = filterRows(rowsToFilter, depth); // Apply the filter to any subRows
+
+    rowsToFilter.forEach(function (row) {
+      newFilteredFlatRows.push(row);
+      newFilteredRowsById[row.id] = row;
+    });
+    return rowsToFilter;
+  };
+
+  return {
+    rows: recurseFilterRows(rowsToFilter),
+    flatRows: newFilteredFlatRows,
+    rowsById: newFilteredRowsById
+  };
+}
+function filterRowModelFromRoot(rowsToFilter, filterRows, instance) {
+  var newFilteredFlatRows = [];
+  var newFilteredRowsById = {}; // Filters top level and nested rows
+
+  var recurseFilterRows = function recurseFilterRows(rowsToFilter, depth) {
+    if (depth === void 0) {
+      depth = 0;
+    }
+
+    // Filter from parents downward first
+    rowsToFilter = filterRows(rowsToFilter, depth); // Apply the filter to any subRows
+
+    for (var i = 0; i < rowsToFilter.length; i++) {
+      var _row$subRows2;
+
+      var row = rowsToFilter[i];
+      newFilteredFlatRows.push(row);
+      newFilteredRowsById[row.id] = row;
+
+      if (!((_row$subRows2 = row.subRows) != null && _row$subRows2.length)) {
+        rowsToFilter.splice(i, 1);
+        i--;
+        continue;
+      }
+
+      rowsToFilter[i] = instance.createRow(row.id, row.original, row.index, row.depth, row.values);
+      rowsToFilter[i].subRows = recurseFilterRows(row.subRows, depth + 1);
+    }
+
+    return rowsToFilter;
+  };
+
+  return {
+    rows: recurseFilterRows(rowsToFilter),
+    flatRows: newFilteredFlatRows,
+    rowsById: newFilteredRowsById
+  };
+}
+
+exports.filterRowModelFromLeafs = filterRowModelFromLeafs;
+exports.filterRowModelFromRoot = filterRowModelFromRoot;
+//# sourceMappingURL=filterRowsUtils.js.map

package/build/cjs/utils/filterRowsUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"filterRowsUtils.js","sources":["../../../src/utils/filterRowsUtils.ts"],"sourcesContent":["import { AnyGenerics, Row, RowModel, TableInstance } from '../types'\n\nexport function filterRowModelFromLeafs<TGenerics extends AnyGenerics>(\n  rowsToFilter: Row<TGenerics>[],\n  filterRows: (\n    rowsToFilter: Row<TGenerics>[],\n    depth: number\n  ) => Row<TGenerics>[],\n  instance: TableInstance<TGenerics>\n): RowModel<TGenerics> {\n  const newFilteredFlatRows: Row<TGenerics>[] = []\n  const newFilteredRowsById: Record<string, Row<TGenerics>> = {}\n\n  const recurseFilterRows = (rowsToFilter: Row<TGenerics>[], depth = 0) => {\n    rowsToFilter = rowsToFilter.slice()\n\n    // Filter from children up first\n    for (let i = 0; i < rowsToFilter.length; i++) {\n      const row = rowsToFilter[i]\n\n      if (!row.subRows?.length) {\n        continue\n      }\n\n      rowsToFilter[i] = instance.createRow(\n        row.id,\n        row.original,\n        row.index,\n        row.depth,\n        row.values\n      )\n\n      rowsToFilter[i].subRows = recurseFilterRows(row.subRows, depth + 1)\n\n      if (!rowsToFilter[i].subRows.length) {\n        rowsToFilter.splice(i, 1)\n        i--\n      }\n    }\n\n    rowsToFilter = filterRows(rowsToFilter, depth)\n\n    // Apply the filter to any subRows\n    rowsToFilter.forEach(row => {\n      newFilteredFlatRows.push(row)\n      newFilteredRowsById[row.id] = row\n    })\n\n    return rowsToFilter\n  }\n\n  return {\n    rows: recurseFilterRows(rowsToFilter),\n    flatRows: newFilteredFlatRows,\n    rowsById: newFilteredRowsById,\n  }\n}\n\nexport function filterRowModelFromRoot<TGenerics extends AnyGenerics>(\n  rowsToFilter: Row<TGenerics>[],\n  filterRows: (\n    rowsToFilter: Row<TGenerics>[],\n    depth: number\n  ) => Row<TGenerics>[],\n  instance: TableInstance<TGenerics>\n): RowModel<TGenerics> {\n  const newFilteredFlatRows: Row<TGenerics>[] = []\n  const newFilteredRowsById: Record<string, Row<TGenerics>> = {}\n\n  // Filters top level and nested rows\n  const recurseFilterRows = (rowsToFilter: Row<TGenerics>[], depth = 0) => {\n    // Filter from parents downward first\n    rowsToFilter = filterRows(rowsToFilter, depth)\n\n    // Apply the filter to any subRows\n    for (let i = 0; i < rowsToFilter.length; i++) {\n      const row = rowsToFilter[i]\n\n      newFilteredFlatRows.push(row)\n      newFilteredRowsById[row.id] = row\n\n      if (!row.subRows?.length) {\n        rowsToFilter.splice(i, 1)\n        i--\n        continue\n      }\n\n      rowsToFilter[i] = instance.createRow(\n        row.id,\n        row.original,\n        row.index,\n        row.depth,\n        row.values\n      )\n\n      rowsToFilter[i].subRows = recurseFilterRows(row.subRows, depth + 1)\n    }\n\n    return rowsToFilter\n  }\n\n  return {\n    rows: recurseFilterRows(rowsToFilter),\n    flatRows: newFilteredFlatRows,\n    rowsById: newFilteredRowsById,\n  }\n}\n"],"names":["filterRowModelFromLeafs","rowsToFilter","filterRows","instance","newFilteredFlatRows","newFilteredRowsById","recurseFilterRows","depth","slice","i","length","row","subRows","createRow","id","original","index","values","splice","forEach","push","rows","flatRows","rowsById","filterRowModelFromRoot"],"mappings":"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"}

package/build/cjs/utils/globalFilterRowsFn.js

@@ -12,11 +12,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var filterRowsUtils = require('./filterRowsUtils.js');
+
 function globalFilterRowsFn(instance, rowModel) {
   var globalFilter = instance.getState().globalFilter;
-  var newFilteredFlatRows = [];
-  var newFilteredRowsById = {};
-  var filterFromChildrenUp = instance.options.filterFromChildrenUp;
+  var filterFromLeafRows = instance.options.filterFromLeafRows;
   var filterFn = instance.getGlobalFilterFn();
 
   if (!filterFn) {
@@ -34,67 +34,15 @@ function globalFilterRowsFn(instance, rowModel) {
     return d.id;
   });
 
-  if (filterFromChildrenUp) {
-    var _recurseFilterRows = function _recurseFilterRows(rowsToFilter, depth) {
-
-      // Filter from children up
-      rowsToFilter = rowsToFilter.filter(function (row) {
-        var _row$subRows;
-
-        if (!((_row$subRows = row.subRows) != null && _row$subRows.length)) {
-          return true;
-        }
-
-        row.subRows = _recurseFilterRows(row.subRows);
-        return row.subRows.length;
-      });
-      rowsToFilter = filterFn(rowsToFilter, filterableColumnIds, globalFilter); // Apply the filter to any subRows
-
-      rowsToFilter.forEach(function (row) {
-        newFilteredFlatRows.push(row);
-        newFilteredRowsById[row.id] = row;
-      });
-      return rowsToFilter;
-    };
-
-    return {
-      rows: _recurseFilterRows(rowModel.rows),
-      flatRows: newFilteredFlatRows,
-      rowsById: newFilteredRowsById
-    };
-  } // Filters top level and nested rows
-
-
-  var recurseFilterRows = function recurseFilterRows(rowsToFilter, depth) {
-
-    // Filter from parents downward
-    rowsToFilter = filterFn(rowsToFilter, filterableColumnIds, globalFilter); // Apply the filter to any subRows
-    // We technically could do this recursively in the above loop,
-    // but that would severely hinder the API for the user, since they
-    // would be required to do that recursion in some scenarios
-
-    rowsToFilter.forEach(function (row) {
-      newFilteredFlatRows.push(row);
-      newFilteredRowsById[row.id] = row;
-
-      if (!filterFromChildrenUp) {
-        var _row$subRows2;
-
-        if (!((_row$subRows2 = row.subRows) != null && _row$subRows2.length)) {
-          return;
-        }
-
-        row.subRows = recurseFilterRows(row.subRows);
-      }
-    });
-    return rowsToFilter;
+  var filterRows = function filterRows(rows) {
+    return filterFn(rows, filterableColumnIds, globalFilter);
   };
 
-  return {
-    rows: recurseFilterRows(rowModel.rows),
-    flatRows: newFilteredFlatRows,
-    rowsById: newFilteredRowsById
-  };
+  if (filterFromLeafRows) {
+    filterRowsUtils.filterRowModelFromLeafs(rowModel.rows, filterRows, instance);
+  }
+
+  return filterRowsUtils.filterRowModelFromRoot(rowModel.rows, filterRows, instance);
 }
 
 exports.globalFilterRowsFn = globalFilterRowsFn;

package/build/cjs/utils/globalFilterRowsFn.js.map

@@ -1 +1 @@
-{"version":3,"file":"globalFilterRowsFn.js","sources":["../../../src/utils/globalFilterRowsFn.ts"],"sourcesContent":["import {\n  TableInstance,\n  Row,\n  RowModel,\n  AnyGenerics,\n  PartialGenerics,\n} from '../types'\n\nexport function globalFilterRowsFn<TGenerics extends AnyGenerics>(\n  instance: TableInstance<TGenerics>,\n  rowModel: RowModel<TGenerics>\n): RowModel<TGenerics> {\n  const globalFilter = instance.getState().globalFilter\n  const newFilteredFlatRows: Row<TGenerics>[] = []\n  const newFilteredRowsById: Record<string, Row<TGenerics>> = {}\n\n  const filterFromChildrenUp = instance.options.filterFromChildrenUp\n\n  const filterFn = instance.getGlobalFilterFn()\n\n  if (!filterFn) {\n    if (process.env.NODE_ENV !== 'production') {\n      console.warn(`Could not find a valid 'globalFilterType'`)\n    }\n    return rowModel\n  }\n\n  const filterableColumns = instance\n    .getAllLeafColumns()\n    .filter(column => column.getCanGlobalFilter())\n\n  const filterableColumnIds = filterableColumns.map(d => d.id)\n\n  if (filterFromChildrenUp) {\n    const recurseFilterRows = (rowsToFilter: Row<TGenerics>[], depth = 0) => {\n      // Filter from children up\n      rowsToFilter = rowsToFilter.filter(row => {\n        if (!row.subRows?.length) {\n          return true\n        }\n\n        row.subRows = recurseFilterRows(row.subRows, depth + 1)\n\n        return row.subRows.length\n      })\n\n      rowsToFilter = filterFn(rowsToFilter, filterableColumnIds, globalFilter)\n\n      // Apply the filter to any subRows\n      rowsToFilter.forEach(row => {\n        newFilteredFlatRows.push(row)\n        newFilteredRowsById[row.id] = row\n      })\n\n      return rowsToFilter\n    }\n\n    return {\n      rows: recurseFilterRows(rowModel.rows),\n      flatRows: newFilteredFlatRows,\n      rowsById: newFilteredRowsById,\n    }\n  }\n\n  // Filters top level and nested rows\n  const recurseFilterRows = (rowsToFilter: Row<TGenerics>[], depth = 0) => {\n    // Filter from parents downward\n    rowsToFilter = filterFn(rowsToFilter, filterableColumnIds, globalFilter)\n\n    // Apply the filter to any subRows\n    // We technically could do this recursively in the above loop,\n    // but that would severely hinder the API for the user, since they\n    // would be required to do that recursion in some scenarios\n    rowsToFilter.forEach(row => {\n      newFilteredFlatRows.push(row)\n      newFilteredRowsById[row.id] = row\n\n      if (!filterFromChildrenUp) {\n        if (!row.subRows?.length) {\n          return\n        }\n\n        row.subRows = recurseFilterRows(row.subRows, depth + 1)\n      }\n    })\n\n    return rowsToFilter\n  }\n\n  return {\n    rows: recurseFilterRows(rowModel.rows),\n    flatRows: newFilteredFlatRows,\n    rowsById: newFilteredRowsById,\n  }\n}\n"],"names":["globalFilterRowsFn","instance","rowModel","globalFilter","getState","newFilteredFlatRows","newFilteredRowsById","filterFromChildrenUp","options","filterFn","getGlobalFilterFn","process","env","NODE_ENV","console","warn","filterableColumns","getAllLeafColumns","filter","column","getCanGlobalFilter","filterableColumnIds","map","d","id","recurseFilterRows","rowsToFilter","depth","row","subRows","length","forEach","push","rows","flatRows","rowsById"],"mappings":"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"}
+{"version":3,"file":"globalFilterRowsFn.js","sources":["../../../src/utils/globalFilterRowsFn.ts"],"sourcesContent":["import { TableInstance, Row, RowModel, AnyGenerics } from '../types'\nimport {\n  filterRowModelFromLeafs,\n  filterRowModelFromRoot,\n} from './filterRowsUtils'\n\nexport function globalFilterRowsFn<TGenerics extends AnyGenerics>(\n  instance: TableInstance<TGenerics>,\n  rowModel: RowModel<TGenerics>\n): RowModel<TGenerics> {\n  const globalFilter = instance.getState().globalFilter\n\n  const filterFromLeafRows = instance.options.filterFromLeafRows\n\n  const filterFn = instance.getGlobalFilterFn()\n\n  if (!filterFn) {\n    if (process.env.NODE_ENV !== 'production') {\n      console.warn(`Could not find a valid 'globalFilterType'`)\n    }\n    return rowModel\n  }\n\n  const filterableColumns = instance\n    .getAllLeafColumns()\n    .filter(column => column.getCanGlobalFilter())\n\n  const filterableColumnIds = filterableColumns.map(d => d.id)\n\n  const filterRows = (rows: Row<TGenerics>[]) => {\n    return filterFn(rows, filterableColumnIds, globalFilter)\n  }\n\n  if (filterFromLeafRows) {\n    filterRowModelFromLeafs(rowModel.rows, filterRows, instance)\n  }\n\n  return filterRowModelFromRoot(rowModel.rows, filterRows, instance)\n}\n"],"names":["globalFilterRowsFn","instance","rowModel","globalFilter","getState","filterFromLeafRows","options","filterFn","getGlobalFilterFn","process","env","NODE_ENV","console","warn","filterableColumns","getAllLeafColumns","filter","column","getCanGlobalFilter","filterableColumnIds","map","d","id","filterRows","rows","filterRowModelFromLeafs","filterRowModelFromRoot"],"mappings":";;;;;;;;;;;;;;;;AAMO,SAASA,kBAAT,CACLC,QADK,EAELC,QAFK,EAGgB;AACrB,MAAMC,YAAY,GAAGF,QAAQ,CAACG,QAAT,GAAoBD,YAAzC;AAEA,MAAME,kBAAkB,GAAGJ,QAAQ,CAACK,OAAT,CAAiBD,kBAA5C;AAEA,MAAME,QAAQ,GAAGN,QAAQ,CAACO,iBAAT,EAAjB;;AAEA,MAAI,CAACD,QAAL,EAAe;AACb,QAAIE,OAAO,CAACC,GAAR,CAAYC,QAAZ,KAAyB,YAA7B,EAA2C;AACzCC,MAAAA,OAAO,CAACC,IAAR;AACD;;AACD,WAAOX,QAAP;AACD;;AAED,MAAMY,iBAAiB,GAAGb,QAAQ,CAC/Bc,iBADuB,GAEvBC,MAFuB,CAEhB,UAAAC,MAAM;AAAA,WAAIA,MAAM,CAACC,kBAAP,EAAJ;AAAA,GAFU,CAA1B;AAIA,MAAMC,mBAAmB,GAAGL,iBAAiB,CAACM,GAAlB,CAAsB,UAAAC,CAAC;AAAA,WAAIA,CAAC,CAACC,EAAN;AAAA,GAAvB,CAA5B;;AAEA,MAAMC,UAAU,GAAG,SAAbA,UAAa,CAACC,IAAD,EAA4B;AAC7C,WAAOjB,QAAQ,CAACiB,IAAD,EAAOL,mBAAP,EAA4BhB,YAA5B,CAAf;AACD,GAFD;;AAIA,MAAIE,kBAAJ,EAAwB;AACtBoB,IAAAA,uCAAuB,CAACvB,QAAQ,CAACsB,IAAV,EAAgBD,UAAhB,EAA4BtB,QAA5B,CAAvB;AACD;;AAED,SAAOyB,sCAAsB,CAACxB,QAAQ,CAACsB,IAAV,EAAgBD,UAAhB,EAA4BtB,QAA5B,CAA7B;AACD;;;;"}

package/build/cjs/utils/groupRowsFn.js

@@ -35,21 +35,21 @@ function groupRowsFn(instance, sortedRowModel) {
       var aggregateFn = instance.getColumnAggregationFn(column.id);
 
       if (aggregateFn) {
-        // Get the columnValues to aggregate
-        var groupedValues = groupedRows.map(function (row) {
-          return row.values[column.id];
-        }); // Get the columnValues to aggregate
-
-        var leafValues = leafRows.map(function (row) {
-          var columnValue = row.values[column.id];
-
-          if (!depth && column.aggregateValue) {
-            columnValue = column.aggregateValue(columnValue);
-          }
-
-          return columnValue;
+        values[column.id] = aggregateFn(function () {
+          return leafRows.map(function (row) {
+            var columnValue = row.values[column.id];
+
+            if (!depth && column.aggregateValue) {
+              columnValue = column.aggregateValue(columnValue);
+            }
+
+            return columnValue;
+          });
+        }, function () {
+          return groupedRows.map(function (row) {
+            return row.values[column.id];
+          });
         });
-        values[column.id] = aggregateFn(leafValues, groupedValues);
       } else if (column.aggregationType) {
         console.info({
           column: column
@@ -92,7 +92,7 @@ function groupRowsFn(instance, sortedRowModel) {
       var subRows = groupUpRecursively(groupedRows, depth + 1, id); // Flatten the leaf rows of the rows in this group
 
       var leafRows = depth ? utils.flattenBy(groupedRows, function (row) {
-        return row.leafRows;
+        return row.subRows;
       }) : groupedRows;
       var values = aggregateRowsToValues(leafRows, groupedRows, depth);
       var row = instance.createRow(id, undefined, index, depth, values);

package/build/cjs/utils/groupRowsFn.js.map

@@ -1 +1 @@
-{"version":3,"file":"groupRowsFn.js","sources":["../../../src/utils/groupRowsFn.ts"],"sourcesContent":["import {\n  TableInstance,\n  Row,\n  RowModel,\n  AnyGenerics,\n  PartialGenerics,\n} from '../types'\nimport { flattenBy } from '../utils'\n\nexport function groupRowsFn<TGenerics extends AnyGenerics>(\n  instance: TableInstance<TGenerics>,\n  sortedRowModel: RowModel<TGenerics>\n): RowModel<TGenerics> {\n  const groupingState = instance.getState().grouping\n  // Filter the grouping list down to columns that exist\n  const existingGrouping = groupingState.filter(columnId =>\n    instance.getColumn(columnId)\n  )\n\n  // Find the columns that can or are aggregating\n  // Uses each column to aggregate rows into a single value\n  const aggregateRowsToValues = (\n    leafRows: Row<TGenerics>[],\n    groupedRows: Row<TGenerics>[],\n    depth: number\n  ) => {\n    const values: Record<string, unknown> = {}\n\n    instance.getAllLeafColumns().forEach(column => {\n      // Don't aggregate columns that are in the grouping\n      if (existingGrouping.includes(column.id)) {\n        values[column.id] = groupedRows[0]\n          ? groupedRows[0].values[column.id]\n          : null\n        return\n      }\n\n      // Aggregate the values\n      const aggregateFn = instance.getColumnAggregationFn(column.id)\n\n      if (aggregateFn) {\n        // Get the columnValues to aggregate\n        const groupedValues = groupedRows.map(row => row.values[column.id])\n\n        // Get the columnValues to aggregate\n        const leafValues = leafRows.map(row => {\n          let columnValue = row.values[column.id]\n\n          if (!depth && column.aggregateValue) {\n            columnValue = column.aggregateValue(columnValue)\n          }\n\n          return columnValue\n        })\n\n        values[column.id] = aggregateFn(leafValues, groupedValues)\n      } else if (column.aggregationType) {\n        console.info({ column })\n        throw new Error(\n          process.env.NODE_ENV !== 'production'\n            ? `Table: Invalid column.aggregateType option for column listed above`\n            : ''\n        )\n      } else {\n        values[column.id] = null\n      }\n    })\n\n    return values\n  }\n\n  const groupedFlatRows: Row<TGenerics>[] = []\n  const groupedRowsById: Record<string, Row<TGenerics>> = {}\n  // const onlyGroupedFlatRows: Row[] = [];\n  // const onlyGroupedRowsById: Record<RowId, Row> = {};\n  // const nonGroupedFlatRows: Row[] = [];\n  // const nonGroupedRowsById: Record<RowId, Row> = {};\n\n  // Recursively group the data\n  const groupUpRecursively = (\n    rows: Row<TGenerics>[],\n    depth = 0,\n    parentId: string\n  ) => {\n    // This is the last level, just return the rows\n    if (depth === existingGrouping.length) {\n      return rows\n    }\n\n    const columnId = existingGrouping[depth]!\n\n    // Group the rows together for this level\n    const rowGroupsMap = groupBy(rows, columnId)\n\n    // Peform aggregations for each group\n    const aggregatedGroupedRows = Array.from(rowGroupsMap.entries()).map(\n      ([groupingValue, groupedRows], index) => {\n        let id = `${columnId}:${groupingValue}`\n        id = parentId ? `${parentId}>${id}` : id\n\n        // First, Recurse to group sub rows before aggregation\n        const subRows = groupUpRecursively(groupedRows, depth + 1, id)\n\n        // Flatten the leaf rows of the rows in this group\n        const leafRows = depth\n          ? flattenBy(groupedRows, row => row.leafRows)\n          : groupedRows\n\n        const values = aggregateRowsToValues(leafRows, groupedRows, depth)\n\n        const row = instance.createRow(id, undefined, index, depth, values)\n\n        Object.assign(row, {\n          groupingColumnId: columnId,\n          groupingValue,\n          subRows,\n          leafRows,\n        })\n\n        subRows.forEach(subRow => {\n          groupedFlatRows.push(subRow)\n          groupedRowsById[subRow.id] = subRow\n          // if (subRow.getIsGrouped?.()) {\n          //   onlyGroupedFlatRows.push(subRow);\n          //   onlyGroupedRowsById[subRow.id] = subRow;\n          // } else {\n          //   nonGroupedFlatRows.push(subRow);\n          //   nonGroupedRowsById[subRow.id] = subRow;\n          // }\n        })\n\n        return row\n      }\n    )\n\n    return aggregatedGroupedRows\n  }\n\n  const groupedRows = groupUpRecursively(sortedRowModel.rows, 0, '')\n\n  groupedRows.forEach(subRow => {\n    groupedFlatRows.push(subRow)\n    groupedRowsById[subRow.id] = subRow\n    // if (subRow.getIsGrouped?.()) {\n    //   onlyGroupedFlatRows.push(subRow);\n    //   onlyGroupedRowsById[subRow.id] = subRow;\n    // } else {\n    //   nonGroupedFlatRows.push(subRow);\n    //   nonGroupedRowsById[subRow.id] = subRow;\n    // }\n  })\n\n  return {\n    rows: groupedRows,\n    flatRows: groupedFlatRows,\n    rowsById: groupedRowsById,\n  }\n}\n\nfunction groupBy<TGenerics extends PartialGenerics>(\n  rows: Row<TGenerics>[],\n  columnId: string\n) {\n  const groupMap = new Map<any, Row<TGenerics>[]>()\n\n  return rows.reduce((map, row) => {\n    const resKey = `${row.values[columnId]}`\n    const previous = map.get(resKey)\n    if (!previous) {\n      map.set(resKey, [row])\n    } else {\n      map.set(resKey, [...previous, row])\n    }\n    return map\n  }, groupMap)\n}\n"],"names":["groupRowsFn","instance","sortedRowModel","groupingState","getState","grouping","existingGrouping","filter","columnId","getColumn","aggregateRowsToValues","leafRows","groupedRows","depth","values","getAllLeafColumns","forEach","column","includes","id","aggregateFn","getColumnAggregationFn","groupedValues","map","row","leafValues","columnValue","aggregateValue","aggregationType","console","info","Error","process","env","NODE_ENV","groupedFlatRows","groupedRowsById","groupUpRecursively","rows","parentId","length","rowGroupsMap","groupBy","aggregatedGroupedRows","Array","from","entries","index","groupingValue","subRows","flattenBy","createRow","undefined","Object","assign","groupingColumnId","subRow","push","flatRows","rowsById","groupMap","Map","reduce","resKey","previous","get","set"],"mappings":"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"}
+{"version":3,"file":"groupRowsFn.js","sources":["../../../src/utils/groupRowsFn.ts"],"sourcesContent":["import {\n  TableInstance,\n  Row,\n  RowModel,\n  AnyGenerics,\n  PartialGenerics,\n} from '../types'\nimport { flattenBy } from '../utils'\n\nexport function groupRowsFn<TGenerics extends AnyGenerics>(\n  instance: TableInstance<TGenerics>,\n  sortedRowModel: RowModel<TGenerics>\n): RowModel<TGenerics> {\n  const groupingState = instance.getState().grouping\n  // Filter the grouping list down to columns that exist\n  const existingGrouping = groupingState.filter(columnId =>\n    instance.getColumn(columnId)\n  )\n\n  // Find the columns that can or are aggregating\n  // Uses each column to aggregate rows into a single value\n  const aggregateRowsToValues = (\n    leafRows: Row<TGenerics>[],\n    groupedRows: Row<TGenerics>[],\n    depth: number\n  ) => {\n    const values: Record<string, unknown> = {}\n\n    instance.getAllLeafColumns().forEach(column => {\n      // Don't aggregate columns that are in the grouping\n      if (existingGrouping.includes(column.id)) {\n        values[column.id] = groupedRows[0]\n          ? groupedRows[0].values[column.id]\n          : null\n        return\n      }\n\n      // Aggregate the values\n      const aggregateFn = instance.getColumnAggregationFn(column.id)\n\n      if (aggregateFn) {\n        values[column.id] = aggregateFn(\n          () =>\n            leafRows.map(row => {\n              let columnValue = row.values[column.id]\n\n              if (!depth && column.aggregateValue) {\n                columnValue = column.aggregateValue(columnValue)\n              }\n\n              return columnValue\n            }),\n          () => groupedRows.map(row => row.values[column.id])\n        )\n      } else if (column.aggregationType) {\n        console.info({ column })\n        throw new Error(\n          process.env.NODE_ENV !== 'production'\n            ? `Table: Invalid column.aggregateType option for column listed above`\n            : ''\n        )\n      } else {\n        values[column.id] = null\n      }\n    })\n\n    return values\n  }\n\n  const groupedFlatRows: Row<TGenerics>[] = []\n  const groupedRowsById: Record<string, Row<TGenerics>> = {}\n  // const onlyGroupedFlatRows: Row[] = [];\n  // const onlyGroupedRowsById: Record<RowId, Row> = {};\n  // const nonGroupedFlatRows: Row[] = [];\n  // const nonGroupedRowsById: Record<RowId, Row> = {};\n\n  // Recursively group the data\n  const groupUpRecursively = (\n    rows: Row<TGenerics>[],\n    depth = 0,\n    parentId: string\n  ) => {\n    // This is the last level, just return the rows\n    if (depth === existingGrouping.length) {\n      return rows\n    }\n\n    const columnId = existingGrouping[depth]!\n\n    // Group the rows together for this level\n    const rowGroupsMap = groupBy(rows, columnId)\n\n    // Peform aggregations for each group\n    const aggregatedGroupedRows = Array.from(rowGroupsMap.entries()).map(\n      ([groupingValue, groupedRows], index) => {\n        let id = `${columnId}:${groupingValue}`\n        id = parentId ? `${parentId}>${id}` : id\n\n        // First, Recurse to group sub rows before aggregation\n        const subRows = groupUpRecursively(groupedRows, depth + 1, id)\n\n        // Flatten the leaf rows of the rows in this group\n        const leafRows = depth\n          ? flattenBy(groupedRows, row => row.subRows)\n          : groupedRows\n\n        const values = aggregateRowsToValues(leafRows, groupedRows, depth)\n\n        const row = instance.createRow(id, undefined, index, depth, values)\n\n        Object.assign(row, {\n          groupingColumnId: columnId,\n          groupingValue,\n          subRows,\n          leafRows,\n        })\n\n        subRows.forEach(subRow => {\n          groupedFlatRows.push(subRow)\n          groupedRowsById[subRow.id] = subRow\n          // if (subRow.getIsGrouped?.()) {\n          //   onlyGroupedFlatRows.push(subRow);\n          //   onlyGroupedRowsById[subRow.id] = subRow;\n          // } else {\n          //   nonGroupedFlatRows.push(subRow);\n          //   nonGroupedRowsById[subRow.id] = subRow;\n          // }\n        })\n\n        return row\n      }\n    )\n\n    return aggregatedGroupedRows\n  }\n\n  const groupedRows = groupUpRecursively(sortedRowModel.rows, 0, '')\n\n  groupedRows.forEach(subRow => {\n    groupedFlatRows.push(subRow)\n    groupedRowsById[subRow.id] = subRow\n    // if (subRow.getIsGrouped?.()) {\n    //   onlyGroupedFlatRows.push(subRow);\n    //   onlyGroupedRowsById[subRow.id] = subRow;\n    // } else {\n    //   nonGroupedFlatRows.push(subRow);\n    //   nonGroupedRowsById[subRow.id] = subRow;\n    // }\n  })\n\n  return {\n    rows: groupedRows,\n    flatRows: groupedFlatRows,\n    rowsById: groupedRowsById,\n  }\n}\n\nfunction groupBy<TGenerics extends PartialGenerics>(\n  rows: Row<TGenerics>[],\n  columnId: string\n) {\n  const groupMap = new Map<any, Row<TGenerics>[]>()\n\n  return rows.reduce((map, row) => {\n    const resKey = `${row.values[columnId]}`\n    const previous = map.get(resKey)\n    if (!previous) {\n      map.set(resKey, [row])\n    } else {\n      map.set(resKey, [...previous, row])\n    }\n    return map\n  }, groupMap)\n}\n"],"names":["groupRowsFn","instance","sortedRowModel","groupingState","getState","grouping","existingGrouping","filter","columnId","getColumn","aggregateRowsToValues","leafRows","groupedRows","depth","values","getAllLeafColumns","forEach","column","includes","id","aggregateFn","getColumnAggregationFn","map","row","columnValue","aggregateValue","aggregationType","console","info","Error","process","env","NODE_ENV","groupedFlatRows","groupedRowsById","groupUpRecursively","rows","parentId","length","rowGroupsMap","groupBy","aggregatedGroupedRows","Array","from","entries","index","groupingValue","subRows","flattenBy","createRow","undefined","Object","assign","groupingColumnId","subRow","push","flatRows","rowsById","groupMap","Map","reduce","resKey","previous","get","set"],"mappings":"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"}

package/build/cjs/utils/sortRowsFn.js

@@ -48,7 +48,7 @@ function sortRowsFn(instance, rowModel) {
           var bUndefined = typeof bValue === 'undefined';
 
           if (aUndefined || bUndefined) {
-            return aUndefined && bUndefined ? 0 : aUndefined ? 1 : -1;
+            return aUndefined && bUndefined ? 0 : aUndefined ? columnInfo.sortUndefined : -columnInfo.sortUndefined;
           }
         } // This function should always return in ascending order
 

package/build/cjs/utils/sortRowsFn.js.map

@@ -1 +1 @@
-{"version":3,"file":"sortRowsFn.js","sources":["../../../src/utils/sortRowsFn.ts"],"sourcesContent":["import {\n  TableInstance,\n  Row,\n  RowModel,\n  AnyGenerics,\n  PartialGenerics,\n} from '../types'\nimport { SortingFn } from '../features/Sorting'\n\nexport function sortRowsFn<TGenerics extends AnyGenerics>(\n  instance: TableInstance<TGenerics>,\n  rowModel: RowModel<TGenerics>\n): RowModel<TGenerics> {\n  const sortingState = instance.getState().sorting\n\n  const sortedFlatRows: Row<TGenerics>[] = []\n\n  // Filter out sortings that correspond to non existing columns\n  const availableSorting = sortingState.filter(sort =>\n    instance.getColumnCanSort(sort.id)\n  )\n\n  const columnInfoById: Record<\n    string,\n    {\n      sortUndefined?: false | -1 | 1\n      invertSorting?: boolean\n      sortingFn: SortingFn<TGenerics>\n    }\n  > = {}\n\n  availableSorting.forEach(sortEntry => {\n    const column = instance.getColumn(sortEntry.id)!\n\n    columnInfoById[sortEntry.id] = {\n      sortUndefined: column.sortUndefined,\n      invertSorting: column.invertSorting,\n      sortingFn: instance.getColumnSortingFn(sortEntry.id)!,\n    }\n  })\n\n  const sortData = (rows: Row<TGenerics>[]) => {\n    // This will also perform a stable sorting using the row index\n    // if needed.\n    const sortedData = rows.slice()\n\n    sortedData.sort((rowA, rowB) => {\n      for (let i = 0; i < availableSorting.length; i += 1) {\n        const sortEntry = availableSorting[i]!\n        const columnInfo = columnInfoById[sortEntry.id]!\n        const isDesc = sortEntry?.desc ?? false\n\n        if (columnInfo.sortUndefined) {\n          const aValue = rowA.values[sortEntry.id]\n          const bValue = rowB.values[sortEntry.id]\n\n          const aUndefined = typeof aValue === 'undefined'\n          const bUndefined = typeof bValue === 'undefined'\n\n          if (aUndefined || bUndefined) {\n            return aUndefined && bUndefined ? 0 : aUndefined ? 1 : -1\n          }\n        }\n\n        // This function should always return in ascending order\n        let sortInt = columnInfo.sortingFn(rowA, rowB, sortEntry.id)\n\n        if (sortInt !== 0) {\n          if (isDesc) {\n            sortInt *= -1\n          }\n\n          if (columnInfo.invertSorting) {\n            sortInt *= -1\n          }\n\n          return sortInt\n        }\n      }\n\n      return rowA.index - rowB.index\n    })\n\n    // If there are sub-rows, sort them\n    sortedData.forEach(row => {\n      sortedFlatRows.push(row)\n      if (!row.subRows || row.subRows.length <= 1) {\n        return\n      }\n      row.subRows = sortData(row.subRows)\n    })\n\n    return sortedData\n  }\n\n  return {\n    rows: sortData(rowModel.rows),\n    flatRows: sortedFlatRows,\n    rowsById: rowModel.rowsById,\n  }\n}\n"],"names":["sortRowsFn","instance","rowModel","sortingState","getState","sorting","sortedFlatRows","availableSorting","filter","sort","getColumnCanSort","id","columnInfoById","forEach","sortEntry","column","getColumn","sortUndefined","invertSorting","sortingFn","getColumnSortingFn","sortData","rows","sortedData","slice","rowA","rowB","i","length","columnInfo","isDesc","desc","aValue","values","bValue","aUndefined","bUndefined","sortInt","index","row","push","subRows","flatRows","rowsById"],"mappings":"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"}
+{"version":3,"file":"sortRowsFn.js","sources":["../../../src/utils/sortRowsFn.ts"],"sourcesContent":["import { TableInstance, Row, RowModel, AnyGenerics } from '../types'\nimport { SortingFn } from '../features/Sorting'\n\nexport function sortRowsFn<TGenerics extends AnyGenerics>(\n  instance: TableInstance<TGenerics>,\n  rowModel: RowModel<TGenerics>\n): RowModel<TGenerics> {\n  const sortingState = instance.getState().sorting\n\n  const sortedFlatRows: Row<TGenerics>[] = []\n\n  // Filter out sortings that correspond to non existing columns\n  const availableSorting = sortingState.filter(sort =>\n    instance.getColumnCanSort(sort.id)\n  )\n\n  const columnInfoById: Record<\n    string,\n    {\n      sortUndefined?: false | -1 | 1\n      invertSorting?: boolean\n      sortingFn: SortingFn<TGenerics>\n    }\n  > = {}\n\n  availableSorting.forEach(sortEntry => {\n    const column = instance.getColumn(sortEntry.id)!\n\n    columnInfoById[sortEntry.id] = {\n      sortUndefined: column.sortUndefined,\n      invertSorting: column.invertSorting,\n      sortingFn: instance.getColumnSortingFn(sortEntry.id)!,\n    }\n  })\n\n  const sortData = (rows: Row<TGenerics>[]) => {\n    // This will also perform a stable sorting using the row index\n    // if needed.\n    const sortedData = rows.slice()\n\n    sortedData.sort((rowA, rowB) => {\n      for (let i = 0; i < availableSorting.length; i += 1) {\n        const sortEntry = availableSorting[i]!\n        const columnInfo = columnInfoById[sortEntry.id]!\n        const isDesc = sortEntry?.desc ?? false\n\n        if (columnInfo.sortUndefined) {\n          const aValue = rowA.values[sortEntry.id]\n          const bValue = rowB.values[sortEntry.id]\n\n          const aUndefined = typeof aValue === 'undefined'\n          const bUndefined = typeof bValue === 'undefined'\n\n          if (aUndefined || bUndefined) {\n            return aUndefined && bUndefined\n              ? 0\n              : aUndefined\n              ? columnInfo.sortUndefined\n              : -columnInfo.sortUndefined\n          }\n        }\n\n        // This function should always return in ascending order\n        let sortInt = columnInfo.sortingFn(rowA, rowB, sortEntry.id)\n\n        if (sortInt !== 0) {\n          if (isDesc) {\n            sortInt *= -1\n          }\n\n          if (columnInfo.invertSorting) {\n            sortInt *= -1\n          }\n\n          return sortInt\n        }\n      }\n\n      return rowA.index - rowB.index\n    })\n\n    // If there are sub-rows, sort them\n    sortedData.forEach(row => {\n      sortedFlatRows.push(row)\n      if (!row.subRows || row.subRows.length <= 1) {\n        return\n      }\n      row.subRows = sortData(row.subRows)\n    })\n\n    return sortedData\n  }\n\n  return {\n    rows: sortData(rowModel.rows),\n    flatRows: sortedFlatRows,\n    rowsById: rowModel.rowsById,\n  }\n}\n"],"names":["sortRowsFn","instance","rowModel","sortingState","getState","sorting","sortedFlatRows","availableSorting","filter","sort","getColumnCanSort","id","columnInfoById","forEach","sortEntry","column","getColumn","sortUndefined","invertSorting","sortingFn","getColumnSortingFn","sortData","rows","sortedData","slice","rowA","rowB","i","length","columnInfo","isDesc","desc","aValue","values","bValue","aUndefined","bUndefined","sortInt","index","row","push","subRows","flatRows","rowsById"],"mappings":"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"}