From 8a5d6adae4f5970dcfb0fa932c11b26432e0d7bb Mon Sep 17 00:00:00 2001 From: Nick the Sick Date: Mon, 16 Nov 2026 17:49:37 +0100 Subject: [PATCH 1/2] fix(core): insert paragraphs at gap cursor on Enter --- ...dShortcutsExtension.gapCursor.node.test.ts | 141 ++++++++++++++++++ .../KeyboardShortcutsExtension.ts | 31 ++++ 2 files changed, 172 insertions(+) create mode 100644 packages/core/src/extensions/tiptap-extensions/KeyboardShortcuts/KeyboardShortcutsExtension.gapCursor.node.test.ts diff --git a/packages/core/src/extensions/tiptap-extensions/KeyboardShortcuts/KeyboardShortcutsExtension.gapCursor.node.test.ts b/packages/core/src/extensions/tiptap-extensions/KeyboardShortcuts/KeyboardShortcutsExtension.gapCursor.node.test.ts new file mode 100644 index 0000000000..754c1de68f --- /dev/null +++ b/packages/core/src/extensions/tiptap-extensions/KeyboardShortcuts/KeyboardShortcutsExtension.gapCursor.node.test.ts @@ -0,0 +1,141 @@ +// @vitest-environment node +import { GapCursor } from "@tiptap/pm/gapcursor"; +import { NodeSelection, TextSelection } from "prosemirror-state"; +import { afterEach, describe, expect, it } from "vite-plus/test"; + +import { getNodeById } from "../../../api/nodeUtil.js"; +import { type PartialBlock } from "../../../blocks/defaultBlocks.js"; +import { BlockNoteEditor } from "../../../editor/BlockNoteEditor.js"; + +const editors: BlockNoteEditor[] = []; + +afterEach(() => { + for (const editor of editors.splice(0)) { + editor._tiptapEditor.destroy(); + } +}); + +function createEditor(initialContent: PartialBlock[]) { + const editor = BlockNoteEditor.create({ + initialContent, + trailingBlock: false, + }); + editors.push(editor); + const view = editor.prosemirrorView; + view.updateState( + view.state.reconfigure({ + plugins: editor._tiptapEditor.extensionManager.plugins, + }), + ); + return editor; +} + +function pressEnter(editor: BlockNoteEditor) { + // The real keymaps only read these fields; no DOM or layout is needed. + const event = { key: "Enter", keyCode: 13 } as KeyboardEvent; + const view = editor.prosemirrorView; + expect( + view.state.plugins.some((plugin) => + plugin.props.handleKeyDown?.call(plugin, view, event), + ), + ).toBe(true); + view.state.doc.check(); + expect(view.state.selection).toBeInstanceOf(TextSelection); + expect(view.state.selection.$from.parent.type.name).toBe("paragraph"); +} + +describe("Enter at a gap cursor", () => { + // Manual ArrowUp navigation produces the inner gap at position 2, before the + // image content inside its blockContainer, not before the wrapper itself. + // These node tests pin Enter's response, not browser arrow-key geometry. + it.each(["image", "file", "video", "audio"] as const)( + "inserts above the first %s without moving its children", + (type) => { + const editor = createEditor([ + { id: "media", type, children: [{ id: "child", content: "Child" }] }, + { id: "following", content: "Following" }, + ]); + editor.transact((tr) => { + tr.setSelection(new GapCursor(tr.doc.resolve(2))); + }); + const original = editor.document; + + pressEnter(editor); + + expect(editor.document.map((block) => block.type)).toEqual([ + "paragraph", + type, + "paragraph", + ]); + expect(editor.document.slice(1)).toEqual(original); + expect(editor.getTextCursorPosition().block.id).toBe( + editor.document[0].id, + ); + }, + ); + + it.each([ + [1, 0], // Before the first wrapper. + [2, 0], // Before the first image, inside its wrapper (the reported case). + [3, 1], // After the image, inside its wrapper. + [4, 1], // Between the wrappers. + [5, 1], // Before the file, inside its wrapper. + [6, 2], // After the final file, inside its wrapper. + ])("inserts at gap %s as block %s", (pos, insertionIndex) => { + const editor = createEditor([ + { id: "image", type: "image" }, + { id: "file", type: "file" }, + ]); + editor.transact((tr) => { + tr.setSelection(new GapCursor(tr.doc.resolve(pos))); + }); + + pressEnter(editor); + + const expected = ["image", "file"]; + expected.splice(insertionIndex, 0, "paragraph"); + expect(editor.document.map((block) => block.type)).toEqual(expected); + expect(editor.getTextCursorPosition().block.id).toBe( + editor.document[insertionIndex].id, + ); + }); + + it("inserts before a nested image without outdenting it", () => { + const editor = createEditor([ + { + id: "parent", + content: "Parent", + children: [{ id: "image", type: "image" }], + }, + ]); + const image = getNodeById("image", editor.prosemirrorState.doc)!; + editor.transact((tr) => { + tr.setSelection(new GapCursor(tr.doc.resolve(image.posBeforeNode + 1))); + }); + + pressEnter(editor); + + expect(editor.document).toHaveLength(1); + expect(editor.document[0].children.map((block) => block.type)).toEqual([ + "paragraph", + "image", + ]); + expect(editor.getTextCursorPosition().block.id).toBe( + editor.document[0].children[0].id, + ); + }); + + it("still inserts below a node-selected image", () => { + const editor = createEditor([{ id: "image", type: "image" }]); + editor.transact((tr) => { + tr.setSelection(NodeSelection.create(tr.doc, 2)); + }); + + pressEnter(editor); + + expect(editor.document.map((block) => block.type)).toEqual([ + "image", + "paragraph", + ]); + }); +}); diff --git a/packages/core/src/extensions/tiptap-extensions/KeyboardShortcuts/KeyboardShortcutsExtension.ts b/packages/core/src/extensions/tiptap-extensions/KeyboardShortcuts/KeyboardShortcutsExtension.ts index 505eb72df0..c63876aec8 100644 --- a/packages/core/src/extensions/tiptap-extensions/KeyboardShortcuts/KeyboardShortcutsExtension.ts +++ b/packages/core/src/extensions/tiptap-extensions/KeyboardShortcuts/KeyboardShortcutsExtension.ts @@ -1,4 +1,5 @@ import { type ChainedCommands, Extension } from "@tiptap/core"; +import { GapCursor } from "@tiptap/pm/gapcursor"; import { Fragment, type Node } from "prosemirror-model"; import { NodeSelection, @@ -17,6 +18,7 @@ import { unnestBlock, } from "../../../api/blockManipulation/commands/nestBlock/nestBlock.js"; import { fixLayoutBlocksById } from "../../../api/blockManipulation/layoutBlocks/fixLayoutBlock.js"; +import { blockToNode } from "../../../api/nodeConversions/blockToNode.js"; import { nodeToBlock } from "../../../api/nodeConversions/nodeToBlock.js"; import { isLayoutNode } from "../../../schema/blocks/children.js"; import { splitBlockCommand } from "../../../api/blockManipulation/commands/splitBlock/splitBlock.js"; @@ -640,6 +642,35 @@ export const KeyboardShortcutsExtension = Extension.create<{ const handleEnter = (withShift = false) => { return this.editor.commands.first(({ commands, tr }) => [ + // A gap is between blocks, not inside the nearest empty block. Arrow + // navigation can place it just inside a blockContainer, before its + // content node; insert outside that wrapper without moving its children. + () => + commands.command(({ state, tr, dispatch }) => { + if (!(state.selection instanceof GapCursor)) { + return false; + } + let $pos = state.selection.$from; + if ($pos.parent.type.name === "blockContainer") { + if ($pos.parentOffset === 0) { + $pos = state.doc.resolve($pos.before()); + } else if ($pos.parentOffset === $pos.parent.content.size) { + $pos = state.doc.resolve($pos.after()); + } + } + const blockType = state.schema.nodes["blockContainer"]; + const index = $pos.index(); + if (!$pos.parent.canReplaceWith(index, index, blockType)) { + return false; + } + if (dispatch) { + const block = blockToNode({ type: "paragraph" }, state.schema); + tr.insert($pos.pos, block) + .setSelection(TextSelection.create(tr.doc, $pos.pos + 2)) + .scrollIntoView(); + } + return true; + }), // Resets an empty block (`keyboard.resetsTo`) if it resets on Enter // (`keyboard.emptyEnterResets`), e.g. an empty list item turns into a // paragraph. Its children stay. From 93d777f171765056d15dd4d0126a23b53e2dd8cf Mon Sep 17 00:00:00 2001 From: Nick the Sick Date: Mon, 16 Nov 2026 18:11:14 +0100 Subject: [PATCH 2/2] test: serve custom block images from local fixtures --- .../customblocks/customblocks.test.tsx | 22 ++++++++++++++-- .../customblocks/fixtures/332x322.jpg | Bin 0 -> 2818 bytes .../customblocks/fixtures/800x540.png | Bin 0 -> 10711 bytes tests/src/utils/mockCustomBlockImages.ts | 24 ++++++++++++++++++ tests/vite.config.browser.ts | 8 +++++- 5 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 tests/src/end-to-end/customblocks/fixtures/332x322.jpg create mode 100644 tests/src/end-to-end/customblocks/fixtures/800x540.png create mode 100644 tests/src/utils/mockCustomBlockImages.ts diff --git a/tests/src/end-to-end/customblocks/customblocks.test.tsx b/tests/src/end-to-end/customblocks/customblocks.test.tsx index 42c89c12b3..9d50f52fbf 100644 --- a/tests/src/end-to-end/customblocks/customblocks.test.tsx +++ b/tests/src/end-to-end/customblocks/customblocks.test.tsx @@ -1,8 +1,8 @@ import ReactCustomBlocksApp from "@examples/06-custom-schema/react-custom-blocks/src/App"; import VanillaCustomBlocksApp from "@examples/vanilla-js/react-vanilla-custom-blocks/src/App"; -import { describe, test } from "vite-plus/test"; +import { afterAll, beforeAll, describe, expect, test } from "vite-plus/test"; import { render } from "vitest-browser-react"; -import { userEvent } from "../../utils/context.js"; +import { commands, userEvent } from "../../utils/context.js"; import { EDITOR_SELECTOR } from "../../utils/const.js"; import { compareDocToSnapshot, @@ -12,6 +12,22 @@ import { } from "../../utils/editor.js"; describe("Check custom block functionality", () => { + const imageCommands = commands as unknown as { + mockCustomBlockImages(action: "install" | "remove"): Promise; + }; + beforeAll(() => imageCommands.mockCustomBlockImages("install")); + afterAll(() => imageCommands.mockCustomBlockImages("remove")); + + async function waitForImage() { + await expect + .poll( + () => + document.querySelector("img.simple-image") + ?.naturalWidth ?? 0, + ) + .toBeGreaterThan(0); + } + test("Should be able to interactively update vanilla custom blocks", async () => { await render(); await waitForSelector(EDITOR_SELECTOR); @@ -20,6 +36,7 @@ describe("Check custom block functionality", () => { await sleep(500); await compareDocToSnapshot("vanillaInteractivity"); + await waitForImage(); await expectElement(document.body).toMatchScreenshot( "vanilla-interactivity", ); @@ -33,6 +50,7 @@ describe("Check custom block functionality", () => { await sleep(500); await compareDocToSnapshot("reactInteractivity"); + await waitForImage(); await expectElement(document.body).toMatchScreenshot("react-interactivity"); }); }); diff --git a/tests/src/end-to-end/customblocks/fixtures/332x322.jpg b/tests/src/end-to-end/customblocks/fixtures/332x322.jpg new file mode 100644 index 0000000000000000000000000000000000000000..8287e0bd9455f35658a2f768e552bcac75628f36 GIT binary patch literal 2818 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 literal 0 HcmV?d00001 diff --git a/tests/src/utils/mockCustomBlockImages.ts b/tests/src/utils/mockCustomBlockImages.ts new file mode 100644 index 0000000000..0ee7740bd8 --- /dev/null +++ b/tests/src/utils/mockCustomBlockImages.ts @@ -0,0 +1,24 @@ +import { fileURLToPath } from "node:url"; +import type { BrowserCommandContext } from "vite-plus/test/node"; + +// Preserve the examples' URLs/document snapshots, but serve the exact image +// bytes locally: a screenshot must not depend on placehold.co being available. +export async function mockCustomBlockImages( + { context }: BrowserCommandContext, + action: "install" | "remove", +) { + for (const filename of ["800x540.png", "332x322.jpg"]) { + const url = `https://placehold.co/${filename}`; + if (action === "remove") { + await context.unroute(url); + } else { + const path = fileURLToPath( + new URL( + `../end-to-end/customblocks/fixtures/${filename}`, + import.meta.url, + ), + ); + await context.route(url, (route) => route.fulfill({ path })); + } + } +} diff --git a/tests/vite.config.browser.ts b/tests/vite.config.browser.ts index ac2b636bd7..6fe9023fd1 100644 --- a/tests/vite.config.browser.ts +++ b/tests/vite.config.browser.ts @@ -5,6 +5,7 @@ import { configDefaults, defineConfig, type UserConfig } from "vite-plus"; import { playwright } from "vite-plus/test/browser/providers/playwright"; import { positionalMouse } from "./src/utils/positionalMouse.js"; import { imeComposition } from "./src/utils/imeComposition.js"; +import { mockCustomBlockImages } from "./src/utils/mockCustomBlockImages.js"; // For the desktop instances: end-to-end/mobile runs only in the "android" // instance. An instance-level `exclude` replaces the resolved base exclude @@ -165,7 +166,12 @@ export default defineConfig( // still show in the HTML report (errors + stack traces don't depend // on these shots), so disable them. See `e2e:report` to view. screenshotFailures: false, - commands: { positionalMouse, imeComposition, restoreTouchEmulation }, + commands: { + positionalMouse, + imeComposition, + restoreTouchEmulation, + mockCustomBlockImages, + }, instances: [ { browser: "chromium",