@macrostrat/data-sheet 4.1.0 → 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 (69) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/dist/actions/column-controls.cjs +17 -5
  3. package/dist/actions/column-controls.cjs.map +1 -1
  4. package/dist/actions/column-controls.js +18 -6
  5. package/dist/actions/column-controls.js.map +1 -1
  6. package/dist/actions/column-filter.cjs +48 -25
  7. package/dist/actions/column-filter.cjs.map +1 -1
  8. package/dist/actions/column-filter.js +50 -27
  9. package/dist/actions/column-filter.js.map +1 -1
  10. package/dist/actions/table-controls.cjs +4 -0
  11. package/dist/actions/table-controls.cjs.map +1 -1
  12. package/dist/actions/table-controls.js +4 -0
  13. package/dist/actions/table-controls.js.map +1 -1
  14. package/dist/actions/toolbar.cjs +19 -5
  15. package/dist/actions/toolbar.cjs.map +1 -1
  16. package/dist/actions/toolbar.js +20 -6
  17. package/dist/actions/toolbar.js.map +1 -1
  18. package/dist/cell-renderer.cjs +1 -1
  19. package/dist/cell-renderer.cjs.map +1 -1
  20. package/dist/cell-renderer.js +1 -1
  21. package/dist/cell-renderer.js.map +1 -1
  22. package/dist/core.cjs +11 -2
  23. package/dist/core.cjs.map +1 -1
  24. package/dist/core.d.ts +4 -0
  25. package/dist/core.js +11 -2
  26. package/dist/core.js.map +1 -1
  27. package/dist/filters/operators.cjs +2 -2
  28. package/dist/filters/operators.cjs.map +1 -1
  29. package/dist/filters/operators.d.ts +1 -1
  30. package/dist/filters/operators.js +2 -2
  31. package/dist/filters/operators.js.map +1 -1
  32. package/dist/postgrest-table/data-loaders.cjs +1 -8
  33. package/dist/postgrest-table/data-loaders.cjs.map +1 -1
  34. package/dist/postgrest-table/data-loaders.js +1 -8
  35. package/dist/postgrest-table/data-loaders.js.map +1 -1
  36. package/dist/provider.cjs +9 -3
  37. package/dist/provider.cjs.map +1 -1
  38. package/dist/provider.d.ts +2 -1
  39. package/dist/provider.js +9 -3
  40. package/dist/provider.js.map +1 -1
  41. package/dist/renderers/column-header-cell.cjs +19 -4
  42. package/dist/renderers/column-header-cell.cjs.map +1 -1
  43. package/dist/renderers/column-header-cell.d.ts +1 -2
  44. package/dist/renderers/column-header-cell.js +20 -5
  45. package/dist/renderers/column-header-cell.js.map +1 -1
  46. package/dist/types.cjs.map +1 -1
  47. package/dist/types.d.ts +10 -1
  48. package/dist/types.js.map +1 -1
  49. package/dist/utils/column-spec.cjs.map +1 -1
  50. package/dist/utils/column-spec.d.ts +4 -0
  51. package/dist/utils/column-spec.js.map +1 -1
  52. package/dist/zustand-store.cjs +1 -0
  53. package/dist/zustand-store.cjs.map +1 -1
  54. package/dist/zustand-store.js +1 -0
  55. package/dist/zustand-store.js.map +1 -1
  56. package/package.json +1 -1
  57. package/src/actions/column-controls.ts +24 -7
  58. package/src/actions/column-filter.ts +59 -30
  59. package/src/actions/table-controls.ts +4 -0
  60. package/src/actions/toolbar.ts +39 -11
  61. package/src/cell-renderer.ts +6 -1
  62. package/src/core.ts +26 -3
  63. package/src/filters/operators.ts +5 -3
  64. package/src/postgrest-table/data-loaders.ts +6 -10
  65. package/src/provider.ts +22 -5
  66. package/src/renderers/column-header-cell.ts +31 -4
  67. package/src/types.ts +10 -1
  68. package/src/utils/column-spec.ts +4 -0
  69. package/src/zustand-store.ts +1 -0
package/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
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
+
3
9
  ## [4.1.0] - 2026-07-10
4
10
 
5
11
  ### Controlled editing improvements
@@ -153,7 +153,7 @@ function ColumnFilterControl({ col }) {
153
153
  minimal: true,
154
154
  icon: "filter",
155
155
  rightIcon: "caret-down",
156
- intent: isActive ? "warning" : "none"
156
+ intent: isActive ? "primary" : "none"
157
157
  },
158
158
  label
159
159
  )
@@ -171,7 +171,10 @@ function applicableColumnFilters(col) {
171
171
  }
172
172
  return result;
173
173
  }
