@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
|
@@ -6,13 +6,16 @@
|
|
|
6
6
|
* omit them, replace them, or add their own controls at any cardinality.
|
|
7
7
|
*/
|
|
8
8
|
import h from "@macrostrat/hyper";
|
|
9
|
-
import { useMemo } from "react";
|
|
10
|
-
import { Button, Menu, MenuItem, PopoverNext } from "@blueprintjs/core";
|
|
11
9
|
import { RegionCardinality } from "@blueprintjs/table";
|
|
12
|
-
import {
|
|
13
|
-
import type {
|
|
14
|
-
import
|
|
15
|
-
import {
|
|
10
|
+
import type { TableAction } from "./types";
|
|
11
|
+
import type { ColumnSpec } from "../provider";
|
|
12
|
+
import { TableActionContext } from "./context.ts";
|
|
13
|
+
import {
|
|
14
|
+
ColumnFilterControl,
|
|
15
|
+
ColumnFilterMenu,
|
|
16
|
+
ColumnSortIndicator,
|
|
17
|
+
ColumnSortMenu,
|
|
18
|
+
} from "../components";
|
|
16
19
|
|
|
17
20
|
function selectedColumn(ctx: TableActionContext) {
|
|
18
21
|
const key = ctx.getSelectedColumnKeys()[0];
|
|
@@ -22,96 +25,6 @@ function selectedColumn(ctx: TableActionContext) {
|
|
|
22
25
|
|
|
23
26
|
// ---- Sort ----
|
|
24
27
|
|
|
25
|
-
function ColumnSortControl({ columnKey }: { columnKey: string }) {
|
|
26
|
-
const storeAPI = useStoreAPI();
|
|
27
|
-
const sort = useSelector((s) => s.columnSorts.find((x) => x.key === columnKey));
|
|
28
|
-
const set = (ascending: boolean | null) =>
|
|
29
|
-
storeAPI.getState().setColumnSort(columnKey, ascending);
|
|
30
|
-
|
|
31
|
-
const icon = sort == null ? "sort" : sort.ascending ? "sort-asc" : "sort-desc";
|
|
32
|
-
const label =
|
|
33
|
-
sort == null ? "Sort" : sort.ascending ? "Ascending" : "Descending";
|
|
34
|
-
|
|
35
|
-
return h(
|
|
36
|
-
PopoverNext,
|
|
37
|
-
{
|
|
38
|
-
placement: "bottom-start",
|
|
39
|
-
content: h(Menu, [
|
|
40
|
-
h(MenuItem, {
|
|
41
|
-
key: "asc",
|
|
42
|
-
text: "Ascending",
|
|
43
|
-
icon: "sort-asc",
|
|
44
|
-
active: sort?.ascending === true,
|
|
45
|
-
onClick: () => set(true),
|
|
46
|
-
}),
|
|
47
|
-
h(MenuItem, {
|
|
48
|
-
key: "desc",
|
|
49
|
-
text: "Descending",
|
|
50
|
-
icon: "sort-desc",
|
|
51
|
-
active: sort?.ascending === false,
|
|
52
|
-
onClick: () => set(false),
|
|
53
|
-
}),
|
|
54
|
-
h(MenuItem, {
|
|
55
|
-
key: "clear",
|
|
56
|
-
text: "Clear sort",
|
|
57
|
-
icon: "cross",
|
|
58
|
-
disabled: sort == null,
|
|
59
|
-
onClick: () => set(null),
|
|
60
|
-
}),
|
|
61
|
-
]),
|
|
62
|
-
},
|
|
63
|
-
h(
|
|
64
|
-
Button,
|
|
65
|
-
{
|
|
66
|
-
small: true,
|
|
67
|
-
minimal: true,
|
|
68
|
-
icon,
|
|
69
|
-
rightIcon: "caret-down",
|
|
70
|
-
intent: sort != null ? "primary" : "none",
|
|
71
|
-
},
|
|
72
|
-
label,
|
|
73
|
-
),
|
|
74
|
-
);
|
|
75
|
-
}
|
|
76
|
-
|
|
77
|
-
/** Menu-native sort: a "Sort" item whose submenu holds Ascending / Descending.
|
|
78
|
-
* Clicking the *active* direction again clears the sort (toggle off) — there's
|
|
79
|
-
* no explicit "Clear" item, since the active-filter/sort tag in the status bar
|
|
80
|
-
* already offers direct removal. */
|
|
81
|
-
function ColumnSortMenu({ columnKey }: { columnKey: string }) {
|
|
82
|
-
const storeAPI = useStoreAPI();
|
|
83
|
-
const sort = useSelector((s) => s.columnSorts.find((x) => x.key === columnKey));
|
|
84
|
-
const toggle = (ascending: boolean) => {
|
|
85
|
-
const store = storeAPI.getState();
|
|
86
|
-
// A second click on the current direction toggles the sort off.
|
|
87
|
-
const next = sort != null && sort.ascending === ascending ? null : ascending;
|
|
88
|
-
store.setColumnSort(columnKey, next);
|
|
89
|
-
};
|
|
90
|
-
const icon = sort == null ? "sort" : sort.ascending ? "sort-asc" : "sort-desc";
|
|
91
|
-
return h(
|
|
92
|
-
MenuItem,
|
|
93
|
-
{ icon, text: "Sort" },
|
|
94
|
-
[
|
|
95
|
-
h(MenuItem, {
|
|
96
|
-
key: "asc",
|
|
97
|
-
icon: "sort-asc",
|
|
98
|
-
text: "Ascending",
|
|
99
|
-
active: sort?.ascending === true,
|
|
100
|
-
shouldDismissPopover: false,
|
|
101
|
-
onClick: () => toggle(true),
|
|
102
|
-
}),
|
|
103
|
-
h(MenuItem, {
|
|
104
|
-
key: "desc",
|
|
105
|
-
icon: "sort-desc",
|
|
106
|
-
text: "Descending",
|
|
107
|
-
active: sort?.ascending === false,
|
|
108
|
-
shouldDismissPopover: false,
|
|
109
|
-
onClick: () => toggle(false),
|
|
110
|
-
}),
|
|
111
|
-
],
|
|
112
|
-
);
|
|
113
|
-
}
|
|
114
|
-
|
|
115
28
|
/** Single-column sort control. Gated by `col.sortable`. */
|
|
116
29
|
export const columnSortAction: TableAction = {
|
|
117
30
|
id: "column-sort",
|
|
@@ -124,161 +37,15 @@ export const columnSortAction: TableAction = {
|
|
|
124
37
|
render(ctx) {
|
|
125
38
|
const col = selectedColumn(ctx);
|
|
126
39
|
if (!col?.sortable) return null;
|
|
127
|
-
return h(
|
|
40
|
+
return h(ColumnSortIndicator, { columnKey: col.key, large: true });
|
|
128
41
|
},
|
|
129
42
|
renderMenuItem(ctx) {
|
|
130
43
|
const col = selectedColumn(ctx);
|
|
131
44
|
if (!col?.sortable) return null;
|
|
132
|
-
return h(ColumnSortMenu, { columnKey: col.key });
|
|
45
|
+
return h(ColumnSortMenu, { columnKey: col.key, defaultLabel: "Sort" });
|
|
133
46
|
},
|
|
134
47
|
};
|
|
135
48
|
|
|
136
|
-
// ---- Filter ----
|
|
137
|
-
|
|
138
|
-
/** The filter offered for a column: its own rich `TableFilter` (from
|
|
139
|
-
* `col.filters`) when present — so the header matches the top bar and the rich
|
|
140
|
-
* filter is prioritized — else the built-in operator `columnFilter`. */
|
|
141
|
-
function resolveColumnFilter(col: ColumnSpec): TableFilter {
|
|
142
|
-
const rich = (col.filters as TableFilter[] | undefined)?.find(
|
|
143
|
-
(f) => (f.columnKey ?? col.key) === col.key,
|
|
144
|
-
);
|
|
145
|
-
if (rich != null) return { ...rich, columnKey: rich.columnKey ?? col.key };
|
|
146
|
-
return columnFilter(col);
|
|
147
|
-
}
|
|
148
|
-
|
|
149
|
-
function ColumnFilterControl({ col }: { col: ColumnSpec }) {
|
|
150
|
-
const storeAPI = useStoreAPI();
|
|
151
|
-
// Same `TableFilter` the FilterBar and any provider consume, so the header,
|
|
152
|
-
// the bar, and the query stay in sync (rich filter prioritized).
|
|
153
|
-
const filter = useMemo(() => resolveColumnFilter(col), [col]);
|
|
154
|
-
const state = useSelector((s) => s.activeFilters.get(filter.id)?.state);
|
|
155
|
-
const isActive = state != null;
|
|
156
|
-
const summary = isActive ? filter.describeState?.(state) : null;
|
|
157
|
-
|
|
158
|
-
const setState = (next: any) => {
|
|
159
|
-
const store = storeAPI.getState();
|
|
160
|
-
// An empty operator-filter value clears; otherwise activate/update.
|
|
161
|
-
if (next == null || next.value === "") {
|
|
162
|
-
store.removeFilter(filter.id);
|
|
163
|
-
} else {
|
|
164
|
-
store.setFilter(filter.id, filter, next);
|
|
165
|
-
}
|
|
166
|
-
};
|
|
167
|
-
|
|
168
|
-
const label = isActive ? String(summary ?? filter.name) : "Filter";
|
|
169
|
-
|
|
170
|
-
return h(
|
|
171
|
-
PopoverNext,
|
|
172
|
-
{
|
|
173
|
-
placement: "bottom-start",
|
|
174
|
-
content: h(
|
|
175
|
-
"div",
|
|
176
|
-
{ style: { padding: "6px", minWidth: "220px" } },
|
|
177
|
-
filter.filterForm != null
|
|
178
|
-
? h(filter.filterForm, {
|
|
179
|
-
state: state ?? filter.defaultState,
|
|
180
|
-
setState,
|
|
181
|
-
})
|
|
182
|
-
: null,
|
|
183
|
-
),
|
|
184
|
-
},
|
|
185
|
-
h(
|
|
186
|
-
Button,
|
|
187
|
-
{
|
|
188
|
-
small: true,
|
|
189
|
-
minimal: true,
|
|
190
|
-
icon: "filter",
|
|
191
|
-
rightIcon: "caret-down",
|
|
192
|
-
intent: isActive ? "primary" : "none",
|
|
193
|
-
},
|
|
194
|
-
label,
|
|
195
|
-
),
|
|
196
|
-
);
|
|
197
|
-
}
|
|
198
|
-
|
|
199
|
-
/** Every filter applicable to a column: its rich `col.filters` (there may be
|
|
200
|
-
* several) plus the built-in operator `columnFilter` when the column is
|
|
201
|
-
* `filterable` and no rich filter already targets it. The menu lists all of
|
|
202
|
-
* them; the toolbar's `render` collapses to `resolveColumnFilter` (a single
|
|
203
|
-
* control). */
|
|
204
|
-
function applicableColumnFilters(col: ColumnSpec): TableFilter[] {
|
|
205
|
-
const result: TableFilter[] = [];
|
|
206
|
-
const rich = (col.filters as TableFilter[] | undefined) ?? [];
|
|
207
|
-
for (const f of rich) {
|
|
208
|
-
result.push({ ...f, columnKey: f.columnKey ?? col.key });
|
|
209
|
-
}
|
|
210
|
-
const hasOwnColumnFilter = result.some((r) => r.columnKey === col.key);
|
|
211
|
-
if (
|
|
212
|
-
(col.filterable === true || typeof col.filterable === "object") &&
|
|
213
|
-
!hasOwnColumnFilter
|
|
214
|
-
) {
|
|
215
|
-
result.push(columnFilter(col));
|
|
216
|
-
}
|
|
217
|
-
return result;
|
|
218
|
-
}
|
|
219
|
-
|
|
220
|
-
/** One filter, as a menu item whose submenu carries its edit form. Active
|
|
221
|
-
* filters get a warning intent and show their `describeState` summary. The
|
|
222
|
-
* displayed `label` may differ from `filter.name` (e.g. the built-in operator
|
|
223
|
-
* filter reads "Filter" in a column's own menu, where the column is implicit). */
|
|
224
|
-
function ColumnFilterMenuItem({
|
|
225
|
-
filter,
|
|
226
|
-
label,
|
|
227
|
-
}: {
|
|
228
|
-
filter: TableFilter;
|
|
229
|
-
label: string;
|
|
230
|
-
}) {
|
|
231
|
-
const storeAPI = useStoreAPI();
|
|
232
|
-
const state = useSelector((s) => s.activeFilters.get(filter.id)?.state);
|
|
233
|
-
const isActive = state != null;
|
|
234
|
-
const summary = isActive ? filter.describeState?.(state) : null;
|
|
235
|
-
|
|
236
|
-
const setState = (next: any) => {
|
|
237
|
-
const store = storeAPI.getState();
|
|
238
|
-
if (next == null || next.value === "") {
|
|
239
|
-
store.removeFilter(filter.id);
|
|
240
|
-
} else {
|
|
241
|
-
store.setFilter(filter.id, filter, next);
|
|
242
|
-
}
|
|
243
|
-
};
|
|
244
|
-
|
|
245
|
-
return h(
|
|
246
|
-
MenuItem,
|
|
247
|
-
{
|
|
248
|
-
icon: filter.icon ?? "filter",
|
|
249
|
-
text: label,
|
|
250
|
-
label: summary != null ? String(summary) : undefined,
|
|
251
|
-
intent: isActive ? "primary" : undefined,
|
|
252
|
-
shouldDismissPopover: false,
|
|
253
|
-
},
|
|
254
|
-
filter.filterForm != null
|
|
255
|
-
? h(
|
|
256
|
-
"div.filter-menu-form",
|
|
257
|
-
{ style: { padding: "6px", minWidth: "220px" } },
|
|
258
|
-
h(filter.filterForm, { state: state ?? filter.defaultState, setState }),
|
|
259
|
-
)
|
|
260
|
-
: null,
|
|
261
|
-
);
|
|
262
|
-
}
|
|
263
|
-
|
|
264
|
-
/** Menu-native filter: one item per applicable filter, each opening its form
|
|
265
|
-
* in a submenu. */
|
|
266
|
-
function ColumnFilterMenu({ col }: { col: ColumnSpec }) {
|
|
267
|
-
const filters = useMemo(() => applicableColumnFilters(col), [col]);
|
|
268
|
-
const builtinId = columnFilterId(col.key);
|
|
269
|
-
return h(
|
|
270
|
-
filters.map((f) =>
|
|
271
|
-
h(ColumnFilterMenuItem, {
|
|
272
|
-
key: f.id,
|
|
273
|
-
filter: f,
|
|
274
|
-
// The generic operator filter is just "Filter" in its own column's
|
|
275
|
-
// menu; rich (user-provided) filters keep their descriptive names.
|
|
276
|
-
label: f.id === builtinId ? "Filter" : f.name,
|
|
277
|
-
}),
|
|
278
|
-
),
|
|
279
|
-
);
|
|
280
|
-
}
|
|
281
|
-
|
|
282
49
|
/** Single-column filter control. Gated by `col.filterable`. */
|
|
283
50
|
export const columnFilterAction: TableAction = {
|
|
284
51
|
id: "column-filter",
|
|
@@ -311,6 +78,6 @@ export function isColumnFilterable(col: ColumnSpec): boolean {
|
|
|
311
78
|
|
|
312
79
|
/** The built-in column controls (sort + filter), for inclusion in `actions`. */
|
|
313
80
|
export const columnControlActions: TableAction[] = [
|
|
314
|
-
columnSortAction,
|
|
315
81
|
columnFilterAction,
|
|
82
|
+
columnSortAction,
|
|
316
83
|
];
|
|
@@ -9,16 +9,15 @@
|
|
|
9
9
|
* (overridable via `filterable: { operators }`).
|
|
10
10
|
*/
|
|
11
11
|
import hyper from "@macrostrat/hyper";
|
|
12
|
-
import {
|
|
13
|
-
import {
|
|
14
|
-
import type { ColumnSpec } from "../utils/column-spec";
|
|
15
|
-
import type { TableFilter } from "./types";
|
|
12
|
+
import type { ColumnSpec } from "../provider/column-spec.ts";
|
|
13
|
+
import type { ColumnFilterOptions, TableFilter } from "./types";
|
|
16
14
|
import {
|
|
17
15
|
FilterOperator,
|
|
18
16
|
getOperatorsForColumn,
|
|
19
17
|
OPERATOR_LABELS,
|
|
20
18
|
testFilterOperator,
|
|
21
19
|
} from "../filters/operators";
|
|
20
|
+
import { ColumnFilterForm } from "../components";
|
|
22
21
|
|
|
23
22
|
const h = hyper;
|
|
24
23
|
|
|
@@ -32,102 +31,39 @@ export function columnFilterId(key: string): string {
|
|
|
32
31
|
return `column-filter:${key}`;
|
|
33
32
|
}
|
|
34
33
|
|
|
35
|
-
/**
|
|
36
|
-
export function
|
|
34
|
+
/** Built-in column filter for a column. */
|
|
35
|
+
export function buildMultiOperatorColumnFilter(
|
|
37
36
|
col: ColumnSpec,
|
|
38
37
|
): TableFilter<any, ColumnFilterState> {
|
|
39
38
|
const operators = getOperatorsForColumn(col);
|
|
40
|
-
return {
|
|
41
|
-
id:
|
|
42
|
-
name: col.name,
|
|
39
|
+
return enhanceColumnFilter(col, {
|
|
40
|
+
id: "default",
|
|
43
41
|
icon: "filter",
|
|
44
|
-
columnKey: col.key,
|
|
45
42
|
defaultState: { operator: operators[0], value: "" },
|
|
46
|
-
describeState: (s) =>
|
|
47
|
-
s?.value
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
43
|
+
describeState: (s) => {
|
|
44
|
+
const val = s?.value;
|
|
45
|
+
if (val == null || val === "") return null;
|
|
46
|
+
const op = OPERATOR_LABELS[s.operator] ?? s.operator;
|
|
47
|
+
return `${op} ${val}`;
|
|
48
|
+
},
|
|
49
|
+
predicate: (row, s) => {
|
|
50
|
+
return testFilterOperator(row?.[col.key], s.operator, s.value);
|
|
51
|
+
},
|
|
52
52
|
filterForm: ({ state, setState }) =>
|
|
53
53
|
h(ColumnFilterForm, { operators, state, setState }),
|
|
54
|
-
};
|
|
54
|
+
});
|
|
55
55
|
}
|
|
56
56
|
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
// filter (so the store round-trips back to the default state), which would
|
|
69
|
-
// otherwise snap the dropdown back to the default — the operator wouldn't
|
|
70
|
-
// "stick" until a value was typed. The value commits (triggering a server
|
|
71
|
-
// re-fetch) on blur / Enter, not on every keystroke.
|
|
72
|
-
const [op, setOp] = useState<FilterOperator>(
|
|
73
|
-
state?.operator ?? operators[0],
|
|
74
|
-
);
|
|
75
|
-
const [val, setVal] = useState<string>(state?.value ?? "");
|
|
76
|
-
|
|
77
|
-
const commit = (nextOp: FilterOperator, nextVal: string) =>
|
|
78
|
-
setState({ operator: nextOp, value: nextVal });
|
|
79
|
-
|
|
80
|
-
const clear = () => {
|
|
81
|
-
setVal("");
|
|
82
|
-
commit(op, "");
|
|
57
|
+
/** Enhance column filter into a full TableFilter object. */
|
|
58
|
+
export function enhanceColumnFilter(
|
|
59
|
+
col: ColumnSpec,
|
|
60
|
+
f: ColumnFilterOptions,
|
|
61
|
+
): TableFilter<any, ColumnFilterState> {
|
|
62
|
+
return {
|
|
63
|
+
...f,
|
|
64
|
+
id: `column-filter:${col.key}:${f.id}`,
|
|
65
|
+
name: f.name ?? col.name,
|
|
66
|
+
subject: col.name,
|
|
67
|
+
columnKey: col.key,
|
|
83
68
|
};
|
|
84
|
-
|
|
85
|
-
return h(
|
|
86
|
-
"div",
|
|
87
|
-
{ style: { display: "flex", flexDirection: "column", gap: "6px" } },
|
|
88
|
-
[
|
|
89
|
-
// Compact header: title + operator on one row (with a clear ✕ when set),
|
|
90
|
-
// value on the next — space-efficient and full-width for the value.
|
|
91
|
-
h(
|
|
92
|
-
"div",
|
|
93
|
-
{ style: { display: "flex", alignItems: "center", gap: "6px" } },
|
|
94
|
-
[
|
|
95
|
-
h("span", { style: { fontWeight: 600 } }, "Filter"),
|
|
96
|
-
h(HTMLSelect, {
|
|
97
|
-
small: true,
|
|
98
|
-
value: op,
|
|
99
|
-
options: operators.map((o) => ({
|
|
100
|
-
value: o,
|
|
101
|
-
label: OPERATOR_LABELS[o] ?? o,
|
|
102
|
-
})),
|
|
103
|
-
onChange: (e) => {
|
|
104
|
-
const nextOp = e.currentTarget.value as FilterOperator;
|
|
105
|
-
setOp(nextOp);
|
|
106
|
-
commit(nextOp, val);
|
|
107
|
-
},
|
|
108
|
-
}),
|
|
109
|
-
h("div", { style: { flex: 1 } }),
|
|
110
|
-
h.if(val !== "")(Button, {
|
|
111
|
-
small: true,
|
|
112
|
-
minimal: true,
|
|
113
|
-
icon: "cross",
|
|
114
|
-
"aria-label": "Clear filter",
|
|
115
|
-
onClick: clear,
|
|
116
|
-
}),
|
|
117
|
-
],
|
|
118
|
-
),
|
|
119
|
-
h(InputGroup, {
|
|
120
|
-
small: true,
|
|
121
|
-
fill: true,
|
|
122
|
-
value: val,
|
|
123
|
-
placeholder: "value",
|
|
124
|
-
autoFocus: true,
|
|
125
|
-
onChange: (e) => setVal(e.target.value),
|
|
126
|
-
onBlur: () => commit(op, val),
|
|
127
|
-
onKeyDown: (e) => {
|
|
128
|
-
if (e.key === "Enter") commit(op, val);
|
|
129
|
-
},
|
|
130
|
-
}),
|
|
131
|
-
],
|
|
132
|
-
);
|
|
133
69
|
}
|