@macrostrat/data-sheet 4.0.1 → 4.1.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.
Files changed (83) hide show
  1. package/CHANGELOG.md +25 -0
  2. package/README.md +11 -1
  3. package/dist/actions/column-controls.cjs +102 -1
  4. package/dist/actions/column-controls.cjs.map +1 -1
  5. package/dist/actions/column-controls.js +104 -3
  6. package/dist/actions/column-controls.js.map +1 -1
  7. package/dist/actions/column-filter.cjs +48 -25
  8. package/dist/actions/column-filter.cjs.map +1 -1
  9. package/dist/actions/column-filter.js +50 -27
  10. package/dist/actions/column-filter.js.map +1 -1
  11. package/dist/actions/selection.cjs +2 -1
  12. package/dist/actions/selection.cjs.map +1 -1
  13. package/dist/actions/selection.js +2 -1
  14. package/dist/actions/selection.js.map +1 -1
  15. package/dist/actions/table-controls.cjs +21 -0
  16. package/dist/actions/table-controls.cjs.map +1 -1
  17. package/dist/actions/table-controls.d.ts +4 -0
  18. package/dist/actions/table-controls.js +21 -0
  19. package/dist/actions/table-controls.js.map +1 -1
  20. package/dist/actions/toolbar.cjs +34 -4
  21. package/dist/actions/toolbar.cjs.map +1 -1
  22. package/dist/actions/toolbar.js +35 -5
  23. package/dist/actions/toolbar.js.map +1 -1
  24. package/dist/actions/types.d.ts +9 -0
  25. package/dist/cell-renderer.cjs +9 -7
  26. package/dist/cell-renderer.cjs.map +1 -1
  27. package/dist/cell-renderer.js +9 -7
  28. package/dist/cell-renderer.js.map +1 -1
  29. package/dist/core.cjs +68 -9
  30. package/dist/core.cjs.map +1 -1
  31. package/dist/core.d.ts +32 -1
  32. package/dist/core.js +69 -10
  33. package/dist/core.js.map +1 -1
  34. package/dist/filters/operators.cjs +2 -2
  35. package/dist/filters/operators.cjs.map +1 -1
  36. package/dist/filters/operators.d.ts +1 -1
  37. package/dist/filters/operators.js +2 -2
  38. package/dist/filters/operators.js.map +1 -1
  39. package/dist/index.cjs +4 -2
  40. package/dist/index.cjs.map +1 -1
  41. package/dist/index.js +4 -2
  42. package/dist/postgrest-table/data-loaders.cjs +1 -8
  43. package/dist/postgrest-table/data-loaders.cjs.map +1 -1
  44. package/dist/postgrest-table/data-loaders.js +1 -8
  45. package/dist/postgrest-table/data-loaders.js.map +1 -1
  46. package/dist/provider.cjs +9 -3
  47. package/dist/provider.cjs.map +1 -1
  48. package/dist/provider.d.ts +2 -1
  49. package/dist/provider.js +9 -3
  50. package/dist/provider.js.map +1 -1
  51. package/dist/renderers/column-header-cell.cjs +33 -32
  52. package/dist/renderers/column-header-cell.cjs.map +1 -1
  53. package/dist/renderers/column-header-cell.d.ts +1 -2
  54. package/dist/renderers/column-header-cell.js +34 -33
  55. package/dist/renderers/column-header-cell.js.map +1 -1
  56. package/dist/types.cjs +11 -0
  57. package/dist/types.cjs.map +1 -1
  58. package/dist/types.d.ts +55 -2
  59. package/dist/types.js +11 -0
  60. package/dist/types.js.map +1 -1
  61. package/dist/utils/column-spec.cjs.map +1 -1
  62. package/dist/utils/column-spec.d.ts +8 -0
  63. package/dist/utils/column-spec.js.map +1 -1
  64. package/dist/zustand-store.cjs +7 -3
  65. package/dist/zustand-store.cjs.map +1 -1
  66. package/dist/zustand-store.js +8 -4
  67. package/dist/zustand-store.js.map +1 -1
  68. package/package.json +1 -1
  69. package/src/actions/column-controls.ts +133 -2
  70. package/src/actions/column-filter.ts +59 -30
  71. package/src/actions/selection.ts +1 -0
  72. package/src/actions/table-controls.ts +24 -0
  73. package/src/actions/toolbar.ts +61 -5
  74. package/src/actions/types.ts +10 -0
  75. package/src/cell-renderer.ts +23 -10
  76. package/src/core.ts +131 -13
  77. package/src/filters/operators.ts +5 -3
  78. package/src/postgrest-table/data-loaders.ts +6 -10
  79. package/src/provider.ts +22 -5
  80. package/src/renderers/column-header-cell.ts +51 -36
  81. package/src/types.ts +66 -2
  82. package/src/utils/column-spec.ts +8 -0
  83. package/src/zustand-store.ts +12 -5
package/CHANGELOG.md CHANGED
@@ -1,5 +1,30 @@
1
1
  # Changelog
2
2
 
3
+ ## [4.1.1] - 2026-07-10
4
+
5
+ Small fixes to the column header, filters, and toolbar. Ghost/skeleton rows
6
+ while a provider table loads. `columnSpec` may now be a function of the loaded
7
+ rows, so a data-shaped spec needs no separate fetch of sample data.
8
+
9
+ ## [4.1.0] - 2026-07-10
10
+
11
+ ### Controlled editing improvements
12
+
13
+ - `deriveOverlay(rows)` prop — derive the controlled overlay from loaded rows
14
+ inside the sheet (for provider-owned data with external edit state)
15
+ - `onEdit` `setCells` events now carry the base `row`
16
+ - `refreshToken` prop to force a provider re-fetch
17
+
18
+ ### Toolbar and status bar improvements
19
+
20
+ - Global toolbar actions auto-position right (Clear → Reset → Save); contextual
21
+ actions stay left
22
+ - Built-in, auto-included `clearSelectionAction`
23
+ - Added a `statusBar` prop for bottom bar content
24
+ - Column headers dropdowns now use `Menu`
25
+ - Sort and filter improvements
26
+ - Improved and generalized `rowStatus` handling
27
+
3
28
  ## [4.0.1] - 2026-07-09
4
29
 
5
30
  Fixed small bug with the `editCells` api emitting `onEdit` events, which
package/README.md CHANGED
@@ -67,4 +67,14 @@ Workstreams, in sequence:
67
67
  removed). _Stories:_ `Data sheet/Chunk loader`, `Data sheet/PostgREST
68
68
  sheet`, `Data sheet/Filters`. _(Group-by stays a consumer/page-side
69
69
  concern for now — only the ingestion page needs it.)_
70
- - [ ] **F — Row-header customization** (group-key labels, omit styling)
70
+ - [x] **F — Row-header & row-status customization** — extensible `rowStatus`
71
+ (any string, not just added/deleted), per-status presentation via
72
+ **`rowStatusStyles`** (cell style + intent, row-header style; merged over
73
+ the built-in `"deleted"` default), a **`rowHeaderRenderer(ctx)`** for
74
+ gutter content (group-key labels, omit markers), and `status` on
75
+ `CellRenderContext`. _Story:_ `Data sheet/Row status`.
76
+ - [x] **Column-header menus** — sort and filter render as native menu items in
77
+ the column-header dropdown via **`TableAction.renderMenuItem`**: sort as an
78
+ Ascending/Descending submenu (re-click active to toggle off), filter as a
79
+ list of every applicable filter, each with its edit form in a submenu.
80
+ _Stories:_ `Data sheet/Controls`, `Data sheet/Filters`.
@@ -60,6 +60,38 @@ function ColumnSortControl({ columnKey }) {
60
60
  )
61
61
  );
62
62
  }
63
+ function ColumnSortMenu({ columnKey }) {
64
+ const storeAPI = provider.useStoreAPI();
65
+ const sort = provider.useSelector((s) => s.columnSorts.find((x) => x.key === columnKey));
66
+ const toggle = (ascending) => {
67
+ const store = storeAPI.getState();
68
+ const next = sort != null && sort.ascending === ascending ? null : ascending;
69
+ store.setColumnSort(columnKey, next);
70
+ };
71
+ const icon = sort == null ? "sort" : sort.ascending ? "sort-asc" : "sort-desc";
72
+ return h__default.default(
73
+ core.MenuItem,
74
+ { icon, text: "Sort" },
75
+ [
76
+ h__default.default(core.MenuItem, {
77
+ key: "asc",
78
+ icon: "sort-asc",
79
+ text: "Ascending",
80
+ active: sort?.ascending === true,
81
+ shouldDismissPopover: false,
82
+ onClick: () => toggle(true)
83
+ }),
84
+ h__default.default(core.MenuItem, {
85
+ key: "desc",
86
+ icon: "sort-desc",
87
+ text: "Descending",
88
+ active: sort?.ascending === false,
89
+ shouldDismissPopover: false,
90
+ onClick: () => toggle(false)
91
+ })
92
+ ]
93
+ );
94
+ }
63
95
  const columnSortAction = {
64
96
  id: "column-sort",
65
97
  name: "Sort",
@@ -72,6 +104,11 @@ const columnSortAction = {
72
104
  const col = selectedColumn(ctx);
73
105
  if (!col?.sortable) return null;
74
106
  return h__default.default(ColumnSortControl, { columnKey: col.key });
107
+ },
108
+ renderMenuItem(ctx) {
109
+ const col = selectedColumn(ctx);
110
+ if (!col?.sortable) return null;
111
+ return h__default.default(ColumnSortMenu, { columnKey: col.key });
75
112
  }
76
113
  };
77
114
  function resolveColumnFilter(col) {
@@ -116,12 +153,71 @@ function ColumnFilterControl({ col }) {
116
153
  minimal: true,
117
154
  icon: "filter",
118
155
  rightIcon: "caret-down",
119
- intent: isActive ? "warning" : "none"
156
+ intent: isActive ? "primary" : "none"
120
157
  },
121
158
  label
122
159
  )
123
160
  );
124
161
  }
