@macrostrat/data-sheet 2.0.1 → 2.1.0

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 (161) hide show
  1. package/CHANGELOG.md +14 -0
  2. package/README.md +17 -10
  3. package/dist/esm/{postgrest-table.d1f8b3a4.js → data-sheet.00171fc5.js} +76 -61
  4. package/dist/esm/data-sheet.00171fc5.js.map +1 -0
  5. package/dist/esm/{utils.5d81fe80.js → data-sheet.0adfe599.js} +2 -2
  6. package/dist/esm/{utils.5d81fe80.js.map → data-sheet.0adfe599.js.map} +1 -1
  7. package/dist/esm/{editor-popup.819ce365.js → data-sheet.1d6ac6c6.js} +28 -8
  8. package/dist/esm/data-sheet.1d6ac6c6.js.map +1 -0
  9. package/dist/esm/{data-loaders.b7de291b.js → data-sheet.2773da15.js} +12 -3
  10. package/dist/esm/data-sheet.2773da15.js.map +1 -0
  11. package/dist/esm/{main.module.7e0903d4.js → data-sheet.37e35216.js} +16 -1
  12. package/dist/esm/data-sheet.37e35216.js.map +1 -0
  13. package/dist/esm/{column-spec.e56f4d75.js → data-sheet.410c5122.js} +20 -7
  14. package/dist/esm/data-sheet.410c5122.js.map +1 -0
  15. package/dist/esm/{main.module.83442ac4.js → data-sheet.48635112.js} +4 -1
  16. package/dist/esm/data-sheet.48635112.js.map +1 -0
  17. package/dist/esm/{actions.module.560a3136.js → data-sheet.54cfa8e8.js} +1 -1
  18. package/dist/esm/{actions.module.560a3136.js.map → data-sheet.54cfa8e8.js.map} +1 -1
  19. package/dist/esm/{colors.75a92ad3.js → data-sheet.6021b6c9.js} +30 -21
  20. package/dist/esm/data-sheet.6021b6c9.js.map +1 -0
  21. package/dist/esm/{actions.module.684172fa.css → data-sheet.706f955d.css} +1 -1
  22. package/dist/esm/{actions.module.684172fa.css.map → data-sheet.706f955d.css.map} +1 -1
  23. package/dist/esm/{main.module.658cf7b2.css → data-sheet.91223ec6.css} +35 -1
  24. package/dist/esm/data-sheet.91223ec6.css.map +1 -0
  25. package/dist/esm/{actions.065d098d.js → data-sheet.a3eb6088.js} +4 -4
  26. package/dist/esm/{actions.065d098d.js.map → data-sheet.a3eb6088.js.map} +1 -1
  27. package/dist/esm/{main.module.df43976f.css → data-sheet.b3ccc91b.css} +8 -5
  28. package/dist/esm/data-sheet.b3ccc91b.css.map +1 -0
  29. package/dist/esm/{provider.7942302e.js → data-sheet.b4098761.js} +162 -13
  30. package/dist/esm/data-sheet.b4098761.js.map +1 -0
  31. package/dist/esm/{text-areas.ccfcf204.js → data-sheet.b5946d6b.js} +6 -5
  32. package/dist/esm/data-sheet.b5946d6b.js.map +1 -0
  33. package/dist/esm/{main.module.bd60788c.js → data-sheet.d570ef95.js} +22 -22
  34. package/dist/esm/data-sheet.d570ef95.js.map +1 -0
  35. package/dist/esm/{core.c9bdeacd.js → data-sheet.e09ffc66.js} +183 -82
  36. package/dist/esm/data-sheet.e09ffc66.js.map +1 -0
  37. package/dist/esm/{components.f832ecf3.js → data-sheet.e37b4bd3.js} +5 -5
  38. package/dist/esm/{components.f832ecf3.js.map → data-sheet.e37b4bd3.js.map} +1 -1
  39. package/dist/esm/data-sheet.ef63e366.css +110 -0
  40. package/dist/esm/data-sheet.ef63e366.css.map +1 -0
  41. package/dist/esm/index.d.ts +38 -24
  42. package/dist/esm/index.d.ts.map +1 -1
  43. package/dist/esm/index.js +3 -3
  44. package/dist/node/data-sheet.0f66147e.js +2 -0
  45. package/dist/node/data-sheet.0f66147e.js.map +1 -0
  46. package/dist/node/data-sheet.171105c1.js +2 -0
  47. package/dist/node/data-sheet.171105c1.js.map +1 -0
  48. package/dist/node/data-sheet.1a487c3c.js +2 -0
  49. package/dist/node/data-sheet.1a487c3c.js.map +1 -0
  50. package/dist/node/data-sheet.28641e23.css +2 -0
  51. package/dist/node/data-sheet.28641e23.css.map +1 -0
  52. package/dist/node/data-sheet.2cac1a8c.js +2 -0
  53. package/dist/node/data-sheet.2cac1a8c.js.map +1 -0
  54. package/dist/node/data-sheet.2f64274d.css +2 -0
  55. package/dist/node/data-sheet.2f64274d.css.map +1 -0
  56. package/dist/node/data-sheet.3680e59d.js +2 -0
  57. package/dist/node/data-sheet.3680e59d.js.map +1 -0
  58. package/dist/node/data-sheet.47e3f95c.js +2 -0
  59. package/dist/node/data-sheet.47e3f95c.js.map +1 -0
  60. package/dist/node/data-sheet.50d0742f.js +2 -0
  61. package/dist/node/data-sheet.50d0742f.js.map +1 -0
  62. package/dist/node/data-sheet.599efaa9.js +2 -0
  63. package/dist/node/data-sheet.599efaa9.js.map +1 -0
  64. package/dist/node/data-sheet.7b95fbc1.css +2 -0
  65. package/dist/node/data-sheet.7b95fbc1.css.map +1 -0
  66. package/dist/node/data-sheet.7bbad640.js +2 -0
  67. package/dist/node/data-sheet.7bbad640.js.map +1 -0
  68. package/dist/node/data-sheet.945becc3.js +2 -0
  69. package/dist/node/data-sheet.945becc3.js.map +1 -0
  70. package/dist/node/data-sheet.95445483.js +2 -0
  71. package/dist/node/data-sheet.95445483.js.map +1 -0
  72. package/dist/node/data-sheet.a65463ef.js +2 -0
  73. package/dist/node/data-sheet.a65463ef.js.map +1 -0
  74. package/dist/node/data-sheet.c3eefdc9.js +2 -0
  75. package/dist/node/data-sheet.c3eefdc9.js.map +1 -0
  76. package/dist/node/data-sheet.e6e07d4a.js +2 -0
  77. package/dist/node/data-sheet.e6e07d4a.js.map +1 -0
  78. package/dist/node/data-sheet.f0223f39.js +2 -0
  79. package/dist/node/data-sheet.f0223f39.js.map +1 -0
  80. package/dist/node/{actions.module.565df529.css → data-sheet.ffaf8ac7.css} +1 -1
  81. package/dist/node/data-sheet.ffaf8ac7.css.map +1 -0
  82. package/dist/node/index.js +1 -1
  83. package/dist/node/index.js.map +1 -1
  84. package/package.json +8 -6
  85. package/src/__archive/base.ts +1 -1
  86. package/src/__archive/components/column-utils.ts +1 -1
  87. package/src/__archive/components/index.ts +3 -3
  88. package/src/__archive/components/toolbar.ts +4 -4
  89. package/src/__archive/editors/index.ts +2 -2
  90. package/src/__archive/main.ts +6 -6
  91. package/src/__archive/provider.ts +1 -1
  92. package/src/__archive/test-sheet/index.ts +5 -5
  93. package/src/__archive/virtualized.ts +2 -2
  94. package/src/components/colors.ts +38 -22
  95. package/src/components/editor-popup.ts +28 -6
  96. package/src/components/main.module.sass +33 -0
  97. package/src/components/text-areas.ts +2 -1
  98. package/src/core.ts +262 -105
  99. package/src/main.module.sass +19 -0
  100. package/src/postgrest-table/data-loaders.ts +44 -12
  101. package/src/postgrest-table/index.ts +104 -45
  102. package/src/postgrest-table/main.module.sass +6 -4
  103. package/src/provider.ts +289 -98
  104. package/src/utils/column-spec.ts +42 -3
  105. package/dist/esm/cell-renderers.8222e82a.js +0 -31
  106. package/dist/esm/cell-renderers.8222e82a.js.map +0 -1
  107. package/dist/esm/colors.75a92ad3.js.map +0 -1
  108. package/dist/esm/column-spec.e56f4d75.js.map +0 -1
  109. package/dist/esm/core.c9bdeacd.js.map +0 -1
  110. package/dist/esm/data-loaders.b7de291b.js.map +0 -1
  111. package/dist/esm/editor-popup.819ce365.js.map +0 -1
  112. package/dist/esm/main.module.658cf7b2.css.map +0 -1
  113. package/dist/esm/main.module.7e0903d4.js.map +0 -1
  114. package/dist/esm/main.module.83442ac4.js.map +0 -1
  115. package/dist/esm/main.module.b66a4bc1.css +0 -91
  116. package/dist/esm/main.module.b66a4bc1.css.map +0 -1
  117. package/dist/esm/main.module.bd60788c.js.map +0 -1
  118. package/dist/esm/main.module.df43976f.css.map +0 -1
  119. package/dist/esm/postgrest-table.d1f8b3a4.js.map +0 -1
  120. package/dist/esm/provider.7942302e.js.map +0 -1
  121. package/dist/esm/text-areas.ccfcf204.js.map +0 -1
  122. package/dist/node/actions.4dfe63d8.js +0 -2
  123. package/dist/node/actions.4dfe63d8.js.map +0 -1
  124. package/dist/node/actions.module.565df529.css.map +0 -1
  125. package/dist/node/actions.module.61991621.js +0 -2
  126. package/dist/node/actions.module.61991621.js.map +0 -1
  127. package/dist/node/cell-renderers.bbaaeb83.js +0 -2
  128. package/dist/node/cell-renderers.bbaaeb83.js.map +0 -1
  129. package/dist/node/colors.fee61100.js +0 -2
  130. package/dist/node/colors.fee61100.js.map +0 -1
  131. package/dist/node/column-spec.da7354f5.js +0 -2
  132. package/dist/node/column-spec.da7354f5.js.map +0 -1
  133. package/dist/node/components.213ca3fc.js +0 -2
  134. package/dist/node/components.213ca3fc.js.map +0 -1
  135. package/dist/node/core.c404e4d4.js +0 -2
  136. package/dist/node/core.c404e4d4.js.map +0 -1
  137. package/dist/node/data-loaders.50ce46a4.js +0 -2
  138. package/dist/node/data-loaders.50ce46a4.js.map +0 -1
  139. package/dist/node/editor-popup.e19a3668.js +0 -2
  140. package/dist/node/editor-popup.e19a3668.js.map +0 -1
  141. package/dist/node/main.module.0802fb12.js +0 -2
  142. package/dist/node/main.module.0802fb12.js.map +0 -1
  143. package/dist/node/main.module.273015bb.js +0 -2
  144. package/dist/node/main.module.273015bb.js.map +0 -1
  145. package/dist/node/main.module.4cad6bbb.js +0 -2
  146. package/dist/node/main.module.4cad6bbb.js.map +0 -1
  147. package/dist/node/main.module.8370d601.css +0 -2
  148. package/dist/node/main.module.8370d601.css.map +0 -1
  149. package/dist/node/main.module.a197ee6f.css +0 -2
  150. package/dist/node/main.module.a197ee6f.css.map +0 -1
  151. package/dist/node/main.module.e5354239.css +0 -2
  152. package/dist/node/main.module.e5354239.css.map +0 -1
  153. package/dist/node/postgrest-table.49926421.js +0 -2
  154. package/dist/node/postgrest-table.49926421.js.map +0 -1
  155. package/dist/node/provider.f11d5828.js +0 -2
  156. package/dist/node/provider.f11d5828.js.map +0 -1
  157. package/dist/node/text-areas.64832f7d.js +0 -2
  158. package/dist/node/text-areas.64832f7d.js.map +0 -1
  159. package/dist/node/utils.897d92e2.js +0 -2
  160. package/dist/node/utils.897d92e2.js.map +0 -1
  161. package/src/postgrest-table/cell-renderers.ts +0 -24
