@macrostrat/data-sheet 4.1.0 → 4.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (302) hide show
  1. package/CHANGELOG.md +40 -0
  2. package/dist/actions/builtin.cjs +1 -1
  3. package/dist/actions/builtin.cjs.map +1 -1
  4. package/dist/actions/builtin.d.ts +0 -2
  5. package/dist/actions/builtin.js +1 -1
  6. package/dist/actions/builtin.js.map +1 -1
  7. package/dist/actions/clipboard.cjs +1 -1
  8. package/dist/actions/clipboard.cjs.map +1 -1
  9. package/dist/actions/clipboard.d.ts +3 -2
  10. package/dist/actions/clipboard.js +1 -1
  11. package/dist/actions/clipboard.js.map +1 -1
  12. package/dist/actions/column-controls.cjs +7 -184
  13. package/dist/actions/column-controls.cjs.map +1 -1
  14. package/dist/actions/column-controls.d.ts +1 -1
  15. package/dist/actions/column-controls.js +5 -182
  16. package/dist/actions/column-controls.js.map +1 -1
  17. package/dist/actions/column-filter.cjs +24 -50
  18. package/dist/actions/column-filter.cjs.map +1 -1
  19. package/dist/actions/column-filter.d.ts +6 -4
  20. package/dist/actions/column-filter.js +25 -51
  21. package/dist/actions/column-filter.js.map +1 -1
  22. package/dist/actions/context.cjs +147 -0
  23. package/dist/actions/context.cjs.map +1 -0
  24. package/dist/actions/context.d.ts +93 -0
  25. package/dist/actions/context.js +145 -0
  26. package/dist/actions/context.js.map +1 -0
  27. package/dist/actions/edit-actions.cjs.map +1 -1
  28. package/dist/actions/edit-actions.d.ts +3 -1
  29. package/dist/actions/edit-actions.js.map +1 -1
  30. package/dist/actions/index.d.ts +2 -3
  31. package/dist/actions/selection.cjs +70 -115
  32. package/dist/actions/selection.cjs.map +1 -1
  33. package/dist/actions/selection.d.ts +22 -12
  34. package/dist/actions/selection.js +71 -114
  35. package/dist/actions/selection.js.map +1 -1
  36. package/dist/actions/{table-controls.cjs → table-actions.cjs} +7 -24
  37. package/dist/actions/table-actions.cjs.map +1 -0
  38. package/dist/actions/{table-controls.d.ts → table-actions.d.ts} +0 -4
  39. package/dist/actions/{table-controls.js → table-actions.js} +2 -19
  40. package/dist/actions/table-actions.js.map +1 -0
  41. package/dist/actions/types.d.ts +11 -89
  42. package/dist/components/cell-detail.cjs +6 -6
  43. package/dist/components/cell-detail.cjs.map +1 -1
  44. package/dist/components/cell-detail.js +1 -1
  45. package/dist/components/colors.cjs.map +1 -1
  46. package/dist/components/colors.js.map +1 -1
  47. package/dist/components/editor-popup.cjs +7 -7
  48. package/dist/components/editor-popup.cjs.map +1 -1
  49. package/dist/components/editor-popup.js +1 -1
  50. package/dist/components/index.d.ts +2 -1
  51. package/dist/components/indicators/filter-and-sort.cjs +378 -0
  52. package/dist/components/indicators/filter-and-sort.cjs.map +1 -0
  53. package/dist/components/indicators/filter-and-sort.d.ts +59 -0
  54. package/dist/components/indicators/filter-and-sort.js +376 -0
  55. package/dist/components/indicators/filter-and-sort.js.map +1 -0
  56. package/dist/components/indicators/filter-and-sort.module.sass.cjs +16 -0
  57. package/dist/components/indicators/filter-and-sort.module.sass.cjs.map +1 -0
  58. package/dist/components/indicators/filter-and-sort.module.sass.js +14 -0
  59. package/dist/components/indicators/filter-and-sort.module.sass.js.map +1 -0
  60. package/dist/components/indicators/index.d.ts +4 -0
  61. package/dist/components/indicators/selection.cjs +113 -0
  62. package/dist/components/indicators/selection.cjs.map +1 -0
  63. package/dist/components/indicators/selection.d.ts +3 -0
  64. package/dist/components/indicators/selection.js +111 -0
  65. package/dist/components/indicators/selection.js.map +1 -0
  66. package/dist/components/indicators/selection.module.sass.cjs +19 -0
  67. package/dist/components/indicators/selection.module.sass.cjs.map +1 -0
  68. package/dist/components/indicators/selection.module.sass.js +17 -0
  69. package/dist/components/indicators/selection.module.sass.js.map +1 -0
  70. package/dist/components/indicators/unified-filters.cjs +130 -0
  71. package/dist/components/indicators/unified-filters.cjs.map +1 -0
  72. package/dist/components/indicators/unified-filters.d.ts +10 -0
  73. package/dist/components/indicators/unified-filters.js +130 -0
  74. package/dist/components/indicators/unified-filters.js.map +1 -0
  75. package/dist/components/indicators/view-info.cjs +59 -0
  76. package/dist/components/indicators/view-info.cjs.map +1 -0
  77. package/dist/components/{view-info.d.ts → indicators/view-info.d.ts} +1 -0
  78. package/dist/components/{view-info.js → indicators/view-info.js} +17 -13
  79. package/dist/components/indicators/view-info.js.map +1 -0
  80. package/dist/components/text-areas.cjs +5 -5
  81. package/dist/components/text-areas.cjs.map +1 -1
  82. package/dist/components/text-areas.js +1 -1
  83. package/dist/components/toolbars/actions-toolbar.cjs +185 -0
  84. package/dist/components/toolbars/actions-toolbar.cjs.map +1 -0
  85. package/dist/{actions/toolbar.d.ts → components/toolbars/actions-toolbar.d.ts} +9 -5
  86. package/dist/{actions/toolbar.js → components/toolbars/actions-toolbar.js} +36 -97
  87. package/dist/components/toolbars/actions-toolbar.js.map +1 -0
  88. package/dist/components/toolbars/actions-toolbar.module.sass.cjs +29 -0
  89. package/dist/components/toolbars/actions-toolbar.module.sass.cjs.map +1 -0
  90. package/dist/components/toolbars/actions-toolbar.module.sass.js +27 -0
  91. package/dist/components/toolbars/actions-toolbar.module.sass.js.map +1 -0
  92. package/dist/components/toolbars/active-filters.cjs +120 -0
  93. package/dist/components/toolbars/active-filters.cjs.map +1 -0
  94. package/dist/{actions/filters.d.ts → components/toolbars/active-filters.d.ts} +3 -3
  95. package/dist/components/toolbars/active-filters.js +120 -0
  96. package/dist/components/toolbars/active-filters.js.map +1 -0
  97. package/dist/components/toolbars/index.d.ts +2 -0
  98. package/dist/data-panel.cjs +291 -0
  99. package/dist/data-panel.cjs.map +1 -0
  100. package/dist/data-panel.d.ts +110 -0
  101. package/dist/data-panel.js +289 -0
  102. package/dist/data-panel.js.map +1 -0
  103. package/dist/data-panel.module.sass.cjs +40 -0
  104. package/dist/data-panel.module.sass.cjs.map +1 -0
  105. package/dist/data-panel.module.sass.js +38 -0
  106. package/dist/data-panel.module.sass.js.map +1 -0
  107. package/dist/{core.cjs → data-sheet.cjs} +123 -181
  108. package/dist/data-sheet.cjs.map +1 -0
  109. package/dist/data-sheet.css +241 -13
  110. package/dist/data-sheet.d.ts +16 -0
  111. package/dist/{core.js → data-sheet.js} +92 -150
  112. package/dist/data-sheet.js.map +1 -0
  113. package/dist/data-view.cjs +47 -0
  114. package/dist/data-view.cjs.map +1 -0
  115. package/dist/data-view.d.ts +15 -0
  116. package/dist/data-view.js +45 -0
  117. package/dist/data-view.js.map +1 -0
  118. package/dist/filters/operators.cjs +21 -4
  119. package/dist/filters/operators.cjs.map +1 -1
  120. package/dist/filters/operators.d.ts +5 -4
  121. package/dist/filters/operators.js +21 -4
  122. package/dist/filters/operators.js.map +1 -1
  123. package/dist/index.cjs +106 -47
  124. package/dist/index.cjs.map +1 -1
  125. package/dist/index.d.ts +4 -3
  126. package/dist/index.js +76 -17
  127. package/dist/index.js.map +1 -1
  128. package/dist/notifications.cjs +4 -4
  129. package/dist/notifications.cjs.map +1 -1
  130. package/dist/notifications.js +1 -1
  131. package/dist/postgrest-table/data-loaders.cjs +129 -103
  132. package/dist/postgrest-table/data-loaders.cjs.map +1 -1
  133. package/dist/postgrest-table/data-loaders.d.ts +52 -82
  134. package/dist/postgrest-table/data-loaders.js +110 -84
  135. package/dist/postgrest-table/data-loaders.js.map +1 -1
  136. package/dist/postgrest-table/index.cjs +18 -17
  137. package/dist/postgrest-table/index.cjs.map +1 -1
  138. package/dist/postgrest-table/index.d.ts +4 -3
  139. package/dist/postgrest-table/index.js +9 -8
  140. package/dist/postgrest-table/index.js.map +1 -1
  141. package/dist/{utils → provider}/column-spec.cjs +23 -9
  142. package/dist/provider/column-spec.cjs.map +1 -0
  143. package/dist/{utils → provider}/column-spec.d.ts +77 -2
  144. package/dist/{utils → provider}/column-spec.js +24 -10
  145. package/dist/provider/column-spec.js.map +1 -0
  146. package/dist/provider/core.cjs +382 -0
  147. package/dist/provider/core.cjs.map +1 -0
  148. package/dist/provider/core.d.ts +74 -0
  149. package/dist/provider/core.js +380 -0
  150. package/dist/provider/core.js.map +1 -0
  151. package/dist/provider/index.d.ts +7 -0
  152. package/dist/provider/interactions.cjs +128 -0
  153. package/dist/provider/interactions.cjs.map +1 -0
  154. package/dist/provider/interactions.d.ts +39 -0
  155. package/dist/provider/interactions.js +128 -0
  156. package/dist/provider/interactions.js.map +1 -0
  157. package/dist/provider/selection.cjs +29 -0
  158. package/dist/provider/selection.cjs.map +1 -0
  159. package/dist/provider/selection.d.ts +9 -0
  160. package/dist/provider/selection.js +29 -0
  161. package/dist/provider/selection.js.map +1 -0
  162. package/dist/provider/table-data.cjs +92 -0
  163. package/dist/provider/table-data.cjs.map +1 -0
  164. package/dist/provider/table-data.d.ts +81 -0
  165. package/dist/provider/table-data.js +92 -0
  166. package/dist/provider/table-data.js.map +1 -0
  167. package/dist/provider/types.cjs +22 -0
  168. package/dist/provider/types.cjs.map +1 -0
  169. package/dist/provider/types.d.ts +256 -0
  170. package/dist/provider/types.js +22 -0
  171. package/dist/provider/types.js.map +1 -0
  172. package/dist/{zustand-store.cjs → provider/zustand-store.cjs} +37 -23
  173. package/dist/provider/zustand-store.cjs.map +1 -0
  174. package/dist/{zustand-store.js → provider/zustand-store.js} +22 -8
  175. package/dist/provider/zustand-store.js.map +1 -0
  176. package/dist/{cell-renderer.cjs → renderers/cell-renderer.cjs} +68 -35
  177. package/dist/renderers/cell-renderer.cjs.map +1 -0
  178. package/dist/{cell-renderer.d.ts → renderers/cell-renderer.d.ts} +1 -2
  179. package/dist/{cell-renderer.js → renderers/cell-renderer.js} +66 -33
  180. package/dist/renderers/cell-renderer.js.map +1 -0
  181. package/dist/renderers/column-header-cell.cjs +40 -17
  182. package/dist/renderers/column-header-cell.cjs.map +1 -1
  183. package/dist/renderers/column-header-cell.d.ts +2 -2
  184. package/dist/renderers/column-header-cell.js +40 -17
  185. package/dist/renderers/column-header-cell.js.map +1 -1
  186. package/dist/renderers/index.d.ts +1 -0
  187. package/dist/types.cjs +7 -19
  188. package/dist/types.cjs.map +1 -1
  189. package/dist/types.d.ts +123 -226
  190. package/dist/types.js +7 -19
  191. package/dist/types.js.map +1 -1
  192. package/dist/utils/atoms.cjs +24 -0
  193. package/dist/utils/atoms.cjs.map +1 -0
  194. package/dist/utils/atoms.d.ts +4 -0
  195. package/dist/utils/atoms.js +24 -0
  196. package/dist/utils/atoms.js.map +1 -0
  197. package/dist/utils/debug-overlay.cjs.map +1 -1
  198. package/dist/utils/debug-overlay.js.map +1 -1
  199. package/dist/utils/index.d.ts +2 -3
  200. package/dist/utils/key-handling.cjs +140 -139
  201. package/dist/utils/key-handling.cjs.map +1 -1
  202. package/dist/utils/key-handling.d.ts +4 -2
  203. package/dist/utils/key-handling.js +136 -135
  204. package/dist/utils/key-handling.js.map +1 -1
  205. package/dist/utils/validation.cjs +6 -1
  206. package/dist/utils/validation.cjs.map +1 -1
  207. package/dist/utils/validation.d.ts +1 -1
  208. package/dist/utils/validation.js +6 -1
  209. package/dist/utils/validation.js.map +1 -1
  210. package/package.json +4 -3
  211. package/src/actions/builtin.ts +1 -4
  212. package/src/actions/clipboard.ts +4 -3
  213. package/src/actions/column-controls.ts +12 -228
  214. package/src/actions/column-filter.ts +28 -63
  215. package/src/actions/context.ts +299 -0
  216. package/src/actions/edit-actions.ts +3 -1
  217. package/src/actions/index.ts +2 -3
  218. package/src/actions/selection.ts +109 -156
  219. package/src/actions/{table-controls.ts → table-actions.ts} +0 -20
  220. package/src/actions/types.ts +17 -101
  221. package/src/components/colors.ts +1 -1
  222. package/src/components/index.ts +2 -1
  223. package/src/components/indicators/filter-and-sort.module.sass +13 -0
  224. package/src/components/indicators/filter-and-sort.ts +478 -0
  225. package/src/components/indicators/index.ts +4 -0
  226. package/src/components/indicators/selection.module.sass +22 -0
  227. package/src/components/indicators/selection.ts +141 -0
  228. package/src/components/indicators/unified-filters.ts +161 -0
  229. package/src/components/{view-info.ts → indicators/view-info.ts} +16 -27
  230. package/src/{actions/toolbar.module.sass → components/toolbars/actions-toolbar.module.sass} +17 -4
  231. package/src/{actions/toolbar.ts → components/toolbars/actions-toolbar.ts} +53 -126
  232. package/src/components/toolbars/active-filters.ts +150 -0
  233. package/src/components/toolbars/index.ts +2 -0
  234. package/src/data-panel.module.sass +185 -0
  235. package/src/data-panel.ts +556 -0
  236. package/src/{core.ts → data-sheet.ts} +144 -306
  237. package/src/data-view.ts +70 -0
  238. package/src/filters/operators.ts +38 -6
  239. package/src/index.ts +4 -3
  240. package/src/postgrest-table/data-loaders.ts +250 -181
  241. package/src/postgrest-table/index.ts +10 -9
  242. package/src/{utils → provider}/column-spec.ts +34 -15
  243. package/src/provider/core.ts +585 -0
  244. package/src/provider/index.ts +7 -0
  245. package/src/provider/interactions.ts +161 -0
  246. package/src/provider/selection.ts +31 -0
  247. package/src/provider/table-data.ts +178 -0
  248. package/src/provider/types.ts +273 -0
  249. package/src/{zustand-store.ts → provider/zustand-store.ts} +36 -14
  250. package/src/{cell-renderer.ts → renderers/cell-renderer.ts} +146 -58
  251. package/src/renderers/column-header-cell.ts +51 -17
  252. package/src/renderers/index.ts +1 -0
  253. package/src/types.ts +143 -236
  254. package/src/utils/atoms.ts +28 -0
  255. package/src/utils/debug-overlay.ts +1 -1
  256. package/src/utils/index.ts +2 -8
  257. package/src/utils/key-handling.ts +170 -164
  258. package/src/utils/validation.ts +7 -2
  259. package/dist/actions/filters.cjs +0 -139
  260. package/dist/actions/filters.cjs.map +0 -1
  261. package/dist/actions/filters.js +0 -139
  262. package/dist/actions/filters.js.map +0 -1
  263. package/dist/actions/table-controls.cjs.map +0 -1
  264. package/dist/actions/table-controls.js.map +0 -1
  265. package/dist/actions/toolbar.cjs +0 -246
  266. package/dist/actions/toolbar.cjs.map +0 -1
  267. package/dist/actions/toolbar.js.map +0 -1
  268. package/dist/actions/toolbar.module.sass.cjs +0 -27
  269. package/dist/actions/toolbar.module.sass.cjs.map +0 -1
  270. package/dist/actions/toolbar.module.sass.js +0 -25
  271. package/dist/actions/toolbar.module.sass.js.map +0 -1
  272. package/dist/cell-renderer.cjs.map +0 -1
  273. package/dist/cell-renderer.js.map +0 -1
  274. package/dist/components/view-info.cjs +0 -55
  275. package/dist/components/view-info.cjs.map +0 -1
  276. package/dist/components/view-info.js.map +0 -1
  277. package/dist/core.cjs.map +0 -1
  278. package/dist/core.d.ts +0 -113
  279. package/dist/core.js.map +0 -1
  280. package/dist/provider.cjs +0 -191
  281. package/dist/provider.cjs.map +0 -1
  282. package/dist/provider.d.ts +0 -25
  283. package/dist/provider.js +0 -189
  284. package/dist/provider.js.map +0 -1
  285. package/dist/table-updates/data-parameter.d.ts +0 -14
  286. package/dist/table-updates/filter.d.ts +0 -16
  287. package/dist/table-updates/index.d.ts +0 -19
  288. package/dist/utils/column-spec.cjs.map +0 -1
  289. package/dist/utils/column-spec.js.map +0 -1
  290. package/dist/utils/index.cjs +0 -9
  291. package/dist/utils/index.cjs.map +0 -1
  292. package/dist/utils/index.js +0 -9
  293. package/dist/utils/index.js.map +0 -1
  294. package/dist/zustand-store.cjs.map +0 -1
  295. package/dist/zustand-store.js.map +0 -1
  296. package/src/actions/filters.ts +0 -176
  297. package/src/components/actions.module.sass +0 -8
  298. package/src/provider.ts +0 -250
  299. package/src/table-updates/data-parameter.ts +0 -44
  300. package/src/table-updates/filter.ts +0 -124
  301. package/src/table-updates/index.ts +0 -239
  302. /package/dist/{zustand-store.d.ts → provider/zustand-store.d.ts} +0 -0
