@tanstack/react-table 0.0.1-alpha.9 → 8.0.0-alpha.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (129) hide show
  1. package/build/cjs/_virtual/_rollupPluginBabelHelpers.js +112 -0
  2. package/build/cjs/_virtual/_rollupPluginBabelHelpers.js.map +1 -0
  3. package/build/cjs/aggregationTypes.js +130 -0
  4. package/build/cjs/aggregationTypes.js.map +1 -0
  5. package/build/cjs/core.js +552 -0
  6. package/build/cjs/core.js.map +1 -0
  7. package/build/cjs/createTable.js +108 -0
  8. package/build/cjs/createTable.js.map +1 -0
  9. package/build/cjs/features/ColumnSizing.js +317 -0
  10. package/build/cjs/features/ColumnSizing.js.map +1 -0
  11. package/build/cjs/features/Expanding.js +255 -0
  12. package/build/cjs/features/Expanding.js.map +1 -0
  13. package/build/cjs/features/Filters.js +445 -0
  14. package/build/cjs/features/Filters.js.map +1 -0
  15. package/build/cjs/features/Grouping.js +249 -0
  16. package/build/cjs/features/Grouping.js.map +1 -0
  17. package/build/cjs/features/Headers.js +549 -0
  18. package/build/cjs/features/Headers.js.map +1 -0
  19. package/build/cjs/features/Ordering.js +86 -0
  20. package/build/cjs/features/Ordering.js.map +1 -0
  21. package/build/cjs/features/Pagination.js +194 -0
  22. package/build/cjs/features/Pagination.js.map +1 -0
  23. package/build/cjs/features/Pinning.js +149 -0
  24. package/build/cjs/features/Pinning.js.map +1 -0
  25. package/build/cjs/features/RowSelection.js +541 -0
  26. package/build/cjs/features/RowSelection.js.map +1 -0
  27. package/build/cjs/features/Sorting.js +327 -0
  28. package/build/cjs/features/Sorting.js.map +1 -0
  29. package/build/cjs/features/Visibility.js +166 -0
  30. package/build/cjs/features/Visibility.js.map +1 -0
  31. package/build/cjs/filterTypes.js +172 -0
  32. package/build/cjs/filterTypes.js.map +1 -0
  33. package/build/cjs/index.js +30 -0
  34. package/build/cjs/index.js.map +1 -0
  35. package/build/cjs/sortTypes.js +122 -0
  36. package/build/cjs/sortTypes.js.map +1 -0
  37. package/build/cjs/utils/columnFilterRowsFn.js +131 -0
  38. package/build/cjs/utils/columnFilterRowsFn.js.map +1 -0
  39. package/build/cjs/utils/expandRowsFn.js +38 -0
  40. package/build/cjs/utils/expandRowsFn.js.map +1 -0
  41. package/build/cjs/utils/globalFilterRowsFn.js +101 -0
  42. package/build/cjs/utils/globalFilterRowsFn.js.map +1 -0
  43. package/build/cjs/utils/groupRowsFn.js +155 -0
  44. package/build/cjs/utils/groupRowsFn.js.map +1 -0
  45. package/build/cjs/utils/sortRowsFn.js +94 -0
  46. package/build/cjs/utils/sortRowsFn.js.map +1 -0
  47. package/build/cjs/utils.js +146 -0
  48. package/build/cjs/utils.js.map +1 -0
  49. package/build/esm/index.js +4747 -0
  50. package/build/esm/index.js.map +1 -0
  51. package/build/stats-html.html +2689 -0
  52. package/build/stats-react.json +817 -0
  53. package/build/types/aggregationTypes.d.ts +22 -0
  54. package/build/types/core.d.ts +111 -0
  55. package/build/types/createTable.d.ts +53 -0
  56. package/build/types/features/ColumnSizing.d.ts +67 -0
  57. package/build/types/features/Expanding.d.ts +53 -0
  58. package/build/types/features/Filters.d.ts +98 -0
  59. package/build/types/features/Grouping.d.ts +82 -0
  60. package/build/types/features/Headers.d.ts +41 -0
  61. package/build/types/features/Ordering.d.ts +19 -0
  62. package/build/types/features/Pagination.d.ts +43 -0
  63. package/build/types/features/Pinning.d.ts +39 -0
  64. package/build/types/features/RowSelection.d.ts +66 -0
  65. package/build/types/features/Sorting.d.ts +78 -0
  66. package/build/types/features/Visibility.d.ts +47 -0
  67. package/build/types/filterTypes.d.ts +50 -0
  68. package/build/types/index.d.ts +7 -0
  69. package/build/types/sortTypes.d.ts +18 -0
  70. package/build/types/types.d.ts +127 -0
  71. package/build/types/utils/columnFilterRowsFn.d.ts +2 -0
  72. package/build/types/utils/expandRowsFn.d.ts +2 -0
  73. package/build/types/utils/globalFilterRowsFn.d.ts +2 -0
  74. package/build/types/utils/groupRowsFn.d.ts +2 -0
  75. package/build/types/utils/paginateRowsFn.d.ts +2 -0
  76. package/build/types/utils/sortRowsFn.d.ts +2 -0
  77. package/build/types/utils.d.ts +28 -0
  78. package/{dist/react-table.development.js → build/umd/index.development.js} +1617 -249
  79. package/build/umd/index.development.js.map +1 -0
  80. package/build/umd/index.production.js +12 -0
  81. package/build/umd/index.production.js.map +1 -0
  82. package/package.json +9 -94
  83. package/src/core.tsx +252 -264
  84. package/src/createTable.tsx +69 -9
  85. package/src/features/ColumnSizing.ts +453 -0
  86. package/src/features/Expanding.ts +27 -11
  87. package/src/features/Filters.ts +75 -20
  88. package/src/features/Grouping.ts +27 -12
  89. package/src/features/Headers.ts +55 -50
  90. package/src/features/Ordering.ts +2 -3
  91. package/src/features/Pagination.ts +314 -0
  92. package/src/features/Pinning.ts +3 -16
  93. package/src/features/RowSelection.ts +831 -0
  94. package/src/features/Sorting.ts +82 -22
  95. package/src/features/Visibility.ts +2 -4
  96. package/src/sortTypes.ts +1 -1
  97. package/src/types.ts +55 -9
  98. package/src/utils/columnFilterRowsFn.ts +5 -12
  99. package/src/utils/expandRowsFn.ts +2 -5
  100. package/src/utils/globalFilterRowsFn.ts +3 -10
  101. package/src/utils/groupRowsFn.ts +3 -5
  102. package/src/utils/paginateRowsFn.ts +34 -0
  103. package/src/utils/sortRowsFn.ts +5 -5
  104. package/src/utils.tsx +20 -6
  105. package/dist/react-table.development.js.map +0 -1
  106. package/dist/react-table.production.min.js +0 -2
  107. package/dist/react-table.production.min.js.map +0 -1
  108. package/lib/index.js +0 -65
  109. package/src/features/notest/useAbsoluteLayout.test.js +0 -152
  110. package/src/features/notest/useBlockLayout.test.js +0 -158
  111. package/src/features/notest/useColumnOrder.test.js +0 -186
  112. package/src/features/notest/useExpanded.test.js +0 -125
  113. package/src/features/notest/useFilters.test.js +0 -393
  114. package/src/features/notest/useFiltersAndRowSelect.test.js +0 -256
  115. package/src/features/notest/useFlexLayout.test.js +0 -152
  116. package/src/features/notest/useGroupBy.test.js +0 -259
  117. package/src/features/notest/usePagination.test.js +0 -231
  118. package/src/features/notest/useResizeColumns.test.js +0 -229
  119. package/src/features/notest/useRowSelect.test.js +0 -250
  120. package/src/features/notest/useRowState.test.js +0 -178
  121. package/src/features/tests/Visibility.test.tsx +0 -225
  122. package/src/features/tests/__snapshots__/Visibility.test.tsx.snap +0 -390
  123. package/src/features/tests/withSorting.notest.tsx +0 -341
  124. package/src/features/withColumnResizing.ts +0 -281
  125. package/src/features/withPagination.ts +0 -208
  126. package/src/features/withRowSelection.ts +0 -467
  127. package/src/test-utils/makeTestData.ts +0 -41
  128. package/src/tests/__snapshots__/core.test.tsx.snap +0 -148
  129. package/src/tests/core.test.tsx +0 -241
