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

package/dist/command.d.ts

@@ -518,10 +518,10 @@ declare const enter: Command.Pure;
 /**
 Delete the selection, or the unit after or before the selection.
 If that unit is the start or end of a textblock, this will try to
-join that textblock to the next one. Otherwise, if it is a
-character or leaf node, that is deleted. If none of that is
-possible and the cursor is in an empty textblock, this will delete
-the textblock.
+join that textblock to the next one. Otherwise, if the cursor is
+in an empty textblock, this will delete the textblock. Finally, if
+there is a character or leaf node in the given direction, that is
+deleted.
 
 When deleting backward at the start of a list item that has a
 sibling before it, this command will try to join those list items.
@@ -709,9 +709,17 @@ declare const redo: Command;
 
 /**
 If the cursor is in an empty textblock that can be lifted out of a
-parent, return a transaction that does this.
+parent, return a transaction that does this. Unless
+`splitListItem` is set to false, if the block is part of a
+continued list item, this function will split the item above the
+block before it lifts it.
 */
-declare function liftEmptyBlock(state: GardState): Transaction.Spec | false;
+declare function liftEmptyBlock(state: GardState, splitListItem?: boolean): Transaction.Spec | false;
+/**
+Lift the textblock that the cursor is at the start of out of its
+innermost parent, if possible.
+*/
+declare function liftTextblock(state: GardState): Transaction.Spec | false;
 /**
 If the selection is in a {@link Plot.Spec.preserveWhitespace
 `preserveWhitespace`} textblock, replace the selected content with
@@ -823,4 +831,4 @@ updated to perform those joins.
 */
 declare function autoJoinBlocks(state: GardState, tr: Transaction.Spec): Transaction.Spec;
 
-export { Command, Menu, autoJoinBlocks, canAddMarkInRange, clearNonFitting, deleteBackward, deleteEmptyPlot, deleteForward, deleteLine, deleteSelection, deleteToLineEnd, deleteUnit, deleteWord, doUnwrapBlock, enter, enterInCode, findUnwrappable, findWrappable, insertLineBreak, insertText, joinBackward, joinBlocks, joinForward, joinListItems, killToLineEnd, 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, yankKilled };
+export { Command, Menu, autoJoinBlocks, canAddMarkInRange, clearNonFitting, deleteBackward, deleteEmptyPlot, deleteForward, deleteLine, deleteSelection, deleteToLineEnd, deleteUnit, deleteWord, doUnwrapBlock, enter, enterInCode, findUnwrappable, findWrappable, insertLineBreak, insertText, joinBackward, joinBlocks, joinForward, joinListItems, killToLineEnd, liftEmptyBlock, liftTextblock, 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, yankKilled };

package/dist/command.js

@@ -45,12 +45,27 @@ const Command = /*@__PURE__*/(function (Command) {
     Command.dispatch = dispatch;
 ;return Command})({});
 
