@react-fabric/searchbar 1.0.0-beta.5 → 1.0.0-beta.52

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 (40) hide show
  1. package/dist/cjs/filterbar/FilterBar.js +9 -5
  2. package/dist/cjs/filterbar/FilterForm.js +138 -33
  3. package/dist/cjs/filterbar/FilterMenu.js +16 -4
  4. package/dist/cjs/filterbar/FilterTag.js +9 -4
  5. package/dist/cjs/filterbar/FilterView.js +5 -1
  6. package/dist/cjs/filterbar/QueryForm.js +8 -5
  7. package/dist/cjs/i18n/ar.json.js +42 -39
  8. package/dist/cjs/i18n/en.json.js +43 -39
  9. package/dist/cjs/searchbar/SearchBar.js +58 -4
  10. package/dist/cjs/types/index.js +12 -4
  11. package/dist/esm/filterbar/FilterBar.js +9 -5
  12. package/dist/esm/filterbar/FilterForm.js +139 -34
  13. package/dist/esm/filterbar/FilterMenu.js +16 -4
  14. package/dist/esm/filterbar/FilterTag.js +9 -4
  15. package/dist/esm/filterbar/FilterView.js +5 -1
  16. package/dist/esm/filterbar/QueryForm.js +8 -5
  17. package/dist/esm/i18n/ar.json.js +42 -39
  18. package/dist/esm/i18n/en.json.js +43 -39
  19. package/dist/esm/searchbar/SearchBar.js +59 -5
  20. package/dist/esm/types/index.js +12 -4
  21. package/dist/types/filterbar/Context.d.ts +2 -3
  22. package/dist/types/filterbar/FilterBar.d.ts +27 -1
  23. package/dist/types/filterbar/FilterMenu.d.ts +2 -1
  24. package/dist/types/filterbar/FilterTag.d.ts +2 -1
  25. package/dist/types/index.d.ts +1 -1
  26. package/dist/types/searchbar/SearchBar.d.ts +35 -1
  27. package/dist/types/types/index.d.ts +19 -10
  28. package/package.json +15 -13
  29. package/src/filterbar/Context.tsx +4 -1
  30. package/src/filterbar/FilterBar.tsx +48 -6
  31. package/src/filterbar/FilterForm.tsx +107 -22
  32. package/src/filterbar/FilterMenu.tsx +30 -3
  33. package/src/filterbar/FilterTag.tsx +25 -6
  34. package/src/filterbar/FilterView.tsx +4 -1
  35. package/src/filterbar/QueryForm.tsx +10 -4
  36. package/src/i18n/ar.json +42 -39
  37. package/src/i18n/en.json +43 -39
  38. package/src/index.ts +6 -1
  39. package/src/searchbar/SearchBar.tsx +52 -2
  40. package/src/types/index.ts +57 -34
@@ -3,70 +3,74 @@
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
5
  var label = {
6
- filters: "Filters",
6
+ add: "Add Filter",
7
7
  all_filters: "All Filters",
8
+ apply: "Apply",
9
+ basicFilter: "Basic Filter",
10
+ cancel: "Cancel",
11
+ customQuery: "Custom Query",
12
+ "delete": "Delete",
13
+ disable: "Disable",
14
+ disableAll: "Disable All",
15
+ edit: "Edit",
16
+ enable: "Enable",
17
+ enableAll: "Enable All",
18
+ exclude: "Exclude",
19
+ excludeAll: "Exclude All",
8
20
  field: "Field",
9
- operator: "Operator",
10
- value: "Value",
21
+ filters: "Filters",
22
+ forAdvanced: "For advanced users only!",
23
+ include: "Include",
24
+ includeAll: "Include All",
25
+ invertAll: "Invert Include/Exclude",
11
26
  label: "Label",
27
+ matchAll: "Match All",
28
+ matchAny: "Match Any",
29
+ operator: "Operator",
12
30
  optional: "Optional",
13
- add: "Add Filter",
14
- edit: "Edit",
15
- view: "View",
16
31
  pin: "Pinned",
17
- unpin: "Unpinned",
18
- includeAll: "Include All",
19
- excludeAll: "Exclude All",
20
- invertAll: "Invert Include/Exclude",
32
+ query: "Query",
33
+ refresh: "Refresh",
34
+ remove: "Remove",
21
35
  removeAll: "Remove All",
22
- enableAll: "Enable All",
23
- disableAll: "Disable All",
24
36
  toggleDisable: "Invert Disable/Enable",
25
- remove: "Remove",
26
- enable: "Enable",
27
- disable: "Disable",
28
- exclude: "Exclude",
29
- include: "Include",
30
- refresh: "Refresh",
37
+ unpin: "Unpinned",
31
38
  update: "Update",
32
- query: "Query",
33
- apply: "Apply",
34
- cancel: "Cancel",
35
- "delete": "Delete",
36
- basicFilter: "Basic Filter",
37
- customQuery: "Custom Query",
38
- forAdvanced: "For advanced users only!"
39
+ value: "Value",
40
+ view: "View"
39
41
  };
