@react-fabric/searchbar 1.0.0-beta.9 → 1.0.2

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 (54) hide show
  1. package/dist/cjs/filterbar/Context.js +1 -1
  2. package/dist/cjs/filterbar/FilterBar.js +28 -23
  3. package/dist/cjs/filterbar/FilterEdit.js +7 -4
  4. package/dist/cjs/filterbar/FilterForm.js +177 -64
  5. package/dist/cjs/filterbar/FilterMenu.js +23 -12
  6. package/dist/cjs/filterbar/FilterTag.js +30 -20
  7. package/dist/cjs/filterbar/FilterView.js +11 -6
  8. package/dist/cjs/filterbar/QueryForm.js +47 -24
  9. package/dist/cjs/i18n/{ar.json.js → ar/searchbar.json.js} +43 -39
  10. package/dist/cjs/i18n/{en.json.js → en/searchbar.json.js} +43 -39
  11. package/dist/cjs/i18n/index.js +4 -4
  12. package/dist/cjs/index.js +28 -0
  13. package/dist/cjs/searchbar/SearchBar.js +58 -16
  14. package/dist/cjs/types/index.js +13 -4
  15. package/dist/esm/filterbar/Context.js +2 -2
  16. package/dist/esm/filterbar/FilterBar.js +30 -25
  17. package/dist/esm/filterbar/FilterEdit.js +7 -4
  18. package/dist/esm/filterbar/FilterForm.js +181 -68
  19. package/dist/esm/filterbar/FilterMenu.js +24 -13
  20. package/dist/esm/filterbar/FilterTag.js +32 -22
  21. package/dist/esm/filterbar/FilterView.js +11 -6
  22. package/dist/esm/filterbar/QueryForm.js +48 -25
  23. package/dist/esm/i18n/{ar.json.js → ar/searchbar.json.js} +43 -39
  24. package/dist/esm/i18n/{en.json.js → en/searchbar.json.js} +43 -39
  25. package/dist/esm/i18n/index.js +2 -2
  26. package/dist/esm/index.js +30 -0
  27. package/dist/esm/searchbar/SearchBar.js +59 -17
  28. package/dist/esm/types/index.js +13 -4
  29. package/dist/types/filterbar/Context.d.ts +2 -3
  30. package/dist/types/filterbar/FilterBar.d.ts +23 -1
  31. package/dist/types/filterbar/FilterEdit.d.ts +2 -2
  32. package/dist/types/filterbar/FilterForm.d.ts +3 -3
  33. package/dist/types/filterbar/FilterMenu.d.ts +3 -2
  34. package/dist/types/filterbar/FilterTag.d.ts +3 -2
  35. package/dist/types/filterbar/FilterView.d.ts +2 -2
  36. package/dist/types/filterbar/QueryForm.d.ts +2 -2
  37. package/dist/types/index.d.ts +27 -1
  38. package/dist/types/searchbar/SearchBar.d.ts +30 -1
  39. package/dist/types/types/index.d.ts +23 -14
  40. package/package.json +16 -19
  41. package/src/filterbar/Context.tsx +5 -5
  42. package/src/filterbar/FilterBar.tsx +58 -75
  43. package/src/filterbar/FilterEdit.tsx +9 -16
  44. package/src/filterbar/FilterForm.tsx +149 -91
  45. package/src/filterbar/FilterMenu.tsx +29 -16
  46. package/src/filterbar/FilterTag.tsx +30 -43
  47. package/src/filterbar/FilterView.tsx +13 -24
  48. package/src/filterbar/QueryForm.tsx +26 -43
  49. package/src/i18n/{ar.json → ar/searchbar.json} +43 -39
  50. package/src/i18n/{en.json → en/searchbar.json} +43 -39
  51. package/src/i18n/index.ts +2 -2
  52. package/src/index.ts +23 -18
  53. package/src/searchbar/SearchBar.tsx +67 -40
  54. package/src/types/index.ts +38 -70
package/dist/cjs/index.js CHANGED
@@ -5,9 +5,37 @@ var FilterBar = require('./filterbar/FilterBar.js');
5
5
  var SearchBar = require('./searchbar/SearchBar.js');
6
6
  var index = require('./types/index.js');
7
7
 
