@nerd-bible/wordgard 0.3.4 → 0.3.6

package/dist/command.d.ts

@@ -511,7 +511,7 @@ declare const insertLineBreak: Command.Pure;
 The command that handles enter presses. The default handler will,
 if the selection is not in an inline context, insert an empty
 default textblock in its position. Otherwise it first tries
-`liftEmptyTextblock`, then `splitTextblock`.
+`liftEmptyBlock`, then `splitTextblock`.
 */
 declare const enter: Command.Pure;
 /**
@@ -705,11 +705,11 @@ selection is empty.
 */
 declare function deleteSelection(state: GardState): Transaction.Spec | false;
 /**
-If the cursor is inside an empty textblock, return a transaction
-that deletes the entire block. `dir` determines which way the
-cursor moves after the deletion.
+If the cursor is inside an empty plot, return a transaction that
+deletes the entire plot. `dir` determines which way the cursor
+moves after the deletion.
 */
-declare function deleteEmptyTextblock(state: GardState, dir?: -1 | 1): Transaction.Spec | false;
+declare function deleteEmptyPlot(state: GardState, dir?: -1 | 1): Transaction.Spec | false;
 /**
 If the cursor is at the start of a textblock that can be joined to
 a textblock before it, return a transaction to performs this join.
@@ -793,4 +793,4 @@ updated to perform those joins.
 */
 declare function autoJoinBlocks(state: GardState, tr: Transaction.Spec): Transaction.Spec;
 
-export { Command, Menu, autoJoinBlocks, canAddMarkInRange, clearNonFitting, deleteBackward, deleteEmptyTextblock, deleteForward, deleteLine, deleteSelection, deleteToLineEnd, deleteUnit, deleteWord, doUnwrapBlock, enter, findUnwrappable, findWrappable, insertLineBreak, insertText, joinBackward, joinBlocks, joinForward, joinListItems, liftEmptyBlock, listIsActive, moveByLine, moveByPage, moveByUnit, moveByWord, moveToDocSide, moveToLineSide, moveToTextblockSide, redo, selectAll, selectedTextblocks, setAlignment, setDirection, setTextblockType, splitTextblock, toggleBlock, toggleEmphasis, toggleList, toggleMark, toggleStrong, toggleUnderline, transposeChars, undo, unwrapBlock, wrapBlock, wrapBlockRange };
+export { Command, Menu, autoJoinBlocks, canAddMarkInRange, clearNonFitting, deleteBackward, deleteEmptyPlot, deleteForward, deleteLine, deleteSelection, deleteToLineEnd, deleteUnit, deleteWord, doUnwrapBlock, enter, findUnwrappable, findWrappable, insertLineBreak, insertText, joinBackward, joinBlocks, joinForward, joinListItems, liftEmptyBlock, listIsActive, moveByLine, moveByPage, moveByUnit, moveByWord, moveToDocSide, moveToLineSide, moveToTextblockSide, redo, selectAll, selectedTextblocks, setAlignment, setDirection, setTextblockType, splitTextblock, toggleBlock, toggleEmphasis, toggleList, toggleMark, toggleStrong, toggleUnderline, transposeChars, undo, unwrapBlock, wrapBlock, wrapBlockRange };

package/dist/command.js

@@ -150,14 +150,14 @@ function deleteSelection(state) {
         userEvent: "delete.selection"
     });
 }