162
+ function applicableColumnFilters(col) {
163
+ const result = [];
164
+ const rich = col.filters ?? [];
165
+ for (const f of rich) {
166
+ result.push({ ...f, columnKey: f.columnKey ?? col.key });
167
+ }
168
+ const hasOwnColumnFilter = result.some((r) => r.columnKey === col.key);
169
+ if ((col.filterable === true || typeof col.filterable === "object") && !hasOwnColumnFilter) {
170
+ result.push(columnFilter.columnFilter(col));
171
+ }
172
+ return result;
173
+ }
174
+ function ColumnFilterMenuItem({
175
+ filter,
176
+ label
177
+ }) {
178
+ const storeAPI = provider.useStoreAPI();
179
+ const state = provider.useSelector((s) => s.activeFilters.get(filter.id)?.state);
180
+ const isActive = state != null;
181
+ const summary = isActive ? filter.describeState?.(state) : null;
182
+ const setState = (next) => {
183
+ const store = storeAPI.getState();
184
+ if (next == null || next.value === "") {
185
+ store.removeFilter(filter.id);
186
+ } else {
187
+ store.setFilter(filter.id, filter, next);
188
+ }
189
+ };
190
+ return h__default.default(
191
+ core.MenuItem,
192
+ {
193
+ icon: filter.icon ?? "filter",
194
+ text: label,
195
+ label: summary != null ? String(summary) : void 0,
196
+ intent: isActive ? "primary" : void 0,
197
+ shouldDismissPopover: false
198
+ },
199
+ filter.filterForm != null ? h__default.default(
200
+ "div.filter-menu-form",
201
+ { style: { padding: "6px", minWidth: "220px" } },
202
+ h__default.default(filter.filterForm, { state: state ?? filter.defaultState, setState })
203
+ ) : null
204
+ );
205
+ }
206
+ function ColumnFilterMenu({ col }) {
207
+ const filters = react.useMemo(() => applicableColumnFilters(col), [col]);
208
+ const builtinId = columnFilter.columnFilterId(col.key);
209
+ return h__default.default(
210
+ filters.map(
211
+ (f) => h__default.default(ColumnFilterMenuItem, {
212
+ key: f.id,
213
+ filter: f,
214
+ // The generic operator filter is just "Filter" in its own column's
215
+ // menu; rich (user-provided) filters keep their descriptive names.
216
+ label: f.id === builtinId ? "Filter" : f.name
217
+ })
218
+ )
219
+ );
220
+ }
125
221
  const columnFilterAction = {
126
222
  id: "column-filter",
127
223
  name: "Filter",
@@ -133,6 +229,11 @@ const columnFilterAction = {
133
229
  const col = selectedColumn(ctx);
134
230
  if (col == null || !isColumnFilterable(col)) return null;
135
231
  return h__default.default(ColumnFilterControl, { col });
232
+ },
233
+ renderMenuItem(ctx) {
234
+ const col = selectedColumn(ctx);
235
+ if (col == null || !isColumnFilterable(col)) return null;
236
+ return h__default.default(ColumnFilterMenu, { col });
136
237
  }
137
238
  };
