@macrostrat/data-sheet 3.0.4 → 4.0.0-dev1

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 (185) hide show
  1. package/CHANGELOG.md +20 -1
  2. package/dist/actions/builtin.cjs +56 -0
  3. package/dist/actions/builtin.cjs.map +1 -0
  4. package/dist/actions/builtin.d.ts +15 -0
  5. package/dist/actions/builtin.js +56 -0
  6. package/dist/actions/builtin.js.map +1 -0
  7. package/dist/actions/clipboard.cjs +250 -0
  8. package/dist/actions/clipboard.cjs.map +1 -0
  9. package/dist/actions/clipboard.d.ts +42 -0
  10. package/dist/actions/clipboard.js +250 -0
  11. package/dist/actions/clipboard.js.map +1 -0
  12. package/dist/actions/filters.cjs +123 -0
  13. package/dist/actions/filters.cjs.map +1 -0
  14. package/dist/actions/filters.d.ts +6 -0
  15. package/dist/actions/filters.js +123 -0
  16. package/dist/actions/filters.js.map +1 -0
  17. package/dist/actions/index.d.ts +6 -0
  18. package/dist/actions/selection.cjs +194 -0
  19. package/dist/actions/selection.cjs.map +1 -0
  20. package/dist/actions/selection.d.ts +40 -0
  21. package/dist/actions/selection.js +192 -0
  22. package/dist/actions/selection.js.map +1 -0
  23. package/dist/actions/toolbar.cjs +171 -0
  24. package/dist/actions/toolbar.cjs.map +1 -0
  25. package/dist/actions/toolbar.d.ts +10 -0
  26. package/dist/actions/toolbar.js +171 -0
  27. package/dist/actions/toolbar.js.map +1 -0
  28. package/dist/actions/toolbar.module.sass.cjs +22 -0
  29. package/dist/actions/toolbar.module.sass.cjs.map +1 -0
  30. package/dist/actions/toolbar.module.sass.js +20 -0
  31. package/dist/actions/toolbar.module.sass.js.map +1 -0
  32. package/dist/actions/types.d.ts +143 -0
  33. package/dist/cell-renderer.cjs +165 -0
  34. package/dist/cell-renderer.cjs.map +1 -0
  35. package/dist/cell-renderer.d.ts +3 -0
  36. package/dist/cell-renderer.js +165 -0
  37. package/dist/cell-renderer.js.map +1 -0
  38. package/dist/components/actions.module.sass.cjs +3 -3
  39. package/dist/components/actions.module.sass.js +2 -2
  40. package/dist/components/colors.cjs +20 -16
  41. package/dist/components/colors.cjs.map +1 -1
  42. package/dist/components/colors.d.ts +4 -3
  43. package/dist/components/colors.js +20 -16
  44. package/dist/components/colors.js.map +1 -1
  45. package/dist/components/editor-popup.cjs +4 -3
  46. package/dist/components/editor-popup.cjs.map +1 -1
  47. package/dist/components/editor-popup.js +4 -3
  48. package/dist/components/editor-popup.js.map +1 -1
  49. package/dist/components/index.d.ts +1 -0
  50. package/dist/components/main.module.sass.cjs +12 -12
  51. package/dist/components/main.module.sass.js +11 -11
  52. package/dist/components/text-areas.cjs +23 -18
  53. package/dist/components/text-areas.cjs.map +1 -1
  54. package/dist/components/text-areas.d.ts +8 -4
  55. package/dist/components/text-areas.js +20 -13
  56. package/dist/components/text-areas.js.map +1 -1
  57. package/dist/components/view-info.cjs +18 -0
  58. package/dist/components/view-info.cjs.map +1 -0
  59. package/dist/components/view-info.d.ts +1 -0
  60. package/dist/components/view-info.js +18 -0
  61. package/dist/components/view-info.js.map +1 -0
  62. package/dist/core.cjs +201 -300
  63. package/dist/core.cjs.map +1 -1
  64. package/dist/core.d.ts +18 -10
  65. package/dist/core.js +204 -299
  66. package/dist/core.js.map +1 -1
  67. package/dist/data-sheet.css +190 -52
  68. package/dist/index.cjs +47 -8
  69. package/dist/index.cjs.map +1 -1
  70. package/dist/index.d.ts +3 -0
  71. package/dist/index.js +48 -9
  72. package/dist/index.js.map +1 -1
  73. package/dist/main.module.sass.cjs +15 -14
  74. package/dist/main.module.sass.cjs.map +1 -1
  75. package/dist/main.module.sass.js +14 -13
  76. package/dist/main.module.sass.js.map +1 -1
  77. package/dist/notifications.cjs +19 -0
  78. package/dist/notifications.cjs.map +1 -0
  79. package/dist/notifications.d.ts +9 -0
  80. package/dist/notifications.js +19 -0
  81. package/dist/notifications.js.map +1 -0
  82. package/dist/postgrest-table/data-loaders.cjs +181 -104
  83. package/dist/postgrest-table/data-loaders.cjs.map +1 -1
  84. package/dist/postgrest-table/data-loaders.d.ts +52 -28
  85. package/dist/postgrest-table/data-loaders.js +181 -104
  86. package/dist/postgrest-table/data-loaders.js.map +1 -1
  87. package/dist/postgrest-table/index.cjs +205 -79
  88. package/dist/postgrest-table/index.cjs.map +1 -1
  89. package/dist/postgrest-table/index.d.ts +14 -17
  90. package/dist/postgrest-table/index.js +186 -58
  91. package/dist/postgrest-table/index.js.map +1 -1
  92. package/dist/postgrest-table/lazy-loader-table.cjs +18 -17
  93. package/dist/postgrest-table/lazy-loader-table.cjs.map +1 -1
  94. package/dist/postgrest-table/lazy-loader-table.d.ts +1 -1
  95. package/dist/postgrest-table/lazy-loader-table.js +17 -14
  96. package/dist/postgrest-table/lazy-loader-table.js.map +1 -1
  97. package/dist/postgrest-table/loading-utils.cjs +16 -0
  98. package/dist/postgrest-table/loading-utils.cjs.map +1 -0
  99. package/dist/postgrest-table/loading-utils.d.ts +13 -0
  100. package/dist/postgrest-table/loading-utils.js +16 -0
  101. package/dist/postgrest-table/loading-utils.js.map +1 -0
  102. package/dist/postgrest-table/main.module.sass.cjs +18 -13
  103. package/dist/postgrest-table/main.module.sass.cjs.map +1 -1
  104. package/dist/postgrest-table/main.module.sass.js +18 -13
  105. package/dist/postgrest-table/main.module.sass.js.map +1 -1
  106. package/dist/provider.cjs +96 -344
  107. package/dist/provider.cjs.map +1 -1
  108. package/dist/provider.js +96 -343
  109. package/dist/provider.js.map +1 -1
  110. package/dist/renderers/column-header-cell-postgrest.cjs +216 -0
  111. package/dist/renderers/column-header-cell-postgrest.cjs.map +1 -0
  112. package/dist/renderers/column-header-cell-postgrest.d.ts +13 -0
  113. package/dist/renderers/column-header-cell-postgrest.js +216 -0
  114. package/dist/renderers/column-header-cell-postgrest.js.map +1 -0
  115. package/dist/renderers/column-header-cell-postgrest.module.sass.cjs +23 -0
  116. package/dist/renderers/column-header-cell-postgrest.module.sass.cjs.map +1 -0
  117. package/dist/renderers/column-header-cell-postgrest.module.sass.js +22 -0
  118. package/dist/renderers/column-header-cell-postgrest.module.sass.js.map +1 -0
  119. package/dist/renderers/column-header-cell.cjs +103 -0
  120. package/dist/renderers/column-header-cell.cjs.map +1 -0
  121. package/dist/renderers/column-header-cell.d.ts +30 -0
  122. package/dist/renderers/column-header-cell.js +101 -0
  123. package/dist/renderers/column-header-cell.js.map +1 -0
  124. package/dist/renderers/index.d.ts +2 -0
  125. package/dist/table-updates/data-parameter.d.ts +14 -0
  126. package/dist/table-updates/filter.d.ts +16 -0
  127. package/dist/table-updates/index.d.ts +19 -0
  128. package/dist/types.cjs +9 -0
  129. package/dist/types.cjs.map +1 -0
  130. package/dist/types.d.ts +108 -0
  131. package/dist/types.js +9 -0
  132. package/dist/types.js.map +1 -0
  133. package/dist/utils/column-spec.cjs +9 -1
  134. package/dist/utils/column-spec.cjs.map +1 -1
  135. package/dist/utils/column-spec.d.ts +21 -0
  136. package/dist/utils/column-spec.js +9 -1
  137. package/dist/utils/column-spec.js.map +1 -1
  138. package/dist/utils/key-handling.cjs +161 -47
  139. package/dist/utils/key-handling.cjs.map +1 -1
  140. package/dist/utils/key-handling.d.ts +3 -3
  141. package/dist/utils/key-handling.js +161 -47
  142. package/dist/utils/key-handling.js.map +1 -1
  143. package/dist/zustand-store.cjs +485 -0
  144. package/dist/zustand-store.cjs.map +1 -0
  145. package/dist/zustand-store.d.ts +6 -0
  146. package/dist/zustand-store.js +483 -0
  147. package/dist/zustand-store.js.map +1 -0
  148. package/package.json +6 -5
  149. package/src/actions/builtin.ts +65 -0
  150. package/src/actions/clipboard.ts +350 -0
  151. package/src/actions/filters.ts +150 -0
  152. package/src/actions/index.ts +6 -0
  153. package/src/actions/selection.ts +271 -0
  154. package/src/actions/toolbar.module.sass +30 -0
  155. package/src/actions/toolbar.ts +212 -0
  156. package/src/actions/types.ts +159 -0
  157. package/src/cell-renderer.ts +221 -0
  158. package/src/components/colors.ts +22 -19
  159. package/src/components/editor-popup.ts +3 -2
  160. package/src/components/index.ts +1 -0
  161. package/src/components/main.module.sass +1 -0
  162. package/src/components/text-areas.ts +34 -19
  163. package/src/components/view-info.ts +17 -0
  164. package/src/core.ts +273 -360
  165. package/src/index.ts +4 -0
  166. package/src/main.module.sass +14 -2
  167. package/src/notifications.ts +22 -0
  168. package/src/postgrest-table/data-loaders.ts +300 -201
  169. package/src/postgrest-table/index.ts +260 -86
  170. package/src/postgrest-table/lazy-loader-table.ts +18 -17
  171. package/src/postgrest-table/loading-utils.ts +49 -0
  172. package/src/postgrest-table/main.module.sass +16 -0
  173. package/src/provider.ts +110 -487
  174. package/src/renderers/column-header-cell-postgrest.module.sass +71 -0
  175. package/src/renderers/column-header-cell-postgrest.ts +282 -0
  176. package/src/renderers/column-header-cell.ts +388 -0
  177. package/src/renderers/index.ts +2 -0
  178. package/src/table-updates/data-parameter.ts +44 -0
  179. package/src/table-updates/filter.ts +124 -0
  180. package/src/table-updates/index.ts +239 -0
  181. package/src/types.ts +121 -0
  182. package/src/utils/column-spec.ts +47 -0
  183. package/src/utils/key-handling.ts +201 -66
  184. package/src/zustand-store.ts +582 -0
  185. package/dist/provider.d.ts +0 -69
