michael/cinny
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity

Only escape when editing (#852)

Browse source 
* Only escape when editing

* Base edit change detection on rendered content
This commit is contained in:
ginnyTheCat 2022-09-17 13:25:26 +02:00 committed by GitHub
parent c1be57b205
commit cbd1bf35c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/app/molecules/message/Message.jsx
View file

@ -300,12 +300,12 @@ function MessageEdit({ body, onSave, onCancel }) {
if (e.key === 'Enter' && e.shiftKey === false) { if (e.key === 'Enter' && e.shiftKey === false) {
e.preventDefault(); e.preventDefault();
onSave(editInputRef.current.value); onSave(editInputRef.current.value, body);
} }
}; };
return ( return (
<form className="message__edit" onSubmit={(e) => { e.preventDefault(); onSave(editInputRef.current.value); }}> <form className="message__edit" onSubmit={(e) => { e.preventDefault(); onSave(editInputRef.current.value, body); }}>
<Input <Input
forwardRef={editInputRef} forwardRef={editInputRef}
onKeyDown={handleKeyDown} onKeyDown={handleKeyDown}
@ -806,8 +806,8 @@ function Message({
body={(customHTML body={(customHTML
? html(customHTML, { kind: 'edit', onlyPlain: true }).plain ? html(customHTML, { kind: 'edit', onlyPlain: true }).plain
: plain(body, { kind: 'edit', onlyPlain: true }).plain)} : plain(body, { kind: 'edit', onlyPlain: true }).plain)}
onSave={(newBody) => { onSave={(newBody, oldBody) => {
if (newBody !== body) { if (newBody !== oldBody) {
initMatrix.roomsInput.sendEditedMessage(roomId, mEvent, newBody); initMatrix.roomsInput.sendEditedMessage(roomId, mEvent, newBody);
} }
cancelEdit(); cancelEdit();

4
src/util/markdown.js
View file

@ -96,7 +96,9 @@ const plainRules = {
text: { text: {
...defaultRules.text, ...defaultRules.text,
match: anyScopeRegex(/^[\s\S]+?(?=[^0-9A-Za-z\s\u00c0-\uffff]| *\n|\w+:\S|$)/), match: anyScopeRegex(/^[\s\S]+?(?=[^0-9A-Za-z\s\u00c0-\uffff]| *\n|\w+:\S|$)/),
plain: (node) => node.content.replace(/(\*|_|!\[|\[|\|\||\$\$?)/g, '\\$1'), plain: (node, _, state) => (state.kind === 'edit'
? node.content.replace(/(\*|_|!\[|\[|\|\||\$\$?)/g, '\\$1')
: node.content),
}, },
}; };