@macrostrat/data-sheet 4.1.0 → 4.2.0

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 (302) hide show
  1. package/CHANGELOG.md +40 -0
  2. package/dist/actions/builtin.cjs +1 -1
  3. package/dist/actions/builtin.cjs.map +1 -1
  4. package/dist/actions/builtin.d.ts +0 -2
  5. package/dist/actions/builtin.js +1 -1
  6. package/dist/actions/builtin.js.map +1 -1
  7. package/dist/actions/clipboard.cjs +1 -1
  8. package/dist/actions/clipboard.cjs.map +1 -1
  9. package/dist/actions/clipboard.d.ts +3 -2
  10. package/dist/actions/clipboard.js +1 -1
  11. package/dist/actions/clipboard.js.map +1 -1
  12. package/dist/actions/column-controls.cjs +7 -184
  13. package/dist/actions/column-controls.cjs.map +1 -1
  14. package/dist/actions/column-controls.d.ts +1 -1
  15. package/dist/actions/column-controls.js +5 -182
  16. package/dist/actions/column-controls.js.map +1 -1
  17. package/dist/actions/column-filter.cjs +24 -50
  18. package/dist/actions/column-filter.cjs.map +1 -1
  19. package/dist/actions/column-filter.d.ts +6 -4
  20. package/dist/actions/column-filter.js +25 -51
  21. package/dist/actions/column-filter.js.map +1 -1
  22. package/dist/actions/context.cjs +147 -0
  23. package/dist/actions/context.cjs.map +1 -0
  24. package/dist/actions/context.d.ts +93 -0
  25. package/dist/actions/context.js +145 -0
  26. package/dist/actions/context.js.map +1 -0
  27. package/dist/actions/edit-actions.cjs.map +1 -1
  28. package/dist/actions/edit-actions.d.ts +3 -1
  29. package/dist/actions/edit-actions.js.map +1 -1
  30. package/dist/actions/index.d.ts +2 -3
  31. package/dist/actions/selection.cjs +70 -115
  32. package/dist/actions/selection.cjs.map +1 -1
  33. package/dist/actions/selection.d.ts +22 -12
  34. package/dist/actions/selection.js +71 -114
  35. package/dist/actions/selection.js.map +1 -1
  36. package/dist/actions/{table-controls.cjs → table-actions.cjs} +7 -24
  37. package/dist/actions/table-actions.cjs.map +1 -0
  38. package/dist/actions/{table-controls.d.ts → table-actions.d.ts} +0 -4
  39. package/dist/actions/{table-controls.js → table-actions.js} +2 -19
  40. package/dist/actions/table-actions.js.map +1 -0
  41. package/dist/actions/types.d.ts +11 -89
  42. package/dist/components/cell-detail.cjs +6 -6
  43. package/dist/components/cell-detail.cjs.map +1 -1
  44. package/dist/components/cell-detail.js +1 -1
  45. package/dist/components/colors.cjs.map +1 -1
  46. package/dist/components/colors.js.map +1 -1
  47. package/dist/components/editor-popup.cjs +7 -7
  48. package/dist/components/editor-popup.cjs.map +1 -1
  49. package/dist/components/editor-popup.js +1 -1
  50. package/dist/components/index.d.ts +2 -1
  51. package/dist/components/indicators/filter-and-sort.cjs +378 -0
  52. package/dist/components/indicators/filter-and-sort.cjs.map +1 -0
  53. package/dist/components/indicators/filter-and-sort.d.ts +59 -0
  54. package/dist/components/indicators/filter-and-sort.js +376 -0
  55. package/dist/components/indicators/filter-and-sort.js.map +1 -0
  56. package/dist/components/indicators/filter-and-sort.module.sass.cjs +16 -0
  57. package/dist/components/indicators/filter-and-sort.module.sass.cjs.map +1 -0
  58. package/dist/components/indicators/filter-and-sort.module.sass.js +14 -0
  59. package/dist/components/indicators/filter-and-sort.module.sass.js.map +1 -0
  60. package/dist/components/indicators/index.d.ts +4 -0
  61. package/dist/components/indicators/selection.cjs +113 -0
  62. package/dist/components/indicators/selection.cjs.map +1 -0
  63. package/dist/components/indicators/selection.d.ts +3 -0
  64. package/dist/components/indicators/selection.js +111 -0
  65. package/dist/components/indicators/selection.js.map +1 -0
  66. package/dist/components/indicators/selection.module.sass.cjs +19 -0
  67. package/dist/components/indicators/selection.module.sass.cjs.map +1 -0
  68. package/dist/components/indicators/selection.module.sass.js +17 -0
  69. package/dist/components/indicators/selection.module.sass.js.map +1 -0
  70. package/dist/components/indicators/unified-filters.cjs +130 -0
  71. package/dist/components/indicators/unified-filters.cjs.map +1 -0
  72. package/dist/components/indicators/unified-filters.d.ts +10 -0
  73. package/dist/components/indicators/unified-filters.js +130 -0
  74. package/dist/components/indicators/unified-filters.js.map +1 -0
  75. package/dist/components/indicators/view-info.cjs +59 -0
  76. package/dist/components/indicators/view-info.cjs.map +1 -0
  77. package/dist/components/{view-info.d.ts → indicators/view-info.d.ts} +1 -0
  78. package/dist/components/{view-info.js → indicators/view-info.js} +17 -13
  79. package/dist/components/indicators/view-info.js.map +1 -0
  80. package/dist/components/text-areas.cjs +5 -5
  81. package/dist/components/text-areas.cjs.map +1 -1
  82. package/dist/components/text-areas.js +1 -1
  83. package/dist/components/toolbars/actions-toolbar.cjs +185 -0
  84. package/dist/components/toolbars/actions-toolbar.cjs.map +1 -0
  85. package/dist/{actions/toolbar.d.ts → components/toolbars/actions-toolbar.d.ts} +9 -5
  86. package/dist/{actions/toolbar.js → components/toolbars/actions-toolbar.js} +36 -97
  87. package/dist/components/toolbars/actions-toolbar.js.map +1 -0
  88. package/dist/components/toolbars/actions-toolbar.module.sass.cjs +29 -0
  89. package/dist/components/toolbars/actions-toolbar.module.sass.cjs.map +1 -0
  90. package/dist/components/toolbars/actions-toolbar.module.sass.js +27 -0
  91. package/dist/components/toolbars/actions-toolbar.module.sass.js.map +1 -0
  92. package/dist/components/toolbars/active-filters.cjs +120 -0
  93. package/dist/components/toolbars/active-filters.cjs.map +1 -0
  94. package/dist/{actions/filters.d.ts → components/toolbars/active-filters.d.ts} +3 -3
  95. package/dist/components/toolbars/active-filters.js +120 -0
  96. package/dist/components/toolbars/active-filters.js.map +1 -0
  97. package/dist/components/toolbars/index.d.ts +2 -0
  98. package/dist/data-panel.cjs +291 -0
  99. package/dist/data-panel.cjs.map +1 -0
  100. package/dist/data-panel.d.ts +110 -0
  101. package/dist/data-panel.js +289 -0
  102. package/dist/data-panel.js.map +1 -0
  103. package/dist/data-panel.module.sass.cjs +40 -0
  104. package/dist/data-panel.module.sass.cjs.map +1 -0
  105. package/dist/data-panel.module.sass.js +38 -0
  106. package/dist/data-panel.module.sass.js.map +1 -0
  107. package/dist/{core.cjs → data-sheet.cjs} +123 -181
  108. package/dist/data-sheet.cjs.map +1 -0
  109. package/dist/data-sheet.css +241 -13
  110. package/dist/data-sheet.d.ts +16 -0
  111. package/dist/{core.js → data-sheet.js} +92 -150
  112. package/dist/data-sheet.js.map +1 -0
  113. package/dist/data-view.cjs +47 -0
  114. package/dist/data-view.cjs.map +1 -0
  115. package/dist/data-view.d.ts +15 -0
  116. package/dist/data-view.js +45 -0
  117. package/dist/data-view.js.map +1 -0
  118. package/dist/filters/operators.cjs +21 -4
  119. package/dist/filters/operators.cjs.map +1 -1
  120. package/dist/filters/operators.d.ts +5 -4
  121. package/dist/filters/operators.js +21 -4
  122. package/dist/filters/operators.js.map +1 -1
  123. package/dist/index.cjs +106 -47
  124. package/dist/index.cjs.map +1 -1
  125. package/dist/index.d.ts +4 -3
  126. package/dist/index.js +76 -17
  127. package/dist/index.js.map +1 -1
  128. package/dist/notifications.cjs +4 -4
  129. package/dist/notifications.cjs.map +1 -1
  130. package/dist/notifications.js +1 -1
  131. package/dist/postgrest-table/data-loaders.cjs +129 -103
  132. package/dist/postgrest-table/data-loaders.cjs.map +1 -1
  133. package/dist/postgrest-table/data-loaders.d.ts +52 -82
  134. package/dist/postgrest-table/data-loaders.js +110 -84
  135. package/dist/postgrest-table/data-loaders.js.map +1 -1
  136. package/dist/postgrest-table/index.cjs +18 -17
  137. package/dist/postgrest-table/index.cjs.map +1 -1
  138. package/dist/postgrest-table/index.d.ts +4 -3
  139. package/dist/postgrest-table/index.js +9 -8
  140. package/dist/postgrest-table/index.js.map +1 -1
  141. package/dist/{utils → provider}/column-spec.cjs +23 -9
  142. package/dist/provider/column-spec.cjs.map +1 -0
  143. package/dist/{utils → provider}/column-spec.d.ts +77 -2
  144. package/dist/{utils → provider}/column-spec.js +24 -10
  145. package/dist/provider/column-spec.js.map +1 -0
  146. package/dist/provider/core.cjs +382 -0
  147. package/dist/provider/core.cjs.map +1 -0
  148. package/dist/provider/core.d.ts +74 -0
  149. package/dist/provider/core.js +380 -0
  150. package/dist/provider/core.js.map +1 -0
  151. package/dist/provider/index.d.ts +7 -0
  152. package/dist/provider/interactions.cjs +128 -0
  153. package/dist/provider/interactions.cjs.map +1 -0
  154. package/dist/provider/interactions.d.ts +39 -0
  155. package/dist/provider/interactions.js +128 -0
  156. package/dist/provider/interactions.js.map +1 -0
  157. package/dist/provider/selection.cjs +29 -0
  158. package/dist/provider/selection.cjs.map +1 -0
  159. package/dist/provider/selection.d.ts +9 -0
  160. package/dist/provider/selection.js +29 -0
  161. package/dist/provider/selection.js.map +1 -0
  162. package/dist/provider/table-data.cjs +92 -0
  163. package/dist/provider/table-data.cjs.map +1 -0
  164. package/dist/provider/table-data.d.ts +81 -0
  165. package/dist/provider/table-data.js +92 -0
  166. package/dist/provider/table-data.js.map +1 -0
  167. package/dist/provider/types.cjs +22 -0
  168. package/dist/provider/types.cjs.map +1 -0
  169. package/dist/provider/types.d.ts +256 -0
  170. package/dist/provider/types.js +22 -0
  171. package/dist/provider/types.js.map +1 -0
  172. package/dist/{zustand-store.cjs → provider/zustand-store.cjs} +37 -23
  173. package/dist/provider/zustand-store.cjs.map +1 -0
  174. package/dist/{zustand-store.js → provider/zustand-store.js} +22 -8
  175. package/dist/provider/zustand-store.js.map +1 -0
  176. package/dist/{cell-renderer.cjs → renderers/cell-renderer.cjs} +68 -35
  177. package/dist/renderers/cell-renderer.cjs.map +1 -0
  178. package/dist/{cell-renderer.d.ts → renderers/cell-renderer.d.ts} +1 -2
  179. package/dist/{cell-renderer.js → renderers/cell-renderer.js} +66 -33
  180. package/dist/renderers/cell-renderer.js.map +1 -0
  181. package/dist/renderers/column-header-cell.cjs +40 -17
  182. package/dist/renderers/column-header-cell.cjs.map +1 -1
  183. package/dist/renderers/column-header-cell.d.ts +2 -2
  184. package/dist/renderers/column-header-cell.js +40 -17
  185. package/dist/renderers/column-header-cell.js.map +1 -1
  186. package/dist/renderers/index.d.ts +1 -0
  187. package/dist/types.cjs +7 -19
  188. package/dist/types.cjs.map +1 -1
  189. package/dist/types.d.ts +123 -226
  190. package/dist/types.js +7 -19
  191. package/dist/types.js.map +1 -1
  192. package/dist/utils/atoms.cjs +24 -0
  193. package/dist/utils/atoms.cjs.map +1 -0
  194. package/dist/utils/atoms.d.ts +4 -0
  195. package/dist/utils/atoms.js +24 -0
  196. package/dist/utils/atoms.js.map +1 -0
  197. package/dist/utils/debug-overlay.cjs.map +1 -1
  198. package/dist/utils/debug-overlay.js.map +1 -1
  199. package/dist/utils/index.d.ts +2 -3
  200. package/dist/utils/key-handling.cjs +140 -139
  201. package/dist/utils/key-handling.cjs.map +1 -1
  202. package/dist/utils/key-handling.d.ts +4 -2
  203. package/dist/utils/key-handling.js +136 -135
  204. package/dist/utils/key-handling.js.map +1 -1
  205. package/dist/utils/validation.cjs +6 -1
  206. package/dist/utils/validation.cjs.map +1 -1
  207. package/dist/utils/validation.d.ts +1 -1
  208. package/dist/utils/validation.js +6 -1
  209. package/dist/utils/validation.js.map +1 -1
  210. package/package.json +4 -3
  211. package/src/actions/builtin.ts +1 -4
  212. package/src/actions/clipboard.ts +4 -3
  213. package/src/actions/column-controls.ts +12 -228
  214. package/src/actions/column-filter.ts +28 -63
  215. package/src/actions/context.ts +299 -0
  216. package/src/actions/edit-actions.ts +3 -1
  217. package/src/actions/index.ts +2 -3
  218. package/src/actions/selection.ts +109 -156
  219. package/src/actions/{table-controls.ts → table-actions.ts} +0 -20
  220. package/src/actions/types.ts +17 -101
  221. package/src/components/colors.ts +1 -1
  222. package/src/components/index.ts +2 -1
  223. package/src/components/indicators/filter-and-sort.module.sass +13 -0
  224. package/src/components/indicators/filter-and-sort.ts +478 -0
  225. package/src/components/indicators/index.ts +4 -0
  226. package/src/components/indicators/selection.module.sass +22 -0
  227. package/src/components/indicators/selection.ts +141 -0
  228. package/src/components/indicators/unified-filters.ts +161 -0
  229. package/src/components/{view-info.ts → indicators/view-info.ts} +16 -27
  230. package/src/{actions/toolbar.module.sass → components/toolbars/actions-toolbar.module.sass} +17 -4
  231. package/src/{actions/toolbar.ts → components/toolbars/actions-toolbar.ts} +53 -126
  232. package/src/components/toolbars/active-filters.ts +150 -0
  233. package/src/components/toolbars/index.ts +2 -0
  234. package/src/data-panel.module.sass +185 -0
  235. package/src/data-panel.ts +556 -0
  236. package/src/{core.ts → data-sheet.ts} +144 -306
  237. package/src/data-view.ts +70 -0
  238. package/src/filters/operators.ts +38 -6
  239. package/src/index.ts +4 -3
  240. package/src/postgrest-table/data-loaders.ts +250 -181
  241. package/src/postgrest-table/index.ts +10 -9
  242. package/src/{utils → provider}/column-spec.ts +34 -15
  243. package/src/provider/core.ts +585 -0
  244. package/src/provider/index.ts +7 -0
  245. package/src/provider/interactions.ts +161 -0
  246. package/src/provider/selection.ts +31 -0
  247. package/src/provider/table-data.ts +178 -0
  248. package/src/provider/types.ts +273 -0
  249. package/src/{zustand-store.ts → provider/zustand-store.ts} +36 -14
  250. package/src/{cell-renderer.ts → renderers/cell-renderer.ts} +146 -58
  251. package/src/renderers/column-header-cell.ts +51 -17
  252. package/src/renderers/index.ts +1 -0
  253. package/src/types.ts +143 -236
  254. package/src/utils/atoms.ts +28 -0
  255. package/src/utils/debug-overlay.ts +1 -1
  256. package/src/utils/index.ts +2 -8
  257. package/src/utils/key-handling.ts +170 -164
  258. package/src/utils/validation.ts +7 -2
  259. package/dist/actions/filters.cjs +0 -139
  260. package/dist/actions/filters.cjs.map +0 -1
  261. package/dist/actions/filters.js +0 -139
  262. package/dist/actions/filters.js.map +0 -1
  263. package/dist/actions/table-controls.cjs.map +0 -1
  264. package/dist/actions/table-controls.js.map +0 -1
  265. package/dist/actions/toolbar.cjs +0 -246
  266. package/dist/actions/toolbar.cjs.map +0 -1
  267. package/dist/actions/toolbar.js.map +0 -1
  268. package/dist/actions/toolbar.module.sass.cjs +0 -27
  269. package/dist/actions/toolbar.module.sass.cjs.map +0 -1
  270. package/dist/actions/toolbar.module.sass.js +0 -25
  271. package/dist/actions/toolbar.module.sass.js.map +0 -1
  272. package/dist/cell-renderer.cjs.map +0 -1
  273. package/dist/cell-renderer.js.map +0 -1
  274. package/dist/components/view-info.cjs +0 -55
  275. package/dist/components/view-info.cjs.map +0 -1
  276. package/dist/components/view-info.js.map +0 -1
  277. package/dist/core.cjs.map +0 -1
  278. package/dist/core.d.ts +0 -113
  279. package/dist/core.js.map +0 -1
  280. package/dist/provider.cjs +0 -191
  281. package/dist/provider.cjs.map +0 -1
  282. package/dist/provider.d.ts +0 -25
  283. package/dist/provider.js +0 -189
  284. package/dist/provider.js.map +0 -1
  285. package/dist/table-updates/data-parameter.d.ts +0 -14
  286. package/dist/table-updates/filter.d.ts +0 -16
  287. package/dist/table-updates/index.d.ts +0 -19
  288. package/dist/utils/column-spec.cjs.map +0 -1
  289. package/dist/utils/column-spec.js.map +0 -1
  290. package/dist/utils/index.cjs +0 -9
  291. package/dist/utils/index.cjs.map +0 -1
  292. package/dist/utils/index.js +0 -9
  293. package/dist/utils/index.js.map +0 -1
  294. package/dist/zustand-store.cjs.map +0 -1
  295. package/dist/zustand-store.js.map +0 -1
  296. package/src/actions/filters.ts +0 -176
  297. package/src/components/actions.module.sass +0 -8
  298. package/src/provider.ts +0 -250
  299. package/src/table-updates/data-parameter.ts +0 -44
  300. package/src/table-updates/filter.ts +0 -124
  301. package/src/table-updates/index.ts +0 -239
  302. /package/dist/{zustand-store.d.ts → provider/zustand-store.d.ts} +0 -0
