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

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

@@ -1 +1 @@
-{"version":3,"file":"expandRowsFn.js","sources":["../../../src/utils/expandRowsFn.ts"],"sourcesContent":["import { TableInstance, Row, RowModel, AnyGenerics } from '../types'\n\nexport function expandRowsFn<TGenerics extends AnyGenerics>(\n  instance: TableInstance<TGenerics>,\n  sortedRowModel: RowModel<TGenerics>\n): RowModel<TGenerics> {\n  const expandedRows: Row<TGenerics>[] = []\n\n  const { expandSubRows } = instance.options\n\n  const handleRow = (row: Row<TGenerics>) => {\n    expandedRows.push(row)\n\n    if (\n      expandSubRows &&\n      row.subRows?.length &&\n      instance.getIsRowExpanded(row.id)\n    ) {\n      row.subRows.forEach(handleRow)\n    }\n  }\n\n  sortedRowModel.rows.forEach(handleRow)\n\n  return {\n    rows: expandedRows,\n    flatRows: sortedRowModel.flatRows,\n    rowsById: sortedRowModel.rowsById,\n  }\n}\n"],"names":["expandRowsFn","instance","sortedRowModel","expandedRows","expandSubRows","options","handleRow","row","push","subRows","length","getIsRowExpanded","id","forEach","rows","flatRows","rowsById"],"mappings":";;;;;;;;;;;;;;AAEO,SAASA,YAAT,CACLC,QADK,EAELC,cAFK,EAGgB;AACrB,MAAMC,YAA8B,GAAG,EAAvC;AAEA,MAAQC,aAAR,GAA0BH,QAAQ,CAACI,OAAnC,CAAQD,aAAR;;AAEA,MAAME,SAAS,GAAG,SAAZA,SAAY,CAACC,GAAD,EAAyB;AAAA;;AACzCJ,IAAAA,YAAY,CAACK,IAAb,CAAkBD,GAAlB;;AAEA,QACEH,aAAa,oBACbG,GAAG,CAACE,OADS,aACb,aAAaC,MADb,IAEAT,QAAQ,CAACU,gBAAT,CAA0BJ,GAAG,CAACK,EAA9B,CAHF,EAIE;AACAL,MAAAA,GAAG,CAACE,OAAJ,CAAYI,OAAZ,CAAoBP,SAApB;AACD;AACF,GAVD;;AAYAJ,EAAAA,cAAc,CAACY,IAAf,CAAoBD,OAApB,CAA4BP,SAA5B;AAEA,SAAO;AACLQ,IAAAA,IAAI,EAAEX,YADD;AAELY,IAAAA,QAAQ,EAAEb,cAAc,CAACa,QAFpB;AAGLC,IAAAA,QAAQ,EAAEd,cAAc,CAACc;AAHpB,GAAP;AAKD;;;;"}
+{"version":3,"file":"expandRowsFn.js","sources":["../../../src/utils/expandRowsFn.ts"],"sourcesContent":["import {\n  TableInstance,\n  Row,\n  RowModel,\n  AnyGenerics,\n  PartialGenerics,\n} from '../types'\n\nexport function expandRowsFn<TGenerics extends AnyGenerics>(\n  instance: TableInstance<TGenerics>,\n  sortedRowModel: RowModel<TGenerics>\n): RowModel<TGenerics> {\n  const expandedRows: Row<TGenerics>[] = []\n\n  const handleRow = (row: Row<TGenerics>) => {\n    expandedRows.push(row)\n\n    if (\n      instance.options.expandSubRows &&\n      row.subRows?.length &&\n      instance.getIsRowExpanded(row.id)\n    ) {\n      row.subRows.forEach(handleRow)\n    }\n  }\n\n  sortedRowModel.rows.forEach(handleRow)\n\n  return {\n    rows: expandedRows,\n    flatRows: sortedRowModel.flatRows,\n    rowsById: sortedRowModel.rowsById,\n  }\n}\n"],"names":["expandRowsFn","instance","sortedRowModel","expandedRows","handleRow","row","push","options","expandSubRows","subRows","length","getIsRowExpanded","id","forEach","rows","flatRows","rowsById"],"mappings":";;;;;;;;;;;;;;AAQO,SAASA,YAAT,CACLC,QADK,EAELC,cAFK,EAGgB;AACrB,MAAMC,YAA8B,GAAG,EAAvC;;AAEA,MAAMC,SAAS,GAAG,SAAZA,SAAY,CAACC,GAAD,EAAyB;AAAA;;AACzCF,IAAAA,YAAY,CAACG,IAAb,CAAkBD,GAAlB;;AAEA,QACEJ,QAAQ,CAACM,OAAT,CAAiBC,aAAjB,oBACAH,GAAG,CAACI,OADJ,aACA,aAAaC,MADb,IAEAT,QAAQ,CAACU,gBAAT,CAA0BN,GAAG,CAACO,EAA9B,CAHF,EAIE;AACAP,MAAAA,GAAG,CAACI,OAAJ,CAAYI,OAAZ,CAAoBT,SAApB;AACD;AACF,GAVD;;AAYAF,EAAAA,cAAc,CAACY,IAAf,CAAoBD,OAApB,CAA4BT,SAA5B;AAEA,SAAO;AACLU,IAAAA,IAAI,EAAEX,YADD;AAELY,IAAAA,QAAQ,EAAEb,cAAc,CAACa,QAFpB;AAGLC,IAAAA,QAAQ,EAAEd,cAAc,CAACc;AAHpB,GAAP;AAKD;;;;"}

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

