@nerd-bible/wordgard 0.5.3-beta6 → 0.5.3-beta7

package/dist/editor.js

@@ -62,7 +62,7 @@ function separateChange(changes, fromB, toB) {
     let lenI = 0, dLen = 0;
     for (let posB = 0, done = false, i = 0; i < changes.length;) {
         let len = changes[i++], ins = changes[i++], endB = posB + (ins < 0 ? len : ins);
-        if (fromB > endB || toB < posB) {
+        if (fromB >= endB || toB <= posB) {
             result.push(len, ins);
         }
         else {
@@ -1529,6 +1529,8 @@ class DocTile extends CompositeTile {
                 changes = separated;
         }
         let builder = new ContentUpdate(state, this, wg, new DecoIterator(state, decoSet), wrapper);
+        if (composition?.target && Tile.get(composition.target))
+            builder.reused.set(Tile.get(composition.target), 2);
         for (let i = 0, posB = 0, startCovered = false; i < changes.length;) {
             let len = changes[i++], ins = changes[i++];
             if (composition && posB == composition.fromB && ins >= 0) {
@@ -3631,6 +3633,7 @@ class InputState {
     mouseSelection = null;
     draggedContent = null;
     notifiedFocused;
+    suppressEvents = false;
     pendingInputEvent = null;
     domDoc;
     _domMapping;
@@ -3646,6 +3649,8 @@ class InputState {
         this._domMapping = ChangeSet.empty(this.domDoc.length);
     }
     handleEvent(event) {
+        if (this.suppressEvents)
+            return;
         if (!eventBelongsToEditor(this.wg, event) || this.ignoreDuringComposition(event))
             return;
         if (event.type == "keydown" && this.keydown(event))
@@ -3797,8 +3802,11 @@ class InputState {
                 });
         }
         else if (type == "insertCompositionText") {
-            let compositionStart = !wg.inputState.composing.changes;
-            wg.inputState.composing.changes++;
+            let compositionStart = true;
+            if (wg.inputState.composing) {
+                compositionStart = !wg.inputState.composing.changes;
+                wg.inputState.composing.changes++;
+            }
             let sel = wg.observer.selectionRange;
             if (!sel.focusNode)
                 return false;
@@ -3856,6 +3864,57 @@ class InputState {
             return !tileBefore ? before : !tileAfter ? after : prev == after ? after : before;
         }
     }
+    getCompositionInfo(wg) {
+        let wrap = this.wrappingComposition;
+        if (wrap) {
+            let sel = wg.state.selection.head;
+            return {
+                fromB: sel, toB: sel,
+                text: "",
+                target: null,
+                wrapCursor: wrap
+            };
+        }
+        let comp = this.composing;
+        if (!comp || !(comp.target = this.findComposition(comp.target)))
+            return null;
+        let value = comp.target.nodeValue;
+        let fromB = this.posAtDOM(comp.target, 0, 1), toB = fromB + value.length;
+        let disrupted = false;
+        this.domMapping.iterChanges((fA, tA, fB, tB) => {
+            if (fB < toB && tB > fromB)
+                disrupted = true;
+        });
+        return disrupted ? null : { fromB, toB, text: value, target: comp.target };
+    }
+    clearComposition() {
+        let comp = this.composing;
+        this.composing = null;
+        this.compositionEndedAt = Date.now();
+        if (!comp.target)
+            return false;
+        let pos = this.posAtDOM(comp.target, 0, 1);
+        this.wg.observer.addDirtyRange(pos, pos + comp.target.nodeValue.length);
+        return true;
+    }
+    abortComposition() {
+        if (!this.composing || !this.wg.hasFocus)
+            return;
+        this.clearComposition();
+        this.wg.win.setTimeout(() => {
+            this.suppressEvents = true;
+            try {
+                getSelection(this.wg.root)?.collapse(document.body, 0);
+                let dummy = this.wg.win.document.body.appendChild(document.createElement("input"));
+                dummy.focus();
+                dummy.remove();
+                this.wg.focus();
+            }
+            finally {
+                this.suppressEvents = false;
+            }
+        }, 0);
+    }
     recordTouch(e) {
         this.lastTouchTime = Date.now();
         this.lastTouchEvent = e;
@@ -4118,37 +4177,9 @@ function updateForFocusChange(wg) {
         }
     }, 10);
 }
-function getCompositionInfo(wg) {
-    let wrap = wg.inputState.wrappingComposition;
-    if (wrap) {
-        let sel = wg.state.selection.head;
-        return {
-            fromB: sel, toB: sel,
-            text: "",
-            target: null,
-            wrapCursor: wrap
-        };
-    }
-    let comp = wg.inputState.composing;
-    if (!comp || !(comp.target = wg.inputState.findComposition(comp.target)))
-        return null;
-    let value = comp.target.nodeValue;
-    let pos = wg.inputState.posAtDOM(comp.target, 0);
-    return {
-        fromB: pos, toB: pos + value.length,
-        text: value,
-        target: comp.target
-    };
-}
 function compositionEnd(wg) {
-    let comp = wg.inputState.composing;
-    wg.inputState.composing = null;
-    wg.inputState.compositionEndedAt = Date.now();
-    if (comp && comp.target) {
-        let pos = wg.inputState.posAtDOM(comp.target, 0);
-        wg.observer.addDirtyRange(pos, pos + comp.target.nodeValue.length);
+    if (wg.inputState.composing && wg.inputState.clearComposition())
         wg.flush();
-    }
 }
 function compositionUpdate(wg, event) {
     if (!wg.inputState.composing) {
@@ -4789,8 +4820,8 @@ class Wordgard {
         this.lastFlush = Date.now();
         try {
             let domChanges = this.observer.takeDirty();
-            this.viewState.flush();
             this.observer.ignore(() => this.runUpdate(update, domChanges));
+            this.viewState.flush();
             domChanges = null;
             for (let i = 0;; i++) {
                 if (i > 5) {
@@ -4856,7 +4887,9 @@ class Wordgard {
         scrollRectIntoView(this.scrollDOM, targetRect, assoc, target.spec.x, target.spec.y, Math.max(Math.min(target.spec.xMargin, offsetWidth), -offsetWidth), Math.max(Math.min(target.spec.yMargin, offsetHeight), -offsetHeight), this.state.textLTR);
     }
     runUpdate(update, domChanges) {
-        let composition = this.composing ? getCompositionInfo(this) : null;
+        let composition = this.composing ? this.inputState.getCompositionInfo(this) : null;
+        if (this.composing && !composition)
+            this.inputState.abortComposition();
         let changes = domChanges ? addUpdated(update.changes.sections, domChanges) : update.changes.sections;
         let prevDocTile = this.docTile;
         if (!update.empty) {
@@ -5035,7 +5068,7 @@ class Wordgard {
         if (this.connected)
             this.observer.ignore(() => {
                 this.contentDOM.focus({ preventScroll: true });
-                if (this.willFlush && this.flushing == 0)
+                if (this.willFlush && this.flushing == 0 && this.viewState.pending.some(tr => tr.docChanged))
                     this.flush();
                 setDOMSelection(this);
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nerd-bible/wordgard",
-  "version": "0.5.3-beta6",
+  "version": "0.5.3-beta7",
   "description": "Semantic rich text editor system",
   "type": "module",
   "main": "dist/index.js",