8
+ /**
9
+ * React Fabric
10
+ * @version 1.0.0
11
+ * @license MIT
12
+ * @copyright 2024 Adarsh Pastakia
13
+ *
14
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
15
+ * of this software and associated documentation files (the "Software"), to deal
16
+ * in the Software without restriction, including without limitation the rights
17
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
18
+ * copies of the Software, and to permit persons to whom the Software is
19
+ * furnished to do so, subject to the following conditions:
20
+ *
21
+ * The above copyright notice and this permission notice shall be included in all
22
+ * copies or substantial portions of the Software.
23
+ *
24
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
25
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
26
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
27
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
28
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
29
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
30
+ * SOFTWARE.
31
+ */
8
32
 
33
+ var SEARCHBAR_PACKAGE = "@react-fabric/searchbar";
34
+ var SEARCHBAR_VERSION = "1.0.0";
9
35
 
10
36
  exports.FilterBar = FilterBar.FilterBar;
11
37
  exports.SearchBar = SearchBar.SearchBar;
12
38
  exports.FIELD_TYPE = index.FIELD_TYPE;
13
39
  exports.OPERATOR = index.OPERATOR;
40
+ exports.SEARCHBAR_PACKAGE = SEARCHBAR_PACKAGE;
41
+ exports.SEARCHBAR_VERSION = SEARCHBAR_VERSION;
@@ -12,10 +12,39 @@ var reactI18next = require('react-i18next');
12
12
  var FilterBar = require('../filterbar/FilterBar.js');
13
13
  var jsxRuntime = require('react/jsx-runtime');
14
14
 
