@macrostrat/data-sheet 2.0.2 → 2.1.1

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