138
239
  function isColumnFilterable(col) {
@@ -1 +1 @@
1
- {"version":3,"file":"column-controls.cjs","sources":["../../src/actions/column-controls.ts"],"sourcesContent":["/**\n * Built-in `FULL_COLUMNS`-scoped controls — sort and filter — expressed as\n * `TableAction`s with a `render` (live control) rather than a one-shot `run`.\n * They read the single selected column from the action context and are gated\n * by the column's `sortable` / `filterable` flags. Overridable: consumers can\n * omit them, replace them, or add their own controls at any cardinality.\n */\nimport h from \"@macrostrat/hyper\";\nimport { useMemo } from \"react\";\nimport { Button, Menu, MenuItem, PopoverNext } from \"@blueprintjs/core\";\nimport { RegionCardinality } from \"@blueprintjs/table\";\nimport { useSelector, useStoreAPI } from \"../provider\";\nimport type { TableAction, TableActionContext, TableFilter } from \"./types\";\nimport type { ColumnSpec } from \"../utils/column-spec\";\nimport { columnFilter } from \"./column-filter\";\n\nfunction selectedColumn(ctx: TableActionContext) {\n const key = ctx.getSelectedColumnKeys()[0];\n if (key == null) return null;\n return ctx.columnSpec.find((c) => c.key === key) ?? null;\n}\n\n// ---- Sort ----\n\nfunction ColumnSortControl({ columnKey }: { columnKey: string }) {\n const storeAPI = useStoreAPI();\n const sort = useSelector((s) => s.columnSorts.find((x) => x.key === columnKey));\n const set = (ascending: boolean | null) =>\n storeAPI.getState().setColumnSort(columnKey, ascending);\n\n const icon = sort == null ? \"sort\" : sort.ascending ? \"sort-asc\" : \"sort-desc\";\n const label =\n sort == null ? \"Sort\" : sort.ascending ? \"Ascending\" : \"Descending\";\n\n return h(\n PopoverNext,\n {\n placement: \"bottom-start\",\n content: h(Menu, [\n h(MenuItem, {\n key: \"asc\",\n text: \"Ascending\",\n icon: \"sort-asc\",\n active: sort?.ascending === true,\n onClick: () => set(true),\n }),\n h(MenuItem, {\n key: \"desc\",\n text: \"Descending\",\n icon: \"sort-desc\",\n active: sort?.ascending === false,\n onClick: () => set(false),\n }),\n h(MenuItem, {\n key: \"clear\",\n text: \"Clear sort\",\n icon: \"cross\",\n disabled: sort == null,\n onClick: () => set(null),\n }),\n ]),\n },\n h(\n Button,\n {\n small: true,\n minimal: true,\n icon,\n rightIcon: \"caret-down\",\n intent: sort != null ? \"primary\" : \"none\",\n },\n label,\n ),\n );\n}\n\n/** Single-column sort control. Gated by `col.sortable`. */\nexport const columnSortAction: TableAction = {\n id: \"column-sort\",\n name: \"Sort\",\n icon: \"sort\",\n targets: [RegionCardinality.FULL_COLUMNS],\n requiresEditable: false,\n // Only a single column (within the FULL_COLUMNS target), not multi-column.\n appliesTo: (ctx) => ctx.columnKey != null,\n render(ctx) {\n const col = selectedColumn(ctx);\n if (!col?.sortable) return null;\n return h(ColumnSortControl, { columnKey: col.key });\n },\n};\n\n// ---- Filter ----\n\n/** The filter offered for a column: its own rich `TableFilter` (from\n * `col.filters`) when present — so the header matches the top bar and the rich\n * filter is prioritized — else the built-in operator `columnFilter`. */\nfunction resolveColumnFilter(col: ColumnSpec): TableFilter {\n const rich = (col.filters as TableFilter[] | undefined)?.find(\n (f) => (f.columnKey ?? col.key) === col.key,\n );\n if (rich != null) return { ...rich, columnKey: rich.columnKey ?? col.key };\n return columnFilter(col);\n}\n\nfunction ColumnFilterControl({ col }: { col: ColumnSpec }) {\n const storeAPI = useStoreAPI();\n // Same `TableFilter` the FilterBar and any provider consume, so the header,\n // the bar, and the query stay in sync (rich filter prioritized).\n const filter = useMemo(() => resolveColumnFilter(col), [col]);\n const state = useSelector((s) => s.activeFilters.get(filter.id)?.state);\n const isActive = state != null;\n const summary = isActive ? filter.describeState?.(state) : null;\n\n const setState = (next: any) => {\n const store = storeAPI.getState();\n // An empty operator-filter value clears; otherwise activate/update.\n if (next == null || next.value === \"\") {\n store.removeFilter(filter.id);\n } else {\n store.setFilter(filter.id, filter, next);\n }\n };\n\n const label = isActive ? String(summary ?? filter.name) : \"Filter\";\n\n return h(\n PopoverNext,\n {\n placement: \"bottom-start\",\n content: h(\n \"div\",\n { style: { padding: \"6px\", minWidth: \"220px\" } },\n filter.filterForm != null\n ? h(filter.filterForm, {\n state: state ?? filter.defaultState,\n setState,\n })\n : null,\n ),\n },\n h(\n Button,\n {\n small: true,\n minimal: true,\n icon: \"filter\",\n rightIcon: \"caret-down\",\n intent: isActive ? \"warning\" : \"none\",\n },\n label,\n ),\n );\n}\n\n/** Single-column filter control. Gated by `col.filterable`. */\nexport const columnFilterAction: TableAction = {\n id: \"column-filter\",\n name: \"Filter\",\n icon: \"filter\",\n targets: [RegionCardinality.FULL_COLUMNS],\n requiresEditable: false,\n appliesTo: (ctx) => ctx.columnKey != null,\n render(ctx) {\n const col = selectedColumn(ctx);\n if (col == null || !isColumnFilterable(col)) return null;\n return h(ColumnFilterControl, { col });\n },\n};\n\n/** A column offers a filter when it declares `filterable`, or supplies its own\n * `filters`. */\nexport function isColumnFilterable(col: ColumnSpec): boolean {\n return (\n col.filterable === true ||\n typeof col.filterable === \"object\" ||\n (Array.isArray(col.filters) && col.filters.length > 0)\n );\n}\n\n/** The built-in column controls (sort + filter), for inclusion in `actions`. */\nexport const columnControlActions: TableAction[] = [\n columnSortAction,\n columnFilterAction,\n];\n"],"names":["useStoreAPI","useSelector","h","PopoverNext","Menu","MenuItem","Button","RegionCardinality","columnFilter","useMemo"],"mappings":"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"}
1
+ {"version":3,"file":"column-controls.cjs","sources":["../../src/actions/column-controls.ts"],"sourcesContent":["/**\n * Built-in `FULL_COLUMNS`-scoped controls — sort and filter — expressed as\n * `TableAction`s with a `render` (live control) rather than a one-shot `run`.\n * They read the single selected column from the action context and are gated\n * by the column's `sortable` / `filterable` flags. Overridable: consumers can\n * omit them, replace them, or add their own controls at any cardinality.\n */\nimport h from \"@macrostrat/hyper\";\nimport { useMemo } from \"react\";\nimport { Button, Menu, MenuItem, PopoverNext } from \"@blueprintjs/core\";\nimport { RegionCardinality } from \"@blueprintjs/table\";\nimport { useSelector, useStoreAPI } from \"../provider\";\nimport type { TableAction, TableActionContext, TableFilter } from \"./types\";\nimport type { ColumnSpec } from \"../utils/column-spec\";\nimport { columnFilter, columnFilterId } from \"./column-filter\";\n\nfunction selectedColumn(ctx: TableActionContext) {\n const key = ctx.getSelectedColumnKeys()[0];\n if (key == null) return null;\n return ctx.columnSpec.find((c) => c.key === key) ?? null;\n}\n\n// ---- Sort ----\n\nfunction ColumnSortControl({ columnKey }: { columnKey: string }) {\n const storeAPI = useStoreAPI();\n const sort = useSelector((s) => s.columnSorts.find((x) => x.key === columnKey));\n const set = (ascending: boolean | null) =>\n storeAPI.getState().setColumnSort(columnKey, ascending);\n\n const icon = sort == null ? \"sort\" : sort.ascending ? \"sort-asc\" : \"sort-desc\";\n const label =\n sort == null ? \"Sort\" : sort.ascending ? \"Ascending\" : \"Descending\";\n\n return h(\n PopoverNext,\n {\n placement: \"bottom-start\",\n content: h(Menu, [\n h(MenuItem, {\n key: \"asc\",\n text: \"Ascending\",\n icon: \"sort-asc\",\n active: sort?.ascending === true,\n onClick: () => set(true),\n }),\n h(MenuItem, {\n key: \"desc\",\n text: \"Descending\",\n icon: \"sort-desc\",\n active: sort?.ascending === false,\n onClick: () => set(false),\n }),\n h(MenuItem, {\n key: \"clear\",\n text: \"Clear sort\",\n icon: \"cross\",\n disabled: sort == null,\n onClick: () => set(null),\n }),\n ]),\n },\n h(\n Button,\n {\n small: true,\n minimal: true,\n icon,\n rightIcon: \"caret-down\",\n intent: sort != null ? \"primary\" : \"none\",\n },\n label,\n ),\n );\n}\n\n/** Menu-native sort: a \"Sort\" item whose submenu holds Ascending / Descending.\n * Clicking the *active* direction again clears the sort (toggle off) — there's\n * no explicit \"Clear\" item, since the active-filter/sort tag in the status bar\n * already offers direct removal. */\nfunction ColumnSortMenu({ columnKey }: { columnKey: string }) {\n const storeAPI = useStoreAPI();\n const sort = useSelector((s) => s.columnSorts.find((x) => x.key === columnKey));\n const toggle = (ascending: boolean) => {\n const store = storeAPI.getState();\n // A second click on the current direction toggles the sort off.\n const next = sort != null && sort.ascending === ascending ? null : ascending;\n store.setColumnSort(columnKey, next);\n };\n const icon = sort == null ? \"sort\" : sort.ascending ? \"sort-asc\" : \"sort-desc\";\n return h(\n MenuItem,\n { icon, text: \"Sort\" },\n [\n h(MenuItem, {\n key: \"asc\",\n icon: \"sort-asc\",\n text: \"Ascending\",\n active: sort?.ascending === true,\n shouldDismissPopover: false,\n onClick: () => toggle(true),\n }),\n h(MenuItem, {\n key: \"desc\",\n icon: \"sort-desc\",\n text: \"Descending\",\n active: sort?.ascending === false,\n shouldDismissPopover: false,\n onClick: () => toggle(false),\n }),\n ],\n );\n}\n\n/** Single-column sort control. Gated by `col.sortable`. */\nexport const columnSortAction: TableAction = {\n id: \"column-sort\",\n name: \"Sort\",\n icon: \"sort\",\n targets: [RegionCardinality.FULL_COLUMNS],\n requiresEditable: false,\n // Only a single column (within the FULL_COLUMNS target), not multi-column.\n appliesTo: (ctx) => ctx.columnKey != null,\n render(ctx) {\n const col = selectedColumn(ctx);\n if (!col?.sortable) return null;\n return h(ColumnSortControl, { columnKey: col.key });\n },\n renderMenuItem(ctx) {\n const col = selectedColumn(ctx);\n if (!col?.sortable) return null;\n return h(ColumnSortMenu, { columnKey: col.key });\n },\n};\n\n// ---- Filter ----\n\n/** The filter offered for a column: its own rich `TableFilter` (from\n * `col.filters`) when present — so the header matches the top bar and the rich\n * filter is prioritized — else the built-in operator `columnFilter`. */\nfunction resolveColumnFilter(col: ColumnSpec): TableFilter {\n const rich = (col.filters as TableFilter[] | undefined)?.find(\n (f) => (f.columnKey ?? col.key) === col.key,\n );\n if (rich != null) return { ...rich, columnKey: rich.columnKey ?? col.key };\n return columnFilter(col);\n}\n\nfunction ColumnFilterControl({ col }: { col: ColumnSpec }) {\n const storeAPI = useStoreAPI();\n // Same `TableFilter` the FilterBar and any provider consume, so the header,\n // the bar, and the query stay in sync (rich filter prioritized).\n const filter = useMemo(() => resolveColumnFilter(col), [col]);\n const state = useSelector((s) => s.activeFilters.get(filter.id)?.state);\n const isActive = state != null;\n const summary = isActive ? filter.describeState?.(state) : null;\n\n const setState = (next: any) => {\n const store = storeAPI.getState();\n // An empty operator-filter value clears; otherwise activate/update.\n if (next == null || next.value === \"\") {\n store.removeFilter(filter.id);\n } else {\n store.setFilter(filter.id, filter, next);\n }\n };\n\n const label = isActive ? String(summary ?? filter.name) : \"Filter\";\n\n return h(\n PopoverNext,\n {\n placement: \"bottom-start\",\n content: h(\n \"div\",\n { style: { padding: \"6px\", minWidth: \"220px\" } },\n filter.filterForm != null\n ? h(filter.filterForm, {\n state: state ?? filter.defaultState,\n setState,\n })\n : null,\n ),\n },\n h(\n Button,\n {\n small: true,\n minimal: true,\n icon: \"filter\",\n rightIcon: \"caret-down\",\n intent: isActive ? \"primary\" : \"none\",\n },\n label,\n ),\n );\n}\n\n/** Every filter applicable to a column: its rich `col.filters` (there may be\n * several) plus the built-in operator `columnFilter` when the column is\n * `filterable` and no rich filter already targets it. The menu lists all of\n * them; the toolbar's `render` collapses to `resolveColumnFilter` (a single\n * control). */\nfunction applicableColumnFilters(col: ColumnSpec): TableFilter[] {\n const result: TableFilter[] = [];\n const rich = (col.filters as TableFilter[] | undefined) ?? [];\n for (const f of rich) {\n result.push({ ...f, columnKey: f.columnKey ?? col.key });\n }\n const hasOwnColumnFilter = result.some((r) => r.columnKey === col.key);\n if (\n (col.filterable === true || typeof col.filterable === \"object\") &&\n !hasOwnColumnFilter\n ) {\n result.push(columnFilter(col));\n }\n return result;\n}\n\n/** One filter, as a menu item whose submenu carries its edit form. Active\n * filters get a warning intent and show their `describeState` summary. The\n * displayed `label` may differ from `filter.name` (e.g. the built-in operator\n * filter reads \"Filter\" in a column's own menu, where the column is implicit). */\nfunction ColumnFilterMenuItem({\n filter,\n label,\n}: {\n filter: TableFilter;\n label: string;\n}) {\n const storeAPI = useStoreAPI();\n const state = useSelector((s) => s.activeFilters.get(filter.id)?.state);\n const isActive = state != null;\n const summary = isActive ? filter.describeState?.(state) : null;\n\n const setState = (next: any) => {\n const store = storeAPI.getState();\n if (next == null || next.value === \"\") {\n store.removeFilter(filter.id);\n } else {\n store.setFilter(filter.id, filter, next);\n }\n };\n\n return h(\n MenuItem,\n {\n icon: filter.icon ?? \"filter\",\n text: label,\n label: summary != null ? String(summary) : undefined,\n intent: isActive ? \"primary\" : undefined,\n shouldDismissPopover: false,\n },\n filter.filterForm != null\n ? h(\n \"div.filter-menu-form\",\n { style: { padding: \"6px\", minWidth: \"220px\" } },\n h(filter.filterForm, { state: state ?? filter.defaultState, setState }),\n )\n : null,\n );\n}\n\n/** Menu-native filter: one item per applicable filter, each opening its form\n * in a submenu. */\nfunction ColumnFilterMenu({ col }: { col: ColumnSpec }) {\n const filters = useMemo(() => applicableColumnFilters(col), [col]);\n const builtinId = columnFilterId(col.key);\n return h(\n filters.map((f) =>\n h(ColumnFilterMenuItem, {\n key: f.id,\n filter: f,\n // The generic operator filter is just \"Filter\" in its own column's\n // menu; rich (user-provided) filters keep their descriptive names.\n label: f.id === builtinId ? \"Filter\" : f.name,\n }),\n ),\n );\n}\n\n/** Single-column filter control. Gated by `col.filterable`. */\nexport const columnFilterAction: TableAction = {\n id: \"column-filter\",\n name: \"Filter\",\n icon: \"filter\",\n targets: [RegionCardinality.FULL_COLUMNS],\n requiresEditable: false,\n appliesTo: (ctx) => ctx.columnKey != null,\n render(ctx) {\n const col = selectedColumn(ctx);\n if (col == null || !isColumnFilterable(col)) return null;\n return h(ColumnFilterControl, { col });\n },\n renderMenuItem(ctx) {\n const col = selectedColumn(ctx);\n if (col == null || !isColumnFilterable(col)) return null;\n return h(ColumnFilterMenu, { col });\n },\n};\n\n/** A column offers a filter when it declares `filterable`, or supplies its own\n * `filters`. */\nexport function isColumnFilterable(col: ColumnSpec): boolean {\n return (\n col.filterable === true ||\n typeof col.filterable === \"object\" ||\n (Array.isArray(col.filters) && col.filters.length > 0)\n );\n}\n\n/** The built-in column controls (sort + filter), for inclusion in `actions`. */\nexport const columnControlActions: TableAction[] = [\n columnSortAction,\n columnFilterAction,\n];\n"],"names":["useStoreAPI","useSelector","h","PopoverNext","Menu","MenuItem","Button","RegionCardinality","columnFilter","useMemo","columnFilterId"],"mappings":"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"}
@@ -1,9 +1,9 @@
1
1
  import h from "@macrostrat/hyper";
2
2
  import { useMemo } from "react";
3
- import { PopoverNext, Menu, MenuItem, Button } from "@blueprintjs/core";
3
+ import { MenuItem, PopoverNext, Menu, Button } from "@blueprintjs/core";
4
4
  import { RegionCardinality } from "@blueprintjs/table";
5
5
  import { useStoreAPI, useSelector } from "../provider.js";
6
- import { columnFilter } from "./column-filter.js";
6
+ import { columnFilterId, columnFilter } from "./column-filter.js";
7
7
  function selectedColumn(ctx) {
8
8
  const key = ctx.getSelectedColumnKeys()[0];
9
9
  if (key == null) return null;
@@ -56,6 +56,38 @@ function ColumnSortControl({ columnKey }) {
56
56
  )
57
57
  );
58
58
  }