15
- var _excluded = ["historyKey", "historyCount", "defaultQueryList", "prepend", "append", "decorateEnd", "decorateStart", "children", "hideFilters", "defaultCollapsed", "disabled", "onCollapsed", "onQuery", "onSearch", "query", "multiple", "filters"];
15
+ var _excluded = ["historyKey", "historyCount", "defaultQueryList", "prepend", "append", "decorateEnd", "decorateStart", "children", "hideFilters", "defaultCollapsed", "disabled", "onSearch", "query", "ref", "multiple", "filters"];
16
16
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
17
- function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
18
- var SearchBar = function SearchBar(_ref) {
17
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
18
+ /**
19
+ * This component provides a search input with autocomplete functionality,
20
+ * a button to trigger search, and an optional filter bar.
21
+ * It supports history of search queries, multiple selection, and custom decorations.
22
+ * It can be collapsed to hide filters and has options for customization.
23
+ *
24
+ * @example
25
+ * ```jsx
26
+ * <SearchBar
27
+ * historyKey="myApp:searchHistory"
28
+ * historyCount={10}
29
+ * defaultQueryList={["example", "test"]}
30
+ * prepend={<span>Prepend</span>}
31
+ * append={<span>Append</span>}
32
+ * decorateEnd={<span>End Decoration</span>}
33
+ * decorateStart={<span>Start Decoration</span>}
34
+ * hideFilters={false}
35
+ * defaultCollapsed={false}
36
+ * disabled={false}
37
+ * onCollapsed={(collapsed) => console.log("Collapsed:", collapsed)}
38
+ * onQuery={(query) => console.log("Query:", query)}
39
+ * onSearch={({ query, filters }) => console.log("Search:", query, filters)}
40
+ * query={""}
41
+ * ref={searchInputRef}
42
+ * multiple={false}
43
+ * filters={[{ name: "filter1", value: "value1" }]}
44
+ * />
45
+ * ```
46
+ */
47
+ function SearchBar(_ref) {
19
48
  var _ref$historyKey = _ref.historyKey,
20
49
  historyKey = _ref$historyKey === void 0 ? "ruf:search" : _ref$historyKey,
21
50
  _ref$historyCount = _ref.historyCount,
@@ -28,12 +57,11 @@ var SearchBar = function SearchBar(_ref) {
28
57
  children = _ref.children,
29
58
  hideFilters = _ref.hideFilters,
30
59
  _ref$defaultCollapsed = _ref.defaultCollapsed,
31
- defaultCollapsed = _ref$defaultCollapsed === void 0 ? false : _ref$defaultCollapsed;
32
- _ref.disabled;
33
- _ref.onCollapsed;
34
- _ref.onQuery;
35
- var onSearch = _ref.onSearch,
60
+ defaultCollapsed = _ref$defaultCollapsed === void 0 ? false : _ref$defaultCollapsed,
61
+ disabled = _ref.disabled,
62
+ onSearch = _ref.onSearch,
36
63
  query = _ref.query,
64
+ ref = _ref.ref,
37
65
  multiple = _ref.multiple,
38
66
  _ref$filters = _ref.filters,
39
67
  filters = _ref$filters === void 0 ? utilities.EMPTY_ARRAY : _ref$filters,
@@ -44,7 +72,9 @@ var SearchBar = function SearchBar(_ref) {
44
72
  _useLocalStorage2 = _slicedToArray(_useLocalStorage, 2),
45
73
  history = _useLocalStorage2[0],
46
74
  setHistory = _useLocalStorage2[1];
47
- var _useState = react.useState(defaultCollapsed),
75
+ var _useState = react.useState(function () {
76
+ return defaultCollapsed;
77
+ }),
48
78
  _useState2 = _slicedToArray(_useState, 2),
49
79
  collapsed = _useState2[0],
50
80
  setCollapsed = _useState2[1];
@@ -52,6 +82,10 @@ var SearchBar = function SearchBar(_ref) {
52
82
  return multiple ? utilities.EMPTY_ARRAY : "";
53
83
  }, [multiple]);
54
84
  var fireSearch = core.useDebounce(function (query, filters) {
85
+ dispatch({
86
+ type: "dirty",
87
+ dirty: false
88
+ });
55
89
  onSearch === null || onSearch === void 0 || onSearch({
56
90
  query: query,
57
91
  filters: filters
@@ -60,6 +94,7 @@ var SearchBar = function SearchBar(_ref) {
60
94
  var _useReducer = react.useReducer(function (state, action) {
61
95
  if (action.type === "reset") {
62
96
  return _objectSpread(_objectSpread({}, state), {}, {
97
+ dirty: false,
63
98
  query: action.query,
64
99
  filters: action.filters
65
100
  });
@@ -71,9 +106,9 @@ var SearchBar = function SearchBar(_ref) {
71
106
  }
72
107
  if (action.type === "query") {
73
108
  var _action$query, _action$query2;
74
- !multiple && fireSearch((_action$query = action.query) !== null && _action$query !== void 0 ? _action$query : emptyValue, state.filters);
109
+ if (!multiple) fireSearch((_action$query = action.query) !== null && _action$query !== void 0 ? _action$query : emptyValue, state.filters);
75
110
  return _objectSpread(_objectSpread({}, state), {}, {
76
- dirty: false,
111
+ dirty: !!multiple,
77
112
  query: (_action$query2 = action.query) !== null && _action$query2 !== void 0 ? _action$query2 : emptyValue
78
113
  });
79
114
  }
@@ -123,8 +158,12 @@ var SearchBar = function SearchBar(_ref) {
123
158
  "data-inner": true,
124
159
  className: "flex-1",
125
160
  children: [!hideFilters && /*#__PURE__*/jsxRuntime.jsx(core.Button, {
126
- variant: "link",
127
- badge: filters.length,
161
+ color: "primary",
162
+ variant: collapsed ? "soft" : "link",
163
+ altIcon: /*#__PURE__*/jsxRuntime.jsx(core.Badge, {
164
+ inline: true,
165
+ value: filters.length
166
+ }),
128
167
  onClick: function onClick() {
129
168
  return setCollapsed(!collapsed);
130
169
  },
@@ -132,6 +171,8 @@ var SearchBar = function SearchBar(_ref) {
132
171
  }), prepend, /*#__PURE__*/jsxRuntime.jsx(form.AutoComplete, {
133
172
  allowClear: true,
134
173
  expandOnEdit: true,
174
+ ref: ref,
175
+ disabled: disabled,
135
176
  multiple: multiple,
136
177
  history: history,
137
178
  value: state.query,
@@ -140,11 +181,11 @@ var SearchBar = function SearchBar(_ref) {
140
181
  onInput: function onInput() {
141
182
  return dispatch({
142
183
  type: "dirty",
143
- dirty: true
184
+ dirty: !multiple
144
185
  });
145
186
  },
146
187
  onSelect: updateHistory,
147
- "data-testid": "searchbar-input",
188
+ "data-ref": "searchbarInput",
148
189
  onEnterPressed: function onEnterPressed() {
149
190
  return fireSearch(state.query, state.filters);
150
191
  }
@@ -158,10 +199,11 @@ var SearchBar = function SearchBar(_ref) {
158
199
  })]
159
200
  }), children]
160
201
  }), !hideFilters && !collapsed && /*#__PURE__*/jsxRuntime.jsx(FilterBar.FilterBar, _objectSpread(_objectSpread({}, filterProps), {}, {
202
+ disabled: disabled,
161
203
  filters: state.filters,
162
204
  onFilterChanged: handleFilterChange
163
205
  }))]
164
206
  });
165
- };
207
+ }
166
208
 
167
209
  exports.SearchBar = SearchBar;
@@ -29,21 +29,27 @@ var _OperatorValueType;
29
29
  var FIELD_TYPE = /*#__PURE__*/function (FIELD_TYPE) {
30
30
  FIELD_TYPE["ID"] = "ID";
31
31
  FIELD_TYPE["STRING"] = "STRING";
32
+ FIELD_TYPE["TEXT"] = "TEXT";
32
33
  FIELD_TYPE["NUMBER"] = "NUMBER";
33
34
  FIELD_TYPE["DECIMAL"] = "DECIMAL";
34
35
  FIELD_TYPE["BOOLEAN"] = "BOOLEAN";
36
+ FIELD_TYPE["DATE"] = "DATE";
37
+ FIELD_TYPE["DATETIME"] = "DATETIME";
38
+ // GEO = "GEO",
35
39
  FIELD_TYPE["NONE"] = "NONE";
36
40
  return FIELD_TYPE;
37
41
  }({});
38
42
  var OPERATOR = /*#__PURE__*/function (OPERATOR) {
39
43
  OPERATOR["EXISTS"] = "EXISTS";
40
44
  OPERATOR["IS"] = "IS";
41
- OPERATOR["IN"] = "IN";
45
+ OPERATOR["ALL"] = "ALL";
46
+ OPERATOR["ANY"] = "ANY";
47
+ OPERATOR["EQ"] = "EQ";
42
48
  OPERATOR["LT"] = "LT";
43
49
  OPERATOR["GT"] = "GT";
44
50
  OPERATOR["LTE"] = "LTE";
45
51
  OPERATOR["GTE"] = "GTE";
46
- OPERATOR["INCLUDES"] = "INCLUDES";
52
+ OPERATOR["LIKE"] = "LIKE";
47
53
  OPERATOR["STARTS"] = "STARTS";
48
54
  OPERATOR["ENDS"] = "ENDS";
49
55
  OPERATOR["WITHIN"] = "WITHIN";
@@ -54,12 +60,15 @@ var OPERATOR = /*#__PURE__*/function (OPERATOR) {
54
60
  /**
55
61
  * @internal
56
62
  */
57
- var TypeOperators = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, FIELD_TYPE.ID, [OPERATOR.IS, OPERATOR.IN]), FIELD_TYPE.STRING, [OPERATOR.EXISTS, OPERATOR.IS, OPERATOR.IN, OPERATOR.INCLUDES, OPERATOR.STARTS, OPERATOR.ENDS]), FIELD_TYPE.NUMBER, [OPERATOR.EXISTS, OPERATOR.IS, OPERATOR.BETWEEN, OPERATOR.LT, OPERATOR.GT, OPERATOR.LTE, OPERATOR.GTE]), FIELD_TYPE.DECIMAL, [OPERATOR.EXISTS, OPERATOR.IS, OPERATOR.BETWEEN, OPERATOR.LT, OPERATOR.GT, OPERATOR.LTE, OPERATOR.GTE]), FIELD_TYPE.BOOLEAN, [OPERATOR.EXISTS, OPERATOR.IS]), FIELD_TYPE.NONE, [OPERATOR.EXISTS]);
63
+ var TypeOperators = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, FIELD_TYPE.ID, [OPERATOR.IS, OPERATOR.ANY]), FIELD_TYPE.STRING, [OPERATOR.EXISTS, OPERATOR.IS, OPERATOR.ANY, OPERATOR.ALL]), FIELD_TYPE.TEXT, [OPERATOR.EXISTS, OPERATOR.LIKE, OPERATOR.STARTS, OPERATOR.ENDS]), FIELD_TYPE.NUMBER, [OPERATOR.EXISTS, OPERATOR.EQ, OPERATOR.BETWEEN, OPERATOR.LT, OPERATOR.GT, OPERATOR.LTE, OPERATOR.GTE]), FIELD_TYPE.DECIMAL, [OPERATOR.EXISTS, OPERATOR.EQ, OPERATOR.BETWEEN, OPERATOR.LT, OPERATOR.GT, OPERATOR.LTE, OPERATOR.GTE]), FIELD_TYPE.BOOLEAN, [OPERATOR.EXISTS, OPERATOR.EQ]), FIELD_TYPE.DATE, [OPERATOR.EXISTS, OPERATOR.EQ, OPERATOR.BETWEEN, OPERATOR.LT, OPERATOR.GT, OPERATOR.LTE, OPERATOR.GTE]), FIELD_TYPE.DATETIME, [OPERATOR.EXISTS, OPERATOR.EQ, OPERATOR.BETWEEN, OPERATOR.LT, OPERATOR.GT, OPERATOR.LTE, OPERATOR.GTE]), FIELD_TYPE.NONE, [OPERATOR.EXISTS]);
58
64
 