package/dist/core.js CHANGED
@@ -1,19 +1,28 @@
1
- import { HotkeysProvider, InputGroup, Button, ButtonGroup, Intent } from "@blueprintjs/core";
2
- import { Cell, Column, RowHeaderCell, Table } from "@blueprintjs/table";
3
- import { Cell as Cell2 } from "@blueprintjs/table";
1
+ import { InputGroup, Button, useHotkeys } from "@blueprintjs/core";
2
+ import { Column, RowHeaderCell, RegionCardinality, Table } from "@blueprintjs/table";
4
3
  /* empty css */
5
- import update from "immutability-helper";
6
- import { useState, useMemo, useCallback, useEffect } from "react";
4
+ import { useState, useMemo, useCallback, useEffect, useRef } from "react";
7
5
  import h from "./main.module.sass.js";
8
- import { DataSheetProvider, useSelector, useStoreAPI, singleFocusedCell } from "./provider.js";
6
+ import { DataSheetProvider, useSelector, ctx, tableActionsAtom, useStoreAPI, columnSpecAtom, storeAtom } from "./provider.js";
7
+ import { atom } from "jotai";
8
+ import { TableElementStatus } from "./types.js";
9
+ import { basicCellRenderer } from "./cell-renderer.js";
9
10
  import { DataSheetAction } from "./components/actions.js";
