@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.
- package/CHANGELOG.md +40 -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 -184
- 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 -182
- package/dist/actions/column-controls.js.map +1 -1
- package/dist/actions/column-filter.cjs +24 -50
- 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 -51
- 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-controls.cjs → table-actions.cjs} +7 -24
- 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 -19
- 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/{view-info.d.ts → indicators/view-info.d.ts} +1 -0
- package/dist/components/{view-info.js → indicators/view-info.js} +17 -13
- 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} +36 -97
- 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} +123 -181
- 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} +92 -150
- 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 +21 -4
- package/dist/filters/operators.cjs.map +1 -1
- package/dist/filters/operators.d.ts +5 -4
- package/dist/filters/operators.js +21 -4
- 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 +129 -103
- 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 +110 -84
- 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 +77 -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} +37 -23
- package/dist/provider/zustand-store.cjs.map +1 -0
- package/dist/{zustand-store.js → provider/zustand-store.js} +22 -8
- package/dist/provider/zustand-store.js.map +1 -0
- package/dist/{cell-renderer.cjs → renderers/cell-renderer.cjs} +68 -35
- 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} +66 -33
- package/dist/renderers/cell-renderer.js.map +1 -0
- package/dist/renderers/column-header-cell.cjs +40 -17
- package/dist/renderers/column-header-cell.cjs.map +1 -1
- package/dist/renderers/column-header-cell.d.ts +2 -2
- package/dist/renderers/column-header-cell.js +40 -17
- 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 +123 -226
- 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 -228
- package/src/actions/column-filter.ts +28 -63
- 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 -20
- 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} +16 -27
- package/src/{actions/toolbar.module.sass → components/toolbars/actions-toolbar.module.sass} +17 -4
- package/src/{actions/toolbar.ts → components/toolbars/actions-toolbar.ts} +53 -126
- 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} +144 -306
- package/src/data-view.ts +70 -0
- package/src/filters/operators.ts +38 -6
- package/src/index.ts +4 -3
- package/src/postgrest-table/data-loaders.ts +250 -181
- package/src/postgrest-table/index.ts +10 -9
- package/src/{utils → provider}/column-spec.ts +34 -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} +36 -14
- package/src/{cell-renderer.ts → renderers/cell-renderer.ts} +146 -58
- package/src/renderers/column-header-cell.ts +51 -17
- package/src/renderers/index.ts +1 -0
- package/src/types.ts +143 -236
- 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.map +0 -1
- package/dist/actions/table-controls.js.map +0 -1
- package/dist/actions/toolbar.cjs +0 -246
- 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.js.map +0 -1
- package/dist/core.cjs.map +0 -1
- package/dist/core.d.ts +0 -113
- package/dist/core.js.map +0 -1
- package/dist/provider.cjs +0 -191
- package/dist/provider.cjs.map +0 -1
- package/dist/provider.d.ts +0 -25
- package/dist/provider.js +0 -189
- 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 -250
- 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,183 +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";
|
|
25
|
-
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
44
|
import { CellRendererDebugOverlay, tableHotkeysAtom } from "./utils";
|
|
36
45
|
import {
|
|
37
|
-
ActionsToolbar,
|
|
38
|
-
clearSelectionAction,
|
|
39
46
|
clipboardActions,
|
|
40
47
|
columnControlActions,
|
|
41
48
|
createSaveAction,
|
|
42
|
-
FilterBar,
|
|
43
49
|
resetChangesAction,
|
|
44
50
|
TableAction,
|
|
45
51
|
TableActionContext,
|
|
46
|
-
TableFilter,
|
|
47
52
|
} from "./actions";
|
|
48
53
|
import {
|
|
49
|
-
createLocalProvider,
|
|
50
|
-
dataRefreshTokenAtom,
|
|
51
|
-
FetchData,
|
|
52
|
-
FetchDataOptions,
|
|
53
54
|
tableFooterAtom,
|
|
54
|
-
TableDataProvider,
|
|
55
|
-
useScrollHandler,
|
|
56
55
|
useDataLoader,
|
|
56
|
+
useScrollHandler,
|
|
57
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";
|
|
58
66
|
|
|
59
67
|
// More on component templates: https://storybook.js.org/docs/react/writing-stories/introduction#using-args
|
|
60
68
|
|
|
61
69
|
// TODO: add a "copy to selection" tool (the little square in the bottom right corner of a cell)
|
|
62
70
|
// This should copy the value of a cell (or a set of cells in the same row) downwards.
|
|
63
71
|
|
|
64
|
-
export enum DataSheetDensity {
|
|
65
|
-
HIGH = "high",
|
|
66
|
-
MEDIUM = "medium",
|
|
67
|
-
LOW = "low",
|
|
68
|
-
}
|
|
69
|
-
|
|
70
72
|
/** Approximate column-header + scrollbar allowance, used to size the table to
|
|
71
73
|
* its content in paged mode. */
|
|
72
74
|
const COLUMN_HEADER_HEIGHT = 34;
|
|
73
75
|
|
|
74
|
-
/**
|
|
75
|
-
* How selecting a cell activates its surface (an editor, or a read-only detail
|
|
76
|
-
* panel):
|
|
77
|
-
* - `"auto"` (default when `autoFocusEditor` is `true`): open the surface on
|
|
78
|
-
* selection and, for editors, focus it. Editors relinquish focus at their
|
|
79
|
-
* edges — arrow past the start/end of a text cell, or press Escape, and focus
|
|
80
|
-
* returns to the table — so the keyboard stays operable without the mouse.
|
|
81
|
-
* Pressing Escape drops into navigation mode (surfaces stop auto-opening)
|
|
82
|
-
* until the next click.
|
|
83
|
-
* - `"manual"` (default when `autoFocusEditor` is `false`): the surface stays
|
|
84
|
-
* closed until the cell is clicked; arrow keys always navigate the table.
|
|
85
|
-
*/
|
|
86
|
-
export type CellInteraction = "auto" | "manual";
|
|
87
|
-
|
|
88
|
-
interface DataSheetInternalProps<T> extends TableProps, FetchDataOptions {
|
|
89
|
-
/** In-memory rows. Internally wrapped in a local `TableDataProvider` and
|
|
90
|
-
* driven through the same loader as any other source. */
|
|
91
|
-
data?: T[];
|
|
92
|
-
// function to fetch a chunk of data (the read side of a data provider)
|
|
93
|
-
fetchData?: FetchData<T>;
|
|
94
|
-
/** A data provider instantiated separately and passed in — bundles the read
|
|
95
|
-
* side (`fetchData` + `identity`) and, optionally, the persistence side
|
|
96
|
-
* (`saveRows` / `deleteRows` / `insertRow`) that drives the Save action. An
|
|
97
|
-
* explicit alternative to the loose `data` / `fetchData` / `identity` props;
|
|
98
|
-
* takes precedence when given. */
|
|
99
|
-
provider?: TableDataProvider<T>;
|
|
100
|
-
// An optional table name that will be used in toolbars if given
|
|
101
|
-
name?: string;
|
|
102
|
-
onVisibleCellsChange?: (visibleCells: VisibleCells) => void;
|
|
103
|
-
onUpdateData?: (updatedData: any[], data: T[]) => void;
|
|
104
|
-
/** Observer called for every user edit as a structured `EditEvent`
|
|
105
|
-
* (Workstream A). Additive: the built-in `updatedData` overlay still
|
|
106
|
-
* applies. */
|
|
107
|
-
onEdit?: (event: EditEvent<T>) => void;
|
|
108
|
-
/** Controlled edited-cell overlay (Workstream A). When provided, it is
|
|
109
|
-
* synced into the store as the source of truth for edited values — pair with
|
|
110
|
-
* `onEdit` to own edit state externally (e.g. an ops model). Optimistic
|
|
111
|
-
* in-table edits are superseded by the next value you pass back. */
|
|
112
|
-
updatedData?: T[];
|
|
113
|
-
/** Controlled row-status overlay (edited / added / deleted), the companion
|
|
114
|
-
* to `updatedData`. */
|
|
115
|
-
rowStatus?: TableElementStatus[];
|
|
116
|
-
/** Row identity for the edit overlay — stable across a provider re-sort (a
|
|
117
|
-
* data provider supplies its own; defaults to `(row) => row?.id`). Lets edits
|
|
118
|
-
* survive a re-ordered re-fetch. */
|
|
119
|
-
identity?: (row: T) => string | number | null | undefined;
|
|
120
|
-
/** Derive the controlled edit overlay from the loaded rows, *inside* the
|
|
121
|
-
* sheet. For provider-backed tables whose overlay is a function of the loaded
|
|
122
|
-
* data plus external edit state (e.g. an ops stack): the library owns the
|
|
123
|
-
* rows, so it calls this with them and uses the result as the controlled
|
|
124
|
-
* overlay, re-deriving when the rows — or this function's identity (close it
|
|
125
|
-
* over your edit state) — change. Supersedes `updatedData`/`rowStatus`. */
|
|
126
|
-
deriveOverlay?: (rows: T[]) => {
|
|
127
|
-
updatedData: T[];
|
|
128
|
-
rowStatus: TableElementStatus[];
|
|
129
|
-
};
|
|
130
|
-
/** Bump to force the data provider to re-fetch from scratch (e.g. after a
|
|
131
|
-
* save/delete that invalidated the loaded rows). */
|
|
132
|
-
refreshToken?: number | string;
|
|
133
|
-
/** Persistence handler for the built-in Save action. When provided, a Save
|
|
134
|
-
* control is added to the toolbar (always visible, disabled when there are
|
|
135
|
-
* no pending changes). */
|
|
136
|
-
onSave?: (ctx: TableActionContext<T>) => void | Promise<void>;
|
|
137
|
-
onDeleteRows?: (selection: Region[]) => void;
|
|
138
|
-
verbose?: boolean;
|
|
139
|
-
enableColumnReordering?: boolean;
|
|
140
|
-
enableClipboard?: boolean;
|
|
141
|
-
enableFocusedCell?: boolean;
|
|
142
|
-
editable?: boolean;
|
|
143
|
-
/** @deprecated Prefer `cellInteraction`. `true` maps to `"auto"`,
|
|
144
|
-
* `false` to `"manual"`. */
|
|
145
|
-
autoFocusEditor?: boolean;
|
|
146
|
-
/** How selecting a cell activates its surface (editor or detail panel).
|
|
147
|
-
* Defaults from `autoFocusEditor` for backward compatibility. */
|
|
148
|
-
cellInteraction?: CellInteraction;
|
|
149
|
-
density?: DataSheetDensity;
|
|
150
|
-
/** Configurable table actions shown in a selection-aware toolbar.
|
|
151
|
-
* When provided, the actions toolbar renders alongside the existing
|
|
152
|
-
* edit toolbar. Actions are filtered by the current selection cardinality. */
|
|
153
|
-
actions?: TableAction<T>[];
|
|
154
|
-
/** Available column/table filters shown in a filter bar.
|
|
155
|
-
* Filters can also be defined per-column via `ColumnSpec.filters`. */
|
|
156
|
-
filters?: TableFilter<T>[];
|
|
157
|
-
/** Optional custom column header cell renderer, called for each column.
|
|
158
|
-
* Receives the ColumnSpec and column index; should return a React element
|
|
159
|
-
* (typically a Blueprint ColumnHeaderCell). */
|
|
160
|
-
columnHeaderCellRenderer?: (col: any, colIndex: number) => ReactNode;
|
|
161
|
-
/** Arbitrary nodes for the bottom status bar (left group), rendered beside
|
|
162
|
-
* the active sort/filter tags — the home for view-state controls (show/hide
|
|
163
|
-
* omitted rows/columns, a group-by indicator, etc.). */
|
|
164
|
-
statusBar?: ReactNode;
|
|
165
|
-
/** Presentation per row-status value, merged over the built-in defaults
|
|
166
|
-
* (which style `"deleted"`). Supply styles for consumer-defined statuses
|
|
167
|
-
* (e.g. `"omitted"`) and/or override the defaults. Each entry may set the
|
|
168
|
-
* cells' style/intent and the row header's style. */
|
|
169
|
-
rowStatusStyles?: RowStatusStyles;
|
|
170
|
-
/** Render the content of a row's header cell (the left gutter). Receives the
|
|
171
|
-
* row, its status, and the default 1-based label; return a node to use, or a
|
|
172
|
-
* nullish value to keep the default. For group-key labels, omit indicators,
|
|
173
|
-
* etc. Header-cell *styling* still comes from `rowStatusStyles`. */
|
|
174
|
-
rowHeaderRenderer?: (ctx: RowHeaderRenderContext<T>) => ReactNode;
|
|
175
|
-
}
|
|
176
|
-
|
|
177
|
-
type DataSheetProps<T> = DataSheetProviderProps<T> & DataSheetInternalProps<T>;
|
|
178
|
-
|
|
179
|
-
const emptyData: any[] = [];
|
|
180
|
-
|
|
181
76
|
export function DataSheet<T>(props: DataSheetProps<T>) {
|
|
182
77
|
const {
|
|
183
78
|
data,
|
|
@@ -188,74 +83,27 @@ export function DataSheet<T>(props: DataSheetProps<T>) {
|
|
|
188
83
|
enableFocusedCell = false,
|
|
189
84
|
defaultColumnWidth = 150,
|
|
190
85
|
children,
|
|
86
|
+
name,
|
|
191
87
|
...rest
|
|
192
88
|
} = props;
|
|
193
89
|
|
|
90
|
+
const [providerProps, rendererProps] = splitDataProviderProps<T>({
|
|
91
|
+
...props,
|
|
92
|
+
viewType: DataViewRendererType.TABLE,
|
|
93
|
+
});
|
|
194
94
|
return h(
|
|
195
95
|
DataSheetProvider<T>,
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
columnSpec,
|
|
199
|
-
columnSpecOptions,
|
|
200
|
-
enableColumnReordering,
|
|
201
|
-
defaultColumnWidth,
|
|
202
|
-
editable,
|
|
203
|
-
...rest,
|
|
204
|
-
},
|
|
205
|
-
h(_DataSheet<any>, {
|
|
206
|
-
...rest,
|
|
207
|
-
data: data ?? emptyData,
|
|
208
|
-
children,
|
|
209
|
-
editable,
|
|
210
|
-
enableColumnReordering,
|
|
211
|
-
enableFocusedCell,
|
|
212
|
-
}),
|
|
96
|
+
providerProps,
|
|
97
|
+
h(DataSheetRenderer<any>, rendererProps),
|
|
213
98
|
);
|
|
214
99
|
}
|
|
215
100
|
|
|
216
|
-
|
|
217
|
-
* `insertRow`, edited rows via `saveRows`, deleted rows via `deleteRows`
|
|
218
|
-
* (addressed by `provider.identity`). Used by the built-in Save action when an
|
|
219
|
-
* explicit provider owns persistence. */
|
|
220
|
-
async function persistViaProvider<T>(
|
|
221
|
-
provider: TableDataProvider<T>,
|
|
222
|
-
ctx: TableActionContext<T>,
|
|
223
|
-
): Promise<void> {
|
|
224
|
-
const base = (ctx.data ?? []) as any[];
|
|
225
|
-
const updates = (ctx.updatedData ?? []) as any[];
|
|
226
|
-
const status = (ctx.rowStatus ?? []) as any[];
|
|
227
|
-
const n = Math.max(base.length, updates.length, status.length);
|
|
228
|
-
const toSave: T[] = [];
|
|
229
|
-
const toInsert: T[] = [];
|
|
230
|
-
const toDelete: Array<string | number> = [];
|
|
231
|
-
for (let i = 0; i < n; i++) {
|
|
232
|
-
if (status[i] === TableElementStatus.DELETED) {
|
|
233
|
-
const id = provider.identity(base[i]);
|
|
234
|
-
if (id != null) toDelete.push(id);
|
|
235
|
-
continue;
|
|
236
|
-
}
|
|
237
|
-
const upd = updates[i];
|
|
238
|
-
const hasEdit =
|
|
239
|
-
upd != null && typeof upd === "object" && Object.keys(upd).length > 0;
|
|
240
|
-
if (status[i] === TableElementStatus.ADDED) {
|
|
241
|
-
toInsert.push({ ...base[i], ...upd } as T);
|
|
242
|
-
} else if (hasEdit) {
|
|
243
|
-
toSave.push({ ...base[i], ...upd } as T);
|
|
244
|
-
}
|
|
245
|
-
}
|
|
246
|
-
if (toDelete.length > 0 && provider.deleteRows != null) {
|
|
247
|
-
await provider.deleteRows(toDelete);
|
|
248
|
-
}
|
|
249
|
-
for (const row of toInsert) {
|
|
250
|
-
if (provider.insertRow != null) await provider.insertRow(row);
|
|
251
|
-
}
|
|
252
|
-
if (toSave.length > 0 && provider.saveRows != null) {
|
|
253
|
-
await provider.saveRows(toSave);
|
|
254
|
-
}
|
|
255
|
-
}
|
|
101
|
+
const verboseAtom = atom(false);
|
|
256
102
|
|
|
257
|
-
|
|
258
|
-
|
|
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>({
|
|
259
107
|
fetchData,
|
|
260
108
|
provider,
|
|
261
109
|
pageSize,
|
|
@@ -266,12 +114,16 @@ function _DataSheet<T>({
|
|
|
266
114
|
onSave,
|
|
267
115
|
updatedData: updatedDataProp,
|
|
268
116
|
rowStatus: rowStatusProp,
|
|
269
|
-
|
|
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,
|
|
270
121
|
deriveOverlay,
|
|
271
|
-
refreshToken,
|
|
122
|
+
refreshToken: _refreshToken,
|
|
272
123
|
onDeleteRows,
|
|
273
124
|
name,
|
|
274
125
|
verbose = false,
|
|
126
|
+
debug = false,
|
|
275
127
|
enableFocusedCell,
|
|
276
128
|
autoFocusEditor = true,
|
|
277
129
|
cellInteraction,
|
|
@@ -285,38 +137,25 @@ function _DataSheet<T>({
|
|
|
285
137
|
rowStatusStyles,
|
|
286
138
|
rowHeaderRenderer,
|
|
287
139
|
children,
|
|
288
|
-
...
|
|
289
|
-
}:
|
|
140
|
+
...tableProps
|
|
141
|
+
}: DataSheetRendererProps<T>) {
|
|
290
142
|
/**
|
|
291
143
|
* @param data: The data to be displayed in the table
|
|
292
144
|
* @param columnSpec: The specification for all columns in the table. If not provided, the column spec will be generated from the data.
|
|
293
145
|
* @param columnSpecOptions: Options for generating a column spec from data
|
|
294
146
|
*/
|
|
295
147
|
|
|
296
|
-
|
|
297
|
-
const debugMode = false;
|
|
148
|
+
ctx.useSync(verboseAtom, verbose);
|
|
298
149
|
|
|
299
150
|
const editable = useSelector((state) => state.editable);
|
|
300
151
|
|
|
301
|
-
//
|
|
302
|
-
//
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
if (fetchData != null) {
|
|
309
|
-
return { fetchData, identity: identity ?? ((r: any) => r?.id) };
|
|
310
|
-
}
|
|
311
|
-
if (sourceData != null && sourceData.length > 0) {
|
|
312
|
-
return createLocalProvider(
|
|
313
|
-
sourceData,
|
|
314
|
-
identity != null ? { identity } : undefined,
|
|
315
|
-
);
|
|
316
|
-
}
|
|
317
|
-
return null;
|
|
318
|
-
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
319
|
-
}, [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);
|
|
320
159
|
|
|
321
160
|
// When an explicit provider owns persistence, its methods drive the built-in
|
|
322
161
|
// Save (batch: edits→saveRows, added→insertRow, deleted→deleteRows), then a
|
|
@@ -350,7 +189,6 @@ function _DataSheet<T>({
|
|
|
350
189
|
};
|
|
351
190
|
if (actions != null) add(actions);
|
|
352
191
|
add(columnControlActions);
|
|
353
|
-
add([clearSelectionAction]);
|
|
354
192
|
if (enableClipboard) add(clipboardActions);
|
|
355
193
|
// Save/reset last — they're the most significant actions — and present for
|
|
356
194
|
// every cardinality (editable), so the toolbar stays mounted regardless of
|
|
@@ -362,9 +200,15 @@ function _DataSheet<T>({
|
|
|
362
200
|
return _actions;
|
|
363
201
|
}, [actions, enableClipboard, editable, saveHandler]);
|
|
364
202
|
|
|
203
|
+
/*** TODO: generalize this, probably shouldn't need 'set' */
|
|
365
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]);
|
|
366
211
|
|
|
367
|
-
const hotkeysConfig = ctx.useValue(tableHotkeysAtom);
|
|
368
212
|
const { handleKeyDown, handleKeyUp } = useHotkeys(hotkeysConfig);
|
|
369
213
|
|
|
370
214
|
// For now, we only consider a single cell "focused" when we have one cell selected.
|
|
@@ -433,13 +277,13 @@ function _DataSheet<T>({
|
|
|
433
277
|
// In paged mode the row count is small and fixed, so let the table size to
|
|
434
278
|
// its content (header + rows) instead of filling the viewport.
|
|
435
279
|
const footerInfo = ctx.useValue(tableFooterAtom);
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
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
|
+
}
|
|
443
287
|
|
|
444
288
|
const onColumnsReordered = useSelector((state) => state.onColumnsReordered);
|
|
445
289
|
|
|
@@ -501,41 +345,21 @@ function _DataSheet<T>({
|
|
|
501
345
|
// when the rows load/change or the function's identity changes (close it over
|
|
502
346
|
// your external edit state). The `controlledOverlay` flag above suppresses the
|
|
503
347
|
// loader-boundary identity remap so this derivation is authoritative.
|
|
504
|
-
const loadedData = useSelector((state) => state.data);
|
|
505
348
|
useEffect(() => {
|
|
506
349
|
if (deriveOverlay == null) return;
|
|
507
|
-
const overlay = deriveOverlay(
|
|
350
|
+
const overlay = deriveOverlay(data);
|
|
508
351
|
storeState.setState({
|
|
509
352
|
updatedData: overlay.updatedData,
|
|
510
353
|
rowStatus: overlay.rowStatus,
|
|
511
354
|
});
|
|
512
|
-
}, [deriveOverlay,
|
|
513
|
-
|
|
514
|
-
// Imperative re-fetch: bump `refreshToken` to reload the provider (e.g. after
|
|
515
|
-
// a save). Skips the initial mount (the loader does its own first fetch).
|
|
516
|
-
const bumpRefreshFromToken = ctx.useSet(dataRefreshTokenAtom);
|
|
517
|
-
const firstRefreshToken = useRef(true);
|
|
518
|
-
useEffect(() => {
|
|
519
|
-
if (firstRefreshToken.current) {
|
|
520
|
-
firstRefreshToken.current = false;
|
|
521
|
-
return;
|
|
522
|
-
}
|
|
523
|
-
bumpRefreshFromToken((v) => v + 1);
|
|
524
|
-
}, [refreshToken, bumpRefreshFromToken]);
|
|
355
|
+
}, [deriveOverlay, data, storeState]);
|
|
525
356
|
|
|
526
|
-
//
|
|
527
|
-
|
|
528
|
-
const id = activeProvider?.identity ?? identity;
|
|
529
|
-
if (id != null) storeState.setState({ identity: id });
|
|
530
|
-
}, [storeState, activeProvider, identity]);
|
|
357
|
+
// Function `columnSpec` derivation is hoisted to the provider
|
|
358
|
+
// (`DataSheetProviderInner`), shared by both renderers.
|
|
531
359
|
|
|
532
|
-
//
|
|
533
|
-
// `
|
|
534
|
-
//
|
|
535
|
-
useEffect(() => {
|
|
536
|
-
const canDeleteRows = provider == null || provider.deleteRows != null;
|
|
537
|
-
storeState.setState({ canDeleteRows });
|
|
538
|
-
}, [storeState, provider]);
|
|
360
|
+
// Identity and canDeleteRows sync are hoisted to the provider
|
|
361
|
+
// (`DataSheetProviderInner`), shared with `_DataPanel` — both depend only on
|
|
362
|
+
// the resolved data provider, not any sheet-specific state.
|
|
539
363
|
|
|
540
364
|
// Merge consumer `rowStatusStyles` over the built-in defaults and hand the
|
|
541
365
|
// result to the store, where the cell renderer and row-header renderer read
|
|
@@ -551,11 +375,11 @@ function _DataSheet<T>({
|
|
|
551
375
|
const realizedColumns = useMemo(() => {
|
|
552
376
|
return columnSpec.map((col, colIndex) => {
|
|
553
377
|
let fn =
|
|
554
|
-
col.
|
|
378
|
+
col.headerRenderer ??
|
|
555
379
|
columnHeaderCellRenderer ??
|
|
556
380
|
renderColumnHeaderCell;
|
|
557
|
-
let activeSort = null;
|
|
558
|
-
let activeFilter = null;
|
|
381
|
+
let activeSort: any = null;
|
|
382
|
+
let activeFilter: any = null;
|
|
559
383
|
if (col.sortable) {
|
|
560
384
|
activeSort = columnSorts?.find((s) => s.key === col.key);
|
|
561
385
|
}
|
|
@@ -569,19 +393,22 @@ function _DataSheet<T>({
|
|
|
569
393
|
}
|
|
570
394
|
}
|
|
571
395
|
|
|
572
|
-
const _columnHeaderCellRenderer = (colIndex) => {
|
|
573
|
-
return fn(
|
|
574
|
-
|
|
396
|
+
const _columnHeaderCellRenderer: any = (colIndex) => {
|
|
397
|
+
return fn(
|
|
398
|
+
{
|
|
399
|
+
col,
|
|
400
|
+
colIndex,
|
|
401
|
+
activeSort,
|
|
402
|
+
activeFilter,
|
|
403
|
+
},
|
|
575
404
|
colIndex,
|
|
576
|
-
|
|
577
|
-
activeFilter,
|
|
578
|
-
});
|
|
405
|
+
);
|
|
579
406
|
};
|
|
580
407
|
|
|
581
408
|
return h(Column, {
|
|
582
409
|
id: col.key,
|
|
583
410
|
name: col.name,
|
|
584
|
-
columnHeaderCellRenderer: _columnHeaderCellRenderer,
|
|
411
|
+
columnHeaderCellRenderer: _columnHeaderCellRenderer as any,
|
|
585
412
|
cellRenderer: (rowIndex) => {
|
|
586
413
|
const state = storeAPI.getState();
|
|
587
414
|
return basicCellRenderer<T>(
|
|
@@ -609,20 +436,20 @@ function _DataSheet<T>({
|
|
|
609
436
|
|
|
610
437
|
const rowHeaderCellRenderer = useCallback(
|
|
611
438
|
(rowIndex: number) => {
|
|
612
|
-
|
|
613
|
-
|
|
614
|
-
|
|
615
|
-
|
|
439
|
+
let dataRowIndex = rowIndex;
|
|
440
|
+
if (filteredRowIndices != null) {
|
|
441
|
+
dataRowIndex = filteredRowIndices[rowIndex] ?? rowIndex;
|
|
442
|
+
}
|
|
616
443
|
const statusVal = rowStatus[dataRowIndex];
|
|
617
|
-
|
|
618
|
-
|
|
619
|
-
|
|
620
|
-
|
|
444
|
+
let style: CSSProperties | undefined;
|
|
445
|
+
if (statusVal != null) {
|
|
446
|
+
style = mergedRowStatusStyles[statusVal]?.headerStyle;
|
|
447
|
+
}
|
|
621
448
|
|
|
622
449
|
const defaultLabel = `${dataRowIndex + 1}`;
|
|
623
|
-
let name:
|
|
450
|
+
let name: string = defaultLabel;
|
|
624
451
|
if (rowHeaderRenderer != null) {
|
|
625
|
-
|
|
452
|
+
return rowHeaderRenderer({
|
|
626
453
|
rowIndex: dataRowIndex,
|
|
627
454
|
visibleIndex: rowIndex,
|
|
628
455
|
row: data[dataRowIndex] ?? updatedData[dataRowIndex],
|
|
@@ -630,7 +457,6 @@ function _DataSheet<T>({
|
|
|
630
457
|
isDeleted: statusVal === TableElementStatus.DELETED,
|
|
631
458
|
defaultLabel,
|
|
632
459
|
});
|
|
633
|
-
if (custom != null) name = custom;
|
|
634
460
|
}
|
|
635
461
|
|
|
636
462
|
return h(RowHeaderCell, {
|
|
@@ -650,6 +476,23 @@ function _DataSheet<T>({
|
|
|
650
476
|
],
|
|
651
477
|
);
|
|
652
478
|
|
|
479
|
+
// Done with hooks!
|
|
480
|
+
/** Guard for unacceptable state combinations:
|
|
481
|
+
* editable = true requires selectionModes to include cells, else the user cannot select a cell to edit.
|
|
482
|
+
* TODO: make this an impossible state to enter.
|
|
483
|
+
*/
|
|
484
|
+
if (
|
|
485
|
+
editable &&
|
|
486
|
+
selectionModes &&
|
|
487
|
+
!selectionModes.includes(RegionCardinality.CELLS)
|
|
488
|
+
) {
|
|
489
|
+
return h(ErrorCallout, {
|
|
490
|
+
title: "Invalid selection mode",
|
|
491
|
+
description: "Editable sheet requires cell selection",
|
|
492
|
+
});
|
|
493
|
+
}
|
|
494
|
+
|
|
495
|
+
// TODO: hoist this
|
|
653
496
|
let _selectionModes = selectionModes;
|
|
654
497
|
if (
|
|
655
498
|
editable &&
|
|
@@ -675,12 +518,13 @@ function _DataSheet<T>({
|
|
|
675
518
|
let dataLoader: ReactNode = null;
|
|
676
519
|
if (activeProvider != null) {
|
|
677
520
|
_showLoadProgress = !isLocalProvider;
|
|
521
|
+
// A local (in-memory) source loads all its rows in one page; its count
|
|
522
|
+
// rides on the resolved provider (`localCount`), so `_DataSheet` no longer
|
|
523
|
+
// takes a `data` prop — live rows come only from the store.
|
|
678
524
|
dataLoader = h(_DataLoaderManager, {
|
|
679
525
|
key: "__data_loader",
|
|
680
526
|
fetchData: activeProvider.fetchData,
|
|
681
|
-
pageSize: isLocalProvider
|
|
682
|
-
? Math.max(sourceData?.length ?? 1, 1)
|
|
683
|
-
: pageSize,
|
|
527
|
+
pageSize: isLocalProvider ? Math.max(localCount, 1) : pageSize,
|
|
684
528
|
fetchMode: isLocalProvider ? undefined : fetchMode,
|
|
685
529
|
});
|
|
686
530
|
}
|
|
@@ -689,13 +533,13 @@ function _DataSheet<T>({
|
|
|
689
533
|
|
|
690
534
|
let filterStatus: ReactNode = null;
|
|
691
535
|
if (showFilterBar) {
|
|
692
|
-
filterStatus = h(
|
|
536
|
+
filterStatus = h(ActiveFiltersList, { filters: filters ?? [] });
|
|
693
537
|
}
|
|
694
538
|
|
|
695
539
|
return h("div.data-sheet-container", { className, style }, [
|
|
696
540
|
// The actions/tools toolbar (selection-modal). Table-scoped controls like
|
|
697
541
|
// scroll-to-row / full-text search live here as ordinary actions.
|
|
698
|
-
h(ActionsToolbar, { actions: _actions
|
|
542
|
+
h(ActionsToolbar, { actions: _actions }),
|
|
699
543
|
dataLoader,
|
|
700
544
|
children,
|
|
701
545
|
h(
|
|
@@ -708,7 +552,7 @@ function _DataSheet<T>({
|
|
|
708
552
|
style: holderStyle,
|
|
709
553
|
},
|
|
710
554
|
h(
|
|
711
|
-
Table,
|
|
555
|
+
Table as any, // Some sort of hyperscript type error
|
|
712
556
|
{
|
|
713
557
|
ref,
|
|
714
558
|
numRows,
|
|
@@ -718,11 +562,10 @@ function _DataSheet<T>({
|
|
|
718
562
|
focusedCell,
|
|
719
563
|
selectedRegions,
|
|
720
564
|
defaultRowHeight: rowHeight,
|
|
721
|
-
minRowHeight: rowHeight,
|
|
722
565
|
columnWidths,
|
|
723
566
|
onColumnWidthChanged,
|
|
724
567
|
onSelection,
|
|
725
|
-
/** TODO: we could enable this
|
|
568
|
+
/** TODO: we could enable this if we had a use-case */
|
|
726
569
|
enableRowReordering: false,
|
|
727
570
|
enableRowResizing: false,
|
|
728
571
|
// The cell renderer is memoized internally based on these data dependencies
|
|
@@ -730,7 +573,7 @@ function _DataSheet<T>({
|
|
|
730
573
|
onVisibleCellsChange: _onVisibleCellsChange,
|
|
731
574
|
rowHeaderCellRenderer,
|
|
732
575
|
selectionModes: _selectionModes,
|
|
733
|
-
...
|
|
576
|
+
...tableProps,
|
|
734
577
|
getCellClipboardData: null,
|
|
735
578
|
},
|
|
736
579
|
realizedColumns,
|
|
@@ -742,7 +585,7 @@ function _DataSheet<T>({
|
|
|
742
585
|
h("div.spacer"),
|
|
743
586
|
h.if(_showLoadProgress)(LoadProgressIndicator),
|
|
744
587
|
]),
|
|
745
|
-
h.if(
|
|
588
|
+
h.if(debug)(CellRendererDebugOverlay, {
|
|
746
589
|
cellRendererDependencies,
|
|
747
590
|
names: [
|
|
748
591
|
"data",
|
|
@@ -755,8 +598,14 @@ function _DataSheet<T>({
|
|
|
755
598
|
]);
|
|
756
599
|
}
|
|
757
600
|
|
|
758
|
-
const
|
|
759
|
-
|
|
601
|
+
const EMPTY_MAP = new Map<string, number>();
|
|
602
|
+
|
|
603
|
+
const columnWidthsIndexAtom = atom(
|
|
604
|
+
(get) => get(storeAtom)?.columnWidthsIndex ?? EMPTY_MAP,
|
|
605
|
+
);
|
|
606
|
+
const defaultColumnWidthAtom = atom(
|
|
607
|
+
(get) => get(storeAtom)?.defaultColumnWidth ?? 150,
|
|
608
|
+
);
|
|
760
609
|
|
|
761
610
|
const columnWidthsAtom = atom((get) => {
|
|
762
611
|
const ix = get(columnWidthsIndexAtom);
|
|
@@ -765,7 +614,10 @@ const columnWidthsAtom = atom((get) => {
|
|
|
765
614
|
);
|
|
766
615
|
});
|
|
767
616
|
|
|
768
|
-
function styleParamsForDensity(density: DataSheetDensity) {
|
|
617
|
+
function styleParamsForDensity(density: DataSheetDensity): {
|
|
618
|
+
rowHeight: number;
|
|
619
|
+
style: Record<string, string>;
|
|
620
|
+
} {
|
|
769
621
|
switch (density) {
|
|
770
622
|
case DataSheetDensity.MEDIUM:
|
|
771
623
|
return {
|
|
@@ -806,17 +658,3 @@ function _DataLoaderManager<T = any>({
|
|
|
806
658
|
useDataLoader(fetchData, rest);
|
|
807
659
|
return null;
|
|
808
660
|
}
|
|
809
|
-
|
|
810
|
-
export function getRowsToDelete(selection) {
|
|
811
|
-
let rowIndices: number[] = [];
|
|
812
|
-
for (const sel of selection) {
|
|
813
|
-
// This isn't a full-row selection
|
|
814
|
-
if (sel.cols != null) continue;
|
|
815
|
-
if (sel.rows == null) continue;
|
|
816
|
-
const [startIndex, endIndex] = sel.rows;
|
|
817
|
-
for (let i = startIndex; i <= endIndex; i++) {
|
|
818
|
-
rowIndices.push(i);
|
|
819
|
-
}
|
|
820
|
-
}
|
|
821
|
-
return rowIndices;
|
|
822
|
-
}
|