@danikokonn/yarik-frontend-lib 2.0.58-test7 → 2.0.58-test9
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RichFilterTextField.d.ts","sourceRoot":"","sources":["../../../src/components/RichFilterTextField/RichFilterTextField.tsx"],"names":[],"mappings":"AAAA,OAAO,KAMN,MAAM,OAAO,CAAC;AAUf,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAKlE,QAAA,MAAM,mBAAmB,GAAI,4HAS1B,wBAAwB,
|
|
1
|
+
{"version":3,"file":"RichFilterTextField.d.ts","sourceRoot":"","sources":["../../../src/components/RichFilterTextField/RichFilterTextField.tsx"],"names":[],"mappings":"AAAA,OAAO,KAMN,MAAM,OAAO,CAAC;AAUf,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAKlE,QAAA,MAAM,mBAAmB,GAAI,4HAS1B,wBAAwB,sBAyP1B,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
|
|
@@ -13,10 +13,8 @@ const RichFilterTextField = ({ filterExpr, filterExprHist, fields, operators, ad
|
|
|
13
13
|
const { enqueueSnackbar } = useSnackbarContext();
|
|
14
14
|
const [search, setSearch] = useState(filterExpr);
|
|
15
15
|
const instant = _instant ?? true;
|
|
16
|
-
// Принудительное изменение состояния, если изменился пропс
|
|
17
|
-
useEffect(() => setSearch(filterExpr), [filterExpr]);
|
|
18
16
|
const [searchHist, setSearchHist] = useState(filterExprHist);
|
|
19
|
-
const [inputAnchor, setInputAnchor] = useState(null);
|
|
17
|
+
// const [inputAnchor, setInputAnchor] = useState<HTMLDivElement | null>(null);
|
|
20
18
|
const [cursorPos, setCursorPos] = useState(null);
|
|
21
19
|
// const [currentHintOptions, setCurrentHintOptions] = useState<
|
|
22
20
|
// Map<string, string | undefined>
|
|
@@ -27,13 +25,14 @@ const RichFilterTextField = ({ filterExpr, filterExprHist, fields, operators, ad
|
|
|
27
25
|
const currentHintOptions = (cursorPos != null
|
|
28
26
|
? getHints(search, cursorPos, fields, operators)
|
|
29
27
|
: null) ?? new Map();
|
|
28
|
+
const inputAnchor = currentHintOptions?.size > 0 ? textFieldRef.current : null;
|
|
30
29
|
useEffect(() => {
|
|
31
30
|
if (cursorPos == null)
|
|
32
31
|
return;
|
|
33
32
|
if (currentHintOptions === getHints(search, cursorPos, fields, operators))
|
|
34
33
|
return;
|
|
35
34
|
setFocusIdx(0);
|
|
36
|
-
setInputAnchor(currentHintOptions?.size > 0 ? textFieldRef.current : null);
|
|
35
|
+
// setInputAnchor(currentHintOptions?.size > 0 ? textFieldRef.current : null);
|
|
37
36
|
}, [search, cursorPos]);
|
|
38
37
|
useEffect(() => {
|
|
39
38
|
if (cursorPos == null)
|
|
@@ -43,6 +42,8 @@ const RichFilterTextField = ({ filterExpr, filterExprHist, fields, operators, ad
|
|
|
43
42
|
inputRef.current.selectionEnd = cursorPos;
|
|
44
43
|
}
|
|
45
44
|
}, [cursorPos]);
|
|
45
|
+
// Принудительное изменение состояния, если изменился пропс
|
|
46
|
+
// useEffect(() => setSearch(filterExpr), [filterExpr]);
|
|
46
47
|
const handleChange = (value, _idx) => {
|
|
47
48
|
setSearch(value);
|
|
48
49
|
onChange(value, (v) => setSearchHist(v));
|
|
@@ -91,7 +92,7 @@ const RichFilterTextField = ({ filterExpr, filterExprHist, fields, operators, ad
|
|
|
91
92
|
}
|
|
92
93
|
case "Escape":
|
|
93
94
|
case "Tab": {
|
|
94
|
-
setInputAnchor(null);
|
|
95
|
+
// setInputAnchor(null);
|
|
95
96
|
setCursorPos(null);
|
|
96
97
|
break;
|
|
97
98
|
}
|
|
@@ -139,7 +140,7 @@ const RichFilterTextField = ({ filterExpr, filterExprHist, fields, operators, ad
|
|
|
139
140
|
}
|
|
140
141
|
case "Escape":
|
|
141
142
|
case "Tab": {
|
|
142
|
-
setInputAnchor(null);
|
|
143
|
+
// setInputAnchor(null);
|
|
143
144
|
setCursorPos(null);
|
|
144
145
|
break;
|
|
145
146
|
}
|
|
@@ -181,7 +182,7 @@ const RichFilterTextField = ({ filterExpr, filterExprHist, fields, operators, ad
|
|
|
181
182
|
},
|
|
182
183
|
} }),
|
|
183
184
|
React.createElement(HintOptionsMenu, { inputAnchor: inputAnchor, inputRef: inputRef, textFieldRef: textFieldRef, options: currentHintOptions, focusIdx: focusIdx, onSelectHint: insertHint, onClose: () => {
|
|
184
|
-
setInputAnchor(null);
|
|
185
|
+
// setInputAnchor(null);
|
|
185
186
|
setCursorPos(null);
|
|
186
187
|
} })));
|
|
187
188
|
};
|