40
42
  var operator = {
43
+ ALL: "All of",
44
+ ANY: "Any of",
45
+ BETWEEN: "Between",
46
+ ENDS: "Ends with",
47
+ EQ: "=",
41
48
  EXISTS: "Exists",
49
+ GT: ">",
50
+ GTE: "≥",
42
51
  IS: "Is",
43
- IN: "In",
52
+ LIKE: "Like",
44
53
  LT: "<",
45
- GT: ">",
46
54
  LTE: "≤",
47
- GTE: "≥",
48
- INCLUDES: "Includes",
49
55
  STARTS: "Starts with",
50
- ENDS: "Ends with",
51
- WITHIN: "Within",
52
- BETWEEN: "Between"
56
+ WITHIN: "Within"
53
57
  };
54
58
  var placeholder = "Search term...";
55
59
  var type = {
56
- STRING: "String",
57
- NUMBER: "Number",
58
- DECIMAL: "Decimal",
59
60
  BOOLEAN: "Bool",
60
61
  DATE: "Date",
61
62
  DATETIME: "Date Time",
62
- GEO: "GeoJSON"
63
+ DECIMAL: "Decimal",
64
+ GEO: "GeoJSON",
65
+ NUMBER: "Number",
66
+ STRING: "String"
63
67
  };
64
68
  var validate = {
69
+ compare: "Compare field required",
65
70
  field: "Field required",
71
+ label: "Label required",
66
72
  operator: "Operator required",
67
- value: "Value required",
68
- compare: "Compare field required",
69
- label: "Label required"
73
+ value: "Value required"
70
74
  };