59
65
  /**
60
66
  * @internal
67
+ * 0 single value
68
+ * 1 many values
69
+ * 2 two values
61
70
  */
62
- (_OperatorValueType = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_OperatorValueType, OPERATOR.EXISTS, 0), OPERATOR.IS, 0), OPERATOR.IN, 1), OPERATOR.BETWEEN, 2), OPERATOR.WITHIN, 0), OPERATOR.STARTS, 0), OPERATOR.ENDS, 0), OPERATOR.INCLUDES, 0), OPERATOR.LT, 0), OPERATOR.GT, 0), _defineProperty(_defineProperty(_OperatorValueType, OPERATOR.LTE, 0), OPERATOR.GTE, 0));
71
+ (_OperatorValueType = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_OperatorValueType, OPERATOR.EXISTS, 0), OPERATOR.IS, 0), OPERATOR.ANY, 1), OPERATOR.ALL, 1), OPERATOR.BETWEEN, 2), OPERATOR.WITHIN, 0), OPERATOR.STARTS, 0), OPERATOR.ENDS, 0), OPERATOR.LIKE, 0), OPERATOR.EQ, 0), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_OperatorValueType, OPERATOR.LT, 0), OPERATOR.GT, 0), OPERATOR.LTE, 0), OPERATOR.GTE, 0));
63
72
 