59
+ function ColumnSortMenu({ columnKey }) {
60
+ const storeAPI = useStoreAPI();
61
+ const sort = useSelector((s) => s.columnSorts.find((x) => x.key === columnKey));
62
+ const toggle = (ascending) => {
63
+ const store = storeAPI.getState();
64
+ const next = sort != null && sort.ascending === ascending ? null : ascending;
65
+ store.setColumnSort(columnKey, next);
66
+ };
67
+ const icon = sort == null ? "sort" : sort.ascending ? "sort-asc" : "sort-desc";
68
+ return h(
69
+ MenuItem,
70
+ { icon, text: "Sort" },
71
+ [
72
+ h(MenuItem, {
73
+ key: "asc",
74
+ icon: "sort-asc",
75
+ text: "Ascending",
76
+ active: sort?.ascending === true,
77
+ shouldDismissPopover: false,
78
+ onClick: () => toggle(true)
79
+ }),
80
+ h(MenuItem, {
81
+ key: "desc",
82
+ icon: "sort-desc",
83
+ text: "Descending",
84
+ active: sort?.ascending === false,
85
+ shouldDismissPopover: false,
86
+ onClick: () => toggle(false)
87
+ })
88
+ ]
89
+ );
90
+ }
59
91
  const columnSortAction = {
60
92
  id: "column-sort",
61
93
  name: "Sort",
@@ -68,6 +100,11 @@ const columnSortAction = {
68
100
  const col = selectedColumn(ctx);
69
101
  if (!col?.sortable) return null;
70
102
  return h(ColumnSortControl, { columnKey: col.key });
103
+ },
104
+ renderMenuItem(ctx) {
105
+ const col = selectedColumn(ctx);
106
+ if (!col?.sortable) return null;
107
+ return h(ColumnSortMenu, { columnKey: col.key });
71
108
  }
72
109
  };
73
110
  function resolveColumnFilter(col) {
@@ -112,12 +149,71 @@ function ColumnFilterControl({ col }) {
112
149
  minimal: true,
113
150
  icon: "filter",
114
151
  rightIcon: "caret-down",
115
- intent: isActive ? "warning" : "none"
152
+ intent: isActive ? "primary" : "none"
116
153
  },
117
154
  label
118
155
  )
119
156
  );
120
157
  }
158
+ function applicableColumnFilters(col) {
159
+ const result = [];
160
+ const rich = col.filters ?? [];
161
+ for (const f of rich) {
162
+ result.push({ ...f, columnKey: f.columnKey ?? col.key });
163
+ }
164
+ const hasOwnColumnFilter = result.some((r) => r.columnKey === col.key);
165
+ if ((col.filterable === true || typeof col.filterable === "object") && !hasOwnColumnFilter) {
166
+ result.push(columnFilter(col));
167
+ }
168
+ return result;
169
+ }
170
+ function ColumnFilterMenuItem({
171
+ filter,
172
+ label
173
+ }) {
174
+ const storeAPI = useStoreAPI();
175
+ const state = useSelector((s) => s.activeFilters.get(filter.id)?.state);
176
+ const isActive = state != null;
177
+ const summary = isActive ? filter.describeState?.(state) : null;
178
+ const setState = (next) => {
179
+ const store = storeAPI.getState();
180
+ if (next == null || next.value === "") {
181
+ store.removeFilter(filter.id);
182
+ } else {
183
+ store.setFilter(filter.id, filter, next);
184
+ }
185
+ };
186
+ return h(
187
+ MenuItem,
188
+ {
189
+ icon: filter.icon ?? "filter",
190
+ text: label,
191
+ label: summary != null ? String(summary) : void 0,
192
+ intent: isActive ? "primary" : void 0,
193
+ shouldDismissPopover: false
194
+ },
195
+ filter.filterForm != null ? h(
196
+ "div.filter-menu-form",
197
+ { style: { padding: "6px", minWidth: "220px" } },
198
+ h(filter.filterForm, { state: state ?? filter.defaultState, setState })
199
+ ) : null
200
+ );
201
+ }
202
+ function ColumnFilterMenu({ col }) {
203
+ const filters = useMemo(() => applicableColumnFilters(col), [col]);
204
+ const builtinId = columnFilterId(col.key);
205
+ return h(
206
+ filters.map(
207
+ (f) => h(ColumnFilterMenuItem, {
208
+ key: f.id,
209
+ filter: f,
210
+ // The generic operator filter is just "Filter" in its own column's
211
+ // menu; rich (user-provided) filters keep their descriptive names.
212
+ label: f.id === builtinId ? "Filter" : f.name
213
+ })
214
+ )
215
+ );
216
+ }
121
217
  const columnFilterAction = {
122
218
  id: "column-filter",
123
219
  name: "Filter",
@@ -129,6 +225,11 @@ const columnFilterAction = {
129
225
  const col = selectedColumn(ctx);
130
226
  if (col == null || !isColumnFilterable(col)) return null;
131
227
  return h(ColumnFilterControl, { col });
228
+ },
229
+ renderMenuItem(ctx) {
230
+ const col = selectedColumn(ctx);
231
+ if (col == null || !isColumnFilterable(col)) return null;
232
+ return h(ColumnFilterMenu, { col });
132
233
  }
133
234
  };
