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

Fix dismissing edit composer when change was undone (#9109)

Browse source 
* Fix dismissing edit composer when change was undone

* Add tests
This commit is contained in:
Michael Telatynski 2022-08-02 14:54:40 +01:00 • committed by GitHub
parent 27ba1e57e6
commit 6796375b10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 73 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/components/views/rooms/EditMessageComposer.tsx
View file

@ -213,6 +213,9 @@ class EditMessageComposer extends React.Component<IEditMessageComposerProps, ISt
};
private endEdit(): void {
localStorage.removeItem(this.editorRoomKey);
localStorage.removeItem(this.editorStateKey);
// close the event editing and focus composer
dis.dispatch({
action: Action.EditEvent,
@ -241,7 +244,6 @@ class EditMessageComposer extends React.Component<IEditMessageComposerProps, ISt
}
private cancelEdit = (): void => {
this.clearStoredEditorState();
this.endEdit();
};
@ -262,11 +264,6 @@ class EditMessageComposer extends React.Component<IEditMessageComposerProps, ISt
}
}
private clearStoredEditorState(): void {
localStorage.removeItem(this.editorRoomKey);
localStorage.removeItem(this.editorStateKey);
}
private clearPreviousEdit(): void {
if (localStorage.getItem(this.editorRoomKey)) {
localStorage.removeItem(`mx_edit_state_${localStorage.getItem(this.editorRoomKey)}`);
@ -354,7 +351,6 @@ class EditMessageComposer extends React.Component<IEditMessageComposerProps, ISt
const threadId = event.threadRootId || null;
this.props.mxClient.sendMessage(roomId, threadId, editContent);
this.clearStoredEditorState();
dis.dispatch({ action: "message_sent" });
}
}