@@ -0,0 +1 @@
1
+ {"version":3,"file":"globalFilterRowsFn.js","sources":["../../../src/utils/globalFilterRowsFn.ts"],"sourcesContent":["import { ReactTable, Row, RowModel } from '../types'\n\nexport function globalFilterRowsFn<\n TData,\n TValue,\n TFilterFns,\n TSortingFns,\n TAggregationFns\n>(\n instance: ReactTable<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>,\n rowModel: RowModel<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>\n): RowModel<TData, TValue, TFilterFns, TSortingFns, TAggregationFns> {\n const globalFilter = instance.getState().globalFilter\n const newFilteredFlatRows: Row<\n TData,\n TValue,\n TFilterFns,\n TSortingFns,\n TAggregationFns\n >[] = []\n const newFilteredRowsById: Record<\n string,\n Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>\n > = {}\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 = (\n rowsToFilter: Row<\n TData,\n TValue,\n TFilterFns,\n TSortingFns,\n TAggregationFns\n >[],\n depth = 0\n ) => {\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 = (\n rowsToFilter: Row<\n TData,\n TValue,\n TFilterFns,\n TSortingFns,\n TAggregationFns\n >[],\n depth = 0\n ) => {\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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"}
@@ -0,0 +1,155 @@
1
+ /**
2
+ * react-table
3
+ *
4
+ * Copyright (c) TanStack
5
+ *
6
+ * This source code is licensed under the MIT license found in the
7
+ * LICENSE.md file in the root directory of this source tree.
8
+ *
9
+ * @license MIT
10
+ */
11
+ 'use strict';
12
+
13
+ Object.defineProperty(exports, '__esModule', { value: true });
14
+
15
+ var utils = require('../utils.js');
16
+
17
+ function groupRowsFn(instance, sortedRowModel) {
18
+ var groupingState = instance.getState().grouping; // Filter the grouping list down to columns that exist
19
+
20
+ var existingGrouping = groupingState.filter(function (columnId) {
21
+ return instance.getColumn(columnId);
22
+ }); // Find the columns that can or are aggregating
23
+ // Uses each column to aggregate rows into a single value
24
+
25
+ var aggregateRowsToValues = function aggregateRowsToValues(leafRows, groupedRows, depth) {
26
+ var values = {};
27
+ instance.getAllLeafColumns().forEach(function (column) {
28
+ // Don't aggregate columns that are in the grouping
29
+ if (existingGrouping.includes(column.id)) {
30
+ values[column.id] = groupedRows[0] ? groupedRows[0].values[column.id] : null;
31
+ return;
32
+ } // Aggregate the values
33
+
34
+
35
+ var aggregateFn = instance.getColumnAggregationFn(column.id);
36
+
37
+ if (aggregateFn) {
38
+ // Get the columnValues to aggregate
39
+ var groupedValues = groupedRows.map(function (row) {
40
+ return row.values[column.id];
41
+ }); // Get the columnValues to aggregate
42
+
43
+ var leafValues = leafRows.map(function (row) {
44
+ var columnValue = row.values[column.id];
45
+
46
+ if (!depth && column.aggregateValue) {
47
+ columnValue = column.aggregateValue(columnValue);
48
+ }
49
+
50
+ return columnValue;
51
+ });
52
+ values[column.id] = aggregateFn(leafValues, groupedValues);
53
+ } else if (column.aggregationType) {
54
+ console.info({
55
+ column: column
56
+ });
57
+ throw new Error(process.env.NODE_ENV !== 'production' ? "React Table: Invalid column.aggregateType option for column listed above" : '');
58
+ } else {
59
+ values[column.id] = null;
60
+ }
61
+ });
62
+ return values;
63
+ };
64
+
65
+ var groupedFlatRows = [];
66
+ var groupedRowsById = {}; // const onlyGroupedFlatRows: Row[] = [];
67
+ // const onlyGroupedRowsById: Record<RowId, Row> = {};
68
+ // const nonGroupedFlatRows: Row[] = [];
69
+ // const nonGroupedRowsById: Record<RowId, Row> = {};
70
+ // Recursively group the data
71
+
72
+ var groupUpRecursively = function groupUpRecursively(rows, depth, parentId) {
73
+ if (depth === void 0) {
74
+ depth = 0;
75
+ }
76
+
77
+ // This is the last level, just return the rows
78
+ if (depth === existingGrouping.length) {
79
+ return rows;
80
+ }
81
+
82
+ var columnId = existingGrouping[depth]; // Group the rows together for this level
83
+
84
+ var rowGroupsMap = groupBy(rows, columnId); // Peform aggregations for each group
85
+
86
+ var aggregatedGroupedRows = Array.from(rowGroupsMap.entries()).map(function (_ref, index) {
87
+ var groupingValue = _ref[0],
88
+ groupedRows = _ref[1];
89
+ var id = columnId + ":" + groupingValue;
90
+ id = parentId ? parentId + ">" + id : id; // First, Recurse to group sub rows before aggregation
91
+
92
+ var subRows = groupUpRecursively(groupedRows, depth + 1, id); // Flatten the leaf rows of the rows in this group
93
+
94
+ var leafRows = depth ? utils.flattenBy(groupedRows, function (row) {
95
+ return row.leafRows;
96
+ }) : groupedRows;
97
+ var values = aggregateRowsToValues(leafRows, groupedRows, depth);
98
+ var row = instance.createRow(id, undefined, index, depth, values);
99
+ Object.assign(row, {
100
+ groupingColumnId: columnId,
101
+ groupingValue: groupingValue,
102
+ subRows: subRows,
103
+ leafRows: leafRows
104
+ });
105
+ subRows.forEach(function (subRow) {
106
+ groupedFlatRows.push(subRow);
107
+ groupedRowsById[subRow.id] = subRow; // if (subRow.getIsGrouped?.()) {
108
+ // onlyGroupedFlatRows.push(subRow);
109
+ // onlyGroupedRowsById[subRow.id] = subRow;
110
+ // } else {
111
+ // nonGroupedFlatRows.push(subRow);
112
+ // nonGroupedRowsById[subRow.id] = subRow;
113
+ // }
114
+ });
115
+ return row;
116
+ });
117
+ return aggregatedGroupedRows;
118
+ };
119
+
120
+ var groupedRows = groupUpRecursively(sortedRowModel.rows, 0, '');
121
+ groupedRows.forEach(function (subRow) {
122
+ groupedFlatRows.push(subRow);
123
+ groupedRowsById[subRow.id] = subRow; // if (subRow.getIsGrouped?.()) {
124
+ // onlyGroupedFlatRows.push(subRow);
125
+ // onlyGroupedRowsById[subRow.id] = subRow;
126
+ // } else {
127
+ // nonGroupedFlatRows.push(subRow);
128
+ // nonGroupedRowsById[subRow.id] = subRow;
129
+ // }
130
+ });
131
+ return {
132
+ rows: groupedRows,
133
+ flatRows: groupedFlatRows,
134
+ rowsById: groupedRowsById
135
+ };
136
+ }
137
+
138
+ function groupBy(rows, columnId) {
139
+ var groupMap = new Map();
140
+ return rows.reduce(function (map, row) {
141
+ var resKey = "" + row.values[columnId];
142
+ var previous = map.get(resKey);
143
+
144
+ if (!previous) {
145
+ map.set(resKey, [row]);
146
+ } else {
147
+ map.set(resKey, [].concat(previous, [row]));
148
+ }
149
+
150
+ return map;
151
+ }, groupMap);
152
+ }
153
+
154
+ exports.groupRowsFn = groupRowsFn;
155
+ //# sourceMappingURL=groupRowsFn.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"groupRowsFn.js","sources":["../../../src/utils/groupRowsFn.ts"],"sourcesContent":["import { ReactTable, Row, RowModel } from '../types'\nimport { flattenBy } from '../utils'\n\nexport function groupRowsFn<\n TData,\n TValue,\n TFilterFns,\n TSortingFns,\n TAggregationFns\n>(\n instance: ReactTable<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>,\n sortedRowModel: RowModel<\n TData,\n TValue,\n TFilterFns,\n TSortingFns,\n TAggregationFns\n >\n): RowModel<TData, TValue, TFilterFns, TSortingFns, TAggregationFns> {\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<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[],\n groupedRows: Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[],\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 ? `React 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<\n TData,\n TValue,\n TFilterFns,\n TSortingFns,\n TAggregationFns\n >[] = []\n const groupedRowsById: Record<\n string,\n Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>\n > = {}\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<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[],\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<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>(\n rows: Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[],\n columnId: string\n) {\n const groupMap = new Map<\n any,\n Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[]\n >()\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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"}
@@ -0,0 +1,94 @@
1
+ /**
2
+ * react-table
3
+ *
4
+ * Copyright (c) TanStack
5
+ *
6
+ * This source code is licensed under the MIT license found in the
7
+ * LICENSE.md file in the root directory of this source tree.
8
+ *
9
+ * @license MIT
10
+ */
11
+ 'use strict';
12
+
13
+ Object.defineProperty(exports, '__esModule', { value: true });
14
+
15
+ function sortRowsFn(instance, rowModel) {
16
+ var sortingState = instance.getState().sorting;
17
+ var sortedFlatRows = []; // Filter out sortings that correspond to non existing columns
18
+
19
+ var availableSorting = sortingState.filter(function (sort) {
20
+ return instance.getColumnCanSort(sort.id);
21
+ });
22
+ var columnInfoById = {};
23
+ availableSorting.forEach(function (sortEntry) {
24
+ var column = instance.getColumn(sortEntry.id);
25
+ columnInfoById[sortEntry.id] = {
26
+ sortUndefined: column.sortUndefined,
27
+ invertSorting: column.invertSorting,
28
+ sortingFn: instance.getColumnSortingFn(sortEntry.id)
29
+ };
30
+ });
31
+
32
+ var sortData = function sortData(rows) {
33
+ // This will also perform a stable sorting using the row index
34
+ // if needed.
35
+ var sortedData = rows.slice();
36
+ sortedData.sort(function (rowA, rowB) {
37
+ for (var i = 0; i < availableSorting.length; i += 1) {
38
+ var _sortEntry$desc;
39
+
40
+ var sortEntry = availableSorting[i];
41
+ var columnInfo = columnInfoById[sortEntry.id];
42
+ var isDesc = (_sortEntry$desc = sortEntry == null ? void 0 : sortEntry.desc) != null ? _sortEntry$desc : false;
43
+
44
+ if (columnInfo.sortUndefined) {
45
+ var aValue = rowA.values[sortEntry.id];
46
+ var bValue = rowB.values[sortEntry.id];
47
+ var aUndefined = typeof aValue === 'undefined';
48
+ var bUndefined = typeof bValue === 'undefined';
49
+
50
+ if (aUndefined || bUndefined) {
51
+ return aUndefined && bUndefined ? 0 : aUndefined ? 1 : -1;
52
+ }
53
+ } // This function should always return in ascending order
54
+
55
+
56
+ var sortInt = columnInfo.sortingFn(rowA, rowB, sortEntry.id);
57
+
58
+ if (sortInt !== 0) {
59
+ if (isDesc) {
60
+ sortInt *= -1;
61
+ }
62
+
63
+ if (columnInfo.invertSorting) {
64
+ sortInt *= -1;
65
+ }
66
+
67
+ return sortInt;
68
+ }
69
+ }
70
+
71
+ return rowA.index - rowB.index;
72
+ }); // If there are sub-rows, sort them
73
+
74
+ sortedData.forEach(function (row) {
75
+ sortedFlatRows.push(row);
76
+
77
+ if (!row.subRows || row.subRows.length <= 1) {
78
+ return;
79
+ }
80
+
81
+ row.subRows = sortData(row.subRows);
82
+ });
83
+ return sortedData;
84
+ };
85
+
86
+ return {
87
+ rows: sortData(rowModel.rows),
88
+ flatRows: sortedFlatRows,
89
+ rowsById: rowModel.rowsById
90
+ };
91
+ }
92
+
93
+ exports.sortRowsFn = sortRowsFn;
94
+ //# sourceMappingURL=sortRowsFn.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"sortRowsFn.js","sources":["../../../src/utils/sortRowsFn.ts"],"sourcesContent":["import { ReactTable, Row, RowModel } from '../types'\nimport { SortingFn } from '../features/Sorting'\n\nexport function sortRowsFn<\n TData,\n TValue,\n TFilterFns,\n TSortingFns,\n TAggregationFns\n>(\n instance: ReactTable<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>,\n rowModel: RowModel<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>\n): RowModel<TData, TValue, TFilterFns, TSortingFns, TAggregationFns> {\n const sortingState = instance.getState().sorting\n\n const sortedFlatRows: Row<\n TData,\n TValue,\n TFilterFns,\n TSortingFns,\n TAggregationFns\n >[] = []\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<\n TData,\n TValue,\n TFilterFns,\n TSortingFns,\n TAggregationFns\n >\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 = (\n rows: Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[]\n ) => {\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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"}
@@ -0,0 +1,146 @@
1
+ /**
2
+ * react-table
3
+ *
4
+ * Copyright (c) TanStack
5
+ *
6
+ * This source code is licensed under the MIT license found in the
7
+ * LICENSE.md file in the root directory of this source tree.
8
+ *
9
+ * @license MIT
10
+ */
11
+ 'use strict';
12
+
13
+ Object.defineProperty(exports, '__esModule', { value: true });
14
+
15
+ var _rollupPluginBabelHelpers = require('./_virtual/_rollupPluginBabelHelpers.js');
16
+ var React = require('react');
17
+
18
+ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
19
+
20
+ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
21
+
22
+ function functionalUpdate(updater, input) {
23
+ return typeof updater === 'function' ? updater(input) : updater;
24
+ }
25
+ function makeStateUpdater(key, instance) {
26
+ return function (updater) {
27
+ instance.setState(function (old) {
28
+ var _extends2;
29
+
30
+ return _rollupPluginBabelHelpers["extends"]({}, old, (_extends2 = {}, _extends2[key] = functionalUpdate(updater, old[key]), _extends2));
31
+ });
32
+ };
33
+ } // SSR has issues with useLayoutEffect still, so use useEffect during SSR
34
+
35
+ typeof document !== 'undefined' ? React__default["default"].useLayoutEffect : React__default["default"].useEffect;
36
+ function isFunction(d) {
37
+ return d instanceof Function;
38
+ }
39
+ function flattenBy(arr, getChildren) {
40
+ var flat = [];
41
+
42
+ var recurse = function recurse(subArr) {
43
+ subArr.forEach(function (item) {
44
+ flat.push(item);
45
+ var children = getChildren(item);
46
+
47
+ if (children != null && children.length) {
48
+ recurse(children);
49
+ }
50
+ });
51
+ };
52
+
53
+ recurse(arr);
54
+ return flat;
55
+ }
56
+ // @ts-ignore // Just rely on the type, not the implementation
57
+ var propGetter = function propGetter(initial, getter) {
58
+ if (isFunction(getter)) {
59
+ return getter(initial);
60
+ }
61
+
62
+ return _rollupPluginBabelHelpers["extends"]({}, initial, getter != null ? getter : {});
63
+ };
64
+ function memo(getDeps, fn, opts) {
65
+ var deps = [];
66
+ var result;
67
+ return function () {
68
+ var newDeps = getDeps();
69
+ var newSerializedDeps = newDeps;
70
+ var oldSerializedDeps = deps;
71
+ var depsChanged = newSerializedDeps.length !== oldSerializedDeps.length || newSerializedDeps.some(function (dep, index) {
72
+ return oldSerializedDeps[index] !== dep;
73
+ });
74
+
75
+ if (depsChanged) {
76
+ if (opts != null && opts.debug) {
77
+ console.info(opts == null ? void 0 : opts.key, _rollupPluginBabelHelpers["extends"]({
78
+ length: oldSerializedDeps.length + " -> " + newSerializedDeps.length
79
+ }, newSerializedDeps.map(function (_, index) {
80
+ if (oldSerializedDeps[index] !== newSerializedDeps[index]) {
81
+ return [index, oldSerializedDeps[index], newSerializedDeps[index]];
82
+ }
83
+
84
+ return false;
85
+ }).filter(Boolean).reduce(function (accu, curr) {
86
+ var _extends3;
87
+
88
+ return _rollupPluginBabelHelpers["extends"]({}, accu, (_extends3 = {}, _extends3[curr[0]] = curr.slice(1), _extends3));
89
+ }, {}), {
90
+ parent: parent
91
+ }));
92
+ }
93
+
94
+ var oldResult = result;
95
+ result = fn.apply(void 0, newDeps);
96
+ deps = newSerializedDeps;
97
+ opts == null ? void 0 : opts.onChange == null ? void 0 : opts.onChange(result, oldResult);
98
+ oldResult = undefined;
99
+ }
100
+
101
+ return result;
102
+ };
103
+ } // Copied from: https://github.com/jonschlinkert/is-plain-object
104
+
105
+ function flexRender(Comp, props) {
106
+ return !Comp ? null : isReactComponent(Comp) ? /*#__PURE__*/React__default["default"].createElement(Comp, props) : Comp;
107
+ }
108
+
109
+ function isReactComponent(component) {
110
+ return isClassComponent(component) || typeof component === 'function' || isExoticComponent(component);
111
+ }
112
+
113
+ function isClassComponent(component) {
114
+ return typeof component === 'function' && function () {
115
+ var proto = Object.getPrototypeOf(component);
116
+ return proto.prototype && proto.prototype.isReactComponent;
117
+ }();
118
+ }
119
+
120
+ function isExoticComponent(component) {
121
+ return typeof component === 'object' && typeof component.$$typeof === 'symbol' && ['react.memo', 'react.forward_ref'].includes(component.$$typeof.description);
122
+ } // export function hashString(str: string, seed = 0): string {
123
+ // let h1 = 0xdeadbeef ^ seed,
124
+ // h2 = 0x41c6ce57 ^ seed
125
+ // for (let i = 0, ch; i < str.length; i++) {
126
+ // ch = str.charCodeAt(i)
127
+ // h1 = Math.imul(h1 ^ ch, 2654435761)
128
+ // h2 = Math.imul(h2 ^ ch, 1597334677)
129
+ // }
130
+ // h1 =
131
+ // Math.imul(h1 ^ (h1 >>> 16), 2246822507) ^
132
+ // Math.imul(h2 ^ (h2 >>> 13), 3266489909)
133
+ // h2 =
134
+ // Math.imul(h2 ^ (h2 >>> 16), 2246822507) ^
135
+ // Math.imul(h1 ^ (h1 >>> 13), 3266489909)
136
+ // return (4294967296 * (2097151 & h2) + (h1 >>> 0)).toString()
137
+ // }
138
+
139
+ exports.flattenBy = flattenBy;
140
+ exports.flexRender = flexRender;
141
+ exports.functionalUpdate = functionalUpdate;
142
+ exports.isFunction = isFunction;
143
+ exports.makeStateUpdater = makeStateUpdater;
144
+ exports.memo = memo;
145
+ exports.propGetter = propGetter;
146
+ //# sourceMappingURL=utils.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"utils.js","sources":["../../src/utils.tsx"],"sourcesContent":["import React from 'react'\nimport {\n Getter,\n NoInfer,\n PropGetterValue,\n Renderable,\n TableState,\n} from './types'\n\nexport type IsAny<T> = 0 extends 1 & T ? true : false\nexport type PartialKeys<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>\nexport type RequiredKeys<T, K extends keyof T> = Omit<T, K> &\n Required<Pick<T, K>>\nexport type Overwrite<T, U> = Omit<T, keyof U> & U\n\nexport type DataUpdateFunction<TInput, TOutput> = (input: TInput) => TOutput\n\nexport type Updater<TInput, TOutput> =\n | TOutput\n | DataUpdateFunction<TInput, TOutput>\n\nexport function functionalUpdate<TInput, TOutput = TInput>(\n updater: Updater<TInput, TOutput>,\n input: TInput\n): TOutput {\n return typeof updater === 'function'\n ? (updater as DataUpdateFunction<TInput, TOutput>)(input)\n : updater\n}\n\nexport function noop() {\n //\n}\n\nexport function makeStateUpdater(key: keyof TableState, instance: unknown) {\n return (updater: Updater<any, any>) => {\n ;(instance as any).setState(<TTableState,>(old: TTableState) => {\n return {\n ...old,\n [key]: functionalUpdate(updater, (old as any)[key]),\n }\n })\n }\n}\n\n// SSR has issues with useLayoutEffect still, so use useEffect during SSR\nexport const safeUseLayoutEffect =\n typeof document !== 'undefined' ? React.useLayoutEffect : React.useEffect\n\nexport function useMountedLayoutEffect(fn: any, deps: any[]) {\n const mountedRef = React.useRef(false)\n\n safeUseLayoutEffect(() => {\n if (mountedRef.current) {\n fn()\n }\n mountedRef.current = true\n // eslint-disable-next-line\n }, deps)\n}\n\nexport function useGetLatest<T>(obj: T): () => T {\n const ref = React.useRef<T>()\n ref.current = obj\n\n return React.useCallback(() => ref.current!, [])\n}\n\ntype AnyFunction = (...args: any) => any\n\nexport function isFunction<T extends AnyFunction>(d: any): d is T {\n return d instanceof Function\n}\n\nexport function flattenBy<TNode>(\n arr: TNode[],\n getChildren: (item: TNode) => TNode[]\n) {\n const flat: TNode[] = []\n\n const recurse = (subArr: TNode[]) => {\n subArr.forEach(item => {\n flat.push(item)\n const children = getChildren(item)\n if (children?.length) {\n recurse(children)\n }\n })\n }\n\n recurse(arr)\n\n return flat\n}\n\ntype PropGetterImpl = <TBaseProps, TGetter extends Getter<TBaseProps>>(\n initial: TBaseProps,\n userProps?: TGetter\n) => PropGetterValue<TBaseProps, TGetter>\n\n// @ts-ignore // Just rely on the type, not the implementation\nexport const propGetter: PropGetterImpl = (initial, getter) => {\n if (isFunction(getter)) {\n return getter(initial)\n }\n\n return {\n ...initial,\n ...(getter ?? {}),\n }\n}\n\nexport function memo<TDeps extends readonly any[], TResult>(\n getDeps: () => [...TDeps],\n fn: (...args: NoInfer<[...TDeps]>) => TResult,\n opts: {\n key: string\n debug?: boolean\n onChange?: (result: TResult, previousResult?: TResult) => void\n }\n): () => TResult {\n let deps: any[] = []\n let result: TResult | undefined\n\n return () => {\n const newDeps = getDeps()\n const newSerializedDeps = newDeps\n const oldSerializedDeps = deps\n\n const depsChanged =\n newSerializedDeps.length !== oldSerializedDeps.length ||\n newSerializedDeps.some(\n (dep: any, index: number) => oldSerializedDeps[index] !== dep\n )\n\n if (depsChanged) {\n if (opts?.debug) {\n console.info(opts?.key, {\n length: `${oldSerializedDeps.length} -> ${newSerializedDeps.length}`,\n ...newSerializedDeps\n .map((_, index) => {\n if (oldSerializedDeps[index] !== newSerializedDeps[index]) {\n return [\n index,\n oldSerializedDeps[index],\n newSerializedDeps[index],\n ]\n }\n\n return false\n })\n .filter(Boolean)\n .reduce(\n (accu, curr: any) => ({\n ...accu,\n [curr[0]]: curr.slice(1),\n }),\n {}\n ),\n parent,\n })\n }\n\n let oldResult = result\n result = fn(...newDeps)\n deps = newSerializedDeps\n opts?.onChange?.(result, oldResult)\n\n oldResult = undefined\n }\n\n return result!\n }\n}\n\n// Copied from: https://github.com/jonschlinkert/is-plain-object\nexport function isPlainObject(o: any): o is Object {\n if (!hasObjectPrototype(o)) {\n return false\n }\n\n // If has modified constructor\n const ctor = o.constructor\n if (typeof ctor === 'undefined') {\n return true\n }\n\n // If has modified prototype\n const prot = ctor.prototype\n if (!hasObjectPrototype(prot)) {\n return false\n }\n\n // If constructor does not have an Object-specific method\n if (!prot.hasOwnProperty('isPrototypeOf')) {\n return false\n }\n\n // Most likely a plain Object\n return true\n}\n\nfunction hasObjectPrototype(o: any): boolean {\n return Object.prototype.toString.call(o) === '[object Object]'\n}\n\nexport type Render = typeof flexRender\n\nexport function flexRender<TProps extends {}>(\n Comp: Renderable<TProps>,\n props: TProps\n): React.ReactNode {\n return !Comp ? null : isReactComponent(Comp) ? <Comp {...props} /> : Comp\n}\n\nfunction isReactComponent(component: unknown): component is React.FC {\n return (\n isClassComponent(component) ||\n typeof component === 'function' ||\n isExoticComponent(component)\n )\n}\n\nfunction isClassComponent(component: any) {\n return (\n typeof component === 'function' &&\n (() => {\n const proto = Object.getPrototypeOf(component)\n return proto.prototype && proto.prototype.isReactComponent\n })()\n )\n}\n\nfunction isExoticComponent(component: any) {\n return (\n typeof component === 'object' &&\n typeof component.$$typeof === 'symbol' &&\n ['react.memo', 'react.forward_ref'].includes(component.$$typeof.description)\n )\n}\n\n// export function hashString(str: string, seed = 0): string {\n// let h1 = 0xdeadbeef ^ seed,\n// h2 = 0x41c6ce57 ^ seed\n// for (let i = 0, ch; i < str.length; i++) {\n// ch = str.charCodeAt(i)\n// h1 = Math.imul(h1 ^ ch, 2654435761)\n// h2 = Math.imul(h2 ^ ch, 1597334677)\n// }\n// h1 =\n// Math.imul(h1 ^ (h1 >>> 16), 2246822507) ^\n// Math.imul(h2 ^ (h2 >>> 13), 3266489909)\n// h2 =\n// Math.imul(h2 ^ (h2 >>> 16), 2246822507) ^\n// Math.imul(h1 ^ (h1 >>> 13), 3266489909)\n// return (4294967296 * (2097151 & h2) + (h1 >>> 0)).toString()\n// }\n"],"names":["functionalUpdate","updater","input","makeStateUpdater","key","instance","setState","old","document","React","useLayoutEffect","useEffect","isFunction","d","Function","flattenBy","arr","getChildren","flat","recurse","subArr","forEach","item","push","children","length","propGetter","initial","getter","memo","getDeps","fn","opts","deps","result","newDeps","newSerializedDeps","oldSerializedDeps","depsChanged","some","dep","index","debug","console","info","map","_","filter","Boolean","reduce","accu","curr","slice","parent","oldResult","onChange","undefined","flexRender","Comp","props","isReactComponent","component","isClassComponent","isExoticComponent","proto","Object","getPrototypeOf","prototype","$$typeof","includes","description"],"mappings":"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"}