@rolster/react-components 18.15.11 → 18.15.13
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/index.js +13 -23
- package/dist/cjs/index.js.map +1 -1
- package/dist/es/index.js +13 -23
- package/dist/es/index.js.map +1 -1
- package/dist/esm/components/organisms/FieldAutocomplete/FieldAutocompleteHook.js +3 -3
- package/dist/esm/components/organisms/FieldSelect/FieldSelectHook.js +2 -2
- package/dist/esm/hooks/ListControlHook.d.ts +1 -1
- package/dist/esm/hooks/ListControlHook.js +8 -18
- package/dist/esm/hooks/ListControlHook.js.map +1 -1
- package/package.json +1 -1
|
@@ -12,7 +12,7 @@ export function useFieldAutocomplete({ disabled, formControl, onSelect, onValue,
|
|
|
12
12
|
previous: null
|
|
13
13
|
});
|
|
14
14
|
const listControl = useListControl({ suggestions, formControl });
|
|
15
|
-
const { inputRef, navigationElement, navigationInput, setFocused,
|
|
15
|
+
const { inputRef, navigationElement, navigationInput, setFocused, setFormValue, setValue, setVisible } = listControl;
|
|
16
16
|
useEffect(() => {
|
|
17
17
|
refreshCoincidences(pattern, true);
|
|
18
18
|
}, [suggestions]);
|
|
@@ -47,7 +47,7 @@ export function useFieldAutocomplete({ disabled, formControl, onSelect, onValue,
|
|
|
47
47
|
function onClickAction() {
|
|
48
48
|
setVisible(false);
|
|
49
49
|
setValue('');
|
|
50
|
-
|
|
50
|
+
setFormValue(undefined);
|
|
51
51
|
onValue && onValue(undefined);
|
|
52
52
|
}
|
|
53
53
|
function onClickBackdrop() {
|
|
@@ -69,7 +69,7 @@ export function useFieldAutocomplete({ disabled, formControl, onSelect, onValue,
|
|
|
69
69
|
onSelect(value);
|
|
70
70
|
}
|
|
71
71
|
else {
|
|
72
|
-
|
|
72
|
+
setFormValue(value);
|
|
73
73
|
setValue(description);
|
|
74
74
|
}
|
|
75
75
|
onValue && onValue(value);
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { useListControl } from '../../../hooks';
|
|
2
2
|
export function useFieldSelect({ suggestions, formControl, onSelect, onValue }) {
|
|
3
3
|
const listControl = useListControl({ suggestions, formControl });
|
|
4
|
-
const { inputRef, visible, navigationElement, navigationInput, setFocused,
|
|
4
|
+
const { inputRef, visible, navigationElement, navigationInput, setFocused, setFormValue, setValue, setVisible } = listControl;
|
|
5
5
|
function onFocusInput() {
|
|
6
6
|
setFocused(true);
|
|
7
7
|
}
|
|
@@ -50,7 +50,7 @@ export function useFieldSelect({ suggestions, formControl, onSelect, onValue })
|
|
|
50
50
|
onSelect(value);
|
|
51
51
|
}
|
|
52
52
|
else {
|
|
53
|
-
|
|
53
|
+
setFormValue(value);
|
|
54
54
|
setValue(description);
|
|
55
55
|
}
|
|
56
56
|
onValue && onValue(value);
|
|
@@ -14,7 +14,7 @@ export interface ListControl<T = any> extends ListControlState {
|
|
|
14
14
|
navigationElement: (event: KeyboardEvent) => void;
|
|
15
15
|
navigationInput: (event: KeyboardEvent) => void;
|
|
16
16
|
setFocused: (focused: boolean) => void;
|
|
17
|
-
|
|
17
|
+
setFormValue(value: Undefined<T>): void;
|
|
18
18
|
setValue: (value: string) => void;
|
|
19
19
|
setVisible: (visible: boolean) => void;
|
|
20
20
|
}
|
|
@@ -12,7 +12,6 @@ export function useListControl({ suggestions, formControl }) {
|
|
|
12
12
|
});
|
|
13
13
|
const collection = useRef(new ListCollection([]));
|
|
14
14
|
const position = useRef(0);
|
|
15
|
-
const changeInternal = useRef(false);
|
|
16
15
|
const protectedValue = useRef();
|
|
17
16
|
useEffect(() => {
|
|
18
17
|
function onCloseSuggestions({ target }) {
|
|
@@ -25,35 +24,29 @@ export function useListControl({ suggestions, formControl }) {
|
|
|
25
24
|
};
|
|
26
25
|
}, []);
|
|
27
26
|
useEffect(() => {
|
|
28
|
-
formControl?.touch();
|
|
27
|
+
state.visible && formControl?.touch();
|
|
29
28
|
setState((state) => ({
|
|
30
29
|
...state,
|
|
31
30
|
higher: locationListCanTop(contentRef.current, listRef.current)
|
|
32
31
|
}));
|
|
33
32
|
}, [state.visible]);
|
|
34
|
-
useEffect(() => {
|
|
35
|
-
if (!changeInternal.current) {
|
|
36
|
-
changeInternal.current = false;
|
|
37
|
-
return;
|
|
38
|
-
}
|
|
39
|
-
refresh(collection.current, formControl?.value);
|
|
40
|
-
}, [formControl?.value]);
|
|
41
33
|
useEffect(() => {
|
|
42
34
|
collection.current = new ListCollection(suggestions);
|
|
43
35
|
refresh(collection.current, formControl?.value);
|
|
44
|
-
}, [suggestions]);
|
|
36
|
+
}, [suggestions, formControl?.value]);
|
|
45
37
|
function refresh(collection, state) {
|
|
46
38
|
if (!state) {
|
|
47
39
|
return refreshProtected(collection) ? undefined : setValue('');
|
|
48
40
|
}
|
|
49
41
|
const element = collection.find(state);
|
|
50
42
|
if (element) {
|
|
43
|
+
protectedValue.current = undefined;
|
|
51
44
|
return setValue(element.description);
|
|
52
45
|
}
|
|
53
46
|
if (!refreshProtected(collection)) {
|
|
54
47
|
protectedValue.current = state;
|
|
55
48
|
setValue('');
|
|
56
|
-
|
|
49
|
+
setFormValue(undefined);
|
|
57
50
|
}
|
|
58
51
|
}
|
|
59
52
|
function refreshProtected(collection) {
|
|
@@ -73,11 +66,8 @@ export function useListControl({ suggestions, formControl }) {
|
|
|
73
66
|
function setValue(value) {
|
|
74
67
|
setState((state) => ({ ...state, value }));
|
|
75
68
|
}
|
|
76
|
-
function
|
|
77
|
-
|
|
78
|
-
changeInternal.current = true;
|
|
79
|
-
formControl.setValue(value);
|
|
80
|
-
}
|
|
69
|
+
function setFormValue(value) {
|
|
70
|
+
formControl?.setValue(value);
|
|
81
71
|
}
|
|
82
72
|
function setVisible(visible) {
|
|
83
73
|
setState((state) => ({ ...state, visible }));
|
|
@@ -89,7 +79,7 @@ export function useListControl({ suggestions, formControl }) {
|
|
|
89
79
|
event: event,
|
|
90
80
|
list: listRef.current
|
|
91
81
|
});
|
|
92
|
-
position.current = newPosition
|
|
82
|
+
position.current = newPosition ?? 0;
|
|
93
83
|
}
|
|
94
84
|
}
|
|
95
85
|
function navigationElement(event) {
|
|
@@ -109,7 +99,7 @@ export function useListControl({ suggestions, formControl }) {
|
|
|
109
99
|
navigationElement,
|
|
110
100
|
navigationInput,
|
|
111
101
|
setFocused,
|
|
112
|
-
|
|
102
|
+
setFormValue,
|
|
113
103
|
setValue,
|
|
114
104
|
setVisible
|
|
115
105
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ListControlHook.js","sourceRoot":"","sources":["../../../src/hooks/ListControlHook.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,cAAc,EACd,yBAAyB,EACzB,uBAAuB,EACvB,kBAAkB,EACnB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAA4B,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AA0B9E,MAAM,UAAU,cAAc,CAAU,EACtC,WAAW,EACX,WAAW,EACS;IACpB,MAAM,UAAU,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,MAAM,CAAmB,IAAI,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAG,MAAM,CAAmB,IAAI,CAAC,CAAC;IAEhD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAmB;QACnD,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,EAAE;QACT,OAAO,EAAE,KAAK;KACf,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,cAAc,CAAI,EAAE,CAAC,CAAC,CAAC;IACrD,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IAC3B,MAAM,cAAc,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"ListControlHook.js","sourceRoot":"","sources":["../../../src/hooks/ListControlHook.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,cAAc,EACd,yBAAyB,EACzB,uBAAuB,EACvB,kBAAkB,EACnB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAA4B,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AA0B9E,MAAM,UAAU,cAAc,CAAU,EACtC,WAAW,EACX,WAAW,EACS;IACpB,MAAM,UAAU,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,MAAM,CAAmB,IAAI,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAG,MAAM,CAAmB,IAAI,CAAC,CAAC;IAEhD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAmB;QACnD,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,EAAE;QACT,OAAO,EAAE,KAAK;KACf,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,cAAc,CAAI,EAAE,CAAC,CAAC,CAAC;IACrD,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IAC3B,MAAM,cAAc,GAAG,MAAM,EAAK,CAAC;IAEnC,SAAS,CAAC,GAAG,EAAE;QACb,SAAS,kBAAkB,CAAC,EAAE,MAAM,EAAc;YAChD,CAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAC,MAAa,CAAC;gBAC3C,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;QACxD,CAAC;QAED,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;QAEvD,OAAO,GAAG,EAAE;YACV,QAAQ,CAAC,mBAAmB,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;QAC5D,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,SAAS,CAAC,GAAG,EAAE;QACb,KAAK,CAAC,OAAO,IAAI,WAAW,EAAE,KAAK,EAAE,CAAC;QAEtC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACnB,GAAG,KAAK;YACR,MAAM,EAAE,kBAAkB,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC;SAChE,CAAC,CAAC,CAAC;IACN,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IAEpB,SAAS,CAAC,GAAG,EAAE;QACb,UAAU,CAAC,OAAO,GAAG,IAAI,cAAc,CAAC,WAAW,CAAC,CAAC;QACrD,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;IAClD,CAAC,EAAE,CAAC,WAAW,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;IAEtC,SAAS,OAAO,CAAC,UAA6B,EAAE,KAAS;QACvD,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACjE,CAAC;QAED,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEvC,IAAI,OAAO,EAAE,CAAC;YACZ,cAAc,CAAC,OAAO,GAAG,SAAS,CAAC;YACnC,OAAO,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACvC,CAAC;QAED,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,EAAE,CAAC;YAClC,cAAc,CAAC,OAAO,GAAG,KAAK,CAAC;YAC/B,QAAQ,CAAC,EAAE,CAAC,CAAC;YACb,YAAY,CAAC,SAAS,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC;IAED,SAAS,gBAAgB,CAAC,UAA6B;QACrD,IAAI,cAAc,CAAC,OAAO,EAAE,CAAC;YAC3B,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;YAExD,IAAI,OAAO,EAAE,CAAC;gBACZ,WAAW,EAAE,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;gBAC9C,cAAc,CAAC,OAAO,GAAG,SAAS,CAAC;gBACnC,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED,SAAS,UAAU,CAAC,OAAgB;QAClC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED,SAAS,QAAQ,CAAC,KAAa;QAC7B,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IAC7C,CAAC;IAED,SAAS,YAAY,CAAC,KAAmB;QACvC,WAAW,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,SAAS,UAAU,CAAC,OAAgB;QAClC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED,SAAS,eAAe,CAAC,KAAoB;QAC3C,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,WAAW,GAAG,uBAAuB,CAAC;gBAC1C,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,KAAK,EAAE,KAAY;gBACnB,IAAI,EAAE,OAAO,CAAC,OAAO;aACtB,CAAC,CAAC;YAEH,QAAQ,CAAC,OAAO,GAAG,WAAW,IAAI,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;IAED,SAAS,iBAAiB,CAAC,KAAoB;QAC7C,QAAQ,CAAC,OAAO,GAAG,yBAAyB,CAAC;YAC3C,OAAO,EAAE,UAAU,CAAC,OAAO;YAC3B,KAAK,EAAE,KAAY;YACnB,KAAK,EAAE,QAAQ,CAAC,OAAO;YACvB,IAAI,EAAE,OAAO,CAAC,OAAO;YACrB,QAAQ,EAAE,QAAQ,CAAC,OAAO;SAC3B,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,GAAG,KAAK;QACR,UAAU;QACV,QAAQ;QACR,OAAO;QACP,iBAAiB;QACjB,eAAe;QACf,UAAU;QACV,YAAY;QACZ,QAAQ;QACR,UAAU;KACX,CAAC;AACJ,CAAC"}
|