@macrostrat/data-sheet 4.3.0 → 4.4.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 +74 -0
- package/dist/components/indicators/filter-and-sort.cjs +14 -3
- package/dist/components/indicators/filter-and-sort.cjs.map +1 -1
- package/dist/components/indicators/filter-and-sort.d.ts +21 -1
- package/dist/components/indicators/filter-and-sort.js +14 -3
- package/dist/components/indicators/filter-and-sort.js.map +1 -1
- package/dist/components/indicators/filter-and-sort.module.sass.cjs +7 -5
- package/dist/components/indicators/filter-and-sort.module.sass.cjs.map +1 -1
- package/dist/components/indicators/filter-and-sort.module.sass.js +7 -5
- package/dist/components/indicators/filter-and-sort.module.sass.js.map +1 -1
- package/dist/components/indicators/selection.cjs +7 -12
- package/dist/components/indicators/selection.cjs.map +1 -1
- package/dist/components/indicators/selection.d.ts +5 -0
- package/dist/components/indicators/selection.js +9 -14
- package/dist/components/indicators/selection.js.map +1 -1
- package/dist/components/indicators/unified-filters.cjs +130 -11
- package/dist/components/indicators/unified-filters.cjs.map +1 -1
- package/dist/components/indicators/unified-filters.d.ts +8 -1
- package/dist/components/indicators/unified-filters.js +132 -13
- package/dist/components/indicators/unified-filters.js.map +1 -1
- package/dist/components/toolbars/actions-toolbar.module.sass.cjs +12 -12
- package/dist/components/toolbars/actions-toolbar.module.sass.js +12 -12
- package/dist/data-panel.cjs +12 -4
- package/dist/data-panel.cjs.map +1 -1
- package/dist/data-panel.d.ts +14 -2
- package/dist/data-panel.js +13 -5
- package/dist/data-panel.js.map +1 -1
- package/dist/data-panel.module.sass.cjs +25 -24
- package/dist/data-panel.module.sass.cjs.map +1 -1
- package/dist/data-panel.module.sass.js +25 -24
- package/dist/data-panel.module.sass.js.map +1 -1
- package/dist/data-sheet.css +57 -54
- package/dist/index.cjs +4 -0
- package/dist/index.cjs.map +1 -1
- package/dist/index.js +7 -3
- package/dist/provider/interactions.cjs +14 -0
- package/dist/provider/interactions.cjs.map +1 -1
- package/dist/provider/interactions.d.ts +19 -0
- package/dist/provider/interactions.js +15 -1
- package/dist/provider/interactions.js.map +1 -1
- package/dist/provider/selection.cjs +2 -2
- package/dist/provider/selection.cjs.map +1 -1
- package/dist/provider/selection.js +3 -3
- package/dist/provider/selection.js.map +1 -1
- package/dist/provider/zustand-store.cjs +13 -6
- package/dist/provider/zustand-store.cjs.map +1 -1
- package/dist/provider/zustand-store.js +13 -6
- package/dist/provider/zustand-store.js.map +1 -1
- package/package.json +4 -4
- package/src/components/indicators/filter-and-sort.module.sass +2 -2
- package/src/components/indicators/filter-and-sort.ts +31 -2
- package/src/components/indicators/selection.ts +10 -15
- package/src/components/indicators/unified-filters.ts +189 -13
- package/src/components/toolbars/actions-toolbar.module.sass +1 -1
- package/src/data-panel.module.sass +7 -3
- package/src/data-panel.ts +28 -4
- package/src/provider/interactions.ts +31 -0
- package/src/provider/selection.ts +3 -3
- package/src/provider/zustand-store.ts +23 -5
|
@@ -3,7 +3,7 @@ import { RegionCardinality } from "@blueprintjs/table";
|
|
|
3
3
|
import classNames from "classnames";
|
|
4
4
|
import h from "./selection.module.sass.js";
|
|
5
5
|
import { Tag } from "@blueprintjs/core";
|
|
6
|
-
import { interactionOptionsAtom } from "../../provider/interactions.js";
|
|
6
|
+
import { interactionOptionsAtom, enableSelectionAtom } from "../../provider/interactions.js";
|
|
7
7
|
import { ctx, tableNameAtom, itemLabelAtom, columnSpecAtom, pluralize } from "../../provider/core.js";
|
|
8
8
|
import { selectionAtom } from "../../provider/selection.js";
|
|
9
9
|
import { computeSelectionShape, getSelectedColumnKeys } from "../../actions/selection.js";
|
|
@@ -40,17 +40,10 @@ function itemCount(n, itemType) {
|
|
|
40
40
|
return `${n} ` + pluralize(itemType, n);
|
|
41
41
|
}
|
|
42
42
|
const toggleModalSelectionAtom = atom(null, (get, set) => {
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
set(clearableSelectionAtom);
|
|
48
|
-
}
|
|
49
|
-
set(interactionOptionsAtom, {
|
|
50
|
-
...interactionState,
|
|
51
|
-
enableSelection
|
|
52
|
-
});
|
|
53
|
-
}
|
|
43
|
+
if (!get(interactionOptionsAtom).enableModalSelection) return;
|
|
44
|
+
const next = !get(enableSelectionAtom);
|
|
45
|
+
if (!next) set(clearableSelectionAtom);
|
|
46
|
+
set(enableSelectionAtom, next);
|
|
54
47
|
});
|
|
55
48
|
const clearableSelectionAtom = atom(
|
|
56
49
|
(get) => get(selectionAtom),
|
|
@@ -63,7 +56,8 @@ function SelectionIndicator({ minimal = true }) {
|
|
|
63
56
|
const interactionState = ctx.useValue(interactionOptionsAtom);
|
|
64
57
|
const tableName = ctx.useValue(tableNameAtom);
|
|
65
58
|
const toggleModalSelection = ctx.useSet(toggleModalSelectionAtom);
|
|
66
|
-
const { enableModalSelection
|
|
59
|
+
const { enableModalSelection } = interactionState;
|
|
60
|
+
const enableSelection = ctx.useValue(enableSelectionAtom);
|
|
67
61
|
const hasSelection = selection != null && selection.length > 0;
|
|
68
62
|
let selectionName = ctx.useValue(selectionTitleAtom);
|
|
69
63
|
let _name = tableName;
|
|
@@ -106,6 +100,7 @@ function SelectionIndicator({ minimal = true }) {
|
|
|
106
100
|
]);
|
|
107
101
|
}
|
|
108
102
|
export {
|
|
109
|
-
SelectionIndicator
|
|
103
|
+
SelectionIndicator,
|
|
104
|
+
toggleModalSelectionAtom
|
|
110
105
|
};
|
|
111
106
|
//# sourceMappingURL=selection.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"selection.js","sources":["../../../src/components/indicators/selection.ts"],"sourcesContent":["import {\n columnSpecAtom,\n ctx,\n interactionOptionsAtom,\n itemLabelAtom,\n pluralize,\n selectionAtom,\n tableNameAtom,\n} from \"../../provider\";\nimport { atom } from \"jotai\";\nimport { computeSelectionShape, getSelectedColumnKeys } from \"../../actions\";\nimport { RegionCardinality } from \"@blueprintjs/table\";\nimport classNames from \"classnames\";\nimport h from \"./selection.module.sass\";\nimport { Tag } from \"@blueprintjs/core\";\n\n/** A short title describing the current selection (its shape), shown as the\n * toolbar's leading label — no icon. */\nconst selectionTitleAtom = atom<string | null>((get) => {\n const sel = get(selectionAtom);\n if (sel == null || sel.length === 0) return null;\n const sh = computeSelectionShape(sel);\n const itemName = get(itemLabelAtom);\n\n switch (sh.cardinality) {\n case RegionCardinality.FULL_COLUMNS: {\n if (sh.columns == 1) {\n const columnSpec = get(columnSpecAtom);\n const columnKey = getSelectedColumnKeys(sel, columnSpec)[0];\n const col = columnSpec.find((c) => c.key === columnKey);\n return col?.name ?? \"1 column\";\n }\n return itemCount(sh.columns, \"column\");\n }\n case RegionCardinality.FULL_ROWS:\n return itemCount(sh.rows, itemName);\n case RegionCardinality.CELLS:\n if (sh.columns == 1 || sh.rows == 1) {\n const nCells = Math.max(sh.columns, sh.rows);\n return itemCount(nCells, \"cell\");\n }\n return `${sh.columns}×${sh.rows} cells`;\n case RegionCardinality.FULL_TABLE:\n return null;\n default:\n return null;\n }\n});\n\nfunction itemCount(n: number, itemType: string) {\n return `${n} ` + pluralize(itemType, n);\n}\n\
|
|
1
|
+
{"version":3,"file":"selection.js","sources":["../../../src/components/indicators/selection.ts"],"sourcesContent":["import {\n columnSpecAtom,\n ctx,\n enableSelectionAtom,\n interactionOptionsAtom,\n itemLabelAtom,\n pluralize,\n selectionAtom,\n tableNameAtom,\n} from \"../../provider\";\nimport { atom } from \"jotai\";\nimport { computeSelectionShape, getSelectedColumnKeys } from \"../../actions\";\nimport { RegionCardinality } from \"@blueprintjs/table\";\nimport classNames from \"classnames\";\nimport h from \"./selection.module.sass\";\nimport { Tag } from \"@blueprintjs/core\";\n\n/** A short title describing the current selection (its shape), shown as the\n * toolbar's leading label — no icon. */\nconst selectionTitleAtom = atom<string | null>((get) => {\n const sel = get(selectionAtom);\n if (sel == null || sel.length === 0) return null;\n const sh = computeSelectionShape(sel);\n const itemName = get(itemLabelAtom);\n\n switch (sh.cardinality) {\n case RegionCardinality.FULL_COLUMNS: {\n if (sh.columns == 1) {\n const columnSpec = get(columnSpecAtom);\n const columnKey = getSelectedColumnKeys(sel, columnSpec)[0];\n const col = columnSpec.find((c) => c.key === columnKey);\n return col?.name ?? \"1 column\";\n }\n return itemCount(sh.columns, \"column\");\n }\n case RegionCardinality.FULL_ROWS:\n return itemCount(sh.rows, itemName);\n case RegionCardinality.CELLS:\n if (sh.columns == 1 || sh.rows == 1) {\n const nCells = Math.max(sh.columns, sh.rows);\n return itemCount(nCells, \"cell\");\n }\n return `${sh.columns}×${sh.rows} cells`;\n case RegionCardinality.FULL_TABLE:\n return null;\n default:\n return null;\n }\n});\n\nfunction itemCount(n: number, itemType: string) {\n return `${n} ` + pluralize(itemType, n);\n}\n\n/** Enter/leave select mode. Leaving clears the selection — it has to happen\n * *before* selection is switched off, since the selection write is gated on it. */\nexport const toggleModalSelectionAtom = atom(null, (get, set) => {\n if (!get(interactionOptionsAtom).enableModalSelection) return;\n const next = !get(enableSelectionAtom);\n if (!next) set(clearableSelectionAtom);\n set(enableSelectionAtom, next);\n});\nconst clearableSelectionAtom = atom(\n (get) => get(selectionAtom),\n (get, set) => {\n set(selectionAtom, []);\n },\n);\n\nexport function SelectionIndicator({ minimal = true }: { minimal?: boolean }) {\n /** An indicator that shows the table's current selection shape, and optionally modal selection status */\n // The leading title doubles as the clear-selection affordance: with an active\n // selection it renders as a dismissible tag (its ✕ clears the selection),\n // which ties \"clear\" to the selection it acts on and frees toolbar space.\n // With no selection it's a plain label (table name).\n // Both states render as a `large` `Tag` so the title keeps a constant font\n // and height; only the selected one has a filled background + a ✕ (which\n // clears the selection). The unselected label is a transparent, non-removable\n // tag — visually a plain title, but the same box.\n\n const [selection, clearSelection] = ctx.use(clearableSelectionAtom);\n const interactionState = ctx.useValue(interactionOptionsAtom);\n const tableName = ctx.useValue(tableNameAtom);\n\n const toggleModalSelection = ctx.useSet(toggleModalSelectionAtom);\n const { enableModalSelection } = interactionState;\n const enableSelection = ctx.useValue(enableSelectionAtom);\n\n const hasSelection = selection != null && selection.length > 0;\n\n let selectionName: string | null = ctx.useValue(selectionTitleAtom);\n\n let _name = tableName;\n if (hasSelection) {\n _name = selectionName ?? tableName;\n } else if (enableModalSelection) {\n _name = \"Select\";\n }\n\n const isClearable = hasSelection || (enableModalSelection && enableSelection);\n\n if (minimal && !(hasSelection || enableModalSelection)) {\n return null;\n }\n\n let onClick = null;\n let icon: string | null = null;\n let enterSelectionButton: React.ReactNode = null;\n if (enableModalSelection) {\n onClick = toggleModalSelection;\n if (!isClearable) {\n icon = \"more\";\n }\n }\n\n const className = classNames(\"selection-indicator-tag\", {\n enabled: isClearable,\n interactive: onClick != null || hasSelection,\n });\n\n return h(\"div.selection-indicator\", [\n h(\n Tag,\n {\n minimal: true,\n large: true,\n onClick,\n rightIcon: icon,\n intent: isClearable ? \"primary\" : undefined,\n className,\n onRemove: isClearable ? clearSelection : undefined,\n },\n [_name, enterSelectionButton],\n ),\n ]);\n}\n"],"names":[],"mappings":"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"}
|
|
@@ -4,11 +4,13 @@ const react = require("react");
|
|
|
4
4
|
const dataPanel_module = require("../../data-panel.module.sass.cjs");
|
|
5
5
|
const core$1 = require("@blueprintjs/core");
|
|
6
6
|
const filterAndSort = require("./filter-and-sort.cjs");
|
|
7
|
+
const selection = require("./selection.cjs");
|
|
7
8
|
const jotai = require("jotai");
|
|
8
9
|
const columnControls = require("../../actions/column-controls.cjs");
|
|
9
10
|
const core = require("../../provider/core.cjs");
|
|
10
11
|
const editActions = require("../../actions/edit-actions.cjs");
|
|
11
|
-
|
|
12
|
+
const interactions = require("../../provider/interactions.cjs");
|
|
13
|
+
function useDataPanelControls(tableFilters = [], presentation = "inline") {
|
|
12
14
|
const columnSpec = core.useSelector((s) => s.columnSpec);
|
|
13
15
|
const entries = react.useMemo(() => {
|
|
14
16
|
const fromColumns = columnSpec.filter((c) => columnControls.isColumnFilterable(c)).map((c) => ({ filter: filterAndSort.resolveColumnFilter(c), label: c.name }));
|
|
@@ -23,6 +25,12 @@ function useDataPanelControls(tableFilters = []) {
|
|
|
23
25
|
);
|
|
24
26
|
const filterMenuAction = useFilterMenuAction(menuEntries);
|
|
25
27
|
const sortAction = useSortAction();
|
|
28
|
+
const collapsedAction = useCollapsedControlsAction(entries);
|
|
29
|
+
const exitSelectionAction = useExitSelectionAction();
|
|
30
|
+
if (exitSelectionAction != null) return [exitSelectionAction];
|
|
31
|
+
if (presentation === "popover" && collapsedAction != null) {
|
|
32
|
+
return [collapsedAction];
|
|
33
|
+
}
|
|
26
34
|
const actions = [];
|
|
27
35
|
for (const { filter } of inlineEntries) {
|
|
28
36
|
actions.push({
|
|
@@ -37,11 +45,122 @@ function useDataPanelControls(tableFilters = []) {
|
|
|
37
45
|
if (sortAction != null) actions.push(sortAction);
|
|
38
46
|
return actions;
|
|
39
47
|
}
|
|
48
|
+
function useCollapsedControlsAction(entries) {
|
|
49
|
+
const columnSpec = core.useSelector((s) => s.columnSpec);
|
|
50
|
+
const hasActiveFilters = core.ctx.useValue(hasActiveFiltersAtom);
|
|
51
|
+
const hasActiveSorts = core.ctx.useValue(hasActiveSortsAtom);
|
|
52
|
+
const sortableCols = react.useMemo(
|
|
53
|
+
() => columnSpec.filter((c) => c.sortable),
|
|
54
|
+
[columnSpec]
|
|
55
|
+
);
|
|
56
|
+
if (entries.length === 0 && sortableCols.length === 0) return null;
|
|
57
|
+
const inlineEntries = entries.filter(
|
|
58
|
+
(e) => presentationOf(e.filter) === "inline"
|
|
59
|
+
);
|
|
60
|
+
const menuEntries = entries.filter(
|
|
61
|
+
(e) => presentationOf(e.filter) !== "inline"
|
|
62
|
+
);
|
|
63
|
+
const items = [];
|
|
64
|
+
for (const { filter, label } of inlineEntries) {
|
|
65
|
+
items.push(
|
|
66
|
+
dataPanel_module.default(filterAndSort.MenuFormItem, { key: filter.id, title: label }, [
|
|
67
|
+
dataPanel_module.default(filterAndSort.InlineFilterControl, { filter })
|
|
68
|
+
])
|
|
69
|
+
);
|
|
70
|
+
}
|
|
71
|
+
if (menuEntries.length > 0) {
|
|
72
|
+
items.push(dataPanel_module.default(core$1.MenuDivider, { key: "filter-divider", title: "Filter" }));
|
|
73
|
+
for (const { filter, label } of menuEntries) {
|
|
74
|
+
if (presentationOf(filter) === "menu-inline") {
|
|
75
|
+
items.push(dataPanel_module.default(filterAndSort.MenuInlineFilterItem, { key: filter.id, filter, label }));
|
|
76
|
+
} else {
|
|
77
|
+
items.push(dataPanel_module.default(filterAndSort.ColumnFilterMenuItem, { key: filter.id, filter, label }));
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
if (sortableCols.length > 0) {
|
|
82
|
+
items.push(dataPanel_module.default(core$1.MenuDivider, { key: "sort-divider", title: "Sort" }));
|
|
83
|
+
for (const col of sortableCols) {
|
|
84
|
+
items.push(
|
|
85
|
+
dataPanel_module.default(filterAndSort.ColumnSortMenu, { key: col.key, columnKey: col.key, text: col.name })
|
|
86
|
+
);
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
let intent = "none";
|
|
90
|
+
if (hasActiveFilters || hasActiveSorts) intent = "primary";
|
|
91
|
+
return {
|
|
92
|
+
id: "view-controls",
|
|
93
|
+
name: "View",
|
|
94
|
+
icon: "filter-list",
|
|
95
|
+
description: "Search, filter and sort.",
|
|
96
|
+
targets: editActions.ALL_CARDINALITIES,
|
|
97
|
+
requiresEditable: false,
|
|
98
|
+
render: () => dataPanel_module.default(
|
|
99
|
+
filterAndSort.MenuDropdown,
|
|
100
|
+
{ content: dataPanel_module.default(core$1.Menu, { className: "collapsed-controls" }, items) },
|
|
101
|
+
[
|
|
102
|
+
dataPanel_module.default(core$1.Button, {
|
|
103
|
+
minimal: true,
|
|
104
|
+
small: true,
|
|
105
|
+
icon: "filter-list",
|
|
106
|
+
intent,
|
|
107
|
+
title: "Search, filter and sort"
|
|
108
|
+
})
|
|
109
|
+
]
|
|
110
|
+
)
|
|
111
|
+
};
|
|
112
|
+
}
|
|
113
|
+
function useExitSelectionAction() {
|
|
114
|
+
const { enableModalSelection } = core.ctx.useValue(interactions.interactionOptionsAtom);
|
|
115
|
+
const selecting = core.ctx.useValue(interactions.enableSelectionAtom);
|
|
116
|
+
const toggleSelectMode = core.ctx.useSet(selection.toggleModalSelectionAtom);
|
|
117
|
+
if (!enableModalSelection || !selecting) return null;
|
|
118
|
+
return {
|
|
119
|
+
id: "exit-selection",
|
|
120
|
+
name: "Filter",
|
|
121
|
+
icon: "filter",
|
|
122
|
+
description: "Leave select mode to filter and sort.",
|
|
123
|
+
targets: editActions.ALL_CARDINALITIES,
|
|
124
|
+
requiresEditable: false,
|
|
125
|
+
render: () => dataPanel_module.default(
|
|
126
|
+
core$1.Tag,
|
|
127
|
+
{
|
|
128
|
+
minimal: true,
|
|
129
|
+
large: true,
|
|
130
|
+
interactive: true,
|
|
131
|
+
icon: "filter",
|
|
132
|
+
title: "Filter and sort (leaves select mode)",
|
|
133
|
+
onClick: () => toggleSelectMode()
|
|
134
|
+
},
|
|
135
|
+
"Filter"
|
|
136
|
+
)
|
|
137
|
+
};
|
|
138
|
+
}
|
|
40
139
|
function presentationOf(filter) {
|
|
41
140
|
return filter.presentation ?? "menu";
|
|
42
141
|
}
|
|
43
|
-
function
|
|
44
|
-
const
|
|
142
|
+
function useFilterSubsetState(entries) {
|
|
143
|
+
const ids = entries.map((e) => e.filter.id);
|
|
144
|
+
const key = ids.join("\0");
|
|
145
|
+
const subsetAtom = react.useMemo(
|
|
146
|
+
() => jotai.atom(
|
|
147
|
+
(get) => {
|
|
148
|
+
const active = get(core.storeAtom)?.activeFilters;
|
|
149
|
+
if (active == null) return false;
|
|
150
|
+
return ids.some((id) => active.has(id));
|
|
151
|
+
},
|
|
152
|
+
(get) => {
|
|
153
|
+
const store = get(core.storeAtom);
|
|
154
|
+
if (store == null) return;
|
|
155
|
+
for (const id of ids) store.removeFilter(id);
|
|
156
|
+
}
|
|
157
|
+
),
|
|
158
|
+
[key]
|
|
159
|
+
);
|
|
160
|
+
const [hasActive, clear] = core.ctx.use(subsetAtom);
|
|
161
|
+
return [hasActive, clear];
|
|
162
|
+
}
|
|
163
|
+
function useDisplayIntent([hasActive, clearActive]) {
|
|
45
164
|
const intent = hasActive ? "primary" : "none";
|
|
46
165
|
let rightIcon = "caret-down";
|
|
47
166
|
let onRemove = void 0;
|
|
@@ -55,7 +174,7 @@ function useDisplayIntent(atom2) {
|
|
|
55
174
|
return { intent, rightIcon, onRemove, hasActive };
|
|
56
175
|
}
|
|
57
176
|
function useFilterMenuAction(entries) {
|
|
58
|
-
const rest = useDisplayIntent(
|
|
177
|
+
const rest = useDisplayIntent(useFilterSubsetState(entries));
|
|
59
178
|
if (entries.length === 0) return null;
|
|
60
179
|
const filterMenu = dataPanel_module.default(
|
|
61
180
|
core$1.Menu,
|
|
@@ -94,7 +213,7 @@ function useFilterMenuAction(entries) {
|
|
|
94
213
|
}
|
|
95
214
|
function useSortAction() {
|
|
96
215
|
const columnSpec = core.useSelector((s) => s.columnSpec);
|
|
97
|
-
const rest = useDisplayIntent(hasActiveSortsAtom);
|
|
216
|
+
const rest = useDisplayIntent(core.ctx.use(hasActiveSortsAtom));
|
|
98
217
|
const sortableCols = react.useMemo(
|
|
99
218
|
() => columnSpec.filter((c) => c.sortable),
|
|
100
219
|
[columnSpec]
|
|
@@ -129,15 +248,15 @@ function useSortAction() {
|
|
|
129
248
|
};
|
|
130
249
|
}
|
|
131
250
|
const hasActiveFiltersAtom = jotai.atom(
|
|
132
|
-
(get) => get(core.storeAtom)?.activeFilters
|
|
133
|
-
(get
|
|
134
|
-
|
|
251
|
+
(get) => (get(core.storeAtom)?.activeFilters?.size ?? 0) > 0,
|
|
252
|
+
(get) => {
|
|
253
|
+
get(core.storeAtom)?.clearFilters?.();
|
|
135
254
|
}
|
|
136
255
|
);
|
|
137
256
|
const hasActiveSortsAtom = jotai.atom(
|
|
138
|
-
(get) => get(core.storeAtom)?.columnSorts
|
|
139
|
-
(get
|
|
140
|
-
|
|
257
|
+
(get) => (get(core.storeAtom)?.columnSorts?.length ?? 0) > 0,
|
|
258
|
+
(get) => {
|
|
259
|
+
get(core.storeAtom)?.clearColumnSorts?.();
|
|
141
260
|
}
|
|
142
261
|
);
|
|
143
262
|
exports.useDataPanelControls = useDataPanelControls;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unified-filters.cjs","sources":["../../../src/components/indicators/unified-filters.ts"],"sourcesContent":["import {\n ALL_CARDINALITIES,\n isColumnFilterable,\n TableAction,\n TableFilter,\n} from \"../../actions\";\nimport { ctx, storeAtom, useSelector } from \"../../provider\";\nimport { useMemo } from \"react\";\nimport h from \"../../data-panel.module.sass\";\nimport { Menu, Tag } from \"@blueprintjs/core\";\nimport {\n ColumnFilterMenuItem,\n ColumnSortMenu,\n InlineFilterControl,\n MenuDropdown,\n MenuInlineFilterItem,\n resolveColumnFilter,\n} from \"./filter-and-sort.ts\";\nimport { atom } from \"jotai\";\n\n/** A filter to surface, plus the label to show for it. */\ninterface FilterEntry {\n filter: TableFilter;\n label: string;\n}\n\n/**\n * Stand-in for the column-header dropdown the card list lacks. Surfaces every\n * available filter (column-declared `filterable` + any table-level `filters`)\n * and sort, honoring each filter's `presentation`:\n * - `\"inline\"` → an always-visible toolbar control (its `filterForm` directly),\n * - `\"menu\"` (default) → a \"Filter\" menu item that opens the form in a submenu,\n * - `\"menu-inline\"` → the form rendered directly in the \"Filter\" menu.\n * Every case reuses the *same* controls and store/provider seam — only\n * placement changes. Sort still comes from the column-declared `sortable` set.\n */\nexport function useDataPanelControls(\n tableFilters: TableFilter[] = [],\n): TableAction[] {\n const columnSpec = useSelector((s) => s.columnSpec);\n\n // All filters, table-level first, then column-derived (each with a label).\n const entries = useMemo<FilterEntry[]>(() => {\n const fromColumns = columnSpec\n .filter((c) => isColumnFilterable(c))\n .map((c) => ({ filter: resolveColumnFilter(c), label: c.name }));\n const fromTable = tableFilters.map((f) => ({ filter: f, label: f.name }));\n return [...fromTable, ...fromColumns];\n }, [columnSpec, tableFilters]);\n\n const inlineEntries = entries.filter(\n (e) => presentationOf(e.filter) === \"inline\",\n );\n const menuEntries = entries.filter(\n (e) => presentationOf(e.filter) !== \"inline\",\n );\n\n // Hooks first (stable order), then assemble.\n const filterMenuAction = useFilterMenuAction(menuEntries);\n const sortAction = useSortAction();\n\n const actions: TableAction[] = [];\n // Inline filters: one always-visible toolbar control each.\n for (const { filter } of inlineEntries) {\n actions.push({\n id: `filter:${filter.id}`,\n name: filter.name,\n icon: filter.icon,\n targets: ALL_CARDINALITIES,\n render: () => h(InlineFilterControl, { filter }),\n });\n }\n if (filterMenuAction != null) actions.push(filterMenuAction);\n if (sortAction != null) actions.push(sortAction);\n return actions;\n}\n\nfunction presentationOf(filter: TableFilter): string {\n return filter.presentation ?? \"menu\";\n}\n\nfunction useDisplayIntent(atom) {\n const [hasActive, clearActive] = ctx.use(atom);\n const intent = hasActive ? \"primary\" : \"none\";\n\n let rightIcon: \"caret-down\" | undefined = \"caret-down\";\n let onRemove: any = undefined;\n if (hasActive) {\n rightIcon = undefined;\n onRemove = (evt) => {\n clearActive();\n evt.stopPropagation();\n };\n }\n\n return { intent, rightIcon, onRemove, hasActive };\n}\n\nfunction useFilterMenuAction(entries: FilterEntry[]): TableAction | null {\n const rest = useDisplayIntent(hasActiveFiltersAtom);\n\n if (entries.length === 0) return null;\n\n const filterMenu = h(\n Menu,\n entries.map(({ filter, label }) => {\n // A `menu-inline` filter renders its form directly in the menu (no\n // submenu); the default `menu` presentation uses the submenu item.\n if (presentationOf(filter) === \"menu-inline\") {\n return h(MenuInlineFilterItem, { key: filter.id, filter, label });\n }\n return h(ColumnFilterMenuItem, { key: filter.id, filter, label });\n }),\n );\n\n const filterIndicator = h(\n Tag,\n {\n minimal: true,\n large: true,\n icon: \"filter\",\n ...rest,\n },\n \"Filter\",\n );\n\n return {\n id: \"filter\",\n name: \"Filter\",\n icon: \"filter\",\n description: \"Add a filter to the data panel.\",\n targets: ALL_CARDINALITIES,\n render: (ctx) =>\n h(\n MenuDropdown,\n {\n content: filterMenu,\n placement: \"bottom-start\",\n },\n [filterIndicator],\n ),\n };\n}\n\nfunction useSortAction(): TableAction | null {\n const columnSpec = useSelector((s) => s.columnSpec);\n\n const rest = useDisplayIntent(hasActiveSortsAtom);\n\n const sortableCols = useMemo(\n () => columnSpec.filter((c) => c.sortable),\n [columnSpec],\n );\n\n if (sortableCols.length == 0) {\n return null;\n }\n const sortMenu = h(\n Menu,\n sortableCols.map((col) =>\n h(ColumnSortMenu, { key: col.key, columnKey: col.key, text: col.name }),\n ),\n );\n\n return {\n id: \"sort\",\n name: \"Sort\",\n icon: \"sort\",\n description: \"Add a sort to the data panel.\",\n targets: ALL_CARDINALITIES,\n render: (ctx) =>\n h(MenuDropdown, { content: sortMenu }, [\n h(\n Tag,\n {\n minimal: true,\n large: true,\n icon: \"sort\",\n ...rest,\n },\n \"Sort\",\n ),\n ]),\n };\n}\n\nconst hasActiveFiltersAtom = atom(\n (get) => get(storeAtom)?.activeFilters.size ?? 0 > 0,\n (get, set) => {\n set(storeAtom, (s) => ({ ...s, activeFilters: new Map([]) }));\n },\n);\nconst hasActiveSortsAtom = atom(\n (get) => get(storeAtom)?.columnSorts.length ?? 0 > 0,\n (get, set) => {\n set(storeAtom, (s) => ({ ...s, columnSorts: [] }));\n },\n);\n"],"names":["useSelector","useMemo","isColumnFilterable","resolveColumnFilter","ALL_CARDINALITIES","h","InlineFilterControl","atom","ctx","Menu","MenuInlineFilterItem","ColumnFilterMenuItem","Tag","MenuDropdown","ColumnSortMenu","storeAtom"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"unified-filters.cjs","sources":["../../../src/components/indicators/unified-filters.ts"],"sourcesContent":["import {\n ALL_CARDINALITIES,\n isColumnFilterable,\n TableAction,\n TableFilter,\n} from \"../../actions\";\nimport {\n ctx,\n enableSelectionAtom,\n interactionOptionsAtom,\n storeAtom,\n useSelector,\n} from \"../../provider\";\nimport { type ReactNode, useMemo } from \"react\";\nimport h from \"../../data-panel.module.sass\";\nimport { Button, Menu, MenuDivider, Tag } from \"@blueprintjs/core\";\nimport {\n ColumnFilterMenuItem,\n ColumnSortMenu,\n InlineFilterControl,\n MenuDropdown,\n MenuFormItem,\n MenuInlineFilterItem,\n resolveColumnFilter,\n} from \"./filter-and-sort.ts\";\nimport { toggleModalSelectionAtom } from \"./selection.ts\";\nimport { atom } from \"jotai\";\n\n/** How the built-in view controls (inline filters, Filter menu, Sort menu) are\n * placed in the toolbar:\n * - `\"inline\"` (default): each control sits in the toolbar.\n * - `\"popover\"`: all of them collapse behind a single button — for a narrow or\n * deliberately chrome-light toolbar.\n * In both cases the controls, state, and provider seam are identical. */\nexport type ViewControlsPresentation = \"inline\" | \"popover\";\n\n/** A filter to surface, plus the label to show for it. */\ninterface FilterEntry {\n filter: TableFilter;\n label: string;\n}\n\n/**\n * Stand-in for the column-header dropdown the card list lacks. Surfaces every\n * available filter (column-declared `filterable` + any table-level `filters`)\n * and sort, honoring each filter's `presentation`:\n * - `\"inline\"` → an always-visible toolbar control (its `filterForm` directly),\n * - `\"menu\"` (default) → a \"Filter\" menu item that opens the form in a submenu,\n * - `\"menu-inline\"` → the form rendered directly in the \"Filter\" menu.\n * Every case reuses the *same* controls and store/provider seam — only\n * placement changes. Sort still comes from the column-declared `sortable` set.\n */\nexport function useDataPanelControls(\n tableFilters: TableFilter[] = [],\n presentation: ViewControlsPresentation = \"inline\",\n): TableAction[] {\n const columnSpec = useSelector((s) => s.columnSpec);\n\n // All filters, table-level first, then column-derived (each with a label).\n const entries = useMemo<FilterEntry[]>(() => {\n const fromColumns = columnSpec\n .filter((c) => isColumnFilterable(c))\n .map((c) => ({ filter: resolveColumnFilter(c), label: c.name }));\n const fromTable = tableFilters.map((f) => ({ filter: f, label: f.name }));\n return [...fromTable, ...fromColumns];\n }, [columnSpec, tableFilters]);\n\n const inlineEntries = entries.filter(\n (e) => presentationOf(e.filter) === \"inline\",\n );\n const menuEntries = entries.filter(\n (e) => presentationOf(e.filter) !== \"inline\",\n );\n\n // Hooks first (stable order), then assemble.\n const filterMenuAction = useFilterMenuAction(menuEntries);\n const sortAction = useSortAction();\n const collapsedAction = useCollapsedControlsAction(entries);\n const exitSelectionAction = useExitSelectionAction();\n\n // While a modal view is *selecting*, the toolbar belongs to the selection and\n // its set-actions. Changing the view would also invalidate the selection\n // (rows are addressed by index — see `dropRowSelection`), so rather than\n // competing for space, the view controls collapse to a single affordance that\n // **leaves select mode** and hands the toolbar back.\n if (exitSelectionAction != null) return [exitSelectionAction];\n\n // One button holding every control, for a toolbar with no room for them (or a\n // deliberately chrome-light layout).\n if (presentation === \"popover\" && collapsedAction != null) {\n return [collapsedAction];\n }\n\n const actions: TableAction[] = [];\n // Inline filters: one always-visible toolbar control each.\n for (const { filter } of inlineEntries) {\n actions.push({\n id: `filter:${filter.id}`,\n name: filter.name,\n icon: filter.icon,\n targets: ALL_CARDINALITIES,\n render: () => h(InlineFilterControl, { filter }),\n });\n }\n if (filterMenuAction != null) actions.push(filterMenuAction);\n if (sortAction != null) actions.push(sortAction);\n return actions;\n}\n\n/**\n * The whole view-control set behind one button: inline filters as titled\n * sections, then the filters, then the sorts. Same controls, same store seam —\n * only placement changes (the `presentation` idea from `TableFilter`, applied to\n * the toolbar as a whole).\n */\nfunction useCollapsedControlsAction(\n entries: FilterEntry[],\n): TableAction | null {\n const columnSpec = useSelector((s) => s.columnSpec);\n const hasActiveFilters = ctx.useValue(hasActiveFiltersAtom);\n const hasActiveSorts = ctx.useValue(hasActiveSortsAtom);\n\n const sortableCols = useMemo(\n () => columnSpec.filter((c) => c.sortable),\n [columnSpec],\n );\n\n if (entries.length === 0 && sortableCols.length === 0) return null;\n\n const inlineEntries = entries.filter(\n (e) => presentationOf(e.filter) === \"inline\",\n );\n const menuEntries = entries.filter(\n (e) => presentationOf(e.filter) !== \"inline\",\n );\n\n const items: ReactNode[] = [];\n for (const { filter, label } of inlineEntries) {\n items.push(\n h(MenuFormItem, { key: filter.id, title: label }, [\n h(InlineFilterControl, { filter }),\n ]),\n );\n }\n if (menuEntries.length > 0) {\n items.push(h(MenuDivider, { key: \"filter-divider\", title: \"Filter\" }));\n for (const { filter, label } of menuEntries) {\n if (presentationOf(filter) === \"menu-inline\") {\n items.push(h(MenuInlineFilterItem, { key: filter.id, filter, label }));\n } else {\n items.push(h(ColumnFilterMenuItem, { key: filter.id, filter, label }));\n }\n }\n }\n if (sortableCols.length > 0) {\n items.push(h(MenuDivider, { key: \"sort-divider\", title: \"Sort\" }));\n for (const col of sortableCols) {\n items.push(\n h(ColumnSortMenu, { key: col.key, columnKey: col.key, text: col.name }),\n );\n }\n }\n\n let intent: \"primary\" | \"none\" = \"none\";\n if (hasActiveFilters || hasActiveSorts) intent = \"primary\";\n\n return {\n id: \"view-controls\",\n name: \"View\",\n icon: \"filter-list\",\n description: \"Search, filter and sort.\",\n targets: ALL_CARDINALITIES,\n requiresEditable: false,\n render: () =>\n h(\n MenuDropdown,\n { content: h(Menu, { className: \"collapsed-controls\" }, items) },\n [\n h(Button, {\n minimal: true,\n small: true,\n icon: \"filter-list\",\n intent,\n title: \"Search, filter and sort\",\n }),\n ],\n ),\n };\n}\n\n/** While selecting on a modal view: one control that leaves select mode (and so\n * restores the view controls). Labelled for where it takes you, not what it\n * does to the selection. */\nfunction useExitSelectionAction(): TableAction | null {\n const { enableModalSelection } = ctx.useValue(interactionOptionsAtom);\n const selecting = ctx.useValue(enableSelectionAtom);\n const toggleSelectMode = ctx.useSet(toggleModalSelectionAtom);\n\n if (!enableModalSelection || !selecting) return null;\n\n return {\n id: \"exit-selection\",\n name: \"Filter\",\n icon: \"filter\",\n description: \"Leave select mode to filter and sort.\",\n targets: ALL_CARDINALITIES,\n requiresEditable: false,\n render: () =>\n h(\n Tag,\n {\n minimal: true,\n large: true,\n interactive: true,\n icon: \"filter\",\n title: \"Filter and sort (leaves select mode)\",\n onClick: () => toggleSelectMode(),\n },\n \"Filter\",\n ),\n };\n}\n\nfunction presentationOf(filter: TableFilter): string {\n return filter.presentation ?? \"menu\";\n}\n\n/** Active-state + clear for a subset of filters, keyed by id. */\nfunction useFilterSubsetState(entries: FilterEntry[]): [boolean, () => void] {\n const ids = entries.map((e) => e.filter.id);\n const key = ids.join(\"\\u0000\");\n const subsetAtom = useMemo(\n () =>\n atom(\n (get) => {\n const active = get(storeAtom)?.activeFilters;\n if (active == null) return false;\n return ids.some((id) => active.has(id));\n },\n (get) => {\n const store = get(storeAtom);\n if (store == null) return;\n for (const id of ids) store.removeFilter(id);\n },\n ),\n [key],\n );\n const [hasActive, clear] = ctx.use(subsetAtom);\n return [hasActive, clear as () => void];\n}\n\nfunction useDisplayIntent([hasActive, clearActive]: [boolean, () => void]) {\n const intent = hasActive ? \"primary\" : \"none\";\n\n let rightIcon: \"caret-down\" | undefined = \"caret-down\";\n let onRemove: any = undefined;\n if (hasActive) {\n rightIcon = undefined;\n onRemove = (evt) => {\n clearActive();\n evt.stopPropagation();\n };\n }\n\n return { intent, rightIcon, onRemove, hasActive };\n}\n\nfunction useFilterMenuAction(entries: FilterEntry[]): TableAction | null {\n // Scoped to the filters this menu actually holds. An `\"inline\"` filter has\n // its own always-visible control, so it must not light up the Filter tag —\n // nor be wiped by its clear button, which reads as \"clear the filters in\n // here\".\n const rest = useDisplayIntent(useFilterSubsetState(entries));\n\n if (entries.length === 0) return null;\n\n const filterMenu = h(\n Menu,\n entries.map(({ filter, label }) => {\n // A `menu-inline` filter renders its form directly in the menu (no\n // submenu); the default `menu` presentation uses the submenu item.\n if (presentationOf(filter) === \"menu-inline\") {\n return h(MenuInlineFilterItem, { key: filter.id, filter, label });\n }\n return h(ColumnFilterMenuItem, { key: filter.id, filter, label });\n }),\n );\n\n const filterIndicator = h(\n Tag,\n {\n minimal: true,\n large: true,\n icon: \"filter\",\n ...rest,\n },\n \"Filter\",\n );\n\n return {\n id: \"filter\",\n name: \"Filter\",\n icon: \"filter\",\n description: \"Add a filter to the data panel.\",\n targets: ALL_CARDINALITIES,\n render: (ctx) =>\n h(\n MenuDropdown,\n {\n content: filterMenu,\n placement: \"bottom-start\",\n },\n [filterIndicator],\n ),\n };\n}\n\nfunction useSortAction(): TableAction | null {\n const columnSpec = useSelector((s) => s.columnSpec);\n\n const rest = useDisplayIntent(ctx.use(hasActiveSortsAtom));\n\n const sortableCols = useMemo(\n () => columnSpec.filter((c) => c.sortable),\n [columnSpec],\n );\n\n if (sortableCols.length == 0) {\n return null;\n }\n const sortMenu = h(\n Menu,\n sortableCols.map((col) =>\n h(ColumnSortMenu, { key: col.key, columnKey: col.key, text: col.name }),\n ),\n );\n\n return {\n id: \"sort\",\n name: \"Sort\",\n icon: \"sort\",\n description: \"Add a sort to the data panel.\",\n targets: ALL_CARDINALITIES,\n render: (ctx) =>\n h(MenuDropdown, { content: sortMenu }, [\n h(\n Tag,\n {\n minimal: true,\n large: true,\n icon: \"sort\",\n ...rest,\n },\n \"Sort\",\n ),\n ]),\n };\n}\n\n// Both of these clear through the store's *actions* rather than writing the\n// state directly: the actions are what also drop a now-meaningless row\n// selection (see `dropRowSelection`).\nconst hasActiveFiltersAtom = atom(\n (get) => (get(storeAtom)?.activeFilters?.size ?? 0) > 0,\n (get) => {\n get(storeAtom)?.clearFilters?.();\n },\n);\nconst hasActiveSortsAtom = atom(\n (get) => (get(storeAtom)?.columnSorts?.length ?? 0) > 0,\n (get) => {\n get(storeAtom)?.clearColumnSorts?.();\n },\n);\n"],"names":["useSelector","useMemo","isColumnFilterable","resolveColumnFilter","ALL_CARDINALITIES","h","InlineFilterControl","ctx","MenuFormItem","MenuDivider","MenuInlineFilterItem","ColumnFilterMenuItem","ColumnSortMenu","MenuDropdown","Menu","Button","interactionOptionsAtom","enableSelectionAtom","toggleModalSelectionAtom","Tag","atom","storeAtom"],"mappings":"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"}
|
|
@@ -1,4 +1,11 @@
|
|
|
1
1
|
import { TableAction, TableFilter } from '../../actions';
|
|
2
|
+
/** How the built-in view controls (inline filters, Filter menu, Sort menu) are
|
|
3
|
+
* placed in the toolbar:
|
|
4
|
+
* - `"inline"` (default): each control sits in the toolbar.
|
|
5
|
+
* - `"popover"`: all of them collapse behind a single button — for a narrow or
|
|
6
|
+
* deliberately chrome-light toolbar.
|
|
7
|
+
* In both cases the controls, state, and provider seam are identical. */
|
|
8
|
+
export type ViewControlsPresentation = "inline" | "popover";
|
|
2
9
|
/**
|
|
3
10
|
* Stand-in for the column-header dropdown the card list lacks. Surfaces every
|
|
4
11
|
* available filter (column-declared `filterable` + any table-level `filters`)
|
|
@@ -9,4 +16,4 @@ import { TableAction, TableFilter } from '../../actions';
|
|
|
9
16
|
* Every case reuses the *same* controls and store/provider seam — only
|
|
10
17
|
* placement changes. Sort still comes from the column-declared `sortable` set.
|
|
11
18
|
*/
|
|
12
|
-
export declare function useDataPanelControls(tableFilters?: TableFilter[]): TableAction[];
|
|
19
|
+
export declare function useDataPanelControls(tableFilters?: TableFilter[], presentation?: ViewControlsPresentation): TableAction[];
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import { useMemo } from "react";
|
|
2
2
|
import h from "../../data-panel.module.sass.js";
|
|
3
|
-
import { Menu, Tag } from "@blueprintjs/core";
|
|
4
|
-
import { resolveColumnFilter, InlineFilterControl, MenuInlineFilterItem, ColumnFilterMenuItem, MenuDropdown, ColumnSortMenu } from "./filter-and-sort.js";
|
|
3
|
+
import { Menu, Tag, MenuDivider, Button } from "@blueprintjs/core";
|
|
4
|
+
import { resolveColumnFilter, InlineFilterControl, MenuInlineFilterItem, ColumnFilterMenuItem, MenuDropdown, ColumnSortMenu, MenuFormItem } from "./filter-and-sort.js";
|
|
5
|
+
import { toggleModalSelectionAtom } from "./selection.js";
|
|
5
6
|
import { atom } from "jotai";
|
|
6
7
|
import { isColumnFilterable } from "../../actions/column-controls.js";
|
|
7
8
|
import { useSelector, ctx, storeAtom } from "../../provider/core.js";
|
|
8
9
|
import { ALL_CARDINALITIES } from "../../actions/edit-actions.js";
|
|
9
|
-
|
|
10
|
+
import { interactionOptionsAtom, enableSelectionAtom } from "../../provider/interactions.js";
|
|
11
|
+
function useDataPanelControls(tableFilters = [], presentation = "inline") {
|
|
10
12
|
const columnSpec = useSelector((s) => s.columnSpec);
|
|
11
13
|
const entries = useMemo(() => {
|
|
12
14
|
const fromColumns = columnSpec.filter((c) => isColumnFilterable(c)).map((c) => ({ filter: resolveColumnFilter(c), label: c.name }));
|
|
@@ -21,6 +23,12 @@ function useDataPanelControls(tableFilters = []) {
|
|
|
21
23
|
);
|
|
22
24
|
const filterMenuAction = useFilterMenuAction(menuEntries);
|
|
23
25
|
const sortAction = useSortAction();
|
|
26
|
+
const collapsedAction = useCollapsedControlsAction(entries);
|
|
27
|
+
const exitSelectionAction = useExitSelectionAction();
|
|
28
|
+
if (exitSelectionAction != null) return [exitSelectionAction];
|
|
29
|
+
if (presentation === "popover" && collapsedAction != null) {
|
|
30
|
+
return [collapsedAction];
|
|
31
|
+
}
|
|
24
32
|
const actions = [];
|
|
25
33
|
for (const { filter } of inlineEntries) {
|
|
26
34
|
actions.push({
|
|
@@ -35,11 +43,122 @@ function useDataPanelControls(tableFilters = []) {
|
|
|
35
43
|
if (sortAction != null) actions.push(sortAction);
|
|
36
44
|
return actions;
|
|
37
45
|
}
|
|
46
|
+
function useCollapsedControlsAction(entries) {
|
|
47
|
+
const columnSpec = useSelector((s) => s.columnSpec);
|
|
48
|
+
const hasActiveFilters = ctx.useValue(hasActiveFiltersAtom);
|
|
49
|
+
const hasActiveSorts = ctx.useValue(hasActiveSortsAtom);
|
|
50
|
+
const sortableCols = useMemo(
|
|
51
|
+
() => columnSpec.filter((c) => c.sortable),
|
|
52
|
+
[columnSpec]
|
|
53
|
+
);
|
|
54
|
+
if (entries.length === 0 && sortableCols.length === 0) return null;
|
|
55
|
+
const inlineEntries = entries.filter(
|
|
56
|
+
(e) => presentationOf(e.filter) === "inline"
|
|
57
|
+
);
|
|
58
|
+
const menuEntries = entries.filter(
|
|
59
|
+
(e) => presentationOf(e.filter) !== "inline"
|
|
60
|
+
);
|
|
61
|
+
const items = [];
|
|
62
|
+
for (const { filter, label } of inlineEntries) {
|
|
63
|
+
items.push(
|
|
64
|
+
h(MenuFormItem, { key: filter.id, title: label }, [
|
|
65
|
+
h(InlineFilterControl, { filter })
|
|
66
|
+
])
|
|
67
|
+
);
|
|
68
|
+
}
|
|
69
|
+
if (menuEntries.length > 0) {
|
|
70
|
+
items.push(h(MenuDivider, { key: "filter-divider", title: "Filter" }));
|
|
71
|
+
for (const { filter, label } of menuEntries) {
|
|
72
|
+
if (presentationOf(filter) === "menu-inline") {
|
|
73
|
+
items.push(h(MenuInlineFilterItem, { key: filter.id, filter, label }));
|
|
74
|
+
} else {
|
|
75
|
+
items.push(h(ColumnFilterMenuItem, { key: filter.id, filter, label }));
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
if (sortableCols.length > 0) {
|
|
80
|
+
items.push(h(MenuDivider, { key: "sort-divider", title: "Sort" }));
|
|
81
|
+
for (const col of sortableCols) {
|
|
82
|
+
items.push(
|
|
83
|
+
h(ColumnSortMenu, { key: col.key, columnKey: col.key, text: col.name })
|
|
84
|
+
);
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
let intent = "none";
|
|
88
|
+
if (hasActiveFilters || hasActiveSorts) intent = "primary";
|
|
89
|
+
return {
|
|
90
|
+
id: "view-controls",
|
|
91
|
+
name: "View",
|
|
92
|
+
icon: "filter-list",
|
|
93
|
+
description: "Search, filter and sort.",
|
|
94
|
+
targets: ALL_CARDINALITIES,
|
|
95
|
+
requiresEditable: false,
|
|
96
|
+
render: () => h(
|
|
97
|
+
MenuDropdown,
|
|
98
|
+
{ content: h(Menu, { className: "collapsed-controls" }, items) },
|
|
99
|
+
[
|
|
100
|
+
h(Button, {
|
|
101
|
+
minimal: true,
|
|
102
|
+
small: true,
|
|
103
|
+
icon: "filter-list",
|
|
104
|
+
intent,
|
|
105
|
+
title: "Search, filter and sort"
|
|
106
|
+
})
|
|
107
|
+
]
|
|
108
|
+
)
|
|
109
|
+
};
|
|
110
|
+
}
|
|
111
|
+
function useExitSelectionAction() {
|
|
112
|
+
const { enableModalSelection } = ctx.useValue(interactionOptionsAtom);
|
|
113
|
+
const selecting = ctx.useValue(enableSelectionAtom);
|
|
114
|
+
const toggleSelectMode = ctx.useSet(toggleModalSelectionAtom);
|
|
115
|
+
if (!enableModalSelection || !selecting) return null;
|
|
116
|
+
return {
|
|
117
|
+
id: "exit-selection",
|
|
118
|
+
name: "Filter",
|
|
119
|
+
icon: "filter",
|
|
120
|
+
description: "Leave select mode to filter and sort.",
|
|
121
|
+
targets: ALL_CARDINALITIES,
|
|
122
|
+
requiresEditable: false,
|
|
123
|
+
render: () => h(
|
|
124
|
+
Tag,
|
|
125
|
+
{
|
|
126
|
+
minimal: true,
|
|
127
|
+
large: true,
|
|
128
|
+
interactive: true,
|
|
129
|
+
icon: "filter",
|
|
130
|
+
title: "Filter and sort (leaves select mode)",
|
|
131
|
+
onClick: () => toggleSelectMode()
|
|
132
|
+
},
|
|
133
|
+
"Filter"
|
|
134
|
+
)
|
|
135
|
+
};
|
|
136
|
+
}
|
|
38
137
|
function presentationOf(filter) {
|
|
39
138
|
return filter.presentation ?? "menu";
|
|
40
139
|
}
|
|
41
|
-
function
|
|
42
|
-
const
|
|
140
|
+
function useFilterSubsetState(entries) {
|
|
141
|
+
const ids = entries.map((e) => e.filter.id);
|
|
142
|
+
const key = ids.join("\0");
|
|
143
|
+
const subsetAtom = useMemo(
|
|
144
|
+
() => atom(
|
|
145
|
+
(get) => {
|
|
146
|
+
const active = get(storeAtom)?.activeFilters;
|
|
147
|
+
if (active == null) return false;
|
|
148
|
+
return ids.some((id) => active.has(id));
|
|
149
|
+
},
|
|
150
|
+
(get) => {
|
|
151
|
+
const store = get(storeAtom);
|
|
152
|
+
if (store == null) return;
|
|
153
|
+
for (const id of ids) store.removeFilter(id);
|
|
154
|
+
}
|
|
155
|
+
),
|
|
156
|
+
[key]
|
|
157
|
+
);
|
|
158
|
+
const [hasActive, clear] = ctx.use(subsetAtom);
|
|
159
|
+
return [hasActive, clear];
|
|
160
|
+
}
|
|
161
|
+
function useDisplayIntent([hasActive, clearActive]) {
|
|
43
162
|
const intent = hasActive ? "primary" : "none";
|
|
44
163
|
let rightIcon = "caret-down";
|
|
45
164
|
let onRemove = void 0;
|
|
@@ -53,7 +172,7 @@ function useDisplayIntent(atom2) {
|
|
|
53
172
|
return { intent, rightIcon, onRemove, hasActive };
|
|
54
173
|
}
|
|
55
174
|
function useFilterMenuAction(entries) {
|
|
56
|
-
const rest = useDisplayIntent(
|
|
175
|
+
const rest = useDisplayIntent(useFilterSubsetState(entries));
|
|
57
176
|
if (entries.length === 0) return null;
|
|
58
177
|
const filterMenu = h(
|
|
59
178
|
Menu,
|
|
@@ -92,7 +211,7 @@ function useFilterMenuAction(entries) {
|
|
|
92
211
|
}
|
|
93
212
|
function useSortAction() {
|
|
94
213
|
const columnSpec = useSelector((s) => s.columnSpec);
|
|
95
|
-
const rest = useDisplayIntent(hasActiveSortsAtom);
|
|
214
|
+
const rest = useDisplayIntent(ctx.use(hasActiveSortsAtom));
|
|
96
215
|
const sortableCols = useMemo(
|
|
97
216
|
() => columnSpec.filter((c) => c.sortable),
|
|
98
217
|
[columnSpec]
|
|
@@ -127,15 +246,15 @@ function useSortAction() {
|
|
|
127
246
|
};
|
|
128
247
|
}
|
|
129
248
|
const hasActiveFiltersAtom = atom(
|
|
130
|
-
(get) => get(storeAtom)?.activeFilters
|
|
131
|
-
(get
|
|
132
|
-
|
|
249
|
+
(get) => (get(storeAtom)?.activeFilters?.size ?? 0) > 0,
|
|
250
|
+
(get) => {
|
|
251
|
+
get(storeAtom)?.clearFilters?.();
|
|
133
252
|
}
|
|
134
253
|
);
|
|
135
254
|
const hasActiveSortsAtom = atom(
|
|
136
|
-
(get) => get(storeAtom)?.columnSorts
|
|
137
|
-
(get
|
|
138
|
-
|
|
255
|
+
(get) => (get(storeAtom)?.columnSorts?.length ?? 0) > 0,
|
|
256
|
+
(get) => {
|
|
257
|
+
get(storeAtom)?.clearColumnSorts?.();
|
|
139
258
|
}
|
|
140
259
|
);
|
|
141
260
|
export {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unified-filters.js","sources":["../../../src/components/indicators/unified-filters.ts"],"sourcesContent":["import {\n ALL_CARDINALITIES,\n isColumnFilterable,\n TableAction,\n TableFilter,\n} from \"../../actions\";\nimport { ctx, storeAtom, useSelector } from \"../../provider\";\nimport { useMemo } from \"react\";\nimport h from \"../../data-panel.module.sass\";\nimport { Menu, Tag } from \"@blueprintjs/core\";\nimport {\n ColumnFilterMenuItem,\n ColumnSortMenu,\n InlineFilterControl,\n MenuDropdown,\n MenuInlineFilterItem,\n resolveColumnFilter,\n} from \"./filter-and-sort.ts\";\nimport { atom } from \"jotai\";\n\n/** A filter to surface, plus the label to show for it. */\ninterface FilterEntry {\n filter: TableFilter;\n label: string;\n}\n\n/**\n * Stand-in for the column-header dropdown the card list lacks. Surfaces every\n * available filter (column-declared `filterable` + any table-level `filters`)\n * and sort, honoring each filter's `presentation`:\n * - `\"inline\"` → an always-visible toolbar control (its `filterForm` directly),\n * - `\"menu\"` (default) → a \"Filter\" menu item that opens the form in a submenu,\n * - `\"menu-inline\"` → the form rendered directly in the \"Filter\" menu.\n * Every case reuses the *same* controls and store/provider seam — only\n * placement changes. Sort still comes from the column-declared `sortable` set.\n */\nexport function useDataPanelControls(\n tableFilters: TableFilter[] = [],\n): TableAction[] {\n const columnSpec = useSelector((s) => s.columnSpec);\n\n // All filters, table-level first, then column-derived (each with a label).\n const entries = useMemo<FilterEntry[]>(() => {\n const fromColumns = columnSpec\n .filter((c) => isColumnFilterable(c))\n .map((c) => ({ filter: resolveColumnFilter(c), label: c.name }));\n const fromTable = tableFilters.map((f) => ({ filter: f, label: f.name }));\n return [...fromTable, ...fromColumns];\n }, [columnSpec, tableFilters]);\n\n const inlineEntries = entries.filter(\n (e) => presentationOf(e.filter) === \"inline\",\n );\n const menuEntries = entries.filter(\n (e) => presentationOf(e.filter) !== \"inline\",\n );\n\n // Hooks first (stable order), then assemble.\n const filterMenuAction = useFilterMenuAction(menuEntries);\n const sortAction = useSortAction();\n\n const actions: TableAction[] = [];\n // Inline filters: one always-visible toolbar control each.\n for (const { filter } of inlineEntries) {\n actions.push({\n id: `filter:${filter.id}`,\n name: filter.name,\n icon: filter.icon,\n targets: ALL_CARDINALITIES,\n render: () => h(InlineFilterControl, { filter }),\n });\n }\n if (filterMenuAction != null) actions.push(filterMenuAction);\n if (sortAction != null) actions.push(sortAction);\n return actions;\n}\n\nfunction presentationOf(filter: TableFilter): string {\n return filter.presentation ?? \"menu\";\n}\n\nfunction useDisplayIntent(atom) {\n const [hasActive, clearActive] = ctx.use(atom);\n const intent = hasActive ? \"primary\" : \"none\";\n\n let rightIcon: \"caret-down\" | undefined = \"caret-down\";\n let onRemove: any = undefined;\n if (hasActive) {\n rightIcon = undefined;\n onRemove = (evt) => {\n clearActive();\n evt.stopPropagation();\n };\n }\n\n return { intent, rightIcon, onRemove, hasActive };\n}\n\nfunction useFilterMenuAction(entries: FilterEntry[]): TableAction | null {\n const rest = useDisplayIntent(hasActiveFiltersAtom);\n\n if (entries.length === 0) return null;\n\n const filterMenu = h(\n Menu,\n entries.map(({ filter, label }) => {\n // A `menu-inline` filter renders its form directly in the menu (no\n // submenu); the default `menu` presentation uses the submenu item.\n if (presentationOf(filter) === \"menu-inline\") {\n return h(MenuInlineFilterItem, { key: filter.id, filter, label });\n }\n return h(ColumnFilterMenuItem, { key: filter.id, filter, label });\n }),\n );\n\n const filterIndicator = h(\n Tag,\n {\n minimal: true,\n large: true,\n icon: \"filter\",\n ...rest,\n },\n \"Filter\",\n );\n\n return {\n id: \"filter\",\n name: \"Filter\",\n icon: \"filter\",\n description: \"Add a filter to the data panel.\",\n targets: ALL_CARDINALITIES,\n render: (ctx) =>\n h(\n MenuDropdown,\n {\n content: filterMenu,\n placement: \"bottom-start\",\n },\n [filterIndicator],\n ),\n };\n}\n\nfunction useSortAction(): TableAction | null {\n const columnSpec = useSelector((s) => s.columnSpec);\n\n const rest = useDisplayIntent(hasActiveSortsAtom);\n\n const sortableCols = useMemo(\n () => columnSpec.filter((c) => c.sortable),\n [columnSpec],\n );\n\n if (sortableCols.length == 0) {\n return null;\n }\n const sortMenu = h(\n Menu,\n sortableCols.map((col) =>\n h(ColumnSortMenu, { key: col.key, columnKey: col.key, text: col.name }),\n ),\n );\n\n return {\n id: \"sort\",\n name: \"Sort\",\n icon: \"sort\",\n description: \"Add a sort to the data panel.\",\n targets: ALL_CARDINALITIES,\n render: (ctx) =>\n h(MenuDropdown, { content: sortMenu }, [\n h(\n Tag,\n {\n minimal: true,\n large: true,\n icon: \"sort\",\n ...rest,\n },\n \"Sort\",\n ),\n ]),\n };\n}\n\nconst hasActiveFiltersAtom = atom(\n (get) => get(storeAtom)?.activeFilters.size ?? 0 > 0,\n (get, set) => {\n set(storeAtom, (s) => ({ ...s, activeFilters: new Map([]) }));\n },\n);\nconst hasActiveSortsAtom = atom(\n (get) => get(storeAtom)?.columnSorts.length ?? 0 > 0,\n (get, set) => {\n set(storeAtom, (s) => ({ ...s, columnSorts: [] }));\n },\n);\n"],"names":["atom","ctx"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"unified-filters.js","sources":["../../../src/components/indicators/unified-filters.ts"],"sourcesContent":["import {\n ALL_CARDINALITIES,\n isColumnFilterable,\n TableAction,\n TableFilter,\n} from \"../../actions\";\nimport {\n ctx,\n enableSelectionAtom,\n interactionOptionsAtom,\n storeAtom,\n useSelector,\n} from \"../../provider\";\nimport { type ReactNode, useMemo } from \"react\";\nimport h from \"../../data-panel.module.sass\";\nimport { Button, Menu, MenuDivider, Tag } from \"@blueprintjs/core\";\nimport {\n ColumnFilterMenuItem,\n ColumnSortMenu,\n InlineFilterControl,\n MenuDropdown,\n MenuFormItem,\n MenuInlineFilterItem,\n resolveColumnFilter,\n} from \"./filter-and-sort.ts\";\nimport { toggleModalSelectionAtom } from \"./selection.ts\";\nimport { atom } from \"jotai\";\n\n/** How the built-in view controls (inline filters, Filter menu, Sort menu) are\n * placed in the toolbar:\n * - `\"inline\"` (default): each control sits in the toolbar.\n * - `\"popover\"`: all of them collapse behind a single button — for a narrow or\n * deliberately chrome-light toolbar.\n * In both cases the controls, state, and provider seam are identical. */\nexport type ViewControlsPresentation = \"inline\" | \"popover\";\n\n/** A filter to surface, plus the label to show for it. */\ninterface FilterEntry {\n filter: TableFilter;\n label: string;\n}\n\n/**\n * Stand-in for the column-header dropdown the card list lacks. Surfaces every\n * available filter (column-declared `filterable` + any table-level `filters`)\n * and sort, honoring each filter's `presentation`:\n * - `\"inline\"` → an always-visible toolbar control (its `filterForm` directly),\n * - `\"menu\"` (default) → a \"Filter\" menu item that opens the form in a submenu,\n * - `\"menu-inline\"` → the form rendered directly in the \"Filter\" menu.\n * Every case reuses the *same* controls and store/provider seam — only\n * placement changes. Sort still comes from the column-declared `sortable` set.\n */\nexport function useDataPanelControls(\n tableFilters: TableFilter[] = [],\n presentation: ViewControlsPresentation = \"inline\",\n): TableAction[] {\n const columnSpec = useSelector((s) => s.columnSpec);\n\n // All filters, table-level first, then column-derived (each with a label).\n const entries = useMemo<FilterEntry[]>(() => {\n const fromColumns = columnSpec\n .filter((c) => isColumnFilterable(c))\n .map((c) => ({ filter: resolveColumnFilter(c), label: c.name }));\n const fromTable = tableFilters.map((f) => ({ filter: f, label: f.name }));\n return [...fromTable, ...fromColumns];\n }, [columnSpec, tableFilters]);\n\n const inlineEntries = entries.filter(\n (e) => presentationOf(e.filter) === \"inline\",\n );\n const menuEntries = entries.filter(\n (e) => presentationOf(e.filter) !== \"inline\",\n );\n\n // Hooks first (stable order), then assemble.\n const filterMenuAction = useFilterMenuAction(menuEntries);\n const sortAction = useSortAction();\n const collapsedAction = useCollapsedControlsAction(entries);\n const exitSelectionAction = useExitSelectionAction();\n\n // While a modal view is *selecting*, the toolbar belongs to the selection and\n // its set-actions. Changing the view would also invalidate the selection\n // (rows are addressed by index — see `dropRowSelection`), so rather than\n // competing for space, the view controls collapse to a single affordance that\n // **leaves select mode** and hands the toolbar back.\n if (exitSelectionAction != null) return [exitSelectionAction];\n\n // One button holding every control, for a toolbar with no room for them (or a\n // deliberately chrome-light layout).\n if (presentation === \"popover\" && collapsedAction != null) {\n return [collapsedAction];\n }\n\n const actions: TableAction[] = [];\n // Inline filters: one always-visible toolbar control each.\n for (const { filter } of inlineEntries) {\n actions.push({\n id: `filter:${filter.id}`,\n name: filter.name,\n icon: filter.icon,\n targets: ALL_CARDINALITIES,\n render: () => h(InlineFilterControl, { filter }),\n });\n }\n if (filterMenuAction != null) actions.push(filterMenuAction);\n if (sortAction != null) actions.push(sortAction);\n return actions;\n}\n\n/**\n * The whole view-control set behind one button: inline filters as titled\n * sections, then the filters, then the sorts. Same controls, same store seam —\n * only placement changes (the `presentation` idea from `TableFilter`, applied to\n * the toolbar as a whole).\n */\nfunction useCollapsedControlsAction(\n entries: FilterEntry[],\n): TableAction | null {\n const columnSpec = useSelector((s) => s.columnSpec);\n const hasActiveFilters = ctx.useValue(hasActiveFiltersAtom);\n const hasActiveSorts = ctx.useValue(hasActiveSortsAtom);\n\n const sortableCols = useMemo(\n () => columnSpec.filter((c) => c.sortable),\n [columnSpec],\n );\n\n if (entries.length === 0 && sortableCols.length === 0) return null;\n\n const inlineEntries = entries.filter(\n (e) => presentationOf(e.filter) === \"inline\",\n );\n const menuEntries = entries.filter(\n (e) => presentationOf(e.filter) !== \"inline\",\n );\n\n const items: ReactNode[] = [];\n for (const { filter, label } of inlineEntries) {\n items.push(\n h(MenuFormItem, { key: filter.id, title: label }, [\n h(InlineFilterControl, { filter }),\n ]),\n );\n }\n if (menuEntries.length > 0) {\n items.push(h(MenuDivider, { key: \"filter-divider\", title: \"Filter\" }));\n for (const { filter, label } of menuEntries) {\n if (presentationOf(filter) === \"menu-inline\") {\n items.push(h(MenuInlineFilterItem, { key: filter.id, filter, label }));\n } else {\n items.push(h(ColumnFilterMenuItem, { key: filter.id, filter, label }));\n }\n }\n }\n if (sortableCols.length > 0) {\n items.push(h(MenuDivider, { key: \"sort-divider\", title: \"Sort\" }));\n for (const col of sortableCols) {\n items.push(\n h(ColumnSortMenu, { key: col.key, columnKey: col.key, text: col.name }),\n );\n }\n }\n\n let intent: \"primary\" | \"none\" = \"none\";\n if (hasActiveFilters || hasActiveSorts) intent = \"primary\";\n\n return {\n id: \"view-controls\",\n name: \"View\",\n icon: \"filter-list\",\n description: \"Search, filter and sort.\",\n targets: ALL_CARDINALITIES,\n requiresEditable: false,\n render: () =>\n h(\n MenuDropdown,\n { content: h(Menu, { className: \"collapsed-controls\" }, items) },\n [\n h(Button, {\n minimal: true,\n small: true,\n icon: \"filter-list\",\n intent,\n title: \"Search, filter and sort\",\n }),\n ],\n ),\n };\n}\n\n/** While selecting on a modal view: one control that leaves select mode (and so\n * restores the view controls). Labelled for where it takes you, not what it\n * does to the selection. */\nfunction useExitSelectionAction(): TableAction | null {\n const { enableModalSelection } = ctx.useValue(interactionOptionsAtom);\n const selecting = ctx.useValue(enableSelectionAtom);\n const toggleSelectMode = ctx.useSet(toggleModalSelectionAtom);\n\n if (!enableModalSelection || !selecting) return null;\n\n return {\n id: \"exit-selection\",\n name: \"Filter\",\n icon: \"filter\",\n description: \"Leave select mode to filter and sort.\",\n targets: ALL_CARDINALITIES,\n requiresEditable: false,\n render: () =>\n h(\n Tag,\n {\n minimal: true,\n large: true,\n interactive: true,\n icon: \"filter\",\n title: \"Filter and sort (leaves select mode)\",\n onClick: () => toggleSelectMode(),\n },\n \"Filter\",\n ),\n };\n}\n\nfunction presentationOf(filter: TableFilter): string {\n return filter.presentation ?? \"menu\";\n}\n\n/** Active-state + clear for a subset of filters, keyed by id. */\nfunction useFilterSubsetState(entries: FilterEntry[]): [boolean, () => void] {\n const ids = entries.map((e) => e.filter.id);\n const key = ids.join(\"\\u0000\");\n const subsetAtom = useMemo(\n () =>\n atom(\n (get) => {\n const active = get(storeAtom)?.activeFilters;\n if (active == null) return false;\n return ids.some((id) => active.has(id));\n },\n (get) => {\n const store = get(storeAtom);\n if (store == null) return;\n for (const id of ids) store.removeFilter(id);\n },\n ),\n [key],\n );\n const [hasActive, clear] = ctx.use(subsetAtom);\n return [hasActive, clear as () => void];\n}\n\nfunction useDisplayIntent([hasActive, clearActive]: [boolean, () => void]) {\n const intent = hasActive ? \"primary\" : \"none\";\n\n let rightIcon: \"caret-down\" | undefined = \"caret-down\";\n let onRemove: any = undefined;\n if (hasActive) {\n rightIcon = undefined;\n onRemove = (evt) => {\n clearActive();\n evt.stopPropagation();\n };\n }\n\n return { intent, rightIcon, onRemove, hasActive };\n}\n\nfunction useFilterMenuAction(entries: FilterEntry[]): TableAction | null {\n // Scoped to the filters this menu actually holds. An `\"inline\"` filter has\n // its own always-visible control, so it must not light up the Filter tag —\n // nor be wiped by its clear button, which reads as \"clear the filters in\n // here\".\n const rest = useDisplayIntent(useFilterSubsetState(entries));\n\n if (entries.length === 0) return null;\n\n const filterMenu = h(\n Menu,\n entries.map(({ filter, label }) => {\n // A `menu-inline` filter renders its form directly in the menu (no\n // submenu); the default `menu` presentation uses the submenu item.\n if (presentationOf(filter) === \"menu-inline\") {\n return h(MenuInlineFilterItem, { key: filter.id, filter, label });\n }\n return h(ColumnFilterMenuItem, { key: filter.id, filter, label });\n }),\n );\n\n const filterIndicator = h(\n Tag,\n {\n minimal: true,\n large: true,\n icon: \"filter\",\n ...rest,\n },\n \"Filter\",\n );\n\n return {\n id: \"filter\",\n name: \"Filter\",\n icon: \"filter\",\n description: \"Add a filter to the data panel.\",\n targets: ALL_CARDINALITIES,\n render: (ctx) =>\n h(\n MenuDropdown,\n {\n content: filterMenu,\n placement: \"bottom-start\",\n },\n [filterIndicator],\n ),\n };\n}\n\nfunction useSortAction(): TableAction | null {\n const columnSpec = useSelector((s) => s.columnSpec);\n\n const rest = useDisplayIntent(ctx.use(hasActiveSortsAtom));\n\n const sortableCols = useMemo(\n () => columnSpec.filter((c) => c.sortable),\n [columnSpec],\n );\n\n if (sortableCols.length == 0) {\n return null;\n }\n const sortMenu = h(\n Menu,\n sortableCols.map((col) =>\n h(ColumnSortMenu, { key: col.key, columnKey: col.key, text: col.name }),\n ),\n );\n\n return {\n id: \"sort\",\n name: \"Sort\",\n icon: \"sort\",\n description: \"Add a sort to the data panel.\",\n targets: ALL_CARDINALITIES,\n render: (ctx) =>\n h(MenuDropdown, { content: sortMenu }, [\n h(\n Tag,\n {\n minimal: true,\n large: true,\n icon: \"sort\",\n ...rest,\n },\n \"Sort\",\n ),\n ]),\n };\n}\n\n// Both of these clear through the store's *actions* rather than writing the\n// state directly: the actions are what also drop a now-meaningless row\n// selection (see `dropRowSelection`).\nconst hasActiveFiltersAtom = atom(\n (get) => (get(storeAtom)?.activeFilters?.size ?? 0) > 0,\n (get) => {\n get(storeAtom)?.clearFilters?.();\n },\n);\nconst hasActiveSortsAtom = atom(\n (get) => (get(storeAtom)?.columnSorts?.length ?? 0) > 0,\n (get) => {\n get(storeAtom)?.clearColumnSorts?.();\n },\n);\n"],"names":["ctx"],"mappings":"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"}
|