64
73
  /**
65
74
  * @internal
@@ -1,6 +1,6 @@
1
1
  'use client';
2
2
 
3
- import { createContext, useContext } from 'react';
3
+ import { createContext, use } from 'react';
4
4
 
5
5
  /*
6
6
  * React Fabric
@@ -27,7 +27,7 @@ import { createContext, useContext } from 'react';
27
27
 
28
28
  var FilterContext = /*#__PURE__*/createContext({});
29
29
  var useFilterContext = function useFilterContext() {
30
- return useContext(FilterContext);
30
+ return use(FilterContext);
31
31
  };
32
32
 
33
33
  export { FilterContext, useFilterContext };
@@ -2,24 +2,25 @@
2
2
 
3
3
  import _defineProperty from '@babel/runtime/helpers/defineProperty';
4
4
  import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
5
- import { Dropdown, Icon, CoreIcons, Menu, MenuItem, Divider, Chip } from '@react-fabric/core';
6
- import { isNil, isEmpty } from '@react-fabric/utilities';
5
+ import { Dropdown, Icon, Menu, MenuItem, Divider, Chip } from '@react-fabric/core';
6
+ import { isNil, isEmpty, cn } from '@react-fabric/utilities';
7
7
  import { useCallback, useMemo } from 'react';
8
8
  import { useTranslation } from 'react-i18next';
9
+ import { FilterContext } from './Context.js';
9
10
  import { FilterEdit } from './FilterEdit.js';
10
11
  import { FilterTag } from './FilterTag.js';
11
- import classNames from 'classnames';
12
- import { FilterContext } from './Context.js';
13
12
  import { jsx, jsxs } from 'react/jsx-runtime';
14
13
 
