@react-fabric/searchbar 1.0.0-beta.49 → 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/FilterForm.js +13 -2
- package/dist/cjs/types/index.js +2 -1
- package/dist/esm/filterbar/FilterForm.js +14 -3
- package/dist/esm/types/index.js +2 -1
- package/dist/types/types/index.d.ts +2 -0
- package/package.json +9 -9
- package/src/filterbar/FilterForm.tsx +10 -1
- package/src/types/index.ts +4 -3
|
@@ -190,6 +190,16 @@ var FilterForm = function FilterForm(_ref) {
|
|
|
190
190
|
});
|
|
191
191
|
}
|
|
192
192
|
}
|
|
193
|
+
if (field.type === index.FIELD_TYPE.TEXT) {
|
|
194
|
+
return /*#__PURE__*/jsxRuntime.jsx(form.Controller, {
|
|
195
|
+
name: "value",
|
|
196
|
+
children: /*#__PURE__*/jsxRuntime.jsx(form.Textarea, {
|
|
197
|
+
rows: 3,
|
|
198
|
+
label: t("label.value"),
|
|
199
|
+
allowClear: true
|
|
200
|
+
})
|
|
201
|
+
});
|
|
202
|
+
}
|
|
193
203
|
if ((field === null || field === void 0 ? void 0 : field.type) === index.FIELD_TYPE.DECIMAL || (field === null || field === void 0 ? void 0 : field.type) === index.FIELD_TYPE.NUMBER) {
|
|
194
204
|
var step = field.type === index.FIELD_TYPE.DECIMAL ? 0.1 : 1;
|
|
195
205
|
if ((values === null || values === void 0 ? void 0 : values.operator) === index.OPERATOR.BETWEEN) {
|
|
@@ -269,11 +279,12 @@ var FilterForm = function FilterForm(_ref) {
|
|
|
269
279
|
negate: model.negate,
|
|
270
280
|
operator: model.operator,
|
|
271
281
|
value: model.value,
|
|
272
|
-
label: model.label
|
|
282
|
+
label: model.label,
|
|
283
|
+
type: field === null || field === void 0 ? void 0 : field.type
|
|
273
284
|
};
|
|
274
285
|
onChange === null || onChange === void 0 || onChange(filter);
|
|
275
286
|
tree === null || tree === void 0 || tree.events.emit("close");
|
|
276
|
-
}, [onChange]);
|
|
287
|
+
}, [field, onChange]);
|
|
277
288
|
return /*#__PURE__*/jsxRuntime.jsx(form.Form, {
|
|
278
289
|
formRef: formRef,
|
|
279
290
|
schema: FilterSchema,
|
package/dist/cjs/types/index.js
CHANGED
|
@@ -29,6 +29,7 @@ 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";
|
|
@@ -57,7 +58,7 @@ var OPERATOR = /*#__PURE__*/function (OPERATOR) {
|
|
|
57
58
|
/**
|
|
58
59
|
* @internal
|
|
59
60
|
*/
|
|
60
|
-
var TypeOperators = _defineProperty(_defineProperty(_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.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]);
|
|
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]);
|
|
61
62
|
|
|
62
63
|
/**
|
|
63
64
|
* @internal
|
|
@@ -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, DateInput, 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';
|
|
@@ -190,6 +190,16 @@ var FilterForm = function FilterForm(_ref) {
|
|
|
190
190
|
});
|
|
191
191
|
}
|
|
192
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
|
+
}
|
|
193
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) {
|
|
194
204
|
var step = field.type === FIELD_TYPE.DECIMAL ? 0.1 : 1;
|
|
195
205
|
if ((values === null || values === void 0 ? void 0 : values.operator) === OPERATOR.BETWEEN) {
|
|
@@ -269,11 +279,12 @@ var FilterForm = function FilterForm(_ref) {
|
|
|
269
279
|
negate: model.negate,
|
|
270
280
|
operator: model.operator,
|
|
271
281
|
value: model.value,
|
|
272
|
-
label: model.label
|
|
282
|
+
label: model.label,
|
|
283
|
+
type: field === null || field === void 0 ? void 0 : field.type
|
|
273
284
|
};
|
|
274
285
|
onChange === null || onChange === void 0 || onChange(filter);
|
|
275
286
|
tree === null || tree === void 0 || tree.events.emit("close");
|
|
276
|
-
}, [onChange]);
|
|
287
|
+
}, [field, onChange]);
|
|
277
288
|
return /*#__PURE__*/jsx(Form, {
|
|
278
289
|
formRef: formRef,
|
|
279
290
|
schema: FilterSchema,
|
package/dist/esm/types/index.js
CHANGED
|
@@ -29,6 +29,7 @@ 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";
|
|
@@ -57,7 +58,7 @@ var OPERATOR = /*#__PURE__*/function (OPERATOR) {
|
|
|
57
58
|
/**
|
|
58
59
|
* @internal
|
|
59
60
|
*/
|
|
60
|
-
var TypeOperators = _defineProperty(_defineProperty(_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.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]);
|
|
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]);
|
|
61
62
|
|
|
62
63
|
/**
|
|
63
64
|
* @internal
|
|
@@ -3,6 +3,7 @@ import { type ReactElement } from "react";
|
|
|
3
3
|
export declare enum FIELD_TYPE {
|
|
4
4
|
ID = "ID",
|
|
5
5
|
STRING = "STRING",
|
|
6
|
+
TEXT = "TEXT",
|
|
6
7
|
NUMBER = "NUMBER",
|
|
7
8
|
DECIMAL = "DECIMAL",
|
|
8
9
|
BOOLEAN = "BOOLEAN",
|
|
@@ -65,6 +66,7 @@ export type FilterObject = BaseFilter & ({
|
|
|
65
66
|
negate?: boolean;
|
|
66
67
|
canInvert?: boolean;
|
|
67
68
|
query?: never;
|
|
69
|
+
type?: string;
|
|
68
70
|
} | {
|
|
69
71
|
field?: never;
|
|
70
72
|
operator?: never;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@react-fabric/searchbar",
|
|
3
|
-
"version": "1.0.0-beta.
|
|
3
|
+
"version": "1.0.0-beta.51",
|
|
4
4
|
"description": "RUF: Searchbar with filters package",
|
|
5
5
|
"author": "Adarsh Pastakia <adarshpastakia@outlook.com>",
|
|
6
6
|
"license": "MIT",
|
|
@@ -34,25 +34,25 @@
|
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
36
|
"@floating-ui/react": "^0.27.9",
|
|
37
|
-
"@react-fabric/core": "^1.0.0-beta.
|
|
38
|
-
"@react-fabric/form": "^1.0.0-beta.
|
|
39
|
-
"@react-fabric/monaco": "^1.0.0-beta.
|
|
40
|
-
"@react-fabric/utilities": "^1.0.0-beta.
|
|
37
|
+
"@react-fabric/core": "^1.0.0-beta.51",
|
|
38
|
+
"@react-fabric/form": "^1.0.0-beta.51",
|
|
39
|
+
"@react-fabric/monaco": "^1.0.0-beta.51",
|
|
40
|
+
"@react-fabric/utilities": "^1.0.0-beta.50",
|
|
41
41
|
"classnames": "^2.5.1",
|
|
42
42
|
"react-hook-form": "^7.56.4"
|
|
43
43
|
},
|
|
44
44
|
"peerDependencies": {
|
|
45
|
-
"i18next": "^
|
|
45
|
+
"i18next": "^25.2.1",
|
|
46
46
|
"react": "^19.0.0",
|
|
47
47
|
"react-dom": "^19.0.0",
|
|
48
|
-
"react-i18next": "^15.
|
|
48
|
+
"react-i18next": "^15.5.2"
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
51
|
-
"@react-fabric/superdate": "^1.0.0-beta.
|
|
51
|
+
"@react-fabric/superdate": "^1.0.0-beta.51"
|
|
52
52
|
},
|
|
53
53
|
"engines": {
|
|
54
54
|
"node": ">=18.12.0",
|
|
55
55
|
"npm": ">=8.19.0"
|
|
56
56
|
},
|
|
57
|
-
"gitHead": "
|
|
57
|
+
"gitHead": "a1b04de4663045f82992bff2aef8db26608eac74"
|
|
58
58
|
}
|
|
@@ -32,6 +32,7 @@ import {
|
|
|
32
32
|
Number,
|
|
33
33
|
Select,
|
|
34
34
|
Switch,
|
|
35
|
+
Textarea,
|
|
35
36
|
type FormRef,
|
|
36
37
|
} from "@react-fabric/form";
|
|
37
38
|
import { isArray, shortHash, yup } from "@react-fabric/utilities";
|
|
@@ -214,6 +215,13 @@ export const FilterForm = ({
|
|
|
214
215
|
);
|
|
215
216
|
}
|
|
216
217
|
}
|
|
218
|
+
if (field.type === FIELD_TYPE.TEXT) {
|
|
219
|
+
return (
|
|
220
|
+
<Controller name="value">
|
|
221
|
+
<Textarea rows={3} label={t("label.value")} allowClear />
|
|
222
|
+
</Controller>
|
|
223
|
+
);
|
|
224
|
+
}
|
|
217
225
|
if (
|
|
218
226
|
field?.type === FIELD_TYPE.DECIMAL ||
|
|
219
227
|
field?.type === FIELD_TYPE.NUMBER
|
|
@@ -279,11 +287,12 @@ export const FilterForm = ({
|
|
|
279
287
|
operator: model.operator,
|
|
280
288
|
value: model.value as AnyObject,
|
|
281
289
|
label: model.label,
|
|
290
|
+
type: field?.type,
|
|
282
291
|
};
|
|
283
292
|
onChange?.(filter);
|
|
284
293
|
tree?.events.emit("close");
|
|
285
294
|
},
|
|
286
|
-
[onChange],
|
|
295
|
+
[field, onChange],
|
|
287
296
|
);
|
|
288
297
|
|
|
289
298
|
return (
|
package/src/types/index.ts
CHANGED
|
@@ -30,6 +30,7 @@ import { type ReactElement } from "react";
|
|
|
30
30
|
export enum FIELD_TYPE {
|
|
31
31
|
ID = "ID",
|
|
32
32
|
STRING = "STRING",
|
|
33
|
+
TEXT = "TEXT",
|
|
33
34
|
NUMBER = "NUMBER",
|
|
34
35
|
DECIMAL = "DECIMAL",
|
|
35
36
|
BOOLEAN = "BOOLEAN",
|
|
@@ -60,10 +61,9 @@ export enum OPERATOR {
|
|
|
60
61
|
*/
|
|
61
62
|
export const TypeOperators: { [key in FIELD_TYPE]: OPERATOR[] } = {
|
|
62
63
|
[FIELD_TYPE.ID]: [OPERATOR.IS, OPERATOR.IN],
|
|
63
|
-
[FIELD_TYPE.STRING]: [
|
|
64
|
+
[FIELD_TYPE.STRING]: [OPERATOR.EXISTS, OPERATOR.IS, OPERATOR.IN],
|
|
65
|
+
[FIELD_TYPE.TEXT]: [
|
|
64
66
|
OPERATOR.EXISTS,
|
|
65
|
-
OPERATOR.IS,
|
|
66
|
-
OPERATOR.IN,
|
|
67
67
|
OPERATOR.INCLUDES,
|
|
68
68
|
OPERATOR.STARTS,
|
|
69
69
|
OPERATOR.ENDS,
|
|
@@ -168,6 +168,7 @@ export type FilterObject = BaseFilter &
|
|
|
168
168
|
negate?: boolean;
|
|
169
169
|
canInvert?: boolean;
|
|
170
170
|
query?: never;
|
|
171
|
+
type?: string;
|
|
171
172
|
}
|
|
172
173
|
| {
|
|
173
174
|
field?: never;
|