matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-08 21:42:24 +03:00
Code Activity

Merge pull request #3391 from matrix-org/bwindels/cider-format-history

Browse Source 
New composer: ensure undo history is persisted before applying formatting
This commit is contained in:
Bruno Windels
2019-09-06 09:28:18 +00:00
committed by GitHub
parent df4762871a 9dac91a70d
commit 5014b606db
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/views/rooms/BasicMessageComposer.js
View File

@@ -454,6 +454,7 @@ export default class BasicMessageEditor extends React.Component {
if (range.length === 0) {
return;
}
this.historyManager.ensureLastChangesPushed(this.props.model);
switch (action) {
case "bold":
formatInline(range, "**");

10
src/editor/history.js
View File

@@ -106,6 +106,12 @@ export default class HistoryManager {
return shouldPush;
}
ensureLastChangesPushed(model) {
if (this._changedSinceLastPush) {
this._pushState(model, this._lastCaret);
}
}
canUndo() {
return this._currentIndex >= 1 || this._changedSinceLastPush;
}
@@ -117,9 +123,7 @@ export default class HistoryManager {
// returns state that should be applied to model
undo(model) {
if (this.canUndo()) {
if (this._changedSinceLastPush) {
this._pushState(model, this._lastCaret);
}
this.ensureLastChangesPushed(model);
this._currentIndex -= 1;
return this._stack[this._currentIndex];
}