15
14
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
16
- function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
17
- var FilterBar = function FilterBar(_ref) {
15
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
16
+ function FilterBar(_ref) {
18
17
  var _ref$filters = _ref.filters,
19
18
  filters = _ref$filters === void 0 ? [] : _ref$filters,
20
19
  allowAdd = _ref.allowAdd,
21
20
  fields = _ref.fields,
21
+ editable = _ref.editable,
22
22
  querySchema = _ref.querySchema,
23
+ queryLanguage = _ref.queryLanguage,
23
24
  defaultQuery = _ref.defaultQuery,
24
25
  includedColor = _ref.includedColor,
25
26
  excludedColor = _ref.excludedColor,
@@ -30,12 +31,12 @@ var FilterBar = function FilterBar(_ref) {
30
31
  var list = _toConsumableArray(filters);
31
32
  list.splice(index, 1);
32
33
  onFilterChanged === null || onFilterChanged === void 0 || onFilterChanged(list);
33
- }, [filters]);
34
+ }, [filters, onFilterChanged]);
34
35
  var handleChange = useCallback(function (filter, index) {
35
36
  var list = _toConsumableArray(filters);
36
- isNil(index) ? list.push(filter) : list.splice(index, 1, filter);
37
+ if (isNil(index)) list.push(filter);else list.splice(index, 1, filter);
37
38
  onFilterChanged === null || onFilterChanged === void 0 || onFilterChanged(list);
38
- }, [filters]);
39
+ }, [filters, onFilterChanged]);
39
40
  var handleToggle = useCallback(function (type) {
40
41
  var list = [];
41
42
  if (type === "removeAll") {
@@ -48,14 +49,14 @@ var FilterBar = function FilterBar(_ref) {
48
49
  if (type === "disableAll") filter.disabled = true;
49
50
  if (type === "enableAll") filter.disabled = false;
50
51
  if (type === "toggleDisable") filter.disabled = !filter.disabled;
51
- if (type === "excludeAll") filter.negate = true;
52
- if (type === "includeAll") filter.negate = false;
53
- if (type === "invertAll") filter.negate = !filter.negate;
52
+ if (type === "excludeAll" && filter.field) filter.negate = true;
53
+ if (type === "includeAll" && filter.field) filter.negate = false;
54
+ if (type === "invertAll" && filter.field) filter.negate = !filter.negate;
54
55
  return _objectSpread({}, filter);
55
56
  })));
56
57
  }
57
58
  onFilterChanged === null || onFilterChanged === void 0 || onFilterChanged(list);
