cswimr/revite
1
0
Fork 0
mirror of https://github.com/revoltchat/revite.git synced 2024-12-25 07:02:10 -05:00
Code Issues Projects Releases Packages Wiki Activity

feat: prevent accidental send while in code block (#557)

Browse source
This commit is contained in:
Reinis Mazeiks 2022-03-29 22:49:25 +03:00 committed by GitHub
parent b4c7fe543f
commit 8021169131
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/components/common/messaging/MessageBox.tsx
View file

@ -130,6 +130,9 @@ const FileAction = styled.div`
// For sed replacement
const RE_SED = new RegExp("^s/([^])*/([^])*$");
// Tests for code block delimiters (``` at start of line)
const RE_CODE_DELIMITER = new RegExp("^```", "gm");
// ! FIXME: add to app config and load from app config
export const CAN_UPLOAD_AT_ONCE = 5;
@ -415,6 +418,21 @@ export default observer(({ channel }: Props) => {
}
}
function isInCodeBlock(cursor: number): boolean {
const content = state.draft.get(channel._id) || "";
const contentBeforeCursor = content.substring(0, cursor);
let delimiterCount = 0;
for (const delimiter of contentBeforeCursor.matchAll(
RE_CODE_DELIMITER,
)) {
delimiterCount++;
}
// Odd number of ``` delimiters before cursor => we are in code block
return delimiterCount % 2 === 1;
}
// TODO: change to useDebounceCallback
// eslint-disable-next-line
const debouncedStopTyping = useCallback(
@ -543,7 +561,8 @@ export default observer(({ channel }: Props) => {
!e.shiftKey &&
!e.isComposing &&
e.key === "Enter" &&
!isTouchscreenDevice
!isTouchscreenDevice &&
!isInCodeBlock(e.currentTarget.selectionStart)
) {
e.preventDefault();
return send();