@macrostrat/data-sheet 2.2.2 → 2.2.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.
- package/CHANGELOG.md +6 -0
- package/dist/esm/{data-sheet.a0d5d18d.js → data-sheet.00353511.js} +4 -4
- package/dist/esm/{data-sheet.a0d5d18d.js.map → data-sheet.00353511.js.map} +1 -1
- package/dist/esm/data-sheet.186dcac8.js +86 -0
- package/dist/esm/data-sheet.186dcac8.js.map +1 -0
- package/dist/esm/{data-sheet.1d6ac6c6.js → data-sheet.6776e250.js} +11 -23
- package/dist/esm/data-sheet.6776e250.js.map +1 -0
- package/dist/esm/{data-sheet.ae6daf58.js → data-sheet.8dbfccef.js} +4 -2
- package/dist/esm/data-sheet.8dbfccef.js.map +1 -0
- package/dist/esm/{data-sheet.b5946d6b.js → data-sheet.96446cae.js} +5 -26
- package/dist/esm/data-sheet.96446cae.js.map +1 -0
- package/dist/esm/{data-sheet.ce2a3218.js → data-sheet.9b593da4.js} +4 -4
- package/dist/esm/{data-sheet.ce2a3218.js.map → data-sheet.9b593da4.js.map} +1 -1
- package/dist/esm/{data-sheet.ce24dcf9.js → data-sheet.ba9a1241.js} +101 -125
- package/dist/esm/data-sheet.ba9a1241.js.map +1 -0
- package/dist/esm/{data-sheet.45e8d3b0.js → data-sheet.c9b6b6f2.js} +66 -8
- package/dist/esm/data-sheet.c9b6b6f2.js.map +1 -0
- package/dist/esm/{data-sheet.aa2b4902.js → data-sheet.d2160988.js} +2 -1
- package/dist/esm/data-sheet.d2160988.js.map +1 -0
- package/dist/esm/index.d.ts +56 -40
- package/dist/esm/index.d.ts.map +1 -1
- package/dist/esm/index.js +6 -6
- package/dist/node/{data-sheet.d40ac2ae.js → data-sheet.2a613259.js} +2 -2
- package/dist/node/{data-sheet.d40ac2ae.js.map → data-sheet.2a613259.js.map} +1 -1
- package/dist/node/{data-sheet.846d5f8f.js → data-sheet.648db7af.js} +2 -2
- package/dist/node/data-sheet.648db7af.js.map +1 -0
- package/dist/node/data-sheet.6a663031.js +2 -0
- package/dist/node/data-sheet.6a663031.js.map +1 -0
- package/dist/node/data-sheet.809cdb29.js +2 -0
- package/dist/node/data-sheet.809cdb29.js.map +1 -0
- package/dist/node/data-sheet.97ac1b50.js +2 -0
- package/dist/node/data-sheet.97ac1b50.js.map +1 -0
- package/dist/node/data-sheet.ae543670.js +2 -0
- package/dist/node/data-sheet.ae543670.js.map +1 -0
- package/dist/node/data-sheet.c350336f.js +2 -0
- package/dist/node/data-sheet.c350336f.js.map +1 -0
- package/dist/node/data-sheet.d971095a.js +2 -0
- package/dist/node/data-sheet.d971095a.js.map +1 -0
- package/dist/node/data-sheet.dffdda71.js +2 -0
- package/dist/node/data-sheet.dffdda71.js.map +1 -0
- package/dist/node/index.js +1 -1
- package/dist/node/index.js.map +1 -1
- package/package.json +1 -1
- package/src/components/editor-popup.ts +11 -24
- package/src/components/text-areas.ts +2 -43
- package/src/core.ts +132 -148
- package/src/postgrest-table/data-loaders.ts +1 -0
- package/src/provider.ts +81 -9
- package/src/utils/index.ts +1 -0
- package/src/utils/key-handling.ts +132 -0
- package/dist/esm/data-sheet.1d6ac6c6.js.map +0 -1
- package/dist/esm/data-sheet.45e8d3b0.js.map +0 -1
- package/dist/esm/data-sheet.aa2b4902.js.map +0 -1
- package/dist/esm/data-sheet.ae6daf58.js.map +0 -1
- package/dist/esm/data-sheet.b5946d6b.js.map +0 -1
- package/dist/esm/data-sheet.ce24dcf9.js.map +0 -1
- package/dist/node/data-sheet.1a487c3c.js +0 -2
- package/dist/node/data-sheet.1a487c3c.js.map +0 -1
- package/dist/node/data-sheet.4a8fd8a7.js +0 -2
- package/dist/node/data-sheet.4a8fd8a7.js.map +0 -1
- package/dist/node/data-sheet.846d5f8f.js.map +0 -1
- package/dist/node/data-sheet.86550c41.js +0 -2
- package/dist/node/data-sheet.86550c41.js.map +0 -1
- package/dist/node/data-sheet.a65463ef.js +0 -2
- package/dist/node/data-sheet.a65463ef.js.map +0 -1
- package/dist/node/data-sheet.bfbba3fc.js +0 -2
- package/dist/node/data-sheet.bfbba3fc.js.map +0 -1
- package/dist/node/data-sheet.f3404ed5.js +0 -2
- package/dist/node/data-sheet.f3404ed5.js.map +0 -1
|
@@ -2,6 +2,7 @@ import hyper from "@macrostrat/hyper";
|
|
|
2
2
|
import styles from "./main.module.sass";
|
|
3
3
|
import { Button } from "@blueprintjs/core";
|
|
4
4
|
import { useEffect, useRef } from "react";
|
|
5
|
+
import { multiLineTextKeyHandler } from "../utils";
|
|
5
6
|
|
|
6
7
|
const h = hyper.styled(styles);
|
|
7
8
|
|
|
@@ -22,23 +23,7 @@ export function EditableTextArea({ value, onChange }) {
|
|
|
22
23
|
ref,
|
|
23
24
|
value: value ?? "",
|
|
24
25
|
onChange: (evt) => onChange(evt.target.value),
|
|
25
|
-
onKeyDown:
|
|
26
|
-
if (evt.key === "Enter") {
|
|
27
|
-
//evt.preventDefault();
|
|
28
|
-
evt.stopPropagation();
|
|
29
|
-
return;
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
if (evt.key === "Escape") {
|
|
33
|
-
evt.preventDefault();
|
|
34
|
-
return;
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
const shouldPropagate = handleSpecialKeys(evt, evt.target);
|
|
38
|
-
if (!shouldPropagate) {
|
|
39
|
-
evt.stopPropagation();
|
|
40
|
-
}
|
|
41
|
-
},
|
|
26
|
+
onKeyDown: multiLineTextKeyHandler,
|
|
42
27
|
}),
|
|
43
28
|
h("div.tools", [
|
|
44
29
|
h(Button, {
|
|
@@ -61,29 +46,3 @@ export function EditableTextArea({ value, onChange }) {
|
|
|
61
46
|
]),
|
|
62
47
|
]);
|
|
63
48
|
}
|
|
64
|
-
|
|
65
|
-
export function handleSpecialKeys(evt, target): boolean {
|
|
66
|
-
if (
|
|
67
|
-
(evt.key === "ArrowLeft" ||
|
|
68
|
-
evt.key === "ArrowUp" ||
|
|
69
|
-
evt.key === "ArrowDown") &&
|
|
70
|
-
target.selectionStart === 0
|
|
71
|
-
) {
|
|
72
|
-
target.blur();
|
|
73
|
-
return true;
|
|
74
|
-
}
|
|
75
|
-
|
|
76
|
-
if (
|
|
77
|
-
(evt.key === "ArrowRight" ||
|
|
78
|
-
evt.key === "ArrowUp" ||
|
|
79
|
-
evt.key === "Tab" ||
|
|
80
|
-
evt.key === "Enter" ||
|
|
81
|
-
evt.key === "ArrowDown") &&
|
|
82
|
-
target.selectionStart === evt.target.value.length
|
|
83
|
-
) {
|
|
84
|
-
target.blur();
|
|
85
|
-
return true;
|
|
86
|
-
}
|
|
87
|
-
|
|
88
|
-
return false;
|
|
89
|
-
}
|
package/src/core.ts
CHANGED
|
@@ -16,7 +16,7 @@ import "@blueprintjs/table/lib/css/table.css";
|
|
|
16
16
|
import hyper from "@macrostrat/hyper";
|
|
17
17
|
import update from "immutability-helper";
|
|
18
18
|
import { ReactNode, useCallback, useEffect, useMemo, useState } from "react";
|
|
19
|
-
import { EditorPopup,
|
|
19
|
+
import { EditorPopup, DataSheetAction } from "./components";
|
|
20
20
|
import styles from "./main.module.sass";
|
|
21
21
|
import {
|
|
22
22
|
DataSheetProvider,
|
|
@@ -27,7 +27,7 @@ import {
|
|
|
27
27
|
useStoreAPI,
|
|
28
28
|
VisibleCells,
|
|
29
29
|
} from "./provider";
|
|
30
|
-
import
|
|
30
|
+
import { ColumnSpec } from "./utils";
|
|
31
31
|
|
|
32
32
|
const h = hyper.styled(styles);
|
|
33
33
|
|
|
@@ -66,6 +66,7 @@ export function DataSheet<T>(props: DataSheetProps<T>) {
|
|
|
66
66
|
editable = true,
|
|
67
67
|
enableColumnReordering = false,
|
|
68
68
|
enableFocusedCell = false,
|
|
69
|
+
defaultColumnWidth = 150,
|
|
69
70
|
...rest
|
|
70
71
|
} = props;
|
|
71
72
|
|
|
@@ -78,6 +79,7 @@ export function DataSheet<T>(props: DataSheetProps<T>) {
|
|
|
78
79
|
columnSpec,
|
|
79
80
|
columnSpecOptions: columnSpecOptions,
|
|
80
81
|
enableColumnReordering,
|
|
82
|
+
defaultColumnWidth,
|
|
81
83
|
editable,
|
|
82
84
|
...rest,
|
|
83
85
|
},
|
|
@@ -111,7 +113,7 @@ function _DataSheet<T>({
|
|
|
111
113
|
|
|
112
114
|
// For now, we only consider a single cell "focused" when we have one cell selected.
|
|
113
115
|
// Multi-cell selections have a different set of "bulk" actions.
|
|
114
|
-
const
|
|
116
|
+
const selectedRegions = useSelector<T>((state) => state.selection);
|
|
115
117
|
|
|
116
118
|
const data = useSelector((state) => state.data);
|
|
117
119
|
const editable = useSelector((state) => state.editable);
|
|
@@ -163,8 +165,8 @@ function _DataSheet<T>({
|
|
|
163
165
|
const deleteSelectedRows = useSelector((state) => state.deleteSelectedRows);
|
|
164
166
|
const _onDeleteRows = useCallback(() => {
|
|
165
167
|
deleteSelectedRows();
|
|
166
|
-
onDeleteRows?.(
|
|
167
|
-
}, [onDeleteRows,
|
|
168
|
+
onDeleteRows?.(selectedRegions);
|
|
169
|
+
}, [onDeleteRows, selectedRegions, deleteSelectedRows]);
|
|
168
170
|
|
|
169
171
|
useEffect(() => {
|
|
170
172
|
if (!verbose) return;
|
|
@@ -177,12 +179,15 @@ function _DataSheet<T>({
|
|
|
177
179
|
|
|
178
180
|
useEffect(() => {
|
|
179
181
|
if (!verbose) return;
|
|
180
|
-
console.log("
|
|
181
|
-
}, [
|
|
182
|
+
console.log("Selected regions", selectedRegions);
|
|
183
|
+
}, [selectedRegions]);
|
|
182
184
|
|
|
183
|
-
|
|
185
|
+
const nDeletionCandidates = useMemo(
|
|
186
|
+
() => getRowsToDelete(selectedRegions).length,
|
|
187
|
+
[selectedRegions],
|
|
188
|
+
);
|
|
184
189
|
|
|
185
|
-
const
|
|
190
|
+
const columnWidths = useSelector((state) => state.columnWidths);
|
|
186
191
|
|
|
187
192
|
const numRows = Math.max(updatedData.length, data.length);
|
|
188
193
|
|
|
@@ -208,6 +213,52 @@ function _DataSheet<T>({
|
|
|
208
213
|
};
|
|
209
214
|
}
|
|
210
215
|
|
|
216
|
+
const children = useMemo(
|
|
217
|
+
() =>
|
|
218
|
+
columnSpec.map((col, colIndex) => {
|
|
219
|
+
return h(Column, {
|
|
220
|
+
name: col.name,
|
|
221
|
+
cellRenderer: (rowIndex) => {
|
|
222
|
+
const state = storeAPI.getState();
|
|
223
|
+
return basicCellRenderer<T>(
|
|
224
|
+
rowIndex,
|
|
225
|
+
colIndex,
|
|
226
|
+
col,
|
|
227
|
+
state,
|
|
228
|
+
autoFocusEditor,
|
|
229
|
+
);
|
|
230
|
+
},
|
|
231
|
+
});
|
|
232
|
+
}),
|
|
233
|
+
[columnSpec, storeAPI, autoFocusEditor],
|
|
234
|
+
);
|
|
235
|
+
|
|
236
|
+
const onColumnWidthChanged = useSelector(
|
|
237
|
+
(state) => state.onColumnWidthChanged,
|
|
238
|
+
);
|
|
239
|
+
|
|
240
|
+
const rowHeaderCellRenderer = useCallback(
|
|
241
|
+
(rowIndex: number) => {
|
|
242
|
+
let style = null;
|
|
243
|
+
if (deletedRows.has(rowIndex)) {
|
|
244
|
+
style = {
|
|
245
|
+
opacity: 0.5,
|
|
246
|
+
textDecoration: "line-through",
|
|
247
|
+
};
|
|
248
|
+
}
|
|
249
|
+
return h(RowHeaderCell, {
|
|
250
|
+
index: rowIndex,
|
|
251
|
+
name: `${rowIndex + 1}`,
|
|
252
|
+
style,
|
|
253
|
+
});
|
|
254
|
+
},
|
|
255
|
+
[deletedRows],
|
|
256
|
+
);
|
|
257
|
+
|
|
258
|
+
const onKeyDown = useSelector((state) => state.tableKeyHandler);
|
|
259
|
+
|
|
260
|
+
if (data == null) return null;
|
|
261
|
+
|
|
211
262
|
return h("div.data-sheet-container", { className, style }, [
|
|
212
263
|
h.if(editable)(DataSheetEditToolbar, {
|
|
213
264
|
onSaveData: _onSaveData,
|
|
@@ -216,92 +267,37 @@ function _DataSheet<T>({
|
|
|
216
267
|
dataSheetActions,
|
|
217
268
|
h(
|
|
218
269
|
"div.data-sheet-holder",
|
|
219
|
-
{
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
},
|
|
243
|
-
},
|
|
244
|
-
[
|
|
245
|
-
h(
|
|
246
|
-
// @ts-expect-error
|
|
247
|
-
Table2,
|
|
248
|
-
{
|
|
249
|
-
ref,
|
|
250
|
-
numRows,
|
|
251
|
-
className: "data-sheet",
|
|
252
|
-
enableFocusedCell,
|
|
253
|
-
enableColumnReordering,
|
|
254
|
-
//onColumnsReordered,
|
|
270
|
+
{ onKeyDown },
|
|
271
|
+
h(
|
|
272
|
+
// @ts-expect-error
|
|
273
|
+
Table2,
|
|
274
|
+
{
|
|
275
|
+
ref,
|
|
276
|
+
numRows,
|
|
277
|
+
className: "data-sheet",
|
|
278
|
+
enableFocusedCell,
|
|
279
|
+
enableColumnReordering,
|
|
280
|
+
//onColumnsReordered,
|
|
281
|
+
focusedCell,
|
|
282
|
+
selectedRegions,
|
|
283
|
+
defaultRowHeight: rowHeight,
|
|
284
|
+
minRowHeight: rowHeight,
|
|
285
|
+
columnWidths,
|
|
286
|
+
onColumnWidthChanged,
|
|
287
|
+
onSelection,
|
|
288
|
+
// The cell renderer is memoized internally based on these data dependencies
|
|
289
|
+
cellRendererDependencies: [
|
|
290
|
+
data,
|
|
291
|
+
//selection,
|
|
292
|
+
updatedData,
|
|
255
293
|
focusedCell,
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
// The cell renderer is memoized internally based on these data dependencies
|
|
264
|
-
cellRendererDependencies: [
|
|
265
|
-
data,
|
|
266
|
-
selection,
|
|
267
|
-
updatedData,
|
|
268
|
-
focusedCell,
|
|
269
|
-
deletedRows,
|
|
270
|
-
],
|
|
271
|
-
onVisibleCellsChange: _onVisibleCellsChange,
|
|
272
|
-
rowHeaderCellRenderer: (rowIndex) => {
|
|
273
|
-
let style = null;
|
|
274
|
-
let intent = undefined;
|
|
275
|
-
if (deletedRows.has(rowIndex)) {
|
|
276
|
-
style = {
|
|
277
|
-
opacity: 0.5,
|
|
278
|
-
textDecoration: "line-through",
|
|
279
|
-
};
|
|
280
|
-
}
|
|
281
|
-
return h(RowHeaderCell, {
|
|
282
|
-
index: rowIndex,
|
|
283
|
-
name: `${rowIndex + 1}`,
|
|
284
|
-
style,
|
|
285
|
-
});
|
|
286
|
-
},
|
|
287
|
-
},
|
|
288
|
-
columnSpec.map((col, colIndex) => {
|
|
289
|
-
return h(Column, {
|
|
290
|
-
name: col.name,
|
|
291
|
-
cellRenderer: (rowIndex) => {
|
|
292
|
-
const state = storeAPI.getState();
|
|
293
|
-
return basicCellRenderer<T>(
|
|
294
|
-
rowIndex,
|
|
295
|
-
colIndex,
|
|
296
|
-
col,
|
|
297
|
-
state,
|
|
298
|
-
autoFocusEditor,
|
|
299
|
-
);
|
|
300
|
-
},
|
|
301
|
-
});
|
|
302
|
-
}),
|
|
303
|
-
),
|
|
304
|
-
],
|
|
294
|
+
deletedRows,
|
|
295
|
+
],
|
|
296
|
+
onVisibleCellsChange: _onVisibleCellsChange,
|
|
297
|
+
rowHeaderCellRenderer,
|
|
298
|
+
},
|
|
299
|
+
children,
|
|
300
|
+
),
|
|
305
301
|
),
|
|
306
302
|
]);
|
|
307
303
|
}
|
|
@@ -329,8 +325,6 @@ function basicCellRenderer<T>(
|
|
|
329
325
|
|
|
330
326
|
const value = updatedData[rowIndex]?.[col.key] ?? data[rowIndex]?.[col.key];
|
|
331
327
|
const _renderedValue = col.valueRenderer?.(value) ?? value;
|
|
332
|
-
let cellContents: ReactNode = _renderedValue;
|
|
333
|
-
const editable = (col.editable ?? state.editable) && !isDeleted;
|
|
334
328
|
|
|
335
329
|
let style = col.style ?? {};
|
|
336
330
|
if (isDeleted) {
|
|
@@ -343,6 +337,9 @@ function basicCellRenderer<T>(
|
|
|
343
337
|
|
|
344
338
|
const focused =
|
|
345
339
|
focusedCell?.col === colIndex && focusedCell?.row === rowIndex;
|
|
340
|
+
|
|
341
|
+
const editable = (col.editable ?? state.editable) && !isDeleted;
|
|
342
|
+
|
|
346
343
|
// Top left cell of a ranged selection
|
|
347
344
|
const topLeft =
|
|
348
345
|
_topLeftCell?.col === colIndex && _topLeftCell?.row === rowIndex;
|
|
@@ -374,24 +371,37 @@ function basicCellRenderer<T>(
|
|
|
374
371
|
style,
|
|
375
372
|
isDeleted,
|
|
376
373
|
},
|
|
377
|
-
|
|
374
|
+
_renderedValue,
|
|
378
375
|
);
|
|
379
376
|
}
|
|
380
377
|
|
|
381
378
|
// The rest is for the top-left cell of a selection or the focused cell
|
|
382
379
|
|
|
380
|
+
// Hidden input to capture key events
|
|
381
|
+
let hiddenInput = h("input.hidden-input", {
|
|
382
|
+
autoFocus: true,
|
|
383
|
+
onKeyDown: state.editorKeyHandler,
|
|
384
|
+
});
|
|
385
|
+
|
|
386
|
+
let cellContents: ReactNode = _renderedValue;
|
|
387
|
+
|
|
383
388
|
if (!editable) {
|
|
384
389
|
// Most cells are not focused and don't need to be editable.
|
|
385
390
|
// This will be the rendering logic for almost all cells
|
|
386
391
|
|
|
387
392
|
if (col.dataEditor != null) {
|
|
388
|
-
cellContents = h(
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
393
|
+
cellContents = h(
|
|
394
|
+
EditorPopup,
|
|
395
|
+
{
|
|
396
|
+
autoFocus: autoFocusEditor,
|
|
397
|
+
valueViewer: _renderedValue,
|
|
398
|
+
},
|
|
399
|
+
[
|
|
400
|
+
h(col.dataEditor, {
|
|
401
|
+
value,
|
|
402
|
+
}),
|
|
403
|
+
],
|
|
404
|
+
);
|
|
395
405
|
}
|
|
396
406
|
|
|
397
407
|
return h(
|
|
@@ -401,18 +411,7 @@ function basicCellRenderer<T>(
|
|
|
401
411
|
value,
|
|
402
412
|
style,
|
|
403
413
|
},
|
|
404
|
-
|
|
405
|
-
h.if(!focused)("input.hidden-input", {
|
|
406
|
-
autoFocus: true,
|
|
407
|
-
onKeyDown(e) {
|
|
408
|
-
if (e.key == "Backspace" || e.key == "Delete") {
|
|
409
|
-
clearSelection();
|
|
410
|
-
}
|
|
411
|
-
e.preventDefault();
|
|
412
|
-
},
|
|
413
|
-
}),
|
|
414
|
-
cellContents,
|
|
415
|
-
],
|
|
414
|
+
cellContents,
|
|
416
415
|
);
|
|
417
416
|
// Could probably put the hidden input elsewhere,
|
|
418
417
|
}
|
|
@@ -425,6 +424,8 @@ function basicCellRenderer<T>(
|
|
|
425
424
|
onCellEdited(rowIndex, col.key, e.target.value);
|
|
426
425
|
};
|
|
427
426
|
|
|
427
|
+
const isSingleCellSelection = singleFocusedCell(state.selection) != null;
|
|
428
|
+
|
|
428
429
|
let _inlineEditor: ReactNode = null;
|
|
429
430
|
if (typeof inlineEditor == "boolean") {
|
|
430
431
|
let _value = value;
|
|
@@ -439,26 +440,7 @@ function basicCellRenderer<T>(
|
|
|
439
440
|
value: _value ?? "",
|
|
440
441
|
autoFocus: autoFocusEditor,
|
|
441
442
|
onChange,
|
|
442
|
-
onKeyDown
|
|
443
|
-
console.log("Key down in inline editor", e.key);
|
|
444
|
-
if (e.key == "Enter") {
|
|
445
|
-
e.target.blur();
|
|
446
|
-
}
|
|
447
|
-
|
|
448
|
-
if (e.key == "Escape") {
|
|
449
|
-
e.target.blur();
|
|
450
|
-
e.preventDefault();
|
|
451
|
-
return;
|
|
452
|
-
}
|
|
453
|
-
|
|
454
|
-
const shouldPropagate = handleSpecialKeys(e, e.target);
|
|
455
|
-
if (!shouldPropagate) {
|
|
456
|
-
e.stopPropagation();
|
|
457
|
-
} else {
|
|
458
|
-
e.target.blur();
|
|
459
|
-
//e.target.parentNode.dispatchEvent(new KeyboardEvent("keydown", e));
|
|
460
|
-
}
|
|
461
|
-
},
|
|
443
|
+
onKeyDown: state.editorKeyHandler,
|
|
462
444
|
});
|
|
463
445
|
} else {
|
|
464
446
|
// If inlineEditor is a ReactNode, we use it directly
|
|
@@ -469,26 +451,27 @@ function basicCellRenderer<T>(
|
|
|
469
451
|
|
|
470
452
|
if (col.dataEditor != null) {
|
|
471
453
|
className = "editor-cell";
|
|
472
|
-
cellContents = h(
|
|
473
|
-
|
|
454
|
+
cellContents = h(
|
|
455
|
+
EditorPopup,
|
|
456
|
+
{
|
|
474
457
|
autoFocus: autoFocusEditor,
|
|
475
|
-
content: h(col.dataEditor, {
|
|
476
|
-
value,
|
|
477
|
-
onChange(value) {
|
|
478
|
-
if (!editable) return;
|
|
479
|
-
onCellEdited(rowIndex, col.key, value);
|
|
480
|
-
},
|
|
481
|
-
}),
|
|
482
458
|
valueViewer: _renderedValue,
|
|
459
|
+
},
|
|
460
|
+
h(col.dataEditor, {
|
|
461
|
+
value,
|
|
462
|
+
onChange(value) {
|
|
463
|
+
if (!editable) return;
|
|
464
|
+
state.onSelectionEdited(value);
|
|
465
|
+
},
|
|
483
466
|
}),
|
|
484
|
-
|
|
467
|
+
);
|
|
468
|
+
hiddenInput = null;
|
|
485
469
|
} else if (_inlineEditor != null) {
|
|
486
470
|
cellContents = _inlineEditor;
|
|
487
471
|
className = "input-cell";
|
|
472
|
+
hiddenInput = null;
|
|
488
473
|
}
|
|
489
474
|
|
|
490
|
-
const isSingleCellSelection = singleFocusedCell(state.selection) != null;
|
|
491
|
-
|
|
492
475
|
// Hidden html input
|
|
493
476
|
return h(
|
|
494
477
|
_Cell,
|
|
@@ -504,6 +487,7 @@ function basicCellRenderer<T>(
|
|
|
504
487
|
h.if(editable && isSingleCellSelection)(DragHandle, {
|
|
505
488
|
focusedCell,
|
|
506
489
|
}),
|
|
490
|
+
hiddenInput,
|
|
507
491
|
],
|
|
508
492
|
);
|
|
509
493
|
}
|
package/src/provider.ts
CHANGED
|
@@ -10,8 +10,10 @@ import type {
|
|
|
10
10
|
import {
|
|
11
11
|
ColumnSpec,
|
|
12
12
|
ColumnSpecOptions,
|
|
13
|
+
editorKeyHandler,
|
|
13
14
|
generateColumnSpec,
|
|
14
15
|
range,
|
|
16
|
+
tableKeyHandler,
|
|
15
17
|
} from "./utils";
|
|
16
18
|
import update, { Spec } from "immutability-helper";
|
|
17
19
|
|
|
@@ -20,6 +22,7 @@ export interface DataSheetCoreProps<T> {
|
|
|
20
22
|
columnSpec?: ColumnSpec[];
|
|
21
23
|
editable?: boolean;
|
|
22
24
|
enableColumnReordering?: boolean;
|
|
25
|
+
defaultColumnWidth?: number;
|
|
23
26
|
}
|
|
24
27
|
|
|
25
28
|
export interface DataSheetState<T> {
|
|
@@ -32,22 +35,21 @@ export interface DataSheetState<T> {
|
|
|
32
35
|
// Sparse data structure for updated data
|
|
33
36
|
updatedData: T[];
|
|
34
37
|
initialized: boolean;
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
export interface DataSheetComputedStore {
|
|
38
|
-
hasUpdates: boolean;
|
|
38
|
+
columnWidthsIndex: Map<string, number>;
|
|
39
39
|
}
|
|
40
40
|
|
|
41
41
|
type DataSheetVals<T> = DataSheetState<T> & DataSheetCoreProps<T>;
|
|
42
42
|
|
|
43
43
|
type StateUpdater<T> = T[] | ((state: T[]) => T[]);
|
|
44
44
|
|
|
45
|
-
export interface
|
|
45
|
+
export interface DataSheetStoreMain<T> extends DataSheetVals<T> {
|
|
46
46
|
setSelection(selection: Region[]): void;
|
|
47
47
|
onDragValue(cell: FocusedCellCoordinates | null): void;
|
|
48
48
|
setUpdatedData(data: StateUpdater<T>): void;
|
|
49
49
|
onCellEdited(rowIndex: number, columnName: string, value: any): void;
|
|
50
|
+
onSelectionEdited(value: any): void;
|
|
50
51
|
onColumnsReordered(oldIndex: number, newIndex: number, length: number): void;
|
|
52
|
+
onColumnWidthChanged(columnIndex: number, newWidth: number): void;
|
|
51
53
|
moveFocusedCell(direction: "up" | "down" | "left" | "right"): void;
|
|
52
54
|
deleteSelectedRows(): void;
|
|
53
55
|
clearSelection(): void;
|
|
@@ -59,6 +61,8 @@ export interface DataSheetStore<T> extends DataSheetVals<T> {
|
|
|
59
61
|
setVisibleCells(visibleCells: VisibleCells): void;
|
|
60
62
|
scrollToRow(rowIndex: number): void;
|
|
61
63
|
tableRef: React.MutableRefObject<Table2>;
|
|
64
|
+
columnWidthsIndex: Map<string, number>;
|
|
65
|
+
defaultColumnWidth: number;
|
|
62
66
|
}
|
|
63
67
|
|
|
64
68
|
export type DataSheetProviderProps<T> = DataSheetCoreProps<T> & {
|
|
@@ -73,10 +77,38 @@ export interface VisibleCells {
|
|
|
73
77
|
rowIndexEnd: number;
|
|
74
78
|
}
|
|
75
79
|
|
|
80
|
+
interface DataSheetComputedVals {
|
|
81
|
+
hasUpdates: boolean;
|
|
82
|
+
/** State for column widths (if resized).
|
|
83
|
+
* This will reset if the columnSpec prop changes
|
|
84
|
+
*/
|
|
85
|
+
columnWidths: number[];
|
|
86
|
+
tableKeyHandler: (evt: React.KeyboardEvent) => void;
|
|
87
|
+
editorKeyHandler: (evt: React.KeyboardEvent) => void;
|
|
88
|
+
isSingleCellSelection?: boolean;
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
export type DataSheetStore<T> = DataSheetComputedVals & DataSheetStoreMain<T>;
|
|
92
|
+
|
|
76
93
|
const computed = createComputed(
|
|
77
|
-
(state:
|
|
78
|
-
|
|
79
|
-
|
|
94
|
+
(state: DataSheetStoreMain<any>): DataSheetComputedVals => {
|
|
95
|
+
const isSingleCellSelection = singleFocusedCell(state.selection) != null;
|
|
96
|
+
return {
|
|
97
|
+
hasUpdates: state.updatedData.length > 0 || state.deletedRows.size > 0,
|
|
98
|
+
columnWidths: state.columnSpec.map(
|
|
99
|
+
(col) =>
|
|
100
|
+
state.columnWidthsIndex.get(col.key) ??
|
|
101
|
+
col.width ??
|
|
102
|
+
state.defaultColumnWidth,
|
|
103
|
+
),
|
|
104
|
+
editorKeyHandler: (e: React.KeyboardEvent) =>
|
|
105
|
+
editorKeyHandler(e, isSingleCellSelection),
|
|
106
|
+
isSingleCellSelection,
|
|
107
|
+
tableKeyHandler: (e: React.KeyboardEvent) => {
|
|
108
|
+
tableKeyHandler(e, state);
|
|
109
|
+
},
|
|
110
|
+
};
|
|
111
|
+
},
|
|
80
112
|
) as any;
|
|
81
113
|
|
|
82
114
|
export function DataSheetProvider<T>({
|
|
@@ -86,6 +118,7 @@ export function DataSheetProvider<T>({
|
|
|
86
118
|
columnSpecOptions,
|
|
87
119
|
editable,
|
|
88
120
|
enableColumnReordering,
|
|
121
|
+
defaultColumnWidth = 150,
|
|
89
122
|
}: DataSheetProviderProps<T>) {
|
|
90
123
|
const visibleCellsRef = useRef<VisibleCells>({
|
|
91
124
|
rowIndexStart: 0,
|
|
@@ -95,11 +128,13 @@ export function DataSheetProvider<T>({
|
|
|
95
128
|
const tableRef = useRef<Table2>(null);
|
|
96
129
|
|
|
97
130
|
const [store] = useState(() => {
|
|
131
|
+
const spec = columnSpec || generateColumnSpec(data, columnSpecOptions);
|
|
98
132
|
return createStore<DataSheetStore<T>>(
|
|
99
133
|
computed((set): DataSheetStore<T> => {
|
|
100
134
|
return {
|
|
101
135
|
data,
|
|
102
|
-
columnSpec:
|
|
136
|
+
columnSpec: spec,
|
|
137
|
+
defaultColumnWidth,
|
|
103
138
|
editable,
|
|
104
139
|
deletedRows: new Set<number>(),
|
|
105
140
|
selection: [],
|
|
@@ -114,6 +149,7 @@ export function DataSheetProvider<T>({
|
|
|
114
149
|
setSelection(selection: Region[]) {
|
|
115
150
|
set(updateSelection(selection));
|
|
116
151
|
},
|
|
152
|
+
columnWidthsIndex: new Map<string, number>(),
|
|
117
153
|
moveFocusedCell(direction: "up" | "down" | "left" | "right") {
|
|
118
154
|
set((state) => {
|
|
119
155
|
const { topLeftCell } = state;
|
|
@@ -195,12 +231,22 @@ export function DataSheetProvider<T>({
|
|
|
195
231
|
set((state) => ({
|
|
196
232
|
updatedData: [],
|
|
197
233
|
deletedRows: new Set<number>(),
|
|
234
|
+
columnWidths: new Map<string, number>(),
|
|
198
235
|
selection: [],
|
|
199
236
|
focusedCell: null,
|
|
200
237
|
topLeftCell: null,
|
|
201
238
|
fillValueBaseCell: null,
|
|
202
239
|
}));
|
|
203
240
|
},
|
|
241
|
+
onColumnWidthChanged(columnIx: number, newWidth: number) {
|
|
242
|
+
set((state) => {
|
|
243
|
+
const { columnSpec, columnWidthsIndex } = state;
|
|
244
|
+
const colKey = columnSpec[columnIx].key;
|
|
245
|
+
const newColumnWidths = new Map(columnWidthsIndex);
|
|
246
|
+
newColumnWidths.set(colKey, newWidth);
|
|
247
|
+
return { columnWidthsIndex: newColumnWidths };
|
|
248
|
+
});
|
|
249
|
+
},
|
|
204
250
|
setVisibleCells(visibleCells: VisibleCells) {
|
|
205
251
|
// Visible cells are used for infinite scrolling
|
|
206
252
|
// Right now we don't store this in the state
|
|
@@ -234,6 +280,7 @@ export function DataSheetProvider<T>({
|
|
|
234
280
|
const { selection, updatedData, columnSpec, data } = state;
|
|
235
281
|
let spec = {};
|
|
236
282
|
for (const region of selection) {
|
|
283
|
+
console.log("Clearing region", region);
|
|
237
284
|
const { cols, rows } = region;
|
|
238
285
|
const rowRange = range(rows ?? [0, updatedData.length - 1]);
|
|
239
286
|
const colRange = range(cols ?? [0, columnSpec.length - 1]);
|
|
@@ -279,6 +326,31 @@ export function DataSheetProvider<T>({
|
|
|
279
326
|
return spec;
|
|
280
327
|
});
|
|
281
328
|
},
|
|
329
|
+
onSelectionEdited(value: any) {
|
|
330
|
+
// Apply the same value to all selected cells
|
|
331
|
+
set((state) => {
|
|
332
|
+
const { selection, updatedData, columnSpec, editable } = state;
|
|
333
|
+
if (!editable) return {};
|
|
334
|
+
let spec = {};
|
|
335
|
+
for (const region of selection) {
|
|
336
|
+
const { cols, rows } = region;
|
|
337
|
+
const rowRange = range(rows ?? [0, updatedData.length - 1]);
|
|
338
|
+
const colRange = range(cols ?? [0, columnSpec.length - 1]);
|
|
339
|
+
for (const row of rowRange) {
|
|
340
|
+
let vals = {};
|
|
341
|
+
for (const col of colRange) {
|
|
342
|
+
const key = columnSpec[col].key;
|
|
343
|
+
vals[key] = value;
|
|
344
|
+
}
|
|
345
|
+
let op = updatedData[row] == null ? "$set" : "$merge";
|
|
346
|
+
spec[row] = { [op]: vals };
|
|
347
|
+
}
|
|
348
|
+
}
|
|
349
|
+
return {
|
|
350
|
+
updatedData: update(updatedData, spec),
|
|
351
|
+
};
|
|
352
|
+
});
|
|
353
|
+
},
|
|
282
354
|
onColumnsReordered(
|
|
283
355
|
oldIndex: number,
|
|
284
356
|
newIndex: number,
|