@@ -1,93 +1,11 @@
1
1
  import h from "@macrostrat/hyper";
2
- import { useMemo } from "react";
3
- import { MenuItem, PopoverNext, Menu, Button } from "@blueprintjs/core";
4
2
  import { RegionCardinality } from "@blueprintjs/table";
5
- import { useStoreAPI, useSelector } from "../provider.js";
6
- import { columnFilter } from "./column-filter.js";
3
+ import { ColumnFilterMenu, ColumnFilterControl, ColumnSortMenu, ColumnSortIndicator } from "../components/indicators/filter-and-sort.js";
7
4
  function selectedColumn(ctx) {
8
5
  const key = ctx.getSelectedColumnKeys()[0];
9
6
  if (key == null) return null;
10
7
  return ctx.columnSpec.find((c) => c.key === key) ?? null;
11
8
  }
12
- function ColumnSortControl({ columnKey }) {
13
- const storeAPI = useStoreAPI();
14
- const sort = useSelector((s) => s.columnSorts.find((x) => x.key === columnKey));
15
- const set = (ascending) => storeAPI.getState().setColumnSort(columnKey, ascending);
16
- const icon = sort == null ? "sort" : sort.ascending ? "sort-asc" : "sort-desc";
17
- const label = sort == null ? "Sort" : sort.ascending ? "Ascending" : "Descending";
18
- return h(
19
- PopoverNext,
20
- {
21
- placement: "bottom-start",
22
- content: h(Menu, [
23
- h(MenuItem, {
24
- key: "asc",
25
- text: "Ascending",
26
- icon: "sort-asc",
27
- active: sort?.ascending === true,
28
- onClick: () => set(true)
29
- }),
30
- h(MenuItem, {
31
- key: "desc",
32
- text: "Descending",
33
- icon: "sort-desc",
34
- active: sort?.ascending === false,
35
- onClick: () => set(false)
36
- }),
37
- h(MenuItem, {
38
- key: "clear",
39
- text: "Clear sort",
40
- icon: "cross",
41
- disabled: sort == null,
42
- onClick: () => set(null)
43
- })
44
- ])
45
- },
46
- h(
47
- Button,
48
- {
49
- small: true,
50
- minimal: true,
51
- icon,
52
- rightIcon: "caret-down",
53
- intent: sort != null ? "primary" : "none"
54
- },
55
- label
56
- )
57
- );
58
- }
59
- function ColumnSortMenu({ columnKey }) {
60
- const storeAPI = useStoreAPI();
61
- const sort = useSelector((s) => s.columnSorts.find((x) => x.key === columnKey));
62
- const toggle = (ascending) => {
63
- const store = storeAPI.getState();
64
- const next = sort != null && sort.ascending === ascending ? null : ascending;
65
- store.setColumnSort(columnKey, next);
66
- };
67
- const icon = sort == null ? "sort" : sort.ascending ? "sort-asc" : "sort-desc";
68
- return h(
69
- MenuItem,
70
- { icon, text: "Sort" },
71
- [
72
- h(MenuItem, {
73
- key: "asc",
74
- icon: "sort-asc",
75
- text: "Ascending",
76
- active: sort?.ascending === true,
77
- shouldDismissPopover: false,
78
- onClick: () => toggle(true)
79
- }),
80
- h(MenuItem, {
81
- key: "desc",
82
- icon: "sort-desc",
83
- text: "Descending",
84
- active: sort?.ascending === false,
85
- shouldDismissPopover: false,
86
- onClick: () => toggle(false)
87
- })
88
- ]
89
- );
90
- }
91
9
  const columnSortAction = {
92
10
  id: "column-sort",
93
11
  name: "Sort",
@@ -99,109 +17,14 @@ const columnSortAction = {
99
17
  render(ctx) {
100
18
  const col = selectedColumn(ctx);
101
19
  if (!col?.sortable) return null;
102
- return h(ColumnSortControl, { columnKey: col.key });
20
+ return h(ColumnSortIndicator, { columnKey: col.key, large: true });
103
21
  },
104
22
  renderMenuItem(ctx) {
105
23
  const col = selectedColumn(ctx);
106
24
  if (!col?.sortable) return null;
107
- return h(ColumnSortMenu, { columnKey: col.key });
25
+ return h(ColumnSortMenu, { columnKey: col.key, defaultLabel: "Sort" });
108
26
  }
109
27
  };
110
- function resolveColumnFilter(col) {
111
- const rich = col.filters?.find(
112
- (f) => (f.columnKey ?? col.key) === col.key
113
- );
114
- if (rich != null) return { ...rich, columnKey: rich.columnKey ?? col.key };
115
- return columnFilter(col);
116
- }
117
- function ColumnFilterControl({ col }) {
118
- const storeAPI = useStoreAPI();
119
- const filter = useMemo(() => resolveColumnFilter(col), [col]);
120
- const state = useSelector((s) => s.activeFilters.get(filter.id)?.state);
121
- const isActive = state != null;
122
- const summary = isActive ? filter.describeState?.(state) : null;
123
- const setState = (next) => {
124
- const store = storeAPI.getState();
125
- if (next == null || next.value === "") {
126
- store.removeFilter(filter.id);
127
- } else {
128
- store.setFilter(filter.id, filter, next);
129
- }
130
- };
131
- const label = isActive ? String(summary ?? filter.name) : "Filter";
132
- return h(
133
- PopoverNext,
134
- {
135
- placement: "bottom-start",
136
- content: h(
137
- "div",
138
- { style: { padding: "6px", minWidth: "220px" } },
139
- filter.filterForm != null ? h(filter.filterForm, {
140
- state: state ?? filter.defaultState,
141
- setState
142
- }) : null
143
- )
144
- },
145
- h(
146
- Button,
147
- {
148
- small: true,
149
- minimal: true,
150
- icon: "filter",
151
- rightIcon: "caret-down",
152
- intent: isActive ? "warning" : "none"
153
- },
154
- label
155
- )
156
- );
157
- }
158
- function applicableColumnFilters(col) {
159
- const result = [];
160
- const rich = col.filters ?? [];
161
- for (const f of rich) {
162
- result.push({ ...f, columnKey: f.columnKey ?? col.key });
163
- }
164
- const hasOwnColumnFilter = result.some((r) => r.columnKey === col.key);
165
- if ((col.filterable === true || typeof col.filterable === "object") && !hasOwnColumnFilter) {
166
- result.push(columnFilter(col));
167
- }
168
- return result;
169
- }
170
- function ColumnFilterMenuItem({ filter }) {
171
- const storeAPI = useStoreAPI();
172
- const state = useSelector((s) => s.activeFilters.get(filter.id)?.state);
173
- const isActive = state != null;
174
- const summary = isActive ? filter.describeState?.(state) : null;
175
- const setState = (next) => {
176
- const store = storeAPI.getState();
177
- if (next == null || next.value === "") {
178
- store.removeFilter(filter.id);
179
- } else {
180
- store.setFilter(filter.id, filter, next);
181
- }
182
- };
183
- return h(
184
- MenuItem,
185
- {
186
- icon: filter.icon ?? "filter",
187
- text: filter.name,
188
- label: summary != null ? String(summary) : void 0,
189
- intent: isActive ? "warning" : void 0,
190
- shouldDismissPopover: false
191
- },
192
- filter.filterForm != null ? h(
193
- "div.filter-menu-form",
194
- { style: { padding: "6px", minWidth: "220px" } },
195
- h(filter.filterForm, { state: state ?? filter.defaultState, setState })
196
- ) : null
197
- );
198
- }
199
- function ColumnFilterMenu({ col }) {
200
- const filters = useMemo(() => applicableColumnFilters(col), [col]);
201
- return h(
202
- filters.map((f) => h(ColumnFilterMenuItem, { key: f.id, filter: f }))
203
- );
204
- }
205
28
  const columnFilterAction = {
206
29
  id: "column-filter",
207
30
  name: "Filter",
@@ -224,8 +47,8 @@ function isColumnFilterable(col) {
224
47
  return col.filterable === true || typeof col.filterable === "object" || Array.isArray(col.filters) && col.filters.length > 0;
225
48
  }
226
49
  const columnControlActions = [
227
- columnSortAction,
228
- columnFilterAction
50
+ columnFilterAction,
51
+ columnSortAction
229
52
  ];
230
53
  export {
231
54
  columnControlActions,
@@ -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 { RegionCardinality } from \"@blueprintjs/table\";\nimport type { TableAction } from \"./types\";\nimport type { ColumnSpec } from \"../provider\";\nimport { TableActionContext } from \"./context.ts\";\nimport {\n ColumnFilterControl,\n ColumnFilterMenu,\n ColumnSortIndicator,\n ColumnSortMenu,\n} from \"../components\";\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\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(ColumnSortIndicator, { columnKey: col.key, large: true });\n },\n renderMenuItem(ctx) {\n const col = selectedColumn(ctx);\n if (!col?.sortable) return null;\n return h(ColumnSortMenu, { columnKey: col.key, defaultLabel: \"Sort\" });\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 columnFilterAction,\n columnSortAction,\n];\n"],"names":[],"mappings":";;;AAmBA,SAAS,eAAe,KAAyB;AAC/C,QAAM,MAAM,IAAI,sBAAA,EAAwB,CAAC;AACzC,MAAI,OAAO,KAAM,QAAO;AACxB,SAAO,IAAI,WAAW,KAAK,CAAC,MAAM,EAAE,QAAQ,GAAG,KAAK;AACtD;AAKO,MAAM,mBAAgC;AAAA,EAC3C,IAAI;AAAA,EACJ,MAAM;AAAA,EACN,MAAM;AAAA,EACN,SAAS,CAAC,kBAAkB,YAAY;AAAA,EACxC,kBAAkB;AAAA;AAAA,EAElB,WAAW,CAAC,QAAQ,IAAI,aAAa;AAAA,EACrC,OAAO,KAAK;AACV,UAAM,MAAM,eAAe,GAAG;AAC9B,QAAI,CAAC,KAAK,SAAU,QAAO;AAC3B,WAAO,EAAE,qBAAqB,EAAE,WAAW,IAAI,KAAK,OAAO,MAAM;AAAA,EACnE;AAAA,EACA,eAAe,KAAK;AAClB,UAAM,MAAM,eAAe,GAAG;AAC9B,QAAI,CAAC,KAAK,SAAU,QAAO;AAC3B,WAAO,EAAE,gBAAgB,EAAE,WAAW,IAAI,KAAK,cAAc,QAAQ;AAAA,EACvE;AACF;AAGO,MAAM,qBAAkC;AAAA,EAC7C,IAAI;AAAA,EACJ,MAAM;AAAA,EACN,MAAM;AAAA,EACN,SAAS,CAAC,kBAAkB,YAAY;AAAA,EACxC,kBAAkB;AAAA,EAClB,WAAW,CAAC,QAAQ,IAAI,aAAa;AAAA,EACrC,OAAO,KAAK;AACV,UAAM,MAAM,eAAe,GAAG;AAC9B,QAAI,OAAO,QAAQ,CAAC,mBAAmB,GAAG,EAAG,QAAO;AACpD,WAAO,EAAE,qBAAqB,EAAE,KAAK;AAAA,EACvC;AAAA,EACA,eAAe,KAAK;AAClB,UAAM,MAAM,eAAe,GAAG;AAC9B,QAAI,OAAO,QAAQ,CAAC,mBAAmB,GAAG,EAAG,QAAO;AACpD,WAAO,EAAE,kBAAkB,EAAE,KAAK;AAAA,EACpC;AACF;AAIO,SAAS,mBAAmB,KAA0B;AAC3D,SACE,IAAI,eAAe,QACnB,OAAO,IAAI,eAAe,YACzB,MAAM,QAAQ,IAAI,OAAO,KAAK,IAAI,QAAQ,SAAS;AAExD;AAGO,MAAM,uBAAsC;AAAA,EACjD;AAAA,EACA;AACF;"}
@@ -1,68 +1,42 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
3
3
  const h$1 = require("@macrostrat/hyper");
4
- const react = require("react");
5
- const core = require("@blueprintjs/core");
6
4
  const operators = require("../filters/operators.cjs");
5
+ const filterAndSort = require("../components/indicators/filter-and-sort.cjs");
7
6
  const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
8
7
  const h__default = /* @__PURE__ */ _interopDefault(h$1);
9
8
  const h = h__default.default;
10
9
  function columnFilterId(key) {
11
10
  return `column-filter:${key}`;
12
11
  }
13
- function columnFilter(col) {
12
+ function buildMultiOperatorColumnFilter(col) {
14
13
  const operators$1 = operators.getOperatorsForColumn(col);
15
- return {
16
- id: columnFilterId(col.key),
17
- name: col.name,
14
+ return enhanceColumnFilter(col, {
15
+ id: "default",
18
16
  icon: "filter",
19
- columnKey: col.key,
20
17
  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
- };
18
+ describeState: (s) => {
19
+ const val = s?.value;
20
+ if (val == null || val === "") return null;
21
+ const op = operators.OPERATOR_LABELS[s.operator] ?? s.operator;
22
+ return `${op} ${val}`;
23
+ },
24
+ predicate: (row, s) => {
25
+ return operators.testFilterOperator(row?.[col.key], s.operator, s.value);
26
+ },
27
+ filterForm: ({ state, setState }) => h(filterAndSort.ColumnFilterForm, { operators: operators$1, state, setState })
28
+ });
25
29
  }
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 });
30
+ function enhanceColumnFilter(col, f) {
31
+ return {
32
+ ...f,
33
+ id: `column-filter:${col.key}:${f.id}`,
34
+ name: f.name ?? col.name,
35
+ subject: col.name,
36
+ columnKey: col.key
35
37
  };
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
38
  }
