smartrte-core 1.0.0-beta.8 → 1.0.0-beta.9

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 1.0.0-beta.9
+
+- Fix converting a paragraph sitting directly after an existing list into a list of the same kind always creating a second, independently-numbered list instead of continuing the existing one — e.g. typing after exiting a numbered list (Enter twice) and clicking "Numbered list" again now correctly appends as the next item rather than restarting at "1." next to it. See `docs/bugs/list-creation-ignores-adjacent-identical-list.md`.
+- Fix pressing Enter at the end of a code-block list item never being able to create a new sibling list item — it previously only ever added lines inside the current item's own code block, with the only way "out" leaving a permanent stray empty paragraph behind. The same "type, Enter, Enter" rhythm already used to exit an empty list item now correctly starts a genuine new item instead. See `docs/bugs/code-block-list-item-cannot-exit-to-new-sibling-item.md`.
+- Fix a further Enter pressed on that newly escaped (necessarily empty) item immediately exiting the list again instead of letting you type into it — indistinguishable from the editor's own separate "empty item + Enter exits the list" convention, so one extra keystroke silently undid the escape above and produced only stray paragraphs afterward. See `docs/bugs/code-block-list-item-cannot-exit-to-new-sibling-item.md`.
+- Fix pressing Enter at the end of a code block's own content looking like it did nothing — a trailing "\n" with no following content rendered at zero extra height under `white-space:pre-wrap` (the model was correct; only the visible box failed to grow). See `docs/bugs/code-block-trailing-newline-invisible.md`.
+- Fix any color or border live-preview (e.g. dragging the color picker, table-cell background/text colour) throwing "Children do not match 'text*'" and getting permanently stuck — unable to apply, unable to close by any means — the moment the document contained a multi-line code block anywhere in it, not just the target being colored. See `docs/bugs/checkpoint-restore-crashes-with-multiline-code-block.md`.
+- Fix Shift+ArrowLeft/Shift+ArrowRight moving a collapsed caret instead of extending the selection (outside of a table cell, where this already worked) — the same gap already fixed once for Shift+Home/End, never carried over to plain arrows. See `docs/bugs/shift-arrow-left-right-does-not-extend-selection.md`.
+
 ## 1.0.0-beta.8
 
 - Fix Blockquote (and unwrap) throwing an uncaught error ("replaceNode before payload does not match document node.") and applying nothing, for a selection spanning a list item's own text and a nested sub-list item's text — two selected blocks resolving to two different, nested "list" ancestors were treated as independent (and mutually conflicting) wrap targets instead of recognizing the inner one is already covered by the outer one. Also fixed the identical latent issue for unwrapping nested blockquotes (the schema allows blockquote nesting), even though no live report had surfaced it yet. See `docs/bugs/blockquote-crashes-on-selection-spanning-outer-and-nested-list.md`.

package/dist/foundation/block/input.d.ts

@@ -13,7 +13,24 @@ export declare const insertCodeBlockNewline: (document: SmartDocument, pos: Smar
     readonly paragraphId?: string;
 }) => CodeBlockInputResult | null;
 export declare const indentInsideCodeBlock: (document: SmartDocument, pos: SmartPos) => CodeBlockInputResult | null;