package/src/provider.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  import { createContext, useContext, useEffect, useRef, useState } from "react";
2
2
  import h from "@macrostrat/hyper";
3
3
  import { createStore, StoreApi, useStore } from "zustand";
4
+ import { createComputed } from "zustand-computed";
4
5
  import type {
5
6
  FocusedCellCoordinates,
6
7
  Region,
@@ -24,11 +25,12 @@ export interface ColumnSpec {
24
25
  editable?: boolean;
25
26
  inlineEditor?: boolean | React.ComponentType<any> | string | null;
26
27
  style?: React.CSSProperties;
28
+ width?: number;
27
29
  }
28
30
 
29
- export interface ColumnSpecOptions {
31
+ export interface ColumnSpecOptions<T> {
30
32
  overrides: Record<string, Partial<ColumnSpec> | string>;
31
- data?: any[]; // Data to use for type inference
33
+ data?: T[]; // Data to use for type inference
32
34
  nRows?: number; // Number of rows to use for type inference
33
35
  omitColumns?: string[]; // Columns to omit. Takes precedence over includeColumns.
34
36
  includeColumns?: string[]; // Columns to include.
@@ -38,7 +40,7 @@ export interface DataSheetCoreProps<T> {
38
40
  data: T[];
39
41
  columnSpec?: ColumnSpec[];
40
42
  editable?: boolean;
41
- enableColumnReordering: boolean;
43
+ enableColumnReordering?: boolean;
42
44
  }
43
45
 
44
46
  export interface DataSheetState<T> {
@@ -47,10 +49,16 @@ export interface DataSheetState<T> {
47
49
  fillValueBaseCell: FocusedCellCoordinates | null;
48
50
  focusedCell: FocusedCellCoordinates | null;
49
51
  topLeftCell: FocusedCellCoordinates | null;
52
+ deletedRows: Set<number>;
53
+ // Sparse data structure for updated data
50
54
  updatedData: T[];
51
55
  initialized: boolean;
52
56
  }
53
57
 
58
+ export interface DataSheetComputedStore {
59
+ hasUpdates: boolean;
60
+ }
61
+
54
62
  type DataSheetVals<T> = DataSheetState<T> & DataSheetCoreProps<T>;
55
63
 
56
64
  export interface DataSheetStore<T> extends DataSheetVals<T> {
@@ -58,7 +66,12 @@ export interface DataSheetStore<T> extends DataSheetVals<T> {
58
66
  onDragValue(cell: FocusedCellCoordinates | null): void;
59
67
  setUpdatedData(data: T[]): void;
60
68
  onCellEdited(rowIndex: number, columnName: string, value: any): void;
69
+ onColumnsReordered(oldIndex: number, newIndex: number, length: number): void;
70
+ moveFocusedCell(direction: "up" | "down" | "left" | "right"): void;
71
+ deleteSelectedRows(): void;
61
72
  clearSelection(): void;
73
+ resetChanges(): void;
74
+ addRow(): void;
62
75
  initialize(props: DataSheetCoreProps<T>): void;
63
76
  onSelection(selection: Region[]): void;
64
77
  // Internal method used for infinite scrolling
@@ -69,7 +82,7 @@ export interface DataSheetStore<T> extends DataSheetVals<T> {
69
82
 
70
83
  export type DataSheetProviderProps<T> = DataSheetCoreProps<T> & {
71
84
  children: React.ReactNode;
72
- columnSpecOptions?: ColumnSpecOptions;
85
+ columnSpecOptions?: ColumnSpecOptions<T>;
73
86
  };
74
87
 
75
88
  const DataSheetContext = createContext<StoreApi<DataSheetStore<any>>>(null);
@@ -79,6 +92,12 @@ export interface VisibleCells {
79
92
  rowIndexEnd: number;
80
93
  }
81
94
 
95
+ const computed = createComputed(
96
+ (state: DataSheetStore<any>): DataSheetComputedStore => ({
97
+ hasUpdates: state.updatedData.length > 0 || state.deletedRows.size > 0,
98
+ }),
99
+ ) as any;
100
+
82
101
  export function DataSheetProvider<T>({
83
102
  children,
84
103
  data,
@@ -95,100 +114,213 @@ export function DataSheetProvider<T>({
95
114
  const tableRef = useRef<Table2>(null);
96
115
 
97
116
  const [store] = useState(() => {
98
- return createStore<DataSheetStore<T>>((set) => {
99
- return {
100
- data,
101
- columnSpec: columnSpec ?? generateColumnSpec(data, columnSpecOptions),
102
- editable,
103
- selection: [],
104
- fillValueBaseCell: null,
105
- updatedData: [],
106
- focusedCell: null,
107
- topLeftCell: null,
108
- initialized: false,
109
- tableRef,
110
- setSelection(selection: Region[]) {
111
- set(updateSelection(selection));
112
- },
113
- setUpdatedData(data: T[]) {
114
- set({ updatedData: data });
115
- },
116
- setVisibleCells(visibleCells: VisibleCells) {
117
- // Visible cells are used for infinite scrolling
118
- // Right now we don't store this in the state
119
- visibleCellsRef.current = visibleCells;
120
- },
121
- onDragValue(cell: FocusedCellCoordinates | null) {
122
- set({ fillValueBaseCell: cell });
123
- },
124
- onCellEdited(rowIndex: number, columnName: string, value: any) {
125
- set((state) => {
126
- const { editable, updatedData, data } = state;
127
- if (!editable) return {};
128
- let rowSpec: any;
129
- // Check to see if the new value is the same as the old one
130
- if (value !== data[rowIndex]?.[columnName]) {
131
- const rowOp = updatedData[rowIndex] != null ? "$merge" : "$set";
132
- rowSpec = { [rowOp]: { [columnName]: value } };
117
+ return createStore<DataSheetStore<T>>(
118
+ computed((set): DataSheetStore<T> => {
119
+ return {
120
+ data,
121
+ columnSpec: columnSpec ?? generateColumnSpec(data, columnSpecOptions),
122
+ editable,
123
+ deletedRows: new Set<number>(),
124
+ selection: [],
125
+ fillValueBaseCell: null,
126
+ updatedData: [],
127
+ focusedCell: null,
128
+ topLeftCell: null,
129
+ initialized: false,
130
+ tableRef,
131
+ // This is a placeholder
132
+ enableColumnReordering: false,
133
+ setSelection(selection: Region[]) {
134
+ set(updateSelection(selection));
135
+ },
136
+ moveFocusedCell(direction: "up" | "down" | "left" | "right") {
137
+ set((state) => {
138
+ const { topLeftCell } = state;
139
+ if (topLeftCell == null) return {};
140
+ let { col, row } = topLeftCell;
141
+ switch (direction) {
142
+ case "up":
143
+ row = Math.max(0, row - 1);
144
+ break;
145
+ case "down":
146
+ row = Math.min(
147
+ row + 1,
148
+ Math.max(state.data.length, state.updatedData.length) - 1,
149
+ );
150
+ break;
151
+ case "left":
152
+ col = Math.max(0, col - 1);
153
+ break;
154
+ case "right":
155
+ col = Math.min(col + 1, state.columnSpec.length - 1);
156
+ break;
157
+ }
158
+ const region: Region = { cols: [col, col], rows: [row, row] };
159
+ return updateSelection([region]);
160
+ });
161
+ },
162
+ addRow(row: Partial<T> = {} as T) {
163
+ /** Add a new row. If there is a selection, use the last row index to determine
164
+ * where to insert the new row. Otherwise, append to the end of the data. */
165
+ set((state) => {
166
+ const { updatedData, data, selection } = state;
167
+ const lastRowIndex =
168
+ getLastRowIndex(selection) ??
169
+ Math.max(data.length, updatedData.length) - 1;
170
+ // If there is a selection, insert the new row after the last selected row
171
+ const spec: Spec<any> = {
172
+ $splice: [[lastRowIndex + 1, 0, row]],
173
+ };
174
+ console.log(spec);
175
+
176
+ return {
177
+ updatedData: update(updatedData, spec),
178
+ };
179
+ });
180
+ },
181
+ setUpdatedData(data: T[] | ((state: T[]) => T[])) {
182
+ if (Array.isArray(data)) {
183
+ set({ updatedData: data });
133
184
  } else {
134
- rowSpec = { $unset: [columnName] };
185
+ set((state) => {
186
+ return { updatedData: data(state.updatedData) };
187
+ });
135
188
  }
136
- const spec: Spec<T[]> = { [rowIndex]: rowSpec };
137
- return { updatedData: update(updatedData, spec) };
138
- });
139
- },
140
- initialize(props: DataSheetCoreProps<T>) {
141
- set({ ...props, initialized: true });
142
- },
143
- clearSelection() {
144
- set((state) => {
145
- // Delete all selected cells
146
- const { selection, updatedData, columnSpec } = state;
147
- let spec = {};
148
- for (const region of selection) {
149
- const { cols, rows } = region;
150
- for (const row of range(rows)) {
151
- let vals = {};
152
- for (const col of range(cols)) {
153
- const key = columnSpec[col].key;
154
- vals[key] = "";
189
+ },
190
+ deleteSelectedRows() {
191
+ // Remove selected rows from the data and updatedData arrays
192
+ set((state) => {
193
+ const { selection, deletedRows } = state;
194
+ const rowIndices = getRowIndices(selection);
195
+
196
+ // Delete rows from both updatedData and data
197
+ const newDeletedRows = new Set(deletedRows);
198
+ for (const rowIndex of rowIndices) {
199
+ newDeletedRows.add(rowIndex);
200
+ }
201
+
202
+ // Remove selected rows and reset selection
203
+ return {
204
+ deletedRows: newDeletedRows,
205
+ selection: [],
206
+ focusedCell: null,
207
+ topLeftCell: null,
208
+ fillValueBaseCell: null,
209
+ };
210
+ });
211
+ },
212
+ resetChanges() {
213
+ // Reset the updated data to the initial data
214
+ set((state) => ({
215
+ updatedData: [],
216
+ deletedRows: new Set<number>(),
217
+ selection: [],
218
+ focusedCell: null,
219
+ topLeftCell: null,
220
+ fillValueBaseCell: null,
221
+ }));
222
+ },
223
+ setVisibleCells(visibleCells: VisibleCells) {
224
+ // Visible cells are used for infinite scrolling
225
+ // Right now we don't store this in the state
226
+ visibleCellsRef.current = visibleCells;
227
+ },
228
+ onDragValue(cell: FocusedCellCoordinates | null) {
229
+ set({ fillValueBaseCell: cell });
230
+ },
231
+ onCellEdited(rowIndex: number, columnName: string, value: any) {
232
+ set((state) => {
233
+ const { editable, updatedData, data } = state;
234
+ if (!editable) return {};
235
+ let rowSpec: any;
236
+ // Check to see if the new value is the same as the old one
237
+ if (value !== data[rowIndex]?.[columnName]) {
238
+ const rowOp = updatedData[rowIndex] != null ? "$merge" : "$set";
239
+ rowSpec = { [rowOp]: { [columnName]: value } };
240
+ } else {
241
+ rowSpec = { $unset: [columnName] };
242
+ }
243
+ const spec: Spec<T[]> = { [rowIndex]: rowSpec };
244
+ return { updatedData: update(updatedData, spec) };
245
+ });
246
+ },
247
+ initialize(props: DataSheetCoreProps<T>) {
248
+ set({ ...props, initialized: true });
249
+ },
250
+ clearSelection() {
251
+ set((state) => {
252
+ // Delete all selected cells
253
+ const { selection, updatedData, columnSpec, data } = state;
254
+ let spec = {};
255
+ for (const region of selection) {
256
+ const { cols, rows } = region;
257
+ const rowRange = range(rows ?? [0, updatedData.length - 1]);
258
+ const colRange = range(cols ?? [0, columnSpec.length - 1]);
259
+ for (const row of rowRange) {
260
+ let vals = {};
261
+ for (const col of colRange) {
262
+ const key = columnSpec[col].key;
263
+ const currentValue =
264
+ updatedData[row]?.[key] ?? data[row]?.[key];
265
+ if (currentValue != null && currentValue !== "") {
266
+ vals[key] = "";
267
+ }
268
+ }
269
+ let op = updatedData[row] == null ? "$set" : "$merge";
270
+ spec[row] = { [op]: vals };
155
271
  }
156
- let op = updatedData[row] == null ? "$set" : "$merge";
157
- spec[row] = { [op]: vals };
158
272
  }
159
- }
160
- return {
161
- updatedData: update(updatedData, spec),
162
- };
163
- });
164
- },
165
- onSelection(selection: Region[]) {
166
- set((state) => {
167
- let spec = updateSelection(selection);
168
- if (state.fillValueBaseCell != null) {
169
- spec.updatedData = fillValues(state, selection);
170
- }
171
- return spec;
172
- });
173
- },
174
- onColumnsReordered(oldIndex: number, newIndex: number, length: number) {
175
- set((state) => {
176
- if (!state.enableColumnReordering) return {};
177
- const { columnSpec } = state;
178
- const newSpec = [...columnSpec];
179
- const removed = newSpec.splice(oldIndex, length);
180
- newSpec.splice(newIndex, 0, ...removed);
181
- return { columnSpec: newSpec };
182
- });
183
- },
184
- scrollToRow(rowIndex: number, columnIndex: number) {
185
- if (tableRef.current == null) return;
186
- tableRef.current.scrollToRegion({
187
- rows: [rowIndex, rowIndex],
188
- });
189
- },
190
- };
191
- });
273
+ return {
274
+ updatedData: update(updatedData, spec),
275
+ };
276
+ });
277
+ },
278
+ onSelection(selection: Region[]) {
279
+ set((state) => {
280
+ if (
281
+ selectionEquals(selection, state.selection) &&
282
+ singleFocusedCell(selection) == null // Only if we're in a multi-cell selection mode
283
+ ) {
284
+ // If the selection is the same as the current selection, remove the selection.
285
+ // In practice this only happens for whole-row and whole-column selections
286
+ return {
287
+ selection: [],
288
+ focusedCell: null,
289
+ topLeftCell: null,
290
+ fillValueBaseCell: null,
291
+ };
292
+ }
293
+
294
+ let spec = updateSelection(selection);
295
+ if (state.fillValueBaseCell != null) {
296
+ spec.updatedData = fillValues(state, selection);
297
+ }
298
+ return spec;
299
+ });
300
+ },
301
+ onColumnsReordered(
302
+ oldIndex: number,
303
+ newIndex: number,
304
+ length: number,
305
+ ) {
306
+ set((state) => {
307
+ if (!state.enableColumnReordering) return {};
308
+ const { columnSpec } = state;
309
+ const newSpec = [...columnSpec];
310
+ const removed = newSpec.splice(oldIndex, length);
311
+ newSpec.splice(newIndex, 0, ...removed);
312
+ return { columnSpec: newSpec };
313
+ });
314
+ },
315
+ scrollToRow(rowIndex: number) {
316
+ if (tableRef.current == null) return;
317
+ tableRef.current.scrollToRegion({
318
+ rows: [rowIndex, rowIndex],
319
+ });
320
+ },
321
+ };
322
+ }),
323
+ );
192
324
  });
193
325
 
194
326
  // Not sure how required this initialization is
@@ -214,13 +346,13 @@ export function useStoreAPI<T>(): StoreApi<DataSheetStore<T>> {
214
346
  }
215
347
 
216
348
  export function useSelector<T = any, A = any>(
217
- selector: (state: DataSheetStore<T>) => A
349
+ selector: (state: DataSheetStore<T> & DataSheetComputedStore) => A,
218
350
  ): A {
219
351
  const store = useStoreAPI<T>();
220
352
  return useStore(store, selector);
221
353
  }
222
354
 
223
- function updateSelection(selection: Region[]) {
355
+ function updateSelection<T>(selection: Region[]) {
224
356
  const focusedCell = singleFocusedCell(selection);
225
357
  let spec: Partial<DataSheetState<T>> = {
226
358
  selection,
@@ -233,9 +365,39 @@ function updateSelection(selection: Region[]) {
233
365
  return spec;
234
366
  }
235
367
 
368
+ function getLastRowIndex(regions: Region[]): number | null {
369
+ /** Get the last row index from a selection of regions */
370
+ if (regions == null || regions.length === 0) return null;
371
+ let lastRow = -1;
372
+ for (const region of regions) {
373
+ const { rows } = region;
374
+ if (rows == null || rows.length !== 2) continue;
375
+ lastRow = Math.max(lastRow, rows[1]);
376
+ }
377
+ if (lastRow < 0) {
378
+ /** If no valid rows are found, return null */
379
+ return null;
380
+ }
381
+ return lastRow;
382
+ }
383
+
384
+ function getRowIndices(regions: Region[]): number[] {
385
+ /** Get the row indices from a selection of regions */
386
+ if (regions == null || regions.length === 0) return [];
387
+ const rowIndices = new Set<number>();
388
+ for (const region of regions) {
389
+ const { rows } = region;
390
+ if (rows == null || rows.length !== 2) continue;
391
+ for (let i = rows[0]; i <= rows[1]; i++) {
392
+ rowIndices.add(i);
393
+ }
394
+ }
395
+ return Array.from(rowIndices).sort((a, b) => a - b);
396
+ }
397
+
236
398
  export function topLeftCell(
237
399
  regions: Region[],
238
- requireSolitaryCell: boolean = false
400
+ requireSolitaryCell: boolean = false,
239
401
  ): FocusedCellCoordinates | null {
240
402
  /** Top left cell of a ranged selection */
241
403
  if (regions == null) return null;
@@ -248,7 +410,36 @@ export function topLeftCell(
248
410
  return { col: cols[0], row: rows[0], focusSelectionIndex: 0 };
249
411
  }
250
412
 
251
- function singleFocusedCell(sel: Region[]): FocusedCellCoordinates | null {
413
+ function selectionEquals(a: Region[], b: Region[]): boolean {
414
+ /** Check if two selections are equal */
415
+ if (a.length !== b.length) return false;
416
+ for (let i = 0; i < a.length; i++) {
417
+ const regionA = a[i];
418
+ const regionB = b[i];
419
+
420
+ const colsA = regionA.cols ?? [];
421
+ const colsB = regionB.cols ?? [];
422
+
423
+ const rowsA = regionA.rows ?? [];
424
+ const rowsB = regionB.rows ?? [];
425
+
426
+ if (
427
+ colsA.length !== colsB.length ||
428
+ rowsA.length !== rowsB.length ||
429
+ colsA[0] !== colsB[0] ||
430
+ colsA[1] !== colsB[1] ||
431
+ rowsA[0] !== rowsB[0] ||
432
+ rowsA[1] !== rowsB[1]
433
+ ) {
434
+ return false;
435
+ }
436
+ }
437
+ return true;
438
+ }
439
+
440
+ export function singleFocusedCell(
441
+ sel: Region[],
442
+ ): FocusedCellCoordinates | null {
252
443
  /** Derive a single focused cell from a selected region, if possible */
253
444
  if (sel?.length !== 1) return null;
254
445
  return topLeftCell(sel, true);
@@ -7,12 +7,33 @@ const defaultRenderers = {
7
7
  array: (d) => d?.join(", "),
8
8
  };
9
9
 
10
- export function generateDefaultColumnSpec<T>(data: Array<T>): ColumnSpec[] {
10
+ interface ColumnSpecGenerateOptions {
11
+ calculateWidths?: boolean;
12
+ defaultWidth?: number;
13
+ getWidthForValue?: (value: any) => number;
14
+ }
15
+
16
+ const defaultWidthForValue = (val) => String(val).length * 8;
17
+
18
+ export function generateDefaultColumnSpec<T>(
19
+ data: Array<T>,
20
+ options: ColumnSpecGenerateOptions = {},
21
+ ): ColumnSpec[] {
11
22
  /** Build a default column spec from a dataset based on the first n rows */
12
23
  if (data == null) return [];
13
24
  // Get the keys
14
- const keys = new Set();
25
+
26
+ const {
27
+ defaultWidth = 150,
28
+ calculateWidths = true,
29
+ getWidthForValue = defaultWidthForValue,
30
+ } = options;
31
+
32
+ const keys = new Set<string>();
15
33
  const types = new Map();
34
+
35
+ const columnWidths = new Map<string, number>();
36
+
16
37
  for (const row of data) {
17
38
  if (row == null) continue;
18
39
  for (const key of Object.keys(row)) {
@@ -20,6 +41,14 @@ export function generateDefaultColumnSpec<T>(data: Array<T>): ColumnSpec[] {
20
41
  keys.add(key);
21
42
 
22
43
  if (val == null) continue;
44
+
45
+ if (calculateWidths) {
46
+ let width = getWidthForValue(val);
47
+ if (width != null && width >= 0) {
48
+ columnWidths.set(key, Math.max(width, columnWidths.get(key) ?? 0));
49
+ }
50
+ }
51
+
23
52
  let type: string = typeof val;
24
53
  // Special 'type' for integers
25
54
  if (Number.isInteger(val)) {
@@ -54,10 +83,20 @@ export function generateDefaultColumnSpec<T>(data: Array<T>): ColumnSpec[] {
54
83
  // Build a column spec
55
84
  const spec = [];
56
85
  for (const key of keys) {
86
+ let width = null;
87
+ if (calculateWidths) {
88
+ // If we are calculating widths, use the value lengths
89
+ width = Math.min(
90
+ Math.max(defaultWidth / 2, columnWidths.get(key) ?? defaultWidth),
91
+ defaultWidth * 1.5,
92
+ );
93
+ }
94
+
57
95
  spec.push({
58
96
  name: key,
59
97
  key,
60
98
  valueRenderer: defaultRenderers[types.get(key)],
99
+ width,
61
100
  });
62
101
  }
63
102
  return spec;
@@ -65,7 +104,7 @@ export function generateDefaultColumnSpec<T>(data: Array<T>): ColumnSpec[] {
65
104
 
66
105
  export function generateColumnSpec<T>(
67
106
  data: T[],
68
- options: ColumnSpecOptions
107
+ options: ColumnSpecOptions,
69
108
  ): ColumnSpec[] {
70
109
  /** Generate a column spec from a dataset */
71
110
  const { overrides = {}, nRows = 10, omitColumns, includeColumns } = options;
@@ -1,31 +0,0 @@
1
- import {useInDarkMode as $iwzwH$useInDarkMode} from "@macrostrat/ui-components";
2
- import $iwzwH$macrostrathyper from "@macrostrat/hyper";
3
- import {Tag as $iwzwH$Tag} from "@blueprintjs/core";
4
- import {asChromaColor as $iwzwH$asChromaColor} from "@macrostrat/color-utils";
5
- import $iwzwH$classnames from "classnames";
6
-
7
-
8
-
9
-
10
-
11
-
12
- function $753d4a0c461d4588$export$17064b7382e320b2({ data: data, className: className = null }) {
13
- const darkMode = (0, $iwzwH$useInDarkMode)();
14
- const luminance = darkMode ? 0.9 : 0.4;
15
- const color = (0, $iwzwH$asChromaColor)(data.color);
16
- return (0, $iwzwH$macrostrathyper)((0, $iwzwH$Tag), {
17
- key: data.id,
18
- className: (0, $iwzwH$classnames)("lithology-tag", className),
19
- minimal: true,
20
- style: {
21
- color: color?.luminance(luminance).hex(),
22
- backgroundColor: color?.luminance(1 - luminance).hex()
23
- }
24
- }, (0, $iwzwH$macrostrathyper)("span.contents", [
25
- (0, $iwzwH$macrostrathyper)("span.name", data.name)
26
- ]));
27
- }
28
-
29
-
30
- export {$753d4a0c461d4588$export$17064b7382e320b2 as LithologyTag};
31
- //# sourceMappingURL=cell-renderers.8222e82a.js.map
@@ -1 +0,0 @@
1
- {"mappings":";;;;;;;;;;;AAMO,SAAS,0CAAa,QAAE,IAAI,aAAE,YAAY,MAAM;IACrD,MAAM,WAAW,CAAA,GAAA,oBAAY;IAC7B,MAAM,YAAY,WAAW,MAAM;IACnC,MAAM,QAAQ,CAAA,GAAA,oBAAY,EAAE,KAAK,KAAK;IACtC,OAAO,CAAA,GAAA,sBAAA,EACL,CAAA,GAAA,UAAE,GACF;QACE,KAAK,KAAK,EAAE;QACZ,WAAW,CAAA,GAAA,iBAAS,EAAE,iBAAiB;QACvC,SAAS;QACT,OAAO;YACL,OAAO,OAAO,UAAU,WAAW;YACnC,iBAAiB,OAAO,UAAU,IAAI,WAAW;QACnD;IACF,GACA,CAAA,GAAA,sBAAA,EAAE,iBAAiB;QAAC,CAAA,GAAA,sBAAA,EAAE,aAAa,KAAK,IAAI;KAAE;AAElD","sources":["packages/data-sheet/src/postgrest-table/cell-renderers.ts"],"sourcesContent":["import { useInDarkMode } from \"@macrostrat/ui-components\";\nimport h from \"@macrostrat/hyper\";\nimport { Tag } from \"@blueprintjs/core\";\nimport { asChromaColor } from \"@macrostrat/color-utils\";\nimport classNames from \"classnames\";\n\nexport function LithologyTag({ data, className = null }) {\n const darkMode = useInDarkMode();\n const luminance = darkMode ? 0.9 : 0.4;\n const color = asChromaColor(data.color);\n return h(\n Tag,\n {\n key: data.id,\n className: classNames(\"lithology-tag\", className),\n minimal: true,\n style: {\n color: color?.luminance(luminance).hex(),\n backgroundColor: color?.luminance(1 - luminance).hex(),\n },\n },\n h(\"span.contents\", [h(\"span.name\", data.name)])\n );\n}\n"],"names":[],"version":3,"file":"cell-renderers.8222e82a.js.map"}
@@ -1 +0,0 @@
1
- {"mappings":";;;;;;;;;;;;;;;;;;;;;;AASA,MAAM,0BAAI,CAAA,GAAA,sBAAI,EAAE,MAAM,CAAC,CAAA,GAAA,sEAAK;AAErB,SAAS,0CAAU,SAAE,KAAK,YAAE,QAAQ,SAAE,KAAK,UAAE,MAAM,EAAE,GAAG,MAAM;IACnE,MAAM,WAAW,CAAA,GAAA,oBAAY;IAE7B,OAAO,wBACL,CAAA,GAAA,WAAG,GACH;QACE,GAAG,IAAI;QACP,OAAO;YACL,GAAG,KAAK;YACR,GAAG,iCAAW,OAAO,SAAS;QAChC;IACF,GACA;AAEJ;AAEA,MAAM,mCAAa,CAAA,GAAA,cAAM,EAAE,CAAC,OAAO,WACjC,0CAAoB,OAAO;kBAAE;IAAS;AAGjC,SAAS,0CACd,KAAK,EACL,aAAE,YAAY,uBAAM,kBAAkB,eAAK,WAAW,OAAO,GAAG,CAAC,CAAC;IAElE,MAAM,WAAW,aAAa,WAAW,MAAM;IAE/C,6BAA6B;IAC7B,QAAQ,CAAA,GAAA,oBAAY,EAAE;IACtB,IAAI,SAAS,MAAM,OAAO,CAAC;IAC3B,OAAO;QACL,OAAO,OAAO,YAAY,UAAU;QACpC,iBAAiB,OAAO,QAAQ,iBAAiB;IACnD;AACF;AAEA,IAAA,AAAK,mEAAA;;;;;WAAA;EAAA;AAOE,SAAS,0CAAY,SAC1B,KAAK,YACL,QAAQ,QACR,cACD;IACC,MAAM,MAAM,CAAA,GAAA,aAAK,EAAE;IACnB,CAAA,GAAA,gBAAQ,EAAE;QACR,IAAI,IAAI,OAAO,IAAI,MAAM;QACzB,IAAI,OAAO,CAAC,KAAK;IACnB,GAAG,EAAE;IAEL,IAAI;IACJ,IAAI;QACF,QAAQ,CAAA,GAAA,oBAAY,EAAE,OAAO,GAAG;IAClC,EAAE,OAAM;QACN,QAAQ;IACV;IACA,OAAO,wBACL,8BACA;QACE,WAAU,GAAG;YACX,QAAQ,GAAG,CAAC;YACZ,IAAI,IAAI,GAAG,KAAK,UACd,IAAI,cAAc;QAEtB;aACA;QACA,UAAU;IACZ,GACA,wBAAE,CAAA,GAAA,qBAAa,GAAG;eAChB;QACA,UAAS,KAAK;YACZ,SAAS,CAAA,GAAA,oBAAY,EAAE,MAAM,CAAC,KAAK;QACrC;IACF;AAEJ","sources":["packages/data-sheet/src/components/colors.ts"],"sourcesContent":["import { Cell } from \"@blueprintjs/table\";\nimport { useInDarkMode } from \"@macrostrat/ui-components\";\nimport hyper from \"@macrostrat/hyper\";\nimport styles from \"./main.module.sass\";\nimport { asChromaColor } from \"@macrostrat/color-utils\";\nimport { HexColorPicker } from \"react-colorful\";\nimport { useEffect, useRef } from \"react\";\nimport { memoize } from \"underscore\";\n\nconst h = hyper.styled(styles);\n\nexport function ColorCell({ value, children, style, intent, ...rest }) {\n const darkMode = useInDarkMode();\n\n return h(\n Cell,\n {\n ...rest,\n style: {\n ...style,\n ...colorCombo(value, darkMode),\n },\n },\n children\n );\n}\n\nconst colorCombo = memoize((color, darkMode) =>\n pleasantCombination(color, { darkMode })\n);\n\nexport function pleasantCombination(\n color,\n { luminance = null, backgroundAlpha = 0.2, darkMode = false } = {}\n) {\n const brighten = luminance ?? darkMode ? 0.5 : 0.1;\n\n // Check if is a chroma color\n color = asChromaColor(color);\n if (color == null) return {};\n return {\n color: color?.luminance?.(brighten).css(),\n backgroundColor: color?.alpha?.(backgroundAlpha).css(),\n };\n}\n\nenum ColorConversionType {\n HEX = \"hex\",\n RGB = \"rgb\",\n HSL = \"hsl\",\n CSS = \"css\",\n}\n\nexport function ColorPicker({\n value,\n onChange,\n type = ColorConversionType.CSS,\n}) {\n const ref = useRef(null);\n useEffect(() => {\n if (ref.current == null) return;\n ref.current.focus();\n }, []);\n\n let color: any;\n try {\n color = asChromaColor(value).hex();\n } catch {\n color = \"#aaaaaa\";\n }\n return h(\n \"div.color-picker-container\",\n {\n onKeyDown(evt) {\n console.log(evt);\n if (evt.key === \"Escape\") {\n evt.preventDefault();\n }\n },\n ref,\n tabIndex: 0,\n },\n h(HexColorPicker, {\n color,\n onChange(color) {\n onChange(asChromaColor(color)[type]());\n },\n })\n );\n}\n"],"names":[],"version":3,"file":"colors.75a92ad3.js.map"}
@@ -1 +0,0 @@
1
- {"mappings":"AAAA,MAAM,yCAAmB;IACvB,QAAQ,CAAC,IAAM;IACf,QAAQ,CAAC,IAAM,GAAG,QAAQ;IAC1B,SAAS,CAAC,IAAO,IAAI,MAAM;IAC3B,QAAQ,CAAC,IAAM,KAAK,SAAS,CAAC;IAC9B,SAAS,CAAC,IAAM,GAAG,QAAQ;IAC3B,OAAO,CAAC,IAAM,GAAG,KAAK;AACxB;AAEO,SAAS,0CAA6B,IAAc;IACzD,yEAAyE,GACzE,IAAI,QAAQ,MAAM,OAAO,EAAE;IAC3B,eAAe;IACf,MAAM,OAAO,IAAI;IACjB,MAAM,QAAQ,IAAI;IAClB,KAAK,MAAM,OAAO,KAAM;QACtB,IAAI,OAAO,MAAM;QACjB,KAAK,MAAM,OAAO,OAAO,IAAI,CAAC,KAAM;YAClC,MAAM,MAAM,GAAG,CAAC,IAAI;YACpB,KAAK,GAAG,CAAC;YAET,IAAI,OAAO,MAAM;YACjB,IAAI,OAAe,OAAO;YAC1B,8BAA8B;YAC9B,IAAI,OAAO,SAAS,CAAC,MACnB,OAAO;YAGT,6CAA6C;YAC7C,IACE,MAAM,OAAO,CAAC,QACd,IAAI,KAAK,CAAC,CAAC,IAAM,OAAO,MAAM,YAAY,OAAO,MAAM,WAEvD,OAAO;YAGT,IAAI,MAAM,GAAG,CAAC,MACZ;gBAAA,IAAI,MAAM,GAAG,CAAC,SAAS,MAAM;oBAC3B,IAAI,SAAS,YAAY,MAAM,GAAG,CAAC,SAAS,WAC1C,MAAM,GAAG,CAAC,KAAK;oBAEjB,IAAI,SAAS,YAAY,MAAM,GAAG,CAAC,SAAS,SAC1C,MAAM,GAAG,CAAC,KAAK;oBAGjB,MAAM,GAAG,CAAC,KAAK;gBACjB;YAAA,OAEA,MAAM,GAAG,CAAC,KAAK;QAEnB;IACF;IAEA,sBAAsB;IACtB,MAAM,OAAO,EAAE;IACf,KAAK,MAAM,OAAO,KAChB,KAAK,IAAI,CAAC;QACR,MAAM;aACN;QACA,eAAe,sCAAgB,CAAC,MAAM,GAAG,CAAC,KAAK;IACjD;IAEF,OAAO;AACT;AAEO,SAAS,0CACd,IAAS,EACT,OAA0B;IAE1B,0CAA0C,GAC1C,MAAM,aAAE,YAAY,CAAC,UAAG,QAAQ,iBAAI,WAAW,kBAAE,cAAc,EAAE,GAAG;IAEpE,IAAI,QAAQ,MAAM,OAAO,EAAE;IAE3B,MAAM,SAAS,KAAK,GAAG,CAAC,OAAO,KAAK,MAAM;IAE1C,IAAI,aAAa,0CAA0B,KAAK,KAAK,CAAC,GAAG;IACzD,IAAI,eAAe,WAAW,MAAM,CAAC,CAAC;QACpC,IAAI,eAAe,QAAQ,YAAY,QAAQ,CAAC,IAAI,GAAG,GACrD,OAAO;QAET,IAAI,kBAAkB,QAAQ,CAAC,eAAe,QAAQ,CAAC,IAAI,GAAG,GAC5D,OAAO;QAET,OAAO;IACT;IAEA,kBAAkB;IAClB,OAAO,aAAa,GAAG,CAAC,CAAC;QACvB,IAAI,MAAM,SAAS,CAAC,IAAI,GAAG,CAAC;QAC5B,IAAI,OAAO,MAAM,OAAO;QACxB,IAAI,OAAO,QAAQ,UACjB,OAAO;YAAE,GAAG,GAAG;YAAE,MAAM;QAAI;QAE7B,OAAO;YAAE,GAAG,GAAG;YAAE,GAAG,GAAG;QAAC;IAC1B;AACF","sources":["packages/data-sheet/src/utils/column-spec.ts"],"sourcesContent":["const defaultRenderers = {\n string: (d) => d,\n number: (d) => d?.toFixed(2),\n boolean: (d) => (d ? \"T\" : \"F\"),\n object: (d) => JSON.stringify(d),\n integer: (d) => d?.toFixed(0),\n array: (d) => d?.join(\", \"),\n};\n\nexport function generateDefaultColumnSpec<T>(data: Array<T>): ColumnSpec[] {\n /** Build a default column spec from a dataset based on the first n rows */\n if (data == null) return [];\n // Get the keys\n const keys = new Set();\n const types = new Map();\n for (const row of data) {\n if (row == null) continue;\n for (const key of Object.keys(row)) {\n const val = row[key];\n keys.add(key);\n\n if (val == null) continue;\n let type: string = typeof val;\n // Special 'type' for integers\n if (Number.isInteger(val)) {\n type = \"integer\";\n }\n\n // Special 'type' for arrays of simple values\n if (\n Array.isArray(val) &&\n val.every((d) => typeof d === \"string\" || typeof d === \"number\")\n ) {\n type = \"array\";\n }\n\n if (types.has(key)) {\n if (types.get(key) !== type) {\n if (type === \"number\" && types.get(key) === \"integer\") {\n types.set(key, \"number\");\n }\n if (type === \"object\" && types.get(key) === \"array\") {\n types.set(key, \"object\");\n }\n\n types.set(key, \"string\");\n }\n } else {\n types.set(key, type);\n }\n }\n }\n\n // Build a column spec\n const spec = [];\n for (const key of keys) {\n spec.push({\n name: key,\n key,\n valueRenderer: defaultRenderers[types.get(key)],\n });\n }\n return spec;\n}\n\nexport function generateColumnSpec<T>(\n data: T[],\n options: ColumnSpecOptions\n): ColumnSpec[] {\n /** Generate a column spec from a dataset */\n const { overrides = {}, nRows = 10, omitColumns, includeColumns } = options;\n\n if (data == null) return [];\n\n const _nRows = Math.min(nRows, data.length);\n\n let columnSpec = generateDefaultColumnSpec(data.slice(0, _nRows));\n let filteredSpec = columnSpec.filter((col) => {\n if (omitColumns != null && omitColumns.includes(col.key)) {\n return false;\n }\n if (includeColumns != null && !includeColumns.includes(col.key)) {\n return false;\n }\n return true;\n });\n\n // Apply overrides\n return filteredSpec.map((col) => {\n let ovr = overrides[col.key];\n if (ovr == null) return col;\n if (typeof ovr === \"string\") {\n return { ...col, name: ovr };\n }\n return { ...col, ...ovr };\n });\n}\n"],"names":[],"version":3,"file":"column-spec.e56f4d75.js.map"}