feat: up auto focus

nexpy-io · Apr 24, 2024 · 6f5e822 · 6f5e822
1 parent 34e3d49
commit 6f5e822
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "react",
     "typescript"
   ],
-  "version": "2.3.10",
+  "version": "2.3.11",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.esm.js",
   "types": "./dist/index.d.ts",

diff --git a/src/hooks/useRegisterFieldFocus.ts b/src/hooks/useRegisterFieldFocus.ts
@@ -22,10 +22,6 @@ export const useRegisterFieldFocus = (fieldName?: string | undefined) => {
 
   const autoFocusContextValue = AutoFocusContext.useContext()
 
-  if (fieldName && autoFocusContextValue?.setFocus) {
-    sequentialFieldNamesRef.current.push(fieldName)
-  }
-
   const onKeyDown = useCallback(
     (e: any) => {
       console.log('autoFocusContextValue', autoFocusContextValue)
@@ -69,6 +65,10 @@ export const useRegisterFieldFocus = (fieldName?: string | undefined) => {
   )
 
   useEffect(() => {
+    if (fieldName && autoFocusContextValue?.setFocus) {
+      sequentialFieldNamesRef.current.push(fieldName)
+    }
+
     return () => {
       if (!autoFocusContextValue?.setFocus) {
         return
@@ -80,7 +80,9 @@ export const useRegisterFieldFocus = (fieldName?: string | undefined) => {
         )
       }
     }
-  }, [autoFocusContextValue?.setFocus, fieldName, sequentialFieldNamesRef])
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [autoFocusContextValue?.setFocus])
 
   return onKeyDown
 }