imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplifie surround with and make it more extensible

Browse source 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner 2021-06-20 08:38:01 +02:00
parent 38c0cd2716
commit a772460f63
No known key found for this signature in database
GPG key ID: 9760693FDD98A790
1 changed files with 15 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/components/views/rooms/BasicMessageComposer.tsx
View file

@ -55,6 +55,14 @@ const REGEX_EMOTICON_WHITESPACE = new RegExp('(?:^|\\s)(' + EMOTICON_REGEX.sourc
const IS_MAC = navigator.platform.indexOf("Mac") !== -1; const IS_MAC = navigator.platform.indexOf("Mac") !== -1;
const SURROUND_WITH_CHARACTERS = ["\"", "_", "`", "'", "*", "~", "$"];
const SURROUND_WITH_DOUBLE_CHARACTERS = new Map([
["(", ")"],
["[", "]"],
["{", "}"],
["<", ">"],
]);
function ctrlShortcutLabel(key) { function ctrlShortcutLabel(key) {
return (IS_MAC ? "⌘" : "Ctrl") + "+" + key; return (IS_MAC ? "⌘" : "Ctrl") + "+" + key;
} }
@ -441,41 +449,18 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
let handled = false; let handled = false;
if (this.state.surroundWith && document.getSelection().type != "Caret") { if (this.state.surroundWith && document.getSelection().type != "Caret") {
// Surround selected text with a character // This surrounds the selected text with a character. This is
if (event.key === '(') { // intentionally left out of the keybinding manager as the keybinds
// here shouldn't be changeable
if (SURROUND_WITH_CHARACTERS.includes(event.key)) {
this.historyManager.ensureLastChangesPushed(this.props.model); this.historyManager.ensureLastChangesPushed(this.props.model);
this.modifiedFlag = true; this.modifiedFlag = true;
toggleInlineFormat(selectionRange, "(", ")"); toggleInlineFormat(selectionRange, event.key);
handled = true; handled = true;
} else if (event.key === '[') { } else if ([...SURROUND_WITH_DOUBLE_CHARACTERS.keys()].includes(event.key)) {
this.historyManager.ensureLastChangesPushed(this.props.model); this.historyManager.ensureLastChangesPushed(this.props.model);
this.modifiedFlag = true; this.modifiedFlag = true;
toggleInlineFormat(selectionRange, "[", "]"); toggleInlineFormat(selectionRange, event.key, SURROUND_WITH_DOUBLE_CHARACTERS.get(event.key));
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; handled = true;
} }
} }