fix: Only the last two digits can be deleted via BNP when input is no…

…t focused
Expensify · Oct 14, 2024 · 3f86b0f · 3f86b0f
1 parent 4a3f2da
commit 3f86b0f
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/components/MagicCodeInput.tsx b/src/components/MagicCodeInput.tsx
@@ -277,8 +277,10 @@ function MagicCodeInput(
                 const indexBeforeLastEditIndex = editIndex === 0 ? editIndex : editIndex - 1;
 
                 const indexToFocus = numbers.at(editIndex) === CONST.MAGIC_CODE_EMPTY_CHAR ? indexBeforeLastEditIndex : editIndex;
-                const formElement = inputRefs.current as HTMLFormElement | null;
-                (formElement?.[indexToFocus] as HTMLInputElement)?.focus();
+                if (indexToFocus !== undefined) {
+                    lastFocusedIndex.current = indexToFocus;
+                    inputRefs.current?.focus();
+                }
                 onChangeTextProp(value.substring(0, indexToFocus));
 
                 return;
@@ -314,6 +316,7 @@ function MagicCodeInput(
             onChangeTextProp(composeToString(numbers));
 
             if (newFocusedIndex !== undefined) {
+                lastFocusedIndex.current = newFocusedIndex;
                 inputRefs.current?.focus();
             }
         }