134
235
  function isColumnFilterable(col) {
@@ -1 +1 @@
1
- {"version":3,"file":"column-controls.js","sources":["../../src/actions/column-controls.ts"],"sourcesContent":["/**\n * Built-in `FULL_COLUMNS`-scoped controls — sort and filter — expressed as\n * `TableAction`s with a `render` (live control) rather than a one-shot `run`.\n * They read the single selected column from the action context and are gated\n * by the column's `sortable` / `filterable` flags. Overridable: consumers can\n * omit them, replace them, or add their own controls at any cardinality.\n */\nimport h from \"@macrostrat/hyper\";\nimport { useMemo } from \"react\";\nimport { Button, Menu, MenuItem, PopoverNext } from \"@blueprintjs/core\";\nimport { RegionCardinality } from \"@blueprintjs/table\";\nimport { useSelector, useStoreAPI } from \"../provider\";\nimport type { TableAction, TableActionContext, TableFilter } from \"./types\";\nimport type { ColumnSpec } from \"../utils/column-spec\";\nimport { columnFilter } from \"./column-filter\";\n\nfunction selectedColumn(ctx: TableActionContext) {\n const key = ctx.getSelectedColumnKeys()[0];\n if (key == null) return null;\n return ctx.columnSpec.find((c) => c.key === key) ?? null;\n}\n\n// ---- Sort ----\n\nfunction ColumnSortControl({ columnKey }: { columnKey: string }) {\n const storeAPI = useStoreAPI();\n const sort = useSelector((s) => s.columnSorts.find((x) => x.key === columnKey));\n const set = (ascending: boolean | null) =>\n storeAPI.getState().setColumnSort(columnKey, ascending);\n\n const icon = sort == null ? \"sort\" : sort.ascending ? \"sort-asc\" : \"sort-desc\";\n const label =\n sort == null ? \"Sort\" : sort.ascending ? \"Ascending\" : \"Descending\";\n\n return h(\n PopoverNext,\n {\n placement: \"bottom-start\",\n content: h(Menu, [\n h(MenuItem, {\n key: \"asc\",\n text: \"Ascending\",\n icon: \"sort-asc\",\n active: sort?.ascending === true,\n onClick: () => set(true),\n }),\n h(MenuItem, {\n key: \"desc\",\n text: \"Descending\",\n icon: \"sort-desc\",\n active: sort?.ascending === false,\n onClick: () => set(false),\n }),\n h(MenuItem, {\n key: \"clear\",\n text: \"Clear sort\",\n icon: \"cross\",\n disabled: sort == null,\n onClick: () => set(null),\n }),\n ]),\n },\n h(\n Button,\n {\n small: true,\n minimal: true,\n icon,\n rightIcon: \"caret-down\",\n intent: sort != null ? \"primary\" : \"none\",\n },\n label,\n ),\n );\n}\n\n/** Single-column sort control. Gated by `col.sortable`. */\nexport const columnSortAction: TableAction = {\n id: \"column-sort\",\n name: \"Sort\",\n icon: \"sort\",\n targets: [RegionCardinality.FULL_COLUMNS],\n requiresEditable: false,\n // Only a single column (within the FULL_COLUMNS target), not multi-column.\n appliesTo: (ctx) => ctx.columnKey != null,\n render(ctx) {\n const col = selectedColumn(ctx);\n if (!col?.sortable) return null;\n return h(ColumnSortControl, { columnKey: col.key });\n },\n};\n\n// ---- Filter ----\n\n/** The filter offered for a column: its own rich `TableFilter` (from\n * `col.filters`) when present — so the header matches the top bar and the rich\n * filter is prioritized — else the built-in operator `columnFilter`. */\nfunction resolveColumnFilter(col: ColumnSpec): TableFilter {\n const rich = (col.filters as TableFilter[] | undefined)?.find(\n (f) => (f.columnKey ?? col.key) === col.key,\n );\n if (rich != null) return { ...rich, columnKey: rich.columnKey ?? col.key };\n return columnFilter(col);\n}\n\nfunction ColumnFilterControl({ col }: { col: ColumnSpec }) {\n const storeAPI = useStoreAPI();\n // Same `TableFilter` the FilterBar and any provider consume, so the header,\n // the bar, and the query stay in sync (rich filter prioritized).\n const filter = useMemo(() => resolveColumnFilter(col), [col]);\n const state = useSelector((s) => s.activeFilters.get(filter.id)?.state);\n const isActive = state != null;\n const summary = isActive ? filter.describeState?.(state) : null;\n\n const setState = (next: any) => {\n const store = storeAPI.getState();\n // An empty operator-filter value clears; otherwise activate/update.\n if (next == null || next.value === \"\") {\n store.removeFilter(filter.id);\n } else {\n store.setFilter(filter.id, filter, next);\n }\n };\n\n const label = isActive ? String(summary ?? filter.name) : \"Filter\";\n\n return h(\n PopoverNext,\n {\n placement: \"bottom-start\",\n content: h(\n \"div\",\n { style: { padding: \"6px\", minWidth: \"220px\" } },\n filter.filterForm != null\n ? h(filter.filterForm, {\n state: state ?? filter.defaultState,\n setState,\n })\n : null,\n ),\n },\n h(\n Button,\n {\n small: true,\n minimal: true,\n icon: \"filter\",\n rightIcon: \"caret-down\",\n intent: isActive ? \"warning\" : \"none\",\n },\n label,\n ),\n );\n}\n\n/** Single-column filter control. Gated by `col.filterable`. */\nexport const columnFilterAction: TableAction = {\n id: \"column-filter\",\n name: \"Filter\",\n icon: \"filter\",\n targets: [RegionCardinality.FULL_COLUMNS],\n requiresEditable: false,\n appliesTo: (ctx) => ctx.columnKey != null,\n render(ctx) {\n const col = selectedColumn(ctx);\n if (col == null || !isColumnFilterable(col)) return null;\n return h(ColumnFilterControl, { col });\n },\n};\n\n/** A column offers a filter when it declares `filterable`, or supplies its own\n * `filters`. */\nexport function isColumnFilterable(col: ColumnSpec): boolean {\n return (\n col.filterable === true ||\n typeof col.filterable === \"object\" ||\n (Array.isArray(col.filters) && col.filters.length > 0)\n );\n}\n\n/** The built-in column controls (sort + filter), for inclusion in `actions`. */\nexport const columnControlActions: TableAction[] = [\n columnSortAction,\n columnFilterAction,\n];\n"],"names":[],"mappings":";;;;;;AAgBA,SAAS,eAAe,KAAyB;AAC/C,QAAM,MAAM,IAAI,sBAAA,EAAwB,CAAC;AACzC,MAAI,OAAO,KAAM,QAAO;AACxB,SAAO,IAAI,WAAW,KAAK,CAAC,MAAM,EAAE,QAAQ,GAAG,KAAK;AACtD;AAIA,SAAS,kBAAkB,EAAE,aAAoC;AAC/D,QAAM,WAAW,YAAA;AACjB,QAAM,OAAO,YAAY,CAAC,MAAM,EAAE,YAAY,KAAK,CAAC,MAAM,EAAE,QAAQ,SAAS,CAAC;AAC9E,QAAM,MAAM,CAAC,cACX,SAAS,WAAW,cAAc,WAAW,SAAS;AAExD,QAAM,OAAO,QAAQ,OAAO,SAAS,KAAK,YAAY,aAAa;AACnE,QAAM,QACJ,QAAQ,OAAO,SAAS,KAAK,YAAY,cAAc;AAEzD,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE,WAAW;AAAA,MACX,SAAS,EAAE,MAAM;AAAA,QACf,EAAE,UAAU;AAAA,UACV,KAAK;AAAA,UACL,MAAM;AAAA,UACN,MAAM;AAAA,UACN,QAAQ,MAAM,cAAc;AAAA,UAC5B,SAAS,MAAM,IAAI,IAAI;AAAA,QAAA,CACxB;AAAA,QACD,EAAE,UAAU;AAAA,UACV,KAAK;AAAA,UACL,MAAM;AAAA,UACN,MAAM;AAAA,UACN,QAAQ,MAAM,cAAc;AAAA,UAC5B,SAAS,MAAM,IAAI,KAAK;AAAA,QAAA,CACzB;AAAA,QACD,EAAE,UAAU;AAAA,UACV,KAAK;AAAA,UACL,MAAM;AAAA,UACN,MAAM;AAAA,UACN,UAAU,QAAQ;AAAA,UAClB,SAAS,MAAM,IAAI,IAAI;AAAA,QAAA,CACxB;AAAA,MAAA,CACF;AAAA,IAAA;AAAA,IAEH;AAAA,MACE;AAAA,MACA;AAAA,QACE,OAAO;AAAA,QACP,SAAS;AAAA,QACT;AAAA,QACA,WAAW;AAAA,QACX,QAAQ,QAAQ,OAAO,YAAY;AAAA,MAAA;AAAA,MAErC;AAAA,IAAA;AAAA,EACF;AAEJ;AAGO,MAAM,mBAAgC;AAAA,EAC3C,IAAI;AAAA,EACJ,MAAM;AAAA,EACN,MAAM;AAAA,EACN,SAAS,CAAC,kBAAkB,YAAY;AAAA,EACxC,kBAAkB;AAAA;AAAA,EAElB,WAAW,CAAC,QAAQ,IAAI,aAAa;AAAA,EACrC,OAAO,KAAK;AACV,UAAM,MAAM,eAAe,GAAG;AAC9B,QAAI,CAAC,KAAK,SAAU,QAAO;AAC3B,WAAO,EAAE,mBAAmB,EAAE,WAAW,IAAI,KAAK;AAAA,EACpD;AACF;AAOA,SAAS,oBAAoB,KAA8B;AACzD,QAAM,OAAQ,IAAI,SAAuC;AAAA,IACvD,CAAC,OAAO,EAAE,aAAa,IAAI,SAAS,IAAI;AAAA,EAAA;AAE1C,MAAI,QAAQ,KAAM,QAAO,EAAE,GAAG,MAAM,WAAW,KAAK,aAAa,IAAI,IAAA;AACrE,SAAO,aAAa,GAAG;AACzB;AAEA,SAAS,oBAAoB,EAAE,OAA4B;AACzD,QAAM,WAAW,YAAA;AAGjB,QAAM,SAAS,QAAQ,MAAM,oBAAoB,GAAG,GAAG,CAAC,GAAG,CAAC;AAC5D,QAAM,QAAQ,YAAY,CAAC,MAAM,EAAE,cAAc,IAAI,OAAO,EAAE,GAAG,KAAK;AACtE,QAAM,WAAW,SAAS;AAC1B,QAAM,UAAU,WAAW,OAAO,gBAAgB,KAAK,IAAI;AAE3D,QAAM,WAAW,CAAC,SAAc;AAC9B,UAAM,QAAQ,SAAS,SAAA;AAEvB,QAAI,QAAQ,QAAQ,KAAK,UAAU,IAAI;AACrC,YAAM,aAAa,OAAO,EAAE;AAAA,IAC9B,OAAO;AACL,YAAM,UAAU,OAAO,IAAI,QAAQ,IAAI;AAAA,IACzC;AAAA,EACF;AAEA,QAAM,QAAQ,WAAW,OAAO,WAAW,OAAO,IAAI,IAAI;AAE1D,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE,WAAW;AAAA,MACX,SAAS;AAAA,QACP;AAAA,QACA,EAAE,OAAO,EAAE,SAAS,OAAO,UAAU,UAAQ;AAAA,QAC7C,OAAO,cAAc,OACjB,EAAE,OAAO,YAAY;AAAA,UACnB,OAAO,SAAS,OAAO;AAAA,UACvB;AAAA,QAAA,CACD,IACD;AAAA,MAAA;AAAA,IACN;AAAA,IAEF;AAAA,MACE;AAAA,MACA;AAAA,QACE,OAAO;AAAA,QACP,SAAS;AAAA,QACT,MAAM;AAAA,QACN,WAAW;AAAA,QACX,QAAQ,WAAW,YAAY;AAAA,MAAA;AAAA,MAEjC;AAAA,IAAA;AAAA,EACF;AAEJ;AAGO,MAAM,qBAAkC;AAAA,EAC7C,IAAI;AAAA,EACJ,MAAM;AAAA,EACN,MAAM;AAAA,EACN,SAAS,CAAC,kBAAkB,YAAY;AAAA,EACxC,kBAAkB;AAAA,EAClB,WAAW,CAAC,QAAQ,IAAI,aAAa;AAAA,EACrC,OAAO,KAAK;AACV,UAAM,MAAM,eAAe,GAAG;AAC9B,QAAI,OAAO,QAAQ,CAAC,mBAAmB,GAAG,EAAG,QAAO;AACpD,WAAO,EAAE,qBAAqB,EAAE,KAAK;AAAA,EACvC;AACF;AAIO,SAAS,mBAAmB,KAA0B;AAC3D,SACE,IAAI,eAAe,QACnB,OAAO,IAAI,eAAe,YACzB,MAAM,QAAQ,IAAI,OAAO,KAAK,IAAI,QAAQ,SAAS;AAExD;AAGO,MAAM,uBAAsC;AAAA,EACjD;AAAA,EACA;AACF;"}
1
+ {"version":3,"file":"column-controls.js","sources":["../../src/actions/column-controls.ts"],"sourcesContent":["/**\n * Built-in `FULL_COLUMNS`-scoped controls — sort and filter — expressed as\n * `TableAction`s with a `render` (live control) rather than a one-shot `run`.\n * They read the single selected column from the action context and are gated\n * by the column's `sortable` / `filterable` flags. Overridable: consumers can\n * omit them, replace them, or add their own controls at any cardinality.\n */\nimport h from \"@macrostrat/hyper\";\nimport { useMemo } from \"react\";\nimport { Button, Menu, MenuItem, PopoverNext } from \"@blueprintjs/core\";\nimport { RegionCardinality } from \"@blueprintjs/table\";\nimport { useSelector, useStoreAPI } from \"../provider\";\nimport type { TableAction, TableActionContext, TableFilter } from \"./types\";\nimport type { ColumnSpec } from \"../utils/column-spec\";\nimport { columnFilter, columnFilterId } from \"./column-filter\";\n\nfunction selectedColumn(ctx: TableActionContext) {\n const key = ctx.getSelectedColumnKeys()[0];\n if (key == null) return null;\n return ctx.columnSpec.find((c) => c.key === key) ?? null;\n}\n\n// ---- Sort ----\n\nfunction ColumnSortControl({ columnKey }: { columnKey: string }) {\n const storeAPI = useStoreAPI();\n const sort = useSelector((s) => s.columnSorts.find((x) => x.key === columnKey));\n const set = (ascending: boolean | null) =>\n storeAPI.getState().setColumnSort(columnKey, ascending);\n\n const icon = sort == null ? \"sort\" : sort.ascending ? \"sort-asc\" : \"sort-desc\";\n const label =\n sort == null ? \"Sort\" : sort.ascending ? \"Ascending\" : \"Descending\";\n\n return h(\n PopoverNext,\n {\n placement: \"bottom-start\",\n content: h(Menu, [\n h(MenuItem, {\n key: \"asc\",\n text: \"Ascending\",\n icon: \"sort-asc\",\n active: sort?.ascending === true,\n onClick: () => set(true),\n }),\n h(MenuItem, {\n key: \"desc\",\n text: \"Descending\",\n icon: \"sort-desc\",\n active: sort?.ascending === false,\n onClick: () => set(false),\n }),\n h(MenuItem, {\n key: \"clear\",\n text: \"Clear sort\",\n icon: \"cross\",\n disabled: sort == null,\n onClick: () => set(null),\n }),\n ]),\n },\n h(\n Button,\n {\n small: true,\n minimal: true,\n icon,\n rightIcon: \"caret-down\",\n intent: sort != null ? \"primary\" : \"none\",\n },\n label,\n ),\n );\n}\n\n/** Menu-native sort: a \"Sort\" item whose submenu holds Ascending / Descending.\n * Clicking the *active* direction again clears the sort (toggle off) — there's\n * no explicit \"Clear\" item, since the active-filter/sort tag in the status bar\n * already offers direct removal. */\nfunction ColumnSortMenu({ columnKey }: { columnKey: string }) {\n const storeAPI = useStoreAPI();\n const sort = useSelector((s) => s.columnSorts.find((x) => x.key === columnKey));\n const toggle = (ascending: boolean) => {\n const store = storeAPI.getState();\n // A second click on the current direction toggles the sort off.\n const next = sort != null && sort.ascending === ascending ? null : ascending;\n store.setColumnSort(columnKey, next);\n };\n const icon = sort == null ? \"sort\" : sort.ascending ? \"sort-asc\" : \"sort-desc\";\n return h(\n MenuItem,\n { icon, text: \"Sort\" },\n [\n h(MenuItem, {\n key: \"asc\",\n icon: \"sort-asc\",\n text: \"Ascending\",\n active: sort?.ascending === true,\n shouldDismissPopover: false,\n onClick: () => toggle(true),\n }),\n h(MenuItem, {\n key: \"desc\",\n icon: \"sort-desc\",\n text: \"Descending\",\n active: sort?.ascending === false,\n shouldDismissPopover: false,\n onClick: () => toggle(false),\n }),\n ],\n );\n}\n\n/** Single-column sort control. Gated by `col.sortable`. */\nexport const columnSortAction: TableAction = {\n id: \"column-sort\",\n name: \"Sort\",\n icon: \"sort\",\n targets: [RegionCardinality.FULL_COLUMNS],\n requiresEditable: false,\n // Only a single column (within the FULL_COLUMNS target), not multi-column.\n appliesTo: (ctx) => ctx.columnKey != null,\n render(ctx) {\n const col = selectedColumn(ctx);\n if (!col?.sortable) return null;\n return h(ColumnSortControl, { columnKey: col.key });\n },\n renderMenuItem(ctx) {\n const col = selectedColumn(ctx);\n if (!col?.sortable) return null;\n return h(ColumnSortMenu, { columnKey: col.key });\n },\n};\n\n// ---- Filter ----\n\n/** The filter offered for a column: its own rich `TableFilter` (from\n * `col.filters`) when present — so the header matches the top bar and the rich\n * filter is prioritized — else the built-in operator `columnFilter`. */\nfunction resolveColumnFilter(col: ColumnSpec): TableFilter {\n const rich = (col.filters as TableFilter[] | undefined)?.find(\n (f) => (f.columnKey ?? col.key) === col.key,\n );\n if (rich != null) return { ...rich, columnKey: rich.columnKey ?? col.key };\n return columnFilter(col);\n}\n\nfunction ColumnFilterControl({ col }: { col: ColumnSpec }) {\n const storeAPI = useStoreAPI();\n // Same `TableFilter` the FilterBar and any provider consume, so the header,\n // the bar, and the query stay in sync (rich filter prioritized).\n const filter = useMemo(() => resolveColumnFilter(col), [col]);\n const state = useSelector((s) => s.activeFilters.get(filter.id)?.state);\n const isActive = state != null;\n const summary = isActive ? filter.describeState?.(state) : null;\n\n const setState = (next: any) => {\n const store = storeAPI.getState();\n // An empty operator-filter value clears; otherwise activate/update.\n if (next == null || next.value === \"\") {\n store.removeFilter(filter.id);\n } else {\n store.setFilter(filter.id, filter, next);\n }\n };\n\n const label = isActive ? String(summary ?? filter.name) : \"Filter\";\n\n return h(\n PopoverNext,\n {\n placement: \"bottom-start\",\n content: h(\n \"div\",\n { style: { padding: \"6px\", minWidth: \"220px\" } },\n filter.filterForm != null\n ? h(filter.filterForm, {\n state: state ?? filter.defaultState,\n setState,\n })\n : null,\n ),\n },\n h(\n Button,\n {\n small: true,\n minimal: true,\n icon: \"filter\",\n rightIcon: \"caret-down\",\n intent: isActive ? \"primary\" : \"none\",\n },\n label,\n ),\n );\n}\n\n/** Every filter applicable to a column: its rich `col.filters` (there may be\n * several) plus the built-in operator `columnFilter` when the column is\n * `filterable` and no rich filter already targets it. The menu lists all of\n * them; the toolbar's `render` collapses to `resolveColumnFilter` (a single\n * control). */\nfunction applicableColumnFilters(col: ColumnSpec): TableFilter[] {\n const result: TableFilter[] = [];\n const rich = (col.filters as TableFilter[] | undefined) ?? [];\n for (const f of rich) {\n result.push({ ...f, columnKey: f.columnKey ?? col.key });\n }\n const hasOwnColumnFilter = result.some((r) => r.columnKey === col.key);\n if (\n (col.filterable === true || typeof col.filterable === \"object\") &&\n !hasOwnColumnFilter\n ) {\n result.push(columnFilter(col));\n }\n return result;\n}\n\n/** One filter, as a menu item whose submenu carries its edit form. Active\n * filters get a warning intent and show their `describeState` summary. The\n * displayed `label` may differ from `filter.name` (e.g. the built-in operator\n * filter reads \"Filter\" in a column's own menu, where the column is implicit). */\nfunction ColumnFilterMenuItem({\n filter,\n label,\n}: {\n filter: TableFilter;\n label: string;\n}) {\n const storeAPI = useStoreAPI();\n const state = useSelector((s) => s.activeFilters.get(filter.id)?.state);\n const isActive = state != null;\n const summary = isActive ? filter.describeState?.(state) : null;\n\n const setState = (next: any) => {\n const store = storeAPI.getState();\n if (next == null || next.value === \"\") {\n store.removeFilter(filter.id);\n } else {\n store.setFilter(filter.id, filter, next);\n }\n };\n\n return h(\n MenuItem,\n {\n icon: filter.icon ?? \"filter\",\n text: label,\n label: summary != null ? String(summary) : undefined,\n intent: isActive ? \"primary\" : undefined,\n shouldDismissPopover: false,\n },\n filter.filterForm != null\n ? h(\n \"div.filter-menu-form\",\n { style: { padding: \"6px\", minWidth: \"220px\" } },\n h(filter.filterForm, { state: state ?? filter.defaultState, setState }),\n )\n : null,\n );\n}\n\n/** Menu-native filter: one item per applicable filter, each opening its form\n * in a submenu. */\nfunction ColumnFilterMenu({ col }: { col: ColumnSpec }) {\n const filters = useMemo(() => applicableColumnFilters(col), [col]);\n const builtinId = columnFilterId(col.key);\n return h(\n filters.map((f) =>\n h(ColumnFilterMenuItem, {\n key: f.id,\n filter: f,\n // The generic operator filter is just \"Filter\" in its own column's\n // menu; rich (user-provided) filters keep their descriptive names.\n label: f.id === builtinId ? \"Filter\" : f.name,\n }),\n ),\n );\n}\n\n/** Single-column filter control. Gated by `col.filterable`. */\nexport const columnFilterAction: TableAction = {\n id: \"column-filter\",\n name: \"Filter\",\n icon: \"filter\",\n targets: [RegionCardinality.FULL_COLUMNS],\n requiresEditable: false,\n appliesTo: (ctx) => ctx.columnKey != null,\n render(ctx) {\n const col = selectedColumn(ctx);\n if (col == null || !isColumnFilterable(col)) return null;\n return h(ColumnFilterControl, { col });\n },\n renderMenuItem(ctx) {\n const col = selectedColumn(ctx);\n if (col == null || !isColumnFilterable(col)) return null;\n return h(ColumnFilterMenu, { col });\n },\n};\n\n/** A column offers a filter when it declares `filterable`, or supplies its own\n * `filters`. */\nexport function isColumnFilterable(col: ColumnSpec): boolean {\n return (\n col.filterable === true ||\n typeof col.filterable === \"object\" ||\n (Array.isArray(col.filters) && col.filters.length > 0)\n );\n}\n\n/** The built-in column controls (sort + filter), for inclusion in `actions`. */\nexport const columnControlActions: TableAction[] = [\n columnSortAction,\n columnFilterAction,\n];\n"],"names":[],"mappings":"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"}
@@ -28,39 +28,62 @@ function ColumnFilterForm({
28
28
  state,
29
29
  setState
30
30
  }) {
31
- const [draft, setDraft] = react.useState(state.value ?? "");
32
- react.useEffect(() => setDraft(state.value ?? ""), [state.value]);
33
- const commit = () => {
34
- if (draft !== state.value) setState({ ...state, value: draft });
31
+ const [op, setOp] = react.useState(
32
+ state?.operator ?? operators$1[0]
33
+ );
34
+ const [val, setVal] = react.useState(state?.value ?? "");
35
+ const commit = (nextOp, nextVal) => setState({ operator: nextOp, value: nextVal });
36
+ const clear = () => {
37
+ setVal("");
38
+ commit(op, "");
35
39
  };
36
40
  return h(
37
- core.FormGroup,
38
- { label: "Filter" },
39
- h(core.ControlGroup, { fill: true }, [
40
- h(core.HTMLSelect, {
41
- key: "op",
42
- value: state.operator,
43
- options: operators$1.map((op) => ({
44
- value: op,
45
- label: operators.OPERATOR_LABELS[op] ?? op
46
- })),
47
- onChange: (e) => setState({
48
- ...state,
49
- operator: e.currentTarget.value
50
- })
51
- }),
41
+ "div",
42
+ { style: { display: "flex", flexDirection: "column", gap: "6px" } },
43
+ [
44
+ // Compact header: title + operator on one row (with a clear ✕ when set),
45
+ // value on the next — space-efficient and full-width for the value.
46
+ h(
47
+ "div",
48
+ { style: { display: "flex", alignItems: "center", gap: "6px" } },
49
+ [
50
+ h("span", { style: { fontWeight: 600 } }, "Filter"),
51
+ h(core.HTMLSelect, {
52
+ small: true,
53
+ value: op,
54
+ options: operators$1.map((o) => ({
55
+ value: o,
56
+ label: operators.OPERATOR_LABELS[o] ?? o
57
+ })),
58
+ onChange: (e) => {
59
+ const nextOp = e.currentTarget.value;
60
+ setOp(nextOp);
61
+ commit(nextOp, val);
62
+ }
63
+ }),
64
+ h("div", { style: { flex: 1 } }),
65
+ h.if(val !== "")(core.Button, {
66
+ small: true,
67
+ minimal: true,
68
+ icon: "cross",
69
+ "aria-label": "Clear filter",
70
+ onClick: clear
71
+ })
72
+ ]
73
+ ),
52
74
  h(core.InputGroup, {
53
- key: "val",
54
- value: draft,
75
+ small: true,
76
+ fill: true,
77
+ value: val,
55
78
  placeholder: "value",
56
79
  autoFocus: true,
57
- onChange: (e) => setDraft(e.target.value),
58
- onBlur: commit,
80
+ onChange: (e) => setVal(e.target.value),
81
+ onBlur: () => commit(op, val),
59
82
  onKeyDown: (e) => {
60
- if (e.key === "Enter") commit();
83
+ if (e.key === "Enter") commit(op, val);
61
84
  }
62
85
  })
63
- ])
86
+ ]
64
87
  );
65
88
  }
66
89
  exports.columnFilter = columnFilter;
@@ -1 +1 @@
1
- {"version":3,"file":"column-filter.cjs","sources":["../../src/actions/column-filter.ts"],"sourcesContent":["/**\n * The built-in, operator-first column filter — the core generalization of the\n * PostgREST column header's per-type operator model. `columnFilter(col)` yields\n * a standard `TableFilter` whose state is `{ operator, value }`, so it flows\n * through the same store, `FilterBar`, and provider seam as any other\n * filter. One definition serves both targets: `predicate` filters in-memory\n * tables client-side, while `columnKey` + `state` are what a server provider\n * translates to a query. Operators are inferred from the column's `dataType`\n * (overridable via `filterable: { operators }`).\n */\nimport hyper from \"@macrostrat/hyper\";\nimport { useEffect, useState } from \"react\";\nimport { ControlGroup, FormGroup, HTMLSelect, InputGroup } from \"@blueprintjs/core\";\nimport type { ColumnSpec } from \"../utils/column-spec\";\nimport type { TableFilter } from \"./types\";\nimport {\n FilterOperator,\n getOperatorsForColumn,\n OPERATOR_LABELS,\n testFilterOperator,\n} from \"../filters/operators\";\n\nconst h = hyper;\n\nexport interface ColumnFilterState {\n operator: FilterOperator;\n value: string;\n}\n\n/** Stable filter id for a column's built-in operator filter. */\nexport function columnFilterId(key: string): string {\n return `column-filter:${key}`;\n}\n\n/** Generate the built-in operator filter for a `filterable` column. */\nexport function columnFilter(\n col: ColumnSpec,\n): TableFilter<any, ColumnFilterState> {\n const operators = getOperatorsForColumn(col);\n return {\n id: columnFilterId(col.key),\n name: col.name,\n icon: \"filter\",\n columnKey: col.key,\n defaultState: { operator: operators[0], value: \"\" },\n describeState: (s) =>\n s?.value\n ? `${OPERATOR_LABELS[s.operator] ?? s.operator} ${s.value}`\n : null,\n predicate: (row, s) =>\n testFilterOperator(row?.[col.key], s.operator, s.value),\n filterForm: ({ state, setState }) =>\n h(ColumnFilterForm, { operators, state, setState }),\n };\n}\n\nfunction ColumnFilterForm({\n operators,\n state,\n setState,\n}: {\n operators: FilterOperator[];\n state: ColumnFilterState;\n setState: (s: ColumnFilterState) => void;\n}) {\n // The value is edited in local state and only committed (which triggers a\n // re-fetch for server sources) on blur or Enter — not on every keystroke.\n // The operator select commits immediately (a discrete choice).\n const [draft, setDraft] = useState(state.value ?? \"\");\n useEffect(() => setDraft(state.value ?? \"\"), [state.value]);\n const commit = () => {\n if (draft !== state.value) setState({ ...state, value: draft });\n };\n return h(\n FormGroup,\n { label: \"Filter\" },\n h(ControlGroup, { fill: true }, [\n h(HTMLSelect, {\n key: \"op\",\n value: state.operator,\n options: operators.map((op) => ({\n value: op,\n label: OPERATOR_LABELS[op] ?? op,\n })),\n onChange: (e) =>\n setState({\n ...state,\n operator: e.currentTarget.value as FilterOperator,\n }),\n }),\n h(InputGroup, {\n key: \"val\",\n value: draft,\n placeholder: \"value\",\n autoFocus: true,\n onChange: (e) => setDraft(e.target.value),\n onBlur: commit,\n onKeyDown: (e) => {\n if (e.key === \"Enter\") commit();\n },\n }),\n ]),\n );\n}\n"],"names":["hyper","operators","getOperatorsForColumn","OPERATOR_LABELS","testFilterOperator","useState","useEffect","FormGroup","ControlGroup","HTMLSelect","InputGroup"],"mappings":";;;;;;;;AAsBA,MAAM,IAAIA,WAAAA;AAQH,SAAS,eAAe,KAAqB;AAClD,SAAO,iBAAiB,GAAG;AAC7B;AAGO,SAAS,aACd,KACqC;AACrC,QAAMC,cAAYC,UAAAA,sBAAsB,GAAG;AAC3C,SAAO;AAAA,IACL,IAAI,eAAe,IAAI,GAAG;AAAA,IAC1B,MAAM,IAAI;AAAA,IACV,MAAM;AAAA,IACN,WAAW,IAAI;AAAA,IACf,cAAc,EAAE,UAAUD,YAAU,CAAC,GAAG,OAAO,GAAA;AAAA,IAC/C,eAAe,CAAC,MACd,GAAG,QACC,GAAGE,UAAAA,gBAAgB,EAAE,QAAQ,KAAK,EAAE,QAAQ,IAAI,EAAE,KAAK,KACvD;AAAA,IACN,WAAW,CAAC,KAAK,MACfC,UAAAA,mBAAmB,MAAM,IAAI,GAAG,GAAG,EAAE,UAAU,EAAE,KAAK;AAAA,IACxD,YAAY,CAAC,EAAE,OAAO,SAAA,MACpB,EAAE,kBAAkB,EAAA,WAAEH,aAAW,OAAO,SAAA,CAAU;AAAA,EAAA;AAExD;AAEA,SAAS,iBAAiB;AAAA,EAAA,WACxBA;AAAAA,EACA;AAAA,EACA;AACF,GAIG;AAID,QAAM,CAAC,OAAO,QAAQ,IAAII,MAAAA,SAAS,MAAM,SAAS,EAAE;AACpDC,kBAAU,MAAM,SAAS,MAAM,SAAS,EAAE,GAAG,CAAC,MAAM,KAAK,CAAC;AAC1D,QAAM,SAAS,MAAM;AACnB,QAAI,UAAU,MAAM,MAAO,UAAS,EAAE,GAAG,OAAO,OAAO,OAAO;AAAA,EAChE;AACA,SAAO;AAAA,IACLC,KAAAA;AAAAA,IACA,EAAE,OAAO,SAAA;AAAA,IACT,EAAEC,KAAAA,cAAc,EAAE,MAAM,QAAQ;AAAA,MAC9B,EAAEC,KAAAA,YAAY;AAAA,QACZ,KAAK;AAAA,QACL,OAAO,MAAM;AAAA,QACb,SAASR,YAAU,IAAI,CAAC,QAAQ;AAAA,UAC9B,OAAO;AAAA,UACP,OAAOE,UAAAA,gBAAgB,EAAE,KAAK;AAAA,QAAA,EAC9B;AAAA,QACF,UAAU,CAAC,MACT,SAAS;AAAA,UACP,GAAG;AAAA,UACH,UAAU,EAAE,cAAc;AAAA,QAAA,CAC3B;AAAA,MAAA,CACJ;AAAA,MACD,EAAEO,KAAAA,YAAY;AAAA,QACZ,KAAK;AAAA,QACL,OAAO;AAAA,QACP,aAAa;AAAA,QACb,WAAW;AAAA,QACX,UAAU,CAAC,MAAM,SAAS,EAAE,OAAO,KAAK;AAAA,QACxC,QAAQ;AAAA,QACR,WAAW,CAAC,MAAM;AAChB,cAAI,EAAE,QAAQ,QAAS,QAAA;AAAA,QACzB;AAAA,MAAA,CACD;AAAA,IAAA,CACF;AAAA,EAAA;AAEL;;;"}
1
+ {"version":3,"file":"column-filter.cjs","sources":["../../src/actions/column-filter.ts"],"sourcesContent":["/**\n * The built-in, operator-first column filter — the core generalization of the\n * PostgREST column header's per-type operator model. `columnFilter(col)` yields\n * a standard `TableFilter` whose state is `{ operator, value }`, so it flows\n * through the same store, `FilterBar`, and provider seam as any other\n * filter. One definition serves both targets: `predicate` filters in-memory\n * tables client-side, while `columnKey` + `state` are what a server provider\n * translates to a query. Operators are inferred from the column's `dataType`\n * (overridable via `filterable: { operators }`).\n */\nimport hyper from \"@macrostrat/hyper\";\nimport { useState } from \"react\";\nimport { Button, HTMLSelect, InputGroup } from \"@blueprintjs/core\";\nimport type { ColumnSpec } from \"../utils/column-spec\";\nimport type { TableFilter } from \"./types\";\nimport {\n FilterOperator,\n getOperatorsForColumn,\n OPERATOR_LABELS,\n testFilterOperator,\n} from \"../filters/operators\";\n\nconst h = hyper;\n\nexport interface ColumnFilterState {\n operator: FilterOperator;\n value: string;\n}\n\n/** Stable filter id for a column's built-in operator filter. */\nexport function columnFilterId(key: string): string {\n return `column-filter:${key}`;\n}\n\n/** Generate the built-in operator filter for a `filterable` column. */\nexport function columnFilter(\n col: ColumnSpec,\n): TableFilter<any, ColumnFilterState> {\n const operators = getOperatorsForColumn(col);\n return {\n id: columnFilterId(col.key),\n name: col.name,\n icon: \"filter\",\n columnKey: col.key,\n defaultState: { operator: operators[0], value: \"\" },\n describeState: (s) =>\n s?.value\n ? `${OPERATOR_LABELS[s.operator] ?? s.operator} ${s.value}`\n : null,\n predicate: (row, s) =>\n testFilterOperator(row?.[col.key], s.operator, s.value),\n filterForm: ({ state, setState }) =>\n h(ColumnFilterForm, { operators, state, setState }),\n };\n}\n\nfunction ColumnFilterForm({\n operators,\n state,\n setState,\n}: {\n operators: FilterOperator[];\n state: ColumnFilterState;\n setState: (s: ColumnFilterState) => void;\n}) {\n // Operator and value are held locally, seeded once from the incoming state.\n // The operator must be local: committing it with an empty value clears the\n // filter (so the store round-trips back to the default state), which would\n // otherwise snap the dropdown back to the default — the operator wouldn't\n // \"stick\" until a value was typed. The value commits (triggering a server\n // re-fetch) on blur / Enter, not on every keystroke.\n const [op, setOp] = useState<FilterOperator>(\n state?.operator ?? operators[0],\n );\n const [val, setVal] = useState<string>(state?.value ?? \"\");\n\n const commit = (nextOp: FilterOperator, nextVal: string) =>\n setState({ operator: nextOp, value: nextVal });\n\n const clear = () => {\n setVal(\"\");\n commit(op, \"\");\n };\n\n return h(\n \"div\",\n { style: { display: \"flex\", flexDirection: \"column\", gap: \"6px\" } },\n [\n // Compact header: title + operator on one row (with a clear ✕ when set),\n // value on the next — space-efficient and full-width for the value.\n h(\n \"div\",\n { style: { display: \"flex\", alignItems: \"center\", gap: \"6px\" } },\n [\n h(\"span\", { style: { fontWeight: 600 } }, \"Filter\"),\n h(HTMLSelect, {\n small: true,\n value: op,\n options: operators.map((o) => ({\n value: o,\n label: OPERATOR_LABELS[o] ?? o,\n })),\n onChange: (e) => {\n const nextOp = e.currentTarget.value as FilterOperator;\n setOp(nextOp);\n commit(nextOp, val);\n },\n }),\n h(\"div\", { style: { flex: 1 } }),\n h.if(val !== \"\")(Button, {\n small: true,\n minimal: true,\n icon: \"cross\",\n \"aria-label\": \"Clear filter\",\n onClick: clear,\n }),\n ],\n ),\n h(InputGroup, {\n small: true,\n fill: true,\n value: val,\n placeholder: \"value\",\n autoFocus: true,\n onChange: (e) => setVal(e.target.value),\n onBlur: () => commit(op, val),\n onKeyDown: (e) => {\n if (e.key === \"Enter\") commit(op, val);\n },\n }),\n ],\n );\n}\n"],"names":["hyper","operators","getOperatorsForColumn","OPERATOR_LABELS","testFilterOperator","useState","HTMLSelect","Button","InputGroup"],"mappings":";;;;;;;;AAsBA,MAAM,IAAIA,WAAAA;AAQH,SAAS,eAAe,KAAqB;AAClD,SAAO,iBAAiB,GAAG;AAC7B;AAGO,SAAS,aACd,KACqC;AACrC,QAAMC,cAAYC,UAAAA,sBAAsB,GAAG;AAC3C,SAAO;AAAA,IACL,IAAI,eAAe,IAAI,GAAG;AAAA,IAC1B,MAAM,IAAI;AAAA,IACV,MAAM;AAAA,IACN,WAAW,IAAI;AAAA,IACf,cAAc,EAAE,UAAUD,YAAU,CAAC,GAAG,OAAO,GAAA;AAAA,IAC/C,eAAe,CAAC,MACd,GAAG,QACC,GAAGE,UAAAA,gBAAgB,EAAE,QAAQ,KAAK,EAAE,QAAQ,IAAI,EAAE,KAAK,KACvD;AAAA,IACN,WAAW,CAAC,KAAK,MACfC,UAAAA,mBAAmB,MAAM,IAAI,GAAG,GAAG,EAAE,UAAU,EAAE,KAAK;AAAA,IACxD,YAAY,CAAC,EAAE,OAAO,SAAA,MACpB,EAAE,kBAAkB,EAAA,WAAEH,aAAW,OAAO,SAAA,CAAU;AAAA,EAAA;AAExD;AAEA,SAAS,iBAAiB;AAAA,EAAA,WACxBA;AAAAA,EACA;AAAA,EACA;AACF,GAIG;AAOD,QAAM,CAAC,IAAI,KAAK,IAAII,MAAAA;AAAAA,IAClB,OAAO,YAAYJ,YAAU,CAAC;AAAA,EAAA;AAEhC,QAAM,CAAC,KAAK,MAAM,IAAII,MAAAA,SAAiB,OAAO,SAAS,EAAE;AAEzD,QAAM,SAAS,CAAC,QAAwB,YACtC,SAAS,EAAE,UAAU,QAAQ,OAAO,SAAS;AAE/C,QAAM,QAAQ,MAAM;AAClB,WAAO,EAAE;AACT,WAAO,IAAI,EAAE;AAAA,EACf;AAEA,SAAO;AAAA,IACL;AAAA,IACA,EAAE,OAAO,EAAE,SAAS,QAAQ,eAAe,UAAU,KAAK,QAAM;AAAA,IAChE;AAAA;AAAA;AAAA,MAGE;AAAA,QACE;AAAA,QACA,EAAE,OAAO,EAAE,SAAS,QAAQ,YAAY,UAAU,KAAK,QAAM;AAAA,QAC7D;AAAA,UACE,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,IAAA,EAAI,GAAK,QAAQ;AAAA,UAClD,EAAEC,KAAAA,YAAY;AAAA,YACZ,OAAO;AAAA,YACP,OAAO;AAAA,YACP,SAASL,YAAU,IAAI,CAAC,OAAO;AAAA,cAC7B,OAAO;AAAA,cACP,OAAOE,UAAAA,gBAAgB,CAAC,KAAK;AAAA,YAAA,EAC7B;AAAA,YACF,UAAU,CAAC,MAAM;AACf,oBAAM,SAAS,EAAE,cAAc;AAC/B,oBAAM,MAAM;AACZ,qBAAO,QAAQ,GAAG;AAAA,YACpB;AAAA,UAAA,CACD;AAAA,UACD,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAA,GAAK;AAAA,UAC/B,EAAE,GAAG,QAAQ,EAAE,EAAEI,KAAAA,QAAQ;AAAA,YACvB,OAAO;AAAA,YACP,SAAS;AAAA,YACT,MAAM;AAAA,YACN,cAAc;AAAA,YACd,SAAS;AAAA,UAAA,CACV;AAAA,QAAA;AAAA,MACH;AAAA,MAEF,EAAEC,KAAAA,YAAY;AAAA,QACZ,OAAO;AAAA,QACP,MAAM;AAAA,QACN,OAAO;AAAA,QACP,aAAa;AAAA,QACb,WAAW;AAAA,QACX,UAAU,CAAC,MAAM,OAAO,EAAE,OAAO,KAAK;AAAA,QACtC,QAAQ,MAAM,OAAO,IAAI,GAAG;AAAA,QAC5B,WAAW,CAAC,MAAM;AAChB,cAAI,EAAE,QAAQ,QAAS,QAAO,IAAI,GAAG;AAAA,QACvC;AAAA,MAAA,CACD;AAAA,IAAA;AAAA,EACH;AAEJ;;;"}