diff --git a/playwright/e2e/footnotes.spec.ts b/playwright/e2e/footnotes.spec.ts index 180ff291a70..cfbe9d07113 100644 --- a/playwright/e2e/footnotes.spec.ts +++ b/playwright/e2e/footnotes.spec.ts @@ -33,9 +33,9 @@ test('inserts footnote via keyboard shortcut', async ({ editor, open }) => { await expect(editor.getFootnote('1')).toContainText('footnote') }) -test('inserts footnote via [^label] input rule', async ({ editor, open }) => { +test('inserts footnote via [^] input rule', async ({ editor, open }) => { await open() - await editor.type('hello[^bar]') - await expect(editor.getFootnoteReference('bar')).toBeVisible() - await expect(editor.getFootnote('bar')).toBeVisible() + await editor.type('hello[^]') + await expect(editor.getFootnoteReference('1')).toBeVisible() + await expect(editor.getFootnote('1')).toBeVisible() }) diff --git a/src/components/HelpModal.vue b/src/components/HelpModal.vue index f18d788454b..e15a22f5817 100644 --- a/src/components/HelpModal.vue +++ b/src/components/HelpModal.vue @@ -226,7 +226,7 @@ {{ t('text', 'Footnote') }} - [^{{ t('text', 'label') }}] + [^] {{ ctrlOrModKey }} diff --git a/src/nodes/FootnoteReference.ts b/src/nodes/FootnoteReference.ts index 73b5a808fef..6f55581401c 100644 --- a/src/nodes/FootnoteReference.ts +++ b/src/nodes/FootnoteReference.ts @@ -146,17 +146,15 @@ const FootnoteReference = Node.create({ addInputRules() { return [ new InputRule({ - find: /\[\^([^\]\s]+)\]$/, - handler: ({ state, range, match, chain }) => { - const referenceId = match[1] ?? '' - + find: /\[\^\]$/, + handler: ({ state, range, chain }) => { if (isInsideFootnote(state)) { return null } chain() .deleteRange({ from: range.from, to: range.to }) - .insertFootnote({ referenceId }) + .insertFootnote() .run() }, }), diff --git a/src/nodes/Footnotes.ts b/src/nodes/Footnotes.ts index 3c5f5a5d76c..c139f2fa4cc 100644 --- a/src/nodes/Footnotes.ts +++ b/src/nodes/Footnotes.ts @@ -83,6 +83,17 @@ const Footnotes = Node.create({ return null } + let hasFootnotes = false + for (let i = 0; i < newState.doc.childCount; i++) { + if (newState.doc.child(i).type.name === 'footnotes') { + hasFootnotes = true + break + } + } + if (!hasFootnotes) { + return null + } + const referencedLabels = new Set() newState.doc.descendants((node) => { if (node.type.name === 'footnoteReference') {