58
- }, [filters]);
59
+ }, [filters, onFilterChanged]);
59
60
  var menuItems = useMemo(function () {
60
61
  var key = {
61
62
  someDisabled: false,
@@ -67,16 +68,17 @@ var FilterBar = function FilterBar(_ref) {
67
68
  filters.forEach(function (filter) {
68
69
  if (filter.disabled && filter.canDisable !== false && !key.someDisabled) key.someDisabled = true;
69
70
  if (!filter.disabled && filter.canDisable !== false && !key.someEnabled) key.someEnabled = true;
70
- if (filter.negate && filter.canInvert !== false && !key.someExcluded) key.someExcluded = true;
71
- if (!filter.negate && filter.canInvert !== false && !key.someIncluded) key.someIncluded = true;
71
+ if (filter.field && filter.negate && filter.canInvert !== false && !key.someExcluded) key.someExcluded = true;
72
+ if (filter.field && !filter.negate && filter.canInvert !== false && !key.someIncluded) key.someIncluded = true;
72
73
  if (!filter.required && !key.canRemoveAll) key.canRemoveAll = true;
73
74
  });
74
75
  return key;
75
76
  }, [filters]);
76
- return /*#__PURE__*/jsx(FilterContext.Provider, {
77
+ return /*#__PURE__*/jsx(FilterContext, {
77
78
  value: {
78
79
  defaultQuery: defaultQuery,
79
80
  querySchema: querySchema,
81
+ queryLanguage: queryLanguage,
80
82
  fields: fields
81
83
  },
82
84
  children: /*#__PURE__*/jsxs("div", {
@@ -85,8 +87,8 @@ var FilterBar = function FilterBar(_ref) {
85
87
  showArrow: true,
86
88
  disabled: isEmpty(filters),
87
89
  children: [/*#__PURE__*/jsx(Icon, {
88
- icon: CoreIcons.config,
89
- className: classNames(isEmpty(filters) && "pointer-events-none opacity-30"),
90
+ icon: "icon-[mdi--cog-outline]",
91
+ className: cn(isEmpty(filters) && "pointer-events-none opacity-30"),
90
92
  color: !isEmpty(filters) ? "primary" : undefined
91
93
  }), /*#__PURE__*/jsxs(Menu, {
92
94
  className: "text-sm",
@@ -98,7 +100,7 @@ var FilterBar = function FilterBar(_ref) {
98
100
  id: "disableAll",
99
101
  label: t("label.disableAll")
100
102
  }), /*#__PURE__*/jsx(MenuItem, {
101
- icon: CoreIcons.invertDisable,
103
+ icon: "icon-[mdi--checkbox-intermediate-variant]",
102
104
  id: "toggleDisable",
103
105
  label: t("label.toggleDisable")
104
106
  }), /*#__PURE__*/jsx(Divider, {}), menuItems.someExcluded && /*#__PURE__*/jsx(MenuItem, {
@@ -109,19 +111,22 @@ var FilterBar = function FilterBar(_ref) {
109
111
  label: t("label.excludeAll")
110
112
  }), /*#__PURE__*/jsx(MenuItem, {
111
113
  id: "invertAll",
112
- icon: CoreIcons.invertExclude,
114
+ icon: "icon-[mdi--set-left]",
113
115
  label: t("label.invertAll")
114
116
  }), /*#__PURE__*/jsx(Divider, {}), /*#__PURE__*/jsx(MenuItem, {
115
117
  id: "removeAll",
116
118
  color: "danger",
117
- icon: CoreIcons.remove,
119
+ icon: "icon-[mdi--minus-circle-outline]",
118
120
  label: t("label.removeAll"),
119
121
  disabled: !menuItems.canRemoveAll
120
122
  })]
121
123
  })]
122
124
  }), filters === null || filters === void 0 ? void 0 : filters.map(function (filter, idx) {
123
- return /*#__PURE__*/jsx(FilterTag, {
125
+ return /*#__PURE__*/jsx(FilterTag
126
+ // eslint-disable-next-line @eslint-react/no-array-index-key
127
+ , {
124
128
  filter: filter,
129
+ editable: editable,
125
130
  includedColor: includedColor,
126
131
  excludedColor: excludedColor,
127
132
  onRemove: function onRemove() {
@@ -135,8 +140,8 @@ var FilterBar = function FilterBar(_ref) {
135
140
  showArrow: true,
136
141
  children: [/*#__PURE__*/jsx(Chip, {
137
142
  size: "sm",
138
- className: "!outline-dashed !outline-tint-400",
139
- icon: CoreIcons.insert,
143
+ className: "outline-dashed! outline-tint-400!",
144
+ icon: "icon-[mdi--plus-circle-outline]",
140
145
  children: t("label.add")
141
146
  }), /*#__PURE__*/jsx(FilterEdit, {
142
147
  onChange: handleChange
@@ -144,6 +149,6 @@ var FilterBar = function FilterBar(_ref) {
144
149
  })]
145
150
  })
146
151
  });
147
- };
152
+ }
148
153
 
149
154
  export { FilterBar };
@@ -9,7 +9,7 @@ import { FilterForm } from './FilterForm.js';
9
9
  import { QueryForm } from './QueryForm.js';
10
10
  import { jsxs, jsx } from 'react/jsx-runtime';
11
11
 
12
- var FilterEdit = function FilterEdit(_ref) {
12
+ function FilterEdit(_ref) {
13
13
  var filter = _ref.filter,
14
14
  onRemove = _ref.onRemove,
15
15
  onChange = _ref.onChange;
@@ -17,15 +17,18 @@ var FilterEdit = function FilterEdit(_ref) {
17
17
  t = _useTranslation.t;
18
18
  var _useFilterContext = useFilterContext(),
19
19
  fields = _useFilterContext.fields;
20
- var _useState = useState(isEmpty(fields)),
20
+ var _useState = useState(function () {
21
+ return isEmpty(fields);
22
+ }),
21
23
  _useState2 = _slicedToArray(_useState, 2),
22
24
  queryEdit = _useState2[0],
23
25
  setQueryEdit = _useState2[1];
24
26
  useEffect(function () {
27
+ // eslint-disable-next-line @eslint-react/set-state-in-effect
25
28
  setQueryEdit(!!filter && "query" in filter);
26
29
  }, [filter]);
27
30
  return /*#__PURE__*/jsxs("div", {
28
- className: "px-2 py-1 bg-base outline min-w-[420px]",
31
+ className: "px-2 py-1 bg-default outline min-w-108 rounded-capped",
29
32
  children: [!isEmpty(fields) && /*#__PURE__*/jsx("div", {
30
33
  className: "pb-4 flex justify-end",
31
34
  children: /*#__PURE__*/jsx("span", {
@@ -46,6 +49,6 @@ var FilterEdit = function FilterEdit(_ref) {
46
49
  onChange: onChange
47
50
  })]
48
51
  });
49
- };
52
+ }
50
53
 
51
54
  export { FilterEdit };