66
- exports.columnFilter = columnFilter;
39
+ exports.buildMultiOperatorColumnFilter = buildMultiOperatorColumnFilter;
67
40
  exports.columnFilterId = columnFilterId;
41
+ exports.enhanceColumnFilter = enhanceColumnFilter;
68
42
  //# sourceMappingURL=column-filter.cjs.map
@@ -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 type { ColumnSpec } from \"../provider/column-spec.ts\";\nimport type { ColumnFilterOptions, TableFilter } from \"./types\";\nimport {\n FilterOperator,\n getOperatorsForColumn,\n OPERATOR_LABELS,\n testFilterOperator,\n} from \"../filters/operators\";\nimport { ColumnFilterForm } from \"../components\";\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/** Built-in column filter for a column. */\nexport function buildMultiOperatorColumnFilter(\n col: ColumnSpec,\n): TableFilter<any, ColumnFilterState> {\n const operators = getOperatorsForColumn(col);\n return enhanceColumnFilter(col, {\n id: \"default\",\n icon: \"filter\",\n defaultState: { operator: operators[0], value: \"\" },\n describeState: (s) => {\n const val = s?.value;\n if (val == null || val === \"\") return null;\n const op = OPERATOR_LABELS[s.operator] ?? s.operator;\n return `${op} ${val}`;\n },\n predicate: (row, s) => {\n return testFilterOperator(row?.[col.key], s.operator, s.value);\n },\n filterForm: ({ state, setState }) =>\n h(ColumnFilterForm, { operators, state, setState }),\n });\n}\n\n/** Enhance column filter into a full TableFilter object. */\nexport function enhanceColumnFilter(\n col: ColumnSpec,\n f: ColumnFilterOptions,\n): TableFilter<any, ColumnFilterState> {\n return {\n ...f,\n id: `column-filter:${col.key}:${f.id}`,\n name: f.name ?? col.name,\n subject: col.name,\n columnKey: col.key,\n };\n}\n"],"names":["hyper","operators","getOperatorsForColumn","OPERATOR_LABELS","testFilterOperator","ColumnFilterForm"],"mappings":";;;;;;;AAqBA,MAAM,IAAIA,WAAAA;AAQH,SAAS,eAAe,KAAqB;AAClD,SAAO,iBAAiB,GAAG;AAC7B;AAGO,SAAS,+BACd,KACqC;AACrC,QAAMC,cAAYC,UAAAA,sBAAsB,GAAG;AAC3C,SAAO,oBAAoB,KAAK;AAAA,IAC9B,IAAI;AAAA,IACJ,MAAM;AAAA,IACN,cAAc,EAAE,UAAUD,YAAU,CAAC,GAAG,OAAO,GAAA;AAAA,IAC/C,eAAe,CAAC,MAAM;AACpB,YAAM,MAAM,GAAG;AACf,UAAI,OAAO,QAAQ,QAAQ,GAAI,QAAO;AACtC,YAAM,KAAKE,UAAAA,gBAAgB,EAAE,QAAQ,KAAK,EAAE;AAC5C,aAAO,GAAG,EAAE,IAAI,GAAG;AAAA,IACrB;AAAA,IACA,WAAW,CAAC,KAAK,MAAM;AACrB,aAAOC,UAAAA,mBAAmB,MAAM,IAAI,GAAG,GAAG,EAAE,UAAU,EAAE,KAAK;AAAA,IAC/D;AAAA,IACA,YAAY,CAAC,EAAE,OAAO,SAAA,MACpB,EAAEC,cAAAA,kBAAkB,EAAA,WAAEJ,aAAW,OAAO,SAAA,CAAU;AAAA,EAAA,CACrD;AACH;AAGO,SAAS,oBACd,KACA,GACqC;AACrC,SAAO;AAAA,IACL,GAAG;AAAA,IACH,IAAI,iBAAiB,IAAI,GAAG,IAAI,EAAE,EAAE;AAAA,IACpC,MAAM,EAAE,QAAQ,IAAI;AAAA,IACpB,SAAS,IAAI;AAAA,IACb,WAAW,IAAI;AAAA,EAAA;AAEnB;;;;"}
@@ -1,5 +1,5 @@
1
- import { ColumnSpec } from '../utils/column-spec';
2
- import { TableFilter } from './types';
1
+ import { ColumnSpec } from '../provider/column-spec.ts';
2
+ import { ColumnFilterOptions, TableFilter } from './types';
3
3
  import { FilterOperator } from '../filters/operators';
