mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 04:21:57 +03:00
Code Issues Projects Releases Packages Wiki Activity

introduce transform method so update can be called with a position

Browse source 
and also for multiple transformations at once. This removes
the need to call the update callback from `replaceRange()` as well
This commit is contained in:
Bruno Windels 2019-08-27 16:15:10 +02:00
parent f76a23d5dd
commit 68c2bb7ca6
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/editor/model.js
View file

@ -35,6 +35,11 @@ import Range from "./range";
* This is used to adjust the caret position. * This is used to adjust the caret position.
*/ */
/**
* @callback ManualTransformCallback
* @return the caret position
*/
export default class EditorModel { export default class EditorModel {
constructor(parts, partCreator, updateCallback = null) { constructor(parts, partCreator, updateCallback = null) {
this._parts = parts; this._parts = parts;
@ -44,7 +49,6 @@ export default class EditorModel {
this._autoCompletePartIdx = null; this._autoCompletePartIdx = null;
this._transformCallback = null; this._transformCallback = null;
this.setUpdateCallback(updateCallback); this.setUpdateCallback(updateCallback);
this._updateInProgress = false;
} }
/** /**
@ -170,7 +174,6 @@ export default class EditorModel {
} }
update(newValue, inputType, caret) { update(newValue, inputType, caret) {
this._updateInProgress = true;
const diff = this._diff(newValue, inputType, caret); const diff = this._diff(newValue, inputType, caret);
const position = this.positionForOffset(diff.at, caret.atNodeEnd); const position = this.positionForOffset(diff.at, caret.atNodeEnd);
let removedOffsetDecrease = 0; let removedOffsetDecrease = 0;
@ -191,7 +194,6 @@ export default class EditorModel {
const transformAddedLen = this._transform(newPosition, inputType, diff); const transformAddedLen = this._transform(newPosition, inputType, diff);
newPosition = this.positionForOffset(caretOffset + transformAddedLen, true); newPosition = this.positionForOffset(caretOffset + transformAddedLen, true);
} }
this._updateInProgress = false;
this._updateCallback(newPosition, inputType, diff); this._updateCallback(newPosition, inputType, diff);
return acPromise; return acPromise;
} }
@ -422,8 +424,18 @@ export default class EditorModel {
insertIdx += 1; insertIdx += 1;
} }
this._mergeAdjacentParts(); this._mergeAdjacentParts();
if (!this._updateInProgress) { }
this._updateCallback();
} /**
* Performs a transformation not part of an update cycle.
* Modifying the model should only happen inside a transform call if not part of an update call.
* @param {ManualTransformCallback} callback to run the transformations in
* @return {Promise} a promise when auto-complete (if applicable) is done updating
*/
transform(callback) {
const pos = callback();
const acPromise = this._setActivePart(pos, true);
this._updateCallback(pos);
return acPromise;
} }
} }