PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

keep old arrow-up behaviour when editing is not enabled

Browse source 
also, move caret at end/start checks before choosing what to do
also, selectHistory shouldn't return a promise
This commit is contained in:
Bruno Windels 2019-06-18 11:49:36 +02:00
parent 32840fc274
commit f95f194b6a
1 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/components/views/rooms/MessageComposerInput.js
View file

@ -1206,25 +1206,29 @@ export default class MessageComposerInput extends React.Component {
onVerticalArrow = (e, up) => { onVerticalArrow = (e, up) => {
if (e.ctrlKey || e.shiftKey || e.metaKey) return; if (e.ctrlKey || e.shiftKey || e.metaKey) return;
if (e.altKey) { // selection must be collapsed
const selection = this.state.editorState.selection;
if (!selection.isCollapsed) return;
// and we must be at the edge of the document (up=start, down=end)
const document = this.state.editorState.document;
if (up) {
if (!selection.anchor.isAtStartOfNode(document)) return;
} else {
if (!selection.anchor.isAtEndOfNode(document)) return;
}
const editingEnabled = SettingsStore.isFeatureEnabled("feature_message_editing");
const shouldSelectHistory = (editingEnabled && e.altKey) || !editingEnabled;
const shouldEditLastMessage = editingEnabled && !e.altKey && up;
if (shouldSelectHistory) {
// Try select composer history // Try select composer history
const selected = this.selectHistory(up); const selected = this.selectHistory(up);
if (selected) { if (selected) {
// We're selecting history, so prevent the key event from doing anything else // We're selecting history, so prevent the key event from doing anything else
e.preventDefault(); e.preventDefault();
} }
} else if (!e.altKey && up) { } else if (shouldEditLastMessage) {
// Try edit the latest message
const selection = this.state.editorState.selection;
// selection must be collapsed
if (!selection.isCollapsed) return;
const document = this.state.editorState.document;
// and we must be at the edge of the document (up=start, down=end)
if (!selection.anchor.isAtStartOfNode(document)) return;
if (!e.altKey) {
const editEvent = findEditableEvent(this.props.room, false); const editEvent = findEditableEvent(this.props.room, false);
if (editEvent) { if (editEvent) {
// We're selecting history, so prevent the key event from doing anything else // We're selecting history, so prevent the key event from doing anything else
@ -1235,10 +1239,9 @@ export default class MessageComposerInput extends React.Component {
}); });
} }
} }
}
}; };
selectHistory = async (up) => { selectHistory = (up) => {
const delta = up ? -1 : 1; const delta = up ? -1 : 1;
// True if we are not currently selecting history, but composing a message // True if we are not currently selecting history, but composing a message