@macrostrat/data-sheet 2.0.2 → 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.
- package/CHANGELOG.md +10 -0
- package/README.md +17 -10
- package/dist/esm/{postgrest-table.d4e0260e.js → data-sheet.00171fc5.js} +76 -61
- package/dist/esm/data-sheet.00171fc5.js.map +1 -0
- package/dist/esm/{utils.5d81fe80.js → data-sheet.0adfe599.js} +2 -2
- package/dist/esm/{utils.5d81fe80.js.map → data-sheet.0adfe599.js.map} +1 -1
- package/dist/esm/{editor-popup.819ce365.js → data-sheet.1d6ac6c6.js} +28 -8
- package/dist/esm/data-sheet.1d6ac6c6.js.map +1 -0
- package/dist/esm/{data-loaders.b7de291b.js → data-sheet.2773da15.js} +12 -3
- package/dist/esm/data-sheet.2773da15.js.map +1 -0
- package/dist/esm/{main.module.7e0903d4.js → data-sheet.37e35216.js} +16 -1
- package/dist/esm/data-sheet.37e35216.js.map +1 -0
- package/dist/esm/{column-spec.e56f4d75.js → data-sheet.410c5122.js} +20 -7
- package/dist/esm/data-sheet.410c5122.js.map +1 -0
- package/dist/esm/{main.module.83442ac4.js → data-sheet.48635112.js} +4 -1
- package/dist/esm/data-sheet.48635112.js.map +1 -0
- package/dist/esm/{actions.module.560a3136.js → data-sheet.54cfa8e8.js} +1 -1
- package/dist/esm/{actions.module.560a3136.js.map → data-sheet.54cfa8e8.js.map} +1 -1
- package/dist/esm/{colors.75a92ad3.js → data-sheet.6021b6c9.js} +30 -21
- package/dist/esm/data-sheet.6021b6c9.js.map +1 -0
- package/dist/esm/{actions.module.684172fa.css → data-sheet.706f955d.css} +1 -1
- package/dist/esm/{actions.module.684172fa.css.map → data-sheet.706f955d.css.map} +1 -1
- package/dist/esm/{main.module.658cf7b2.css → data-sheet.91223ec6.css} +35 -1
- package/dist/esm/data-sheet.91223ec6.css.map +1 -0
- package/dist/esm/{actions.065d098d.js → data-sheet.a3eb6088.js} +4 -4
- package/dist/esm/{actions.065d098d.js.map → data-sheet.a3eb6088.js.map} +1 -1
- package/dist/esm/{main.module.df43976f.css → data-sheet.b3ccc91b.css} +8 -5
- package/dist/esm/data-sheet.b3ccc91b.css.map +1 -0
- package/dist/esm/{provider.fefae4a0.js → data-sheet.b4098761.js} +154 -12
- package/dist/esm/data-sheet.b4098761.js.map +1 -0
- package/dist/esm/{text-areas.ccfcf204.js → data-sheet.b5946d6b.js} +6 -5
- package/dist/esm/data-sheet.b5946d6b.js.map +1 -0
- package/dist/esm/{main.module.bd60788c.js → data-sheet.d570ef95.js} +22 -22
- package/dist/esm/data-sheet.d570ef95.js.map +1 -0
- package/dist/esm/{core.f82b5af0.js → data-sheet.e09ffc66.js} +181 -80
- package/dist/esm/data-sheet.e09ffc66.js.map +1 -0
- package/dist/esm/{components.f832ecf3.js → data-sheet.e37b4bd3.js} +5 -5
- package/dist/esm/{components.f832ecf3.js.map → data-sheet.e37b4bd3.js.map} +1 -1
- package/dist/esm/data-sheet.ef63e366.css +110 -0
- package/dist/esm/data-sheet.ef63e366.css.map +1 -0
- package/dist/esm/index.d.ts +36 -23
- package/dist/esm/index.d.ts.map +1 -1
- package/dist/esm/index.js +3 -3
- package/dist/node/data-sheet.0f66147e.js +2 -0
- package/dist/node/data-sheet.0f66147e.js.map +1 -0
- package/dist/node/data-sheet.171105c1.js +2 -0
- package/dist/node/data-sheet.171105c1.js.map +1 -0
- package/dist/node/data-sheet.1a487c3c.js +2 -0
- package/dist/node/data-sheet.1a487c3c.js.map +1 -0
- package/dist/node/data-sheet.28641e23.css +2 -0
- package/dist/node/data-sheet.28641e23.css.map +1 -0
- package/dist/node/data-sheet.2cac1a8c.js +2 -0
- package/dist/node/data-sheet.2cac1a8c.js.map +1 -0
- package/dist/node/data-sheet.2f64274d.css +2 -0
- package/dist/node/data-sheet.2f64274d.css.map +1 -0
- package/dist/node/data-sheet.3680e59d.js +2 -0
- package/dist/node/data-sheet.3680e59d.js.map +1 -0
- package/dist/node/data-sheet.47e3f95c.js +2 -0
- package/dist/node/data-sheet.47e3f95c.js.map +1 -0
- package/dist/node/data-sheet.50d0742f.js +2 -0
- package/dist/node/data-sheet.50d0742f.js.map +1 -0
- package/dist/node/data-sheet.599efaa9.js +2 -0
- package/dist/node/data-sheet.599efaa9.js.map +1 -0
- package/dist/node/data-sheet.7b95fbc1.css +2 -0
- package/dist/node/data-sheet.7b95fbc1.css.map +1 -0
- package/dist/node/data-sheet.7bbad640.js +2 -0
- package/dist/node/data-sheet.7bbad640.js.map +1 -0
- package/dist/node/data-sheet.945becc3.js +2 -0
- package/dist/node/data-sheet.945becc3.js.map +1 -0
- package/dist/node/data-sheet.95445483.js +2 -0
- package/dist/node/data-sheet.95445483.js.map +1 -0
- package/dist/node/data-sheet.a65463ef.js +2 -0
- package/dist/node/data-sheet.a65463ef.js.map +1 -0
- package/dist/node/data-sheet.c3eefdc9.js +2 -0
- package/dist/node/data-sheet.c3eefdc9.js.map +1 -0
- package/dist/node/data-sheet.e6e07d4a.js +2 -0
- package/dist/node/data-sheet.e6e07d4a.js.map +1 -0
- package/dist/node/data-sheet.f0223f39.js +2 -0
- package/dist/node/data-sheet.f0223f39.js.map +1 -0
- package/dist/node/{actions.module.565df529.css → data-sheet.ffaf8ac7.css} +1 -1
- package/dist/node/data-sheet.ffaf8ac7.css.map +1 -0
- package/dist/node/index.js +1 -1
- package/dist/node/index.js.map +1 -1
- package/package.json +8 -6
- package/src/__archive/base.ts +1 -1
- package/src/__archive/components/column-utils.ts +1 -1
- package/src/__archive/components/index.ts +3 -3
- package/src/__archive/components/toolbar.ts +4 -4
- package/src/__archive/editors/index.ts +2 -2
- package/src/__archive/main.ts +6 -6
- package/src/__archive/provider.ts +1 -1
- package/src/__archive/test-sheet/index.ts +5 -5
- package/src/__archive/virtualized.ts +2 -2
- package/src/components/colors.ts +38 -22
- package/src/components/editor-popup.ts +28 -6
- package/src/components/main.module.sass +33 -0
- package/src/components/text-areas.ts +2 -1
- package/src/core.ts +261 -105
- package/src/main.module.sass +19 -0
- package/src/postgrest-table/data-loaders.ts +44 -12
- package/src/postgrest-table/index.ts +104 -45
- package/src/postgrest-table/main.module.sass +6 -4
- package/src/provider.ts +286 -103
- package/src/utils/column-spec.ts +42 -3
- package/dist/esm/cell-renderers.8222e82a.js +0 -31
- package/dist/esm/cell-renderers.8222e82a.js.map +0 -1
- package/dist/esm/colors.75a92ad3.js.map +0 -1
- package/dist/esm/column-spec.e56f4d75.js.map +0 -1
- package/dist/esm/core.f82b5af0.js.map +0 -1
- package/dist/esm/data-loaders.b7de291b.js.map +0 -1
- package/dist/esm/editor-popup.819ce365.js.map +0 -1
- package/dist/esm/main.module.658cf7b2.css.map +0 -1
- package/dist/esm/main.module.7e0903d4.js.map +0 -1
- package/dist/esm/main.module.83442ac4.js.map +0 -1
- package/dist/esm/main.module.b66a4bc1.css +0 -91
- package/dist/esm/main.module.b66a4bc1.css.map +0 -1
- package/dist/esm/main.module.bd60788c.js.map +0 -1
- package/dist/esm/main.module.df43976f.css.map +0 -1
- package/dist/esm/postgrest-table.d4e0260e.js.map +0 -1
- package/dist/esm/provider.fefae4a0.js.map +0 -1
- package/dist/esm/text-areas.ccfcf204.js.map +0 -1
- package/dist/node/actions.4dfe63d8.js +0 -2
- package/dist/node/actions.4dfe63d8.js.map +0 -1
- package/dist/node/actions.module.565df529.css.map +0 -1
- package/dist/node/actions.module.61991621.js +0 -2
- package/dist/node/actions.module.61991621.js.map +0 -1
- package/dist/node/cell-renderers.bbaaeb83.js +0 -2
- package/dist/node/cell-renderers.bbaaeb83.js.map +0 -1
- package/dist/node/colors.fee61100.js +0 -2
- package/dist/node/colors.fee61100.js.map +0 -1
- package/dist/node/column-spec.da7354f5.js +0 -2
- package/dist/node/column-spec.da7354f5.js.map +0 -1
- package/dist/node/components.213ca3fc.js +0 -2
- package/dist/node/components.213ca3fc.js.map +0 -1
- package/dist/node/core.c404e4d4.js +0 -2
- package/dist/node/core.c404e4d4.js.map +0 -1
- package/dist/node/data-loaders.50ce46a4.js +0 -2
- package/dist/node/data-loaders.50ce46a4.js.map +0 -1
- package/dist/node/editor-popup.e19a3668.js +0 -2
- package/dist/node/editor-popup.e19a3668.js.map +0 -1
- package/dist/node/main.module.0802fb12.js +0 -2
- package/dist/node/main.module.0802fb12.js.map +0 -1
- package/dist/node/main.module.273015bb.js +0 -2
- package/dist/node/main.module.273015bb.js.map +0 -1
- package/dist/node/main.module.4cad6bbb.js +0 -2
- package/dist/node/main.module.4cad6bbb.js.map +0 -1
- package/dist/node/main.module.8370d601.css +0 -2
- package/dist/node/main.module.8370d601.css.map +0 -1
- package/dist/node/main.module.a197ee6f.css +0 -2
- package/dist/node/main.module.a197ee6f.css.map +0 -1
- package/dist/node/main.module.e5354239.css +0 -2
- package/dist/node/main.module.e5354239.css.map +0 -1
- package/dist/node/postgrest-table.49926421.js +0 -2
- package/dist/node/postgrest-table.49926421.js.map +0 -1
- package/dist/node/provider.f11d5828.js +0 -2
- package/dist/node/provider.f11d5828.js.map +0 -1
- package/dist/node/text-areas.64832f7d.js +0 -2
- package/dist/node/text-areas.64832f7d.js.map +0 -1
- package/dist/node/utils.897d92e2.js +0 -2
- package/dist/node/utils.897d92e2.js.map +0 -1
- package/src/postgrest-table/cell-renderers.ts +0 -24
package/src/core.ts
CHANGED
|
@@ -5,11 +5,17 @@ import {
|
|
|
5
5
|
InputGroup,
|
|
6
6
|
Intent,
|
|
7
7
|
} from "@blueprintjs/core";
|
|
8
|
-
import {
|
|
8
|
+
import {
|
|
9
|
+
Cell,
|
|
10
|
+
Column,
|
|
11
|
+
Region,
|
|
12
|
+
RowHeaderCell,
|
|
13
|
+
Table2,
|
|
14
|
+
} from "@blueprintjs/table";
|
|
9
15
|
import "@blueprintjs/table/lib/css/table.css";
|
|
10
16
|
import hyper from "@macrostrat/hyper";
|
|
11
17
|
import update from "immutability-helper";
|
|
12
|
-
import { ReactNode, useCallback, useEffect,
|
|
18
|
+
import { ReactNode, useCallback, useEffect, useMemo, useState } from "react";
|
|
13
19
|
import { EditorPopup, handleSpecialKeys } from "./components";
|
|
14
20
|
import styles from "./main.module.sass";
|
|
15
21
|
import {
|
|
@@ -18,6 +24,7 @@ import {
|
|
|
18
24
|
DataSheetProvider,
|
|
19
25
|
DataSheetProviderProps,
|
|
20
26
|
DataSheetStore,
|
|
27
|
+
singleFocusedCell,
|
|
21
28
|
useSelector,
|
|
22
29
|
useStoreAPI,
|
|
23
30
|
VisibleCells,
|
|
@@ -34,14 +41,24 @@ const h = hyper.styled(styles);
|
|
|
34
41
|
// TODO: add a "copy to selection" tool (the little square in the bottom right corner of a cell)
|
|
35
42
|
// This should copy the value of a cell (or a set of cells in the same row) downwards.
|
|
36
43
|
|
|
44
|
+
export enum DataSheetDensity {
|
|
45
|
+
HIGH = "high",
|
|
46
|
+
MEDIUM = "medium",
|
|
47
|
+
LOW = "low",
|
|
48
|
+
}
|
|
49
|
+
|
|
37
50
|
interface DataSheetInternalProps<T> {
|
|
38
51
|
onVisibleCellsChange?: (visibleCells: VisibleCells) => void;
|
|
39
|
-
onSaveData
|
|
52
|
+
onSaveData?: (updatedData: any[], data: T[]) => void;
|
|
53
|
+
onUpdateData?: (updatedData: any[], data: T[]) => void;
|
|
40
54
|
onDeleteRows?: (selection: Region[]) => void;
|
|
41
55
|
verbose?: boolean;
|
|
42
56
|
enableColumnReordering?: boolean;
|
|
57
|
+
enableFocusedCell?: boolean;
|
|
43
58
|
dataSheetActions?: ReactNode | null;
|
|
44
59
|
editable?: boolean;
|
|
60
|
+
autoFocusEditor?: boolean;
|
|
61
|
+
density?: DataSheetDensity;
|
|
45
62
|
}
|
|
46
63
|
|
|
47
64
|
type DataSheetProps<T> = DataSheetProviderProps<T> & DataSheetInternalProps<T>;
|
|
@@ -53,6 +70,7 @@ export function DataSheet<T>(props: DataSheetProps<T>) {
|
|
|
53
70
|
columnSpecOptions,
|
|
54
71
|
editable = true,
|
|
55
72
|
enableColumnReordering = false,
|
|
73
|
+
enableFocusedCell = false,
|
|
56
74
|
...rest
|
|
57
75
|
} = props;
|
|
58
76
|
|
|
@@ -68,8 +86,13 @@ export function DataSheet<T>(props: DataSheetProps<T>) {
|
|
|
68
86
|
editable,
|
|
69
87
|
...rest,
|
|
70
88
|
},
|
|
71
|
-
h(_DataSheet, {
|
|
72
|
-
|
|
89
|
+
h(_DataSheet, {
|
|
90
|
+
...rest,
|
|
91
|
+
editable,
|
|
92
|
+
enableColumnReordering,
|
|
93
|
+
enableFocusedCell,
|
|
94
|
+
}),
|
|
95
|
+
),
|
|
73
96
|
);
|
|
74
97
|
}
|
|
75
98
|
|
|
@@ -77,9 +100,13 @@ function _DataSheet<T>({
|
|
|
77
100
|
onVisibleCellsChange,
|
|
78
101
|
enableColumnReordering,
|
|
79
102
|
onSaveData,
|
|
103
|
+
onUpdateData,
|
|
80
104
|
onDeleteRows,
|
|
81
|
-
verbose =
|
|
105
|
+
verbose = false,
|
|
82
106
|
dataSheetActions = null,
|
|
107
|
+
enableFocusedCell,
|
|
108
|
+
autoFocusEditor = true,
|
|
109
|
+
density = DataSheetDensity.HIGH,
|
|
83
110
|
}: DataSheetInternalProps<T>) {
|
|
84
111
|
/**
|
|
85
112
|
* @param data: The data to be displayed in the table
|
|
@@ -94,6 +121,8 @@ function _DataSheet<T>({
|
|
|
94
121
|
const data = useSelector((state) => state.data);
|
|
95
122
|
const editable = useSelector((state) => state.editable);
|
|
96
123
|
|
|
124
|
+
const deletedRows = useSelector((state) => state.deletedRows);
|
|
125
|
+
|
|
97
126
|
const focusedCell = useSelector((state) => state.focusedCell);
|
|
98
127
|
|
|
99
128
|
const ref = useSelector((state) => state.tableRef);
|
|
@@ -105,17 +134,16 @@ function _DataSheet<T>({
|
|
|
105
134
|
const updatedData = useSelector((state) => state.updatedData);
|
|
106
135
|
const setUpdatedData = useSelector((state) => state.setUpdatedData);
|
|
107
136
|
|
|
108
|
-
const hasUpdates = updatedData.length > 0;
|
|
109
|
-
|
|
110
137
|
const onSelection = useSelector((state) => state.onSelection);
|
|
111
138
|
|
|
112
139
|
const storeAPI = useStoreAPI<T>();
|
|
113
140
|
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
141
|
+
const _onSaveData = useMemo(() => {
|
|
142
|
+
if (onSaveData == null) return null;
|
|
143
|
+
return () => {
|
|
144
|
+
onSaveData(updatedData, data);
|
|
145
|
+
setUpdatedData([]);
|
|
146
|
+
};
|
|
119
147
|
}, [updatedData, data, onSaveData]);
|
|
120
148
|
|
|
121
149
|
const setVisibleCells = useSelector((state) => state.setVisibleCells);
|
|
@@ -125,27 +153,33 @@ function _DataSheet<T>({
|
|
|
125
153
|
setVisibleCells(visibleCells);
|
|
126
154
|
onVisibleCellsChange?.(visibleCells);
|
|
127
155
|
},
|
|
128
|
-
[onVisibleCellsChange, setVisibleCells]
|
|
156
|
+
[onVisibleCellsChange, setVisibleCells],
|
|
129
157
|
);
|
|
130
158
|
|
|
131
159
|
const onAddRow = useCallback(() => {
|
|
132
160
|
setUpdatedData((updatedData) => {
|
|
133
|
-
const ix = data.length;
|
|
161
|
+
const ix = Math.max(updatedData.length, data.length);
|
|
134
162
|
const addRowSpec = { [ix]: { $set: {} } };
|
|
135
163
|
const newUpdatedData = update(updatedData, addRowSpec);
|
|
136
164
|
return newUpdatedData;
|
|
137
165
|
});
|
|
138
|
-
}, [setUpdatedData
|
|
166
|
+
}, [setUpdatedData]);
|
|
139
167
|
|
|
168
|
+
const deleteSelectedRows = useSelector((state) => state.deleteSelectedRows);
|
|
140
169
|
const _onDeleteRows = useCallback(() => {
|
|
141
|
-
|
|
142
|
-
|
|
170
|
+
deleteSelectedRows();
|
|
171
|
+
onDeleteRows?.(selection);
|
|
172
|
+
}, [onDeleteRows, selection, deleteSelectedRows]);
|
|
143
173
|
|
|
144
174
|
useEffect(() => {
|
|
145
175
|
if (!verbose) return;
|
|
146
176
|
console.log("Updated data", updatedData);
|
|
147
177
|
}, [updatedData]);
|
|
148
178
|
|
|
179
|
+
useEffect(() => {
|
|
180
|
+
onUpdateData?.(updatedData, data);
|
|
181
|
+
}, [onUpdateData, data, updatedData]);
|
|
182
|
+
|
|
149
183
|
useEffect(() => {
|
|
150
184
|
if (!verbose) return;
|
|
151
185
|
console.log("Selection", selection);
|
|
@@ -157,43 +191,123 @@ function _DataSheet<T>({
|
|
|
157
191
|
|
|
158
192
|
const numRows = Math.max(updatedData.length, data.length);
|
|
159
193
|
|
|
160
|
-
|
|
194
|
+
let className = `${density}-density`;
|
|
195
|
+
|
|
196
|
+
let rowHeight = 20;
|
|
197
|
+
let defaultColumnWidth = 150;
|
|
198
|
+
let style = {
|
|
199
|
+
"--data-sheet-row-height": "20px",
|
|
200
|
+
"--data-sheet-font-size": "12px",
|
|
201
|
+
};
|
|
202
|
+
if (density === DataSheetDensity.MEDIUM) {
|
|
203
|
+
rowHeight = 24;
|
|
204
|
+
style = {
|
|
205
|
+
"--data-sheet-row-height": "24px",
|
|
206
|
+
"--data-sheet-font-size": "14px",
|
|
207
|
+
};
|
|
208
|
+
} else if (density === DataSheetDensity.LOW) {
|
|
209
|
+
rowHeight = 30;
|
|
210
|
+
style = {
|
|
211
|
+
"--data-sheet-row-height": "30px",
|
|
212
|
+
"--data-sheet-font-size": "18px",
|
|
213
|
+
};
|
|
214
|
+
}
|
|
215
|
+
|
|
216
|
+
return h("div.data-sheet-container", { className, style }, [
|
|
161
217
|
h.if(editable)(DataSheetEditToolbar, {
|
|
162
|
-
hasUpdates,
|
|
163
|
-
setUpdatedData,
|
|
164
218
|
onSaveData: _onSaveData,
|
|
165
219
|
onAddRow,
|
|
166
220
|
onDeleteRows: nDeletionCandidates > 0 ? _onDeleteRows : null,
|
|
167
221
|
}),
|
|
168
222
|
dataSheetActions,
|
|
169
|
-
h(
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
{
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
223
|
+
h(
|
|
224
|
+
"div.data-sheet-holder",
|
|
225
|
+
{
|
|
226
|
+
onKeyDown(e) {
|
|
227
|
+
// General key event
|
|
228
|
+
if (e.key === "Escape") {
|
|
229
|
+
// Clear selection on Escape
|
|
230
|
+
storeAPI.getState().setSelection([]);
|
|
231
|
+
e.preventDefault();
|
|
232
|
+
}
|
|
233
|
+
// Clear selection on Backspace or Delete
|
|
234
|
+
if (e.key === "Backspace" || e.key === "Delete") {
|
|
235
|
+
// Clear selection on Backspace or Delete
|
|
236
|
+
storeAPI.getState().clearSelection();
|
|
237
|
+
e.preventDefault();
|
|
238
|
+
}
|
|
239
|
+
// Handle arrow keys for navigation
|
|
240
|
+
if (e.key.startsWith("Arrow")) {
|
|
241
|
+
// Handle arrow key navigation
|
|
242
|
+
const direction = e.key.replace("Arrow", "").toLowerCase();
|
|
243
|
+
const state = storeAPI.getState();
|
|
244
|
+
state.moveFocusedCell(direction);
|
|
245
|
+
// Prevent default scrolling behavior
|
|
246
|
+
e.preventDefault();
|
|
247
|
+
}
|
|
185
248
|
},
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
249
|
+
},
|
|
250
|
+
[
|
|
251
|
+
h(
|
|
252
|
+
Table2,
|
|
253
|
+
{
|
|
254
|
+
ref,
|
|
255
|
+
numRows,
|
|
256
|
+
className: "data-sheet",
|
|
257
|
+
enableFocusedCell,
|
|
258
|
+
enableColumnReordering,
|
|
259
|
+
//onColumnsReordered,
|
|
260
|
+
focusedCell,
|
|
261
|
+
selectedRegions: selection,
|
|
262
|
+
defaultRowHeight: rowHeight,
|
|
263
|
+
minRowHeight: rowHeight,
|
|
264
|
+
columnWidths: columnSpec.map(
|
|
265
|
+
(col) => col.width ?? defaultColumnWidth,
|
|
266
|
+
),
|
|
267
|
+
onSelection,
|
|
268
|
+
// The cell renderer is memoized internally based on these data dependencies
|
|
269
|
+
cellRendererDependencies: [
|
|
270
|
+
data,
|
|
271
|
+
selection,
|
|
272
|
+
updatedData,
|
|
273
|
+
focusedCell,
|
|
274
|
+
deletedRows,
|
|
275
|
+
],
|
|
276
|
+
onVisibleCellsChange: _onVisibleCellsChange,
|
|
277
|
+
rowHeaderCellRenderer: (rowIndex) => {
|
|
278
|
+
let style = null;
|
|
279
|
+
let intent = undefined;
|
|
280
|
+
if (deletedRows.has(rowIndex)) {
|
|
281
|
+
style = {
|
|
282
|
+
opacity: 0.5,
|
|
283
|
+
textDecoration: "line-through",
|
|
284
|
+
};
|
|
285
|
+
}
|
|
286
|
+
return h(RowHeaderCell, {
|
|
287
|
+
index: rowIndex,
|
|
288
|
+
name: `${rowIndex + 1}`,
|
|
289
|
+
style,
|
|
290
|
+
});
|
|
192
291
|
},
|
|
193
|
-
}
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
292
|
+
},
|
|
293
|
+
columnSpec.map((col, colIndex) => {
|
|
294
|
+
return h(Column, {
|
|
295
|
+
name: col.name,
|
|
296
|
+
cellRenderer: (rowIndex) => {
|
|
297
|
+
const state = storeAPI.getState();
|
|
298
|
+
return basicCellRenderer<T>(
|
|
299
|
+
rowIndex,
|
|
300
|
+
colIndex,
|
|
301
|
+
col,
|
|
302
|
+
state,
|
|
303
|
+
autoFocusEditor,
|
|
304
|
+
);
|
|
305
|
+
},
|
|
306
|
+
});
|
|
307
|
+
}),
|
|
308
|
+
),
|
|
309
|
+
],
|
|
310
|
+
),
|
|
197
311
|
]);
|
|
198
312
|
}
|
|
199
313
|
|
|
@@ -201,11 +315,14 @@ function basicCellRenderer<T>(
|
|
|
201
315
|
rowIndex: number,
|
|
202
316
|
colIndex: number,
|
|
203
317
|
columnSpec: ColumnSpec,
|
|
204
|
-
state: DataSheetStore<T
|
|
318
|
+
state: DataSheetStore<T>,
|
|
319
|
+
autoFocusEditor = true,
|
|
205
320
|
): any {
|
|
206
321
|
const data = state.data;
|
|
207
322
|
const updatedData = state.updatedData;
|
|
208
323
|
|
|
324
|
+
const isDeleted = state.deletedRows.has(rowIndex);
|
|
325
|
+
|
|
209
326
|
const row = data[rowIndex] ?? updatedData[rowIndex];
|
|
210
327
|
const loading = row == null;
|
|
211
328
|
const col = columnSpec;
|
|
@@ -216,12 +333,18 @@ function basicCellRenderer<T>(
|
|
|
216
333
|
const clearSelection = state.clearSelection;
|
|
217
334
|
|
|
218
335
|
const value = updatedData[rowIndex]?.[col.key] ?? data[rowIndex]?.[col.key];
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
336
|
+
const _renderedValue = col.valueRenderer?.(value) ?? value;
|
|
337
|
+
let cellContents: ReactNode = _renderedValue;
|
|
338
|
+
const editable = (col.editable ?? state.editable) && !isDeleted;
|
|
339
|
+
|
|
340
|
+
let style = col.style ?? {};
|
|
341
|
+
if (isDeleted) {
|
|
342
|
+
style = {
|
|
343
|
+
...style,
|
|
344
|
+
opacity: 0.5,
|
|
345
|
+
textDecoration: "line-through",
|
|
346
|
+
};
|
|
347
|
+
}
|
|
225
348
|
|
|
226
349
|
const focused =
|
|
227
350
|
focusedCell?.col === colIndex && focusedCell?.row === rowIndex;
|
|
@@ -229,15 +352,21 @@ function basicCellRenderer<T>(
|
|
|
229
352
|
const topLeft =
|
|
230
353
|
_topLeftCell?.col === colIndex && _topLeftCell?.row === rowIndex;
|
|
231
354
|
|
|
232
|
-
|
|
355
|
+
if (!editable && state.editable) {
|
|
356
|
+
// If the cell is not editable but the sheet is editable, we want to differentiate
|
|
357
|
+
// between editable and non-editable cells.
|
|
358
|
+
style.color = "var(--secondary-color)";
|
|
359
|
+
}
|
|
233
360
|
|
|
234
361
|
const edited = updatedData[rowIndex]?.[col.key] != null;
|
|
235
|
-
|
|
362
|
+
let intent = edited ? "success" : undefined;
|
|
363
|
+
if (isDeleted) {
|
|
364
|
+
intent = "danger";
|
|
365
|
+
}
|
|
236
366
|
|
|
237
367
|
const _Cell = col.cellComponent ?? BaseCell;
|
|
238
368
|
|
|
239
|
-
|
|
240
|
-
let inlineEditor = editable ? col.inlineEditor ?? true : false;
|
|
369
|
+
let inlineEditor = editable ? (col.inlineEditor ?? true) : false;
|
|
241
370
|
|
|
242
371
|
if (!topLeft) {
|
|
243
372
|
// This should be the case for every cell except the focused one
|
|
@@ -248,26 +377,48 @@ function basicCellRenderer<T>(
|
|
|
248
377
|
loading,
|
|
249
378
|
value,
|
|
250
379
|
style,
|
|
380
|
+
isDeleted,
|
|
251
381
|
},
|
|
252
|
-
|
|
382
|
+
cellContents,
|
|
253
383
|
);
|
|
254
384
|
}
|
|
255
385
|
|
|
386
|
+
// The rest is for the top-left cell of a selection or the focused cell
|
|
387
|
+
|
|
256
388
|
if (!editable) {
|
|
257
389
|
// Most cells are not focused and don't need to be editable.
|
|
258
390
|
// This will be the rendering logic for almost all cells
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
391
|
+
|
|
392
|
+
if (col.dataEditor != null) {
|
|
393
|
+
cellContents = h(EditorPopup, {
|
|
394
|
+
autoFocus: autoFocusEditor,
|
|
395
|
+
content: h(col.dataEditor, {
|
|
396
|
+
value,
|
|
397
|
+
}),
|
|
398
|
+
valueViewer: _renderedValue,
|
|
399
|
+
});
|
|
400
|
+
}
|
|
401
|
+
|
|
402
|
+
return h(
|
|
403
|
+
_Cell,
|
|
404
|
+
{
|
|
405
|
+
intent,
|
|
406
|
+
value,
|
|
407
|
+
style,
|
|
408
|
+
},
|
|
409
|
+
[
|
|
410
|
+
h.if(!focused)("input.hidden-input", {
|
|
411
|
+
autoFocus: true,
|
|
412
|
+
onKeyDown(e) {
|
|
413
|
+
if (e.key == "Backspace" || e.key == "Delete") {
|
|
414
|
+
clearSelection();
|
|
415
|
+
}
|
|
416
|
+
e.preventDefault();
|
|
417
|
+
},
|
|
418
|
+
}),
|
|
419
|
+
cellContents,
|
|
420
|
+
],
|
|
421
|
+
);
|
|
271
422
|
// Could probably put the hidden input elsewhere,
|
|
272
423
|
}
|
|
273
424
|
|
|
@@ -279,9 +430,7 @@ function basicCellRenderer<T>(
|
|
|
279
430
|
onCellEdited(rowIndex, col.key, e.target.value);
|
|
280
431
|
};
|
|
281
432
|
|
|
282
|
-
let
|
|
283
|
-
let cellClass = null;
|
|
284
|
-
|
|
433
|
+
let _inlineEditor: ReactNode = null;
|
|
285
434
|
if (typeof inlineEditor == "boolean") {
|
|
286
435
|
let _value = value;
|
|
287
436
|
if (
|
|
@@ -291,11 +440,12 @@ function basicCellRenderer<T>(
|
|
|
291
440
|
) {
|
|
292
441
|
_value = _renderedValue;
|
|
293
442
|
}
|
|
294
|
-
|
|
443
|
+
_inlineEditor = h("input.main-editor", {
|
|
295
444
|
value: _value ?? "",
|
|
296
445
|
autoFocus: autoFocusEditor,
|
|
297
446
|
onChange,
|
|
298
447
|
onKeyDown(e) {
|
|
448
|
+
console.log("Key down in inline editor", e.key);
|
|
299
449
|
if (e.key == "Enter") {
|
|
300
450
|
e.target.blur();
|
|
301
451
|
}
|
|
@@ -311,16 +461,19 @@ function basicCellRenderer<T>(
|
|
|
311
461
|
e.stopPropagation();
|
|
312
462
|
} else {
|
|
313
463
|
e.target.blur();
|
|
314
|
-
|
|
315
|
-
e.target.parentNode.dispatchEvent(new KeyboardEvent("keydown", e));
|
|
316
|
-
}
|
|
464
|
+
//e.target.parentNode.dispatchEvent(new KeyboardEvent("keydown", e));
|
|
317
465
|
}
|
|
318
466
|
},
|
|
319
467
|
});
|
|
468
|
+
} else {
|
|
469
|
+
// If inlineEditor is a ReactNode, we use it directly
|
|
470
|
+
_inlineEditor = inlineEditor as ReactNode;
|
|
320
471
|
}
|
|
321
472
|
|
|
473
|
+
let className = null;
|
|
474
|
+
|
|
322
475
|
if (col.dataEditor != null) {
|
|
323
|
-
|
|
476
|
+
className = "editor-cell";
|
|
324
477
|
cellContents = h([
|
|
325
478
|
h(EditorPopup, {
|
|
326
479
|
autoFocus: autoFocusEditor,
|
|
@@ -331,26 +484,32 @@ function basicCellRenderer<T>(
|
|
|
331
484
|
onCellEdited(rowIndex, col.key, value);
|
|
332
485
|
},
|
|
333
486
|
}),
|
|
334
|
-
inlineEditor,
|
|
335
487
|
valueViewer: _renderedValue,
|
|
336
488
|
}),
|
|
337
489
|
]);
|
|
338
|
-
} else if (
|
|
339
|
-
cellContents =
|
|
340
|
-
|
|
490
|
+
} else if (_inlineEditor != null) {
|
|
491
|
+
cellContents = _inlineEditor;
|
|
492
|
+
className = "input-cell";
|
|
341
493
|
}
|
|
342
494
|
|
|
495
|
+
const isSingleCellSelection = singleFocusedCell(state.selection) != null;
|
|
496
|
+
|
|
343
497
|
// Hidden html input
|
|
344
498
|
return h(
|
|
345
499
|
_Cell,
|
|
346
500
|
{
|
|
347
501
|
intent,
|
|
348
502
|
value,
|
|
349
|
-
className
|
|
503
|
+
className,
|
|
350
504
|
style,
|
|
351
505
|
//truncated: false,
|
|
352
506
|
},
|
|
353
|
-
[
|
|
507
|
+
[
|
|
508
|
+
cellContents,
|
|
509
|
+
h.if(editable && isSingleCellSelection)(DragHandle, {
|
|
510
|
+
focusedCell,
|
|
511
|
+
}),
|
|
512
|
+
],
|
|
354
513
|
);
|
|
355
514
|
}
|
|
356
515
|
|
|
@@ -367,16 +526,14 @@ function DragHandle({ focusedCell }) {
|
|
|
367
526
|
});
|
|
368
527
|
}
|
|
369
528
|
|
|
370
|
-
function DataSheetEditToolbar({
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
onDeleteRows,
|
|
376
|
-
}) {
|
|
529
|
+
function DataSheetEditToolbar({ onSaveData, onDeleteRows }) {
|
|
530
|
+
const selection = useSelector((state) => state.selection);
|
|
531
|
+
const resetChanges = useSelector((state) => state.resetChanges);
|
|
532
|
+
const hasUpdates = useSelector((state) => state.hasUpdates);
|
|
533
|
+
|
|
377
534
|
return h("div.data-sheet-toolbar", [
|
|
378
535
|
h(ButtonGroup, { minimal: true }, [
|
|
379
|
-
h
|
|
536
|
+
h(AddRowButton),
|
|
380
537
|
h(
|
|
381
538
|
Button,
|
|
382
539
|
{
|
|
@@ -386,7 +543,7 @@ function DataSheetEditToolbar({
|
|
|
386
543
|
onDeleteRows?.();
|
|
387
544
|
},
|
|
388
545
|
},
|
|
389
|
-
"Delete"
|
|
546
|
+
"Delete",
|
|
390
547
|
),
|
|
391
548
|
]),
|
|
392
549
|
h("div.spacer"),
|
|
@@ -396,13 +553,11 @@ function DataSheetEditToolbar({
|
|
|
396
553
|
{
|
|
397
554
|
intent: Intent.WARNING,
|
|
398
555
|
disabled: !hasUpdates,
|
|
399
|
-
onClick
|
|
400
|
-
setUpdatedData([]);
|
|
401
|
-
},
|
|
556
|
+
onClick: resetChanges,
|
|
402
557
|
},
|
|
403
|
-
"Reset"
|
|
558
|
+
"Reset",
|
|
404
559
|
),
|
|
405
|
-
h(
|
|
560
|
+
h.if(onSaveData != null)(
|
|
406
561
|
Button,
|
|
407
562
|
{
|
|
408
563
|
intent: Intent.SUCCESS,
|
|
@@ -410,7 +565,7 @@ function DataSheetEditToolbar({
|
|
|
410
565
|
disabled: !hasUpdates,
|
|
411
566
|
onClick: onSaveData,
|
|
412
567
|
},
|
|
413
|
-
"Save"
|
|
568
|
+
"Save",
|
|
414
569
|
),
|
|
415
570
|
]),
|
|
416
571
|
]);
|
|
@@ -438,19 +593,20 @@ export function ScrollToRowControl() {
|
|
|
438
593
|
scrollToRow(row - 1);
|
|
439
594
|
},
|
|
440
595
|
},
|
|
441
|
-
"Scroll to row"
|
|
596
|
+
"Scroll to row",
|
|
442
597
|
),
|
|
443
598
|
]);
|
|
444
599
|
}
|
|
445
600
|
|
|
446
|
-
function AddRowButton(
|
|
601
|
+
function AddRowButton() {
|
|
602
|
+
const addRow = useSelector((state) => state.addRow);
|
|
447
603
|
return h(
|
|
448
604
|
Button,
|
|
449
605
|
{
|
|
450
606
|
icon: "plus",
|
|
451
|
-
onClick:
|
|
607
|
+
onClick: addRow,
|
|
452
608
|
},
|
|
453
|
-
"Add row"
|
|
609
|
+
"Add row",
|
|
454
610
|
);
|
|
455
611
|
}
|
|
456
612
|
|
|
@@ -461,7 +617,7 @@ export function BaseCell({ children, value, ...rest }) {
|
|
|
461
617
|
interactive: true,
|
|
462
618
|
...rest,
|
|
463
619
|
},
|
|
464
|
-
children
|
|
620
|
+
children,
|
|
465
621
|
);
|
|
466
622
|
}
|
|
467
623
|
|
package/src/main.module.sass
CHANGED
|
@@ -2,6 +2,24 @@
|
|
|
2
2
|
flex: 1
|
|
3
3
|
min-height: 0
|
|
4
4
|
|
|
5
|
+
font-size: var(--data-sheet-font-size, 12px)
|
|
6
|
+
line-height: var(--data-sheet-row-height, 20px)
|
|
7
|
+
|
|
8
|
+
:global
|
|
9
|
+
.bp5-table-cell
|
|
10
|
+
&:not([class*="bp5-intent-"]):not(.bp5-loading)
|
|
11
|
+
color: var(--text-color)
|
|
12
|
+
|
|
13
|
+
.bp5-table-cell, .bp5-table-row-name
|
|
14
|
+
font-size: var(--data-sheet-font-size)
|
|
15
|
+
line-height: var(--data-sheet-row-height)
|
|
16
|
+
|
|
17
|
+
.bp5-table-row-name
|
|
18
|
+
color: var(--secondary-color)
|
|
19
|
+
|
|
20
|
+
.bp5-table-column-name
|
|
21
|
+
font-size: 1.2em
|
|
22
|
+
|
|
5
23
|
.data-sheet-container
|
|
6
24
|
display: flex
|
|
7
25
|
position: relative
|
|
@@ -75,3 +93,4 @@
|
|
|
75
93
|
display: flex
|
|
76
94
|
flex-direction: row
|
|
77
95
|
margin-bottom: 0.25em
|
|
96
|
+
|