@danikokonn/yarik-frontend-lib 2.0.58-test20 → 2.0.58-test25

package/dist/components/RichFilterTextField/RichFilterTextField.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RichFilterTextField.d.ts","sourceRoot":"","sources":["../../../src/components/RichFilterTextField/RichFilterTextField.tsx"],"names":[],"mappings":"AAAA,OAAO,KAKN,MAAM,OAAO,CAAC;AAUf,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAKlE,QAAA,MAAM,mBAAmB,GAAI,4HAS1B,wBAAwB,sBAwR1B,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"RichFilterTextField.d.ts","sourceRoot":"","sources":["../../../src/components/RichFilterTextField/RichFilterTextField.tsx"],"names":[],"mappings":"AAAA,OAAO,KAKN,MAAM,OAAO,CAAC;AAUf,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAKlE,QAAA,MAAM,mBAAmB,GAAI,4HAS1B,wBAAwB,sBA8R1B,CAAC;AAEF,eAAe,mBAAmB,CAAC"}

package/dist/components/RichFilterTextField/RichFilterTextField.js

@@ -12,7 +12,8 @@ import { Stack } from "@mui/material";
 const RichFilterTextField = ({ filterExpr, filterExprHist, fields, operators, additionalComponents, instant: _instant, onChange, onSelectFromHistory, }) => {
     const { enqueueSnackbar } = useSnackbarContext();
     const [search, setSearch] = useState(filterExpr);
-    const [searchHist, setSearchHist] = useState(filterExprHist);
+    // const [searchHist, setSearchHist] = useState<string[]>(filterExprHist);
+    const searchHist = filterExprHist;
     const [cursorPos, setCursorPos] = useState(null);
     const [focusIdx, setFocusIdx] = useState(0);
     const inputRef = useRef(null);
@@ -40,7 +41,7 @@ const RichFilterTextField = ({ filterExpr, filterExprHist, fields, operators, ad
         if (cursorPos &&
             getHints(value, cursorPos, fields, operators) !== currentHintOptions)
             setFocusIdx(0);
-        onChange(value, (v) => setSearchHist(v));
+        onChange(value /*(v: unknown) => setSearchHist(v as string[])*/);
     };
     const insertHint = (hint) => {
         if (cursorPos == null)
@@ -56,7 +57,6 @@ const RichFilterTextField = ({ filterExpr, filterExprHist, fields, operators, ad
         }
         const { newSearch, newPos } = insertInStrPos(search, cursorPos, hint, fields);
         setSearch(newSearch);
-        onChange(newSearch, (v) => setSearchHist(v));
         let newCursorPos = newPos;
         if (hint.includes("[") || hint.includes("(") || hint.includes("/")) {
             newCursorPos--;
@@ -84,7 +84,8 @@ const RichFilterTextField = ({ filterExpr, filterExprHist, fields, operators, ad
                     insertHint(focusedHint);
                 }
                 else {
-                    onChange(search, (v) => setSearchHist(v));
+                    onChange(search);
+                    inputRef.current?.blur();
                 }
                 break;
             }
@@ -94,7 +95,12 @@ const RichFilterTextField = ({ filterExpr, filterExprHist, fields, operators, ad
                 break;
             }
             default: {
-                setCursorPos(inputRef.current?.selectionStart ?? null);
+                const newCursorPos = inputRef.current?.selectionStart ?? null;
+                setCursorPos(newCursorPos);
+                if (newCursorPos &&
+                    getHints(search, newCursorPos, fields, operators) !==
+                        currentHintOptions)
+                    setFocusIdx(0);
             }
         }
     };
@@ -182,7 +188,7 @@ const RichFilterTextField = ({ filterExpr, filterExprHist, fields, operators, ad
                     startAdornment: (React.createElement(InputAdornment, { position: "start" },
                         React.createElement(Stack, { direction: "row", sx: { alignItems: "center" } },
                             !instant && (React.createElement(IconButton, { onClick: (e) => {
-                                    onChange(search, (v) => setSearchHist(v));
+                                    onChange(search);
                                     e.stopPropagation();
                                 }, title: "\u041F\u043E\u0438\u0441\u043A" },
                                 React.createElement(SearchRoundedIcon, null))),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danikokonn/yarik-frontend-lib",
-  "version": "2.0.58-test20",
+  "version": "2.0.58-test25",
   "license": "Apache-2.0",
   "description": "",
   "author": "",