@nerd-bible/wordgard 0.5.2-beta → 0.5.2-beta2

package/dist/editor.js

@@ -2020,10 +2020,10 @@ class DocTile extends CompositeTile {
             let len = changes[i++], ins = changes[i++];
             if (composition && posB == composition.fromB && ins >= 0) {
                 if (!startCovered)
-                    builder.update(0, false);
+                    builder.update(0, true);
                 builder.composition(composition, len);
                 if (ins && (startCovered = i == changes.length || changes[i + 1] == -1))
-                    builder.update(0, false);
+                    builder.update(0, true);
             }
             else if (ins == -1) {
                 builder.keep(len, !startCovered, i == changes.length);
@@ -4190,11 +4190,13 @@ class InputState {
         this.domChanges = null;
     }
     getDOMPos(node, offset) {
+        if (!this.domChanges)
+            return this.wg.docTile.posFromDOM(node, offset);
         if (node.nodeType == 1 && offset && node.childNodes[offset - 1].nodeType == 3) {
             node = node.childNodes[offset - 1];
             offset = node.nodeValue.length;
         }
-        let inText = node.nodeType == 3;
+        let inText = node.nodeType == 3 && !this.wg.docTile.nearest(node)?.isPoint;
         let ref = this.wg.docTile.posFromDOM(node, inText ? 0 : offset);
         let dir = -1;
         let textBefore = node.parentNode && textNodeBefore(node.parentNode, domIndex(node));
@@ -4310,9 +4312,11 @@ class InputState {
         }
         else {
             let tileBefore = Tile.get(before), tileAfter = Tile.get(after);
-            return !tileBefore || tileBefore.text != before.nodeValue ? before
-                : !tileAfter || tileAfter.text != after.nodeValue ? after
-                    : prev == after ? after : before;
+            if (tileBefore instanceof TextTile && tileBefore.text != before.nodeValue)
+                return before;
+            if (tileAfter instanceof TextTile && tileAfter.text != after.nodeValue)
+                return after;
+            return !tileBefore ? before : !tileAfter ? after : prev == after ? after : before;
         }
     }
     recordTouch(e) {

package/dist/history.js

@@ -3,7 +3,15 @@ import { ChangeSet } from 'wordgard/doc';
 import { Command, undo as undo$1, redo as redo$1, Menu } from 'wordgard/command';
 import { phrases } from 'wordgard/phrases';
 
-const fromHistory = /*@__PURE__*/Transaction.Annotation.define();
+const fromHistory = /*@__PURE__*/Transaction.Effect.define({
+    map(value, change) {
+        return {
+            side: value.side,
+            startDoc: change.apply(value.startDoc),
+            rest: !value.rest ? null : value.rest.addMapping(change, value.startDoc)
+        };
+    }
+});
 const historyConfig = /*@__PURE__*/GardState.Facet.define({
     combine(configs) {
         return GardState.Facet.combineConfig(configs, {
@@ -23,13 +31,13 @@ const historyField_ = /*@__PURE__*/GardState.Field.define({
     },
     update(state, tr) {
         let config = tr.state.facet(historyConfig);
-        let fromHist = tr.annotation(fromHistory);
+        let fromHist = tr.effects.find(e => e.is(fromHistory));
         if (fromHist) {
-            let from = fromHist.side, event = eventFromTransaction(tr);
-            let other = from == 0 ? state.undone : state.done;
+            let { side, rest } = fromHist.value, event = eventFromTransaction(tr);
+            let other = side == 0 ? state.undone : state.done;
             if (event)
                 other = new Branch(event.changes, event.effects, null, tr.startState.selection, other);
-            return new HistoryState(from == 0 ? fromHist.rest : other, from == 0 ? other : fromHist.rest);
+            return new HistoryState(side == 0 ? rest : other, side == 0 ? other : rest);
         }
         let isolate = tr.annotation(history.isolate);
         if (isolate == true || isolate == "before")
@@ -239,8 +247,7 @@ class HistoryState {
         return {
             changes: branch.changes,
             selection: branch.startSelection,
-            effects: branch.effects,
-            annotations: fromHistory.of({ side, rest: branch.next }),
+            effects: branch.effects.concat(fromHistory.of({ side, startDoc: branch.changes.apply(state.doc), rest: branch.next })),
             userEvent: side == 0 ? "undo" : "redo",
             scrollIntoView: true
         };

package/dist/state.js

@@ -854,14 +854,14 @@ function findNormalAt(cx, pos, bias) {
                 parent = parent.parent;
             }
             else {
-                let next = parent.node.content[index + (dir > 0 ? 0 : -1)];
+                let nextIndex = index + (dir > 0 ? 0 : -1), next = parent.node.content[nextIndex];
                 if (next.isLeaf || isBarrier(cx, next))
                     break;
                 if (!parent.node.inlineContent && next.inlineContent && cx.config.visualCursorMotion) {
                     let startPos = curPos - (dir > 0 ? 0 : next.length) + 1;
                     return TextblockMap.get(cx, startPos, next).visualSide(dir > 0);
                 }
-                parent = Pos.Plot.create(parent, next, curPos, index);
+                parent = Pos.Plot.create(parent, next, curPos, nextIndex);
                 index = dir > 0 ? 0 : next.content.length;
                 curPos += dir;
             }

package/package.json

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