-function deleteEmptyTextblock(state, dir = -1) {
+function deleteEmptyPlot(state, dir = -1) {
     if (!state.selection.isCursor)
         return false;
-    let block = state.sel.head.textblockParent;
-    if (!block || block.start < block.end || block.before == 0 && block.after == state.doc.length)
+    let plot = state.sel.head.parent;
+    if (!plot.parent || plot.start < plot.end)
         return false;
     return {
-        changes: { from: block.before, to: block.after, fit: true },
+        changes: { from: plot.before, to: plot.after, fit: true },
         selection: (cx, changes) => GardSelection.near(cx, changes.mapPos(state.selection.head), dir),
         scrollIntoView: true,
         userEvent: dir < 0 ? "delete.backward" : "delete.forward"
@@ -289,12 +289,9 @@ function deleteBackward(state, word = false) {
     for (;;) {
         if (next.isPlot && next.type.isolating)
             return false;
-        if (next.isLeaf || state.isAtom(next.type))
+        if (next.isLeaf || state.isAtom(next.type) || !next.content.length)
             break;
-        let last = next.content.length - 1;
-        if (last < 0)
-            return false;
-        next = next.content[last];
+        next = next.content[next.content.length - 1];
         pos--;
     }
     if (next.is(Leaf.Text)) {
@@ -336,13 +333,14 @@ function deleteBackward(state, word = false) {
     }
     let from = pos - next.length, to = pos;
     let parent = state.doc.resolve(pos).parent;
-    while (parent && parent.node.type.isBlock && parent.node.content.length == 1) {
-        if (!parent.parent)
-            return false;
-        parent = parent.parent;
-        from--;
-        to++;
-    }
+    if (next.type.isBlock)
+        while (parent && parent.node.type.isBlock && parent.node.content.length == 1) {
+            if (!parent.parent)
+                return false;
+            parent = parent.parent;
+            from--;
+            to++;
+        }
     return {
         changes: { from, to },
         scrollIntoView: true,
@@ -366,10 +364,8 @@ function deleteForward(state, word = false) {
     for (;;) {
         if (next.isPlot && next.type.isolating)
             return false;
-        if (next.isLeaf || state.isAtom(next.type))
+        if (next.isLeaf || state.isAtom(next.type) || !next.content.length)
             break;
-        if (!next.content.length)
-            return false;
         next = next.content[0];
         pos++;
     }
@@ -412,13 +408,14 @@ function deleteForward(state, word = false) {
     }
     let from = pos, to = pos + next.length;
     let parent = state.doc.resolve(pos).parent;
-    while (parent && parent.node.type.isBlock && parent.node.content.length == 1) {
-        if (!parent.parent)
-            return false;
-        parent = parent.parent;
-        from--;
-        to++;
-    }
+    if (next.type.isBlock)
+        while (parent && parent.node.type.isBlock && parent.node.content.length == 1) {
+            if (!parent.parent)
+                return false;
+            parent = parent.parent;
+            from--;
+            to++;
+        }
     return {
         changes: { from, to },
         scrollIntoView: true,
@@ -766,15 +763,15 @@ const deleteUnit = ({ state }, dir) => {
     if (state.readOnly)
         return false;
     return deleteSelection(state) || (dir == "forward"
-        ? joinForward(state) || deleteForward(state) || deleteEmptyTextblock(state, 1)
-        : joinListItems(state) || joinBackward(state) || deleteBackward(state) || deleteEmptyTextblock(state, -1));
+        ? joinForward(state) || deleteForward(state) || deleteEmptyPlot(state, 1)
+        : joinListItems(state) || joinBackward(state) || deleteBackward(state) || deleteEmptyPlot(state, -1));
 };
 const deleteWord = ({ state }, dir) => {
     if (state.readOnly)
         return false;
     return deleteSelection(state) || (dir == "forward"
-        ? joinForward(state) || deleteForward(state, true) || deleteEmptyTextblock(state, 1)
-        : joinListItems(state) || joinBackward(state) || deleteBackward(state, true) || deleteEmptyTextblock(state, -1));
+        ? joinForward(state) || deleteForward(state, true) || deleteEmptyPlot(state, 1)
+        : joinListItems(state) || joinBackward(state) || deleteBackward(state, true) || deleteEmptyPlot(state, -1));
 };
 const deleteToLineEnd = (wg, dir) => {
     if (wg.state.readOnly)
@@ -1101,8 +1098,7 @@ function extendSel(base, head) {
 const moveByUnit = ({ state }, { dir, extend }) => {
     let forward = isForward(dir, state), selection = asTextSel(state.selection, forward);
     if (!selection.empty && !extend) {
-        let next = selection.normalCursorAtBound(state, forward);
-        return next ? setSelection(next) : false;
+        return setSelection(GardSelection.near(state, forward ? selection.to : selection.from, forward ? -1 : 1));
     }
     else {
         let next = selection.nextNormalCursor(state, forward);
@@ -1133,10 +1129,10 @@ function nextVertical(wg, sel, forward, distance, allowNode) {
 }
 const moveByLine = (wg, { dir, extend }) => {
     let { state } = wg, { selection } = state, forward = dir == "down";
-    if (state.selection instanceof GardSelection.Node) {
-        let next = !extend && state.selection.normalCursorAtBound(state, forward);
+    if (selection instanceof GardSelection.Node) {
+        let next = !extend && GardSelection.near(state, forward ? selection.to : selection.from, forward ? -1 : 1);
         if (next && !state.doc.resolve(next.head).parent.node.inlineContent)
-            return setSelection(GardSelection.cursor(next.head, next.headSide, state.selection.goalColumn));
+            return setSelection(GardSelection.cursor(next.head, next.headSide, selection.goalColumn));
         selection = GardSelection.cursor(forward ? selection.to : selection.from, undefined, selection.goalColumn);
     }
     else {
@@ -1448,4 +1444,4 @@ const Menu = /*@__PURE__*/(function (Menu) {
     Menu.resolve = resolve;
 ;return Menu})({});
 
-export { Command, Menu, autoJoinBlocks, canAddMarkInRange, clearNonFitting, deleteBackward, deleteEmptyTextblock, deleteForward, deleteLine, deleteSelection, deleteToLineEnd, deleteUnit, deleteWord, doUnwrapBlock, enter, findUnwrappable, findWrappable, insertLineBreak, insertText, joinBackward, joinBlocks, joinForward, joinListItems, liftEmptyBlock, listIsActive, moveByLine, moveByPage, moveByUnit, moveByWord, moveToDocSide, moveToLineSide, moveToTextblockSide, redo, selectAll, selectedTextblocks, setAlignment, setDirection, setTextblockType, splitTextblock, toggleBlock, toggleEmphasis, toggleList, toggleMark, toggleStrong, toggleUnderline, transposeChars, undo, unwrapBlock, wrapBlock, wrapBlockRange };
+export { Command, Menu, autoJoinBlocks, canAddMarkInRange, clearNonFitting, deleteBackward, deleteEmptyPlot, deleteForward, deleteLine, deleteSelection, deleteToLineEnd, deleteUnit, deleteWord, doUnwrapBlock, enter, findUnwrappable, findWrappable, insertLineBreak, insertText, joinBackward, joinBlocks, joinForward, joinListItems, liftEmptyBlock, listIsActive, moveByLine, moveByPage, moveByUnit, moveByWord, moveToDocSide, moveToLineSide, moveToTextblockSide, redo, selectAll, selectedTextblocks, setAlignment, setDirection, setTextblockType, splitTextblock, toggleBlock, toggleEmphasis, toggleList, toggleMark, toggleStrong, toggleUnderline, transposeChars, undo, unwrapBlock, wrapBlock, wrapBlockRange };

package/dist/doc.d.ts

@@ -250,7 +250,7 @@ declare class Elt<T = string> {
     /**
     Convert an element (with only string content) to a DOM tree.
     */
-    toDOM(this: Elt<string>, doc?: Document): Element | Text;
+    toDOM(this: Elt<string>, doc?: Document): Element;
 }
 declare namespace Elt {
     /**
@@ -1536,6 +1536,15 @@ declare class Plot implements Node.Shared {
     node that overlaps the given range, outer nodes before inner
     nodes. When the function returns `false` for a node, descendents
     of that node are not iterated.
+    
+    When `from` is greater than `to`, iteration happens in inverted
+    order, yielding later siblings before earlier ones.
+    
+    Note that positions passed to the callback are relative to the
+    start of the node this method is called on. That will usually be
+    the document, in which case they are normal document positions,
+    but you can also call it on an arbitrary plot, in which case
+    they are local positions.
     */
     iterate(from: number, to: number, f: (node: Node, pos: number, parent: Plot | null, index: number) => boolean | void): void;
     iterate(f: (node: Node, pos: number, parent: Plot | null, index: number) => boolean | void): void;
@@ -1676,6 +1685,11 @@ declare namespace Plot {
         */
         readonly orientation: "row" | "column";
         /**
+        True if this is an inline plot with {@link
+        Plot.Spec.cursorInsideBounds `cursorInsideBounds`} set.
+        */
+        readonly cursorInsideBounds: boolean;
+        /**
         The spec used to define this plot type.
         */
         readonly spec: Plot.Spec<any>;

package/dist/doc.js

@@ -1301,8 +1301,12 @@ class Plot {
     }
     iterate(a, b, c) {
         let [from, to, f] = typeof a == "number" ? [a, b, c] : [0, this.length, a];
-        if (this.isDoc || f(this, 0, null, 0) !== false)
-            this.iterInner(0, from, to, f);
+        if (this.isDoc || f(this, 0, null, 0) !== false) {
+            if (to < from)
+                this.iterBack(this.contentLength, to, from, f);
+            else
+                this.iterInner(0, from, to, f);
+        }
     }
     nodeAt(pos) {
         for (let node of this.content) {
@@ -1333,12 +1337,20 @@ class Plot {
                 break;
             let node = this.content[i], start = pos;
             pos += node.length;
-            if (pos <= from)
-                continue;
-            if (f(node, start, this, i) !== false && node.isPlot)
+            if (pos > from && f(node, start, this, i) !== false && node.isPlot)
                 node.iterInner(start + 1, from, to, f);
         }
     }
+    iterBack(contentEnd, from, to, f) {
+        for (let pos = contentEnd, i = this.content.length - 1; i >= 0; i--) {
+            if (pos <= from)
+                break;
+            let node = this.content[i], end = pos;
+            pos -= node.length;
+            if (pos < to && f(node, pos, this, i) !== false && node.isPlot)
+                node.iterBack(end - 1, from, to, f);
+        }
+    }
     toString() {
         return this.name + markString(this.tag.marks) + "(" + this.content.join() + ")";
     }
@@ -1417,6 +1429,7 @@ class Plot {
         neutral;
         preserveWhitespace;
         orientation;
+        cursorInsideBounds;
         spec;
         constructor(name, flags, spec) {
             super(name, flags, spec, NodeShape.from(name, false, spec.shape));
@@ -1428,6 +1441,7 @@ class Plot {
             this.neutral = spec.neutral ?? !this.defining;
             this.preserveWhitespace = spec.preserveWhitespace ?? !!this.hasRole(Node.Role.Code);
             this.orientation = flags & 2 ? "row" : spec.orientation || "column";
+            this.cursorInsideBounds = !!((flags & 1) && spec.cursorInsideBounds);
             this.default = "defaultParam" in spec ? Plot.Tag.new(this, spec.defaultParam, none) :
                 (flags & 16) ? Plot.Tag.new(this, null, none) : null;
             if (!this.shape.atom && this.isInline && !this.inlineContent)
@@ -2945,15 +2959,17 @@ class SectionIter {
     }
     next() {
         let { sections } = this;
+        this.off = 0;
         if (this.i < sections.length) {
             this.len = sections[this.i++];
             this.ins = sections[this.i++];
+            if (this.len == 0 && this.ins < 0)
+                this.next();
         }
         else {
             this.len = 0;
             this.ins = -3;
         }
-        this.off = 0;
     }
     get keep() { return this.ins == -1 || this.ins == -2; }
     get done() { return this.ins == -3; }
@@ -3055,6 +3071,9 @@ function splatContext(top, cx) {
     for (let ch of cx.children)
         top.push(ch);
 }
+function isFitBarrier(plot) {
+    return plot.isolating || plot.cursorInsideBounds;
+}
 function fitReplacement(doc, from, to, slice, context) {
     if (!slice.length)
         return fitDeletion(doc, from, to);
@@ -3085,10 +3104,10 @@ function fitReplacement(doc, from, to, slice, context) {
     let found, foundCost = 1e8;
     let neutral = true, toEnd = true;
     scan: for (let cxFrom = from.parent, cxTo = to.parent, fromDepth = from.depth, toDepth = to.depth, start = from.pos, end = to.pos; cxFrom.parent; cxFrom = cxFrom.parent, start--, fromDepth--) {
-        if (cxFrom.start != start || cxFrom.node.type.isolating)
+        if (cxFrom.start != start || isFitBarrier(cxFrom.node.type))
             break;
         while (toDepth > fromDepth) {
-            if (cxTo.node.type.isolating)
+            if (isFitBarrier(cxTo.node.type))
                 break scan;
             cxTo = cxTo.parent;
             toDepth--;
@@ -3122,17 +3141,22 @@ function fitReplacement(doc, from, to, slice, context) {
     if (found)
         return found;
     if (from.pos == to.pos && !from.inText) {
-        let cx = from.parent, before = from.pos, after = from.pos;
-        for (; cx.parent && !cx.node.type.isolating && (before == cx.start || after == cx.end); cx = cx.parent, before--, after++) {
+        let cx = from.parent;
+        for (let before = from.index ? -1 : from.pos, after = from.pos == from.parent.end ? from.pos : -1; before > -1 || after > -1;) {
             for (let i = -1; i < context.length; i++) {
                 let type = i >= 0 ? context[i].type : firstType;
                 if (!type)
                     continue;
-                if (doc.schema.canContain(cx.parent.node.type, type)) {
-                    let pos = before == cx.start ? cx.before : cx.after;
+                if (doc.schema.canContain(cx.node.type, type)) {
+                    let pos = before > -1 ? before : after;
                     return { from: pos, to: pos, slice: i >= 0 ? closeSlice(doc.schema, slice, context, i + 1, true) : slice };
                 }
             }
+            if (isFitBarrier(cx.node.type) || !cx.parent)
+                break;
+            before = before == cx.start ? before - 1 : -1;
+            after = after == cx.end ? after + 1 : -1;
+            cx = cx.parent;
         }
     }
     for (let i = 0; i < context.length; i++) {
@@ -3147,7 +3171,7 @@ function fitDeletion(doc, from, to) {
     let toDepth = to.depth;
     let covered;
     for (let cx = from.parent, cxTo = to.parent, depth = from.depth, start = from.pos, end = to.pos; cx.parent; start--, cx = cx.parent, depth--) {
-        if (cx.start != start || cx.node.type.isolating)
+        if (cx.start != start || isFitBarrier(cx.node.type))
             break;
         while (toDepth > depth) {
             cxTo = cxTo.parent;

package/dist/editor.d.ts

@@ -46,7 +46,7 @@ declare namespace Widget {
         /**
         How to render the widget as DOM content.
         */
-        render: (value: Param) => Element | Text;
+        render: (value: Param, wg: Wordgard) => Element | Text;
         /**
         Compare the widget value for equality. Will default to `===`.
         */
@@ -64,16 +64,22 @@ declare namespace Widget {
         */
         disconnect?: (value: Param, dom: Element | Text) => void;
         /**
-        Called before the editor handles a DOM event that comes from
-        inside the widget. May return true to indicate that no further
-        handling of the event should happen.
+        Used to determine whether events originating from the widget's
+        DOM should ignored by the editor. `false` or a function that
+        returns `false` for the event will prevent the editor's
+        regular event handling for the event.
         */
-        handleEvent?: (event: Event, wg: Wordgard) => boolean;
+        propagateEvent?: boolean | ((event: Event) => boolean);
         /**
         Set this to false for widgets that either aren't visible or
         are positioned outside of the regular document flow.
         */
         inFlow?: boolean;
+        /**
+        By default, widgets are set to be ineditable. Set this to
+        `true` to suppress that.
+        */
+        editable?: boolean;
     };
     /**
     Each widget has an associated type that describes how it
@@ -506,7 +512,7 @@ declare abstract class Tile {
     get boundary(): 0 | 1;
     get firstChild(): Tile | null;
     get lastChild(): Tile | null;
-    handleEvent(event: Event, wg: Wordgard): boolean;
+    ignoreEvent(event: Event): boolean;
     get ignoreMutations(): boolean;
     toString(): string;
     sync(): void;
@@ -606,6 +612,10 @@ declare class Wordgard {
     private editorAttrs;
     private contentAttrs;
     private styleModules;
+    /**
+    True when the editor is connected to a DOM document.
+    */
+    connected: boolean;
     private flushing;
     private willFlush;
     private flushFunc;