-/** Ctrl/Cmd+Enter exits before only at offset zero; otherwise it exits after. */
+/**
+ * Ctrl/Cmd+Enter exits before only at offset zero; otherwise it exits after.
+ *
+ * If the code block is the first/last content of a `list_item` (nothing
+ * else before/after it in the exit direction), exiting creates a new
+ * sibling *list item* instead of just another block stuffed inside the
+ * current one - list.ts's own `isInlineOwner` deliberately excludes
+ * `code_block` from its list-split logic (typing more lines of code must
+ * never accidentally split into a new item), which otherwise leaves no way
+ * to ever start a new item after one whose only content is a code block:
+ * "I create a number list ... type something ... clicked on number list
+ * tool which create new list again instead of becoming one with previous"
+ * was a *different*, already-fixed report, but the same investigation
+ * surfaced this - "Enter only creating new lines inside of code-block"
+ * when trying to add item 5 after a code-block item 4. This check doesn't
+ * require depending on the list module - it only reads generic node types,
+ * the same way `codeAt` above already does.
+ */
 export declare const exitCodeBlock: (document: SmartDocument, pos: SmartPos, paragraphId?: string) => CodeBlockInputResult | null;
 /** Canonical fragment insertion only; Phase 8 owns clipboard parsing. */
 export declare const insertPlainCodeFragment: (document: SmartDocument, pos: SmartPos, fragment: SmartDocument, _ctx: BlockCommandContext) => CodeBlockInputResult | null;

package/dist/foundation/block/input.js

@@ -35,7 +35,24 @@ export const indentInsideCodeBlock = (document, pos) => {
         intent: "indent",
     };
 };
