@macrostrat/data-sheet 4.1.1 → 4.2.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.
- package/CHANGELOG.md +46 -0
- package/dist/actions/builtin.cjs +1 -1
- package/dist/actions/builtin.cjs.map +1 -1
- package/dist/actions/builtin.d.ts +0 -2
- package/dist/actions/builtin.js +1 -1
- package/dist/actions/builtin.js.map +1 -1
- package/dist/actions/clipboard.cjs +1 -1
- package/dist/actions/clipboard.cjs.map +1 -1
- package/dist/actions/clipboard.d.ts +3 -2
- package/dist/actions/clipboard.js +1 -1
- package/dist/actions/clipboard.js.map +1 -1
- package/dist/actions/column-controls.cjs +7 -196
- package/dist/actions/column-controls.cjs.map +1 -1
- package/dist/actions/column-controls.d.ts +1 -1
- package/dist/actions/column-controls.js +5 -194
- package/dist/actions/column-controls.js.map +1 -1
- package/dist/actions/column-filter.cjs +24 -73
- package/dist/actions/column-filter.cjs.map +1 -1
- package/dist/actions/column-filter.d.ts +6 -4
- package/dist/actions/column-filter.js +25 -74
- package/dist/actions/column-filter.js.map +1 -1
- package/dist/actions/context.cjs +147 -0
- package/dist/actions/context.cjs.map +1 -0
- package/dist/actions/context.d.ts +93 -0
- package/dist/actions/context.js +145 -0
- package/dist/actions/context.js.map +1 -0
- package/dist/actions/edit-actions.cjs.map +1 -1
- package/dist/actions/edit-actions.d.ts +3 -1
- package/dist/actions/edit-actions.js.map +1 -1
- package/dist/actions/index.d.ts +2 -3
- package/dist/actions/selection.cjs +70 -115
- package/dist/actions/selection.cjs.map +1 -1
- package/dist/actions/selection.d.ts +22 -12
- package/dist/actions/selection.js +71 -114
- package/dist/actions/selection.js.map +1 -1
- package/dist/actions/table-actions.cjs +41 -0
- package/dist/actions/table-actions.cjs.map +1 -0
- package/dist/actions/{table-controls.d.ts → table-actions.d.ts} +0 -4
- package/dist/actions/{table-controls.js → table-actions.js} +2 -23
- package/dist/actions/table-actions.js.map +1 -0
- package/dist/actions/types.d.ts +11 -89
- package/dist/components/cell-detail.cjs +6 -6
- package/dist/components/cell-detail.cjs.map +1 -1
- package/dist/components/cell-detail.js +1 -1
- package/dist/components/colors.cjs.map +1 -1
- package/dist/components/colors.js.map +1 -1
- package/dist/components/editor-popup.cjs +7 -7
- package/dist/components/editor-popup.cjs.map +1 -1
- package/dist/components/editor-popup.js +1 -1
- package/dist/components/index.d.ts +2 -1
- package/dist/components/indicators/filter-and-sort.cjs +378 -0
- package/dist/components/indicators/filter-and-sort.cjs.map +1 -0
- package/dist/components/indicators/filter-and-sort.d.ts +59 -0
- package/dist/components/indicators/filter-and-sort.js +376 -0
- package/dist/components/indicators/filter-and-sort.js.map +1 -0
- package/dist/components/indicators/filter-and-sort.module.sass.cjs +16 -0
- package/dist/components/indicators/filter-and-sort.module.sass.cjs.map +1 -0
- package/dist/components/indicators/filter-and-sort.module.sass.js +14 -0
- package/dist/components/indicators/filter-and-sort.module.sass.js.map +1 -0
- package/dist/components/indicators/index.d.ts +4 -0
- package/dist/components/indicators/selection.cjs +113 -0
- package/dist/components/indicators/selection.cjs.map +1 -0
- package/dist/components/indicators/selection.d.ts +3 -0
- package/dist/components/indicators/selection.js +111 -0
- package/dist/components/indicators/selection.js.map +1 -0
- package/dist/components/indicators/selection.module.sass.cjs +19 -0
- package/dist/components/indicators/selection.module.sass.cjs.map +1 -0
- package/dist/components/indicators/selection.module.sass.js +17 -0
- package/dist/components/indicators/selection.module.sass.js.map +1 -0
- package/dist/components/indicators/unified-filters.cjs +130 -0
- package/dist/components/indicators/unified-filters.cjs.map +1 -0
- package/dist/components/indicators/unified-filters.d.ts +10 -0
- package/dist/components/indicators/unified-filters.js +130 -0
- package/dist/components/indicators/unified-filters.js.map +1 -0
- package/dist/components/indicators/view-info.cjs +59 -0
- package/dist/components/indicators/view-info.cjs.map +1 -0
- package/dist/components/indicators/view-info.d.ts +11 -0
- package/dist/components/{view-info.js → indicators/view-info.js} +20 -16
- package/dist/components/indicators/view-info.js.map +1 -0
- package/dist/components/text-areas.cjs +5 -5
- package/dist/components/text-areas.cjs.map +1 -1
- package/dist/components/text-areas.js +1 -1
- package/dist/components/toolbars/actions-toolbar.cjs +185 -0
- package/dist/components/toolbars/actions-toolbar.cjs.map +1 -0
- package/dist/{actions/toolbar.d.ts → components/toolbars/actions-toolbar.d.ts} +9 -5
- package/dist/{actions/toolbar.js → components/toolbars/actions-toolbar.js} +37 -112
- package/dist/components/toolbars/actions-toolbar.js.map +1 -0
- package/dist/components/toolbars/actions-toolbar.module.sass.cjs +29 -0
- package/dist/components/toolbars/actions-toolbar.module.sass.cjs.map +1 -0
- package/dist/components/toolbars/actions-toolbar.module.sass.js +27 -0
- package/dist/components/toolbars/actions-toolbar.module.sass.js.map +1 -0
- package/dist/components/toolbars/active-filters.cjs +120 -0
- package/dist/components/toolbars/active-filters.cjs.map +1 -0
- package/dist/{actions/filters.d.ts → components/toolbars/active-filters.d.ts} +3 -3
- package/dist/components/toolbars/active-filters.js +120 -0
- package/dist/components/toolbars/active-filters.js.map +1 -0
- package/dist/components/toolbars/index.d.ts +2 -0
- package/dist/data-panel.cjs +291 -0
- package/dist/data-panel.cjs.map +1 -0
- package/dist/data-panel.d.ts +110 -0
- package/dist/data-panel.js +289 -0
- package/dist/data-panel.js.map +1 -0
- package/dist/data-panel.module.sass.cjs +40 -0
- package/dist/data-panel.module.sass.cjs.map +1 -0
- package/dist/data-panel.module.sass.js +38 -0
- package/dist/data-panel.module.sass.js.map +1 -0
- package/dist/{core.cjs → data-sheet.cjs} +126 -188
- package/dist/data-sheet.cjs.map +1 -0
- package/dist/data-sheet.css +241 -13
- package/dist/data-sheet.d.ts +16 -0
- package/dist/{core.js → data-sheet.js} +95 -157
- package/dist/data-sheet.js.map +1 -0
- package/dist/data-view.cjs +47 -0
- package/dist/data-view.cjs.map +1 -0
- package/dist/data-view.d.ts +15 -0
- package/dist/data-view.js +45 -0
- package/dist/data-view.js.map +1 -0
- package/dist/filters/operators.cjs +19 -2
- package/dist/filters/operators.cjs.map +1 -1
- package/dist/filters/operators.d.ts +4 -3
- package/dist/filters/operators.js +19 -2
- package/dist/filters/operators.js.map +1 -1
- package/dist/index.cjs +106 -47
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.ts +4 -3
- package/dist/index.js +76 -17
- package/dist/index.js.map +1 -1
- package/dist/notifications.cjs +4 -4
- package/dist/notifications.cjs.map +1 -1
- package/dist/notifications.js +1 -1
- package/dist/postgrest-table/data-loaders.cjs +128 -95
- package/dist/postgrest-table/data-loaders.cjs.map +1 -1
- package/dist/postgrest-table/data-loaders.d.ts +52 -82
- package/dist/postgrest-table/data-loaders.js +109 -76
- package/dist/postgrest-table/data-loaders.js.map +1 -1
- package/dist/postgrest-table/index.cjs +18 -17
- package/dist/postgrest-table/index.cjs.map +1 -1
- package/dist/postgrest-table/index.d.ts +4 -3
- package/dist/postgrest-table/index.js +9 -8
- package/dist/postgrest-table/index.js.map +1 -1
- package/dist/{utils → provider}/column-spec.cjs +23 -9
- package/dist/provider/column-spec.cjs.map +1 -0
- package/dist/{utils → provider}/column-spec.d.ts +73 -2
- package/dist/{utils → provider}/column-spec.js +24 -10
- package/dist/provider/column-spec.js.map +1 -0
- package/dist/provider/core.cjs +382 -0
- package/dist/provider/core.cjs.map +1 -0
- package/dist/provider/core.d.ts +74 -0
- package/dist/provider/core.js +380 -0
- package/dist/provider/core.js.map +1 -0
- package/dist/provider/index.d.ts +7 -0
- package/dist/provider/interactions.cjs +128 -0
- package/dist/provider/interactions.cjs.map +1 -0
- package/dist/provider/interactions.d.ts +39 -0
- package/dist/provider/interactions.js +128 -0
- package/dist/provider/interactions.js.map +1 -0
- package/dist/provider/selection.cjs +29 -0
- package/dist/provider/selection.cjs.map +1 -0
- package/dist/provider/selection.d.ts +9 -0
- package/dist/provider/selection.js +29 -0
- package/dist/provider/selection.js.map +1 -0
- package/dist/provider/table-data.cjs +92 -0
- package/dist/provider/table-data.cjs.map +1 -0
- package/dist/provider/table-data.d.ts +81 -0
- package/dist/provider/table-data.js +92 -0
- package/dist/provider/table-data.js.map +1 -0
- package/dist/provider/types.cjs +22 -0
- package/dist/provider/types.cjs.map +1 -0
- package/dist/provider/types.d.ts +256 -0
- package/dist/provider/types.js +22 -0
- package/dist/provider/types.js.map +1 -0
- package/dist/{zustand-store.cjs → provider/zustand-store.cjs} +36 -23
- package/dist/provider/zustand-store.cjs.map +1 -0
- package/dist/{zustand-store.js → provider/zustand-store.js} +21 -8
- package/dist/provider/zustand-store.js.map +1 -0
- package/dist/{cell-renderer.cjs → renderers/cell-renderer.cjs} +67 -34
- package/dist/renderers/cell-renderer.cjs.map +1 -0
- package/dist/{cell-renderer.d.ts → renderers/cell-renderer.d.ts} +1 -2
- package/dist/{cell-renderer.js → renderers/cell-renderer.js} +65 -32
- package/dist/renderers/cell-renderer.js.map +1 -0
- package/dist/renderers/column-header-cell.cjs +21 -13
- package/dist/renderers/column-header-cell.cjs.map +1 -1
- package/dist/renderers/column-header-cell.d.ts +3 -2
- package/dist/renderers/column-header-cell.js +20 -12
- package/dist/renderers/column-header-cell.js.map +1 -1
- package/dist/renderers/index.d.ts +1 -0
- package/dist/types.cjs +7 -19
- package/dist/types.cjs.map +1 -1
- package/dist/types.d.ts +117 -229
- package/dist/types.js +7 -19
- package/dist/types.js.map +1 -1
- package/dist/utils/atoms.cjs +24 -0
- package/dist/utils/atoms.cjs.map +1 -0
- package/dist/utils/atoms.d.ts +4 -0
- package/dist/utils/atoms.js +24 -0
- package/dist/utils/atoms.js.map +1 -0
- package/dist/utils/debug-overlay.cjs.map +1 -1
- package/dist/utils/debug-overlay.js.map +1 -1
- package/dist/utils/index.d.ts +2 -3
- package/dist/utils/key-handling.cjs +140 -139
- package/dist/utils/key-handling.cjs.map +1 -1
- package/dist/utils/key-handling.d.ts +4 -2
- package/dist/utils/key-handling.js +136 -135
- package/dist/utils/key-handling.js.map +1 -1
- package/dist/utils/validation.cjs +6 -1
- package/dist/utils/validation.cjs.map +1 -1
- package/dist/utils/validation.d.ts +1 -1
- package/dist/utils/validation.js +6 -1
- package/dist/utils/validation.js.map +1 -1
- package/package.json +4 -3
- package/src/actions/builtin.ts +1 -4
- package/src/actions/clipboard.ts +4 -3
- package/src/actions/column-controls.ts +12 -245
- package/src/actions/column-filter.ts +28 -92
- package/src/actions/context.ts +299 -0
- package/src/actions/edit-actions.ts +3 -1
- package/src/actions/index.ts +2 -3
- package/src/actions/selection.ts +109 -156
- package/src/actions/{table-controls.ts → table-actions.ts} +0 -24
- package/src/actions/types.ts +17 -101
- package/src/components/colors.ts +1 -1
- package/src/components/index.ts +2 -1
- package/src/components/indicators/filter-and-sort.module.sass +13 -0
- package/src/components/indicators/filter-and-sort.ts +478 -0
- package/src/components/indicators/index.ts +4 -0
- package/src/components/indicators/selection.module.sass +22 -0
- package/src/components/indicators/selection.ts +141 -0
- package/src/components/indicators/unified-filters.ts +161 -0
- package/src/components/{view-info.ts → indicators/view-info.ts} +19 -30
- package/src/{actions/toolbar.module.sass → components/toolbars/actions-toolbar.module.sass} +17 -4
- package/src/{actions/toolbar.ts → components/toolbars/actions-toolbar.ts} +49 -150
- package/src/components/toolbars/active-filters.ts +150 -0
- package/src/components/toolbars/index.ts +2 -0
- package/src/data-panel.module.sass +185 -0
- package/src/data-panel.ts +556 -0
- package/src/{core.ts → data-sheet.ts} +156 -327
- package/src/data-view.ts +70 -0
- package/src/filters/operators.ts +33 -3
- package/src/index.ts +4 -3
- package/src/postgrest-table/data-loaders.ts +244 -171
- package/src/postgrest-table/index.ts +10 -9
- package/src/{utils → provider}/column-spec.ts +30 -15
- package/src/provider/core.ts +585 -0
- package/src/provider/index.ts +7 -0
- package/src/provider/interactions.ts +161 -0
- package/src/provider/selection.ts +31 -0
- package/src/provider/table-data.ts +178 -0
- package/src/provider/types.ts +273 -0
- package/src/{zustand-store.ts → provider/zustand-store.ts} +35 -14
- package/src/{cell-renderer.ts → renderers/cell-renderer.ts} +140 -57
- package/src/renderers/column-header-cell.ts +21 -14
- package/src/renderers/index.ts +1 -0
- package/src/types.ts +137 -239
- package/src/utils/atoms.ts +28 -0
- package/src/utils/debug-overlay.ts +1 -1
- package/src/utils/index.ts +2 -8
- package/src/utils/key-handling.ts +170 -164
- package/src/utils/validation.ts +7 -2
- package/dist/actions/filters.cjs +0 -139
- package/dist/actions/filters.cjs.map +0 -1
- package/dist/actions/filters.js +0 -139
- package/dist/actions/filters.js.map +0 -1
- package/dist/actions/table-controls.cjs +0 -62
- package/dist/actions/table-controls.cjs.map +0 -1
- package/dist/actions/table-controls.js.map +0 -1
- package/dist/actions/toolbar.cjs +0 -260
- package/dist/actions/toolbar.cjs.map +0 -1
- package/dist/actions/toolbar.js.map +0 -1
- package/dist/actions/toolbar.module.sass.cjs +0 -27
- package/dist/actions/toolbar.module.sass.cjs.map +0 -1
- package/dist/actions/toolbar.module.sass.js +0 -25
- package/dist/actions/toolbar.module.sass.js.map +0 -1
- package/dist/cell-renderer.cjs.map +0 -1
- package/dist/cell-renderer.js.map +0 -1
- package/dist/components/view-info.cjs +0 -55
- package/dist/components/view-info.cjs.map +0 -1
- package/dist/components/view-info.d.ts +0 -5
- package/dist/components/view-info.js.map +0 -1
- package/dist/core.cjs.map +0 -1
- package/dist/core.d.ts +0 -117
- package/dist/core.js.map +0 -1
- package/dist/provider.cjs +0 -197
- package/dist/provider.cjs.map +0 -1
- package/dist/provider.d.ts +0 -26
- package/dist/provider.js +0 -195
- package/dist/provider.js.map +0 -1
- package/dist/table-updates/data-parameter.d.ts +0 -14
- package/dist/table-updates/filter.d.ts +0 -16
- package/dist/table-updates/index.d.ts +0 -19
- package/dist/utils/column-spec.cjs.map +0 -1
- package/dist/utils/column-spec.js.map +0 -1
- package/dist/utils/index.cjs +0 -9
- package/dist/utils/index.cjs.map +0 -1
- package/dist/utils/index.js +0 -9
- package/dist/utils/index.js.map +0 -1
- package/dist/zustand-store.cjs.map +0 -1
- package/dist/zustand-store.js.map +0 -1
- package/src/actions/filters.ts +0 -176
- package/src/components/actions.module.sass +0 -8
- package/src/provider.ts +0 -267
- package/src/table-updates/data-parameter.ts +0 -44
- package/src/table-updates/filter.ts +0 -124
- package/src/table-updates/index.ts +0 -239
- /package/dist/{zustand-store.d.ts → provider/zustand-store.d.ts} +0 -0
|
@@ -1,189 +1,78 @@
|
|
|
1
1
|
import { useHotkeys } from "@blueprintjs/core";
|
|
2
2
|
import {
|
|
3
3
|
Column,
|
|
4
|
-
Region,
|
|
5
4
|
RegionCardinality,
|
|
6
5
|
RowHeaderCell,
|
|
7
6
|
Table,
|
|
8
|
-
TableProps,
|
|
9
7
|
} from "@blueprintjs/table";
|
|
10
8
|
import "@blueprintjs/table/lib/css/table.css";
|
|
11
|
-
import {
|
|
12
|
-
|
|
13
|
-
|
|
9
|
+
import {
|
|
10
|
+
CSSProperties,
|
|
11
|
+
ReactNode,
|
|
12
|
+
useCallback,
|
|
13
|
+
useEffect,
|
|
14
|
+
useMemo,
|
|
15
|
+
useRef,
|
|
16
|
+
} from "react";
|
|
17
|
+
import {
|
|
18
|
+
LoadProgressIndicator,
|
|
19
|
+
ActionsToolbar,
|
|
20
|
+
ActiveFiltersList,
|
|
21
|
+
} from "./components";
|
|
22
|
+
import { basicCellRenderer, renderColumnHeaderCell } from "./renderers";
|
|
14
23
|
import h from "./main.module.sass";
|
|
15
24
|
import {
|
|
16
25
|
columnSpecAtom,
|
|
17
26
|
ctx,
|
|
27
|
+
dataProviderAtom,
|
|
28
|
+
dataRefreshTokenAtom,
|
|
18
29
|
DataSheetProvider,
|
|
30
|
+
DataViewRendererType,
|
|
31
|
+
DEFAULT_ROW_STATUS_STYLES,
|
|
32
|
+
FetchData,
|
|
33
|
+
persistViaProvider,
|
|
34
|
+
RowStatusStyles,
|
|
35
|
+
splitDataProviderProps,
|
|
19
36
|
storeAtom,
|
|
20
37
|
tableActionsAtom,
|
|
38
|
+
TableElementStatus,
|
|
21
39
|
useSelector,
|
|
22
40
|
useStoreAPI,
|
|
41
|
+
VisibleCells,
|
|
23
42
|
} from "./provider";
|
|
24
43
|
import { atom } from "jotai";
|
|
44
|
+
import { CellRendererDebugOverlay, tableHotkeysAtom } from "./utils";
|
|
25
45
|
import {
|
|
26
|
-
DataSheetProviderProps,
|
|
27
|
-
DEFAULT_ROW_STATUS_STYLES,
|
|
28
|
-
EditEvent,
|
|
29
|
-
RowHeaderRenderContext,
|
|
30
|
-
RowStatusStyles,
|
|
31
|
-
TableElementStatus,
|
|
32
|
-
VisibleCells,
|
|
33
|
-
} from "./types.ts";
|
|
34
|
-
import { basicCellRenderer } from "./cell-renderer.ts";
|
|
35
|
-
import {
|
|
36
|
-
CellRendererDebugOverlay,
|
|
37
|
-
tableHotkeysAtom,
|
|
38
|
-
type ColumnSpec,
|
|
39
|
-
} from "./utils";
|
|
40
|
-
import {
|
|
41
|
-
ActionsToolbar,
|
|
42
46
|
clipboardActions,
|
|
43
47
|
columnControlActions,
|
|
44
48
|
createSaveAction,
|
|
45
|
-
FilterBar,
|
|
46
49
|
resetChangesAction,
|
|
47
50
|
TableAction,
|
|
48
51
|
TableActionContext,
|
|
49
|
-
TableFilter,
|
|
50
52
|
} from "./actions";
|
|
51
53
|
import {
|
|
52
|
-
createLocalProvider,
|
|
53
|
-
dataRefreshTokenAtom,
|
|
54
|
-
FetchData,
|
|
55
|
-
FetchDataOptions,
|
|
56
54
|
tableFooterAtom,
|
|
57
|
-
TableDataProvider,
|
|
58
|
-
useScrollHandler,
|
|
59
55
|
useDataLoader,
|
|
56
|
+
useScrollHandler,
|
|
60
57
|
} from "./postgrest-table";
|
|
58
|
+
import {
|
|
59
|
+
CellInteraction,
|
|
60
|
+
DataSheetDensity,
|
|
61
|
+
DataSheetProps,
|
|
62
|
+
DataSheetRendererProps,
|
|
63
|
+
FetchDataOptions,
|
|
64
|
+
} from "./types.ts";
|
|
65
|
+
import { ErrorCallout } from "@macrostrat/ui-components";
|
|
61
66
|
|
|
62
67
|
// More on component templates: https://storybook.js.org/docs/react/writing-stories/introduction#using-args
|
|
63
68
|
|
|
64
69
|
// TODO: add a "copy to selection" tool (the little square in the bottom right corner of a cell)
|
|
65
70
|
// This should copy the value of a cell (or a set of cells in the same row) downwards.
|
|
66
71
|
|
|
67
|
-
export enum DataSheetDensity {
|
|
68
|
-
HIGH = "high",
|
|
69
|
-
MEDIUM = "medium",
|
|
70
|
-
LOW = "low",
|
|
71
|
-
}
|
|
72
|
-
|
|
73
72
|
/** Approximate column-header + scrollbar allowance, used to size the table to
|
|
74
73
|
* its content in paged mode. */
|
|
75
74
|
const COLUMN_HEADER_HEIGHT = 34;
|
|
76
75
|
|
|
77
|
-
/**
|
|
78
|
-
* How selecting a cell activates its surface (an editor, or a read-only detail
|
|
79
|
-
* panel):
|
|
80
|
-
* - `"auto"` (default when `autoFocusEditor` is `true`): open the surface on
|
|
81
|
-
* selection and, for editors, focus it. Editors relinquish focus at their
|
|
82
|
-
* edges — arrow past the start/end of a text cell, or press Escape, and focus
|
|
83
|
-
* returns to the table — so the keyboard stays operable without the mouse.
|
|
84
|
-
* Pressing Escape drops into navigation mode (surfaces stop auto-opening)
|
|
85
|
-
* until the next click.
|
|
86
|
-
* - `"manual"` (default when `autoFocusEditor` is `false`): the surface stays
|
|
87
|
-
* closed until the cell is clicked; arrow keys always navigate the table.
|
|
88
|
-
*/
|
|
89
|
-
export type CellInteraction = "auto" | "manual";
|
|
90
|
-
|
|
91
|
-
interface DataSheetInternalProps<T> extends TableProps, FetchDataOptions {
|
|
92
|
-
/** In-memory rows. Internally wrapped in a local `TableDataProvider` and
|
|
93
|
-
* driven through the same loader as any other source. */
|
|
94
|
-
data?: T[];
|
|
95
|
-
/** Passed through from the public props so a function form can be derived
|
|
96
|
-
* from the loaded rows here (a static array is handled by the provider). */
|
|
97
|
-
columnSpec?: ColumnSpec[] | ((rows: T[]) => ColumnSpec[]);
|
|
98
|
-
// function to fetch a chunk of data (the read side of a data provider)
|
|
99
|
-
fetchData?: FetchData<T>;
|
|
100
|
-
/** A data provider instantiated separately and passed in — bundles the read
|
|
101
|
-
* side (`fetchData` + `identity`) and, optionally, the persistence side
|
|
102
|
-
* (`saveRows` / `deleteRows` / `insertRow`) that drives the Save action. An
|
|
103
|
-
* explicit alternative to the loose `data` / `fetchData` / `identity` props;
|
|
104
|
-
* takes precedence when given. */
|
|
105
|
-
provider?: TableDataProvider<T>;
|
|
106
|
-
// An optional table name that will be used in toolbars if given
|
|
107
|
-
name?: string;
|
|
108
|
-
onVisibleCellsChange?: (visibleCells: VisibleCells) => void;
|
|
109
|
-
onUpdateData?: (updatedData: any[], data: T[]) => void;
|
|
110
|
-
/** Observer called for every user edit as a structured `EditEvent`
|
|
111
|
-
* (Workstream A). Additive: the built-in `updatedData` overlay still
|
|
112
|
-
* applies. */
|
|
113
|
-
onEdit?: (event: EditEvent<T>) => void;
|
|
114
|
-
/** Controlled edited-cell overlay (Workstream A). When provided, it is
|
|
115
|
-
* synced into the store as the source of truth for edited values — pair with
|
|
116
|
-
* `onEdit` to own edit state externally (e.g. an ops model). Optimistic
|
|
117
|
-
* in-table edits are superseded by the next value you pass back. */
|
|
118
|
-
updatedData?: T[];
|
|
119
|
-
/** Controlled row-status overlay (edited / added / deleted), the companion
|
|
120
|
-
* to `updatedData`. */
|
|
121
|
-
rowStatus?: TableElementStatus[];
|
|
122
|
-
/** Row identity for the edit overlay — stable across a provider re-sort (a
|
|
123
|
-
* data provider supplies its own; defaults to `(row) => row?.id`). Lets edits
|
|
124
|
-
* survive a re-ordered re-fetch. */
|
|
125
|
-
identity?: (row: T) => string | number | null | undefined;
|
|
126
|
-
/** Derive the controlled edit overlay from the loaded rows, *inside* the
|
|
127
|
-
* sheet. For provider-backed tables whose overlay is a function of the loaded
|
|
128
|
-
* data plus external edit state (e.g. an ops stack): the library owns the
|
|
129
|
-
* rows, so it calls this with them and uses the result as the controlled
|
|
130
|
-
* overlay, re-deriving when the rows — or this function's identity (close it
|
|
131
|
-
* over your edit state) — change. Supersedes `updatedData`/`rowStatus`. */
|
|
132
|
-
deriveOverlay?: (rows: T[]) => {
|
|
133
|
-
updatedData: T[];
|
|
134
|
-
rowStatus: TableElementStatus[];
|
|
135
|
-
};
|
|
136
|
-
/** Bump to force the data provider to re-fetch from scratch (e.g. after a
|
|
137
|
-
* save/delete that invalidated the loaded rows). */
|
|
138
|
-
refreshToken?: number | string;
|
|
139
|
-
/** Persistence handler for the built-in Save action. When provided, a Save
|
|
140
|
-
* control is added to the toolbar (always visible, disabled when there are
|
|
141
|
-
* no pending changes). */
|
|
142
|
-
onSave?: (ctx: TableActionContext<T>) => void | Promise<void>;
|
|
143
|
-
onDeleteRows?: (selection: Region[]) => void;
|
|
144
|
-
verbose?: boolean;
|
|
145
|
-
enableColumnReordering?: boolean;
|
|
146
|
-
enableClipboard?: boolean;
|
|
147
|
-
enableFocusedCell?: boolean;
|
|
148
|
-
editable?: boolean;
|
|
149
|
-
/** @deprecated Prefer `cellInteraction`. `true` maps to `"auto"`,
|
|
150
|
-
* `false` to `"manual"`. */
|
|
151
|
-
autoFocusEditor?: boolean;
|
|
152
|
-
/** How selecting a cell activates its surface (editor or detail panel).
|
|
153
|
-
* Defaults from `autoFocusEditor` for backward compatibility. */
|
|
154
|
-
cellInteraction?: CellInteraction;
|
|
155
|
-
density?: DataSheetDensity;
|
|
156
|
-
/** Configurable table actions shown in a selection-aware toolbar.
|
|
157
|
-
* When provided, the actions toolbar renders alongside the existing
|
|
158
|
-
* edit toolbar. Actions are filtered by the current selection cardinality. */
|
|
159
|
-
actions?: TableAction<T>[];
|
|
160
|
-
/** Available column/table filters shown in a filter bar.
|
|
161
|
-
* Filters can also be defined per-column via `ColumnSpec.filters`. */
|
|
162
|
-
filters?: TableFilter<T>[];
|
|
163
|
-
/** Optional custom column header cell renderer, called for each column.
|
|
164
|
-
* Receives the ColumnSpec and column index; should return a React element
|
|
165
|
-
* (typically a Blueprint ColumnHeaderCell). */
|
|
166
|
-
columnHeaderCellRenderer?: (col: any, colIndex: number) => ReactNode;
|
|
167
|
-
/** Arbitrary nodes for the bottom status bar (left group), rendered beside
|
|
168
|
-
* the active sort/filter tags — the home for view-state controls (show/hide
|
|
169
|
-
* omitted rows/columns, a group-by indicator, etc.). */
|
|
170
|
-
statusBar?: ReactNode;
|
|
171
|
-
/** Presentation per row-status value, merged over the built-in defaults
|
|
172
|
-
* (which style `"deleted"`). Supply styles for consumer-defined statuses
|
|
173
|
-
* (e.g. `"omitted"`) and/or override the defaults. Each entry may set the
|
|
174
|
-
* cells' style/intent and the row header's style. */
|
|
175
|
-
rowStatusStyles?: RowStatusStyles;
|
|
176
|
-
/** Render the content of a row's header cell (the left gutter). Receives the
|
|
177
|
-
* row, its status, and the default 1-based label; return a node to use, or a
|
|
178
|
-
* nullish value to keep the default. For group-key labels, omit indicators,
|
|
179
|
-
* etc. Header-cell *styling* still comes from `rowStatusStyles`. */
|
|
180
|
-
rowHeaderRenderer?: (ctx: RowHeaderRenderContext<T>) => ReactNode;
|
|
181
|
-
}
|
|
182
|
-
|
|
183
|
-
type DataSheetProps<T> = DataSheetProviderProps<T> & DataSheetInternalProps<T>;
|
|
184
|
-
|
|
185
|
-
const emptyData: any[] = [];
|
|
186
|
-
|
|
187
76
|
export function DataSheet<T>(props: DataSheetProps<T>) {
|
|
188
77
|
const {
|
|
189
78
|
data,
|
|
@@ -194,75 +83,27 @@ export function DataSheet<T>(props: DataSheetProps<T>) {
|
|
|
194
83
|
enableFocusedCell = false,
|
|
195
84
|
defaultColumnWidth = 150,
|
|
196
85
|
children,
|
|
86
|
+
name,
|
|
197
87
|
...rest
|
|
198
88
|
} = props;
|
|
199
89
|
|
|
90
|
+
const [providerProps, rendererProps] = splitDataProviderProps<T>({
|
|
91
|
+
...props,
|
|
92
|
+
viewType: DataViewRendererType.TABLE,
|
|
93
|
+
});
|
|
200
94
|
return h(
|
|
201
95
|
DataSheetProvider<T>,
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
columnSpec,
|
|
205
|
-
columnSpecOptions,
|
|
206
|
-
enableColumnReordering,
|
|
207
|
-
defaultColumnWidth,
|
|
208
|
-
editable,
|
|
209
|
-
...rest,
|
|
210
|
-
},
|
|
211
|
-
h(_DataSheet<any>, {
|
|
212
|
-
...rest,
|
|
213
|
-
data: data ?? emptyData,
|
|
214
|
-
columnSpec,
|
|
215
|
-
children,
|
|
216
|
-
editable,
|
|
217
|
-
enableColumnReordering,
|
|
218
|
-
enableFocusedCell,
|
|
219
|
-
}),
|
|
96
|
+
providerProps,
|
|
97
|
+
h(DataSheetRenderer<any>, rendererProps),
|
|
220
98
|
);
|
|
221
99
|
}
|
|
222
100
|
|
|
223
|
-
|
|
224
|
-
* `insertRow`, edited rows via `saveRows`, deleted rows via `deleteRows`
|
|
225
|
-
* (addressed by `provider.identity`). Used by the built-in Save action when an
|
|
226
|
-
* explicit provider owns persistence. */
|
|
227
|
-
async function persistViaProvider<T>(
|
|
228
|
-
provider: TableDataProvider<T>,
|
|
229
|
-
ctx: TableActionContext<T>,
|
|
230
|
-
): Promise<void> {
|
|
231
|
-
const base = (ctx.data ?? []) as any[];
|
|
232
|
-
const updates = (ctx.updatedData ?? []) as any[];
|
|
233
|
-
const status = (ctx.rowStatus ?? []) as any[];
|
|
234
|
-
const n = Math.max(base.length, updates.length, status.length);
|
|
235
|
-
const toSave: T[] = [];
|
|
236
|
-
const toInsert: T[] = [];
|
|
237
|
-
const toDelete: Array<string | number> = [];
|
|
238
|
-
for (let i = 0; i < n; i++) {
|
|
239
|
-
if (status[i] === TableElementStatus.DELETED) {
|
|
240
|
-
const id = provider.identity(base[i]);
|
|
241
|
-
if (id != null) toDelete.push(id);
|
|
242
|
-
continue;
|
|
243
|
-
}
|
|
244
|
-
const upd = updates[i];
|
|
245
|
-
const hasEdit =
|
|
246
|
-
upd != null && typeof upd === "object" && Object.keys(upd).length > 0;
|
|
247
|
-
if (status[i] === TableElementStatus.ADDED) {
|
|
248
|
-
toInsert.push({ ...base[i], ...upd } as T);
|
|
249
|
-
} else if (hasEdit) {
|
|
250
|
-
toSave.push({ ...base[i], ...upd } as T);
|
|
251
|
-
}
|
|
252
|
-
}
|
|
253
|
-
if (toDelete.length > 0 && provider.deleteRows != null) {
|
|
254
|
-
await provider.deleteRows(toDelete);
|
|
255
|
-
}
|
|
256
|
-
for (const row of toInsert) {
|
|
257
|
-
if (provider.insertRow != null) await provider.insertRow(row);
|
|
258
|
-
}
|
|
259
|
-
if (toSave.length > 0 && provider.saveRows != null) {
|
|
260
|
-
await provider.saveRows(toSave);
|
|
261
|
-
}
|
|
262
|
-
}
|
|
101
|
+
const verboseAtom = atom(false);
|
|
263
102
|
|
|
264
|
-
|
|
265
|
-
|
|
103
|
+
/** The table (cell-grid) renderer. Assumes it is rendered inside a
|
|
104
|
+
* `DataSheetProvider` (the `DataSheet` wrapper, or `DataView`). Exported so a
|
|
105
|
+
* shared-store `DataView` can mount it directly alongside `_DataPanel`. */
|
|
106
|
+
export function DataSheetRenderer<T>({
|
|
266
107
|
fetchData,
|
|
267
108
|
provider,
|
|
268
109
|
pageSize,
|
|
@@ -273,12 +114,16 @@ function _DataSheet<T>({
|
|
|
273
114
|
onSave,
|
|
274
115
|
updatedData: updatedDataProp,
|
|
275
116
|
rowStatus: rowStatusProp,
|
|
276
|
-
|
|
117
|
+
// Identity/canDeleteRows sync (was here) is now handled by the provider
|
|
118
|
+
// (`DataSheetProviderInner`); still destructured so `identity`/`refreshToken`
|
|
119
|
+
// don't leak into `...rest` (spread onto the Blueprint `Table` below).
|
|
120
|
+
identity: _identity,
|
|
277
121
|
deriveOverlay,
|
|
278
|
-
refreshToken,
|
|
122
|
+
refreshToken: _refreshToken,
|
|
279
123
|
onDeleteRows,
|
|
280
124
|
name,
|
|
281
125
|
verbose = false,
|
|
126
|
+
debug = false,
|
|
282
127
|
enableFocusedCell,
|
|
283
128
|
autoFocusEditor = true,
|
|
284
129
|
cellInteraction,
|
|
@@ -288,43 +133,29 @@ function _DataSheet<T>({
|
|
|
288
133
|
actions,
|
|
289
134
|
filters,
|
|
290
135
|
columnHeaderCellRenderer,
|
|
291
|
-
columnSpec: columnSpecProp,
|
|
292
136
|
statusBar,
|
|
293
137
|
rowStatusStyles,
|
|
294
138
|
rowHeaderRenderer,
|
|
295
139
|
children,
|
|
296
|
-
...
|
|
297
|
-
}:
|
|
140
|
+
...tableProps
|
|
141
|
+
}: DataSheetRendererProps<T>) {
|
|
298
142
|
/**
|
|
299
143
|
* @param data: The data to be displayed in the table
|
|
300
144
|
* @param columnSpec: The specification for all columns in the table. If not provided, the column spec will be generated from the data.
|
|
301
145
|
* @param columnSpecOptions: Options for generating a column spec from data
|
|
302
146
|
*/
|
|
303
147
|
|
|
304
|
-
|
|
305
|
-
const debugMode = false;
|
|
148
|
+
ctx.useSync(verboseAtom, verbose);
|
|
306
149
|
|
|
307
150
|
const editable = useSelector((state) => state.editable);
|
|
308
151
|
|
|
309
|
-
//
|
|
310
|
-
//
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
if (fetchData != null) {
|
|
317
|
-
return { fetchData, identity: identity ?? ((r: any) => r?.id) };
|
|
318
|
-
}
|
|
319
|
-
if (sourceData != null && sourceData.length > 0) {
|
|
320
|
-
return createLocalProvider(
|
|
321
|
-
sourceData,
|
|
322
|
-
identity != null ? { identity } : undefined,
|
|
323
|
-
);
|
|
324
|
-
}
|
|
325
|
-
return null;
|
|
326
|
-
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
327
|
-
}, [provider, fetchData, sourceData, identity]);
|
|
152
|
+
// The active data source is resolved in the wrapper (`DataSheet`) and held in
|
|
153
|
+
// the provider layer; read it here rather than resolving per render.
|
|
154
|
+
const {
|
|
155
|
+
provider: activeProvider,
|
|
156
|
+
isLocalProvider,
|
|
157
|
+
localCount,
|
|
158
|
+
} = ctx.useValue(dataProviderAtom);
|
|
328
159
|
|
|
329
160
|
// When an explicit provider owns persistence, its methods drive the built-in
|
|
330
161
|
// Save (batch: edits→saveRows, added→insertRow, deleted→deleteRows), then a
|
|
@@ -369,9 +200,15 @@ function _DataSheet<T>({
|
|
|
369
200
|
return _actions;
|
|
370
201
|
}, [actions, enableClipboard, editable, saveHandler]);
|
|
371
202
|
|
|
203
|
+
/*** TODO: generalize this, probably shouldn't need 'set' */
|
|
372
204
|
ctx.useSync(tableActionsAtom, _actions);
|
|
205
|
+
const getHotkeys = ctx.useSet(tableHotkeysAtom);
|
|
206
|
+
|
|
207
|
+
// This is quite hacky!
|
|
208
|
+
const hotkeysConfig = useMemo(() => {
|
|
209
|
+
return getHotkeys();
|
|
210
|
+
}, [_actions]);
|
|
373
211
|
|
|
374
|
-
const hotkeysConfig = ctx.useValue(tableHotkeysAtom);
|
|
375
212
|
const { handleKeyDown, handleKeyUp } = useHotkeys(hotkeysConfig);
|
|
376
213
|
|
|
377
214
|
// For now, we only consider a single cell "focused" when we have one cell selected.
|
|
@@ -440,15 +277,22 @@ function _DataSheet<T>({
|
|
|
440
277
|
// In paged mode the row count is small and fixed, so let the table size to
|
|
441
278
|
// its content (header + rows) instead of filling the viewport.
|
|
442
279
|
const footerInfo = ctx.useValue(tableFooterAtom);
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
280
|
+
let holderStyle: CSSProperties | undefined = undefined;
|
|
281
|
+
if (footerInfo.mode === "paged") {
|
|
282
|
+
holderStyle = {
|
|
283
|
+
flex: "0 0 auto" as const,
|
|
284
|
+
height: numRows * rowHeight + COLUMN_HEADER_HEIGHT,
|
|
285
|
+
};
|
|
286
|
+
}
|
|
450
287
|
|
|
451
288
|
const onColumnsReordered = useSelector((state) => state.onColumnsReordered);
|
|
289
|
+
// Whether table-level column drag-reordering is enabled. Held in the store
|
|
290
|
+
// (set from the `enableColumnReordering` prop by the provider); it must reach
|
|
291
|
+
// the Blueprint `Table` — the `onColumnsReordered` handler alone doesn't turn
|
|
292
|
+
// on the drag affordance.
|
|
293
|
+
const enableColumnReordering = useSelector(
|
|
294
|
+
(state) => state.enableColumnReordering,
|
|
295
|
+
);
|
|
452
296
|
|
|
453
297
|
// Auto-detect if any columns have sortable/filterable set.
|
|
454
298
|
// If so and no explicit columnHeaderCellRenderer was provided,
|
|
@@ -508,57 +352,21 @@ function _DataSheet<T>({
|
|
|
508
352
|
// when the rows load/change or the function's identity changes (close it over
|
|
509
353
|
// your external edit state). The `controlledOverlay` flag above suppresses the
|
|
510
354
|
// loader-boundary identity remap so this derivation is authoritative.
|
|
511
|
-
const loadedData = useSelector((state) => state.data);
|
|
512
355
|
useEffect(() => {
|
|
513
356
|
if (deriveOverlay == null) return;
|
|
514
|
-
const overlay = deriveOverlay(
|
|
357
|
+
const overlay = deriveOverlay(data);
|
|
515
358
|
storeState.setState({
|
|
516
359
|
updatedData: overlay.updatedData,
|
|
517
360
|
rowStatus: overlay.rowStatus,
|
|
518
361
|
});
|
|
519
|
-
}, [deriveOverlay,
|
|
520
|
-
|
|
521
|
-
// Function `columnSpec`: derive the spec from the loaded rows (no separate
|
|
522
|
-
// fetch of sample data). Derive once the first rows arrive, and re-derive
|
|
523
|
-
// when the function's identity changes (a consumer memoizes it over its
|
|
524
|
-
// own view state — hidden columns, order, overrides). Not re-run as more
|
|
525
|
-
// rows page in (guarded by the function identity), so it never clobbers
|
|
526
|
-
// in-store column state on scroll.
|
|
527
|
-
const derivedSpecFor = useRef<unknown>(null);
|
|
528
|
-
useEffect(() => {
|
|
529
|
-
if (typeof columnSpecProp !== "function") return;
|
|
530
|
-
if (derivedSpecFor.current === columnSpecProp) return;
|
|
531
|
-
const rows = loadedData.filter((r) => r != null);
|
|
532
|
-
if (rows.length === 0) return;
|
|
533
|
-
derivedSpecFor.current = columnSpecProp;
|
|
534
|
-
storeState.setState({ columnSpec: columnSpecProp(rows) });
|
|
535
|
-
}, [columnSpecProp, loadedData, storeState]);
|
|
536
|
-
|
|
537
|
-
// Imperative re-fetch: bump `refreshToken` to reload the provider (e.g. after
|
|
538
|
-
// a save). Skips the initial mount (the loader does its own first fetch).
|
|
539
|
-
const bumpRefreshFromToken = ctx.useSet(dataRefreshTokenAtom);
|
|
540
|
-
const firstRefreshToken = useRef(true);
|
|
541
|
-
useEffect(() => {
|
|
542
|
-
if (firstRefreshToken.current) {
|
|
543
|
-
firstRefreshToken.current = false;
|
|
544
|
-
return;
|
|
545
|
-
}
|
|
546
|
-
bumpRefreshFromToken((v) => v + 1);
|
|
547
|
-
}, [refreshToken, bumpRefreshFromToken]);
|
|
362
|
+
}, [deriveOverlay, data, storeState]);
|
|
548
363
|
|
|
549
|
-
//
|
|
550
|
-
|
|
551
|
-
const id = activeProvider?.identity ?? identity;
|
|
552
|
-
if (id != null) storeState.setState({ identity: id });
|
|
553
|
-
}, [storeState, activeProvider, identity]);
|
|
364
|
+
// Function `columnSpec` derivation is hoisted to the provider
|
|
365
|
+
// (`DataSheetProviderInner`), shared by both renderers.
|
|
554
366
|
|
|
555
|
-
//
|
|
556
|
-
// `
|
|
557
|
-
//
|
|
558
|
-
useEffect(() => {
|
|
559
|
-
const canDeleteRows = provider == null || provider.deleteRows != null;
|
|
560
|
-
storeState.setState({ canDeleteRows });
|
|
561
|
-
}, [storeState, provider]);
|
|
367
|
+
// Identity and canDeleteRows sync are hoisted to the provider
|
|
368
|
+
// (`DataSheetProviderInner`), shared with `_DataPanel` — both depend only on
|
|
369
|
+
// the resolved data provider, not any sheet-specific state.
|
|
562
370
|
|
|
563
371
|
// Merge consumer `rowStatusStyles` over the built-in defaults and hand the
|
|
564
372
|
// result to the store, where the cell renderer and row-header renderer read
|
|
@@ -574,11 +382,11 @@ function _DataSheet<T>({
|
|
|
574
382
|
const realizedColumns = useMemo(() => {
|
|
575
383
|
return columnSpec.map((col, colIndex) => {
|
|
576
384
|
let fn =
|
|
577
|
-
col.
|
|
385
|
+
col.headerRenderer ??
|
|
578
386
|
columnHeaderCellRenderer ??
|
|
579
387
|
renderColumnHeaderCell;
|
|
580
|
-
let activeSort = null;
|
|
581
|
-
let activeFilter = null;
|
|
388
|
+
let activeSort: any = null;
|
|
389
|
+
let activeFilter: any = null;
|
|
582
390
|
if (col.sortable) {
|
|
583
391
|
activeSort = columnSorts?.find((s) => s.key === col.key);
|
|
584
392
|
}
|
|
@@ -592,19 +400,22 @@ function _DataSheet<T>({
|
|
|
592
400
|
}
|
|
593
401
|
}
|
|
594
402
|
|
|
595
|
-
const _columnHeaderCellRenderer = (colIndex) => {
|
|
596
|
-
return fn(
|
|
597
|
-
|
|
403
|
+
const _columnHeaderCellRenderer: any = (colIndex) => {
|
|
404
|
+
return fn(
|
|
405
|
+
{
|
|
406
|
+
col,
|
|
407
|
+
colIndex,
|
|
408
|
+
activeSort,
|
|
409
|
+
activeFilter,
|
|
410
|
+
},
|
|
598
411
|
colIndex,
|
|
599
|
-
|
|
600
|
-
activeFilter,
|
|
601
|
-
});
|
|
412
|
+
);
|
|
602
413
|
};
|
|
603
414
|
|
|
604
415
|
return h(Column, {
|
|
605
416
|
id: col.key,
|
|
606
417
|
name: col.name,
|
|
607
|
-
columnHeaderCellRenderer: _columnHeaderCellRenderer,
|
|
418
|
+
columnHeaderCellRenderer: _columnHeaderCellRenderer as any,
|
|
608
419
|
cellRenderer: (rowIndex) => {
|
|
609
420
|
const state = storeAPI.getState();
|
|
610
421
|
return basicCellRenderer<T>(
|
|
@@ -632,17 +443,22 @@ function _DataSheet<T>({
|
|
|
632
443
|
|
|
633
444
|
const rowHeaderCellRenderer = useCallback(
|
|
634
445
|
(rowIndex: number) => {
|
|
635
|
-
|
|
636
|
-
|
|
637
|
-
|
|
638
|
-
|
|
446
|
+
let dataRowIndex = rowIndex;
|
|
447
|
+
if (filteredRowIndices != null) {
|
|
448
|
+
dataRowIndex = filteredRowIndices[rowIndex] ?? rowIndex;
|
|
449
|
+
}
|
|
639
450
|
const statusVal = rowStatus[dataRowIndex];
|
|
640
|
-
|
|
641
|
-
|
|
642
|
-
|
|
643
|
-
|
|
451
|
+
let style: CSSProperties | undefined;
|
|
452
|
+
if (statusVal != null) {
|
|
453
|
+
style = mergedRowStatusStyles[statusVal]?.headerStyle;
|
|
454
|
+
}
|
|
644
455
|
|
|
645
456
|
const defaultLabel = `${dataRowIndex + 1}`;
|
|
457
|
+
// A custom renderer supplies the header's *name* content (a group-key
|
|
458
|
+
// label, an omit indicator, …); a nullish return keeps the default
|
|
459
|
+
// 1-based label. Either way the node is wrapped in a `RowHeaderCell` so
|
|
460
|
+
// status styling and the row index are always applied — the renderer is
|
|
461
|
+
// not responsible for producing the whole cell.
|
|
646
462
|
let name: ReactNode = defaultLabel;
|
|
647
463
|
if (rowHeaderRenderer != null) {
|
|
648
464
|
const custom = rowHeaderRenderer({
|
|
@@ -673,6 +489,23 @@ function _DataSheet<T>({
|
|
|
673
489
|
],
|
|
674
490
|
);
|
|
675
491
|
|
|
492
|
+
// Done with hooks!
|
|
493
|
+
/** Guard for unacceptable state combinations:
|
|
494
|
+
* editable = true requires selectionModes to include cells, else the user cannot select a cell to edit.
|
|
495
|
+
* TODO: make this an impossible state to enter.
|
|
496
|
+
*/
|
|
497
|
+
if (
|
|
498
|
+
editable &&
|
|
499
|
+
selectionModes &&
|
|
500
|
+
!selectionModes.includes(RegionCardinality.CELLS)
|
|
501
|
+
) {
|
|
502
|
+
return h(ErrorCallout, {
|
|
503
|
+
title: "Invalid selection mode",
|
|
504
|
+
description: "Editable sheet requires cell selection",
|
|
505
|
+
});
|
|
506
|
+
}
|
|
507
|
+
|
|
508
|
+
// TODO: hoist this
|
|
676
509
|
let _selectionModes = selectionModes;
|
|
677
510
|
if (
|
|
678
511
|
editable &&
|
|
@@ -698,12 +531,13 @@ function _DataSheet<T>({
|
|
|
698
531
|
let dataLoader: ReactNode = null;
|
|
699
532
|
if (activeProvider != null) {
|
|
700
533
|
_showLoadProgress = !isLocalProvider;
|
|
534
|
+
// A local (in-memory) source loads all its rows in one page; its count
|
|
535
|
+
// rides on the resolved provider (`localCount`), so `_DataSheet` no longer
|
|
536
|
+
// takes a `data` prop — live rows come only from the store.
|
|
701
537
|
dataLoader = h(_DataLoaderManager, {
|
|
702
538
|
key: "__data_loader",
|
|
703
539
|
fetchData: activeProvider.fetchData,
|
|
704
|
-
pageSize: isLocalProvider
|
|
705
|
-
? Math.max(sourceData?.length ?? 1, 1)
|
|
706
|
-
: pageSize,
|
|
540
|
+
pageSize: isLocalProvider ? Math.max(localCount, 1) : pageSize,
|
|
707
541
|
fetchMode: isLocalProvider ? undefined : fetchMode,
|
|
708
542
|
});
|
|
709
543
|
}
|
|
@@ -712,13 +546,13 @@ function _DataSheet<T>({
|
|
|
712
546
|
|
|
713
547
|
let filterStatus: ReactNode = null;
|
|
714
548
|
if (showFilterBar) {
|
|
715
|
-
filterStatus = h(
|
|
549
|
+
filterStatus = h(ActiveFiltersList, { filters: filters ?? [] });
|
|
716
550
|
}
|
|
717
551
|
|
|
718
552
|
return h("div.data-sheet-container", { className, style }, [
|
|
719
553
|
// The actions/tools toolbar (selection-modal). Table-scoped controls like
|
|
720
554
|
// scroll-to-row / full-text search live here as ordinary actions.
|
|
721
|
-
h(ActionsToolbar, { actions: _actions
|
|
555
|
+
h(ActionsToolbar, { actions: _actions }),
|
|
722
556
|
dataLoader,
|
|
723
557
|
children,
|
|
724
558
|
h(
|
|
@@ -731,21 +565,21 @@ function _DataSheet<T>({
|
|
|
731
565
|
style: holderStyle,
|
|
732
566
|
},
|
|
733
567
|
h(
|
|
734
|
-
Table,
|
|
568
|
+
Table as any, // Some sort of hyperscript type error
|
|
735
569
|
{
|
|
736
570
|
ref,
|
|
737
571
|
numRows,
|
|
738
572
|
className: "data-sheet",
|
|
739
573
|
enableFocusedCell,
|
|
574
|
+
enableColumnReordering,
|
|
740
575
|
onColumnsReordered,
|
|
741
576
|
focusedCell,
|
|
742
577
|
selectedRegions,
|
|
743
578
|
defaultRowHeight: rowHeight,
|
|
744
|
-
minRowHeight: rowHeight,
|
|
745
579
|
columnWidths,
|
|
746
580
|
onColumnWidthChanged,
|
|
747
581
|
onSelection,
|
|
748
|
-
/** TODO: we could enable this
|
|
582
|
+
/** TODO: we could enable this if we had a use-case */
|
|
749
583
|
enableRowReordering: false,
|
|
750
584
|
enableRowResizing: false,
|
|
751
585
|
// The cell renderer is memoized internally based on these data dependencies
|
|
@@ -753,7 +587,7 @@ function _DataSheet<T>({
|
|
|
753
587
|
onVisibleCellsChange: _onVisibleCellsChange,
|
|
754
588
|
rowHeaderCellRenderer,
|
|
755
589
|
selectionModes: _selectionModes,
|
|
756
|
-
...
|
|
590
|
+
...tableProps,
|
|
757
591
|
getCellClipboardData: null,
|
|
758
592
|
},
|
|
759
593
|
realizedColumns,
|
|
@@ -765,7 +599,7 @@ function _DataSheet<T>({
|
|
|
765
599
|
h("div.spacer"),
|
|
766
600
|
h.if(_showLoadProgress)(LoadProgressIndicator),
|
|
767
601
|
]),
|
|
768
|
-
h.if(
|
|
602
|
+
h.if(debug)(CellRendererDebugOverlay, {
|
|
769
603
|
cellRendererDependencies,
|
|
770
604
|
names: [
|
|
771
605
|
"data",
|
|
@@ -778,8 +612,14 @@ function _DataSheet<T>({
|
|
|
778
612
|
]);
|
|
779
613
|
}
|
|
780
614
|
|
|
781
|
-
const
|
|
782
|
-
|
|
615
|
+
const EMPTY_MAP = new Map<string, number>();
|
|
616
|
+
|
|
617
|
+
const columnWidthsIndexAtom = atom(
|
|
618
|
+
(get) => get(storeAtom)?.columnWidthsIndex ?? EMPTY_MAP,
|
|
619
|
+
);
|
|
620
|
+
const defaultColumnWidthAtom = atom(
|
|
621
|
+
(get) => get(storeAtom)?.defaultColumnWidth ?? 150,
|
|
622
|
+
);
|
|
783
623
|
|
|
784
624
|
const columnWidthsAtom = atom((get) => {
|
|
785
625
|
const ix = get(columnWidthsIndexAtom);
|
|
@@ -788,7 +628,10 @@ const columnWidthsAtom = atom((get) => {
|
|
|
788
628
|
);
|
|
789
629
|
});
|
|
790
630
|
|
|
791
|
-
function styleParamsForDensity(density: DataSheetDensity) {
|
|
631
|
+
function styleParamsForDensity(density: DataSheetDensity): {
|
|
632
|
+
rowHeight: number;
|
|
633
|
+
style: Record<string, string>;
|
|
634
|
+
} {
|
|
792
635
|
switch (density) {
|
|
793
636
|
case DataSheetDensity.MEDIUM:
|
|
794
637
|
return {
|
|
@@ -829,17 +672,3 @@ function _DataLoaderManager<T = any>({
|
|
|
829
672
|
useDataLoader(fetchData, rest);
|
|
830
673
|
return null;
|
|
831
674
|
}
|
|
832
|
-
|
|
833
|
-
export function getRowsToDelete(selection) {
|
|
834
|
-
let rowIndices: number[] = [];
|
|
835
|
-
for (const sel of selection) {
|
|
836
|
-
// This isn't a full-row selection
|
|
837
|
-
if (sel.cols != null) continue;
|
|
838
|
-
if (sel.rows == null) continue;
|
|
839
|
-
const [startIndex, endIndex] = sel.rows;
|
|
840
|
-
for (let i = startIndex; i <= endIndex; i++) {
|
|
841
|
-
rowIndices.push(i);
|
|
842
|
-
}
|
|
843
|
-
}
|
|
844
|
-
return rowIndices;
|
|
845
|
-
}
|