71
75
  var en = {
72
76
  label: label,
@@ -12,9 +12,43 @@ 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", "onCollapsed", "onQuery", "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
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
+ /**
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
+ * @param {SearchBarProps} props - The properties for the SearchBar component.
25
+ * @returns {JSX.Element} The rendered SearchBar component.
26
+ *
27
+ * @example
28
+ * ```jsx
29
+ * <SearchBar
30
+ * historyKey="myApp:searchHistory"
31
+ * historyCount={10}
32
+ * defaultQueryList={["example", "test"]}
33
+ * prepend={<span>Prepend</span>}
34
+ * append={<span>Append</span>}
35
+ * decorateEnd={<span>End Decoration</span>}
36
+ * decorateStart={<span>Start Decoration</span>}
37
+ * hideFilters={false}
38
+ * defaultCollapsed={false}
39
+ * disabled={false}
40
+ * onCollapsed={(collapsed) => console.log("Collapsed:", collapsed)}
41
+ * onQuery={(query) => console.log("Query:", query)}
42
+ * onSearch={({ query, filters }) => console.log("Search:", query, filters)}
43
+ * query={""}
44
+ * ref={searchInputRef}
45
+ * multiple={false}
46
+ * filters={[{ name: "filter1", value: "value1" }]}
47
+ * />
48
+ * ```
49
+ *
50
+ * @see {@link https://adarshpastakia.github.io/react-fabric/?path=/story/searchbar-searchbar--search-bar} for more details on the properties.
51
+ */
18
52
  var SearchBar = function SearchBar(_ref) {
19
53
  var _ref$historyKey = _ref.historyKey,
20
54
  historyKey = _ref$historyKey === void 0 ? "ruf:search" : _ref$historyKey,
@@ -31,9 +65,10 @@ var SearchBar = function SearchBar(_ref) {
31
65
  defaultCollapsed = _ref$defaultCollapsed === void 0 ? false : _ref$defaultCollapsed;
32
66
  _ref.disabled;
33
67
  _ref.onCollapsed;
34
- var onQuery = _ref.onQuery,
35
- onSearch = _ref.onSearch,
68
+ _ref.onQuery;
69
+ var onSearch = _ref.onSearch,
36
70
  query = _ref.query,
71
+ ref = _ref.ref,
37
72
  multiple = _ref.multiple,
38
73
  _ref$filters = _ref.filters,
39
74
  filters = _ref$filters === void 0 ? utilities.EMPTY_ARRAY : _ref$filters,
@@ -52,12 +87,23 @@ var SearchBar = function SearchBar(_ref) {
52
87
  return multiple ? utilities.EMPTY_ARRAY : "";
53
88
  }, [multiple]);
54
89
  var fireSearch = core.useDebounce(function (query, filters) {
90
+ dispatch({
91
+ type: "dirty",
92
+ dirty: false
93
+ });
55
94
  onSearch === null || onSearch === void 0 || onSearch({
56
95
  query: query,
57
96
  filters: filters
58
97
  });
59
98
  }, []);
60
99
  var _useReducer = react.useReducer(function (state, action) {
100
+ if (action.type === "reset") {
101
+ return _objectSpread(_objectSpread({}, state), {}, {
102
+ dirty: false,
103
+ query: action.query,
104
+ filters: action.filters
105
+ });
106
+ }
61
107
  if (action.type === "dirty") {
62
108
  return _objectSpread(_objectSpread({}, state), {}, {
63
109
  dirty: action.dirty
@@ -88,6 +134,13 @@ var SearchBar = function SearchBar(_ref) {
88
134
  _useReducer2 = _slicedToArray(_useReducer, 2),
89
135
  state = _useReducer2[0],
90
136
  dispatch = _useReducer2[1];
137
+ react.useEffect(function () {
138
+ dispatch({
139
+ type: "reset",
140
+ filters: filters,
141
+ query: query
142
+ });
143
+ }, [filters, query]);
91
144
  var updateHistory = function updateHistory(value) {
92
145
  var historyEntry = utilities.isArray(value) ? value : [value];
93
146
  setHistory(utilities.dedupe([].concat(_toConsumableArray(historyEntry), _toConsumableArray(history))).slice(0, historyCount));
@@ -119,6 +172,7 @@ var SearchBar = function SearchBar(_ref) {
119
172
  }), prepend, /*#__PURE__*/jsxRuntime.jsx(form.AutoComplete, {
120
173
  allowClear: true,
121
174
  expandOnEdit: true,
175
+ ref: ref,
122
176
  multiple: multiple,
123
177
  history: history,
124
178
  value: state.query,
@@ -131,7 +185,7 @@ var SearchBar = function SearchBar(_ref) {
131
185
  });
132
186
  },
133
187
  onSelect: updateHistory,
134
- onQuery: onQuery,
188
+ "data-ref": "searchbarInput",
135
189
  onEnterPressed: function onEnterPressed() {
136
190
  return fireSearch(state.query, state.filters);
137
191
  }
@@ -29,21 +29,26 @@ 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";
35
38
  FIELD_TYPE["NONE"] = "NONE";
36
39
  return FIELD_TYPE;
37
40
  }({});
38
41
  var OPERATOR = /*#__PURE__*/function (OPERATOR) {
39
42
  OPERATOR["EXISTS"] = "EXISTS";
40
43
  OPERATOR["IS"] = "IS";
41
- OPERATOR["IN"] = "IN";
44
+ OPERATOR["ALL"] = "ALL";
45
+ OPERATOR["ANY"] = "ANY";
46
+ OPERATOR["EQ"] = "EQ";
42
47
  OPERATOR["LT"] = "LT";
43
48
  OPERATOR["GT"] = "GT";
44
49
  OPERATOR["LTE"] = "LTE";
45
50
  OPERATOR["GTE"] = "GTE";
46
- OPERATOR["INCLUDES"] = "INCLUDES";
51
+ OPERATOR["LIKE"] = "LIKE";
47
52
  OPERATOR["STARTS"] = "STARTS";
48
53
  OPERATOR["ENDS"] = "ENDS";
49
54
  OPERATOR["WITHIN"] = "WITHIN";
@@ -54,12 +59,15 @@ var OPERATOR = /*#__PURE__*/function (OPERATOR) {
54
59
  /**
55
60
  * @internal
56
61
  */
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]);
62
+ 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
63
 
59
64
  /**
60
65
  * @internal
66
+ * 0 single value
67
+ * 1 many values
68
+ * 2 two values
61
69
  */
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));
70
+ (_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
71
 
64
72
  /**
65
73
  * @internal
@@ -19,7 +19,9 @@ var FilterBar = function FilterBar(_ref) {
19
19
  filters = _ref$filters === void 0 ? [] : _ref$filters,
20
20
  allowAdd = _ref.allowAdd,
21
21
  fields = _ref.fields,
22
+ editable = _ref.editable,
22
23
  querySchema = _ref.querySchema,
24
+ queryLanguage = _ref.queryLanguage,
23
25
  defaultQuery = _ref.defaultQuery,
24
26
  includedColor = _ref.includedColor,
25
27
  excludedColor = _ref.excludedColor,
@@ -48,9 +50,9 @@ var FilterBar = function FilterBar(_ref) {
48
50
  if (type === "disableAll") filter.disabled = true;
49
51
  if (type === "enableAll") filter.disabled = false;
50
52
  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;
53
+ if (type === "excludeAll" && filter.field) filter.negate = true;
54
+ if (type === "includeAll" && filter.field) filter.negate = false;
55
+ if (type === "invertAll" && filter.field) filter.negate = !filter.negate;
54
56
  return _objectSpread({}, filter);
55
57
  })));
56
58
  }
@@ -67,8 +69,8 @@ var FilterBar = function FilterBar(_ref) {
67
69
  filters.forEach(function (filter) {
68
70
  if (filter.disabled && filter.canDisable !== false && !key.someDisabled) key.someDisabled = true;
69
71
  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;
72
+ if (filter.field && filter.negate && filter.canInvert !== false && !key.someExcluded) key.someExcluded = true;
73
+ if (filter.field && !filter.negate && filter.canInvert !== false && !key.someIncluded) key.someIncluded = true;
72
74
  if (!filter.required && !key.canRemoveAll) key.canRemoveAll = true;
73
75
  });
74
76
  return key;
@@ -77,6 +79,7 @@ var FilterBar = function FilterBar(_ref) {
77
79
  value: {
78
80
  defaultQuery: defaultQuery,
79
81
  querySchema: querySchema,
82
+ queryLanguage: queryLanguage,
80
83
  fields: fields
81
84
  },
82
85
  children: /*#__PURE__*/jsxs("div", {
@@ -122,6 +125,7 @@ var FilterBar = function FilterBar(_ref) {
122
125
  }), filters === null || filters === void 0 ? void 0 : filters.map(function (filter, idx) {
123
126
  return /*#__PURE__*/jsx(FilterTag, {
124
127
  filter: filter,
128
+ editable: editable,
125
129
  includedColor: includedColor,
126
130
  excludedColor: excludedColor,
127
131
  onRemove: function onRemove() {
@@ -4,7 +4,7 @@ import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
4
4
  import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
5
5
  import { useFloatingTree } from '@floating-ui/react';
6
6
  import { Row, Col, Button } from '@react-fabric/core';
7
- import { Field, Controller, Switch, Select, Input, Number, Form } from '@react-fabric/form';
7
+ import { Field, Controller, Switch, Select, Input, Textarea, Number, DateInput, Form } from '@react-fabric/form';
8
8
  import { yup, shortHash, isArray } from '@react-fabric/utilities';
9
9
  import { useRef, useState, useEffect, useMemo, useCallback } from 'react';
10
10
  import { useTranslation } from 'react-i18next';
@@ -15,6 +15,7 @@ import { jsx, jsxs } from 'react/jsx-runtime';
15
15
  var FilterSchema = new yup.ObjectSchema({
16
16
  id: yup.string().required(),
17
17
  field: yup.string().required(),
18
+ // type: yup.string().oneOf(Object.values(FIELD_TYPE)),
18
19
  operator: yup.string().required().oneOf(Object.values(OPERATOR)),
19
20
  negate: yup["boolean"](),
20
21
  label: yup.string(),
@@ -27,7 +28,7 @@ var FilterSchema = new yup.ObjectSchema({
27
28
  return schema.required();
28
29
  }
29
30
  }).when("operator", {
30
- is: OPERATOR.IN,
31
+ is: OPERATOR.ANY,
31
32
  then: function then(schema) {
32
33
  return schema.test({
33
34
  name: "array-check",
@@ -38,6 +39,42 @@ var FilterSchema = new yup.ObjectSchema({
38
39
  }
39
40
  });
40
41
  }
42
+ }).when("operator", {
43
+ is: OPERATOR.ALL,
44
+ then: function then(schema) {
45
+ return schema.test({
46
+ name: "array-check",
47
+ message: "${path} is a required field",
48
+ test: function test() {
49
+ var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
50
+ return (val === null || val === void 0 ? void 0 : val.length) > 0;
51
+ }
52
+ });
53
+ }
54
+ }).when("operator", {
55
+ is: OPERATOR.BETWEEN,
56
+ then: function then(schema) {
57
+ return schema.test({
58
+ name: "array-check",
59
+ message: "${path} is a required field",
60
+ test: function test() {
61
+ var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
62
+ return (val === null || val === void 0 ? void 0 : val.length) > 0 && val[0] && val[1];
63
+ }
64
+ });
65
+ }
66
+ }).when("operator", {
67
+ is: OPERATOR.BETWEEN,
68
+ then: function then(schema) {
69
+ return schema.test({
70
+ name: "array-check",
71
+ message: "${path} min max",
72
+ test: function test() {
73
+ var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
74
+ return (val === null || val === void 0 ? void 0 : val.length) > 0 && val[0] < val[1];
75
+ }
76
+ });
77
+ }
41
78
  })
42
79
  });
43
80
  var FilterForm = function FilterForm(_ref) {
@@ -57,13 +94,17 @@ var FilterForm = function FilterForm(_ref) {
57
94
  values = _useState2[0],
58
95
  setValues = _useState2[1];
59
96
  useEffect(function () {
60
- var _formRef$current, _formRef$current2;
61
- if (filter && "field" in filter && filter.field) return (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.setValues(filter);
62
- (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 || _formRef$current2.setValues({
63
- id: shortHash(),
64
- field: "",
65
- operator: OPERATOR.EXISTS
66
- });
97
+ if (filter && "field" in filter && filter.field) {
98
+ var _formRef$current;
99
+ (_formRef$current = formRef.current) === null || _formRef$current === void 0 || _formRef$current.setValues(filter);
100
+ } else {
101
+ var _formRef$current2;
102
+ (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 || _formRef$current2.setValues({
103
+ id: shortHash(),
104
+ field: "",
105
+ operator: OPERATOR.EXISTS
106
+ });
107
+ }
67
108
  }, [filter]);
68
109
  useEffect(function () {
69
110
  setTimeout(function () {
@@ -89,7 +130,7 @@ var FilterForm = function FilterForm(_ref) {
89
130
  (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 || _formRef$current4.setValue("value", undefined);
90
131
  }
91
132
  if ((field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.STRING) {
92
- if ((values === null || values === void 0 ? void 0 : values.operator) === OPERATOR.IN) {
133
+ if ([OPERATOR.ALL, OPERATOR.ANY].includes(values === null || values === void 0 ? void 0 : values.operator)) {
93
134
  var _formRef$current5;
94
135
  !isArray(values.value) && ((_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.setValue("value", []));
95
136
  } else {
@@ -97,7 +138,7 @@ var FilterForm = function FilterForm(_ref) {
97
138
  isArray(values.value) && ((_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : _formRef$current6.setValue("value", undefined));
98
139
  }
99
140
  }
100
- if ((field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.NUMBER || (field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.DECIMAL) {
141
+ if ((field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.DATE || (field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.DATETIME || (field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.NUMBER || (field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.DECIMAL) {
101
142
  if ((values === null || values === void 0 ? void 0 : values.operator) === OPERATOR.BETWEEN) {
102
143
  var _formRef$current7;
103
144
  !isArray(values.value) && ((_formRef$current7 = formRef.current) === null || _formRef$current7 === void 0 ? void 0 : _formRef$current7.setValue("value", []));
@@ -106,7 +147,7 @@ var FilterForm = function FilterForm(_ref) {
106
147
  isArray(values.value) && ((_formRef$current8 = formRef.current) === null || _formRef$current8 === void 0 ? void 0 : _formRef$current8.setValue("value", undefined));
107
148
  }
108
149
  }
109
- if ((field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.BOOLEAN && (values === null || values === void 0 ? void 0 : values.operator) === OPERATOR.IS && (values === null || values === void 0 ? void 0 : values.value) === undefined) {
150
+ if ((field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.BOOLEAN && [OPERATOR.IS, OPERATOR.EQ].includes(values === null || values === void 0 ? void 0 : values.operator) && (values === null || values === void 0 ? void 0 : values.value) === undefined) {
110
151
  var _formRef$current9;
111
152
  (_formRef$current9 = formRef.current) === null || _formRef$current9 === void 0 || _formRef$current9.setValue("value", false);
112
153
  }
@@ -123,7 +164,8 @@ var FilterForm = function FilterForm(_ref) {
123
164
  });
124
165
  }
125
166
  if ((field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.STRING || (field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.ID) {
126
- if ((values === null || values === void 0 ? void 0 : values.operator) === OPERATOR.IN) {
167
+ var _field$values2;
168
+ if ([OPERATOR.ALL, OPERATOR.ANY].includes(values === null || values === void 0 ? void 0 : values.operator)) {
127
169
  var _field$values;
128
170
  return /*#__PURE__*/jsx(Controller, {
129
171
  name: "value",
@@ -137,6 +179,19 @@ var FilterForm = function FilterForm(_ref) {
137
179
  onQuery: field.onSearch
138
180
  })
139
181
  });
182
+ } else if (!!field.onSearch || (_field$values2 = field.values) !== null && _field$values2 !== void 0 && _field$values2.length) {
183
+ var _field$values3;
184
+ return /*#__PURE__*/jsx(Controller, {
185
+ name: "value",
186
+ children: /*#__PURE__*/jsx(Select, {
187
+ searchable: true,
188
+ allowCreate: true,
189
+ allowClear: true,
190
+ options: (_field$values3 = field.values) !== null && _field$values3 !== void 0 ? _field$values3 : [],
191
+ label: t("label.value"),
192
+ onQuery: field.onSearch
193
+ })
194
+ });
140
195
  } else {
141
196
  return /*#__PURE__*/jsx(Controller, {
142
197
  name: "value",
@@ -147,27 +202,40 @@ var FilterForm = function FilterForm(_ref) {
147
202
  });
148
203
  }
149
204
  }
205
+ if (field.type === FIELD_TYPE.TEXT) {
206
+ return /*#__PURE__*/jsx(Controller, {
207
+ name: "value",
208
+ children: /*#__PURE__*/jsx(Textarea, {
209
+ rows: 3,
210
+ label: t("label.value"),
211
+ allowClear: true
212
+ })
213
+ });
214
+ }
150
215
  if ((field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.DECIMAL || (field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.NUMBER) {
151
216
  var step = field.type === FIELD_TYPE.DECIMAL ? 0.1 : 1;
152
217
  if ((values === null || values === void 0 ? void 0 : values.operator) === OPERATOR.BETWEEN) {
153
- return /*#__PURE__*/jsxs(Field, {
154
- label: t("label.value"),
155
- children: [/*#__PURE__*/jsx(Controller, {
156
- name: "value[0]",
157
- children: /*#__PURE__*/jsx(Number, {
158
- step: step,
159
- allowClear: true
160
- })
161
- }), /*#__PURE__*/jsx("span", {
162
- className: "p-2 text-muted",
163
- children: "\u2277"
164
- }), /*#__PURE__*/jsx(Controller, {
165
- name: "value[1]",
166
- children: /*#__PURE__*/jsx(Number, {
167
- step: step,
168
- allowClear: true
169
- })
170
- })]
218
+ return /*#__PURE__*/jsx(Controller, {
219
+ name: "value",
220
+ children: /*#__PURE__*/jsxs(Field, {
221
+ label: t("label.value"),
222
+ children: [/*#__PURE__*/jsx(Controller, {
223
+ name: "value[0]",
224
+ children: /*#__PURE__*/jsx(Number, {
225
+ step: step,
226
+ allowClear: true
227
+ })
228
+ }), /*#__PURE__*/jsx("span", {
229
+ className: "p-2 text-muted",
230
+ children: "\u2277"
231
+ }), /*#__PURE__*/jsx(Controller, {
232
+ name: "value[1]",
233
+ children: /*#__PURE__*/jsx(Number, {
234
+ step: step,
235
+ allowClear: true
236
+ })
237
+ })]
238
+ })
171
239
  });
172
240
  } else {
173
241
  return /*#__PURE__*/jsx(Controller, {
@@ -180,6 +248,41 @@ var FilterForm = function FilterForm(_ref) {
180
248
  });
181
249
  }
182
250
  }
251
+ if ((field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.DATE || (field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.DATETIME) {
252
+ var type = field.type === FIELD_TYPE.DATETIME ? "datetime" : "date";
253
+ if ((values === null || values === void 0 ? void 0 : values.operator) === OPERATOR.BETWEEN) {
254
+ return /*#__PURE__*/jsx(Controller, {
255
+ name: "value",
256
+ children: /*#__PURE__*/jsxs(Field, {
257
+ label: t("label.value"),
258
+ children: [/*#__PURE__*/jsx(Controller, {
259
+ name: "value[0]",
260
+ children: /*#__PURE__*/jsx(DateInput, {
261
+ type: type,
262
+ allowClear: true
263
+ })
264
+ }), /*#__PURE__*/jsx("span", {
265
+ className: "p-2 text-muted",
266
+ children: "\u2277"
267
+ }), /*#__PURE__*/jsx(Controller, {
268
+ name: "value[1]",
269
+ children: /*#__PURE__*/jsx(DateInput, {
270
+ type: type,
271
+ allowClear: true
272
+ })
273
+ })]
274
+ })
275
+ });
276
+ } else {
277
+ return /*#__PURE__*/jsx(Controller, {
278
+ name: "value",
279
+ children: /*#__PURE__*/jsx(DateInput, {
280
+ type: type,
281
+ allowClear: true
282
+ })
283
+ });
284
+ }
285
+ }
183
286
  }, [field, values === null || values === void 0 ? void 0 : values.operator]);
184
287
  var handleSubmit = useCallback(function (model) {
185
288
  var filter = {
@@ -188,11 +291,12 @@ var FilterForm = function FilterForm(_ref) {
188
291
  negate: model.negate,
189
292
  operator: model.operator,
190
293
  value: model.value,
191
- label: model.label
294
+ label: model.label,
295
+ type: field === null || field === void 0 ? void 0 : field.type
192
296
  };
193
297
  onChange === null || onChange === void 0 || onChange(filter);
194
298
  tree === null || tree === void 0 || tree.events.emit("close");
195
- }, [onChange]);
299
+ }, [field, onChange]);
196
300
  return /*#__PURE__*/jsx(Form, {
197
301
  formRef: formRef,
198
302
  schema: FilterSchema,
@@ -208,6 +312,7 @@ var FilterForm = function FilterForm(_ref) {
208
312
  name: "field",
209
313
  children: /*#__PURE__*/jsx(Select, {
210
314
  required: true,
315
+ searchable: true,
211
316
  ref: inputRef,
212
317
  label: t("label.field"),
213
318
  options: fields,
@@ -253,7 +358,7 @@ var FilterForm = function FilterForm(_ref) {
253
358
  })
254
359
  })
255
360
  }), /*#__PURE__*/jsxs("div", {
256
- className: "flex pt-4 justify-end gap-1",
361
+ className: "flex mt-4 justify-end gap-1 sticky bottom-1 bg-base",
257
362
  children: [onRemove && /*#__PURE__*/jsx("div", {
258
363
  className: "flex-1",
259
364
  children: /*#__PURE__*/jsx(Button, {
@@ -5,16 +5,20 @@ import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
5
5
  import { Menu, MenuItem, CoreIcons, Divider } from '@react-fabric/core';
6
6
  import { useState } from 'react';
7
7
  import { useTranslation } from 'react-i18next';
8
+ import { OPERATOR } from '../types/index.js';
8
9
  import { FilterEdit } from './FilterEdit.js';
9
10
  import { FilterView } from './FilterView.js';
10
11
  import { jsx, jsxs } from 'react/jsx-runtime';
11
12
 
12
13
  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; }
13
14
  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; }
15
+ var MATCH_ALL = "M9,5C10.04,5 11.06,5.24 12,5.68C12.94,5.24 13.96,5 15,5A7,7 0 0,1 22,12A7,7 0 0,1 15,19C13.96,19 12.94,18.76 12,18.32C11.06,18.76 10.04,19 9,19A7,7 0 0,1 2,12A7,7 0 0,1 9,5M8.5,12C8.5,13.87 9.29,15.56 10.56,16.75L11.56,16.29C10.31,15.29 9.5,13.74 9.5,12C9.5,10.26 10.31,8.71 11.56,7.71L10.56,7.25C9.29,8.44 8.5,10.13 8.5,12M15.5,12C15.5,10.13 14.71,8.44 13.44,7.25L12.44,7.71C13.69,8.71 14.5,10.26 14.5,12C14.5,13.74 13.69,15.29 12.44,16.29L13.44,16.75C14.71,15.56 15.5,13.87 15.5,12Z";
16
+ var MATCH_ANY = "M9,5A7,7 0 0,0 2,12A7,7 0 0,0 9,19C10.04,19 11.06,18.76 12,18.32C12.94,18.76 13.96,19 15,19A7,7 0 0,0 22,12A7,7 0 0,0 15,5C13.96,5 12.94,5.24 12,5.68C11.06,5.24 10.04,5 9,5M9,7C9.34,7 9.67,7.03 10,7.1C8.72,8.41 8,10.17 8,12C8,13.83 8.72,15.59 10,16.89C9.67,16.96 9.34,17 9,17A5,5 0 0,1 4,12A5,5 0 0,1 9,7M15,7A5,5 0 0,1 20,12A5,5 0 0,1 15,17C14.66,17 14.33,16.97 14,16.9C15.28,15.59 16,13.83 16,12C16,10.17 15.28,8.41 14,7.11C14.33,7.04 14.66,7 15,7Z";
14
17
  var FilterMenu = function FilterMenu(_ref) {
15
18
  var filter = _ref.filter;
16
19
  _ref.fields;
17
- var onChange = _ref.onChange,
20
+ var editable = _ref.editable,
21
+ onChange = _ref.onChange,
18
22
  onRemove = _ref.onRemove;
19
23
  var _useTranslation = useTranslation("searchbar"),
20
24
  t = _useTranslation.t;
@@ -31,7 +35,7 @@ var FilterMenu = function FilterMenu(_ref) {
31
35
  onRemove: onRemove
32
36
  }) : /*#__PURE__*/jsxs(Menu, {
33
37
  className: "text-sm",
34
- children: [filter.canEdit !== false ? /*#__PURE__*/jsx(MenuItem, {
38
+ children: [editable && filter.canEdit !== false ? /*#__PURE__*/jsx(MenuItem, {
35
39
  icon: CoreIcons.edit,
36
40
  label: t("label.edit"),
37
41
  "data-dropdown-dismiss": "false",
@@ -45,14 +49,22 @@ var FilterMenu = function FilterMenu(_ref) {
45
49
  onClick: function onClick() {
46
50
  setView("view");
47
51
  }
48
- }), /*#__PURE__*/jsx(Divider, {}), filter.canPin !== false && /*#__PURE__*/jsx(MenuItem, {
52
+ }), /*#__PURE__*/jsx(Divider, {}), filter.operator && [OPERATOR.ALL, OPERATOR.ANY].includes(filter.operator) && /*#__PURE__*/jsx(MenuItem, {
53
+ label: t(filter.operator === OPERATOR.ALL ? "label.matchAny" : "label.matchAll"),
54
+ icon: t(filter.operator === OPERATOR.ALL ? MATCH_ANY : MATCH_ALL),
55
+ onClick: function onClick() {
56
+ return onChange(_objectSpread(_objectSpread({}, filter), {}, {
57
+ operator: filter.operator === OPERATOR.ALL ? OPERATOR.ANY : OPERATOR.ALL
58
+ }));
59
+ }
60
+ }), filter.canPin !== false && /*#__PURE__*/jsx(MenuItem, {
49
61
  label: t(filter.pinned ? "label.unpin" : "label.pin"),
50
62
  onClick: function onClick() {
51
63
  return onChange(_objectSpread(_objectSpread({}, filter), {}, {
52
64
  pinned: !filter.pinned
53
65
  }));
54
66
  }
55
- }), filter.canInvert !== false && /*#__PURE__*/jsx(MenuItem, {
67
+ }), filter.canInvert !== false && filter.field && /*#__PURE__*/jsx(MenuItem, {
56
68
  label: t(filter.negate ? "label.include" : "label.exclude"),
57
69
  onClick: function onClick() {
58
70
  return onChange(_objectSpread(_objectSpread({}, filter), {}, {