@nerd-bible/wordgard 0.5.3-beta0 → 0.5.3-beta2

package/dist/editor.js

@@ -1858,7 +1858,9 @@ class CompositeTile extends Tile {
         return CoordPos.create(start + this.length - 2 * this.boundary, -1);
     }
 }
-function rowScan(x, y, scan) {
+function rowScan(x, y, scan, depth = 0) {
+    if (depth > 1)
+        return null;
     let closest = null, closestDx = 1e8, closestRect = null;
     let above = null, below = null;
     scan((rect, value) => {
@@ -1884,16 +1886,16 @@ function rowScan(x, y, scan) {
     if (closestRect) {
         if (closestDx) {
             if (above && above.bottom > closestRect.top)
-                return rowScan(x, above.bottom - 1, scan);
+                return rowScan(x, above.bottom - 1, scan, depth + 1);
             if (below && below.top < closestRect.bottom)
-                return rowScan(x, below.top + 1, scan);
+                return rowScan(x, below.top + 1, scan, depth + 1);
         }
         return { closest: closest, rect: closestRect };
     }
     let side = above && (!below || (y - above.bottom < below.top - y)) ? above : below;
     if (!side)
         return null;
-    return rowScan(x, (side.top + side.bottom) / 2, scan);
+    return rowScan(x, (side.top + side.bottom) / 2, scan, depth + 1);
 }
 function ltrAt(state, pos, assoc, textblock) {
     if (textblock === undefined) {
@@ -4154,6 +4156,10 @@ class InputState {
             this._domMapping = this._domMapping.compose(pending[this.domMappingIndex++].changes);
         return this._domMapping;
     }
+    get unflushedSelection() {
+        let { pending } = this.wg.viewState;
+        return pending.some(tr => tr.selection && !tr.isUserEvent("input"));
+    }
     posAtDOM(node, offset, assoc = -1) {
         if (this.domMapping.empty && !this.domChanges)
             return this.wg.docTile.posFromDOM(node, offset);
@@ -4173,7 +4179,7 @@ class InputState {
         }
         let command = inputTypeCommands[type];
         if ((type == "deleteContentBackward" || type == "deleteContentForward") && range &&
-            range.from != range.to &&            (sel.empty
+            range.from != range.to &&            !this.unflushedSelection &&            (sel.empty
                 ? !isSingleChar(this.domDoc, data.domRange.from, data.domRange.to) ||
                     sel.head != (type == "deleteContentBackward" ? range.to : range.from)
                 : sel.from != range.from || sel.to != range.to)) {
@@ -4184,11 +4190,12 @@ class InputState {
         }
         else if (type == "insertText") {
             let insert = event.data.replace(/\r\n?|\n/g, " ");
-            Command.dispatch(wg, insertText, { from: range.from, to: range.to, insert, userEvent: "input.type" });
+            let { from, to } = this.unflushedSelection ? wg.state.selection : range;
+            Command.dispatch(wg, insertText, { from, to, insert, userEvent: "input.type" });
         }
         else if ((type == "insertReplacementText" || type == "insertFromYank")) {
             let read = readClipboard(wg.state, event.dataTransfer, wg.state.sel.head, true);
-            let { from, to } = range;
+            let { from, to } = this.unflushedSelection ? wg.state.selection : range;
             let sel = wg.state.selection, touchesSel = from <= sel.to && to >= sel.from;
             if (read)
                 wg.dispatch({

package/package.json

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