@@ -1,8 +1,8 @@
1
- import { storeAPIAtom, tableActionsAtom, storeAtom } from "../provider.js";
2
1
  import { atom } from "jotai";
3
- import { singleFocusedCell } from "../zustand-store.js";
4
2
  import { toasterAtom } from "../notifications.js";
5
- import { runActionWrapper } from "../actions/toolbar.js";
3
+ import { storeAPIAtom, tableActionsAtom, storeAtom } from "../provider/core.js";
4
+ import { runActionWrapper } from "../actions/context.js";
5
+ import { singleFocusedCell } from "../provider/zustand-store.js";
6
6
  const isEditableAtom = atom((get) => {
7
7
  const store = get(storeAtom);
8
8
  return store?.editable ?? false;
@@ -12,149 +12,150 @@ atom((get) => {
12
12
  const selection = store?.selection ?? [];
13
13
  return selection.length > 0;
14
14
  });
15
- const tableHotkeysAtom = atom((get) => {
16
- const store = get(storeAPIAtom);
17
- const toaster = get(toasterAtom);
18
- const editable = get(isEditableAtom);
19
- const tableActions = get(tableActionsAtom);
20
- if (store == null) return [];
21
- const keyHandler = (actionRunner) => {
22
- return (e) => {
23
- const state = store.getState();
24
- const setState = store.setState;
25
- try {
26
- const res = actionRunner(e, state, setState);
27
- if (res instanceof Promise) {
28
- res.then(() => {
29
- }).catch((err) => {
30
- console.error(err);
31
- handleError(toaster, err);
32
- });
33
- }
34
- } catch (err) {
35
- handleError(toaster, err);
36
- }
37
- };
38
- };
39
- function handleError(toaster2, err) {
40
- toaster2.show({
41
- message: `${err}`,
42
- intent: "danger"
43
- });
44
- }
45
- const directionCombos = ["up", "down", "left", "right"].map((dir) => {
46
- return {
47
- combo: dir,
48
- group: "Navigation",
49
- label: "Move focus " + dir,
50
- preventDefault: true,
51
- onKeyDown: keyHandler((e, state) => {
52
- state.moveFocusedCell(dir);
53
- })
54
- };
55
- });
56
- const actionsCombos = tableActions.map((action) => {
57
- if (action.hotkey == null) return null;
58
- return {
59
- combo: action.hotkey,
60
- label: action.name,
61
- group: action.group ?? "Actions",
62
- preventDefault: true,
63
- disabled: action.requiresEditable !== false && !editable,
64
- onKeyDown(event) {
15
+ const tableHotkeysAtom = atom(
16
+ null,
17
+ (get, set) => {
18
+ const store = get(storeAPIAtom);
19
+ const toaster = get(toasterAtom);
20
+ const editable = get(isEditableAtom);
21
+ const tableActions = get(tableActionsAtom);
22
+ if (store == null) return [];
23
+ const keyHandler = (actionRunner) => {
24
+ return (e) => {
65
25
  const state = store.getState();
66
26
  const setState = store.setState;
67
- runActionWrapper(action, state, setState, toaster);
68
- }
27
+ try {
28
+ const res = actionRunner(e, state, setState);
29
+ if (res instanceof Promise) {
30
+ res.then(() => {
31
+ }).catch((err) => {
32
+ console.error(err);
33
+ handleError(toaster, err);
34
+ });
35
+ }
36
+ } catch (err) {
37
+ handleError(toaster, err);
38
+ }
39
+ };
69
40
  };
70
- }).filter(Boolean);
71
- const clearOrDeleteSelection = keyHandler((e, state) => {
72
- const sel = state.selection ?? [];
73
- const isRowSelection = sel.length > 0 && sel.every((r) => r.cols == null && r.rows != null);
74
- if (isRowSelection) {
75
- state.deleteSelectedRows();
76
- } else {
77
- state.clearSelection();
41
+ function handleError(toaster2, err) {
42
+ toaster2.show({
43
+ message: `${err}`,
44
+ intent: "danger"
45
+ });
78
46
  }
79
- });
80
- return [
81
- {
82
- combo: "esc",
83
- label: "Exit editing / clear selection",
84
- group: "Selection",
85
- allowInInput: true,
86
- onKeyDown: keyHandler((e, state) => {
87
- if (state.cellSurfaceOpen) {
88
- state.closeCellSurface();
47
+ const directionCombos = ["up", "down", "left", "right"].map((dir) => {
48
+ return {
49
+ combo: dir,
50
+ group: "Navigation",
51
+ label: "Move focus " + dir,
52
+ preventDefault: true,
53
+ onKeyDown: keyHandler((e, state) => {
54
+ state.moveFocusedCell(dir);
55
+ })
56
+ };
57
+ });
58
+ const actionsCombos = tableActions.map((action) => {
59
+ if (action.hotkey == null) return null;
60
+ return {
61
+ combo: action.hotkey,
62
+ label: action.name,
63
+ group: action.group ?? "Actions",
64
+ preventDefault: true,
65
+ disabled: action.requiresEditable !== false && !editable,
66
+ onKeyDown(event) {
67
+ runActionWrapper(action, get, set, toaster);
68
+ }
69
+ };
70
+ }).filter(Boolean);
71
+ const clearOrDeleteSelection = keyHandler((e, state) => {
72
+ const sel = state.selection ?? [];
73
+ const isRowSelection = sel.length > 0 && sel.every((r) => r.cols == null && r.rows != null);
74
+ if (isRowSelection) {
75
+ state.deleteSelectedRows();
76
+ } else {
77
+ state.clearSelection();
78
+ }
79
+ });
80
+ return [
81
+ {
82
+ combo: "esc",
83
+ label: "Exit editing / clear selection",
84
+ group: "Selection",
85
+ allowInInput: true,
86
+ onKeyDown: keyHandler((e, state) => {
87
+ if (state.cellSurfaceOpen) {
88
+ state.closeCellSurface();
89
+ e.preventDefault();
90
+ e.stopPropagation();
91
+ return;
92
+ }
93
+ if (state.selection.length == 0) {
94
+ return;
95
+ }
96
+ state.setSelection([]);
89
97
  e.preventDefault();
90
98
  e.stopPropagation();
91
- return;
92
- }
93
- if (state.selection.length == 0) {
94
- return;
95
- }
96
- state.setSelection([]);
97
- e.preventDefault();
98
- e.stopPropagation();
99
- })
100
- },
101
- {
102
- combo: "backspace",
103
- label: "Clear cells / delete rows",
104
- group: "Selection",
105
- allowInInput: true,
106
- disabled: !editable,
107
- onKeyDown: clearOrDeleteSelection
108
- },
109
- {
110
- combo: "del",
111
- label: "Clear cells / delete rows",
112
- group: "Selection",
113
- allowInInput: true,
114
- disabled: !editable,
115
- onKeyDown: clearOrDeleteSelection
116
- },
117
- {
118
- combo: "tab",
119
- label: "Move focus right (or left with shift)",
120
- group: "Navigation",
121
- allowInInput: true,
122
- onKeyDown: keyHandler((e, state) => {
123
- state.moveFocusedCell(e.shiftKey ? "left" : "right");
124
- })
125
- },
126
- {
127
- combo: "enter",
128
- label: "Edit cell / move focus down",
129
- group: "Navigation",
130
- allowInInput: true,
131
- onKeyDown: keyHandler((e, state) => {
132
- if (!state.cellSurfaceOpen) {
99
+ })
100
+ },
101
+ {
102
+ combo: "backspace",
103
+ label: "Clear cells / delete rows",
104
+ group: "Selection",
105
+ allowInInput: true,
106
+ disabled: !editable,
107
+ onKeyDown: clearOrDeleteSelection
108
+ },
109
+ {
110
+ combo: "del",
111
+ label: "Clear cells / delete rows",
112
+ group: "Selection",
113
+ allowInInput: true,
114
+ disabled: !editable,
115
+ onKeyDown: clearOrDeleteSelection
116
+ },
117
+ {
118
+ combo: "tab",
119
+ label: "Move focus right (or left with shift)",
120
+ group: "Navigation",
121
+ allowInInput: true,
122
+ onKeyDown: keyHandler((e, state) => {
123
+ state.moveFocusedCell(e.shiftKey ? "left" : "right");
124
+ })
125
+ },
126
+ {
127
+ combo: "enter",
128
+ label: "Edit cell / move focus down",
129
+ group: "Navigation",
130
+ allowInInput: true,
131
+ onKeyDown: keyHandler((e, state) => {
132
+ if (!state.cellSurfaceOpen) {
133
+ state.armAutoActivate();
134
+ state.openCellSurface();
135
+ e.preventDefault();
136
+ return;
137
+ }
138
+ state.moveFocusedCell("down");
139
+ })
140
+ },
141
+ {
142
+ combo: "f2",
143
+ label: "Edit / open cell",
144
+ group: "Editing",
145
+ onKeyDown: keyHandler((e, state) => {
133
146
  state.armAutoActivate();
134
147
  state.openCellSurface();
135
148
  e.preventDefault();
136
- return;
137
- }
138
- state.moveFocusedCell("down");
139
- })
140
- },
141
- {
142
- combo: "f2",
143
- label: "Edit / open cell",
144
- group: "Editing",
145
- onKeyDown: keyHandler((e, state) => {
146
- state.armAutoActivate();
147
- state.openCellSurface();
148
- e.preventDefault();
149
- })
150
- },
151
- ...directionCombos,
152
- ...actionsCombos
153
- ];
154
- });
149
+ })
150
+ },
151
+ ...directionCombos,
152
+ ...actionsCombos
153
+ ];
154
+ }
155
+ );
155
156
  const selectionAtom = atom((get) => {
156
157
  const store = get(storeAtom);
157
- return store.selection;
158
+ return store?.selection ?? [];
158
159
  });
159
160
  const isSingleCellSelectionAtom = atom((get) => {
160
161
  const selection = get(selectionAtom);
@@ -1 +1 @@
1
- {"version":3,"file":"key-handling.js","sources":["../../src/utils/key-handling.ts"],"sourcesContent":["import type { KeyboardEvent } from \"react\";\nimport { storeAPIAtom, storeAtom, tableActionsAtom } from \"../provider\";\nimport type { DataSheetStoreMain } from \"../types\";\nimport { atom } from \"jotai\";\nimport { singleFocusedCell } from \"../zustand-store.ts\";\nimport { buildActionContext, runActionWrapper } from \"../actions\";\nimport { HotkeyConfig } from \"@blueprintjs/core\";\nimport { toasterAtom } from \"../notifications.ts\";\n\ntype HotkeyActionRunner = (\n e: KeyboardEvent,\n state: DataSheetStoreMain<any>,\n setState: (state: Partial<DataSheetStoreMain<any>>) => void,\n) => void | Promise<void>;\n\nconst isEditableAtom = atom((get) => {\n const store = get(storeAtom);\n return store?.editable ?? false;\n});\n\nconst hasSelectionAtom = atom((get) => {\n const store = get(storeAtom);\n const selection = store?.selection ?? [];\n return selection.length > 0;\n});\n\nexport const tableHotkeysAtom = atom<HotkeyConfig[]>((get) => {\n const store = get(storeAPIAtom);\n const toaster = get(toasterAtom);\n const editable = get(isEditableAtom);\n\n /** Set up hotkeys for table actions */\n const tableActions = get(tableActionsAtom);\n\n if (store == null) return [];\n const keyHandler = (\n actionRunner: HotkeyActionRunner,\n ): HotkeyConfig[\"onKeyDown\"] => {\n return (e) => {\n // Kind of a ridiculous hack to get the store from the atom.\n const state = store.getState();\n const setState = store.setState;\n try {\n const res = actionRunner(e, state, setState);\n if (res instanceof Promise) {\n res\n .then(() => {})\n .catch((err) => {\n console.error(err);\n handleError(toaster, err);\n });\n }\n } catch (err) {\n handleError(toaster, err);\n }\n };\n };\n\n function handleError(toaster, err) {\n toaster.show({\n message: `${err}`,\n intent: \"danger\",\n });\n }\n\n const directionCombos = [\"up\", \"down\", \"left\", \"right\"].map((dir) => {\n return {\n combo: dir,\n group: \"Navigation\",\n label: \"Move focus \" + dir,\n preventDefault: true,\n onKeyDown: keyHandler((e, state) => {\n state.moveFocusedCell(dir);\n }),\n };\n });\n\n /** TODO: merge a bit more with the actions config */\n\n const actionsCombos = tableActions\n .map((action) => {\n if (action.hotkey == null) return null;\n return {\n combo: action.hotkey,\n label: action.name,\n group: action.group ?? \"Actions\",\n preventDefault: true,\n disabled: action.requiresEditable !== false && !editable,\n onKeyDown(event: KeyboardEvent<any>): any {\n const state = store.getState();\n const setState = store.setState;\n runActionWrapper(action, state, setState, toaster);\n },\n } as any as HotkeyConfig;\n })\n .filter(Boolean) as HotkeyConfig[];\n\n // Backspace/Delete: on a whole-row selection, delete the row(s); otherwise\n // clear the selected cells.\n const clearOrDeleteSelection = keyHandler((e, state) => {\n const sel = state.selection ?? [];\n const isRowSelection =\n sel.length > 0 && sel.every((r) => r.cols == null && r.rows != null);\n if (isRowSelection) {\n state.deleteSelectedRows();\n } else {\n state.clearSelection();\n }\n });\n\n return [\n {\n combo: \"esc\",\n label: \"Exit editing / clear selection\",\n group: \"Selection\",\n allowInInput: true,\n onKeyDown: keyHandler((e, state) => {\n // First Escape closes the focused cell's open surface (editor/panel)\n // while keeping the selection, so arrow keys keep working — in both\n // auto and manual modes. A second Escape (nothing open) clears the\n // selection.\n if (state.cellSurfaceOpen) {\n state.closeCellSurface();\n e.preventDefault();\n e.stopPropagation();\n return;\n }\n if (state.selection.length == 0) {\n // Focus goes back to parent\n return;\n }\n state.setSelection([]);\n e.preventDefault();\n e.stopPropagation();\n }),\n },\n {\n combo: \"backspace\",\n label: \"Clear cells / delete rows\",\n group: \"Selection\",\n allowInInput: true,\n disabled: !editable,\n onKeyDown: clearOrDeleteSelection,\n },\n {\n combo: \"del\",\n label: \"Clear cells / delete rows\",\n group: \"Selection\",\n allowInInput: true,\n disabled: !editable,\n onKeyDown: clearOrDeleteSelection,\n },\n {\n combo: \"tab\",\n label: \"Move focus right (or left with shift)\",\n group: \"Navigation\",\n allowInInput: true,\n onKeyDown: keyHandler((e, state) => {\n state.moveFocusedCell(e.shiftKey ? \"left\" : \"right\");\n }),\n },\n {\n combo: \"enter\",\n label: \"Edit cell / move focus down\",\n group: \"Navigation\",\n allowInInput: true,\n onKeyDown: keyHandler((e, state) => {\n // In navigation mode (no surface open), Enter enters edit mode —\n // opening and focusing the focused cell's surface (Google Sheets\n // style). While a surface is open, Enter advances downward as usual\n // (an inline editor blurs and this moves to the next row).\n if (!state.cellSurfaceOpen) {\n state.armAutoActivate();\n state.openCellSurface();\n e.preventDefault();\n return;\n }\n state.moveFocusedCell(\"down\");\n }),\n },\n {\n combo: \"f2\",\n label: \"Edit / open cell\",\n group: \"Editing\",\n onKeyDown: keyHandler((e, state) => {\n // Enter edit mode from the keyboard: re-arm auto-activation and open\n // the focused cell's surface (which focuses the editor).\n state.armAutoActivate();\n state.openCellSurface();\n e.preventDefault();\n }),\n },\n ...directionCombos,\n ...actionsCombos,\n ];\n});\n\nconst selectionAtom = atom((get) => {\n const store = get(storeAtom);\n return store.selection;\n});\n\nconst isSingleCellSelectionAtom = atom((get) => {\n const selection = get(selectionAtom);\n return singleFocusedCell(selection) != null;\n});\n\nexport const editorKeyHandlerAtom = atom((get) => {\n const store = get(storeAPIAtom);\n return (e: KeyboardEvent) => {\n if (e.key === \"Escape\") {\n // Escape exits the inline editor: close the surface (which enters\n // navigation mode in auto), keep the selection, and return focus to the\n // table so arrow keys navigate. Stop propagation so the table's own\n // Escape hotkey doesn't also fire.\n const state = store?.getState();\n state?.closeCellSurface();\n state?.tableElement?.focus();\n e.preventDefault();\n e.stopPropagation();\n return;\n }\n const isSingleCellSelection = get(isSingleCellSelectionAtom);\n editorKeyHandler(e, isSingleCellSelection);\n };\n});\n\nfunction editorKeyHandler(\n e: KeyboardEvent<HTMLInputElement>,\n isSingleCellSelection: boolean,\n) {\n /** Get a key handler for inline cell editing */\n\n const target = e.target as HTMLInputElement;\n\n let shouldCaptureEventForInlineEditing = true;\n\n if (e.key == \"Enter\") {\n shouldCaptureEventForInlineEditing = e.shiftKey;\n }\n\n if (e.key == \"Escape\" || e.key == \"Tab\") {\n shouldCaptureEventForInlineEditing = false;\n }\n\n if (e.key == \"Backspace\" || e.key == \"Delete\") {\n /** Clear selection on Backspace or Delete on a multi-cell selection\n * (if shift is held, we allow deletion in a single cell)\n */\n shouldCaptureEventForInlineEditing = isSingleCellSelection && !e.shiftKey;\n }\n\n if (!shouldCaptureEventForInlineEditing) {\n target.blur();\n e.preventDefault();\n return;\n }\n\n const shouldPropagate = shouldPropagateKeystroke(e);\n if (!shouldPropagate) {\n e.stopPropagation();\n //e.preventDefault();\n } else {\n // we blur the editor and dispatch a keydown event on the parent to propagate the event to the table\n e.preventDefault();\n target.blur();\n //console.log(tableElement);\n //tableElement.focus();\n //target.parentNode?.dispatchEvent(e);\n target.parentNode?.dispatchEvent(new KeyboardEvent(\"keydown\", e));\n }\n}\n\nfunction shouldPropagateKeystroke(evt: KeyboardEvent): boolean {\n if (evt.target.selectionStart == evt.target.selectionEnd) {\n // We don't have anything selected, so we can propagate the event potentially\n // Propagate copy and paste events even if there is no selection, since they might want to copy/paste an entire row/column based on the focused cell.\n if (evt.key === \"c\" || evt.key === \"v\" || evt.key === \"x\") {\n if (evt.ctrlKey || evt.metaKey) {\n return true;\n }\n }\n }\n\n if (evt.key === \"ArrowUp\" || evt.key === \"ArrowDown\") {\n return true;\n }\n\n const target = evt.target;\n if (\n (evt.key === \"ArrowLeft\" ||\n evt.key === \"ArrowUp\" ||\n evt.key === \"ArrowDown\") &&\n target.selectionStart === 0\n ) {\n return true;\n }\n\n if (\n (evt.key === \"ArrowRight\" ||\n evt.key === \"ArrowUp\" ||\n evt.key === \"Tab\" ||\n evt.key === \"Enter\" ||\n evt.key === \"ArrowDown\") &&\n target.selectionStart === evt.target.value.length\n ) {\n return true;\n }\n\n return false;\n}\n\nexport function multiLineTextKeyHandler(evt: InputEvent) {\n if (evt.key === \"Enter\") {\n //evt.preventDefault();\n evt.stopPropagation();\n return;\n }\n\n if (evt.key === \"Escape\") {\n evt.preventDefault();\n return;\n }\n\n const shouldPropagate = shouldPropagateKeystroke(evt);\n if (!shouldPropagate) {\n evt.stopPropagation();\n } else {\n evt.target.blur();\n }\n}\n"],"names":["toaster"],"mappings":"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"}
1
+ {"version":3,"file":"key-handling.js","sources":["../../src/utils/key-handling.ts"],"sourcesContent":["import type { KeyboardEvent } from \"react\";\nimport {\n storeAPIAtom,\n storeAtom,\n tableActionsAtom,\n type DataSheetStoreMain,\n singleFocusedCell,\n ctx,\n} from \"../provider\";\nimport { atom } from \"jotai\";\nimport { runActionWrapper } from \"../actions\";\nimport { HotkeyConfig } from \"@blueprintjs/core\";\nimport { toasterAtom } from \"../notifications.ts\";\n\ntype HotkeyActionRunner = (\n e: KeyboardEvent,\n state: DataSheetStoreMain<any>,\n setState: (state: Partial<DataSheetStoreMain<any>>) => void,\n) => void | Promise<void>;\n\nconst isEditableAtom = atom((get) => {\n const store = get(storeAtom);\n return store?.editable ?? false;\n});\n\nconst hasSelectionAtom = atom((get) => {\n const store = get(storeAtom);\n const selection = store?.selection ?? [];\n return selection.length > 0;\n});\n\nexport const tableHotkeysAtom = atom<null, [], HotkeyConfig[]>(\n null,\n (get, set) => {\n const store = get(storeAPIAtom);\n const toaster = get(toasterAtom);\n const editable = get(isEditableAtom);\n\n /** Set up hotkeys for table actions */\n const tableActions = get(tableActionsAtom);\n\n if (store == null) return [];\n const keyHandler = (\n actionRunner: HotkeyActionRunner,\n ): HotkeyConfig[\"onKeyDown\"] => {\n return (e) => {\n // Kind of a ridiculous hack to get the store from the atom.\n const state = store.getState();\n const setState = store.setState;\n try {\n const res = actionRunner(e as any, state, setState);\n if (res instanceof Promise) {\n res\n .then(() => {})\n .catch((err) => {\n console.error(err);\n handleError(toaster, err);\n });\n }\n } catch (err) {\n handleError(toaster, err);\n }\n };\n };\n\n function handleError(toaster, err) {\n toaster.show({\n message: `${err}`,\n intent: \"danger\",\n });\n }\n\n const directionCombos = [\"up\", \"down\", \"left\", \"right\"].map((dir) => {\n return {\n combo: dir,\n group: \"Navigation\",\n label: \"Move focus \" + dir,\n preventDefault: true,\n onKeyDown: keyHandler((e, state) => {\n state.moveFocusedCell(dir as any);\n }),\n };\n });\n\n /** TODO: merge a bit more with the actions config */\n\n const actionsCombos = tableActions\n .map((action) => {\n if (action.hotkey == null) return null;\n return {\n combo: action.hotkey,\n label: action.name,\n group: action.group ?? \"Actions\",\n preventDefault: true,\n disabled: action.requiresEditable !== false && !editable,\n onKeyDown(event: KeyboardEvent<any>): any {\n runActionWrapper(action, get, set, toaster);\n },\n } as any as HotkeyConfig;\n })\n .filter(Boolean) as HotkeyConfig[];\n\n // Backspace/Delete: on a whole-row selection, delete the row(s); otherwise\n // clear the selected cells.\n const clearOrDeleteSelection = keyHandler((e, state) => {\n const sel = state.selection ?? [];\n const isRowSelection =\n sel.length > 0 && sel.every((r) => r.cols == null && r.rows != null);\n if (isRowSelection) {\n state.deleteSelectedRows();\n } else {\n state.clearSelection();\n }\n });\n\n return [\n {\n combo: \"esc\",\n label: \"Exit editing / clear selection\",\n group: \"Selection\",\n allowInInput: true,\n onKeyDown: keyHandler((e, state) => {\n // First Escape closes the focused cell's open surface (editor/panel)\n // while keeping the selection, so arrow keys keep working — in both\n // auto and manual modes. A second Escape (nothing open) clears the\n // selection.\n if (state.cellSurfaceOpen) {\n state.closeCellSurface();\n e.preventDefault();\n e.stopPropagation();\n return;\n }\n if (state.selection.length == 0) {\n // Focus goes back to parent\n return;\n }\n state.setSelection([]);\n e.preventDefault();\n e.stopPropagation();\n }),\n },\n {\n combo: \"backspace\",\n label: \"Clear cells / delete rows\",\n group: \"Selection\",\n allowInInput: true,\n disabled: !editable,\n onKeyDown: clearOrDeleteSelection,\n },\n {\n combo: \"del\",\n label: \"Clear cells / delete rows\",\n group: \"Selection\",\n allowInInput: true,\n disabled: !editable,\n onKeyDown: clearOrDeleteSelection,\n },\n {\n combo: \"tab\",\n label: \"Move focus right (or left with shift)\",\n group: \"Navigation\",\n allowInInput: true,\n onKeyDown: keyHandler((e, state) => {\n state.moveFocusedCell(e.shiftKey ? \"left\" : \"right\");\n }),\n },\n {\n combo: \"enter\",\n label: \"Edit cell / move focus down\",\n group: \"Navigation\",\n allowInInput: true,\n onKeyDown: keyHandler((e, state) => {\n // In navigation mode (no surface open), Enter enters edit mode —\n // opening and focusing the focused cell's surface (Google Sheets\n // style). While a surface is open, Enter advances downward as usual\n // (an inline editor blurs and this moves to the next row).\n if (!state.cellSurfaceOpen) {\n state.armAutoActivate();\n state.openCellSurface();\n e.preventDefault();\n return;\n }\n state.moveFocusedCell(\"down\");\n }),\n },\n {\n combo: \"f2\",\n label: \"Edit / open cell\",\n group: \"Editing\",\n onKeyDown: keyHandler((e, state) => {\n // Enter edit mode from the keyboard: re-arm auto-activation and open\n // the focused cell's surface (which focuses the editor).\n state.armAutoActivate();\n state.openCellSurface();\n e.preventDefault();\n }),\n },\n ...directionCombos,\n ...actionsCombos,\n ];\n },\n);\n\nconst selectionAtom = atom((get) => {\n const store = get(storeAtom);\n return store?.selection ?? [];\n});\n\nconst isSingleCellSelectionAtom = atom((get) => {\n const selection = get(selectionAtom);\n return singleFocusedCell(selection) != null;\n});\n\nexport const editorKeyHandlerAtom = atom((get) => {\n const store = get(storeAPIAtom);\n return (e: KeyboardEvent) => {\n if (e.key === \"Escape\") {\n // Escape exits the inline editor: close the surface (which enters\n // navigation mode in auto), keep the selection, and return focus to the\n // table so arrow keys navigate. Stop propagation so the table's own\n // Escape hotkey doesn't also fire.\n const state = store?.getState();\n state?.closeCellSurface();\n state?.tableElement?.focus();\n e.preventDefault();\n e.stopPropagation();\n return;\n }\n const isSingleCellSelection = get(isSingleCellSelectionAtom);\n editorKeyHandler(e as any, isSingleCellSelection);\n };\n});\n\nfunction editorKeyHandler(\n e: KeyboardEvent<HTMLInputElement>,\n isSingleCellSelection: boolean,\n) {\n /** Get a key handler for inline cell editing */\n\n const target = e.target as HTMLInputElement;\n\n let shouldCaptureEventForInlineEditing = true;\n\n if (e.key == \"Enter\") {\n shouldCaptureEventForInlineEditing = e.shiftKey;\n }\n\n if (e.key == \"Escape\" || e.key == \"Tab\") {\n shouldCaptureEventForInlineEditing = false;\n }\n\n if (e.key == \"Backspace\" || e.key == \"Delete\") {\n /** Clear selection on Backspace or Delete on a multi-cell selection\n * (if shift is held, we allow deletion in a single cell)\n */\n shouldCaptureEventForInlineEditing = isSingleCellSelection && !e.shiftKey;\n }\n\n if (!shouldCaptureEventForInlineEditing) {\n target.blur();\n e.preventDefault();\n return;\n }\n\n const shouldPropagate = shouldPropagateKeystroke(e);\n if (!shouldPropagate) {\n e.stopPropagation();\n //e.preventDefault();\n } else {\n // we blur the editor and dispatch a keydown event on the parent to propagate the event to the table\n e.preventDefault();\n target.blur();\n //console.log(tableElement);\n //tableElement.focus();\n //target.parentNode?.dispatchEvent(e);\n target.parentNode?.dispatchEvent(new KeyboardEvent(\"keydown\", e as any));\n }\n}\n\nfunction shouldPropagateKeystroke(evt: any): boolean {\n if (evt.target.selectionStart == evt.target.selectionEnd) {\n // We don't have anything selected, so we can propagate the event potentially\n // Propagate copy and paste events even if there is no selection, since they might want to copy/paste an entire row/column based on the focused cell.\n if (evt.key === \"c\" || evt.key === \"v\" || evt.key === \"x\") {\n if (evt.ctrlKey || evt.metaKey) {\n return true;\n }\n }\n }\n\n if (evt.key === \"ArrowUp\" || evt.key === \"ArrowDown\") {\n return true;\n }\n\n const target = evt.target;\n if (\n (evt.key === \"ArrowLeft\" ||\n evt.key === \"ArrowUp\" ||\n evt.key === \"ArrowDown\") &&\n target.selectionStart === 0\n ) {\n return true;\n }\n\n if (\n (evt.key === \"ArrowRight\" ||\n evt.key === \"ArrowUp\" ||\n evt.key === \"Tab\" ||\n evt.key === \"Enter\" ||\n evt.key === \"ArrowDown\") &&\n target.selectionStart === evt.target.value.length\n ) {\n return true;\n }\n\n return false;\n}\n\nexport function multiLineTextKeyHandler(evt: any) {\n if (evt.key === \"Enter\") {\n //evt.preventDefault();\n evt.stopPropagation();\n return;\n }\n\n if (evt.key === \"Escape\") {\n evt.preventDefault();\n return;\n }\n\n const shouldPropagate = shouldPropagateKeystroke(evt);\n if (!shouldPropagate) {\n evt.stopPropagation();\n } else {\n evt.target.blur();\n }\n}\n"],"names":["toaster"],"mappings":"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"}
@@ -30,7 +30,12 @@ function collectValidationErrors(s) {
30
30
  for (const col of cols) {
31
31
  const v = validateCell(col, row[col.key], row, i);
32
32
  if (v?.severity === "error") {
33
- errors.push({ rowIndex: i, columnKey: col.key, severity: "error", message: v.message });
33
+ errors.push({
34
+ rowIndex: i,
35
+ columnKey: col.key,
36
+ severity: "error",
37
+ message: v.message
38
+ });
34
39
  }
35
40
  }
36
41
  }
@@ -1 +1 @@
1
- {"version":3,"file":"validation.cjs","sources":["../../src/utils/validation.ts"],"sourcesContent":["import type { CellValidation, ColumnSpec } from \"./column-spec\";\n\n/**\n * Validate a single cell against its column spec. Order: `required` (empty →\n * error), then `validate`, then the deprecated `isValid` boolean. Returns\n * `null` when valid.\n */\nexport function validateCell(\n col: ColumnSpec,\n value: any,\n row: any,\n rowIndex: number,\n): CellValidation | null {\n const isEmpty = value == null || value === \"\";\n\n if (col.required && isEmpty) {\n return { severity: \"error\", message: `${col.name} is required` };\n }\n if (col.validate != null) {\n return col.validate(value, row, { rowIndex });\n }\n if (col.isValid != null && !col.isValid(value)) {\n return { severity: \"error\", message: `Invalid ${col.name}` };\n }\n return null;\n}\n\n/** A validation error located to a specific cell. */\nexport interface CellValidationError {\n rowIndex: number;\n columnKey: string;\n severity: \"error\";\n message?: string;\n}\n\n/**\n * Collect all cell **errors** (not warnings) across the loaded rows, using the\n * merged (base + edited) row values. Skips deleted rows. Used to block saving.\n * Iterates loaded rows × validating columns — for very large tables, consider\n * a memoized index; here it early-exits are the caller's (e.g. a length check).\n */\nexport function collectValidationErrors(s: {\n data?: any[];\n updatedData?: any[];\n columnSpec?: ColumnSpec[];\n rowStatus?: readonly string[];\n}): CellValidationError[] {\n const data = s.data ?? [];\n const updatedData = s.updatedData ?? [];\n const columnSpec = s.columnSpec ?? [];\n const rowStatus = s.rowStatus ?? [];\n\n // Only columns that actually validate need scanning.\n const cols = columnSpec.filter(\n (c) => c.required || c.validate != null || c.isValid != null,\n );\n if (cols.length === 0) return [];\n\n const errors: CellValidationError[] = [];\n const n = Math.max(data.length, updatedData.length);\n for (let i = 0; i < n; i++) {\n if (rowStatus[i] === \"deleted\") continue;\n const row = { ...data[i], ...updatedData[i] };\n for (const col of cols) {\n const v = validateCell(col, row[col.key], row, i);\n if (v?.severity === \"error\") {\n errors.push({ rowIndex: i, columnKey: col.key, severity: \"error\", message: v.message });\n }\n }\n }\n return errors;\n}\n"],"names":[],"mappings":";;AAOO,SAAS,aACd,KACA,OACA,KACA,UACuB;AACvB,QAAM,UAAU,SAAS,QAAQ,UAAU;AAE3C,MAAI,IAAI,YAAY,SAAS;AAC3B,WAAO,EAAE,UAAU,SAAS,SAAS,GAAG,IAAI,IAAI,eAAA;AAAA,EAClD;AACA,MAAI,IAAI,YAAY,MAAM;AACxB,WAAO,IAAI,SAAS,OAAO,KAAK,EAAE,UAAU;AAAA,EAC9C;AACA,MAAI,IAAI,WAAW,QAAQ,CAAC,IAAI,QAAQ,KAAK,GAAG;AAC9C,WAAO,EAAE,UAAU,SAAS,SAAS,WAAW,IAAI,IAAI,GAAA;AAAA,EAC1D;AACA,SAAO;AACT;AAgBO,SAAS,wBAAwB,GAKd;AACxB,QAAM,OAAO,EAAE,QAAQ,CAAA;AACvB,QAAM,cAAc,EAAE,eAAe,CAAA;AACrC,QAAM,aAAa,EAAE,cAAc,CAAA;AACnC,QAAM,YAAY,EAAE,aAAa,CAAA;AAGjC,QAAM,OAAO,WAAW;AAAA,IACtB,CAAC,MAAM,EAAE,YAAY,EAAE,YAAY,QAAQ,EAAE,WAAW;AAAA,EAAA;AAE1D,MAAI,KAAK,WAAW,EAAG,QAAO,CAAA;AAE9B,QAAM,SAAgC,CAAA;AACtC,QAAM,IAAI,KAAK,IAAI,KAAK,QAAQ,YAAY,MAAM;AAClD,WAAS,IAAI,GAAG,IAAI,GAAG,KAAK;AAC1B,QAAI,UAAU,CAAC,MAAM,UAAW;AAChC,UAAM,MAAM,EAAE,GAAG,KAAK,CAAC,GAAG,GAAG,YAAY,CAAC,EAAA;AAC1C,eAAW,OAAO,MAAM;AACtB,YAAM,IAAI,aAAa,KAAK,IAAI,IAAI,GAAG,GAAG,KAAK,CAAC;AAChD,UAAI,GAAG,aAAa,SAAS;AAC3B,eAAO,KAAK,EAAE,UAAU,GAAG,WAAW,IAAI,KAAK,UAAU,SAAS,SAAS,EAAE,QAAA,CAAS;AAAA,MACxF;AAAA,IACF;AAAA,EACF;AACA,SAAO;AACT;;;"}
1
+ {"version":3,"file":"validation.cjs","sources":["../../src/utils/validation.ts"],"sourcesContent":["import type { CellValidation, ColumnSpec } from \"../provider/column-spec.ts\";\n\n/**\n * Validate a single cell against its column spec. Order: `required` (empty →\n * error), then `validate`, then the deprecated `isValid` boolean. Returns\n * `null` when valid.\n */\nexport function validateCell(\n col: ColumnSpec,\n value: any,\n row: any,\n rowIndex: number,\n): CellValidation | null {\n const isEmpty = value == null || value === \"\";\n\n if (col.required && isEmpty) {\n return { severity: \"error\", message: `${col.name} is required` };\n }\n if (col.validate != null) {\n return col.validate(value, row, { rowIndex });\n }\n if (col.isValid != null && !col.isValid(value)) {\n return { severity: \"error\", message: `Invalid ${col.name}` };\n }\n return null;\n}\n\n/** A validation error located to a specific cell. */\nexport interface CellValidationError {\n rowIndex: number;\n columnKey: string;\n severity: \"error\";\n message?: string;\n}\n\n/**\n * Collect all cell **errors** (not warnings) across the loaded rows, using the\n * merged (base + edited) row values. Skips deleted rows. Used to block saving.\n * Iterates loaded rows × validating columns — for very large tables, consider\n * a memoized index; here it early-exits are the caller's (e.g. a length check).\n */\nexport function collectValidationErrors(s: {\n data?: any[];\n updatedData?: any[];\n columnSpec?: ColumnSpec[];\n rowStatus?: readonly string[];\n}): CellValidationError[] {\n const data = s.data ?? [];\n const updatedData = s.updatedData ?? [];\n const columnSpec = s.columnSpec ?? [];\n const rowStatus = s.rowStatus ?? [];\n\n // Only columns that actually validate need scanning.\n const cols = columnSpec.filter(\n (c) => c.required || c.validate != null || c.isValid != null,\n );\n if (cols.length === 0) return [];\n\n const errors: CellValidationError[] = [];\n const n = Math.max(data.length, updatedData.length);\n for (let i = 0; i < n; i++) {\n if (rowStatus[i] === \"deleted\") continue;\n const row = { ...data[i], ...updatedData[i] };\n for (const col of cols) {\n const v = validateCell(col, row[col.key], row, i);\n if (v?.severity === \"error\") {\n errors.push({\n rowIndex: i,\n columnKey: col.key,\n severity: \"error\",\n message: v.message,\n });\n }\n }\n }\n return errors;\n}\n"],"names":[],"mappings":";;AAOO,SAAS,aACd,KACA,OACA,KACA,UACuB;AACvB,QAAM,UAAU,SAAS,QAAQ,UAAU;AAE3C,MAAI,IAAI,YAAY,SAAS;AAC3B,WAAO,EAAE,UAAU,SAAS,SAAS,GAAG,IAAI,IAAI,eAAA;AAAA,EAClD;AACA,MAAI,IAAI,YAAY,MAAM;AACxB,WAAO,IAAI,SAAS,OAAO,KAAK,EAAE,UAAU;AAAA,EAC9C;AACA,MAAI,IAAI,WAAW,QAAQ,CAAC,IAAI,QAAQ,KAAK,GAAG;AAC9C,WAAO,EAAE,UAAU,SAAS,SAAS,WAAW,IAAI,IAAI,GAAA;AAAA,EAC1D;AACA,SAAO;AACT;AAgBO,SAAS,wBAAwB,GAKd;AACxB,QAAM,OAAO,EAAE,QAAQ,CAAA;AACvB,QAAM,cAAc,EAAE,eAAe,CAAA;AACrC,QAAM,aAAa,EAAE,cAAc,CAAA;AACnC,QAAM,YAAY,EAAE,aAAa,CAAA;AAGjC,QAAM,OAAO,WAAW;AAAA,IACtB,CAAC,MAAM,EAAE,YAAY,EAAE,YAAY,QAAQ,EAAE,WAAW;AAAA,EAAA;AAE1D,MAAI,KAAK,WAAW,EAAG,QAAO,CAAA;AAE9B,QAAM,SAAgC,CAAA;AACtC,QAAM,IAAI,KAAK,IAAI,KAAK,QAAQ,YAAY,MAAM;AAClD,WAAS,IAAI,GAAG,IAAI,GAAG,KAAK;AAC1B,QAAI,UAAU,CAAC,MAAM,UAAW;AAChC,UAAM,MAAM,EAAE,GAAG,KAAK,CAAC,GAAG,GAAG,YAAY,CAAC,EAAA;AAC1C,eAAW,OAAO,MAAM;AACtB,YAAM,IAAI,aAAa,KAAK,IAAI,IAAI,GAAG,GAAG,KAAK,CAAC;AAChD,UAAI,GAAG,aAAa,SAAS;AAC3B,eAAO,KAAK;AAAA,UACV,UAAU;AAAA,UACV,WAAW,IAAI;AAAA,UACf,UAAU;AAAA,UACV,SAAS,EAAE;AAAA,QAAA,CACZ;AAAA,MACH;AAAA,IACF;AAAA,EACF;AACA,SAAO;AACT;;;"}
@@ -1,4 +1,4 @@
1
- import { CellValidation, ColumnSpec } from './column-spec';
1
+ import { CellValidation, ColumnSpec } from '../provider/column-spec.ts';
2
2
  /**
3
3
  * Validate a single cell against its column spec. Order: `required` (empty →
4
4
  * error), then `validate`, then the deprecated `isValid` boolean. Returns
@@ -28,7 +28,12 @@ function collectValidationErrors(s) {
28
28
  for (const col of cols) {
29
29
  const v = validateCell(col, row[col.key], row, i);
30
30
  if (v?.severity === "error") {
31
- errors.push({ rowIndex: i, columnKey: col.key, severity: "error", message: v.message });
31
+ errors.push({
32
+ rowIndex: i,
33
+ columnKey: col.key,
34
+ severity: "error",
35
+ message: v.message
36
+ });
32
37
  }
33
38
  }
34
39
  }
@@ -1 +1 @@
1
- {"version":3,"file":"validation.js","sources":["../../src/utils/validation.ts"],"sourcesContent":["import type { CellValidation, ColumnSpec } from \"./column-spec\";\n\n/**\n * Validate a single cell against its column spec. Order: `required` (empty →\n * error), then `validate`, then the deprecated `isValid` boolean. Returns\n * `null` when valid.\n */\nexport function validateCell(\n col: ColumnSpec,\n value: any,\n row: any,\n rowIndex: number,\n): CellValidation | null {\n const isEmpty = value == null || value === \"\";\n\n if (col.required && isEmpty) {\n return { severity: \"error\", message: `${col.name} is required` };\n }\n if (col.validate != null) {\n return col.validate(value, row, { rowIndex });\n }\n if (col.isValid != null && !col.isValid(value)) {\n return { severity: \"error\", message: `Invalid ${col.name}` };\n }\n return null;\n}\n\n/** A validation error located to a specific cell. */\nexport interface CellValidationError {\n rowIndex: number;\n columnKey: string;\n severity: \"error\";\n message?: string;\n}\n\n/**\n * Collect all cell **errors** (not warnings) across the loaded rows, using the\n * merged (base + edited) row values. Skips deleted rows. Used to block saving.\n * Iterates loaded rows × validating columns — for very large tables, consider\n * a memoized index; here it early-exits are the caller's (e.g. a length check).\n */\nexport function collectValidationErrors(s: {\n data?: any[];\n updatedData?: any[];\n columnSpec?: ColumnSpec[];\n rowStatus?: readonly string[];\n}): CellValidationError[] {\n const data = s.data ?? [];\n const updatedData = s.updatedData ?? [];\n const columnSpec = s.columnSpec ?? [];\n const rowStatus = s.rowStatus ?? [];\n\n // Only columns that actually validate need scanning.\n const cols = columnSpec.filter(\n (c) => c.required || c.validate != null || c.isValid != null,\n );\n if (cols.length === 0) return [];\n\n const errors: CellValidationError[] = [];\n const n = Math.max(data.length, updatedData.length);\n for (let i = 0; i < n; i++) {\n if (rowStatus[i] === \"deleted\") continue;\n const row = { ...data[i], ...updatedData[i] };\n for (const col of cols) {\n const v = validateCell(col, row[col.key], row, i);\n if (v?.severity === \"error\") {\n errors.push({ rowIndex: i, columnKey: col.key, severity: \"error\", message: v.message });\n }\n }\n }\n return errors;\n}\n"],"names":[],"mappings":"AAOO,SAAS,aACd,KACA,OACA,KACA,UACuB;AACvB,QAAM,UAAU,SAAS,QAAQ,UAAU;AAE3C,MAAI,IAAI,YAAY,SAAS;AAC3B,WAAO,EAAE,UAAU,SAAS,SAAS,GAAG,IAAI,IAAI,eAAA;AAAA,EAClD;AACA,MAAI,IAAI,YAAY,MAAM;AACxB,WAAO,IAAI,SAAS,OAAO,KAAK,EAAE,UAAU;AAAA,EAC9C;AACA,MAAI,IAAI,WAAW,QAAQ,CAAC,IAAI,QAAQ,KAAK,GAAG;AAC9C,WAAO,EAAE,UAAU,SAAS,SAAS,WAAW,IAAI,IAAI,GAAA;AAAA,EAC1D;AACA,SAAO;AACT;AAgBO,SAAS,wBAAwB,GAKd;AACxB,QAAM,OAAO,EAAE,QAAQ,CAAA;AACvB,QAAM,cAAc,EAAE,eAAe,CAAA;AACrC,QAAM,aAAa,EAAE,cAAc,CAAA;AACnC,QAAM,YAAY,EAAE,aAAa,CAAA;AAGjC,QAAM,OAAO,WAAW;AAAA,IACtB,CAAC,MAAM,EAAE,YAAY,EAAE,YAAY,QAAQ,EAAE,WAAW;AAAA,EAAA;AAE1D,MAAI,KAAK,WAAW,EAAG,QAAO,CAAA;AAE9B,QAAM,SAAgC,CAAA;AACtC,QAAM,IAAI,KAAK,IAAI,KAAK,QAAQ,YAAY,MAAM;AAClD,WAAS,IAAI,GAAG,IAAI,GAAG,KAAK;AAC1B,QAAI,UAAU,CAAC,MAAM,UAAW;AAChC,UAAM,MAAM,EAAE,GAAG,KAAK,CAAC,GAAG,GAAG,YAAY,CAAC,EAAA;AAC1C,eAAW,OAAO,MAAM;AACtB,YAAM,IAAI,aAAa,KAAK,IAAI,IAAI,GAAG,GAAG,KAAK,CAAC;AAChD,UAAI,GAAG,aAAa,SAAS;AAC3B,eAAO,KAAK,EAAE,UAAU,GAAG,WAAW,IAAI,KAAK,UAAU,SAAS,SAAS,EAAE,QAAA,CAAS;AAAA,MACxF;AAAA,IACF;AAAA,EACF;AACA,SAAO;AACT;"}
1
+ {"version":3,"file":"validation.js","sources":["../../src/utils/validation.ts"],"sourcesContent":["import type { CellValidation, ColumnSpec } from \"../provider/column-spec.ts\";\n\n/**\n * Validate a single cell against its column spec. Order: `required` (empty →\n * error), then `validate`, then the deprecated `isValid` boolean. Returns\n * `null` when valid.\n */\nexport function validateCell(\n col: ColumnSpec,\n value: any,\n row: any,\n rowIndex: number,\n): CellValidation | null {\n const isEmpty = value == null || value === \"\";\n\n if (col.required && isEmpty) {\n return { severity: \"error\", message: `${col.name} is required` };\n }\n if (col.validate != null) {\n return col.validate(value, row, { rowIndex });\n }\n if (col.isValid != null && !col.isValid(value)) {\n return { severity: \"error\", message: `Invalid ${col.name}` };\n }\n return null;\n}\n\n/** A validation error located to a specific cell. */\nexport interface CellValidationError {\n rowIndex: number;\n columnKey: string;\n severity: \"error\";\n message?: string;\n}\n\n/**\n * Collect all cell **errors** (not warnings) across the loaded rows, using the\n * merged (base + edited) row values. Skips deleted rows. Used to block saving.\n * Iterates loaded rows × validating columns — for very large tables, consider\n * a memoized index; here it early-exits are the caller's (e.g. a length check).\n */\nexport function collectValidationErrors(s: {\n data?: any[];\n updatedData?: any[];\n columnSpec?: ColumnSpec[];\n rowStatus?: readonly string[];\n}): CellValidationError[] {\n const data = s.data ?? [];\n const updatedData = s.updatedData ?? [];\n const columnSpec = s.columnSpec ?? [];\n const rowStatus = s.rowStatus ?? [];\n\n // Only columns that actually validate need scanning.\n const cols = columnSpec.filter(\n (c) => c.required || c.validate != null || c.isValid != null,\n );\n if (cols.length === 0) return [];\n\n const errors: CellValidationError[] = [];\n const n = Math.max(data.length, updatedData.length);\n for (let i = 0; i < n; i++) {\n if (rowStatus[i] === \"deleted\") continue;\n const row = { ...data[i], ...updatedData[i] };\n for (const col of cols) {\n const v = validateCell(col, row[col.key], row, i);\n if (v?.severity === \"error\") {\n errors.push({\n rowIndex: i,\n columnKey: col.key,\n severity: \"error\",\n message: v.message,\n });\n }\n }\n }\n return errors;\n}\n"],"names":[],"mappings":"AAOO,SAAS,aACd,KACA,OACA,KACA,UACuB;AACvB,QAAM,UAAU,SAAS,QAAQ,UAAU;AAE3C,MAAI,IAAI,YAAY,SAAS;AAC3B,WAAO,EAAE,UAAU,SAAS,SAAS,GAAG,IAAI,IAAI,eAAA;AAAA,EAClD;AACA,MAAI,IAAI,YAAY,MAAM;AACxB,WAAO,IAAI,SAAS,OAAO,KAAK,EAAE,UAAU;AAAA,EAC9C;AACA,MAAI,IAAI,WAAW,QAAQ,CAAC,IAAI,QAAQ,KAAK,GAAG;AAC9C,WAAO,EAAE,UAAU,SAAS,SAAS,WAAW,IAAI,IAAI,GAAA;AAAA,EAC1D;AACA,SAAO;AACT;AAgBO,SAAS,wBAAwB,GAKd;AACxB,QAAM,OAAO,EAAE,QAAQ,CAAA;AACvB,QAAM,cAAc,EAAE,eAAe,CAAA;AACrC,QAAM,aAAa,EAAE,cAAc,CAAA;AACnC,QAAM,YAAY,EAAE,aAAa,CAAA;AAGjC,QAAM,OAAO,WAAW;AAAA,IACtB,CAAC,MAAM,EAAE,YAAY,EAAE,YAAY,QAAQ,EAAE,WAAW;AAAA,EAAA;AAE1D,MAAI,KAAK,WAAW,EAAG,QAAO,CAAA;AAE9B,QAAM,SAAgC,CAAA;AACtC,QAAM,IAAI,KAAK,IAAI,KAAK,QAAQ,YAAY,MAAM;AAClD,WAAS,IAAI,GAAG,IAAI,GAAG,KAAK;AAC1B,QAAI,UAAU,CAAC,MAAM,UAAW;AAChC,UAAM,MAAM,EAAE,GAAG,KAAK,CAAC,GAAG,GAAG,YAAY,CAAC,EAAA;AAC1C,eAAW,OAAO,MAAM;AACtB,YAAM,IAAI,aAAa,KAAK,IAAI,IAAI,GAAG,GAAG,KAAK,CAAC;AAChD,UAAI,GAAG,aAAa,SAAS;AAC3B,eAAO,KAAK;AAAA,UACV,UAAU;AAAA,UACV,WAAW,IAAI;AAAA,UACf,UAAU;AAAA,UACV,SAAS,EAAE;AAAA,QAAA,CACZ;AAAA,MACH;AAAA,IACF;AAAA,EACF;AACA,SAAO;AACT;"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@macrostrat/data-sheet",
3
- "version": "4.1.0",
3
+ "version": "4.2.0",
4
4
  "description": "Scalable data sheet with optional editing capabilities",
5
5
  "repository": {
6
6
  "type": "git",
@@ -49,7 +49,7 @@
49
49
  "@blueprintjs/core": "^6.14.0",
50
50
  "@blueprintjs/table": "^6.1.0",
51
51
  "@macrostrat/color-utils": "^1.2.2",
52
- "@macrostrat/data-components": "^1.1.13",
52
+ "@macrostrat/data-components": "^1.2.0",
53
53
  "@macrostrat/hyper": "^3.1.1",
54
54
  "@macrostrat/ui-components": "^5.0.11",
55
55
  "@supabase/postgrest-js": "^1.17.7",
@@ -62,7 +62,8 @@
62
62
  "zustand": "^5.0.2"
63
63
  },
64
64
  "devDependencies": {
65
- "@macrostrat/web-components-bundler": "1.0.1"
65
+ "@macrostrat/web-components-bundler": "1.0.1",
66
+ "@storybook/react-vite": "*"
66
67
  },
67
68
  "publishConfig": {
68
69
  "access": "public"
@@ -1,14 +1,11 @@
1
1
  import { RegionCardinality } from "@blueprintjs/table";
2
2
  import type { TableAction } from "./types";
3
- import { copyAction, pasteAction, clipboardActions } from "./clipboard";
4
-
5
- export { copyAction, pasteAction, clipboardActions };
6
3
 
7
4
  /** Delete all rows in the current selection. Disabled when the data provider
8
5
  * can't delete (no `deleteRows`). */
9
6
  export const deleteRowsAction: TableAction = {
10
7
  id: "delete-rows",
11
- name: "Delete rows",
8
+ name: "Delete",
12
9
  icon: "trash",
13
10
  intent: "danger",
14
11
  targets: [RegionCardinality.FULL_ROWS],
@@ -1,6 +1,7 @@
1
1
  import { RegionCardinality } from "@blueprintjs/table";
2
- import type { TableAction, TableActionContext, CellEdit } from "./types";
3
- import type { ClipboardProxy } from "../types.ts";
2
+ import type { TableAction } from "./types";
3
+ import type { CellEdit, ClipboardProxy } from "../provider/types.ts";
4
+ import { TableActionContext } from "./context.ts";
4
5
 
5
6
  /** Serialize the current selection to tab-separated values.
6
7
  * For full-row/column copies, includes a header row and produces
@@ -230,7 +231,7 @@ function buildPasteEdits(
230
231
  const value = row[srcC] ?? "";
231
232
  edits.push({
232
233
  rowIndex: dataRow,
233
- columnKey: ctx.columnSpec[colIdx].key,
234
+ column: ctx.columnSpec[colIdx].key,
234
235
  value,
235
236
  });
236
237
  }