@@ -1 +1 @@
-{"version":3,"file":"globalFilterRowsFn.js","sources":["../../../src/utils/globalFilterRowsFn.ts"],"sourcesContent":["import { TableInstance, Row, RowModel, AnyGenerics } 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 {\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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"}

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

@@ -1 +1 @@
-{"version":3,"file":"groupRowsFn.js","sources":["../../../src/utils/groupRowsFn.ts"],"sourcesContent":["import { TableInstance, Row, RowModel, AnyGenerics } 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 AnyGenerics>(\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        // 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":";;;;;;;;;;;;;;;;AASO,SAASA,WAAT,CACLC,QADK,EAELC,cAFK,EAGgB;AACrB,MAAMC,aAAa,GAAGF,QAAQ,CAACG,QAAT,GAAoBC,QAA1C,CADqB;;AAGrB,MAAMC,gBAAgB,GAAGH,aAAa,CAACI,MAAd,CAAqB,UAAAC,QAAQ;AAAA,WACpDP,QAAQ,CAACQ,SAAT,CAAmBD,QAAnB,CADoD;AAAA,GAA7B,CAAzB,CAHqB;AAQrB;;AACA,MAAME,qBAAqB,GAAG,SAAxBA,qBAAwB,CAC5BC,QAD4B,EAE5BC,WAF4B,EAG5BC,KAH4B,EAIzB;AACH,QAAMC,MAA+B,GAAG,EAAxC;AAEAb,IAAAA,QAAQ,CAACc,iBAAT,GAA6BC,OAA7B,CAAqC,UAAAC,MAAM,EAAI;AAC7C;AACA,UAAIX,gBAAgB,CAACY,QAAjB,CAA0BD,MAAM,CAACE,EAAjC,CAAJ,EAA0C;AACxCL,QAAAA,MAAM,CAACG,MAAM,CAACE,EAAR,CAAN,GAAoBP,WAAW,CAAC,CAAD,CAAX,GAChBA,WAAW,CAAC,CAAD,CAAX,CAAeE,MAAf,CAAsBG,MAAM,CAACE,EAA7B,CADgB,GAEhB,IAFJ;AAGA;AACD,OAP4C;;;AAU7C,UAAMC,WAAW,GAAGnB,QAAQ,CAACoB,sBAAT,CAAgCJ,MAAM,CAACE,EAAvC,CAApB;;AAEA,UAAIC,WAAJ,EAAiB;AACf;AACA,YAAME,aAAa,GAAGV,WAAW,CAACW,GAAZ,CAAgB,UAAAC,GAAG;AAAA,iBAAIA,GAAG,CAACV,MAAJ,CAAWG,MAAM,CAACE,EAAlB,CAAJ;AAAA,SAAnB,CAAtB,CAFe;;AAKf,YAAMM,UAAU,GAAGd,QAAQ,CAACY,GAAT,CAAa,UAAAC,GAAG,EAAI;AACrC,cAAIE,WAAW,GAAGF,GAAG,CAACV,MAAJ,CAAWG,MAAM,CAACE,EAAlB,CAAlB;;AAEA,cAAI,CAACN,KAAD,IAAUI,MAAM,CAACU,cAArB,EAAqC;AACnCD,YAAAA,WAAW,GAAGT,MAAM,CAACU,cAAP,CAAsBD,WAAtB,CAAd;AACD;;AAED,iBAAOA,WAAP;AACD,SARkB,CAAnB;AAUAZ,QAAAA,MAAM,CAACG,MAAM,CAACE,EAAR,CAAN,GAAoBC,WAAW,CAACK,UAAD,EAAaH,aAAb,CAA/B;AACD,OAhBD,MAgBO,IAAIL,MAAM,CAACW,eAAX,EAA4B;AACjCC,QAAAA,OAAO,CAACC,IAAR,CAAa;AAAEb,UAAAA,MAAM,EAANA;AAAF,SAAb;AACA,cAAM,IAAIc,KAAJ,CACJC,OAAO,CAACC,GAAR,CAAYC,QAAZ,KAAyB,YAAzB,0EAEI,EAHA,CAAN;AAKD,OAPM,MAOA;AACLpB,QAAAA,MAAM,CAACG,MAAM,CAACE,EAAR,CAAN,GAAoB,IAApB;AACD;AACF,KAtCD;AAwCA,WAAOL,MAAP;AACD,GAhDD;;AAkDA,MAAMqB,eAAiC,GAAG,EAA1C;AACA,MAAMC,eAA+C,GAAG,EAAxD,CA5DqB;AA8DrB;AACA;AACA;AAEA;;AACA,MAAMC,kBAAkB,GAAG,SAArBA,kBAAqB,CACzBC,IADyB,EAEzBzB,KAFyB,EAGzB0B,QAHyB,EAItB;AAAA,QAFH1B,KAEG;AAFHA,MAAAA,KAEG,GAFK,CAEL;AAAA;;AACH;AACA,QAAIA,KAAK,KAAKP,gBAAgB,CAACkC,MAA/B,EAAuC;AACrC,aAAOF,IAAP;AACD;;AAED,QAAM9B,QAAQ,GAAGF,gBAAgB,CAACO,KAAD,CAAjC,CANG;;AASH,QAAM4B,YAAY,GAAGC,OAAO,CAACJ,IAAD,EAAO9B,QAAP,CAA5B,CATG;;AAYH,QAAMmC,qBAAqB,GAAGC,KAAK,CAACC,IAAN,CAAWJ,YAAY,CAACK,OAAb,EAAX,EAAmCvB,GAAnC,CAC5B,gBAA+BwB,KAA/B,EAAyC;AAAA,UAAvCC,aAAuC;AAAA,UAAxBpC,WAAwB;AACvC,UAAIO,EAAE,GAAMX,QAAN,SAAkBwC,aAAxB;AACA7B,MAAAA,EAAE,GAAGoB,QAAQ,GAAMA,QAAN,SAAkBpB,EAAlB,GAAyBA,EAAtC,CAFuC;;AAKvC,UAAM8B,OAAO,GAAGZ,kBAAkB,CAACzB,WAAD,EAAcC,KAAK,GAAG,CAAtB,EAAyBM,EAAzB,CAAlC,CALuC;;AAQvC,UAAMR,QAAQ,GAAGE,KAAK,GAClBqC,eAAS,CAACtC,WAAD,EAAc,UAAAY,GAAG;AAAA,eAAIA,GAAG,CAACb,QAAR;AAAA,OAAjB,CADS,GAElBC,WAFJ;AAIA,UAAME,MAAM,GAAGJ,qBAAqB,CAACC,QAAD,EAAWC,WAAX,EAAwBC,KAAxB,CAApC;AAEA,UAAMW,GAAG,GAAGvB,QAAQ,CAACkD,SAAT,CAAmBhC,EAAnB,EAAuBiC,SAAvB,EAAkCL,KAAlC,EAAyClC,KAAzC,EAAgDC,MAAhD,CAAZ;AAEAuC,MAAAA,MAAM,CAACC,MAAP,CAAc9B,GAAd,EAAmB;AACjB+B,QAAAA,gBAAgB,EAAE/C,QADD;AAEjBwC,QAAAA,aAAa,EAAbA,aAFiB;AAGjBC,QAAAA,OAAO,EAAPA,OAHiB;AAIjBtC,QAAAA,QAAQ,EAARA;AAJiB,OAAnB;AAOAsC,MAAAA,OAAO,CAACjC,OAAR,CAAgB,UAAAwC,MAAM,EAAI;AACxBrB,QAAAA,eAAe,CAACsB,IAAhB,CAAqBD,MAArB;AACApB,QAAAA,eAAe,CAACoB,MAAM,CAACrC,EAAR,CAAf,GAA6BqC,MAA7B,CAFwB;AAIxB;AACA;AACA;AACA;AACA;AACA;AACD,OAVD;AAYA,aAAOhC,GAAP;AACD,KArC2B,CAA9B;AAwCA,WAAOmB,qBAAP;AACD,GAzDD;;AA2DA,MAAM/B,WAAW,GAAGyB,kBAAkB,CAACnC,cAAc,CAACoC,IAAhB,EAAsB,CAAtB,EAAyB,EAAzB,CAAtC;AAEA1B,EAAAA,WAAW,CAACI,OAAZ,CAAoB,UAAAwC,MAAM,EAAI;AAC5BrB,IAAAA,eAAe,CAACsB,IAAhB,CAAqBD,MAArB;AACApB,IAAAA,eAAe,CAACoB,MAAM,CAACrC,EAAR,CAAf,GAA6BqC,MAA7B,CAF4B;AAI5B;AACA;AACA;AACA;AACA;AACA;AACD,GAVD;AAYA,SAAO;AACLlB,IAAAA,IAAI,EAAE1B,WADD;AAEL8C,IAAAA,QAAQ,EAAEvB,eAFL;AAGLwB,IAAAA,QAAQ,EAAEvB;AAHL,GAAP;AAKD;;AAED,SAASM,OAAT,CACEJ,IADF,EAEE9B,QAFF,EAGE;AACA,MAAMoD,QAAQ,GAAG,IAAIC,GAAJ,EAAjB;AAEA,SAAOvB,IAAI,CAACwB,MAAL,CAAY,UAACvC,GAAD,EAAMC,GAAN,EAAc;AAC/B,QAAMuC,MAAM,QAAMvC,GAAG,CAACV,MAAJ,CAAWN,QAAX,CAAlB;AACA,QAAMwD,QAAQ,GAAGzC,GAAG,CAAC0C,GAAJ,CAAQF,MAAR,CAAjB;;AACA,QAAI,CAACC,QAAL,EAAe;AACbzC,MAAAA,GAAG,CAAC2C,GAAJ,CAAQH,MAAR,EAAgB,CAACvC,GAAD,CAAhB;AACD,KAFD,MAEO;AACLD,MAAAA,GAAG,CAAC2C,GAAJ,CAAQH,MAAR,YAAoBC,QAApB,GAA8BxC,GAA9B;AACD;;AACD,WAAOD,GAAP;AACD,GATM,EASJqC,QATI,CAAP;AAUD;;;;"}

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

@@ -1 +1 @@
-{"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 ? 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":";;;;;;;;;;;;;;AAGO,SAASA,UAAT,CACLC,QADK,EAELC,QAFK,EAGgB;AACrB,MAAMC,YAAY,GAAGF,QAAQ,CAACG,QAAT,GAAoBC,OAAzC;AAEA,MAAMC,cAAgC,GAAG,EAAzC,CAHqB;;AAMrB,MAAMC,gBAAgB,GAAGJ,YAAY,CAACK,MAAb,CAAoB,UAAAC,IAAI;AAAA,WAC/CR,QAAQ,CAACS,gBAAT,CAA0BD,IAAI,CAACE,EAA/B,CAD+C;AAAA,GAAxB,CAAzB;AAIA,MAAMC,cAOL,GAAG,EAPJ;AASAL,EAAAA,gBAAgB,CAACM,OAAjB,CAAyB,UAAAC,SAAS,EAAI;AACpC,QAAMC,MAAM,GAAGd,QAAQ,CAACe,SAAT,CAAmBF,SAAS,CAACH,EAA7B,CAAf;AAEAC,IAAAA,cAAc,CAACE,SAAS,CAACH,EAAX,CAAd,GAA+B;AAC7BM,MAAAA,aAAa,EAAEF,MAAM,CAACE,aADO;AAE7BC,MAAAA,aAAa,EAAEH,MAAM,CAACG,aAFO;AAG7BC,MAAAA,SAAS,EAAElB,QAAQ,CAACmB,kBAAT,CAA4BN,SAAS,CAACH,EAAtC;AAHkB,KAA/B;AAKD,GARD;;AAUA,MAAMU,QAAQ,GAAG,SAAXA,QAAW,CAACC,IAAD,EAA4B;AAC3C;AACA;AACA,QAAMC,UAAU,GAAGD,IAAI,CAACE,KAAL,EAAnB;AAEAD,IAAAA,UAAU,CAACd,IAAX,CAAgB,UAACgB,IAAD,EAAOC,IAAP,EAAgB;AAC9B,WAAK,IAAIC,CAAC,GAAG,CAAb,EAAgBA,CAAC,GAAGpB,gBAAgB,CAACqB,MAArC,EAA6CD,CAAC,IAAI,CAAlD,EAAqD;AAAA;;AACnD,YAAMb,SAAS,GAAGP,gBAAgB,CAACoB,CAAD,CAAlC;AACA,YAAME,UAAU,GAAGjB,cAAc,CAACE,SAAS,CAACH,EAAX,CAAjC;AACA,YAAMmB,MAAM,sBAAGhB,SAAH,oBAAGA,SAAS,CAAEiB,IAAd,8BAAsB,KAAlC;;AAEA,YAAIF,UAAU,CAACZ,aAAf,EAA8B;AAC5B,cAAMe,MAAM,GAAGP,IAAI,CAACQ,MAAL,CAAYnB,SAAS,CAACH,EAAtB,CAAf;AACA,cAAMuB,MAAM,GAAGR,IAAI,CAACO,MAAL,CAAYnB,SAAS,CAACH,EAAtB,CAAf;AAEA,cAAMwB,UAAU,GAAG,OAAOH,MAAP,KAAkB,WAArC;AACA,cAAMI,UAAU,GAAG,OAAOF,MAAP,KAAkB,WAArC;;AAEA,cAAIC,UAAU,IAAIC,UAAlB,EAA8B;AAC5B,mBAAOD,UAAU,IAAIC,UAAd,GAA2B,CAA3B,GAA+BD,UAAU,GAAG,CAAH,GAAO,CAAC,CAAxD;AACD;AACF,SAfkD;;;AAkBnD,YAAIE,OAAO,GAAGR,UAAU,CAACV,SAAX,CAAqBM,IAArB,EAA2BC,IAA3B,EAAiCZ,SAAS,CAACH,EAA3C,CAAd;;AAEA,YAAI0B,OAAO,KAAK,CAAhB,EAAmB;AACjB,cAAIP,MAAJ,EAAY;AACVO,YAAAA,OAAO,IAAI,CAAC,CAAZ;AACD;;AAED,cAAIR,UAAU,CAACX,aAAf,EAA8B;AAC5BmB,YAAAA,OAAO,IAAI,CAAC,CAAZ;AACD;;AAED,iBAAOA,OAAP;AACD;AACF;;AAED,aAAOZ,IAAI,CAACa,KAAL,GAAaZ,IAAI,CAACY,KAAzB;AACD,KAnCD,EAL2C;;AA2C3Cf,IAAAA,UAAU,CAACV,OAAX,CAAmB,UAAA0B,GAAG,EAAI;AACxBjC,MAAAA,cAAc,CAACkC,IAAf,CAAoBD,GAApB;;AACA,UAAI,CAACA,GAAG,CAACE,OAAL,IAAgBF,GAAG,CAACE,OAAJ,CAAYb,MAAZ,IAAsB,CAA1C,EAA6C;AAC3C;AACD;;AACDW,MAAAA,GAAG,CAACE,OAAJ,GAAcpB,QAAQ,CAACkB,GAAG,CAACE,OAAL,CAAtB;AACD,KAND;AAQA,WAAOlB,UAAP;AACD,GApDD;;AAsDA,SAAO;AACLD,IAAAA,IAAI,EAAED,QAAQ,CAACnB,QAAQ,CAACoB,IAAV,CADT;AAELoB,IAAAA,QAAQ,EAAEpC,cAFL;AAGLqC,IAAAA,QAAQ,EAAEzC,QAAQ,CAACyC;AAHd,GAAP;AAKD;;;;"}
+{"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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"}

package/build/esm/index.js

@@ -217,9 +217,6 @@ function memo(getDeps, fn, opts) {
 //   return (4294967296 * (2097151 & h2) + (h1 >>> 0)).toString()
 // }
 
-//
-var Please_use_the_create_table_column_utilities_to_define_columns = Symbol();
-
 //
 var Visibility = {
   getInitialState: function getInitialState() {
@@ -2774,9 +2771,6 @@ var Expanding = {
     return {
       onExpandedChange: makeStateUpdater('expanded', instance),
       autoResetExpanded: true,
-      getIsRowExpanded: function getIsRowExpanded(row) {
-        return !!(row == null ? void 0 : row.original).expanded;
-      },
       expandSubRows: true,
       paginateExpandedRows: true
     };
@@ -2851,7 +2845,7 @@ var Expanding = {
       getIsRowExpanded: function getIsRowExpanded(rowId) {
         var _instance$options$get;
 
-        var row = instance.getRow(rowId);
+        var row = instance.getPreExpandedRowModel().rowsById[rowId];
 
         if (!row) {
           if (process.env.NODE_ENV !== 'production') {
@@ -2862,7 +2856,7 @@ var Expanding = {
         }
 
         var expanded = instance.getState().expanded;
-        return !!((_instance$options$get = instance.options.getIsRowExpanded == null ? void 0 : instance.options.getIsRowExpanded(row)) != null ? _instance$options$get : expanded || (expanded == null ? void 0 : expanded[rowId]));
+        return !!((_instance$options$get = instance.options.getIsRowExpanded == null ? void 0 : instance.options.getIsRowExpanded(row)) != null ? _instance$options$get : expanded === true || (expanded == null ? void 0 : expanded[rowId]));
       },
       getRowCanExpand: function getRowCanExpand(rowId) {
         var _ref, _ref2, _instance$options$get2, _row$subRows;
@@ -2936,7 +2930,7 @@ var Expanding = {
         return [instance.getState().expanded, instance.getGroupedRowModel(), instance.options.expandRowsFn, instance.options.paginateExpandedRows];
       }, function (expanded, rowModel, expandRowsFn, paginateExpandedRows) {
         if (!expandRowsFn || // Do not expand if rows are not included in pagination
-        !paginateExpandedRows || !Object.keys(expanded != null ? expanded : {}).length) {
+        !paginateExpandedRows || expanded !== true && !Object.keys(expanded != null ? expanded : {}).length) {
           return rowModel;
         }
 
@@ -2947,9 +2941,6 @@ var Expanding = {
           var _instance$options$deb;
 
           return (_instance$options$deb = instance.options.debugAll) != null ? _instance$options$deb : instance.options.debugTable;
-        },
-        onChange: function onChange() {
-          instance._notifyPageIndexReset();
         }
       }),
       getPreExpandedRowModel: function getPreExpandedRowModel() {
@@ -3101,8 +3092,8 @@ var Pagination = {
       getCanNextPage: function getCanNextPage() {
         var _instance$getState$pa = instance.getState().pagination,
             pageIndex = _instance$getState$pa.pageIndex,
-            pageCount = _instance$getState$pa.pageCount,
             pageSize = _instance$getState$pa.pageSize;
+        var pageCount = instance.getPageCount();
 
         if (pageCount === -1) {
           return true;
@@ -4202,6 +4193,7 @@ function init(opts) {
 
 function _createTable(_, __, __options) {
   return {
+    generics: undefined,
     __options: __options != null ? __options : {
       render: function render() {
         throw new Error();
@@ -4658,14 +4650,13 @@ function groupBy(rows, columnId) {
 
 function expandRowsFn(instance, sortedRowModel) {
   var expandedRows = [];
-  var expandSubRows = instance.options.expandSubRows;
 
   var handleRow = function handleRow(row) {
     var _row$subRows;
 
     expandedRows.push(row);
 
-    if (expandSubRows && (_row$subRows = row.subRows) != null && _row$subRows.length && instance.getIsRowExpanded(row.id)) {
+    if (instance.options.expandSubRows && (_row$subRows = row.subRows) != null && _row$subRows.length && instance.getIsRowExpanded(row.id)) {
       row.subRows.forEach(handleRow);
     }
   };
@@ -4704,5 +4695,5 @@ function paginateRowsFn(instance, rowModel) {
   };
 }
 
-export { ColumnSizing, Expanding, Filters, Grouping, Headers, Ordering, Pagination, Pinning, Please_use_the_create_table_column_utilities_to_define_columns, RowSelection, Sorting, Visibility, buildHeaderGroups, columnFilterRowsFn, createTableInstance, defaultColumnSizing, expandRowsFn, flattenBy, functionalUpdate, globalFilterRowsFn, groupRowsFn, init, isFunction, isRowSelected, makeStateUpdater, memo, noop, paginateRowsFn, passiveEventSupported, propGetter, selectRowsFn, shouldAutoRemoveFilter, sortRowsFn };
+export { ColumnSizing, Expanding, Filters, Grouping, Headers, Ordering, Pagination, Pinning, RowSelection, Sorting, Visibility, buildHeaderGroups, columnFilterRowsFn, createTableInstance, defaultColumnSizing, expandRowsFn, flattenBy, functionalUpdate, globalFilterRowsFn, groupRowsFn, init, isFunction, isRowSelected, makeStateUpdater, memo, noop, paginateRowsFn, passiveEventSupported, propGetter, selectRowsFn, shouldAutoRemoveFilter, sortRowsFn };
 //# sourceMappingURL=index.js.map