10
- import { EditorPopup } from "./components/editor-popup.js";
11
+ import { clipboardActions } from "./actions/clipboard.js";
12
+ import "./actions/builtin.js";
13
+ import { tableHotkeysAtom } from "./utils/key-handling.js";
14
+ import { useScrollHandler } from "./postgrest-table/data-loaders.js";
15
+ import { renderColumnHeaderCell, autoFilterId, SortFilterBar } from "./renderers/column-header-cell.js";
16
+ import { ActionsToolbar } from "./actions/toolbar.js";
17
+ import { FilterBar } from "./actions/filters.js";
18
+ import { InfoBar } from "./components/view-info.js";
11
19
  var DataSheetDensity = /* @__PURE__ */ ((DataSheetDensity2) => {
12
20
  DataSheetDensity2["HIGH"] = "high";
13
21
  DataSheetDensity2["MEDIUM"] = "medium";
14
22
  DataSheetDensity2["LOW"] = "low";
15
23
  return DataSheetDensity2;
16
24
  })(DataSheetDensity || {});
25
+ const emptyData = [];
17
26
  function DataSheet(props) {
18
27
  const {
19
28
  data,
@@ -23,28 +32,27 @@ function DataSheet(props) {
23
32
  enableColumnReordering = false,
24
33
  enableFocusedCell = false,
25
34
  defaultColumnWidth = 150,
35
+ children,
26
36
  ...rest
27
37
  } = props;
28
38
  return h(
29
- HotkeysProvider,
30
- h(
31
- DataSheetProvider,
32
- {
33
- data,
34
- columnSpec,
35
- columnSpecOptions,
36
- enableColumnReordering,
37
- defaultColumnWidth,
38
- editable,
39
- ...rest
40
- },
41
- h(_DataSheet, {
42
- ...rest,
43
- editable,
44
- enableColumnReordering,
45
- enableFocusedCell
46
- })
47
- )
39
+ DataSheetProvider,
40
+ {
41
+ data: data ?? emptyData,
42
+ columnSpec,
43
+ columnSpecOptions,
44
+ enableColumnReordering,
45
+ defaultColumnWidth,
46
+ editable,
47
+ ...rest
48
+ },
49
+ h(_DataSheet, {
50
+ ...rest,
51
+ children,
52
+ editable,
53
+ enableColumnReordering,
54
+ enableFocusedCell
55
+ })
48
56
  );
49
57
  }
50
58
  const deletedRowHeaderStyle = {
@@ -53,7 +61,6 @@ const deletedRowHeaderStyle = {
53
61
  };
54
62
  function _DataSheet({
55
63
  onVisibleCellsChange,
56
- enableColumnReordering,
57
64
  onSaveData,
58
65
  onUpdateData,
59
66
  onDeleteRows,
@@ -61,48 +68,48 @@ function _DataSheet({
61
68
  dataSheetActions = null,
62
69
  enableFocusedCell,
63
70
  autoFocusEditor = true,
64
- density = "high"
65
- /* HIGH */
71
+ enableClipboard = true,
72
+ showInfoBar = false,
73
+ density = "high",
74
+ selectionModes,
75
+ actions,
76
+ filters,
77
+ columnHeaderCellRenderer,
78
+ children,
79
+ ...rest
66
80
  }) {
67
- const selectedRegions = useSelector((state) => state.selection);
81
+ const debugMode = false;
82
+ const _actions = useMemo(() => {
83
+ const _actions2 = [];
84
+ if (actions != null) {
85
+ _actions2.push(...actions);
86
+ }
87
+ if (enableClipboard) {
88
+ _actions2.push(...clipboardActions);
89
+ }
90
+ return _actions2;
91
+ }, [actions, enableClipboard]);
92
+ ctx.useSync(tableActionsAtom, _actions);
93
+ const hotkeysConfig = ctx.useValue(tableHotkeysAtom);
94
+ const { handleKeyDown, handleKeyUp } = useHotkeys(hotkeysConfig);
95
+ const selectedRegions = useSelector((state) => state.selection ?? []);
68
96
  const data = useSelector((state) => state.data);
69
97
  const editable = useSelector((state) => state.editable);
70
- const deletedRows = useSelector((state) => state.deletedRows);
98
+ const rowStatus = useSelector((state) => state.rowStatus);
71
99
  const focusedCell = useSelector((state) => state.focusedCell);
72
100
  const ref = useSelector((state) => state.tableRef);
73
101
  const columnSpec = useSelector((state) => state.columnSpec);
74
102
  const updatedData = useSelector((state) => state.updatedData);
75
- const setUpdatedData = useSelector((state) => state.setUpdatedData);
76
103
  const onSelection = useSelector((state) => state.onSelection);
77
104
  const storeAPI = useStoreAPI();
78
- const _onSaveData = useMemo(() => {
79
- if (onSaveData == null) return null;
80
- return () => {
81
- onSaveData(updatedData, data);
82
- setUpdatedData([]);
83
- };
84
- }, [updatedData, data, onSaveData]);
85
- const setVisibleCells = useSelector((state) => state.setVisibleCells);
105
+ const onScroll = useScrollHandler();
86
106
  const _onVisibleCellsChange = useCallback(
87
107
  (visibleCells) => {
88
- setVisibleCells(visibleCells);
108
+ onScroll(visibleCells);
89
109
  onVisibleCellsChange?.(visibleCells);
90
110
  },
91
- [onVisibleCellsChange, setVisibleCells]
111
+ [onVisibleCellsChange, onScroll]
92
112
  );
93
- useCallback(() => {
94
- setUpdatedData((updatedData2) => {
95
- const ix = Math.max(updatedData2.length, data.length);
96
- const addRowSpec = { [ix]: { $set: {} } };
97
- const newUpdatedData = update(updatedData2, addRowSpec);
98
- return newUpdatedData;
99
- });
100
- }, [setUpdatedData]);
101
- const deleteSelectedRows = useSelector((state) => state.deleteSelectedRows);
102
- const _onDeleteRows = useCallback(() => {
103
- deleteSelectedRows();
104
- onDeleteRows?.(selectedRegions);
105
- }, [onDeleteRows, selectedRegions, deleteSelectedRows]);
106
113
  useEffect(() => {
107
114
  if (!verbose) return;
108
115
  console.log("Updated data", updatedData);
@@ -114,36 +121,46 @@ function _DataSheet({
114
121
  if (!verbose) return;
115
122
  console.log("Selected regions", selectedRegions);
116
123
  }, [selectedRegions]);
117
- const nDeletionCandidates = useMemo(
118
- () => getRowsToDelete(selectedRegions).length,
119
- [selectedRegions]
120
- );
121
- const columnWidths = useSelector((state) => state.columnWidths);
122
- const numRows = Math.max(updatedData.length, data.length);
124
+ const tableElementRef = useRef(null);
125
+ useEffect(() => {
126
+ tableElementRef.current?.focus();
127
+ }, [focusedCell]);
128
+ const columnWidths = ctx.useValue(columnWidthsAtom);
129
+ const filteredRowIndices = useSelector((state) => state.filteredRowIndices);
130
+ const totalRows = Math.max(updatedData.length, data.length);
131
+ const numRows = filteredRowIndices != null ? filteredRowIndices.length : totalRows;
123
132
  let className = `${density}-density`;
124
- let rowHeight = 20;
125
- let style = {
126
- "--data-sheet-row-height": "20px",
127
- "--data-sheet-font-size": "12px"
128
- };
129
- if (density === "medium") {
130
- rowHeight = 24;
131
- style = {
132
- "--data-sheet-row-height": "24px",
133
- "--data-sheet-font-size": "14px"
134
- };
135
- } else if (density === "low") {
136
- rowHeight = 30;
137
- style = {
138
- "--data-sheet-row-height": "30px",
139
- "--data-sheet-font-size": "18px"
140
- };
141
- }
133
+ const { rowHeight, style } = styleParamsForDensity(density);
142
134
  const onColumnsReordered = useSelector((state) => state.onColumnsReordered);
143
- const children = useMemo(() => {
135
+ const hasSortableOrFilterable = useMemo(
136
+ () => columnSpec.some((col) => col.sortable || col.filterable),
137
+ [columnSpec]
138
+ );
139
+ const columnSorts = useSelector((state) => state.columnSorts);
140
+ const activeFilters = useSelector((state) => state.activeFilters);
141
+ const realizedColumns = useMemo(() => {
144
142
  return columnSpec.map((col, colIndex) => {
143
+ let fn = col.headerCellRenderer ?? columnHeaderCellRenderer ?? renderColumnHeaderCell;
144
+ let activeSort = null;
145
+ let activeFilter = null;
146
+ if (col.sortable) {
147
+ activeSort = columnSorts?.find((s) => s.key === col.key);
148
+ }
149
+ if (col.filterable) {
150
+ activeFilter = activeFilters?.get(col.key) ?? activeFilters?.get(autoFilterId(col.key));
151
+ }
152
+ const _columnHeaderCellRenderer = (colIndex2) => {
153
+ return fn({
154
+ col,
155
+ colIndex: colIndex2,
156
+ activeSort,
157
+ activeFilter
158
+ });
159
+ };
145
160
  return h(Column, {
161
+ id: col.key,
146
162
  name: col.name,
163
+ columnHeaderCellRenderer: _columnHeaderCellRenderer,
147
164
  cellRenderer: (rowIndex) => {
148
165
  const state = storeAPI.getState();
149
166
  return basicCellRenderer(
@@ -151,37 +168,62 @@ function _DataSheet({
151
168
  colIndex,
152
169
  col,
153
170
  state,
154
- autoFocusEditor
171
+ autoFocusEditor,
172
+ filteredRowIndices
155
173
  );
156
174
  }
157
175
  });
158
176
  });
159
- }, [columnSpec, storeAPI, autoFocusEditor]);
177
+ }, [
178
+ columnSpec,
179
+ columnSorts,
180
+ activeFilters,
181
+ storeAPI,
182
+ autoFocusEditor,
183
+ filteredRowIndices,
184
+ columnHeaderCellRenderer
185
+ ]);
160
186
  const onColumnWidthChanged = useSelector(
161
187
  (state) => state.onColumnWidthChanged
162
188
  );
163
189
  const rowHeaderCellRenderer = useCallback(
164
190
  (rowIndex) => {
165
- const style2 = deletedRows.has(rowIndex) ? deletedRowHeaderStyle : null;
191
+ const dataRowIndex = filteredRowIndices != null ? filteredRowIndices[rowIndex] ?? rowIndex : rowIndex;
192
+ const style2 = rowStatus[dataRowIndex] == TableElementStatus.DELETED ? deletedRowHeaderStyle : null;
166
193
  return h(RowHeaderCell, {
167
194
  enableRowReordering: false,
168
195
  index: rowIndex,
169
- name: `${rowIndex + 1}`,
196
+ name: `${dataRowIndex + 1}`,
170
197
  style: style2
171
198
  });
172
199
  },
173
- [deletedRows]
200
+ [rowStatus, filteredRowIndices]
174
201
  );
175
- const onKeyDown = useSelector((state) => state.tableKeyHandler);
202
+ let _selectionModes = selectionModes;
203
+ if (editable && _selectionModes != null && !_selectionModes.includes(RegionCardinality.CELLS)) {
204
+ _selectionModes = [..._selectionModes, RegionCardinality.CELLS];
205
+ }
206
+ const cellRendererDependencies = [
207
+ data,
208
+ updatedData,
209
+ focusedCell,
210
+ rowStatus,
211
+ filteredRowIndices
212
+ ];
176
213
  return h("div.data-sheet-container", { className, style }, [
177
- h.if(editable)(DataSheetEditToolbar, {
178
- onSaveData: _onSaveData,
179
- onDeleteRows: nDeletionCandidates > 0 ? _onDeleteRows : null
180
- }),
214
+ h.if(actions != null)(ActionsToolbar, { actions }),
215
+ h.if(filters != null && filters.length > 0)(FilterBar, { filters }),
216
+ h.if(hasSortableOrFilterable)(SortFilterBar),
181
217
  dataSheetActions,
218
+ children,
182
219
  h(
183
220
  "div.data-sheet-holder",
184
- { onKeyDown },
221
+ {
222
+ tabIndex: 0,
223
+ onKeyDown: handleKeyDown,
224
+ onKeyUp: handleKeyUp,
225
+ ref: tableElementRef
226
+ },
185
227
  h(
186
228
  Table,
187
229
  {
@@ -189,7 +231,6 @@ function _DataSheet({
189
231
  numRows,
190
232
  className: "data-sheet",
191
233
  enableFocusedCell,
192
- enableColumnReordering,
193
234
  onColumnsReordered,
194
235
  focusedCell,
195
236
  selectedRegions,
@@ -198,201 +239,59 @@ function _DataSheet({
198
239
  columnWidths,
199
240
  onColumnWidthChanged,
200
241
  onSelection,
201
- renderMode: "batch",
242
+ /** TODO: we could enable this, but we need a use-case first... */
202
243
  enableRowReordering: false,
203
244
  enableRowResizing: false,
204
245
  // The cell renderer is memoized internally based on these data dependencies
205
- cellRendererDependencies: [
206
- data,
207
- //selection,
208
- updatedData,
209
- focusedCell,
210
- deletedRows
211
- ],
246
+ cellRendererDependencies,
212
247
  onVisibleCellsChange: _onVisibleCellsChange,
213
- rowHeaderCellRenderer
248
+ rowHeaderCellRenderer,
249
+ selectionModes: _selectionModes,
250
+ ...rest,
251
+ getCellClipboardData: null
214
252
  },
215
- children
253
+ realizedColumns
216
254
  )
217
- )
255
+ ),
256
+ h.if(showInfoBar)(InfoBar),
257
+ h.if(debugMode)(CellRendererDebugOverlay, {
258
+ cellRendererDependencies,
259
+ names: [
260
+ "data",
261
+ "updatedData",
262
+ "focusedCell",
263
+ "rowStatus",
264
+ "filteredRowIndices"
265
+ ]
266
+ })
218
267
  ]);
219
268
  }
220
- function basicCellRenderer(rowIndex, colIndex, columnSpec, state, autoFocusEditor = true) {
221
- const data = state.data;
222
- const updatedData = state.updatedData;
223
- const isDeleted = state.deletedRows.has(rowIndex);
224
- const row = data[rowIndex] ?? updatedData[rowIndex];
225
- const loading = row == null;
226
- const col = columnSpec;
227
- const _topLeftCell = state.topLeftCell;
228
- const onCellEdited = state.onCellEdited;
229
- const value = updatedData[rowIndex]?.[col.key] ?? data[rowIndex]?.[col.key];
230
- const _renderedValue = col.valueRenderer?.(value) ?? value;
231
- let style = col.style ?? {};
232
- if (isDeleted) {
233
- style = {
234
- ...style,
235
- opacity: 0.5,
236
- textDecoration: "line-through"
237
- };
238
- }
239
- const editable = (col.editable ?? state.editable) && !isDeleted;
240
- const topLeft = _topLeftCell?.col === colIndex && _topLeftCell?.row === rowIndex;
241
- if (!editable && state.editable) {
242
- style.color = "var(--secondary-color)";
243
- }
244
- const edited = updatedData[rowIndex]?.[col.key] != null;
245
- let intent = edited ? "success" : void 0;
246
- if (isDeleted) {
247
- intent = "danger";
248
- }
249
- const _Cell = col.cellComponent ?? BaseCell;
250
- let inlineEditor = editable ? col.inlineEditor ?? true : false;
251
- if (!topLeft) {
252
- return h(
253
- _Cell,
254
- {
255
- intent,
256
- loading,
257
- value,
258
- style,
259
- isDeleted
260
- },
261
- _renderedValue
262
- );
263
- }
264
- let hiddenInput = h("input.hidden-input", {
265
- autoFocus: true,
266
- onKeyDown: state.editorKeyHandler
267
- });
268
- let cellContents = _renderedValue;
269
- let _dataEditor = null;
270
- let className = null;
271
- if (col.dataEditor != null) {
272
- _dataEditor = h(
273
- EditorPopup,
274
- {
275
- autoFocus: autoFocusEditor,
276
- valueViewer: _renderedValue
277
- },
278
- [
279
- h(col.dataEditor, {
280
- value,
281
- editable,
282
- onChange(value2) {
283
- if (!editable) return;
284
- state.onSelectionEdited(value2);
285
- }
286
- })
287
- ]
288
- );
289
- }
290
- if (!editable) {
291
- if (_dataEditor != null) {
292
- cellContents = _dataEditor;
269
+ const columnWidthsIndexAtom = atom((get) => get(storeAtom).columnWidthsIndex);
270
+ const defaultColumnWidthAtom = atom((get) => get(storeAtom).defaultColumnWidth);
271
+ const columnWidthsAtom = atom((get) => {
272
+ const ix = get(columnWidthsIndexAtom);
273
+ return get(columnSpecAtom).map(
274
+ (col) => ix.get(col.key) ?? col.width ?? get(defaultColumnWidthAtom)
275
+ );
276
+ });
277
+ function CellRendererDebugOverlay({ cellRendererDependencies, names }) {
278
+ const lastRenderDependencies = useRef(cellRendererDependencies);
279
+ useEffect(() => {
280
+ let changeDepNames = [];
281
+ for (const [i, dep] of cellRendererDependencies.entries()) {
282
+ if (dep !== lastRenderDependencies.current[i]) {
283
+ changeDepNames.push(names[i]);
284
+ }
293
285
  }
294
- return h(
295
- _Cell,
296
- {
297
- intent,
298
- value,
299
- style
300
- },
301
- cellContents
302
- );
303
- }
304
- const onChange = (e) => {
305
- if (!editable) return;
306
- if (value === e.target.value) return;
307
- onCellEdited(rowIndex, col.key, e.target.value);
308
- };
309
- const isSingleCellSelection = singleFocusedCell(state.selection) != null;
310
- let _inlineEditor = null;
311
- if (typeof inlineEditor == "boolean") {
312
- let _value = value;
313
- if (typeof _renderedValue === "string" || typeof _renderedValue === "number" || _renderedValue == null) {
314
- _value = _renderedValue;
286
+ if (changeDepNames.length > 0) {
287
+ console.log(
288
+ "Cell renderer dependencies changed:",
289
+ changeDepNames.join(", ")
290
+ );
315
291
  }
316
- _inlineEditor = h("input.main-editor", {
317
- value: _value ?? "",
318
- autoFocus: autoFocusEditor,
319
- onChange,
320
- onKeyDown: state.editorKeyHandler
321
- });
322
- } else {
323
- _inlineEditor = inlineEditor;
324
- }
325
- if (_dataEditor != null) {
326
- className = "editor-cell";
327
- cellContents = _dataEditor;
328
- hiddenInput = null;
329
- } else if (_inlineEditor != null) {
330
- cellContents = _inlineEditor;
331
- className = "input-cell";
332
- hiddenInput = null;
333
- }
334
- return h(
335
- _Cell,
336
- {
337
- intent,
338
- value,
339
- className,
340
- style
341
- //truncated: false,
342
- },
343
- [
344
- cellContents,
345
- h.if(editable && isSingleCellSelection)(DragHandle),
346
- hiddenInput
347
- ]
348
- );
349
- }
350
- function DragHandle() {
351
- const onMouseDown = useSelector((state) => state.onDragValue);
352
- return h("div.corner-drag-handle", { onMouseDown });
353
- }
354
- function DataSheetEditToolbar({ onSaveData, onDeleteRows }) {
355
- useSelector((state) => state.selection);
356
- const resetChanges = useSelector((state) => state.resetChanges);
357
- const hasUpdates = useSelector((state) => state.hasUpdates);
358
- return h("div.data-sheet-toolbar", [
359
- h(ButtonGroup, { minimal: true }, [
360
- h(AddRowButton),
361
- h(
362
- Button,
363
- {
364
- intent: Intent.DANGER,
365
- disabled: onDeleteRows == null,
366
- onClick() {
367
- onDeleteRows?.();
368
- }
369
- },
370
- "Delete"
371
- )
372
- ]),
373
- h("div.spacer"),
374
- h(ButtonGroup, [
375
- h(
376
- Button,
377
- {
378
- intent: Intent.WARNING,
379
- disabled: !hasUpdates,
380
- onClick: resetChanges
381
- },
382
- "Reset"
383
- ),
384
- h.if(onSaveData != null)(
385
- Button,
386
- {
387
- intent: Intent.SUCCESS,
388
- icon: "floppy-disk",
389
- disabled: !hasUpdates,
390
- onClick: onSaveData
391
- },
392
- "Save"
393
- )
394
- ])
395
- ]);
292
+ lastRenderDependencies.current = cellRendererDependencies;
293
+ }, cellRendererDependencies);
294
+ return null;
396
295
  }
397
296
  function ScrollToRowControl() {
398
297
  const [value, setValue] = useState("");
@@ -419,26 +318,34 @@ function ScrollToRowControl() {
419
318
  )
420
319
  ]);
421
320
  }
422
- function AddRowButton() {
423
- const addRow = useSelector((state) => state.addRow);
424
- return h(
425
- Button,
426
- {
427
- icon: "plus",
428
- onClick: addRow
429
- },
430
- "Add row"
431
- );
432
- }
433
- function BaseCell({ children, value, ...rest }) {
434
- return h(
435
- Cell,
436
- {
437
- interactive: true,
438
- ...rest
439
- },
440
- children
441
- );
321
+ function styleParamsForDensity(density) {
322
+ switch (density) {
323
+ case "medium":
324
+ return {
325
+ rowHeight: 24,
326
+ style: {
327
+ "--data-sheet-row-height": "24px",
328
+ "--data-sheet-font-size": "14px"
329
+ }
330
+ };
331
+ case "low":
332
+ return {
333
+ rowHeight: 30,
334
+ style: {
335
+ "--data-sheet-row-height": "30px",
336
+ "--data-sheet-font-size": "18px"
337
+ }
338
+ };
339
+ case "high":
340
+ default:
341
+ return {
342
+ rowHeight: 20,
343
+ style: {
344
+ "--data-sheet-row-height": "20px",
345
+ "--data-sheet-font-size": "12px"
346
+ }
347
+ };
348
+ }
442
349
  }
443
350
  function getRowsToDelete(selection) {
444
351
  let rowIndices = [];
@@ -453,8 +360,6 @@ function getRowsToDelete(selection) {
453
360
  return rowIndices;
454
361
  }
455
362
  export {
456
- BaseCell,
457
- Cell2 as Cell,
458
363
  DataSheet,
459
364
  DataSheetDensity,
460
365
  ScrollToRowControl,