4
4
  export interface ColumnFilterState {
5
5
  operator: FilterOperator;
@@ -7,5 +7,7 @@ export interface ColumnFilterState {
7
7
  }
8
8
  /** Stable filter id for a column's built-in operator filter. */
9
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>;
10
+ /** Built-in column filter for a column. */
11
+ export declare function buildMultiOperatorColumnFilter(col: ColumnSpec): TableFilter<any, ColumnFilterState>;
12
+ /** Enhance column filter into a full TableFilter object. */
13
+ export declare function enhanceColumnFilter(col: ColumnSpec, f: ColumnFilterOptions): TableFilter<any, ColumnFilterState>;
@@ -1,66 +1,40 @@
1
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";
2
+ import { getOperatorsForColumn, testFilterOperator, OPERATOR_LABELS } from "../filters/operators.js";
3
+ import { ColumnFilterForm } from "../components/indicators/filter-and-sort.js";
5
4
  const h = h$1;
6
5
  function columnFilterId(key) {
7
6
  return `column-filter:${key}`;
8
7
  }
9
- function columnFilter(col) {
8
+ function buildMultiOperatorColumnFilter(col) {
10
9
  const operators = getOperatorsForColumn(col);
11
- return {
12
- id: columnFilterId(col.key),
13
- name: col.name,
10
+ return enhanceColumnFilter(col, {
11
+ id: "default",
14
12
  icon: "filter",
15
- columnKey: col.key,
16
13
  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),
14
+ describeState: (s) => {
15
+ const val = s?.value;
16
+ if (val == null || val === "") return null;
17
+ const op = OPERATOR_LABELS[s.operator] ?? s.operator;
18
+ return `${op} ${val}`;
19
+ },
20
+ predicate: (row, s) => {
21
+ return testFilterOperator(row?.[col.key], s.operator, s.value);
22
+ },
19
23
  filterForm: ({ state, setState }) => h(ColumnFilterForm, { operators, state, setState })
20
- };
24
+ });
21
25
  }
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 });
26
+ function enhanceColumnFilter(col, f) {
27
+ return {
28
+ ...f,
29
+ id: `column-filter:${col.key}:${f.id}`,
30
+ name: f.name ?? col.name,
31
+ subject: col.name,
32
+ columnKey: col.key
31
33
  };
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
34
  }