-/** Ctrl/Cmd+Enter exits before only at offset zero; otherwise it exits after. */
+/**
+ * Ctrl/Cmd+Enter exits before only at offset zero; otherwise it exits after.
+ *
+ * If the code block is the first/last content of a `list_item` (nothing
+ * else before/after it in the exit direction), exiting creates a new
+ * sibling *list item* instead of just another block stuffed inside the
+ * current one - list.ts's own `isInlineOwner` deliberately excludes
+ * `code_block` from its list-split logic (typing more lines of code must
+ * never accidentally split into a new item), which otherwise leaves no way
+ * to ever start a new item after one whose only content is a code block:
+ * "I create a number list ... type something ... clicked on number list
+ * tool which create new list again instead of becoming one with previous"
+ * was a *different*, already-fixed report, but the same investigation
+ * surfaced this - "Enter only creating new lines inside of code-block"
+ * when trying to add item 5 after a code-block item 4. This check doesn't
+ * require depending on the list module - it only reads generic node types,
+ * the same way `codeAt` above already does.
+ */
 export const exitCodeBlock = (document, pos, paragraphId = createNodeId()) => {
     const code = codeAt(document, pos);
     if (!code || !pos.path.length)
@@ -43,6 +60,23 @@ export const exitCodeBlock = (document, pos, paragraphId = createNodeId()) => {
     const parentPath = pos.path.slice(0, -1);
     const codeIndex = pos.path[pos.path.length - 1];
     const before = pos.offset === 0;
+    const parent = nodeAtPath(document, parentPath);
+    const siblingCount = parent && !isTextNode(parent) ? (parent.children || []).length : 0;
+    const atListItemBoundary = parent && !isTextNode(parent) && parent.type === "list_item"
+        && (before ? codeIndex === 0 : codeIndex === siblingCount - 1) && parentPath.length > 0;
+    if (atListItemBoundary) {
+        const listItemIndex = parentPath[parentPath.length - 1];
+        const listPath = parentPath.slice(0, -1);
+        return {
+            operations: [{
+                    type: "insertNode",
+                    pos: { path: listPath, offset: listItemIndex + (before ? 0 : 1) },
+                    node: { type: "list_item", id: createNodeId(), children: [{ type: "paragraph", id: paragraphId, children: [] }] },
+                }],
+            selectionTarget: { ownerId: paragraphId, offset: 0 },
+            intent: before ? "exit-before" : "exit-after",
+        };
+    }
     return {
         operations: [{
                 type: "insertNode",

package/dist/foundation/list/commands.js

@@ -170,15 +170,48 @@ export const createList = (document, scope, params, ctx) => {
         ...(params.start !== undefined ? { start: params.start } : {}),
         ...(params.checkable !== undefined ? { checkable: params.checkable } : {}),
     };
+    // Only style/preset/checkable define whether two lists are "the same
+    // list" for merge purposes - `start` deliberately excluded, since
+    // appending items to an already-numbered list should keep continuing
+    // from wherever it already is, not require an exact `start` match.
+    const listIdentityMatches = (existing) => (existing?.preset ?? undefined) === listAttrs.preset
+        && (existing?.style ?? undefined) === listAttrs.style
+        && Boolean(existing?.checkable) === Boolean(listAttrs.checkable);
     return groups.flatMap((group) => {
         const depths = clampedDepths(group.entries.map((entry) => entry.node));
-        const list = {
-            type: "list",
-            id: nextListId(),
-            attrs: listAttrs,
-            children: buildListItems(group.entries, depths, 0, () => itemIds[itemCursor++], nextListId, listAttrs),
-        };
         const first = group.entries[0];
+        /**
+         * "I create a number list and press enter twice to take the cursor out
+         * from the list, then type something there and click the list tool" -
+         * previously always created a brand-new, independently-numbered list
+         * even when it sat directly after an existing, identical one - two
+         * separate "1."s instead of one continuous "1./2." list. If the
+         * immediately preceding sibling (same parent, same nesting level) is
+         * already a list of the exact same kind, the converted content joins
+         * it as trailing item(s) instead of starting a second list right next
+         * to the first.
+         */
+        const precedingIndex = first.pos.offset - 1;
+        const parent = ctx.positions.positionOf(first.id)?.parent;
+        const preceding = precedingIndex >= 0 ? parent?.children?.[precedingIndex] : undefined;
+        const mergeTarget = preceding && !isTextNode(preceding) && preceding.type === "list" && listIdentityMatches(preceding.attrs)
+            ? preceding : undefined;
+        const newItems = buildListItems(group.entries, depths, 0, () => itemIds[itemCursor++], nextListId, listAttrs);
+        if (mergeTarget) {
+            const operations = [{
+                    type: "replaceNode",
+                    pos: { path: [...first.pos.path], offset: precedingIndex },
+                    before: mergeTarget,
+                    after: withChildren(mergeTarget, [...(mergeTarget.children || []), ...newItems]),
+                }];
+            // Descending order so removing a later entry never shifts the index
+            // an earlier removeNode in this same batch still needs to target.
+            for (let index = group.entries.length - 1; index >= 0; index -= 1) {
+                operations.push({ type: "removeNode", pos: { path: [...first.pos.path], offset: first.pos.offset + index }, node: group.entries[index].node });
+            }
+            return operations;
+        }
+        const list = { type: "list", id: nextListId(), attrs: listAttrs, children: newItems };
         const operations = [{ type: "replaceNode", pos: first.pos, before: first.node, after: list }];
         group.entries.slice(1).forEach((entry) => operations.push({
             type: "removeNode",

package/dist/foundation/list/input.d.ts

@@ -7,7 +7,7 @@ export interface ListSelectionTarget {
 export interface ListInputResult {
     readonly operations: SmartOperation[];
     readonly selectionTarget: ListSelectionTarget;
-    readonly intent: "split" | "indent" | "outdent" | "unwrap" | "merge-backward" | "merge-forward" | "line-break" | "check";
+    readonly intent: "split" | "indent" | "outdent" | "unwrap" | "merge-backward" | "merge-forward" | "line-break" | "check" | "noop";
 }
 export interface ListEnterIds {
     readonly itemId: string;

package/dist/foundation/list/input.js

@@ -130,6 +130,13 @@ const splitInlineOwner = (owner, offset, newId) => {
     return [left, { ...owner, id: newId, children: after }];
 };
 const emptyParagraph = (id) => ({ type: "paragraph", id, children: [] });
+const endsInCodeBlock = (item) => {
+    if (isTextNode(item))
+        return false;
+    const children = item.children || [];
+    const last = children[children.length - 1];
+    return Boolean(last) && !isTextNode(last) && last.type === "code_block";
+};
 export const enterInList = (document, pos, ids, ctx) => {
     const context = contextAt(document, pos);
     if (!context)
@@ -139,6 +146,21 @@ export const enterInList = (document, pos, ids, ctx) => {
     const itemEmpty = (context.item.children || []).filter(isElementNode).filter((child) => child.type !== "list")
         .every((child) => isInlineOwner(child) && inlineSize(child) === 0);
     if (itemEmpty) {
+        // A code block can only ever be escaped into a *new*, necessarily empty
+        // sibling item (block/input.ts's exitCodeBlock) - so the very next Enter
+        // pressed on that item, before anything is typed, is exactly the
+        // one-keystroke-too-many trap of "type, Enter, Enter, Enter" reported
+        // live: the third Enter looks identical to any other empty-item Enter
+        // and immediately exits the list again, undoing the escape it just
+        // took two Enters to reach. Swallow it instead of exiting so the newly
+        // created item survives long enough to type into.
+        const preceding = context.itemIndex > 0 ? context.list.children?.[context.itemIndex - 1] : undefined;
+        if (preceding && endsInCodeBlock(preceding))
+            return {
+                operations: [],
+                selectionTarget: { ownerId: context.owner.id, offset: 0 },
+                intent: "noop",
+            };
         if (depth > 0)
             return {
                 operations: outdentList(document, scope, {}, ctx),

package/dist/foundation/marks/hardBreak.js

@@ -9,6 +9,17 @@ export const migrateNewlineTextToHardBreaks = (document) => {
                 return node;
             throw new Error("Text-node migration must be performed by its inline owner.");
         }
+        // code_block is the one node type whose schema is `content: "text*"` -
+        // it never accepts a hard_break child, and its own newline handling
+        // (block/input.ts's insertCodeBlockNewline) deliberately keeps line
+        // breaks as literal "\n" characters, unlike every inline-owner this
+        // migration actually targets. Splitting a code block's text here
+        // produced a hard_break inside a "text*"-only parent - a document that
+        // fails validate() on the very next restoreCheckpoint/replaceState
+        // call (live report: dragging the color picker on a document with any
+        // multi-line code block crashed with "Children do not match 'text*'").
+        if (node.type === "code_block")
+            return node;
         const children = [];
         let changed = false;
         (node.children || []).forEach((child) => {

package/dist/foundation/surface/input.js

@@ -1320,7 +1320,7 @@ export class FoundationInputPipeline {
             console.warn(`[Smart RTE canonical input] cancelled unsupported inputType: ${type || "unknown"}`);
         }
     }
-    moveCaret(direction, word = false) {
+    moveCaret(direction, word = false, extend = false) {
         const selection = this.editor.selection;
         const active = selection.head;
         const activeOwner = nodeAtPath(this.editor.document, active.path);
@@ -1372,7 +1372,16 @@ export class FoundationInputPipeline {
             }
         }
         const next = { path: [...path], offset };
-        const model = { type: "text", anchor: next, head: next };
+        // Shift+Left/Right is the standard "extend selection one character/word"
+        // gesture - keep the existing anchor (from wherever the shift-extend
+        // sequence started) and only move `head`, matching how Shift+Home/End
+        // already does this (see that handler's own doc comment for the
+        // matching bug this mirrors). Not threaded through
+        // moveFromStructuralBoundary above - extending a text selection through
+        // or onto a structural/atomic node is a materially different problem
+        // (a different selection shape entirely), out of scope here.
+        const anchor = extend ? selection.anchor : next;
+        const model = { type: "text", anchor, head: next };
         this.editor.setSelection(model, { source: "keyboard" });
         this.renderer.render(this.editor.document, model);
     }
@@ -1531,7 +1540,7 @@ export class FoundationInputPipeline {
                 this.renderer.render(this.editor.document, model);
                 return;
             }
-            this.moveCaret(direction, modifier || event.altKey);
+            this.moveCaret(direction, modifier || event.altKey, event.shiftKey);
         }
         else if (event.key === "ArrowUp" || event.key === "ArrowDown") {
             if (event.shiftKey && this.handleTableShiftArrow(event.key === "ArrowUp" ? -1 : 1, 0)) {

package/dist/foundation/surface/renderer.d.ts

@@ -39,6 +39,8 @@ export declare class FoundationSubtreeRenderer implements CanonicalSubtreeRender
      * caret. This <br> is renderer UI, not canonical document content.
      */
     private syncEmptyLineProjection;
+    /** Renderer-only <br> forcing the last, otherwise-invisible blank line of a code block's trailing "\n" to actually take up space. Must run after real text children are already in the DOM, since it's appended after them. */
+    private syncTrailingNewlineProjection;
     private diffElement;
     private selectionMatches;
     private restoreSelection;

package/dist/foundation/surface/renderer.js

@@ -38,6 +38,22 @@ const atomTypes = new Set(["image", "block_image", "formula", "block_formula", "
  */
 const atomErrorTitle = (node, fallback) => typeof node.attrs?.error === "string" && node.attrs.error ? node.attrs.error : fallback;
 const emptyLineOwnerTypes = new Set(["paragraph", "heading", "code_block"]);
+const SMART_TRAILING_NEWLINE_ATTRIBUTE = "data-smart-trailing-newline";
+/**
+ * A code block stores line breaks as literal "\n" characters inside its text
+ * (unlike a paragraph, which uses explicit hard_break nodes) - so a trailing
+ * "\n" with nothing rendered after it renders with zero extra height under
+ * white-space:pre-wrap (there's no following content to anchor a new line
+ * box against). Pressing Enter at the end of a code block's content was
+ * indistinguishable from doing nothing until a second character followed it.
+ */
+const codeBlockEndsInNewline = (node) => {
+    if (node.type !== "code_block")
+        return false;
+    const children = node.children || [];
+    const last = children[children.length - 1];
+    return Boolean(last) && isTextNode(last) && last.text.endsWith("\n");
+};
 const tagForNode = (node) => {
     if (node.type === "paragraph")
         return "p";
@@ -622,6 +638,7 @@ export class FoundationSubtreeRenderer {
                     }
                 });
             this.syncEmptyLineProjection(element, node);
+            this.syncTrailingNewlineProjection(element, node);
         }
         this.modelById.set(node.id, node);
         this.mapping.track(node, path, element);
@@ -661,6 +678,22 @@ export class FoundationSubtreeRenderer {
             this.recordWrite(node.id);
         }
     }
+    /** Renderer-only <br> forcing the last, otherwise-invisible blank line of a code block's trailing "\n" to actually take up space. Must run after real text children are already in the DOM, since it's appended after them. */
+    syncTrailingNewlineProjection(element, node) {
+        const existing = element.querySelector(`:scope > [${SMART_TRAILING_NEWLINE_ATTRIBUTE}]`);
+        const needsProjection = codeBlockEndsInNewline(node);
+        if (needsProjection && !existing) {
+            const line = element.ownerDocument.createElement("br");
+            line.setAttribute(SMART_TRAILING_NEWLINE_ATTRIBUTE, "true");
+            line.setAttribute(SMART_UI_ATTRIBUTE, "trailing-newline");
+            element.appendChild(line);
+            this.recordWrite(node.id);
+        }
+        else if (!needsProjection && existing) {
+            existing.remove();
+            this.recordWrite(node.id);
+        }
+    }
     diffElement(element, before, after, path, listDepth = 0) {
         this.modelById.set(after.id, after);
         this.mapping.track(after, path, element);
@@ -779,6 +812,7 @@ export class FoundationSubtreeRenderer {
             structural = true;
         }
         this.syncEmptyLineProjection(element, after);
+        this.syncTrailingNewlineProjection(element, after);
         return structural;
     }
     selectionMatches(selection, anchor, head) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "smartrte-core",
-  "version": "1.0.0-beta.8",
+  "version": "1.0.0-beta.9",
   "description": "Framework-agnostic document model and editing primitives for Smart RTE",
   "repository": {
     "type": "git",