@react-fabric/searchbar 1.0.0-beta.5 → 1.0.0-beta.51
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/filterbar/FilterBar.js +9 -5
- package/dist/cjs/filterbar/FilterForm.js +123 -30
- package/dist/cjs/filterbar/FilterMenu.js +4 -3
- package/dist/cjs/filterbar/FilterTag.js +9 -4
- package/dist/cjs/filterbar/QueryForm.js +8 -5
- package/dist/cjs/i18n/en.json.js +1 -0
- package/dist/cjs/searchbar/SearchBar.js +24 -4
- package/dist/cjs/types/index.js +9 -2
- package/dist/esm/filterbar/FilterBar.js +9 -5
- package/dist/esm/filterbar/FilterForm.js +124 -31
- package/dist/esm/filterbar/FilterMenu.js +4 -3
- package/dist/esm/filterbar/FilterTag.js +9 -4
- package/dist/esm/filterbar/QueryForm.js +8 -5
- package/dist/esm/i18n/en.json.js +1 -0
- package/dist/esm/searchbar/SearchBar.js +25 -5
- package/dist/esm/types/index.js +9 -2
- package/dist/types/filterbar/Context.d.ts +2 -2
- package/dist/types/filterbar/FilterBar.d.ts +1 -1
- package/dist/types/filterbar/FilterMenu.d.ts +2 -1
- package/dist/types/filterbar/FilterTag.d.ts +2 -1
- package/dist/types/index.d.ts +1 -1
- package/dist/types/searchbar/SearchBar.d.ts +1 -1
- package/dist/types/types/index.d.ts +16 -8
- package/package.json +15 -13
- package/src/filterbar/Context.tsx +4 -1
- package/src/filterbar/FilterBar.tsx +22 -6
- package/src/filterbar/FilterForm.tsx +95 -19
- package/src/filterbar/FilterMenu.tsx +4 -2
- package/src/filterbar/FilterTag.tsx +24 -5
- package/src/filterbar/QueryForm.tsx +10 -4
- package/src/i18n/en.json +1 -0
- package/src/index.ts +6 -1
- package/src/searchbar/SearchBar.tsx +18 -2
- package/src/types/index.ts +46 -30
|
@@ -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(),
|
|
@@ -38,6 +39,30 @@ var FilterSchema = new yup.ObjectSchema({
|
|
|
38
39
|
}
|
|
39
40
|
});
|
|
40
41
|
}
|
|
42
|
+
}).when("operator", {
|
|
43
|
+
is: OPERATOR.BETWEEN,
|
|
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 && val[0] && val[1];
|
|
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} min max",
|
|
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
|
+
}
|
|
41
66
|
})
|
|
42
67
|
});
|
|
43
68
|
var FilterForm = function FilterForm(_ref) {
|
|
@@ -57,13 +82,17 @@ var FilterForm = function FilterForm(_ref) {
|
|
|
57
82
|
values = _useState2[0],
|
|
58
83
|
setValues = _useState2[1];
|
|
59
84
|
useEffect(function () {
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
85
|
+
if (filter && "field" in filter && filter.field) {
|
|
86
|
+
var _formRef$current;
|
|
87
|
+
(_formRef$current = formRef.current) === null || _formRef$current === void 0 || _formRef$current.setValues(filter);
|
|
88
|
+
} else {
|
|
89
|
+
var _formRef$current2;
|
|
90
|
+
(_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 || _formRef$current2.setValues({
|
|
91
|
+
id: shortHash(),
|
|
92
|
+
field: "",
|
|
93
|
+
operator: OPERATOR.EXISTS
|
|
94
|
+
});
|
|
95
|
+
}
|
|
67
96
|
}, [filter]);
|
|
68
97
|
useEffect(function () {
|
|
69
98
|
setTimeout(function () {
|
|
@@ -97,7 +126,7 @@ var FilterForm = function FilterForm(_ref) {
|
|
|
97
126
|
isArray(values.value) && ((_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : _formRef$current6.setValue("value", undefined));
|
|
98
127
|
}
|
|
99
128
|
}
|
|
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) {
|
|
129
|
+
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
130
|
if ((values === null || values === void 0 ? void 0 : values.operator) === OPERATOR.BETWEEN) {
|
|
102
131
|
var _formRef$current7;
|
|
103
132
|
!isArray(values.value) && ((_formRef$current7 = formRef.current) === null || _formRef$current7 === void 0 ? void 0 : _formRef$current7.setValue("value", []));
|
|
@@ -106,7 +135,7 @@ var FilterForm = function FilterForm(_ref) {
|
|
|
106
135
|
isArray(values.value) && ((_formRef$current8 = formRef.current) === null || _formRef$current8 === void 0 ? void 0 : _formRef$current8.setValue("value", undefined));
|
|
107
136
|
}
|
|
108
137
|
}
|
|
109
|
-
if ((field === null || field === void 0 ? void 0 : field.type) === FIELD_TYPE.BOOLEAN && (values === null || values === void 0 ? void 0 : values.operator)
|
|
138
|
+
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
139
|
var _formRef$current9;
|
|
111
140
|
(_formRef$current9 = formRef.current) === null || _formRef$current9 === void 0 || _formRef$current9.setValue("value", false);
|
|
112
141
|
}
|
|
@@ -123,6 +152,7 @@ var FilterForm = function FilterForm(_ref) {
|
|
|
123
152
|
});
|
|
124
153
|
}
|
|
125
154
|
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) {
|
|
155
|
+
var _field$values2;
|
|
126
156
|
if ((values === null || values === void 0 ? void 0 : values.operator) === OPERATOR.IN) {
|
|
127
157
|
var _field$values;
|
|
128
158
|
return /*#__PURE__*/jsx(Controller, {
|
|
@@ -137,6 +167,19 @@ var FilterForm = function FilterForm(_ref) {
|
|
|
137
167
|
onQuery: field.onSearch
|
|
138
168
|
})
|
|
139
169
|
});
|
|
170
|
+
} else if (!!field.onSearch || (_field$values2 = field.values) !== null && _field$values2 !== void 0 && _field$values2.length) {
|
|
171
|
+
var _field$values3;
|
|
172
|
+
return /*#__PURE__*/jsx(Controller, {
|
|
173
|
+
name: "value",
|
|
174
|
+
children: /*#__PURE__*/jsx(Select, {
|
|
175
|
+
searchable: true,
|
|
176
|
+
allowCreate: true,
|
|
177
|
+
allowClear: true,
|
|
178
|
+
options: (_field$values3 = field.values) !== null && _field$values3 !== void 0 ? _field$values3 : [],
|
|
179
|
+
label: t("label.value"),
|
|
180
|
+
onQuery: field.onSearch
|
|
181
|
+
})
|
|
182
|
+
});
|
|
140
183
|
} else {
|
|
141
184
|
return /*#__PURE__*/jsx(Controller, {
|
|
142
185
|
name: "value",
|
|
@@ -147,27 +190,40 @@ var FilterForm = function FilterForm(_ref) {
|
|
|
147
190
|
});
|
|
148
191
|
}
|
|
149
192
|
}
|
|
193
|
+
if (field.type === FIELD_TYPE.TEXT) {
|
|
194
|
+
return /*#__PURE__*/jsx(Controller, {
|
|
195
|
+
name: "value",
|
|
196
|
+
children: /*#__PURE__*/jsx(Textarea, {
|
|
197
|
+
rows: 3,
|
|
198
|
+
label: t("label.value"),
|
|
199
|
+
allowClear: true
|
|
200
|
+
})
|
|
201
|
+
});
|
|
202
|
+
}
|
|
150
203
|
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
204
|
var step = field.type === FIELD_TYPE.DECIMAL ? 0.1 : 1;
|
|
152
205
|
if ((values === null || values === void 0 ? void 0 : values.operator) === OPERATOR.BETWEEN) {
|
|
153
|
-
return /*#__PURE__*/
|
|
154
|
-
|
|
155
|
-
children:
|
|
156
|
-
|
|
157
|
-
children: /*#__PURE__*/jsx(
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
206
|
+
return /*#__PURE__*/jsx(Controller, {
|
|
207
|
+
name: "value",
|
|
208
|
+
children: /*#__PURE__*/jsxs(Field, {
|
|
209
|
+
label: t("label.value"),
|
|
210
|
+
children: [/*#__PURE__*/jsx(Controller, {
|
|
211
|
+
name: "value[0]",
|
|
212
|
+
children: /*#__PURE__*/jsx(Number, {
|
|
213
|
+
step: step,
|
|
214
|
+
allowClear: true
|
|
215
|
+
})
|
|
216
|
+
}), /*#__PURE__*/jsx("span", {
|
|
217
|
+
className: "p-2 text-muted",
|
|
218
|
+
children: "\u2277"
|
|
219
|
+
}), /*#__PURE__*/jsx(Controller, {
|
|
220
|
+
name: "value[1]",
|
|
221
|
+
children: /*#__PURE__*/jsx(Number, {
|
|
222
|
+
step: step,
|
|
223
|
+
allowClear: true
|
|
224
|
+
})
|
|
225
|
+
})]
|
|
226
|
+
})
|
|
171
227
|
});
|
|
172
228
|
} else {
|
|
173
229
|
return /*#__PURE__*/jsx(Controller, {
|
|
@@ -180,6 +236,41 @@ var FilterForm = function FilterForm(_ref) {
|
|
|
180
236
|
});
|
|
181
237
|
}
|
|
182
238
|
}
|
|
239
|
+
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) {
|
|
240
|
+
var type = field.type === FIELD_TYPE.DATETIME ? "datetime" : "date";
|
|
241
|
+
if ((values === null || values === void 0 ? void 0 : values.operator) === OPERATOR.BETWEEN) {
|
|
242
|
+
return /*#__PURE__*/jsx(Controller, {
|
|
243
|
+
name: "value",
|
|
244
|
+
children: /*#__PURE__*/jsxs(Field, {
|
|
245
|
+
label: t("label.value"),
|
|
246
|
+
children: [/*#__PURE__*/jsx(Controller, {
|
|
247
|
+
name: "value[0]",
|
|
248
|
+
children: /*#__PURE__*/jsx(DateInput, {
|
|
249
|
+
type: type,
|
|
250
|
+
allowClear: true
|
|
251
|
+
})
|
|
252
|
+
}), /*#__PURE__*/jsx("span", {
|
|
253
|
+
className: "p-2 text-muted",
|
|
254
|
+
children: "\u2277"
|
|
255
|
+
}), /*#__PURE__*/jsx(Controller, {
|
|
256
|
+
name: "value[1]",
|
|
257
|
+
children: /*#__PURE__*/jsx(DateInput, {
|
|
258
|
+
type: type,
|
|
259
|
+
allowClear: true
|
|
260
|
+
})
|
|
261
|
+
})]
|
|
262
|
+
})
|
|
263
|
+
});
|
|
264
|
+
} else {
|
|
265
|
+
return /*#__PURE__*/jsx(Controller, {
|
|
266
|
+
name: "value",
|
|
267
|
+
children: /*#__PURE__*/jsx(DateInput, {
|
|
268
|
+
type: type,
|
|
269
|
+
allowClear: true
|
|
270
|
+
})
|
|
271
|
+
});
|
|
272
|
+
}
|
|
273
|
+
}
|
|
183
274
|
}, [field, values === null || values === void 0 ? void 0 : values.operator]);
|
|
184
275
|
var handleSubmit = useCallback(function (model) {
|
|
185
276
|
var filter = {
|
|
@@ -188,11 +279,12 @@ var FilterForm = function FilterForm(_ref) {
|
|
|
188
279
|
negate: model.negate,
|
|
189
280
|
operator: model.operator,
|
|
190
281
|
value: model.value,
|
|
191
|
-
label: model.label
|
|
282
|
+
label: model.label,
|
|
283
|
+
type: field === null || field === void 0 ? void 0 : field.type
|
|
192
284
|
};
|
|
193
285
|
onChange === null || onChange === void 0 || onChange(filter);
|
|
194
286
|
tree === null || tree === void 0 || tree.events.emit("close");
|
|
195
|
-
}, [onChange]);
|
|
287
|
+
}, [field, onChange]);
|
|
196
288
|
return /*#__PURE__*/jsx(Form, {
|
|
197
289
|
formRef: formRef,
|
|
198
290
|
schema: FilterSchema,
|
|
@@ -208,6 +300,7 @@ var FilterForm = function FilterForm(_ref) {
|
|
|
208
300
|
name: "field",
|
|
209
301
|
children: /*#__PURE__*/jsx(Select, {
|
|
210
302
|
required: true,
|
|
303
|
+
searchable: true,
|
|
211
304
|
ref: inputRef,
|
|
212
305
|
label: t("label.field"),
|
|
213
306
|
options: fields,
|
|
@@ -253,7 +346,7 @@ var FilterForm = function FilterForm(_ref) {
|
|
|
253
346
|
})
|
|
254
347
|
})
|
|
255
348
|
}), /*#__PURE__*/jsxs("div", {
|
|
256
|
-
className: "flex
|
|
349
|
+
className: "flex mt-4 justify-end gap-1 sticky bottom-1 bg-base",
|
|
257
350
|
children: [onRemove && /*#__PURE__*/jsx("div", {
|
|
258
351
|
className: "flex-1",
|
|
259
352
|
children: /*#__PURE__*/jsx(Button, {
|
|
@@ -14,7 +14,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
14
14
|
var FilterMenu = function FilterMenu(_ref) {
|
|
15
15
|
var filter = _ref.filter;
|
|
16
16
|
_ref.fields;
|
|
17
|
-
var
|
|
17
|
+
var editable = _ref.editable,
|
|
18
|
+
onChange = _ref.onChange,
|
|
18
19
|
onRemove = _ref.onRemove;
|
|
19
20
|
var _useTranslation = useTranslation("searchbar"),
|
|
20
21
|
t = _useTranslation.t;
|
|
@@ -31,7 +32,7 @@ var FilterMenu = function FilterMenu(_ref) {
|
|
|
31
32
|
onRemove: onRemove
|
|
32
33
|
}) : /*#__PURE__*/jsxs(Menu, {
|
|
33
34
|
className: "text-sm",
|
|
34
|
-
children: [filter.canEdit !== false ? /*#__PURE__*/jsx(MenuItem, {
|
|
35
|
+
children: [editable && filter.canEdit !== false ? /*#__PURE__*/jsx(MenuItem, {
|
|
35
36
|
icon: CoreIcons.edit,
|
|
36
37
|
label: t("label.edit"),
|
|
37
38
|
"data-dropdown-dismiss": "false",
|
|
@@ -52,7 +53,7 @@ var FilterMenu = function FilterMenu(_ref) {
|
|
|
52
53
|
pinned: !filter.pinned
|
|
53
54
|
}));
|
|
54
55
|
}
|
|
55
|
-
}), filter.canInvert !== false && /*#__PURE__*/jsx(MenuItem, {
|
|
56
|
+
}), filter.canInvert !== false && filter.field && /*#__PURE__*/jsx(MenuItem, {
|
|
56
57
|
label: t(filter.negate ? "label.include" : "label.exclude"),
|
|
57
58
|
onClick: function onClick() {
|
|
58
59
|
return onChange(_objectSpread(_objectSpread({}, filter), {}, {
|
|
@@ -15,6 +15,7 @@ var FilterTag = function FilterTag(_ref) {
|
|
|
15
15
|
var _filter$icon;
|
|
16
16
|
var filter = _ref.filter,
|
|
17
17
|
fields = _ref.fields,
|
|
18
|
+
editable = _ref.editable,
|
|
18
19
|
_ref$includedColor = _ref.includedColor,
|
|
19
20
|
includedColor = _ref$includedColor === void 0 ? "primary-500" : _ref$includedColor,
|
|
20
21
|
_ref$excludedColor = _ref.excludedColor,
|
|
@@ -26,7 +27,7 @@ var FilterTag = function FilterTag(_ref) {
|
|
|
26
27
|
var label = useMemo(function () {
|
|
27
28
|
var _filter$value;
|
|
28
29
|
if (filter.label) return /*#__PURE__*/jsxs(Fragment, {
|
|
29
|
-
children: [filter.negate && /*#__PURE__*/jsx("span", {
|
|
30
|
+
children: [filter.field && filter.negate && /*#__PURE__*/jsx("span", {
|
|
30
31
|
className: "font-semibold",
|
|
31
32
|
children: "NOT"
|
|
32
33
|
}), /*#__PURE__*/jsx("span", {
|
|
@@ -34,7 +35,7 @@ var FilterTag = function FilterTag(_ref) {
|
|
|
34
35
|
})]
|
|
35
36
|
});
|
|
36
37
|
return /*#__PURE__*/jsxs(Fragment, {
|
|
37
|
-
children: [filter.negate && /*#__PURE__*/jsx("span", {
|
|
38
|
+
children: [filter.field && filter.negate && /*#__PURE__*/jsx("span", {
|
|
38
39
|
className: "font-semibold",
|
|
39
40
|
children: "NOT"
|
|
40
41
|
}), /*#__PURE__*/jsx("span", {
|
|
@@ -52,7 +53,7 @@ var FilterTag = function FilterTag(_ref) {
|
|
|
52
53
|
}, [filter]);
|
|
53
54
|
var color = useMemo(function () {
|
|
54
55
|
var _filter$color;
|
|
55
|
-
return (_filter$color = filter.color) !== null && _filter$color !== void 0 ? _filter$color : filter.negate ? excludedColor : includedColor;
|
|
56
|
+
return (_filter$color = filter.color) !== null && _filter$color !== void 0 ? _filter$color : filter.field && filter.negate ? excludedColor : includedColor;
|
|
56
57
|
}, [filter, includedColor, excludedColor]);
|
|
57
58
|
var icon = useMemo(function () {
|
|
58
59
|
if (filter.canDisable === false) return undefined;
|
|
@@ -63,7 +64,7 @@ var FilterTag = function FilterTag(_ref) {
|
|
|
63
64
|
children: [/*#__PURE__*/jsx(Chip, {
|
|
64
65
|
size: "sm",
|
|
65
66
|
color: color,
|
|
66
|
-
className: "outline
|
|
67
|
+
className: classNames("outline max-w-60", filter.disabled && "opacity-65"),
|
|
67
68
|
variant: filter.pinned ? "solid" : undefined,
|
|
68
69
|
icon: icon,
|
|
69
70
|
iconColor: color,
|
|
@@ -72,6 +73,8 @@ var FilterTag = function FilterTag(_ref) {
|
|
|
72
73
|
disabled: !filter.disabled
|
|
73
74
|
})), e.stopPropagation()];
|
|
74
75
|
},
|
|
76
|
+
"data-ref": "filterTag",
|
|
77
|
+
"data-test-value": filter.id,
|
|
75
78
|
stopPropagation: true,
|
|
76
79
|
onRemove: filter.required ? undefined : function () {
|
|
77
80
|
return onRemove();
|
|
@@ -79,12 +82,14 @@ var FilterTag = function FilterTag(_ref) {
|
|
|
79
82
|
children: /*#__PURE__*/jsxs("div", {
|
|
80
83
|
className: classNames("flex gap-1 items-center", filter.disabled && "line-through opacity-65"),
|
|
81
84
|
children: [filter.pinned && /*#__PURE__*/jsx(Icon, {
|
|
85
|
+
className: "flex-content",
|
|
82
86
|
icon: (_filter$icon = filter.icon) !== null && _filter$icon !== void 0 ? _filter$icon : CoreIcons.pin
|
|
83
87
|
}), label]
|
|
84
88
|
})
|
|
85
89
|
}), /*#__PURE__*/jsx(FilterMenu, {
|
|
86
90
|
filter: filter,
|
|
87
91
|
fields: fields,
|
|
92
|
+
editable: editable,
|
|
88
93
|
onChange: onChange,
|
|
89
94
|
onRemove: onRemove
|
|
90
95
|
})]
|
|
@@ -13,7 +13,7 @@ import { useTranslation } from 'react-i18next';
|
|
|
13
13
|
import { useFilterContext } from './Context.js';
|
|
14
14
|
import { jsxs, jsx } from 'react/jsx-runtime';
|
|
15
15
|
|
|
16
|
-
var _excluded = ["checked", "error", "invalid"];
|
|
16
|
+
var _excluded = ["checked", "error", "invalid", "ref"];
|
|
17
17
|
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; }
|
|
18
18
|
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; }
|
|
19
19
|
var QuerySchema = new yup.ObjectSchema({
|
|
@@ -37,7 +37,8 @@ var QueryForm = function QueryForm(_ref) {
|
|
|
37
37
|
var _useFilterContext = useFilterContext(),
|
|
38
38
|
_useFilterContext$def = _useFilterContext.defaultQuery,
|
|
39
39
|
defaultQuery = _useFilterContext$def === void 0 ? "" : _useFilterContext$def,
|
|
40
|
-
querySchema = _useFilterContext.querySchema
|
|
40
|
+
querySchema = _useFilterContext.querySchema,
|
|
41
|
+
queryLanguage = _useFilterContext.queryLanguage;
|
|
41
42
|
var inputRef = useRef(null);
|
|
42
43
|
var filterValue = useMemo(function () {
|
|
43
44
|
var _filter$query;
|
|
@@ -87,8 +88,9 @@ var QueryForm = function QueryForm(_ref) {
|
|
|
87
88
|
children: function children(_ref2) {
|
|
88
89
|
_ref2.checked;
|
|
89
90
|
_ref2.error;
|
|
90
|
-
var invalid = _ref2.invalid
|
|
91
|
-
|
|
91
|
+
var invalid = _ref2.invalid;
|
|
92
|
+
_ref2.ref;
|
|
93
|
+
var field = _objectWithoutProperties(_ref2, _excluded);
|
|
92
94
|
return /*#__PURE__*/jsxs("div", {
|
|
93
95
|
className: "my-2",
|
|
94
96
|
children: [/*#__PURE__*/jsx("label", {
|
|
@@ -100,6 +102,7 @@ var QueryForm = function QueryForm(_ref) {
|
|
|
100
102
|
gridTemplate: '"content" 1fr/1fr'
|
|
101
103
|
},
|
|
102
104
|
children: /*#__PURE__*/jsx(CodeEditor, _objectSpread(_objectSpread({
|
|
105
|
+
language: queryLanguage !== null && queryLanguage !== void 0 ? queryLanguage : "text",
|
|
103
106
|
minimal: true,
|
|
104
107
|
required: true
|
|
105
108
|
}, field), {}, {
|
|
@@ -109,7 +112,7 @@ var QueryForm = function QueryForm(_ref) {
|
|
|
109
112
|
});
|
|
110
113
|
}
|
|
111
114
|
}), /*#__PURE__*/jsxs("div", {
|
|
112
|
-
className: "flex justify-end gap-1",
|
|
115
|
+
className: "flex mt-4 justify-end gap-1 sticky bottom-1 bg-base",
|
|
113
116
|
children: [onRemove && /*#__PURE__*/jsx("div", {
|
|
114
117
|
className: "flex-1",
|
|
115
118
|
children: /*#__PURE__*/jsx(Button, {
|
package/dist/esm/i18n/en.json.js
CHANGED
|
@@ -7,12 +7,12 @@ import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProper
|
|
|
7
7
|
import { useLocalStorage, useDebounce, Button } from '@react-fabric/core';
|
|
8
8
|
import { Field, AutoComplete } from '@react-fabric/form';
|
|
9
9
|
import { EMPTY_ARRAY, isArray, dedupe } from '@react-fabric/utilities';
|
|
10
|
-
import { useState, useMemo, useReducer } from 'react';
|
|
10
|
+
import { useState, useMemo, useReducer, useEffect } from 'react';
|
|
11
11
|
import { useTranslation } from 'react-i18next';
|
|
12
12
|
import { FilterBar } from '../filterbar/FilterBar.js';
|
|
13
13
|
import { jsxs, jsx } from '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
18
|
var SearchBar = function SearchBar(_ref) {
|
|
@@ -31,9 +31,10 @@ var SearchBar = function SearchBar(_ref) {
|
|
|
31
31
|
defaultCollapsed = _ref$defaultCollapsed === void 0 ? false : _ref$defaultCollapsed;
|
|
32
32
|
_ref.disabled;
|
|
33
33
|
_ref.onCollapsed;
|
|
34
|
-
|
|
35
|
-
onSearch = _ref.onSearch,
|
|
34
|
+
_ref.onQuery;
|
|
35
|
+
var onSearch = _ref.onSearch,
|
|
36
36
|
query = _ref.query,
|
|
37
|
+
ref = _ref.ref,
|
|
37
38
|
multiple = _ref.multiple,
|
|
38
39
|
_ref$filters = _ref.filters,
|
|
39
40
|
filters = _ref$filters === void 0 ? EMPTY_ARRAY : _ref$filters,
|
|
@@ -52,12 +53,23 @@ var SearchBar = function SearchBar(_ref) {
|
|
|
52
53
|
return multiple ? EMPTY_ARRAY : "";
|
|
53
54
|
}, [multiple]);
|
|
54
55
|
var fireSearch = useDebounce(function (query, filters) {
|
|
56
|
+
dispatch({
|
|
57
|
+
type: "dirty",
|
|
58
|
+
dirty: false
|
|
59
|
+
});
|
|
55
60
|
onSearch === null || onSearch === void 0 || onSearch({
|
|
56
61
|
query: query,
|
|
57
62
|
filters: filters
|
|
58
63
|
});
|
|
59
64
|
}, []);
|
|
60
65
|
var _useReducer = useReducer(function (state, action) {
|
|
66
|
+
if (action.type === "reset") {
|
|
67
|
+
return _objectSpread(_objectSpread({}, state), {}, {
|
|
68
|
+
dirty: false,
|
|
69
|
+
query: action.query,
|
|
70
|
+
filters: action.filters
|
|
71
|
+
});
|
|
72
|
+
}
|
|
61
73
|
if (action.type === "dirty") {
|
|
62
74
|
return _objectSpread(_objectSpread({}, state), {}, {
|
|
63
75
|
dirty: action.dirty
|
|
@@ -88,6 +100,13 @@ var SearchBar = function SearchBar(_ref) {
|
|
|
88
100
|
_useReducer2 = _slicedToArray(_useReducer, 2),
|
|
89
101
|
state = _useReducer2[0],
|
|
90
102
|
dispatch = _useReducer2[1];
|
|
103
|
+
useEffect(function () {
|
|
104
|
+
dispatch({
|
|
105
|
+
type: "reset",
|
|
106
|
+
filters: filters,
|
|
107
|
+
query: query
|
|
108
|
+
});
|
|
109
|
+
}, [filters, query]);
|
|
91
110
|
var updateHistory = function updateHistory(value) {
|
|
92
111
|
var historyEntry = isArray(value) ? value : [value];
|
|
93
112
|
setHistory(dedupe([].concat(_toConsumableArray(historyEntry), _toConsumableArray(history))).slice(0, historyCount));
|
|
@@ -119,6 +138,7 @@ var SearchBar = function SearchBar(_ref) {
|
|
|
119
138
|
}), prepend, /*#__PURE__*/jsx(AutoComplete, {
|
|
120
139
|
allowClear: true,
|
|
121
140
|
expandOnEdit: true,
|
|
141
|
+
ref: ref,
|
|
122
142
|
multiple: multiple,
|
|
123
143
|
history: history,
|
|
124
144
|
value: state.query,
|
|
@@ -131,7 +151,7 @@ var SearchBar = function SearchBar(_ref) {
|
|
|
131
151
|
});
|
|
132
152
|
},
|
|
133
153
|
onSelect: updateHistory,
|
|
134
|
-
|
|
154
|
+
"data-ref": "searchbarInput",
|
|
135
155
|
onEnterPressed: function onEnterPressed() {
|
|
136
156
|
return fireSearch(state.query, state.filters);
|
|
137
157
|
}
|
package/dist/esm/types/index.js
CHANGED
|
@@ -29,9 +29,12 @@ 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
|
}({});
|
|
@@ -39,6 +42,7 @@ var OPERATOR = /*#__PURE__*/function (OPERATOR) {
|
|
|
39
42
|
OPERATOR["EXISTS"] = "EXISTS";
|
|
40
43
|
OPERATOR["IS"] = "IS";
|
|
41
44
|
OPERATOR["IN"] = "IN";
|
|
45
|
+
OPERATOR["EQ"] = "EQ";
|
|
42
46
|
OPERATOR["LT"] = "LT";
|
|
43
47
|
OPERATOR["GT"] = "GT";
|
|
44
48
|
OPERATOR["LTE"] = "LTE";
|
|
@@ -54,12 +58,15 @@ var OPERATOR = /*#__PURE__*/function (OPERATOR) {
|
|
|
54
58
|
/**
|
|
55
59
|
* @internal
|
|
56
60
|
*/
|
|
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.
|
|
61
|
+
var TypeOperators = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, FIELD_TYPE.ID, [OPERATOR.IS, OPERATOR.IN]), FIELD_TYPE.STRING, [OPERATOR.EXISTS, OPERATOR.IS, OPERATOR.IN]), FIELD_TYPE.TEXT, [OPERATOR.EXISTS, OPERATOR.INCLUDES, 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
62
|
|
|
59
63
|
/**
|
|
60
64
|
* @internal
|
|
65
|
+
* 0 single value
|
|
66
|
+
* 1 many values
|
|
67
|
+
* 2 two values
|
|
61
68
|
*/
|
|
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.
|
|
69
|
+
(_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.EQ, 0), OPERATOR.LT, 0), _defineProperty(_defineProperty(_defineProperty(_OperatorValueType, OPERATOR.GT, 0), OPERATOR.LTE, 0), OPERATOR.GTE, 0));
|
|
63
70
|
|
|
64
71
|
/**
|
|
65
72
|
* @internal
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
import { type FilterBarProps } from "../types";
|
|
3
|
-
export declare const FilterContext: import("react").Context<Pick<FilterBarProps, "querySchema" | "defaultQuery" | "fields">>;
|
|
4
|
-
export declare const useFilterContext: () => Pick<FilterBarProps, "querySchema" | "defaultQuery" | "fields">;
|
|
3
|
+
export declare const FilterContext: import("react").Context<Pick<FilterBarProps, "querySchema" | "queryLanguage" | "defaultQuery" | "fields">>;
|
|
4
|
+
export declare const useFilterContext: () => Pick<FilterBarProps, "querySchema" | "queryLanguage" | "defaultQuery" | "fields">;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { type FilterBarProps } from "../types";
|
|
2
|
-
export declare const FilterBar: ({ filters, allowAdd, fields, querySchema, defaultQuery, includedColor, excludedColor, onFilterChanged, }: FilterBarProps) => import("react/jsx-runtime").JSX.Element;
|
|
2
|
+
export declare const FilterBar: ({ filters, allowAdd, fields, editable, querySchema, queryLanguage, defaultQuery, includedColor, excludedColor, onFilterChanged, }: FilterBarProps) => import("react/jsx-runtime").JSX.Element;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { type FilterField, type FilterObject } from "../types";
|
|
2
|
-
export declare const FilterMenu: ({ filter, fields, onChange, onRemove, }: {
|
|
2
|
+
export declare const FilterMenu: ({ filter, fields, editable, onChange, onRemove, }: {
|
|
3
3
|
fields?: FilterField[];
|
|
4
|
+
editable?: boolean;
|
|
4
5
|
filter: FilterObject;
|
|
5
6
|
onRemove: () => void;
|
|
6
7
|
onChange: (filter: FilterObject) => void;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { type FilterBarProps, type FilterObject } from "../types";
|
|
2
|
-
export declare const FilterTag: ({ filter, fields, includedColor, excludedColor, onChange, onRemove, }: {
|
|
2
|
+
export declare const FilterTag: ({ filter, fields, editable, includedColor, excludedColor, onChange, onRemove, }: {
|
|
3
3
|
filter: FilterObject;
|
|
4
|
+
editable?: boolean;
|
|
4
5
|
onRemove: () => void;
|
|
5
6
|
onChange: (filter: FilterObject) => void;
|
|
6
7
|
} & Pick<FilterBarProps, "fields" | "includedColor" | "excludedColor">) => import("react/jsx-runtime").JSX.Element;
|
package/dist/types/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import "./i18n";
|
|
2
2
|
export { FilterBar } from "./filterbar/FilterBar";
|
|
3
3
|
export { SearchBar } from "./searchbar/SearchBar";
|
|
4
|
-
export { FIELD_TYPE, OPERATOR, type FilterObject } from "./types";
|
|
4
|
+
export { FIELD_TYPE, OPERATOR, type FilterObject, type SearchObject, } from "./types";
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { type FilterBarProps, type SearchBarProps } from "../types";
|
|
2
|
-
export declare const SearchBar: ({ historyKey, historyCount, defaultQueryList, prepend, append, decorateEnd, decorateStart, children, hideFilters, defaultCollapsed, disabled, onCollapsed, onQuery, onSearch, query, multiple, filters, ...filterProps }: SearchBarProps & Omit<FilterBarProps, "onFilterChanged">) => import("react/jsx-runtime").JSX.Element;
|
|
2
|
+
export declare const SearchBar: ({ historyKey, historyCount, defaultQueryList, prepend, append, decorateEnd, decorateStart, children, hideFilters, defaultCollapsed, disabled, onCollapsed, onQuery, onSearch, query, ref, multiple, filters, ...filterProps }: SearchBarProps & Omit<FilterBarProps, "onFilterChanged">) => import("react/jsx-runtime").JSX.Element;
|