62
35
  export {
63
- columnFilter,
64
- columnFilterId
36
+ buildMultiOperatorColumnFilter,
37
+ columnFilterId,
38
+ enhanceColumnFilter
65
39
  };
66
40
  //# sourceMappingURL=column-filter.js.map
@@ -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 type { ColumnSpec } from \"../provider/column-spec.ts\";\nimport type { ColumnFilterOptions, TableFilter } from \"./types\";\nimport {\n FilterOperator,\n getOperatorsForColumn,\n OPERATOR_LABELS,\n testFilterOperator,\n} from \"../filters/operators\";\nimport { ColumnFilterForm } from \"../components\";\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/** Built-in column filter for a column. */\nexport function buildMultiOperatorColumnFilter(\n col: ColumnSpec,\n): TableFilter<any, ColumnFilterState> {\n const operators = getOperatorsForColumn(col);\n return enhanceColumnFilter(col, {\n id: \"default\",\n icon: \"filter\",\n defaultState: { operator: operators[0], value: \"\" },\n describeState: (s) => {\n const val = s?.value;\n if (val == null || val === \"\") return null;\n const op = OPERATOR_LABELS[s.operator] ?? s.operator;\n return `${op} ${val}`;\n },\n predicate: (row, s) => {\n return testFilterOperator(row?.[col.key], s.operator, s.value);\n },\n filterForm: ({ state, setState }) =>\n h(ColumnFilterForm, { operators, state, setState }),\n });\n}\n\n/** Enhance column filter into a full TableFilter object. */\nexport function enhanceColumnFilter(\n col: ColumnSpec,\n f: ColumnFilterOptions,\n): TableFilter<any, ColumnFilterState> {\n return {\n ...f,\n id: `column-filter:${col.key}:${f.id}`,\n name: f.name ?? col.name,\n subject: col.name,\n columnKey: col.key,\n };\n}\n"],"names":["hyper"],"mappings":";;;AAqBA,MAAM,IAAIA;AAQH,SAAS,eAAe,KAAqB;AAClD,SAAO,iBAAiB,GAAG;AAC7B;AAGO,SAAS,+BACd,KACqC;AACrC,QAAM,YAAY,sBAAsB,GAAG;AAC3C,SAAO,oBAAoB,KAAK;AAAA,IAC9B,IAAI;AAAA,IACJ,MAAM;AAAA,IACN,cAAc,EAAE,UAAU,UAAU,CAAC,GAAG,OAAO,GAAA;AAAA,IAC/C,eAAe,CAAC,MAAM;AACpB,YAAM,MAAM,GAAG;AACf,UAAI,OAAO,QAAQ,QAAQ,GAAI,QAAO;AACtC,YAAM,KAAK,gBAAgB,EAAE,QAAQ,KAAK,EAAE;AAC5C,aAAO,GAAG,EAAE,IAAI,GAAG;AAAA,IACrB;AAAA,IACA,WAAW,CAAC,KAAK,MAAM;AACrB,aAAO,mBAAmB,MAAM,IAAI,GAAG,GAAG,EAAE,UAAU,EAAE,KAAK;AAAA,IAC/D;AAAA,IACA,YAAY,CAAC,EAAE,OAAO,SAAA,MACpB,EAAE,kBAAkB,EAAE,WAAW,OAAO,SAAA,CAAU;AAAA,EAAA,CACrD;AACH;AAGO,SAAS,oBACd,KACA,GACqC;AACrC,SAAO;AAAA,IACL,GAAG;AAAA,IACH,IAAI,iBAAiB,IAAI,GAAG,IAAI,EAAE,EAAE;AAAA,IACpC,MAAM,EAAE,QAAQ,IAAI;AAAA,IACpB,SAAS,IAAI;AAAA,IACb,WAAW,IAAI;AAAA,EAAA;AAEnB;"}