174
- function ColumnFilterMenuItem({ filter }) {
174
+ function ColumnFilterMenuItem({
175
+ filter,
176
+ label
177
+ }) {
175
178
  const storeAPI = provider.useStoreAPI();
176
179
  const state = provider.useSelector((s) => s.activeFilters.get(filter.id)?.state);
177
180
  const isActive = state != null;
@@ -188,9 +191,9 @@ function ColumnFilterMenuItem({ filter }) {
188
191
  core.MenuItem,
189
192
  {
190
193
  icon: filter.icon ?? "filter",
191
- text: filter.name,
194
+ text: label,
192
195
  label: summary != null ? String(summary) : void 0,
193
- intent: isActive ? "warning" : void 0,
196
+ intent: isActive ? "primary" : void 0,
194
197
  shouldDismissPopover: false
195
198
  },
196
199
  filter.filterForm != null ? h__default.default(
@@ -202,8 +205,17 @@ function ColumnFilterMenuItem({ filter }) {
202
205
  }
203
206
  function ColumnFilterMenu({ col }) {
204
207
  const filters = react.useMemo(() => applicableColumnFilters(col), [col]);
208
+ const builtinId = columnFilter.columnFilterId(col.key);
205
209
  return h__default.default(
206
- filters.map((f) => h__default.default(ColumnFilterMenuItem, { key: f.id, filter: f }))
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
+ )
207
219
  );
208
220
  }
209
221
  const columnFilterAction = {
@@ -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/** 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 ? \"warning\" : \"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. */\nfunction ColumnFilterMenuItem({ filter }: { filter: TableFilter }) {\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: filter.name,\n label: summary != null ? String(summary) : undefined,\n intent: isActive ? \"warning\" : 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 return h(\n filters.map((f) => h(ColumnFilterMenuItem, { key: f.id, filter: f })),\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"],"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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"}
@@ -3,7 +3,7 @@ import { useMemo } from "react";
3
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;
@@ -149,7 +149,7 @@ function ColumnFilterControl({ col }) {
149
149
  minimal: true,
150
150
  icon: "filter",
151
151
  rightIcon: "caret-down",
152
- intent: isActive ? "warning" : "none"
152
+ intent: isActive ? "primary" : "none"
153
153
  },
154
154
  label
155
155
  )
@@ -167,7 +167,10 @@ function applicableColumnFilters(col) {
167
167
  }
168
168
  return result;
169
169
  }
170
- function ColumnFilterMenuItem({ filter }) {
170
+ function ColumnFilterMenuItem({
171
+ filter,
172
+ label
173
+ }) {
171
174
  const storeAPI = useStoreAPI();
172
175
  const state = useSelector((s) => s.activeFilters.get(filter.id)?.state);
173
176
  const isActive = state != null;
@@ -184,9 +187,9 @@ function ColumnFilterMenuItem({ filter }) {
184
187
  MenuItem,
185
188
  {
186
189
  icon: filter.icon ?? "filter",
187
- text: filter.name,
190
+ text: label,
188
191
  label: summary != null ? String(summary) : void 0,
189
- intent: isActive ? "warning" : void 0,
192
+ intent: isActive ? "primary" : void 0,
190
193
  shouldDismissPopover: false
191
194
  },
192
195
  filter.filterForm != null ? h(
@@ -198,8 +201,17 @@ function ColumnFilterMenuItem({ filter }) {
198
201
  }
199
202
  function ColumnFilterMenu({ col }) {
200
203
  const filters = useMemo(() => applicableColumnFilters(col), [col]);
204
+ const builtinId = columnFilterId(col.key);
201
205
  return h(
202
- filters.map((f) => h(ColumnFilterMenuItem, { key: f.id, filter: f }))
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
+ )
203
215
  );
204
216
  }
205
217
  const columnFilterAction = {
@@ -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/** 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 ? \"warning\" : \"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. */\nfunction ColumnFilterMenuItem({ filter }: { filter: TableFilter }) {\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: filter.name,\n label: summary != null ? String(summary) : undefined,\n intent: isActive ? \"warning\" : 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 return h(\n filters.map((f) => h(ColumnFilterMenuItem, { key: f.id, filter: f })),\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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"}
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;;;"}
@@ -1,6 +1,6 @@
1
1
  import h$1 from "@macrostrat/hyper";
2
- import { useState, useEffect } from "react";
3
- import { FormGroup, ControlGroup, HTMLSelect, InputGroup } from "@blueprintjs/core";
2
+ import { useState } from "react";
3
+ import { HTMLSelect, Button, InputGroup } from "@blueprintjs/core";
4
4
  import { getOperatorsForColumn, OPERATOR_LABELS, testFilterOperator } from "../filters/operators.js";
5
5
  const h = h$1;
6
6
  function columnFilterId(key) {
@@ -24,39 +24,62 @@ function ColumnFilterForm({
24
24
  state,
25
25
  setState
26
26
  }) {
27
- const [draft, setDraft] = useState(state.value ?? "");
28
- useEffect(() => setDraft(state.value ?? ""), [state.value]);
29
- const commit = () => {
30
- if (draft !== state.value) setState({ ...state, value: draft });
27
+ const [op, setOp] = useState(
28
+ state?.operator ?? operators[0]
29
+ );
30
+ const [val, setVal] = useState(state?.value ?? "");
31
+ const commit = (nextOp, nextVal) => setState({ operator: nextOp, value: nextVal });
32
+ const clear = () => {
33
+ setVal("");
34
+ commit(op, "");
31
35
  };
32
36
  return h(
33
- FormGroup,
34
- { label: "Filter" },
35
- h(ControlGroup, { fill: true }, [
36
- h(HTMLSelect, {
37
- key: "op",
38
- value: state.operator,
39
- options: operators.map((op) => ({
40
- value: op,
41
- label: OPERATOR_LABELS[op] ?? op
42
- })),
43
- onChange: (e) => setState({
44
- ...state,
45
- operator: e.currentTarget.value
46
- })
47
- }),
37
+ "div",
38
+ { style: { display: "flex", flexDirection: "column", gap: "6px" } },
39
+ [
40
+ // Compact header: title + operator on one row (with a clear ✕ when set),
41
+ // value on the next — space-efficient and full-width for the value.
42
+ h(
43
+ "div",
44
+ { style: { display: "flex", alignItems: "center", gap: "6px" } },
45
+ [
46
+ h("span", { style: { fontWeight: 600 } }, "Filter"),
47
+ h(HTMLSelect, {
48
+ small: true,
49
+ value: op,
50
+ options: operators.map((o) => ({
51
+ value: o,
52
+ label: OPERATOR_LABELS[o] ?? o
53
+ })),
54
+ onChange: (e) => {
55
+ const nextOp = e.currentTarget.value;
56
+ setOp(nextOp);
57
+ commit(nextOp, val);
58
+ }
59
+ }),
60
+ h("div", { style: { flex: 1 } }),
61
+ h.if(val !== "")(Button, {
62
+ small: true,
63
+ minimal: true,
64
+ icon: "cross",
65
+ "aria-label": "Clear filter",
66
+ onClick: clear
67
+ })
68
+ ]
69
+ ),
48
70
  h(InputGroup, {
49
- key: "val",
50
- value: draft,
71
+ small: true,
72
+ fill: true,
73
+ value: val,
51
74
  placeholder: "value",
52
75
  autoFocus: true,
53
- onChange: (e) => setDraft(e.target.value),
54
- onBlur: commit,
76
+ onChange: (e) => setVal(e.target.value),
77
+ onBlur: () => commit(op, val),
55
78
  onKeyDown: (e) => {
56
- if (e.key === "Enter") commit();
79
+ if (e.key === "Enter") commit(op, val);
57
80
  }
58
81
  })
59
- ])
82
+ ]
60
83
  );
61
84
  }
62
85
  export {
@@ -1 +1 @@
1
- {"version":3,"file":"column-filter.js","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"],"mappings":";;;;AAsBA,MAAM,IAAIA;AAQH,SAAS,eAAe,KAAqB;AAClD,SAAO,iBAAiB,GAAG;AAC7B;AAGO,SAAS,aACd,KACqC;AACrC,QAAM,YAAY,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,UAAU,UAAU,CAAC,GAAG,OAAO,GAAA;AAAA,IAC/C,eAAe,CAAC,MACd,GAAG,QACC,GAAG,gBAAgB,EAAE,QAAQ,KAAK,EAAE,QAAQ,IAAI,EAAE,KAAK,KACvD;AAAA,IACN,WAAW,CAAC,KAAK,MACf,mBAAmB,MAAM,IAAI,GAAG,GAAG,EAAE,UAAU,EAAE,KAAK;AAAA,IACxD,YAAY,CAAC,EAAE,OAAO,SAAA,MACpB,EAAE,kBAAkB,EAAE,WAAW,OAAO,SAAA,CAAU;AAAA,EAAA;AAExD;AAEA,SAAS,iBAAiB;AAAA,EACxB;AAAA,EACA;AAAA,EACA;AACF,GAIG;AAID,QAAM,CAAC,OAAO,QAAQ,IAAI,SAAS,MAAM,SAAS,EAAE;AACpD,YAAU,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,IACL;AAAA,IACA,EAAE,OAAO,SAAA;AAAA,IACT,EAAE,cAAc,EAAE,MAAM,QAAQ;AAAA,MAC9B,EAAE,YAAY;AAAA,QACZ,KAAK;AAAA,QACL,OAAO,MAAM;AAAA,QACb,SAAS,UAAU,IAAI,CAAC,QAAQ;AAAA,UAC9B,OAAO;AAAA,UACP,OAAO,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,EAAE,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.js","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"],"mappings":";;;;AAsBA,MAAM,IAAIA;AAQH,SAAS,eAAe,KAAqB;AAClD,SAAO,iBAAiB,GAAG;AAC7B;AAGO,SAAS,aACd,KACqC;AACrC,QAAM,YAAY,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,UAAU,UAAU,CAAC,GAAG,OAAO,GAAA;AAAA,IAC/C,eAAe,CAAC,MACd,GAAG,QACC,GAAG,gBAAgB,EAAE,QAAQ,KAAK,EAAE,QAAQ,IAAI,EAAE,KAAK,KACvD;AAAA,IACN,WAAW,CAAC,KAAK,MACf,mBAAmB,MAAM,IAAI,GAAG,GAAG,EAAE,UAAU,EAAE,KAAK;AAAA,IACxD,YAAY,CAAC,EAAE,OAAO,SAAA,MACpB,EAAE,kBAAkB,EAAE,WAAW,OAAO,SAAA,CAAU;AAAA,EAAA;AAExD;AAEA,SAAS,iBAAiB;AAAA,EACxB;AAAA,EACA;AAAA,EACA;AACF,GAIG;AAOD,QAAM,CAAC,IAAI,KAAK,IAAI;AAAA,IAClB,OAAO,YAAY,UAAU,CAAC;AAAA,EAAA;AAEhC,QAAM,CAAC,KAAK,MAAM,IAAI,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,EAAE,YAAY;AAAA,YACZ,OAAO;AAAA,YACP,OAAO;AAAA,YACP,SAAS,UAAU,IAAI,CAAC,OAAO;AAAA,cAC7B,OAAO;AAAA,cACP,OAAO,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,EAAE,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,EAAE,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;"}
@@ -41,6 +41,10 @@ const clearSelectionAction = {
41
41
  table.RegionCardinality.FULL_COLUMNS,
42
42
  table.RegionCardinality.FULL_TABLE
43
43
  ],
44
+ // Empty selection maps to the FULL_TABLE cardinality, so the action still
45
+ // shows with nothing selected — grey it out there rather than act on nothing.
46
+ // (`disabled` is probed with a bare state, hence the `?? []`.)
47
+ disabled: (s) => (s.selection?.length ?? 0) === 0,
44
48
  run(ctx) {
45
49
  ctx.setState({ selection: [], focusedCell: null, topLeftCell: null });
46
50
  }
@@ -1 +1 @@
1
- {"version":3,"file":"table-controls.cjs","sources":["../../src/actions/table-controls.ts"],"sourcesContent":["/**\n * Table-scoped controls expressed as `TableAction`s (no special\n * `dataSheetActions` chrome). They target every cardinality, so they sit in the\n * toolbar regardless of selection — reachable from the one standard actions\n * path like everything else. Opt-in: add them to the `actions` prop.\n */\nimport h from \"@macrostrat/hyper\";\nimport { useState } from \"react\";\nimport { Button, ControlGroup, InputGroup } from \"@blueprintjs/core\";\nimport { RegionCardinality } from \"@blueprintjs/table\";\nimport { useSelector } from \"../provider\";\nimport type { TableAction } from \"./types\";\nimport { ALL_CARDINALITIES } from \"./edit-actions\";\n\nfunction ScrollToRowControl() {\n const [value, setValue] = useState(\"\");\n const scrollToRow = useSelector((s) => s.scrollToRow);\n const go = () => {\n const r = parseInt(value, 10);\n if (!Number.isNaN(r)) scrollToRow(r - 1);\n };\n return h(ControlGroup, [\n h(InputGroup, {\n type: \"number\",\n placeholder: \"Row #\",\n value,\n small: true,\n style: { width: \"6em\" },\n onValueChange: setValue,\n onKeyDown: (e: any) => {\n if (e.key === \"Enter\") go();\n },\n }),\n h(Button, { small: true, minimal: true, icon: \"arrow-right\", onClick: go }),\n ]);\n}\n\n/** Clear the current selection. Auto-included: appears (on the right, being a\n * general action) whenever something is selected — targets every cardinality\n * except `\"none\"`. */\nexport const clearSelectionAction: TableAction = {\n id: \"clear-selection\",\n name: \"Clear selection\",\n icon: \"cross\",\n requiresEditable: false,\n targets: [\n RegionCardinality.CELLS,\n RegionCardinality.FULL_ROWS,\n RegionCardinality.FULL_COLUMNS,\n RegionCardinality.FULL_TABLE,\n ],\n run(ctx) {\n ctx.setState({ selection: [], focusedCell: null, topLeftCell: null });\n },\n};\n\n/** Scroll to a 1-based row number. Meaningful for large, addressable sources;\n * add it to `actions`. Present in the toolbar regardless of selection. */\nexport const scrollToRowAction: TableAction = {\n id: \"scroll-to-row\",\n name: \"Scroll to row\",\n icon: \"arrow-right\",\n targets: ALL_CARDINALITIES,\n requiresEditable: false,\n render: () => h(ScrollToRowControl),\n};\n"],"names":["useState","useSelector","h","ControlGroup","InputGroup","Button","RegionCardinality","ALL_CARDINALITIES"],"mappings":";;;;;;;;;;AAcA,SAAS,qBAAqB;AAC5B,QAAM,CAAC,OAAO,QAAQ,IAAIA,MAAAA,SAAS,EAAE;AACrC,QAAM,cAAcC,SAAAA,YAAY,CAAC,MAAM,EAAE,WAAW;AACpD,QAAM,KAAK,MAAM;AACf,UAAM,IAAI,SAAS,OAAO,EAAE;AAC5B,QAAI,CAAC,OAAO,MAAM,CAAC,EAAG,aAAY,IAAI,CAAC;AAAA,EACzC;AACA,SAAOC,WAAAA,QAAEC,KAAAA,cAAc;AAAA,IACrBD,WAAAA,QAAEE,KAAAA,YAAY;AAAA,MACZ,MAAM;AAAA,MACN,aAAa;AAAA,MACb;AAAA,MACA,OAAO;AAAA,MACP,OAAO,EAAE,OAAO,MAAA;AAAA,MAChB,eAAe;AAAA,MACf,WAAW,CAAC,MAAW;AACrB,YAAI,EAAE,QAAQ,QAAS,IAAA;AAAA,MACzB;AAAA,IAAA,CACD;AAAA,IACDF,WAAAA,QAAEG,KAAAA,QAAQ,EAAE,OAAO,MAAM,SAAS,MAAM,MAAM,eAAe,SAAS,GAAA,CAAI;AAAA,EAAA,CAC3E;AACH;AAKO,MAAM,uBAAoC;AAAA,EAC/C,IAAI;AAAA,EACJ,MAAM;AAAA,EACN,MAAM;AAAA,EACN,kBAAkB;AAAA,EAClB,SAAS;AAAA,IACPC,MAAAA,kBAAkB;AAAA,IAClBA,MAAAA,kBAAkB;AAAA,IAClBA,MAAAA,kBAAkB;AAAA,IAClBA,wBAAkB;AAAA,EAAA;AAAA,EAEpB,IAAI,KAAK;AACP,QAAI,SAAS,EAAE,WAAW,CAAA,GAAI,aAAa,MAAM,aAAa,MAAM;AAAA,EACtE;AACF;AAIO,MAAM,oBAAiC;AAAA,EAC5C,IAAI;AAAA,EACJ,MAAM;AAAA,EACN,MAAM;AAAA,EACN,SAASC,YAAAA;AAAAA,EACT,kBAAkB;AAAA,EAClB,QAAQ,MAAML,WAAAA,QAAE,kBAAkB;AACpC;;;"}
1
+ {"version":3,"file":"table-controls.cjs","sources":["../../src/actions/table-controls.ts"],"sourcesContent":["/**\n * Table-scoped controls expressed as `TableAction`s (no special\n * `dataSheetActions` chrome). They target every cardinality, so they sit in the\n * toolbar regardless of selection — reachable from the one standard actions\n * path like everything else. Opt-in: add them to the `actions` prop.\n */\nimport h from \"@macrostrat/hyper\";\nimport { useState } from \"react\";\nimport { Button, ControlGroup, InputGroup } from \"@blueprintjs/core\";\nimport { RegionCardinality } from \"@blueprintjs/table\";\nimport { useSelector } from \"../provider\";\nimport type { TableAction } from \"./types\";\nimport { ALL_CARDINALITIES } from \"./edit-actions\";\n\nfunction ScrollToRowControl() {\n const [value, setValue] = useState(\"\");\n const scrollToRow = useSelector((s) => s.scrollToRow);\n const go = () => {\n const r = parseInt(value, 10);\n if (!Number.isNaN(r)) scrollToRow(r - 1);\n };\n return h(ControlGroup, [\n h(InputGroup, {\n type: \"number\",\n placeholder: \"Row #\",\n value,\n small: true,\n style: { width: \"6em\" },\n onValueChange: setValue,\n onKeyDown: (e: any) => {\n if (e.key === \"Enter\") go();\n },\n }),\n h(Button, { small: true, minimal: true, icon: \"arrow-right\", onClick: go }),\n ]);\n}\n\n/** Clear the current selection. Auto-included: appears (on the right, being a\n * general action) whenever something is selected — targets every cardinality\n * except `\"none\"`. */\nexport const clearSelectionAction: TableAction = {\n id: \"clear-selection\",\n name: \"Clear selection\",\n icon: \"cross\",\n requiresEditable: false,\n targets: [\n RegionCardinality.CELLS,\n RegionCardinality.FULL_ROWS,\n RegionCardinality.FULL_COLUMNS,\n RegionCardinality.FULL_TABLE,\n ],\n // Empty selection maps to the FULL_TABLE cardinality, so the action still\n // shows with nothing selected — grey it out there rather than act on nothing.\n // (`disabled` is probed with a bare state, hence the `?? []`.)\n disabled: (s: any) => (s.selection?.length ?? 0) === 0,\n run(ctx) {\n ctx.setState({ selection: [], focusedCell: null, topLeftCell: null });\n },\n};\n\n/** Scroll to a 1-based row number. Meaningful for large, addressable sources;\n * add it to `actions`. Present in the toolbar regardless of selection. */\nexport const scrollToRowAction: TableAction = {\n id: \"scroll-to-row\",\n name: \"Scroll to row\",\n icon: \"arrow-right\",\n targets: ALL_CARDINALITIES,\n requiresEditable: false,\n render: () => h(ScrollToRowControl),\n};\n"],"names":["useState","useSelector","h","ControlGroup","InputGroup","Button","RegionCardinality","ALL_CARDINALITIES"],"mappings":";;;;;;;;;;AAcA,SAAS,qBAAqB;AAC5B,QAAM,CAAC,OAAO,QAAQ,IAAIA,MAAAA,SAAS,EAAE;AACrC,QAAM,cAAcC,SAAAA,YAAY,CAAC,MAAM,EAAE,WAAW;AACpD,QAAM,KAAK,MAAM;AACf,UAAM,IAAI,SAAS,OAAO,EAAE;AAC5B,QAAI,CAAC,OAAO,MAAM,CAAC,EAAG,aAAY,IAAI,CAAC;AAAA,EACzC;AACA,SAAOC,WAAAA,QAAEC,KAAAA,cAAc;AAAA,IACrBD,WAAAA,QAAEE,KAAAA,YAAY;AAAA,MACZ,MAAM;AAAA,MACN,aAAa;AAAA,MACb;AAAA,MACA,OAAO;AAAA,MACP,OAAO,EAAE,OAAO,MAAA;AAAA,MAChB,eAAe;AAAA,MACf,WAAW,CAAC,MAAW;AACrB,YAAI,EAAE,QAAQ,QAAS,IAAA;AAAA,MACzB;AAAA,IAAA,CACD;AAAA,IACDF,WAAAA,QAAEG,KAAAA,QAAQ,EAAE,OAAO,MAAM,SAAS,MAAM,MAAM,eAAe,SAAS,GAAA,CAAI;AAAA,EAAA,CAC3E;AACH;AAKO,MAAM,uBAAoC;AAAA,EAC/C,IAAI;AAAA,EACJ,MAAM;AAAA,EACN,MAAM;AAAA,EACN,kBAAkB;AAAA,EAClB,SAAS;AAAA,IACPC,MAAAA,kBAAkB;AAAA,IAClBA,MAAAA,kBAAkB;AAAA,IAClBA,MAAAA,kBAAkB;AAAA,IAClBA,wBAAkB;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA,EAKpB,UAAU,CAAC,OAAY,EAAE,WAAW,UAAU,OAAO;AAAA,EACrD,IAAI,KAAK;AACP,QAAI,SAAS,EAAE,WAAW,CAAA,GAAI,aAAa,MAAM,aAAa,MAAM;AAAA,EACtE;AACF;AAIO,MAAM,oBAAiC;AAAA,EAC5C,IAAI;AAAA,EACJ,MAAM;AAAA,EACN,MAAM;AAAA,EACN,SAASC,YAAAA;AAAAA,EACT,kBAAkB;AAAA,EAClB,QAAQ,MAAML,WAAAA,QAAE,kBAAkB;AACpC;;;"}
@@ -37,6 +37,10 @@ const clearSelectionAction = {
37
37
  RegionCardinality.FULL_COLUMNS,
38
38
  RegionCardinality.FULL_TABLE
39
39
  ],
40
+ // Empty selection maps to the FULL_TABLE cardinality, so the action still
41
+ // shows with nothing selected — grey it out there rather than act on nothing.
42
+ // (`disabled` is probed with a bare state, hence the `?? []`.)
43
+ disabled: (s) => (s.selection?.length ?? 0) === 0,
40
44
  run(ctx) {
41
45
  ctx.setState({ selection: [], focusedCell: null, topLeftCell: null });
42
46
  }
@@ -1 +1 @@
1
- {"version":3,"file":"table-controls.js","sources":["../../src/actions/table-controls.ts"],"sourcesContent":["/**\n * Table-scoped controls expressed as `TableAction`s (no special\n * `dataSheetActions` chrome). They target every cardinality, so they sit in the\n * toolbar regardless of selection — reachable from the one standard actions\n * path like everything else. Opt-in: add them to the `actions` prop.\n */\nimport h from \"@macrostrat/hyper\";\nimport { useState } from \"react\";\nimport { Button, ControlGroup, InputGroup } from \"@blueprintjs/core\";\nimport { RegionCardinality } from \"@blueprintjs/table\";\nimport { useSelector } from \"../provider\";\nimport type { TableAction } from \"./types\";\nimport { ALL_CARDINALITIES } from \"./edit-actions\";\n\nfunction ScrollToRowControl() {\n const [value, setValue] = useState(\"\");\n const scrollToRow = useSelector((s) => s.scrollToRow);\n const go = () => {\n const r = parseInt(value, 10);\n if (!Number.isNaN(r)) scrollToRow(r - 1);\n };\n return h(ControlGroup, [\n h(InputGroup, {\n type: \"number\",\n placeholder: \"Row #\",\n value,\n small: true,\n style: { width: \"6em\" },\n onValueChange: setValue,\n onKeyDown: (e: any) => {\n if (e.key === \"Enter\") go();\n },\n }),\n h(Button, { small: true, minimal: true, icon: \"arrow-right\", onClick: go }),\n ]);\n}\n\n/** Clear the current selection. Auto-included: appears (on the right, being a\n * general action) whenever something is selected — targets every cardinality\n * except `\"none\"`. */\nexport const clearSelectionAction: TableAction = {\n id: \"clear-selection\",\n name: \"Clear selection\",\n icon: \"cross\",\n requiresEditable: false,\n targets: [\n RegionCardinality.CELLS,\n RegionCardinality.FULL_ROWS,\n RegionCardinality.FULL_COLUMNS,\n RegionCardinality.FULL_TABLE,\n ],\n run(ctx) {\n ctx.setState({ selection: [], focusedCell: null, topLeftCell: null });\n },\n};\n\n/** Scroll to a 1-based row number. Meaningful for large, addressable sources;\n * add it to `actions`. Present in the toolbar regardless of selection. */\nexport const scrollToRowAction: TableAction = {\n id: \"scroll-to-row\",\n name: \"Scroll to row\",\n icon: \"arrow-right\",\n targets: ALL_CARDINALITIES,\n requiresEditable: false,\n render: () => h(ScrollToRowControl),\n};\n"],"names":[],"mappings":";;;;;;AAcA,SAAS,qBAAqB;AAC5B,QAAM,CAAC,OAAO,QAAQ,IAAI,SAAS,EAAE;AACrC,QAAM,cAAc,YAAY,CAAC,MAAM,EAAE,WAAW;AACpD,QAAM,KAAK,MAAM;AACf,UAAM,IAAI,SAAS,OAAO,EAAE;AAC5B,QAAI,CAAC,OAAO,MAAM,CAAC,EAAG,aAAY,IAAI,CAAC;AAAA,EACzC;AACA,SAAO,EAAE,cAAc;AAAA,IACrB,EAAE,YAAY;AAAA,MACZ,MAAM;AAAA,MACN,aAAa;AAAA,MACb;AAAA,MACA,OAAO;AAAA,MACP,OAAO,EAAE,OAAO,MAAA;AAAA,MAChB,eAAe;AAAA,MACf,WAAW,CAAC,MAAW;AACrB,YAAI,EAAE,QAAQ,QAAS,IAAA;AAAA,MACzB;AAAA,IAAA,CACD;AAAA,IACD,EAAE,QAAQ,EAAE,OAAO,MAAM,SAAS,MAAM,MAAM,eAAe,SAAS,GAAA,CAAI;AAAA,EAAA,CAC3E;AACH;AAKO,MAAM,uBAAoC;AAAA,EAC/C,IAAI;AAAA,EACJ,MAAM;AAAA,EACN,MAAM;AAAA,EACN,kBAAkB;AAAA,EAClB,SAAS;AAAA,IACP,kBAAkB;AAAA,IAClB,kBAAkB;AAAA,IAClB,kBAAkB;AAAA,IAClB,kBAAkB;AAAA,EAAA;AAAA,EAEpB,IAAI,KAAK;AACP,QAAI,SAAS,EAAE,WAAW,CAAA,GAAI,aAAa,MAAM,aAAa,MAAM;AAAA,EACtE;AACF;AAIO,MAAM,oBAAiC;AAAA,EAC5C,IAAI;AAAA,EACJ,MAAM;AAAA,EACN,MAAM;AAAA,EACN,SAAS;AAAA,EACT,kBAAkB;AAAA,EAClB,QAAQ,MAAM,EAAE,kBAAkB;AACpC;"}
1
+ {"version":3,"file":"table-controls.js","sources":["../../src/actions/table-controls.ts"],"sourcesContent":["/**\n * Table-scoped controls expressed as `TableAction`s (no special\n * `dataSheetActions` chrome). They target every cardinality, so they sit in the\n * toolbar regardless of selection — reachable from the one standard actions\n * path like everything else. Opt-in: add them to the `actions` prop.\n */\nimport h from \"@macrostrat/hyper\";\nimport { useState } from \"react\";\nimport { Button, ControlGroup, InputGroup } from \"@blueprintjs/core\";\nimport { RegionCardinality } from \"@blueprintjs/table\";\nimport { useSelector } from \"../provider\";\nimport type { TableAction } from \"./types\";\nimport { ALL_CARDINALITIES } from \"./edit-actions\";\n\nfunction ScrollToRowControl() {\n const [value, setValue] = useState(\"\");\n const scrollToRow = useSelector((s) => s.scrollToRow);\n const go = () => {\n const r = parseInt(value, 10);\n if (!Number.isNaN(r)) scrollToRow(r - 1);\n };\n return h(ControlGroup, [\n h(InputGroup, {\n type: \"number\",\n placeholder: \"Row #\",\n value,\n small: true,\n style: { width: \"6em\" },\n onValueChange: setValue,\n onKeyDown: (e: any) => {\n if (e.key === \"Enter\") go();\n },\n }),\n h(Button, { small: true, minimal: true, icon: \"arrow-right\", onClick: go }),\n ]);\n}\n\n/** Clear the current selection. Auto-included: appears (on the right, being a\n * general action) whenever something is selected — targets every cardinality\n * except `\"none\"`. */\nexport const clearSelectionAction: TableAction = {\n id: \"clear-selection\",\n name: \"Clear selection\",\n icon: \"cross\",\n requiresEditable: false,\n targets: [\n RegionCardinality.CELLS,\n RegionCardinality.FULL_ROWS,\n RegionCardinality.FULL_COLUMNS,\n RegionCardinality.FULL_TABLE,\n ],\n // Empty selection maps to the FULL_TABLE cardinality, so the action still\n // shows with nothing selected — grey it out there rather than act on nothing.\n // (`disabled` is probed with a bare state, hence the `?? []`.)\n disabled: (s: any) => (s.selection?.length ?? 0) === 0,\n run(ctx) {\n ctx.setState({ selection: [], focusedCell: null, topLeftCell: null });\n },\n};\n\n/** Scroll to a 1-based row number. Meaningful for large, addressable sources;\n * add it to `actions`. Present in the toolbar regardless of selection. */\nexport const scrollToRowAction: TableAction = {\n id: \"scroll-to-row\",\n name: \"Scroll to row\",\n icon: \"arrow-right\",\n targets: ALL_CARDINALITIES,\n requiresEditable: false,\n render: () => h(ScrollToRowControl),\n};\n"],"names":[],"mappings":";;;;;;AAcA,SAAS,qBAAqB;AAC5B,QAAM,CAAC,OAAO,QAAQ,IAAI,SAAS,EAAE;AACrC,QAAM,cAAc,YAAY,CAAC,MAAM,EAAE,WAAW;AACpD,QAAM,KAAK,MAAM;AACf,UAAM,IAAI,SAAS,OAAO,EAAE;AAC5B,QAAI,CAAC,OAAO,MAAM,CAAC,EAAG,aAAY,IAAI,CAAC;AAAA,EACzC;AACA,SAAO,EAAE,cAAc;AAAA,IACrB,EAAE,YAAY;AAAA,MACZ,MAAM;AAAA,MACN,aAAa;AAAA,MACb;AAAA,MACA,OAAO;AAAA,MACP,OAAO,EAAE,OAAO,MAAA;AAAA,MAChB,eAAe;AAAA,MACf,WAAW,CAAC,MAAW;AACrB,YAAI,EAAE,QAAQ,QAAS,IAAA;AAAA,MACzB;AAAA,IAAA,CACD;AAAA,IACD,EAAE,QAAQ,EAAE,OAAO,MAAM,SAAS,MAAM,MAAM,eAAe,SAAS,GAAA,CAAI;AAAA,EAAA,CAC3E;AACH;AAKO,MAAM,uBAAoC;AAAA,EAC/C,IAAI;AAAA,EACJ,MAAM;AAAA,EACN,MAAM;AAAA,EACN,kBAAkB;AAAA,EAClB,SAAS;AAAA,IACP,kBAAkB;AAAA,IAClB,kBAAkB;AAAA,IAClB,kBAAkB;AAAA,IAClB,kBAAkB;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA,EAKpB,UAAU,CAAC,OAAY,EAAE,WAAW,UAAU,OAAO;AAAA,EACrD,IAAI,KAAK;AACP,QAAI,SAAS,EAAE,WAAW,CAAA,GAAI,aAAa,MAAM,aAAa,MAAM;AAAA,EACtE;AACF;AAIO,MAAM,oBAAiC;AAAA,EAC5C,IAAI;AAAA,EACJ,MAAM;AAAA,EACN,MAAM;AAAA,EACN,SAAS;AAAA,EACT,kBAAkB;AAAA,EAClB,QAAQ,MAAM,EAAE,kBAAkB;AACpC;"}