mirrors/cinny
1
0
Fork 0
mirror of https://github.com/cinnyapp/cinny.git synced 2025-11-18 05:00:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix shortcuts on non QWERTY keyboards (#715)

Browse source 
* Use key instead of keyCode or code

* Use key for Escape
This commit is contained in:
ginnyTheCat 2022-08-05 15:42:25 +02:00 • committed by GitHub
parent 1d90f7588b
commit 5e527e434a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/app/organisms/room/RoomViewCmdBar.jsx
View file

@ -256,11 +256,11 @@ function RoomViewCmdBar({ roomId, roomTimeline, viewEvent }) {
function listenKeyboard(event) {
const { activeElement } = document;
const lastCmdItem = document.activeElement.parentNode.lastElementChild;
if (event.keyCode === 27) {
if (event.key === 'Escape') {
if (activeElement.className !== 'cmd-item') return;
viewEvent.emit('focus_msg_input');
}
if (event.keyCode === 9) {
if (event.key === 'Tab') {
if (lastCmdItem.className !== 'cmd-item') return;
if (lastCmdItem !== activeElement) return;
if (event.shiftKey) return;

6
src/app/organisms/room/RoomViewInput.jsx
View file

@ -128,9 +128,7 @@ function RoomViewInput({
}
function firedCmd(cmdData) {
const msg = textAreaRef.current.value;
textAreaRef.current.value = replaceCmdWith(
msg, cmdCursorPos, typeof cmdData?.replace !== 'undefined' ? cmdData.replace : '',
);
textAreaRef.current.value = replaceCmdWith(msg, cmdCursorPos, typeof cmdData?.replace !== 'undefined' ? cmdData.replace : '');
deactivateCmd();
}
@ -254,7 +252,7 @@ function RoomViewInput({
};
const handleKeyDown = (e) => {
if (e.keyCode === 13 && e.shiftKey === false) {
if (e.key === 'Enter' && e.shiftKey === false) {
e.preventDefault();
sendMessage();
}