@react-fabric/searchbar 1.0.0-beta.6 → 1.0.0-beta.60
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 +10 -6
- package/dist/cjs/filterbar/FilterForm.js +141 -36
- package/dist/cjs/filterbar/FilterMenu.js +16 -4
- package/dist/cjs/filterbar/FilterTag.js +16 -8
- package/dist/cjs/filterbar/FilterView.js +6 -2
- package/dist/cjs/filterbar/QueryForm.js +9 -7
- package/dist/cjs/i18n/ar.json.js +42 -39
- package/dist/cjs/i18n/en.json.js +43 -39
- package/dist/cjs/searchbar/SearchBar.js +60 -7
- package/dist/cjs/types/index.js +12 -4
- package/dist/esm/filterbar/FilterBar.js +10 -6
- package/dist/esm/filterbar/FilterForm.js +142 -37
- package/dist/esm/filterbar/FilterMenu.js +16 -4
- package/dist/esm/filterbar/FilterTag.js +16 -8
- package/dist/esm/filterbar/FilterView.js +6 -2
- package/dist/esm/filterbar/QueryForm.js +9 -7
- package/dist/esm/i18n/ar.json.js +42 -39
- package/dist/esm/i18n/en.json.js +43 -39
- package/dist/esm/searchbar/SearchBar.js +61 -8
- package/dist/esm/types/index.js +12 -4
- package/dist/types/filterbar/Context.d.ts +2 -3
- package/dist/types/filterbar/FilterBar.d.ts +27 -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 +35 -1
- package/dist/types/types/index.d.ts +19 -10
- package/package.json +16 -14
- package/src/filterbar/Context.tsx +4 -1
- package/src/filterbar/FilterBar.tsx +49 -7
- package/src/filterbar/FilterForm.tsx +110 -25
- package/src/filterbar/FilterMenu.tsx +30 -3
- package/src/filterbar/FilterTag.tsx +25 -9
- package/src/filterbar/FilterView.tsx +5 -2
- package/src/filterbar/QueryForm.tsx +5 -5
- package/src/i18n/ar.json +42 -39
- package/src/i18n/en.json +43 -39
- package/src/index.ts +6 -1
- package/src/searchbar/SearchBar.tsx +58 -5
- package/src/types/index.ts +57 -34
|
@@ -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.
|
|
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
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
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)
|
|
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)
|
|
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
|
-
|
|
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__*/
|
|
154
|
-
|
|
155
|
-
children:
|
|
156
|
-
|
|
157
|
-
children: /*#__PURE__*/jsx(
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
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,
|
|
@@ -200,7 +304,7 @@ var FilterForm = function FilterForm(_ref) {
|
|
|
200
304
|
onChange: setValues,
|
|
201
305
|
onSubmit: handleSubmit,
|
|
202
306
|
children: /*#__PURE__*/jsxs("div", {
|
|
203
|
-
className: "w-
|
|
307
|
+
className: "w-lg",
|
|
204
308
|
children: [/*#__PURE__*/jsxs(Row, {
|
|
205
309
|
children: [/*#__PURE__*/jsx(Col, {
|
|
206
310
|
flex: "fill",
|
|
@@ -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,
|
|
@@ -217,7 +322,7 @@ var FilterForm = function FilterForm(_ref) {
|
|
|
217
322
|
})
|
|
218
323
|
})
|
|
219
324
|
}), /*#__PURE__*/jsxs(Col, {
|
|
220
|
-
flex: "
|
|
325
|
+
flex: "content",
|
|
221
326
|
className: "text-center",
|
|
222
327
|
children: [/*#__PURE__*/jsx("label", {
|
|
223
328
|
className: "block py-0.5 text-sm",
|
|
@@ -229,7 +334,7 @@ var FilterForm = function FilterForm(_ref) {
|
|
|
229
334
|
})
|
|
230
335
|
})]
|
|
231
336
|
}), /*#__PURE__*/jsx(Col, {
|
|
232
|
-
flex: "
|
|
337
|
+
flex: "content",
|
|
233
338
|
className: "basis-28",
|
|
234
339
|
children: /*#__PURE__*/jsx(Controller, {
|
|
235
340
|
name: "operator",
|
|
@@ -253,7 +358,7 @@ var FilterForm = function FilterForm(_ref) {
|
|
|
253
358
|
})
|
|
254
359
|
})
|
|
255
360
|
}), /*#__PURE__*/jsxs("div", {
|
|
256
|
-
className: "flex
|
|
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
|
|
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.
|
|
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), {}, {
|
|
@@ -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,16 +64,18 @@ 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
|
-
icon: icon
|
|
69
|
-
|
|
69
|
+
icon: icon && {
|
|
70
|
+
icon: icon,
|
|
71
|
+
color: color
|
|
72
|
+
},
|
|
70
73
|
onIconClick: function onIconClick(e) {
|
|
71
74
|
return [onChange(_objectSpread(_objectSpread({}, filter), {}, {
|
|
72
75
|
disabled: !filter.disabled
|
|
73
76
|
})), e.stopPropagation()];
|
|
74
77
|
},
|
|
75
|
-
"data-
|
|
78
|
+
"data-ref": "filterTag",
|
|
76
79
|
"data-test-value": filter.id,
|
|
77
80
|
stopPropagation: true,
|
|
78
81
|
onRemove: filter.required ? undefined : function () {
|
|
@@ -81,12 +84,17 @@ var FilterTag = function FilterTag(_ref) {
|
|
|
81
84
|
children: /*#__PURE__*/jsxs("div", {
|
|
82
85
|
className: classNames("flex gap-1 items-center", filter.disabled && "line-through opacity-65"),
|
|
83
86
|
children: [filter.pinned && /*#__PURE__*/jsx(Icon, {
|
|
87
|
+
className: "flex-content",
|
|
84
88
|
icon: (_filter$icon = filter.icon) !== null && _filter$icon !== void 0 ? _filter$icon : CoreIcons.pin
|
|
85
|
-
}),
|
|
89
|
+
}), /*#__PURE__*/jsx("div", {
|
|
90
|
+
className: "truncate flex gap-x-0.5 flex-nowrap",
|
|
91
|
+
children: label
|
|
92
|
+
})]
|
|
86
93
|
})
|
|
87
94
|
}), /*#__PURE__*/jsx(FilterMenu, {
|
|
88
95
|
filter: filter,
|
|
89
96
|
fields: fields,
|
|
97
|
+
editable: editable,
|
|
90
98
|
onChange: onChange,
|
|
91
99
|
onRemove: onRemove
|
|
92
100
|
})]
|
|
@@ -45,10 +45,14 @@ var FilterView = function FilterView(_ref) {
|
|
|
45
45
|
var _filter$value2;
|
|
46
46
|
value = "[".concat((_filter$value2 = filter.value) === null || _filter$value2 === void 0 ? void 0 : _filter$value2.join(" - "), "]");
|
|
47
47
|
}
|
|
48
|
-
if (filter.operator === OPERATOR.
|
|
48
|
+
if (filter.operator === OPERATOR.ANY && isArray(filter.value)) {
|
|
49
49
|
var _filter$value3;
|
|
50
50
|
value = "[".concat((_filter$value3 = filter.value) === null || _filter$value3 === void 0 ? void 0 : _filter$value3.join(", "), "]");
|
|
51
51
|
}
|
|
52
|
+
if (filter.operator === OPERATOR.ALL && isArray(filter.value)) {
|
|
53
|
+
var _filter$value4;
|
|
54
|
+
value = "(".concat((_filter$value4 = filter.value) === null || _filter$value4 === void 0 ? void 0 : _filter$value4.join(", "), ")");
|
|
55
|
+
}
|
|
52
56
|
return /*#__PURE__*/jsxs(Fragment, {
|
|
53
57
|
children: [filter.negate && /*#__PURE__*/jsx("b", {
|
|
54
58
|
children: "NOT\xA0"
|
|
@@ -72,7 +76,7 @@ var FilterView = function FilterView(_ref) {
|
|
|
72
76
|
text: view
|
|
73
77
|
})
|
|
74
78
|
}), /*#__PURE__*/jsx("pre", {
|
|
75
|
-
className: "overflow-auto bg-base outline text-sm p-2 max-h-
|
|
79
|
+
className: "overflow-auto bg-base outline text-sm p-2 max-h-96 max-w-3xl min-w-[24rem]",
|
|
76
80
|
children: view
|
|
77
81
|
}), !filter.required && /*#__PURE__*/jsx(Button, {
|
|
78
82
|
size: "sm",
|
|
@@ -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,20 +88,21 @@ 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", {
|
|
95
97
|
className: classNames("block px-2", invalid && "text-danger-600"),
|
|
96
98
|
children: t("label.query")
|
|
97
99
|
}), /*#__PURE__*/jsx("div", {
|
|
98
|
-
className: "h-
|
|
100
|
+
className: "h-96 w-xl grid outline place-content-start",
|
|
99
101
|
style: {
|
|
100
102
|
gridTemplate: '"content" 1fr/1fr'
|
|
101
103
|
},
|
|
102
104
|
children: /*#__PURE__*/jsx(CodeEditor, _objectSpread(_objectSpread({
|
|
103
|
-
language: "
|
|
105
|
+
language: queryLanguage !== null && queryLanguage !== void 0 ? queryLanguage : "text",
|
|
104
106
|
minimal: true,
|
|
105
107
|
required: true
|
|
106
108
|
}, field), {}, {
|
|
@@ -110,7 +112,7 @@ var QueryForm = function QueryForm(_ref) {
|
|
|
110
112
|
});
|
|
111
113
|
}
|
|
112
114
|
}), /*#__PURE__*/jsxs("div", {
|
|
113
|
-
className: "flex justify-end gap-1",
|
|
115
|
+
className: "flex mt-4 justify-end gap-1 sticky bottom-1 bg-base",
|
|
114
116
|
children: [onRemove && /*#__PURE__*/jsx("div", {
|
|
115
117
|
className: "flex-1",
|
|
116
118
|
children: /*#__PURE__*/jsx(Button, {
|
package/dist/esm/i18n/ar.json.js
CHANGED
|
@@ -1,70 +1,73 @@
|
|
|
1
1
|
'use client';
|
|
2
2
|
|
|
3
3
|
var label = {
|
|
4
|
-
|
|
4
|
+
add: "إضافة عامل تصفية",
|
|
5
5
|
all_filters: "جميع المرشحات",
|
|
6
|
+
apply: "يتقدم",
|
|
7
|
+
basicFilter: "الفلتر الأساسي",
|
|
8
|
+
cancel: "يلغي",
|
|
9
|
+
customQuery: "استعلام مخصص",
|
|
10
|
+
"delete": "يمسح",
|
|
11
|
+
disable: "إبطال",
|
|
12
|
+
disableAll: "تعطيل الكل",
|
|
13
|
+
edit: "يحرر",
|
|
14
|
+
enable: "يُمكَِن",
|
|
15
|
+
enableAll: "تمكين الكل",
|
|
16
|
+
exclude: "استبعاد",
|
|
17
|
+
excludeAll: "استبعاد الكل",
|
|
6
18
|
field: "مجال",
|
|
7
|
-
|
|
8
|
-
|
|
19
|
+
filters: "المرشحات",
|
|
20
|
+
forAdvanced: "للمستخدمين المتقدمين فقط!",
|
|
21
|
+
include: "يشمل",
|
|
22
|
+
includeAll: "تضمين الكل",
|
|
23
|
+
invertAll: "عكس التضمين/الاستبعاد",
|
|
9
24
|
label: "ملصق",
|
|
25
|
+
operator: "المشغل",
|
|
10
26
|
optional: "خياري",
|
|
11
|
-
add: "إضافة عامل تصفية",
|
|
12
|
-
edit: "يحرر",
|
|
13
|
-
view: "منظر",
|
|
14
27
|
pin: "مثبت",
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
invertAll: "عكس التضمين/الاستبعاد",
|
|
28
|
+
query: "استفسار",
|
|
29
|
+
refresh: "ينعش",
|
|
30
|
+
remove: "يزيل",
|
|
19
31
|
removeAll: "إزالة الكل",
|
|
20
|
-
enableAll: "تمكين الكل",
|
|
21
|
-
disableAll: "تعطيل الكل",
|
|
22
32
|
toggleDisable: "عكس تعطيل/تمكين",
|
|
23
|
-
|
|
24
|
-
enable: "يُمكَِن",
|
|
25
|
-
disable: "إبطال",
|
|
26
|
-
exclude: "استبعاد",
|
|
27
|
-
include: "يشمل",
|
|
28
|
-
refresh: "ينعش",
|
|
33
|
+
unpin: "غير مثبت",
|
|
29
34
|
update: "تحديث",
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
basicFilter: "الفلتر الأساسي",
|
|
35
|
-
customQuery: "استعلام مخصص",
|
|
36
|
-
forAdvanced: "للمستخدمين المتقدمين فقط!"
|
|
35
|
+
value: "قيمة",
|
|
36
|
+
view: "منظر",
|
|
37
|
+
matchAll: "تطابق كل شيء",
|
|
38
|
+
matchAny: "تطابق أي"
|
|
37
39
|
};
|
|
38
40
|
var operator = {
|
|
41
|
+
ALL: "كل",
|
|
42
|
+
ANY: "أي من",
|
|
43
|
+
BETWEEN: "بين هذا وذاك",
|
|
44
|
+
ENDS: "ينتهي مع",
|
|
39
45
|
EXISTS: "موجود",
|
|
46
|
+
GT: ">",
|
|
47
|
+
GTE: "≥",
|
|
40
48
|
IS: "يكون",
|
|
41
|
-
|
|
49
|
+
LIKE: "يحب",
|
|
42
50
|
LT: "<",
|
|
43
|
-
GT: ">",
|
|
44
51
|
LTE: "≤",
|
|
45
|
-
GTE: "≥",
|
|
46
|
-
INCLUDES: "يشمل",
|
|
47
52
|
STARTS: "ابدا ب",
|
|
48
|
-
|
|
49
|
-
WITHIN: "في غضون",
|
|
50
|
-
BETWEEN: "بين هذا وذاك"
|
|
53
|
+
WITHIN: "في غضون"
|
|
51
54
|
};
|
|
52
55
|
var placeholder = "مصطلح البحث...";
|
|
53
56
|
var type = {
|
|
54
|
-
STRING: "سلسلة",
|
|
55
|
-
NUMBER: "كثافة العمليات",
|
|
56
|
-
DECIMAL: "يطفو",
|
|
57
57
|
BOOLEAN: "رقم",
|
|
58
58
|
DATE: "منطقي",
|
|
59
59
|
DATETIME: "تاريخ",
|
|
60
|
-
|
|
60
|
+
DECIMAL: "يطفو",
|
|
61
|
+
GEO: "GeoJSON",
|
|
62
|
+
NUMBER: "كثافة العمليات",
|
|
63
|
+
STRING: "سلسلة"
|
|
61
64
|
};
|
|
62
65
|
var validate = {
|
|
66
|
+
compare: "مقارنة الحقل المطلوب",
|
|
63
67
|
field: "حقل مطلوب",
|
|
68
|
+
label: "التصنيف مطلوب",
|
|
64
69
|
operator: "عامل مطلوب",
|
|
65
|
-
value: "القيمة المطلوبة"
|
|
66
|
-
compare: "مقارنة الحقل المطلوب",
|
|
67
|
-
label: "التصنيف مطلوب"
|
|
70
|
+
value: "القيمة المطلوبة"
|
|
68
71
|
};
|
|
69
72
|
var ar = {
|
|
70
73
|
label: label,
|