OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Added surround with 

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
pull/21833/head
Šimon Brandner 2020-12-19 19:32:58 +01:00
parent d3be7b79df
commit c6a058fb6f
1 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/components/views/rooms/BasicMessageComposer.tsx
View File

@ -418,6 +418,10 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
}; };
private onKeyDown = (event: React.KeyboardEvent) => { private onKeyDown = (event: React.KeyboardEvent) => {
const selectionRange = getRangeForSelection(this.editorRef.current, this.props.model, document.getSelection());
// trim the range as we want it to exclude leading/trailing spaces
selectionRange.trim();
const model = this.props.model; const model = this.props.model;
const modKey = IS_MAC ? event.metaKey : event.ctrlKey; const modKey = IS_MAC ? event.metaKey : event.ctrlKey;
let handled = false; let handled = false;
@ -471,6 +475,43 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
}); });
handled = true; handled = true;
// autocomplete or enter to send below shouldn't have any modifier keys pressed. // autocomplete or enter to send below shouldn't have any modifier keys pressed.
} else if (document.getSelection().type != "Caret") {
if (event.key === '(') {
this.historyManager.ensureLastChangesPushed(this.props.model);
this.modifiedFlag = true;
toggleInlineFormat(selectionRange, "(", ")");
handled = true;
} else if (event.key === '[') {
this.historyManager.ensureLastChangesPushed(this.props.model);
this.modifiedFlag = true;
toggleInlineFormat(selectionRange, "[", "]");
handled = true;
} else if (event.key === '{') {
this.historyManager.ensureLastChangesPushed(this.props.model);
this.modifiedFlag = true;
toggleInlineFormat(selectionRange, "{", "}");
handled = true;
} else if (event.key === '<') {
this.historyManager.ensureLastChangesPushed(this.props.model);
this.modifiedFlag = true;
toggleInlineFormat(selectionRange, "<", ">");
handled = true;
} else if (event.key === '"') {
this.historyManager.ensureLastChangesPushed(this.props.model);
this.modifiedFlag = true;
toggleInlineFormat(selectionRange, "\"");
handled = true;
} else if (event.key === '`') {
this.historyManager.ensureLastChangesPushed(this.props.model);
this.modifiedFlag = true;
toggleInlineFormat(selectionRange, "`");
handled = true;
} else if (event.key === '\'') {
this.historyManager.ensureLastChangesPushed(this.props.model);
this.modifiedFlag = true;
toggleInlineFormat(selectionRange, "'");
handled = true;
}
} else { } else {
const metaOrAltPressed = event.metaKey || event.altKey; const metaOrAltPressed = event.metaKey || event.altKey;
const modifierPressed = metaOrAltPressed || event.shiftKey; const modifierPressed = metaOrAltPressed || event.shiftKey;