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

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,sBA+R1B,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,sBAwR1B,CAAC;AAEF,eAAe,mBAAmB,CAAC"}

package/dist/components/RichFilterTextField/RichFilterTextField.js

@@ -12,21 +12,23 @@ 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 prevFilterExpr = useRef(filterExpr);
-    if (prevFilterExpr.current !== filterExpr && filterExpr !== search) {
-        setSearch(filterExpr);
-        prevFilterExpr.current = filterExpr;
-    }
-    const instant = _instant ?? true;
     const [searchHist, setSearchHist] = useState(filterExprHist);
     const [cursorPos, setCursorPos] = useState(null);
     const [focusIdx, setFocusIdx] = useState(0);
     const inputRef = useRef(null);
     const textFieldRef = useRef(null);
+    const prevFilterExpr = useRef(filterExpr);
+    const instant = _instant ?? true;
     const currentHintOptions = (cursorPos != null
         ? getHints(search, cursorPos, fields, operators)
         : null) ?? new Map();
     const inputAnchor = currentHintOptions?.size > 0 ? textFieldRef.current : null;
+    if (prevFilterExpr.current !== filterExpr && filterExpr !== search) {
+        setSearch(filterExpr);
+        setCursorPos(null);
+        setFocusIdx(0);
+        prevFilterExpr.current = filterExpr;
+    }
     if (cursorPos != null &&
         inputRef.current &&
         cursorPos !== inputRef.current.selectionStart) {
@@ -88,7 +90,6 @@ const RichFilterTextField = ({ filterExpr, filterExprHist, fields, operators, ad
             }
             case "Escape":
             case "Tab": {
-                // setInputAnchor(null);
                 setCursorPos(null);
                 break;
             }
@@ -141,7 +142,6 @@ const RichFilterTextField = ({ filterExpr, filterExprHist, fields, operators, ad
             }
             case "Escape":
             case "Tab": {
-                // setInputAnchor(null);
                 setCursorPos(null);
                 setFocusIdx(0);
                 break;
@@ -165,12 +165,7 @@ const RichFilterTextField = ({ filterExpr, filterExprHist, fields, operators, ad
                     getHints(e.target.value, newCursorPos, fields, operators) !==
                         currentHintOptions)
                     setFocusIdx(0);
-            }, 
-            // onClick={(e) => {
-            //   if (e.target !== e.currentTarget) return;
-            //   setCursorPos(inputRef.current?.selectionStart ?? null);
-            // }}
-            onKeyUp: handleKeyUp, onKeyDown: handleKeyDown, slotProps: {
+            }, onKeyUp: handleKeyUp, onKeyDown: handleKeyDown, slotProps: {
                 htmlInput: {
                     onClick: (e) => {
                         if (Object(e).target !== Object(e).currentTarget)
@@ -202,7 +197,6 @@ const RichFilterTextField = ({ filterExpr, filterExprHist, fields, operators, ad
                 },
             } }),
         React.createElement(HintOptionsMenu, { inputAnchor: inputAnchor, inputRef: inputRef, textFieldRef: textFieldRef, options: currentHintOptions, focusIdx: focusIdx, onSelectHint: insertHint, onClose: () => {
-                // setInputAnchor(null);
                 setCursorPos(null);
                 setFocusIdx(0);
             } })));

package/package.json

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