tycho-components 0.0.17-SNAPSHOT-25 → 0.0.17-SNAPSHOT-27
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.
|
@@ -4,10 +4,10 @@ export type DefaultOption = {
|
|
|
4
4
|
value: any;
|
|
5
5
|
};
|
|
6
6
|
declare const FilterUtils: {
|
|
7
|
-
apply: (form: UseFormReturn<any>, setFilter: (f: any) => void, onClose: () => void) => void;
|
|
8
|
-
clear: (setFilter: (f: any) => void, onClose: () => void, clearValues: any) => void;
|
|
7
|
+
apply: (form: UseFormReturn<any>, setFilter: (f: any) => void, onClose: () => void, emptyPageable: any) => void;
|
|
8
|
+
clear: (form: UseFormReturn<any>, setFilter: (f: any) => void, onClose: () => void, clearValues: any) => void;
|
|
9
9
|
isSelected: (filter: any) => "" | "selected";
|
|
10
|
-
reset: (setFilter: (p: any) => void, clearValues: any) => void;
|
|
11
|
-
enter: (form: UseFormReturn<any>, setFilter: any, event: React.KeyboardEvent<HTMLDivElement>, onClose: () => void) => void;
|
|
10
|
+
reset: (form: UseFormReturn<any>, setFilter: (p: any) => void, clearValues: any) => void;
|
|
11
|
+
enter: (form: UseFormReturn<any>, setFilter: any, event: React.KeyboardEvent<HTMLDivElement>, onClose: () => void, emptyPageable: any) => void;
|
|
12
12
|
};
|
|
13
13
|
export default FilterUtils;
|
|
@@ -1,22 +1,22 @@
|
|
|
1
|
-
import { EMPTY_PAGEABLE } from '../AppTable/types/AppPageable';
|
|
2
1
|
import DateUtils from './DateUtils';
|
|
3
|
-
const enter = (form, setFilter, event, onClose) => {
|
|
2
|
+
const enter = (form, setFilter, event, onClose, emptyPageable) => {
|
|
4
3
|
// 'keypress' event misbehaves on mobile so we track 'Enter' key via 'keydown' event
|
|
5
4
|
if (event.key === 'Enter') {
|
|
6
5
|
event.preventDefault();
|
|
7
6
|
event.stopPropagation();
|
|
8
|
-
apply(form, setFilter, onClose);
|
|
7
|
+
apply(form, setFilter, onClose, emptyPageable);
|
|
9
8
|
}
|
|
10
9
|
};
|
|
11
|
-
const apply = (form, setFilter, onClose) => {
|
|
12
|
-
setFilter({ ...form.getValues(), ...
|
|
10
|
+
const apply = (form, setFilter, onClose, emptyPageable) => {
|
|
11
|
+
setFilter({ ...form.getValues(), ...emptyPageable });
|
|
13
12
|
onClose();
|
|
14
13
|
};
|
|
15
|
-
const clear = (setFilter, onClose, clearValues) => {
|
|
16
|
-
reset(setFilter, clearValues);
|
|
14
|
+
const clear = (form, setFilter, onClose, clearValues) => {
|
|
15
|
+
reset(form, setFilter, clearValues);
|
|
17
16
|
onClose();
|
|
18
17
|
};
|
|
19
|
-
const reset = (setFilter, clearValues) => {
|
|
18
|
+
const reset = (form, setFilter, clearValues) => {
|
|
19
|
+
form.reset(clearValues);
|
|
20
20
|
setFilter({
|
|
21
21
|
...clearValues,
|
|
22
22
|
seed: DateUtils.millis(),
|
|
@@ -46,9 +46,6 @@ const isObjectEmpty = (filter) => {
|
|
|
46
46
|
});
|
|
47
47
|
return empty;
|
|
48
48
|
};
|
|
49
|
-
function isString(value) {
|
|
50
|
-
return typeof value === 'string' || value instanceof String;
|
|
51
|
-
}
|
|
52
49
|
const FilterUtils = {
|
|
53
50
|
apply,
|
|
54
51
|
clear,
|