Fix wrong cursor position after inserting new blocks at the top of th…

…e buffer, when the previous first block's delimiter is long (e.g. Markdown)

src/editor/annotation.js

@@ -4,4 +4,4 @@ export const heynoteEvent = Annotation.define()
 export const LANGUAGE_CHANGE = "heynote-change"
 export const CURRENCIES_LOADED = "heynote-currencies-loaded"
 export const SET_CONTENT = "heynote-set-content"
-
+export const ADD_NEW_BLOCK = "heynote-add-new-block"

src/editor/block/block.js

@@ -256,7 +256,7 @@ const preventFirstBlockFromBeingDeleted = EditorState.changeFilter.of((tr) => {
  * Transaction filter to prevent the selection from being before the first block
   */
 const preventSelectionBeforeFirstBlock = EditorState.transactionFilter.of((tr) => {
-    if (!firstBlockDelimiterSize) {
+    if (!firstBlockDelimiterSize || tr.annotations.some(a => a.type === heynoteEvent)) {
         return tr
     }
     tr?.selection?.ranges.forEach(range => {

src/editor/block/commands.js

@@ -1,5 +1,5 @@
 import { EditorSelection } from "@codemirror/state"
-import { heynoteEvent, LANGUAGE_CHANGE, CURRENCIES_LOADED } from "../annotation.js";
+import { heynoteEvent, LANGUAGE_CHANGE, CURRENCIES_LOADED, ADD_NEW_BLOCK } from "../annotation.js";
 import {blockState, getActiveNoteBlock, getFirstNoteBlock, getLastNoteBlock, getNoteBlockFromPos} from "./block"
 import { moveLineDown, moveLineUp } from "./move-lines.js";
 import { selectAll } from "./select-all.js";
@@ -40,7 +40,8 @@ export const addNewBlockBeforeCurrent = ({ state, dispatch }) => {
             from: block.delimiter.from,
             insert: delimText,
         },
-        selection: EditorSelection.cursor(block.delimiter.from + delimText.length)
+        selection: EditorSelection.cursor(block.delimiter.from + delimText.length),
+        annotations: [heynoteEvent.of(ADD_NEW_BLOCK)],
     }, {
         scrollIntoView: true,
         userEvent: "input",
@@ -78,7 +79,8 @@ export const addNewBlockBeforeFirst = ({ state, dispatch }) => {
             from: block.delimiter.from,
             insert: delimText,
         },
-        selection: EditorSelection.cursor(delimText.length) // TODO: fix jump. See first char of file when saving
+        selection: EditorSelection.cursor(delimText.length),
+        annotations: [heynoteEvent.of(ADD_NEW_BLOCK)],
     }, {
         scrollIntoView: true,
         userEvent: "input",

src/editor/editor.js

@@ -134,6 +134,10 @@ export class HeynoteEditor {
         return this.view.state.facet(blockState)
     }
 
+    getCursorPosition() {
+        return this.view.state.selection.main.head
+    }
+
     focus() {
         this.view.focus()
     }

tests/block-creation.spec.js

@@ -21,7 +21,7 @@ Block C`)
     expect((await heynotePage.getBlocks()).length).toBe(3)
 
     // check that visual block layers are created
-    expect(await page.locator("css=.heynote-blocks-layer > div")).toHaveCount(3)
+    await expect(page.locator("css=.heynote-blocks-layer > div")).toHaveCount(3)
 
     // select the second block
     await page.locator("body").press("ArrowUp")
@@ -43,6 +43,30 @@ test("create block after last", async ({ page }) => {
     await runTest(page, heynotePage.isMac ? "Meta+Shift+Enter" : "Control+Shift+Enter",['A', 'B', 'C', 'D'])
 })
 
+test("create block before Markdown block", async ({ page }) => {
+    await heynotePage.setContent(`
+∞∞∞markdown
+# Markdown!
+`)
+    await page.locator("body").press("Alt+Enter")
+    await page.waitForTimeout(100);
+    expect(await heynotePage.getCursorPosition()).toBe(11)
+})
+
+test("create block before first Markdown block", async ({ page }) => {
+    await heynotePage.setContent(`
+∞∞∞markdown
+# Markdown!
+∞∞∞text
+`)
+    for (let i=0; i<5; i++) {
+        await page.locator("body").press("ArrowDown")
+    }
+    await page.locator("body").press("Alt+Shift+Enter")
+    await page.waitForTimeout(100);
+    expect(await heynotePage.getCursorPosition()).toBe(11)
+})
+
 const runTest = async (page, key, expectedBlocks) => {
     // create a new block
     await page.locator("body").press(key)
@@ -59,6 +83,6 @@ const runTest = async (page, key, expectedBlocks) => {
     }
 
     // check that only one block delimiter widget has the class first
-    expect(await page.locator("css=.heynote-block-start.first")).toHaveCount(1)
+    await expect(await page.locator("css=.heynote-block-start.first")).toHaveCount(1)
 }
 

tests/test-utils.js

@@ -35,6 +35,10 @@ export class HeynotePage {
         await this.page.evaluate((content) => window._heynote_editor.setContent(content), content)
     }
 
+    async getCursorPosition() {
+        return await this.page.evaluate(() => window._heynote_editor.getCursorPosition())
+    }
+
     async getBlockContent(blockIndex) {
         const blocks = await this.getBlocks()
         const content = await this.getContent()