diff --git a/src/components/Form/FormWrapper.tsx b/src/components/Form/FormWrapper.tsx index 91ecc34d1c553..824b968b9d78f 100644 --- a/src/components/Form/FormWrapper.tsx +++ b/src/components/Form/FormWrapper.tsx @@ -11,7 +11,6 @@ import useBottomSafeSafeAreaPaddingStyle from '@hooks/useBottomSafeSafeAreaPaddi import useOnyx from '@hooks/useOnyx'; import useSafeAreaPaddings from '@hooks/useSafeAreaPaddings'; import useThemeStyles from '@hooks/useThemeStyles'; -import Accessibility from '@libs/Accessibility'; import {getLatestErrorMessage} from '@libs/ErrorUtils'; import CONST from '@src/CONST'; import type {OnyxFormKey} from '@src/ONYXKEYS'; @@ -135,17 +134,8 @@ function FormWrapper({ ); } - // We use InteractionManager to ensure the accessibility focus happens after the scroll animation completes - // eslint-disable-next-line @typescript-eslint/no-deprecated - InteractionManager.runAfterInteractions(() => { - // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access - const nativeRef = (focusInput as any)?.getNativeRef?.() ?? focusInput; - // eslint-disable-next-line @typescript-eslint/no-unsafe-argument - Accessibility.moveAccessibilityFocus(nativeRef); - - // Focus the input after moving accessibility focus - focusInput?.focus?.(); - }); + // Focus the input after scrolling, as on the Web it gives a slightly better visual result + focusInput?.focus?.(); }; // If either of `addBottomSafeAreaPadding` or `shouldSubmitButtonStickToBottom` is explicitly set,