Skip to content

Show Caps Lock indicator in SSH password prompt #2840

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
0John-Hong0 wants to merge 1 commit into
base: main
Choose a base branch
from
+25 −4
Open

Show Caps Lock indicator in SSH password prompt #2840

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 25 additions & 4 deletions frontend/app/modals/userinputmodal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ const UserInputModal = (userInputRequest: UserInputRequest) => {
const [responseText, setResponseText] = useState("");
const [countdown, setCountdown] = useState(Math.floor(userInputRequest.timeoutms / 1000));
const checkboxRef = useRef<HTMLInputElement>(null);
const [capsLockOn, setCapsLockOn] = useState(false);

const handleSendErrResponse = useCallback(() => {
fireAndForget(() =>
Expand Down Expand Up @@ -73,11 +74,15 @@ const UserInputModal = (userInputRequest: UserInputRequest) => {
handleSubmit();
return true;
}
return false;
return false;
},
[handleSendErrResponse, handleSubmit]
);

const handleCapsLockCheck = useCallback((e: React.KeyboardEvent<HTMLInputElement>) => {
setCapsLockOn(e.getModifierState("CapsLock") ?? false);
}, []);

const queryText = useMemo(() => {
if (userInputRequest.markdown) {
return <Markdown text={userInputRequest.querytext} />;
Expand All @@ -97,10 +102,21 @@ const UserInputModal = (userInputRequest: UserInputRequest) => {
maxLength={400}
className="resize-none bg-panel rounded-md border border-border py-1.5 pl-4 min-h-[30px] text-inherit cursor-text focus:ring-2 focus:ring-accent focus:outline-none"
autoFocus={true}
onKeyDown={(e) => keyutil.keydownWrapper(handleKeyDown)(e)}
onKeyDown={(e) => {
handleCapsLockCheck(e);
keyutil.keydownWrapper(handleKeyDown)(e);
}}
onKeyUp={handleCapsLockCheck}
/>
);
}, [userInputRequest.responsetype, userInputRequest.publictext, responseText, handleKeyDown, setResponseText]);
}, [
userInputRequest.responsetype,
userInputRequest.publictext,
responseText,
handleKeyDown,
setResponseText,
handleCapsLockCheck,
]);

const optionalCheckbox = useMemo(() => {
if (userInputRequest.checkboxmsg == "") {
Expand All @@ -115,7 +131,9 @@ const UserInputModal = (userInputRequest: UserInputRequest) => {
className="accent-accent cursor-pointer"
ref={checkboxRef}
/>
<label htmlFor={`uicheckbox-${userInputRequest.requestid}`} className="cursor-pointer">{userInputRequest.checkboxmsg}</label>
<label htmlFor={`uicheckbox-${userInputRequest.requestid}`} className="cursor-pointer">
{userInputRequest.checkboxmsg}
</label>
</div>
</div>
);
Expand Down Expand Up @@ -159,6 +177,9 @@ const UserInputModal = (userInputRequest: UserInputRequest) => {
<div className="flex flex-col justify-between gap-4 mx-4 mb-4 max-w-[500px] font-mono text-primary">
{queryText}
{inputBox}
{!userInputRequest.publictext && capsLockOn && (
<div className="text-xs text-warning">Caps Lock is ON</div>
)}
{optionalCheckbox}
</div>
</Modal>
Expand Down