@macrostrat/data-sheet 4.0.0-dev3 → 4.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +56 -0
- package/README.md +44 -0
- package/dist/actions/builtin.cjs +36 -5
- package/dist/actions/builtin.cjs.map +1 -1
- package/dist/actions/builtin.d.ts +3 -2
- package/dist/actions/builtin.js +36 -5
- package/dist/actions/builtin.js.map +1 -1
- package/dist/actions/column-controls.cjs +149 -0
- package/dist/actions/column-controls.cjs.map +1 -0
- package/dist/actions/column-controls.d.ts +11 -0
- package/dist/actions/column-controls.js +147 -0
- package/dist/actions/column-controls.js.map +1 -0
- package/dist/actions/column-filter.cjs +68 -0
- package/dist/actions/column-filter.cjs.map +1 -0
- package/dist/actions/column-filter.d.ts +11 -0
- package/dist/actions/column-filter.js +66 -0
- package/dist/actions/column-filter.js.map +1 -0
- package/dist/actions/edit-actions.cjs +42 -0
- package/dist/actions/edit-actions.cjs.map +1 -0
- package/dist/actions/edit-actions.d.ts +14 -0
- package/dist/actions/edit-actions.js +42 -0
- package/dist/actions/edit-actions.js.map +1 -0
- package/dist/actions/filters.cjs +39 -23
- package/dist/actions/filters.cjs.map +1 -1
- package/dist/actions/filters.d.ts +6 -3
- package/dist/actions/filters.js +41 -25
- package/dist/actions/filters.js.map +1 -1
- package/dist/actions/index.d.ts +4 -0
- package/dist/actions/selection.cjs +51 -32
- package/dist/actions/selection.cjs.map +1 -1
- package/dist/actions/selection.d.ts +3 -7
- package/dist/actions/selection.js +51 -32
- package/dist/actions/selection.js.map +1 -1
- package/dist/actions/table-controls.cjs +41 -0
- package/dist/actions/table-controls.cjs.map +1 -0
- package/dist/actions/table-controls.d.ts +4 -0
- package/dist/actions/table-controls.js +39 -0
- package/dist/actions/table-controls.js.map +1 -0
- package/dist/actions/toolbar.cjs +69 -10
- package/dist/actions/toolbar.cjs.map +1 -1
- package/dist/actions/toolbar.d.ts +9 -6
- package/dist/actions/toolbar.js +69 -10
- package/dist/actions/toolbar.js.map +1 -1
- package/dist/actions/toolbar.module.sass.cjs +12 -7
- package/dist/actions/toolbar.module.sass.cjs.map +1 -1
- package/dist/actions/toolbar.module.sass.js +12 -7
- package/dist/actions/toolbar.module.sass.js.map +1 -1
- package/dist/actions/types.d.ts +49 -4
- package/dist/cell-renderer.cjs +150 -14
- package/dist/cell-renderer.cjs.map +1 -1
- package/dist/cell-renderer.d.ts +1 -1
- package/dist/cell-renderer.js +151 -15
- package/dist/cell-renderer.js.map +1 -1
- package/dist/components/cell-detail.cjs +24 -0
- package/dist/components/cell-detail.cjs.map +1 -0
- package/dist/components/cell-detail.d.ts +12 -0
- package/dist/components/cell-detail.js +24 -0
- package/dist/components/cell-detail.js.map +1 -0
- package/dist/components/editor-popup.cjs +28 -24
- package/dist/components/editor-popup.cjs.map +1 -1
- package/dist/components/editor-popup.js +29 -25
- package/dist/components/editor-popup.js.map +1 -1
- package/dist/components/index.d.ts +2 -2
- package/dist/components/text-areas.cjs +51 -7
- package/dist/components/text-areas.cjs.map +1 -1
- package/dist/components/text-areas.d.ts +4 -1
- package/dist/components/text-areas.js +51 -7
- package/dist/components/text-areas.js.map +1 -1
- package/dist/components/view-info.cjs +46 -9
- package/dist/components/view-info.cjs.map +1 -1
- package/dist/components/view-info.d.ts +5 -1
- package/dist/components/view-info.js +47 -10
- package/dist/components/view-info.js.map +1 -1
- package/dist/core.cjs +167 -73
- package/dist/core.cjs.map +1 -1
- package/dist/core.d.ts +53 -6
- package/dist/core.js +169 -75
- package/dist/core.js.map +1 -1
- package/dist/data-sheet.css +72 -123
- package/dist/filters/operators.cjs +91 -0
- package/dist/filters/operators.cjs.map +1 -0
- package/dist/filters/operators.d.ts +17 -0
- package/dist/filters/operators.js +91 -0
- package/dist/filters/operators.js.map +1 -0
- package/dist/index.cjs +38 -10
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.js +44 -16
- package/dist/index.js.map +1 -1
- package/dist/main.module.sass.cjs +13 -12
- package/dist/main.module.sass.cjs.map +1 -1
- package/dist/main.module.sass.js +13 -12
- package/dist/main.module.sass.js.map +1 -1
- package/dist/postgrest-table/data-loaders.cjs +255 -146
- package/dist/postgrest-table/data-loaders.cjs.map +1 -1
- package/dist/postgrest-table/data-loaders.d.ts +144 -46
- package/dist/postgrest-table/data-loaders.js +259 -150
- package/dist/postgrest-table/data-loaders.js.map +1 -1
- package/dist/postgrest-table/index.cjs +58 -169
- package/dist/postgrest-table/index.cjs.map +1 -1
- package/dist/postgrest-table/index.d.ts +5 -2
- package/dist/postgrest-table/index.js +63 -174
- package/dist/postgrest-table/index.js.map +1 -1
- package/dist/postgrest-table/loading-utils.cjs +0 -4
- package/dist/postgrest-table/loading-utils.cjs.map +1 -1
- package/dist/postgrest-table/loading-utils.js +1 -5
- package/dist/postgrest-table/loading-utils.js.map +1 -1
- package/dist/postgrest-table/main.module.sass.cjs +14 -13
- package/dist/postgrest-table/main.module.sass.cjs.map +1 -1
- package/dist/postgrest-table/main.module.sass.js +14 -13
- package/dist/postgrest-table/main.module.sass.js.map +1 -1
- package/dist/provider.cjs +68 -11
- package/dist/provider.cjs.map +1 -1
- package/dist/provider.d.ts +25 -0
- package/dist/provider.js +68 -11
- package/dist/provider.js.map +1 -1
- package/dist/renderers/column-header-cell.cjs +95 -75
- package/dist/renderers/column-header-cell.cjs.map +1 -1
- package/dist/renderers/column-header-cell.d.ts +3 -18
- package/dist/renderers/column-header-cell.js +98 -78
- package/dist/renderers/column-header-cell.js.map +1 -1
- package/dist/renderers/index.d.ts +0 -1
- package/dist/types.cjs +2 -0
- package/dist/types.cjs.map +1 -1
- package/dist/types.d.ts +84 -1
- package/dist/types.js +2 -0
- package/dist/types.js.map +1 -1
- package/dist/utils/column-spec.cjs.map +1 -1
- package/dist/utils/column-spec.d.ts +101 -1
- package/dist/utils/column-spec.js.map +1 -1
- package/dist/utils/debug-overlay.cjs +24 -0
- package/dist/utils/debug-overlay.cjs.map +1 -0
- package/dist/utils/debug-overlay.d.ts +4 -0
- package/dist/utils/debug-overlay.js +24 -0
- package/dist/utils/debug-overlay.js.map +1 -0
- package/dist/utils/index.cjs.map +1 -1
- package/dist/utils/index.d.ts +2 -0
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/key-handling.cjs +52 -6
- package/dist/utils/key-handling.cjs.map +1 -1
- package/dist/utils/key-handling.js +52 -6
- package/dist/utils/key-handling.js.map +1 -1
- package/dist/utils/validation.cjs +41 -0
- package/dist/utils/validation.cjs.map +1 -0
- package/dist/utils/validation.d.ts +26 -0
- package/dist/utils/validation.js +41 -0
- package/dist/utils/validation.js.map +1 -0
- package/dist/zustand-store.cjs +119 -61
- package/dist/zustand-store.cjs.map +1 -1
- package/dist/zustand-store.js +121 -63
- package/dist/zustand-store.js.map +1 -1
- package/package.json +3 -3
- package/src/actions/builtin.ts +62 -7
- package/src/actions/column-controls.ts +185 -0
- package/src/actions/column-filter.ts +104 -0
- package/src/actions/edit-actions.ts +67 -0
- package/src/actions/filters.ts +54 -28
- package/src/actions/index.ts +4 -0
- package/src/actions/selection.ts +73 -54
- package/src/actions/table-controls.ts +46 -0
- package/src/actions/toolbar.module.sass +22 -2
- package/src/actions/toolbar.ts +113 -16
- package/src/actions/types.ts +49 -4
- package/src/cell-renderer.ts +211 -16
- package/src/components/cell-detail.ts +30 -0
- package/src/components/editor-popup.ts +39 -25
- package/src/components/index.ts +2 -2
- package/src/components/text-areas.ts +80 -16
- package/src/components/view-info.ts +63 -4
- package/src/core.ts +321 -103
- package/src/filters/operators.ts +127 -0
- package/src/index.ts +2 -0
- package/src/main.module.sass +6 -0
- package/src/postgrest-table/data-loaders.ts +459 -209
- package/src/postgrest-table/index.ts +81 -254
- package/src/postgrest-table/main.module.sass +11 -0
- package/src/provider.ts +109 -12
- package/src/renderers/column-header-cell.ts +60 -272
- package/src/renderers/index.ts +0 -1
- package/src/types.ts +76 -2
- package/src/utils/column-spec.ts +112 -1
- package/src/utils/debug-overlay.ts +22 -0
- package/src/utils/index.ts +2 -0
- package/src/utils/key-handling.ts +70 -6
- package/src/utils/validation.ts +72 -0
- package/src/zustand-store.ts +167 -60
- package/dist/components/actions.cjs +0 -12
- package/dist/components/actions.cjs.map +0 -1
- package/dist/components/actions.d.ts +0 -2
- package/dist/components/actions.js +0 -12
- package/dist/components/actions.js.map +0 -1
- package/dist/components/actions.module.sass.cjs +0 -12
- package/dist/components/actions.module.sass.cjs.map +0 -1
- package/dist/components/actions.module.sass.js +0 -11
- package/dist/components/actions.module.sass.js.map +0 -1
- package/dist/postgrest-table/lazy-loader-table.cjs +0 -27
- package/dist/postgrest-table/lazy-loader-table.cjs.map +0 -1
- package/dist/postgrest-table/lazy-loader-table.d.ts +0 -3
- package/dist/postgrest-table/lazy-loader-table.js +0 -27
- package/dist/postgrest-table/lazy-loader-table.js.map +0 -1
- package/dist/renderers/column-header-cell-postgrest.cjs +0 -216
- package/dist/renderers/column-header-cell-postgrest.cjs.map +0 -1
- package/dist/renderers/column-header-cell-postgrest.d.ts +0 -13
- package/dist/renderers/column-header-cell-postgrest.js +0 -216
- package/dist/renderers/column-header-cell-postgrest.js.map +0 -1
- package/dist/renderers/column-header-cell-postgrest.module.sass.cjs +0 -23
- package/dist/renderers/column-header-cell-postgrest.module.sass.cjs.map +0 -1
- package/dist/renderers/column-header-cell-postgrest.module.sass.js +0 -22
- package/dist/renderers/column-header-cell-postgrest.module.sass.js.map +0 -1
- package/src/components/actions.ts +0 -9
- package/src/postgrest-table/lazy-loader-table.ts +0 -25
- package/src/renderers/column-header-cell-postgrest.ts +0 -282
|
@@ -0,0 +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":"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"}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
|
|
3
|
+
const h$1 = require("@macrostrat/hyper");
|
|
4
|
+
const react = require("react");
|
|
5
|
+
const core = require("@blueprintjs/core");
|
|
6
|
+
const operators = require("../filters/operators.cjs");
|
|
7
|
+
const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
|
|
8
|
+
const h__default = /* @__PURE__ */ _interopDefault(h$1);
|
|
9
|
+
const h = h__default.default;
|
|
10
|
+
function columnFilterId(key) {
|
|
11
|
+
return `column-filter:${key}`;
|
|
12
|
+
}
|
|
13
|
+
function columnFilter(col) {
|
|
14
|
+
const operators$1 = operators.getOperatorsForColumn(col);
|
|
15
|
+
return {
|
|
16
|
+
id: columnFilterId(col.key),
|
|
17
|
+
name: col.name,
|
|
18
|
+
icon: "filter",
|
|
19
|
+
columnKey: col.key,
|
|
20
|
+
defaultState: { operator: operators$1[0], value: "" },
|
|
21
|
+
describeState: (s) => s?.value ? `${operators.OPERATOR_LABELS[s.operator] ?? s.operator} ${s.value}` : null,
|
|
22
|
+
predicate: (row, s) => operators.testFilterOperator(row?.[col.key], s.operator, s.value),
|
|
23
|
+
filterForm: ({ state, setState }) => h(ColumnFilterForm, { operators: operators$1, state, setState })
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
function ColumnFilterForm({
|
|
27
|
+
operators: operators$1,
|
|
28
|
+
state,
|
|
29
|
+
setState
|
|
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 });
|
|
35
|
+
};
|
|
36
|
+
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
|
+
}),
|
|
52
|
+
h(core.InputGroup, {
|
|
53
|
+
key: "val",
|
|
54
|
+
value: draft,
|
|
55
|
+
placeholder: "value",
|
|
56
|
+
autoFocus: true,
|
|
57
|
+
onChange: (e) => setDraft(e.target.value),
|
|
58
|
+
onBlur: commit,
|
|
59
|
+
onKeyDown: (e) => {
|
|
60
|
+
if (e.key === "Enter") commit();
|
|
61
|
+
}
|
|
62
|
+
})
|
|
63
|
+
])
|
|
64
|
+
);
|
|
65
|
+
}
|
|
66
|
+
exports.columnFilter = columnFilter;
|
|
67
|
+
exports.columnFilterId = columnFilterId;
|
|
68
|
+
//# sourceMappingURL=column-filter.cjs.map
|
|
@@ -0,0 +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;;;"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { ColumnSpec } from '../utils/column-spec';
|
|
2
|
+
import { TableFilter } from './types';
|
|
3
|
+
import { FilterOperator } from '../filters/operators';
|
|
4
|
+
export interface ColumnFilterState {
|
|
5
|
+
operator: FilterOperator;
|
|
6
|
+
value: string;
|
|
7
|
+
}
|
|
8
|
+
/** Stable filter id for a column's built-in operator filter. */
|
|
9
|
+
export declare function columnFilterId(key: string): string;
|
|
10
|
+
/** Generate the built-in operator filter for a `filterable` column. */
|
|
11
|
+
export declare function columnFilter(col: ColumnSpec): TableFilter<any, ColumnFilterState>;
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
import h$1 from "@macrostrat/hyper";
|
|
2
|
+
import { useState, useEffect } from "react";
|
|
3
|
+
import { FormGroup, ControlGroup, HTMLSelect, InputGroup } from "@blueprintjs/core";
|
|
4
|
+
import { getOperatorsForColumn, OPERATOR_LABELS, testFilterOperator } from "../filters/operators.js";
|
|
5
|
+
const h = h$1;
|
|
6
|
+
function columnFilterId(key) {
|
|
7
|
+
return `column-filter:${key}`;
|
|
8
|
+
}
|
|
9
|
+
function columnFilter(col) {
|
|
10
|
+
const operators = getOperatorsForColumn(col);
|
|
11
|
+
return {
|
|
12
|
+
id: columnFilterId(col.key),
|
|
13
|
+
name: col.name,
|
|
14
|
+
icon: "filter",
|
|
15
|
+
columnKey: col.key,
|
|
16
|
+
defaultState: { operator: operators[0], value: "" },
|
|
17
|
+
describeState: (s) => s?.value ? `${OPERATOR_LABELS[s.operator] ?? s.operator} ${s.value}` : null,
|
|
18
|
+
predicate: (row, s) => testFilterOperator(row?.[col.key], s.operator, s.value),
|
|
19
|
+
filterForm: ({ state, setState }) => h(ColumnFilterForm, { operators, state, setState })
|
|
20
|
+
};
|
|
21
|
+
}
|
|
22
|
+
function ColumnFilterForm({
|
|
23
|
+
operators,
|
|
24
|
+
state,
|
|
25
|
+
setState
|
|
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 });
|
|
31
|
+
};
|
|
32
|
+
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
|
+
}),
|
|
48
|
+
h(InputGroup, {
|
|
49
|
+
key: "val",
|
|
50
|
+
value: draft,
|
|
51
|
+
placeholder: "value",
|
|
52
|
+
autoFocus: true,
|
|
53
|
+
onChange: (e) => setDraft(e.target.value),
|
|
54
|
+
onBlur: commit,
|
|
55
|
+
onKeyDown: (e) => {
|
|
56
|
+
if (e.key === "Enter") commit();
|
|
57
|
+
}
|
|
58
|
+
})
|
|
59
|
+
])
|
|
60
|
+
);
|
|
61
|
+
}
|
|
62
|
+
export {
|
|
63
|
+
columnFilter,
|
|
64
|
+
columnFilterId
|
|
65
|
+
};
|
|
66
|
+
//# sourceMappingURL=column-filter.js.map
|
|
@@ -0,0 +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;"}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
|
|
3
|
+
const table = require("@blueprintjs/table");
|
|
4
|
+
const validation = require("../utils/validation.cjs");
|
|
5
|
+
const ALL_CARDINALITIES = [
|
|
6
|
+
"none",
|
|
7
|
+
table.RegionCardinality.FULL_TABLE,
|
|
8
|
+
table.RegionCardinality.CELLS,
|
|
9
|
+
table.RegionCardinality.FULL_ROWS,
|
|
10
|
+
table.RegionCardinality.FULL_COLUMNS
|
|
11
|
+
];
|
|
12
|
+
function hasPendingChanges(s) {
|
|
13
|
+
const edited = s.updatedData?.some(
|
|
14
|
+
(r) => r != null && typeof r === "object" && Object.keys(r).length > 0
|
|
15
|
+
) ?? false;
|
|
16
|
+
const structural = s.rowStatus?.some((st) => st === "added" || st === "deleted") ?? false;
|
|
17
|
+
return edited || structural;
|
|
18
|
+
}
|
|
19
|
+
function createSaveAction(onSave) {
|
|
20
|
+
return {
|
|
21
|
+
id: "save-changes",
|
|
22
|
+
name: "Save",
|
|
23
|
+
icon: "floppy-disk",
|
|
24
|
+
intent: "primary",
|
|
25
|
+
targets: ALL_CARDINALITIES,
|
|
26
|
+
requiresEditable: true,
|
|
27
|
+
disabled: (s) => !hasPendingChanges(s),
|
|
28
|
+
run: (ctx) => {
|
|
29
|
+
const errors = validation.collectValidationErrors(ctx);
|
|
30
|
+
if (errors.length > 0) {
|
|
31
|
+
throw new Error(
|
|
32
|
+
`Cannot save: ${errors.length} validation error${errors.length === 1 ? "" : "s"}. Fix the highlighted cells.`
|
|
33
|
+
);
|
|
34
|
+
}
|
|
35
|
+
return onSave(ctx);
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
exports.ALL_CARDINALITIES = ALL_CARDINALITIES;
|
|
40
|
+
exports.createSaveAction = createSaveAction;
|
|
41
|
+
exports.hasPendingChanges = hasPendingChanges;
|
|
42
|
+
//# sourceMappingURL=edit-actions.cjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"edit-actions.cjs","sources":["../../src/actions/edit-actions.ts"],"sourcesContent":["/**\n * Built-in Save action. It targets every cardinality (including no selection /\n * full table), so it's present in the toolbar at all times — which keeps the\n * toolbar mounted regardless of selection, avoiding show/hide layout motion.\n * It's disabled (not hidden) when there are no pending changes. (Reset already\n * lives in `builtin.ts` as `resetChangesAction`.)\n */\nimport { RegionCardinality } from \"@blueprintjs/table\";\nimport { collectValidationErrors } from \"../utils/validation\";\nimport type { SelectionCardinality, TableAction, TableActionContext } from \"./types\";\n\n/** Every selection cardinality — an action targeting all of these is always\n * applicable, so the toolbar never empties out. */\nexport const ALL_CARDINALITIES: SelectionCardinality[] = [\n \"none\",\n RegionCardinality.FULL_TABLE,\n RegionCardinality.CELLS,\n RegionCardinality.FULL_ROWS,\n RegionCardinality.FULL_COLUMNS,\n];\n\n/** Whether the table has uncommitted edits (cell overlays or added/deleted\n * rows). Accepts either the store state or an action context (both carry\n * `updatedData` / `rowStatus`). */\nexport function hasPendingChanges(s: {\n updatedData?: any[];\n rowStatus?: readonly string[];\n}): boolean {\n const edited =\n s.updatedData?.some(\n (r) => r != null && typeof r === \"object\" && Object.keys(r).length > 0,\n ) ?? false;\n // TableElementStatus enum values are the strings \"added\" / \"deleted\";\n // compared literally to avoid a value import (and an extra module cycle).\n const structural =\n s.rowStatus?.some((st) => st === \"added\" || st === \"deleted\") ?? false;\n return edited || structural;\n}\n\n/** Create a save action bound to a persistence handler. Always present;\n * disabled when there are no pending changes. */\nexport function createSaveAction<T = any>(\n onSave: (ctx: TableActionContext<T>) => void | Promise<void>,\n): TableAction<T> {\n return {\n id: \"save-changes\",\n name: \"Save\",\n icon: \"floppy-disk\",\n intent: \"primary\",\n targets: ALL_CARDINALITIES,\n requiresEditable: true,\n disabled: (s: any) => !hasPendingChanges(s),\n run: (ctx) => {\n // Validation errors block saving (warnings don't). The offending cells\n // are already highlighted; refuse and surface a summary.\n const errors = collectValidationErrors(ctx as any);\n if (errors.length > 0) {\n throw new Error(\n `Cannot save: ${errors.length} validation error${\n errors.length === 1 ? \"\" : \"s\"\n }. Fix the highlighted cells.`,\n );\n }\n return onSave(ctx);\n },\n };\n}\n"],"names":["RegionCardinality","collectValidationErrors"],"mappings":";;;;AAaO,MAAM,oBAA4C;AAAA,EACvD;AAAA,EACAA,MAAAA,kBAAkB;AAAA,EAClBA,MAAAA,kBAAkB;AAAA,EAClBA,MAAAA,kBAAkB;AAAA,EAClBA,wBAAkB;AACpB;AAKO,SAAS,kBAAkB,GAGtB;AACV,QAAM,SACJ,EAAE,aAAa;AAAA,IACb,CAAC,MAAM,KAAK,QAAQ,OAAO,MAAM,YAAY,OAAO,KAAK,CAAC,EAAE,SAAS;AAAA,EAAA,KAClE;AAGP,QAAM,aACJ,EAAE,WAAW,KAAK,CAAC,OAAO,OAAO,WAAW,OAAO,SAAS,KAAK;AACnE,SAAO,UAAU;AACnB;AAIO,SAAS,iBACd,QACgB;AAChB,SAAO;AAAA,IACL,IAAI;AAAA,IACJ,MAAM;AAAA,IACN,MAAM;AAAA,IACN,QAAQ;AAAA,IACR,SAAS;AAAA,IACT,kBAAkB;AAAA,IAClB,UAAU,CAAC,MAAW,CAAC,kBAAkB,CAAC;AAAA,IAC1C,KAAK,CAAC,QAAQ;AAGZ,YAAM,SAASC,WAAAA,wBAAwB,GAAU;AACjD,UAAI,OAAO,SAAS,GAAG;AACrB,cAAM,IAAI;AAAA,UACR,gBAAgB,OAAO,MAAM,oBAC3B,OAAO,WAAW,IAAI,KAAK,GAC7B;AAAA,QAAA;AAAA,MAEJ;AACA,aAAO,OAAO,GAAG;AAAA,IACnB;AAAA,EAAA;AAEJ;;;;"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { SelectionCardinality, TableAction, TableActionContext } from './types';
|
|
2
|
+
/** Every selection cardinality — an action targeting all of these is always
|
|
3
|
+
* applicable, so the toolbar never empties out. */
|
|
4
|
+
export declare const ALL_CARDINALITIES: SelectionCardinality[];
|
|
5
|
+
/** Whether the table has uncommitted edits (cell overlays or added/deleted
|
|
6
|
+
* rows). Accepts either the store state or an action context (both carry
|
|
7
|
+
* `updatedData` / `rowStatus`). */
|
|
8
|
+
export declare function hasPendingChanges(s: {
|
|
9
|
+
updatedData?: any[];
|
|
10
|
+
rowStatus?: readonly string[];
|
|
11
|
+
}): boolean;
|
|
12
|
+
/** Create a save action bound to a persistence handler. Always present;
|
|
13
|
+
* disabled when there are no pending changes. */
|
|
14
|
+
export declare function createSaveAction<T = any>(onSave: (ctx: TableActionContext<T>) => void | Promise<void>): TableAction<T>;
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import { RegionCardinality } from "@blueprintjs/table";
|
|
2
|
+
import { collectValidationErrors } from "../utils/validation.js";
|
|
3
|
+
const ALL_CARDINALITIES = [
|
|
4
|
+
"none",
|
|
5
|
+
RegionCardinality.FULL_TABLE,
|
|
6
|
+
RegionCardinality.CELLS,
|
|
7
|
+
RegionCardinality.FULL_ROWS,
|
|
8
|
+
RegionCardinality.FULL_COLUMNS
|
|
9
|
+
];
|
|
10
|
+
function hasPendingChanges(s) {
|
|
11
|
+
const edited = s.updatedData?.some(
|
|
12
|
+
(r) => r != null && typeof r === "object" && Object.keys(r).length > 0
|
|
13
|
+
) ?? false;
|
|
14
|
+
const structural = s.rowStatus?.some((st) => st === "added" || st === "deleted") ?? false;
|
|
15
|
+
return edited || structural;
|
|
16
|
+
}
|
|
17
|
+
function createSaveAction(onSave) {
|
|
18
|
+
return {
|
|
19
|
+
id: "save-changes",
|
|
20
|
+
name: "Save",
|
|
21
|
+
icon: "floppy-disk",
|
|
22
|
+
intent: "primary",
|
|
23
|
+
targets: ALL_CARDINALITIES,
|
|
24
|
+
requiresEditable: true,
|
|
25
|
+
disabled: (s) => !hasPendingChanges(s),
|
|
26
|
+
run: (ctx) => {
|
|
27
|
+
const errors = collectValidationErrors(ctx);
|
|
28
|
+
if (errors.length > 0) {
|
|
29
|
+
throw new Error(
|
|
30
|
+
`Cannot save: ${errors.length} validation error${errors.length === 1 ? "" : "s"}. Fix the highlighted cells.`
|
|
31
|
+
);
|
|
32
|
+
}
|
|
33
|
+
return onSave(ctx);
|
|
34
|
+
}
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
export {
|
|
38
|
+
ALL_CARDINALITIES,
|
|
39
|
+
createSaveAction,
|
|
40
|
+
hasPendingChanges
|
|
41
|
+
};
|
|
42
|
+
//# sourceMappingURL=edit-actions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"edit-actions.js","sources":["../../src/actions/edit-actions.ts"],"sourcesContent":["/**\n * Built-in Save action. It targets every cardinality (including no selection /\n * full table), so it's present in the toolbar at all times — which keeps the\n * toolbar mounted regardless of selection, avoiding show/hide layout motion.\n * It's disabled (not hidden) when there are no pending changes. (Reset already\n * lives in `builtin.ts` as `resetChangesAction`.)\n */\nimport { RegionCardinality } from \"@blueprintjs/table\";\nimport { collectValidationErrors } from \"../utils/validation\";\nimport type { SelectionCardinality, TableAction, TableActionContext } from \"./types\";\n\n/** Every selection cardinality — an action targeting all of these is always\n * applicable, so the toolbar never empties out. */\nexport const ALL_CARDINALITIES: SelectionCardinality[] = [\n \"none\",\n RegionCardinality.FULL_TABLE,\n RegionCardinality.CELLS,\n RegionCardinality.FULL_ROWS,\n RegionCardinality.FULL_COLUMNS,\n];\n\n/** Whether the table has uncommitted edits (cell overlays or added/deleted\n * rows). Accepts either the store state or an action context (both carry\n * `updatedData` / `rowStatus`). */\nexport function hasPendingChanges(s: {\n updatedData?: any[];\n rowStatus?: readonly string[];\n}): boolean {\n const edited =\n s.updatedData?.some(\n (r) => r != null && typeof r === \"object\" && Object.keys(r).length > 0,\n ) ?? false;\n // TableElementStatus enum values are the strings \"added\" / \"deleted\";\n // compared literally to avoid a value import (and an extra module cycle).\n const structural =\n s.rowStatus?.some((st) => st === \"added\" || st === \"deleted\") ?? false;\n return edited || structural;\n}\n\n/** Create a save action bound to a persistence handler. Always present;\n * disabled when there are no pending changes. */\nexport function createSaveAction<T = any>(\n onSave: (ctx: TableActionContext<T>) => void | Promise<void>,\n): TableAction<T> {\n return {\n id: \"save-changes\",\n name: \"Save\",\n icon: \"floppy-disk\",\n intent: \"primary\",\n targets: ALL_CARDINALITIES,\n requiresEditable: true,\n disabled: (s: any) => !hasPendingChanges(s),\n run: (ctx) => {\n // Validation errors block saving (warnings don't). The offending cells\n // are already highlighted; refuse and surface a summary.\n const errors = collectValidationErrors(ctx as any);\n if (errors.length > 0) {\n throw new Error(\n `Cannot save: ${errors.length} validation error${\n errors.length === 1 ? \"\" : \"s\"\n }. Fix the highlighted cells.`,\n );\n }\n return onSave(ctx);\n },\n };\n}\n"],"names":[],"mappings":";;AAaO,MAAM,oBAA4C;AAAA,EACvD;AAAA,EACA,kBAAkB;AAAA,EAClB,kBAAkB;AAAA,EAClB,kBAAkB;AAAA,EAClB,kBAAkB;AACpB;AAKO,SAAS,kBAAkB,GAGtB;AACV,QAAM,SACJ,EAAE,aAAa;AAAA,IACb,CAAC,MAAM,KAAK,QAAQ,OAAO,MAAM,YAAY,OAAO,KAAK,CAAC,EAAE,SAAS;AAAA,EAAA,KAClE;AAGP,QAAM,aACJ,EAAE,WAAW,KAAK,CAAC,OAAO,OAAO,WAAW,OAAO,SAAS,KAAK;AACnE,SAAO,UAAU;AACnB;AAIO,SAAS,iBACd,QACgB;AAChB,SAAO;AAAA,IACL,IAAI;AAAA,IACJ,MAAM;AAAA,IACN,MAAM;AAAA,IACN,QAAQ;AAAA,IACR,SAAS;AAAA,IACT,kBAAkB;AAAA,IAClB,UAAU,CAAC,MAAW,CAAC,kBAAkB,CAAC;AAAA,IAC1C,KAAK,CAAC,QAAQ;AAGZ,YAAM,SAAS,wBAAwB,GAAU;AACjD,UAAI,OAAO,SAAS,GAAG;AACrB,cAAM,IAAI;AAAA,UACR,gBAAgB,OAAO,MAAM,oBAC3B,OAAO,WAAW,IAAI,KAAK,GAC7B;AAAA,QAAA;AAAA,MAEJ;AACA,aAAO,OAAO,GAAG;AAAA,IACnB;AAAA,EAAA;AAEJ;"}
|
package/dist/actions/filters.cjs
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
|
|
3
3
|
const core = require("@blueprintjs/core");
|
|
4
4
|
const react = require("react");
|
|
5
|
+
const table = require("@blueprintjs/table");
|
|
5
6
|
const toolbar_module = require("./toolbar.module.sass.cjs");
|
|
6
7
|
const provider = require("../provider.cjs");
|
|
7
8
|
const selection = require("./selection.cjs");
|
|
@@ -9,39 +10,52 @@ function FilterBar({ filters = [] }) {
|
|
|
9
10
|
const columnSpec = provider.useSelector((state) => state.columnSpec);
|
|
10
11
|
const storeAPI = provider.useStoreAPI();
|
|
11
12
|
const activeFilters = provider.useSelector((state) => state.activeFilters);
|
|
13
|
+
const columnSorts = provider.useSelector((state) => state.columnSorts);
|
|
14
|
+
const selection$1 = provider.useSelector((state) => state.selection);
|
|
15
|
+
const columnSelected = selection.getSelectionCardinality(selection$1) === table.RegionCardinality.FULL_COLUMNS;
|
|
12
16
|
const allFilters = react.useMemo(
|
|
13
17
|
() => selection.collectAllFilters(filters, columnSpec),
|
|
14
18
|
[filters, columnSpec]
|
|
15
19
|
);
|
|
16
|
-
const activeIds = react.useMemo(
|
|
20
|
+
const activeIds = react.useMemo(
|
|
21
|
+
() => new Set(activeFilters.keys()),
|
|
22
|
+
[activeFilters]
|
|
23
|
+
);
|
|
17
24
|
const availableFilters = react.useMemo(
|
|
18
|
-
() => allFilters.filter((f) => !activeIds.has(f.id)),
|
|
25
|
+
() => allFilters.filter((f) => f.columnKey == null && !activeIds.has(f.id)),
|
|
19
26
|
[allFilters, activeIds]
|
|
20
27
|
);
|
|
21
|
-
const
|
|
28
|
+
const showAdd = !columnSelected && availableFilters.length > 0;
|
|
29
|
+
const hasAnything = columnSorts.length > 0 || activeFilters.size > 0 || showAdd;
|
|
30
|
+
if (!hasAnything) return null;
|
|
22
31
|
return toolbar_module.default("div.filter-bar", [
|
|
23
32
|
toolbar_module.default(
|
|
24
|
-
|
|
25
|
-
|
|
33
|
+
"div.group.sorts",
|
|
34
|
+
columnSorts.map(
|
|
35
|
+
(s) => toolbar_module.default(
|
|
36
|
+
core.Tag,
|
|
37
|
+
{
|
|
38
|
+
key: `sort-${s.key}`,
|
|
39
|
+
icon: s.ascending ? "sort-asc" : "sort-desc",
|
|
40
|
+
intent: "primary",
|
|
41
|
+
minimal: true,
|
|
42
|
+
onRemove() {
|
|
43
|
+
storeAPI.getState().setColumnSort(s.key, null);
|
|
44
|
+
}
|
|
45
|
+
},
|
|
46
|
+
`${s.key}: ${s.ascending ? "Ascending" : "Descending"}`
|
|
47
|
+
)
|
|
48
|
+
)
|
|
49
|
+
),
|
|
50
|
+
toolbar_module.default(
|
|
51
|
+
"div.group.filters",
|
|
26
52
|
Array.from(activeFilters.entries()).map(
|
|
27
53
|
([id, entry]) => toolbar_module.default(ActiveFilterChip, { key: id, filterId: id, entry })
|
|
28
54
|
)
|
|
29
55
|
),
|
|
30
|
-
toolbar_module.default.if(
|
|
56
|
+
toolbar_module.default.if(showAdd)(AddFilterPopover, {
|
|
31
57
|
filters: availableFilters
|
|
32
|
-
})
|
|
33
|
-
toolbar_module.default.if(hasActive)(
|
|
34
|
-
core.Button,
|
|
35
|
-
{
|
|
36
|
-
minimal: true,
|
|
37
|
-
small: true,
|
|
38
|
-
icon: "cross",
|
|
39
|
-
onClick() {
|
|
40
|
-
storeAPI.getState().clearFilters();
|
|
41
|
-
}
|
|
42
|
-
},
|
|
43
|
-
"Clear filters"
|
|
44
|
-
)
|
|
58
|
+
})
|
|
45
59
|
]);
|
|
46
60
|
}
|
|
47
61
|
function ActiveFilterChip({
|
|
@@ -51,6 +65,7 @@ function ActiveFilterChip({
|
|
|
51
65
|
const storeAPI = provider.useStoreAPI();
|
|
52
66
|
const [configOpen, setConfigOpen] = react.useState(false);
|
|
53
67
|
const { filter, state: filterState } = entry;
|
|
68
|
+
const summary = filter.describeState?.(filterState);
|
|
54
69
|
const tag = toolbar_module.default(
|
|
55
70
|
core.Tag,
|
|
56
71
|
{
|
|
@@ -62,7 +77,10 @@ function ActiveFilterChip({
|
|
|
62
77
|
intent: "primary",
|
|
63
78
|
onClick: filter.filterForm ? () => setConfigOpen(!configOpen) : void 0
|
|
64
79
|
},
|
|
65
|
-
|
|
80
|
+
[
|
|
81
|
+
filter.name,
|
|
82
|
+
summary != null && summary !== "" ? toolbar_module.default("span.filter-window", [": ", summary]) : null
|
|
83
|
+
]
|
|
66
84
|
);
|
|
67
85
|
if (filter.filterForm == null) return tag;
|
|
68
86
|
return toolbar_module.default(
|
|
@@ -86,9 +104,7 @@ function ActiveFilterChip({
|
|
|
86
104
|
tag
|
|
87
105
|
);
|
|
88
106
|
}
|
|
89
|
-
function AddFilterPopover({
|
|
90
|
-
filters
|
|
91
|
-
}) {
|
|
107
|
+
function AddFilterPopover({ filters }) {
|
|
92
108
|
const storeAPI = provider.useStoreAPI();
|
|
93
109
|
return toolbar_module.default(
|
|
94
110
|
core.PopoverNext,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filters.cjs","sources":["../../src/actions/filters.ts"],"sourcesContent":["import {\n Button,\n ButtonGroup,\n Menu,\n MenuItem,\n PopoverNext,\n Tag,\n} from \"@blueprintjs/core\";\nimport { useMemo, useState } from \"react\";\nimport h from \"./toolbar.module.sass\";\nimport { useSelector, useStoreAPI } from \"../provider\";\nimport { collectAllFilters } from \"./selection\";\nimport type { TableFilter } from \"./types\";\n\n/**
|
|
1
|
+
{"version":3,"file":"filters.cjs","sources":["../../src/actions/filters.ts"],"sourcesContent":["import {\n Button,\n ButtonGroup,\n Menu,\n MenuItem,\n PopoverNext,\n Tag,\n} from \"@blueprintjs/core\";\nimport { useMemo, useState } from \"react\";\nimport { RegionCardinality } from \"@blueprintjs/table\";\nimport h from \"./toolbar.module.sass\";\nimport { useSelector, useStoreAPI } from \"../provider\";\nimport { collectAllFilters, getSelectionCardinality } from \"./selection\";\nimport type { TableFilter } from \"./types\";\n\n/** The single view-state bar: active **sorts** and **filters** shown as\n * removable tags (filters reconfigurable in place via their `filterForm`). The\n * \"Add filter\" button offers only **table-level** filters (no `columnKey`) and\n * only when no column is selected — per-column filters are added/configured\n * from the column header dropdown instead, so there's no redundancy. */\nexport function FilterBar<T>({ filters = [] }: { filters?: TableFilter<T>[] }) {\n const columnSpec = useSelector((state) => state.columnSpec);\n const storeAPI = useStoreAPI();\n const activeFilters = useSelector((state) => state.activeFilters);\n const columnSorts = useSelector((state) => state.columnSorts);\n const selection = useSelector((state) => state.selection);\n\n const columnSelected =\n getSelectionCardinality(selection) === RegionCardinality.FULL_COLUMNS;\n\n const allFilters = useMemo(\n () => collectAllFilters(filters, columnSpec),\n [filters, columnSpec],\n );\n\n const activeIds = useMemo(\n () => new Set(activeFilters.keys()),\n [activeFilters],\n );\n\n // Only table-level filters are addable from the bar; column filters live in\n // the column header dropdown.\n const availableFilters = useMemo(\n () => allFilters.filter((f) => f.columnKey == null && !activeIds.has(f.id)),\n [allFilters, activeIds],\n );\n const showAdd = !columnSelected && availableFilters.length > 0;\n\n const hasAnything =\n columnSorts.length > 0 || activeFilters.size > 0 || showAdd;\n if (!hasAnything) return null;\n\n return h(\"div.filter-bar\", [\n h(\n \"div.group.sorts\",\n columnSorts.map((s) =>\n h(\n Tag,\n {\n key: `sort-${s.key}`,\n icon: s.ascending ? \"sort-asc\" : \"sort-desc\",\n intent: \"primary\",\n minimal: true,\n onRemove() {\n storeAPI.getState().setColumnSort(s.key, null);\n },\n },\n `${s.key}: ${s.ascending ? \"Ascending\" : \"Descending\"}`,\n ),\n ),\n ),\n h(\n \"div.group.filters\",\n Array.from(activeFilters.entries()).map(([id, entry]) =>\n h(ActiveFilterChip, { key: id, filterId: id, entry }),\n ),\n ),\n h.if(showAdd)(AddFilterPopover, {\n filters: availableFilters,\n }),\n ]);\n}\n\n/** A single active filter displayed as a tag. Clicking opens a popover\n * for reconfiguring the filter; the remove button deactivates it. */\nfunction ActiveFilterChip<T>({\n filterId,\n entry,\n}: {\n filterId: string;\n entry: { filter: TableFilter<T>; state: any };\n}) {\n const storeAPI = useStoreAPI();\n const [configOpen, setConfigOpen] = useState(false);\n const { filter, state: filterState } = entry;\n\n // Summarize the active filter's window (e.g. \"0–250\") next to its name, so\n // the tag conveys not just what is filtered but the current setting.\n const summary = filter.describeState?.(filterState);\n\n const tag = h(\n Tag,\n {\n icon: filter.icon ?? \"filter\",\n onRemove() {\n storeAPI.getState().removeFilter(filterId);\n },\n interactive: true,\n intent: \"primary\",\n onClick: filter.filterForm ? () => setConfigOpen(!configOpen) : undefined,\n },\n [\n filter.name,\n summary != null && summary !== \"\"\n ? h(\"span.filter-window\", [\": \", summary])\n : null,\n ],\n );\n\n if (filter.filterForm == null) return tag;\n\n return h(\n PopoverNext,\n {\n isOpen: configOpen,\n onClose: () => setConfigOpen(false),\n content: h(\"div.filter-config\", [\n h.if(filter.description != null)(\"p.description\", filter.description),\n h(filter.filterForm, {\n state: filterState,\n setState(newState) {\n storeAPI.getState().setFilter(filterId, filter, newState);\n },\n }),\n ]),\n placement: \"bottom-start\",\n enforceFocus: false,\n autoFocus: false,\n },\n tag,\n );\n}\n\n/** Popover menu listing available (not-yet-active) filters. */\nfunction AddFilterPopover<T>({ filters }: { filters: TableFilter<T>[] }) {\n const storeAPI = useStoreAPI();\n\n return h(\n PopoverNext,\n {\n content: h(\n Menu,\n filters.map((f) =>\n h(MenuItem, {\n key: f.id,\n text: f.name,\n icon: f.icon ?? \"filter\",\n onClick() {\n storeAPI.getState().setFilter(f.id, f, f.defaultState);\n },\n }),\n ),\n ),\n placement: \"bottom-start\",\n },\n h(\n Button,\n {\n minimal: true,\n small: true,\n icon: \"filter\",\n },\n \"Add filter\",\n ),\n );\n}\n"],"names":["useSelector","useStoreAPI","selection","getSelectionCardinality","RegionCardinality","useMemo","collectAllFilters","h","Tag","useState","PopoverNext","Menu","MenuItem","Button"],"mappings":"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"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { TableFilter } from './types';
|
|
2
|
-
/**
|
|
3
|
-
*
|
|
2
|
+
/** The single view-state bar: active **sorts** and **filters** shown as
|
|
3
|
+
* removable tags (filters reconfigurable in place via their `filterForm`). The
|
|
4
|
+
* "Add filter" button offers only **table-level** filters (no `columnKey`) and
|
|
5
|
+
* only when no column is selected — per-column filters are added/configured
|
|
6
|
+
* from the column header dropdown instead, so there's no redundancy. */
|
|
4
7
|
export declare function FilterBar<T>({ filters }: {
|
|
5
8
|
filters?: TableFilter<T>[];
|
|
6
|
-
}): import('react').DOMElement<import('react').DOMAttributes<Element>, Element
|
|
9
|
+
}): import('react').DOMElement<import('react').DOMAttributes<Element>, Element> | null;
|
package/dist/actions/filters.js
CHANGED
|
@@ -1,45 +1,59 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Tag, PopoverNext, Menu, MenuItem, Button } from "@blueprintjs/core";
|
|
2
2
|
import { useMemo, useState } from "react";
|
|
3
|
+
import { RegionCardinality } from "@blueprintjs/table";
|
|
3
4
|
import h from "./toolbar.module.sass.js";
|
|
4
5
|
import { useSelector, useStoreAPI } from "../provider.js";
|
|
5
|
-
import { collectAllFilters } from "./selection.js";
|
|
6
|
+
import { getSelectionCardinality, collectAllFilters } from "./selection.js";
|
|
6
7
|
function FilterBar({ filters = [] }) {
|
|
7
8
|
const columnSpec = useSelector((state) => state.columnSpec);
|
|
8
9
|
const storeAPI = useStoreAPI();
|
|
9
10
|
const activeFilters = useSelector((state) => state.activeFilters);
|
|
11
|
+
const columnSorts = useSelector((state) => state.columnSorts);
|
|
12
|
+
const selection = useSelector((state) => state.selection);
|
|
13
|
+
const columnSelected = getSelectionCardinality(selection) === RegionCardinality.FULL_COLUMNS;
|
|
10
14
|
const allFilters = useMemo(
|
|
11
15
|
() => collectAllFilters(filters, columnSpec),
|
|
12
16
|
[filters, columnSpec]
|
|
13
17
|
);
|
|
14
|
-
const activeIds = useMemo(
|
|
18
|
+
const activeIds = useMemo(
|
|
19
|
+
() => new Set(activeFilters.keys()),
|
|
20
|
+
[activeFilters]
|
|
21
|
+
);
|
|
15
22
|
const availableFilters = useMemo(
|
|
16
|
-
() => allFilters.filter((f) => !activeIds.has(f.id)),
|
|
23
|
+
() => allFilters.filter((f) => f.columnKey == null && !activeIds.has(f.id)),
|
|
17
24
|
[allFilters, activeIds]
|
|
18
25
|
);
|
|
19
|
-
const
|
|
26
|
+
const showAdd = !columnSelected && availableFilters.length > 0;
|
|
27
|
+
const hasAnything = columnSorts.length > 0 || activeFilters.size > 0 || showAdd;
|
|
28
|
+
if (!hasAnything) return null;
|
|
20
29
|
return h("div.filter-bar", [
|
|
21
30
|
h(
|
|
22
|
-
|
|
23
|
-
|
|
31
|
+
"div.group.sorts",
|
|
32
|
+
columnSorts.map(
|
|
33
|
+
(s) => h(
|
|
34
|
+
Tag,
|
|
35
|
+
{
|
|
36
|
+
key: `sort-${s.key}`,
|
|
37
|
+
icon: s.ascending ? "sort-asc" : "sort-desc",
|
|
38
|
+
intent: "primary",
|
|
39
|
+
minimal: true,
|
|
40
|
+
onRemove() {
|
|
41
|
+
storeAPI.getState().setColumnSort(s.key, null);
|
|
42
|
+
}
|
|
43
|
+
},
|
|
44
|
+
`${s.key}: ${s.ascending ? "Ascending" : "Descending"}`
|
|
45
|
+
)
|
|
46
|
+
)
|
|
47
|
+
),
|
|
48
|
+
h(
|
|
49
|
+
"div.group.filters",
|
|
24
50
|
Array.from(activeFilters.entries()).map(
|
|
25
51
|
([id, entry]) => h(ActiveFilterChip, { key: id, filterId: id, entry })
|
|
26
52
|
)
|
|
27
53
|
),
|
|
28
|
-
h.if(
|
|
54
|
+
h.if(showAdd)(AddFilterPopover, {
|
|
29
55
|
filters: availableFilters
|
|
30
|
-
})
|
|
31
|
-
h.if(hasActive)(
|
|
32
|
-
Button,
|
|
33
|
-
{
|
|
34
|
-
minimal: true,
|
|
35
|
-
small: true,
|
|
36
|
-
icon: "cross",
|
|
37
|
-
onClick() {
|
|
38
|
-
storeAPI.getState().clearFilters();
|
|
39
|
-
}
|
|
40
|
-
},
|
|
41
|
-
"Clear filters"
|
|
42
|
-
)
|
|
56
|
+
})
|
|
43
57
|
]);
|
|
44
58
|
}
|
|
45
59
|
function ActiveFilterChip({
|
|
@@ -49,6 +63,7 @@ function ActiveFilterChip({
|
|
|
49
63
|
const storeAPI = useStoreAPI();
|
|
50
64
|
const [configOpen, setConfigOpen] = useState(false);
|
|
51
65
|
const { filter, state: filterState } = entry;
|
|
66
|
+
const summary = filter.describeState?.(filterState);
|
|
52
67
|
const tag = h(
|
|
53
68
|
Tag,
|
|
54
69
|
{
|
|
@@ -60,7 +75,10 @@ function ActiveFilterChip({
|
|
|
60
75
|
intent: "primary",
|
|
61
76
|
onClick: filter.filterForm ? () => setConfigOpen(!configOpen) : void 0
|
|
62
77
|
},
|
|
63
|
-
|
|
78
|
+
[
|
|
79
|
+
filter.name,
|
|
80
|
+
summary != null && summary !== "" ? h("span.filter-window", [": ", summary]) : null
|
|
81
|
+
]
|
|
64
82
|
);
|
|
65
83
|
if (filter.filterForm == null) return tag;
|
|
66
84
|
return h(
|
|
@@ -84,9 +102,7 @@ function ActiveFilterChip({
|
|
|
84
102
|
tag
|
|
85
103
|
);
|
|
86
104
|
}
|
|
87
|
-
function AddFilterPopover({
|
|
88
|
-
filters
|
|
89
|
-
}) {
|
|
105
|
+
function AddFilterPopover({ filters }) {
|
|
90
106
|
const storeAPI = useStoreAPI();
|
|
91
107
|
return h(
|
|
92
108
|
PopoverNext,
|