@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
package/src/types/index.ts
CHANGED
|
@@ -21,17 +21,21 @@
|
|
|
21
21
|
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
22
22
|
*/
|
|
23
23
|
|
|
24
|
-
import {
|
|
24
|
+
import {
|
|
25
|
+
type ChildrenProp,
|
|
26
|
+
type RefProp,
|
|
27
|
+
} from "@react-fabric/core/dist/types/types";
|
|
25
28
|
import { type ReactElement } from "react";
|
|
26
29
|
|
|
27
30
|
export enum FIELD_TYPE {
|
|
28
31
|
ID = "ID",
|
|
29
32
|
STRING = "STRING",
|
|
33
|
+
TEXT = "TEXT",
|
|
30
34
|
NUMBER = "NUMBER",
|
|
31
35
|
DECIMAL = "DECIMAL",
|
|
32
36
|
BOOLEAN = "BOOLEAN",
|
|
33
|
-
|
|
34
|
-
|
|
37
|
+
DATE = "DATE",
|
|
38
|
+
DATETIME = "DATETIME",
|
|
35
39
|
// GEO = "GEO",
|
|
36
40
|
NONE = "NONE",
|
|
37
41
|
}
|
|
@@ -40,6 +44,7 @@ export enum OPERATOR {
|
|
|
40
44
|
EXISTS = "EXISTS",
|
|
41
45
|
IS = "IS",
|
|
42
46
|
IN = "IN",
|
|
47
|
+
EQ = "EQ",
|
|
43
48
|
LT = "LT",
|
|
44
49
|
GT = "GT",
|
|
45
50
|
LTE = "LTE",
|
|
@@ -56,17 +61,16 @@ export enum OPERATOR {
|
|
|
56
61
|
*/
|
|
57
62
|
export const TypeOperators: { [key in FIELD_TYPE]: OPERATOR[] } = {
|
|
58
63
|
[FIELD_TYPE.ID]: [OPERATOR.IS, OPERATOR.IN],
|
|
59
|
-
[FIELD_TYPE.STRING]: [
|
|
64
|
+
[FIELD_TYPE.STRING]: [OPERATOR.EXISTS, OPERATOR.IS, OPERATOR.IN],
|
|
65
|
+
[FIELD_TYPE.TEXT]: [
|
|
60
66
|
OPERATOR.EXISTS,
|
|
61
|
-
OPERATOR.IS,
|
|
62
|
-
OPERATOR.IN,
|
|
63
67
|
OPERATOR.INCLUDES,
|
|
64
68
|
OPERATOR.STARTS,
|
|
65
69
|
OPERATOR.ENDS,
|
|
66
70
|
],
|
|
67
71
|
[FIELD_TYPE.NUMBER]: [
|
|
68
72
|
OPERATOR.EXISTS,
|
|
69
|
-
OPERATOR.
|
|
73
|
+
OPERATOR.EQ,
|
|
70
74
|
OPERATOR.BETWEEN,
|
|
71
75
|
OPERATOR.LT,
|
|
72
76
|
OPERATOR.GT,
|
|
@@ -75,34 +79,41 @@ export const TypeOperators: { [key in FIELD_TYPE]: OPERATOR[] } = {
|
|
|
75
79
|
],
|
|
76
80
|
[FIELD_TYPE.DECIMAL]: [
|
|
77
81
|
OPERATOR.EXISTS,
|
|
78
|
-
OPERATOR.
|
|
82
|
+
OPERATOR.EQ,
|
|
83
|
+
OPERATOR.BETWEEN,
|
|
84
|
+
OPERATOR.LT,
|
|
85
|
+
OPERATOR.GT,
|
|
86
|
+
OPERATOR.LTE,
|
|
87
|
+
OPERATOR.GTE,
|
|
88
|
+
],
|
|
89
|
+
[FIELD_TYPE.BOOLEAN]: [OPERATOR.EXISTS, OPERATOR.EQ],
|
|
90
|
+
[FIELD_TYPE.DATE]: [
|
|
91
|
+
OPERATOR.EXISTS,
|
|
92
|
+
OPERATOR.EQ,
|
|
93
|
+
OPERATOR.BETWEEN,
|
|
94
|
+
OPERATOR.LT,
|
|
95
|
+
OPERATOR.GT,
|
|
96
|
+
OPERATOR.LTE,
|
|
97
|
+
OPERATOR.GTE,
|
|
98
|
+
],
|
|
99
|
+
[FIELD_TYPE.DATETIME]: [
|
|
100
|
+
OPERATOR.EXISTS,
|
|
101
|
+
OPERATOR.EQ,
|
|
79
102
|
OPERATOR.BETWEEN,
|
|
80
103
|
OPERATOR.LT,
|
|
81
104
|
OPERATOR.GT,
|
|
82
105
|
OPERATOR.LTE,
|
|
83
106
|
OPERATOR.GTE,
|
|
84
107
|
],
|
|
85
|
-
[FIELD_TYPE.BOOLEAN]: [OPERATOR.EXISTS, OPERATOR.IS],
|
|
86
|
-
// [FIELD_TYPE.DATE]: [
|
|
87
|
-
// OPERATOR.BETWEEN,
|
|
88
|
-
// OPERATOR.LT,
|
|
89
|
-
// OPERATOR.GT,
|
|
90
|
-
// OPERATOR.LTE,
|
|
91
|
-
// OPERATOR.GTE,
|
|
92
|
-
// ],
|
|
93
|
-
// [FIELD_TYPE.DATETIME]: [
|
|
94
|
-
// OPERATOR.BETWEEN,
|
|
95
|
-
// OPERATOR.LT,
|
|
96
|
-
// OPERATOR.GT,
|
|
97
|
-
// OPERATOR.LTE,
|
|
98
|
-
// OPERATOR.GTE,
|
|
99
|
-
// ],
|
|
100
108
|
// [FIELD_TYPE.GEO]: [],
|
|
101
109
|
[FIELD_TYPE.NONE]: [OPERATOR.EXISTS],
|
|
102
110
|
};
|
|
103
111
|
|
|
104
112
|
/**
|
|
105
113
|
* @internal
|
|
114
|
+
* 0 single value
|
|
115
|
+
* 1 many values
|
|
116
|
+
* 2 two values
|
|
106
117
|
*/
|
|
107
118
|
export const OperatorValueType: {
|
|
108
119
|
[key in OPERATOR]: 0 | 1 | 2;
|
|
@@ -115,6 +126,7 @@ export const OperatorValueType: {
|
|
|
115
126
|
[OPERATOR.STARTS]: 0,
|
|
116
127
|
[OPERATOR.ENDS]: 0,
|
|
117
128
|
[OPERATOR.INCLUDES]: 0,
|
|
129
|
+
[OPERATOR.EQ]: 0,
|
|
118
130
|
[OPERATOR.LT]: 0,
|
|
119
131
|
[OPERATOR.GT]: 0,
|
|
120
132
|
[OPERATOR.LTE]: 0,
|
|
@@ -140,12 +152,10 @@ interface BaseFilter {
|
|
|
140
152
|
color?: string;
|
|
141
153
|
value?: FilterValue;
|
|
142
154
|
pinned?: boolean;
|
|
143
|
-
negate?: boolean;
|
|
144
155
|
disabled?: boolean;
|
|
145
156
|
required?: boolean;
|
|
146
157
|
canPin?: boolean;
|
|
147
158
|
canEdit?: boolean;
|
|
148
|
-
canInvert?: boolean;
|
|
149
159
|
canDisable?: boolean;
|
|
150
160
|
}
|
|
151
161
|
|
|
@@ -153,16 +163,18 @@ export type FilterObject = BaseFilter &
|
|
|
153
163
|
(
|
|
154
164
|
| {
|
|
155
165
|
field: string;
|
|
156
|
-
type?: FIELD_TYPE;
|
|
157
166
|
operator: OPERATOR;
|
|
158
167
|
value?: FilterValue;
|
|
168
|
+
negate?: boolean;
|
|
169
|
+
canInvert?: boolean;
|
|
159
170
|
query?: never;
|
|
171
|
+
type?: string;
|
|
160
172
|
}
|
|
161
173
|
| {
|
|
162
174
|
field?: never;
|
|
163
|
-
type?: never;
|
|
164
175
|
operator?: never;
|
|
165
176
|
label: string;
|
|
177
|
+
canInvert?: false;
|
|
166
178
|
query: string;
|
|
167
179
|
}
|
|
168
180
|
);
|
|
@@ -185,7 +197,9 @@ export interface FilterField {
|
|
|
185
197
|
onSearch?: (q: string) => Promise<FieldValue[]> | FieldValue[];
|
|
186
198
|
}
|
|
187
199
|
|
|
188
|
-
interface BaseSearchBarProps
|
|
200
|
+
interface BaseSearchBarProps
|
|
201
|
+
extends Partial<ChildrenProp>,
|
|
202
|
+
RefProp<HTMLInputElement> {
|
|
189
203
|
/**
|
|
190
204
|
* Query string
|
|
191
205
|
*/
|
|
@@ -291,12 +305,12 @@ export interface FilterBarProps {
|
|
|
291
305
|
/**
|
|
292
306
|
* Editable filters
|
|
293
307
|
*/
|
|
294
|
-
|
|
308
|
+
editable?: boolean;
|
|
295
309
|
|
|
296
310
|
/**
|
|
297
311
|
* Disable component
|
|
298
312
|
*/
|
|
299
|
-
|
|
313
|
+
disabled?: boolean;
|
|
300
314
|
|
|
301
315
|
/**
|
|
302
316
|
* Message for empty field list
|
|
@@ -313,6 +327,8 @@ export interface FilterBarProps {
|
|
|
313
327
|
excludedColor?: string;
|
|
314
328
|
|
|
315
329
|
allowAdd?: boolean;
|
|
330
|
+
|
|
331
|
+
queryLanguage?: "text" | "json";
|
|
316
332
|
querySchema?: Array<{ uri: string; schema: KeyValue }>;
|
|
317
333
|
defaultQuery?: string;
|
|
318
334
|
|