Skip to content

Auto-focus first input field of Login (as staff and patient) #16605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Rishav-Bagri wants to merge 4 commits into
base: develop
Choose a base branch
from
+12 −0
Open

Auto-focus first input field of Login (as staff and patient) #16605

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
32a77fd
Auto-focus first input field of Login (as staff and patient)
Rishav-Bagri Jul 28, 2026
2dc2e62
Changes according to AI review
Rishav-Bagri Jul 31, 2026
d33351b
Fix requestAnimation function cleanup
Rishav-Bagri Jul 31, 2026
bb92b0c
changed mode to activeMode in DOM
Rishav-Bagri Jul 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/components/Auth/Login.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ const Login = (props: LoginProps) => {
const [otpError, setOtpError] = useState<string>("");
const [otpValidationError, setOtpValidationError] = useState<string>("");
const [resendOtpCountdown, setResendOtpCountdown] = useState(0);
const activeMode =
!disablePatientLogin && mode === "patient" ? "patient" : "staff";

// Timer Function for resend OTP
useEffect(() => {
Expand All @@ -127,6 +129,16 @@ const Login = (props: LoginProps) => {
localStorage.setItem(LocalStorageKeys.loginPreference, mode);
}, [mode]);

// Autofocuses when switching tabs
useEffect(() => {
const frame = requestAnimationFrame(() => {
document
.getElementById(activeMode === "staff" ? "username" : "phone")
?.focus();
});
return () => cancelAnimationFrame(frame);
}, [activeMode]);

// Send OTP Mutation
const { mutate: sendOtp, isPending: sendOtpPending } = useMutation({
mutationFn: mutate(otpApi.send),
Expand Down
Loading