-function liftEmptyBlock(state) {
+function liftEmptyBlock(state, splitListItem = true) {
     if (!state.selection.isCursor)
         return false;
     let sel = state.sel, block = sel.head.textblockParent;
     if (!block || !sel.head.isAtStart(block) || !sel.head.isAtEnd(block))
         return false;
+    if (splitListItem && block.parent?.parent && block.index && block.parent.parent.node.type.hasRole(Node.Role.List))
+        return {
+            changes: { from: block.before, insert: [Plot.End, block.parent.node.tag] },
+            scrollIntoView: true,
+            userEvent: "split.list"
+        };
+    return liftBlock(state, block);
+}
+function liftTextblock(state) {
+    if (!state.selection.isCursor)
+        return false;
+    let { head } = state.sel, block = head.textblockParent;
+    return !block || !head.isAtStart(block) ? false : liftBlock(state, block);
+}
+function liftBlock(state, block) {
     let start = block.before, end = block.after, before = [], after = [];
     for (let level = block.parent, index = block.index, atStart = true, atEnd = true, first = true; level; first = false, index = level.index, level = level.parent) {
         if (!first && state.schema.canContain(level.node.type, block.node.type))
@@ -60,7 +75,7 @@ function liftEmptyBlock(state) {
                     { from: block.after, to: end, insert: after }
                 ],
                 scrollIntoView: true,
-                userEvent: "unwrap.empty"
+                userEvent: "unwrap"
             };
         if (level.node.isInline || level.node.type.isolating)
             break;
@@ -792,8 +807,8 @@ const deleteUnit = ({ state }, dir) => {
     if (state.readOnly)
         return false;
     return deleteSelection(state) || (dir == "forward"
-        ? joinForward(state) || deleteForward(state) || deleteEmptyPlot(state, 1)
-        : joinListItems(state) || joinBackward(state) || deleteBackward(state) || deleteEmptyPlot(state, -1));
+        ? joinForward(state) || deleteEmptyPlot(state, 1) || deleteForward(state)
+        : joinListItems(state) || liftTextblock(state) || joinBackward(state) || deleteEmptyPlot(state, -1) || deleteBackward(state));
 };
 const deleteWord = ({ state }, dir) => {
     if (state.readOnly)
@@ -1541,4 +1556,4 @@ const Menu = /*@__PURE__*/(function (Menu) {
     Menu.resolve = resolve;
 ;return Menu})({});
 
-export { Command, Menu, autoJoinBlocks, canAddMarkInRange, clearNonFitting, deleteBackward, deleteEmptyPlot, deleteForward, deleteLine, deleteSelection, deleteToLineEnd, deleteUnit, deleteWord, doUnwrapBlock, enter, enterInCode, findUnwrappable, findWrappable, insertLineBreak, insertText, joinBackward, joinBlocks, joinForward, joinListItems, killToLineEnd, 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, yankKilled };
+export { Command, Menu, autoJoinBlocks, canAddMarkInRange, clearNonFitting, deleteBackward, deleteEmptyPlot, deleteForward, deleteLine, deleteSelection, deleteToLineEnd, deleteUnit, deleteWord, doUnwrapBlock, enter, enterInCode, findUnwrappable, findWrappable, insertLineBreak, insertText, joinBackward, joinBlocks, joinForward, joinListItems, killToLineEnd, liftEmptyBlock, liftTextblock, 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, yankKilled };

package/dist/doc.js

@@ -412,7 +412,7 @@ const Attributes = /*@__PURE__*/(function (Attributes) {
                 score--;
                 iA += 2;
             }
-            else if (iB < b.length && iA == a.length) {
+            else if (iB < b.length) {
                 score--;
                 iB += 2;
             }
@@ -2399,6 +2399,36 @@ class ChangeSetBuilder {
     sections = [];
     data = [];
     pos = 0;
+    addSection(from, to, ins, value) {
+        if (from >= this.pos) {
+            addSection(this.sections, this.data, from - this.pos, -1, null);
+            addSection(this.sections, this.data, to - from, ins, value);
+            this.pos = to;
+            return true;
+        }
+        if (this.sections.length && this.sections[0] > to && this.sections[1] == -1) {
+            this.spliceSection(0, from, to, ins, value);
+            return true;
+        }
+        for (let pos = this.pos, i = this.sections.length; i > 2 && pos > to;) {
+            let nextIns = this.sections[--i], nextLen = this.sections[--i];
+            let start = pos - nextLen;
+            if (nextIns == -1 && start < from) {
+                this.spliceSection(i, from - start, to - start, ins, value);
+                return true;
+            }
+            pos = start;
+        }
+        return false;
+    }
+    spliceSection(i, from, to, ins, value) {
+        let sections = [], data = [];
+        addSection(sections, data, from, -1, null);
+        addSection(sections, data, to - from, ins, value);
+        addSection(sections, data, this.sections[i] - to, -1, null);
+        this.sections.splice(i, 2, ...sections);
+        this.data.splice(i >> 1, 1, ...data);
+    }
 }
 function sliceLen(tokens) {
     return tokens.reduce((l, e) => l + (e.tokenType == Token.Type.Node ? e.length : 1), 0);
@@ -2419,14 +2449,11 @@ function createChangeSet(doc, spec, mayCorrect = true) {
         accum = accum ? accum.compose(transform(set, accum, doc, false, false).set) : set;
     };
     let section = (from, to, ins, value) => {
-        if (!cur || from < cur.pos) {
+        if (!cur?.addSection(from, to, ins, value)) {
             flush();
             cur = new ChangeSetBuilder(doc.length);
+            cur.addSection(from, to, ins, value);
         }
-        if (from > cur.pos)
-            addSection(cur.sections, cur.data, from - cur.pos, -1, null);
-        addSection(cur.sections, cur.data, to - from, ins, value);
-        cur.pos = to;
     };
     let build = (spec) => {
         if (Array.isArray(spec)) {

package/dist/editor.js

@@ -743,7 +743,7 @@ class DecoIterator {
                 else
                     started = true;
                 let hasPending = pendingPos == pos && !node.isText;
-                let shape = hasPending && pendingShape ? pendingShape.shape : this.tagShape(node.tag, iter.active);
+                let shape = this.tagShape(node.tag, iter.active, hasPending ? pendingShape : null);
                 if (hasPending)
                     for (let deco of pendingDeco)
                         shape = applyDeco(shape, deco, node.tag);
@@ -757,8 +757,7 @@ class DecoIterator {
                     this.widgets(node.tag, 0, walker);
                 else
                     started = true;
-                let shape = pendingShape && pendingPos == pos ? pendingShape.shape
-                    : this.tagShape(node.tag, iter.active);
+                let shape = this.tagShape(node.tag, iter.active, pendingShape && pendingPos == pos ? pendingShape : null);
                 if (pendingPos == pos)
                     for (let deco of pendingDeco)
                         shape = applyDeco(shape, deco, node.tag);
@@ -837,9 +836,8 @@ class DecoIterator {
         }
         this.pos = pos;
     }
-    tagShape(tag, active) {
-        let override = this.tagShapes.get(tag.type);
-        let shape = override ? override(tag) : baseTagShape(tag);
+    tagShape(tag, active, fromPoint) {
+        let shape = fromPoint ? fromPoint.shape : this.tagShapes.get(tag.type)?.(tag) ?? baseTagShape(tag);
         if (tag.marks.length)
             shape = addMarkAttributes(this.markShapes, shape, tag);
         let add;
@@ -2532,8 +2530,10 @@ class ContentUpdate {
                 prev = copy;
                 prev.parent = cur;
             }
-            for (let j = i + 1; j < cur.children.length; j++)
+            for (let j = i + 1; j < cur.children.length; j++) {
                 prev.addChild(cur.children[j]);
+                cur.children.splice(j, 1);
+            }
             return prev;
         }
         return null;

package/package.json

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