Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from Milkdown:main #26

Merged
merged 1 commit into from
Dec 9, 2024
Merged

[pull] main from Milkdown:main #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion e2e/tests/input/heading.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect, test } from '@playwright/test'
import { focusEditor, getMarkdown } from '../misc'
import { focusEditor, getMarkdown, waitNextFrame } from '../misc'

test.beforeEach(async ({ page }) => {
await page.goto('/preset-commonmark/')
Expand All @@ -21,3 +21,19 @@ test('heading', async ({ page }) => {
const markdown2 = await getMarkdown(page)
expect(markdown2).toBe('# Heading1\n\n## Heading 2\n')
})

test('should generate different id for same heading', async ({ page }) => {
const editor = page.locator('.editor')
await focusEditor(page)
await page.keyboard.type('# Heading1')
await page.keyboard.press('Enter')
await page.keyboard.type('# Heading1')
await page.keyboard.press('Enter')
await page.keyboard.type('## Heading1')
await page.keyboard.press('Enter')

await waitNextFrame(page)
await expect(editor.locator('h1').first()).toHaveAttribute('id', 'heading1')
await expect(editor.locator('h1').last()).toHaveAttribute('id', 'heading1-#2')
await expect(editor.locator('h2')).toHaveAttribute('id', 'heading1-#3')
})
9 changes: 8 additions & 1 deletion packages/plugins/preset-commonmark/src/plugin/sync-heading-id-plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,20 @@ export const syncHeadingIdPlugin = $prose((ctx) => {
const tr = view.state.tr.setMeta('addToHistory', false)

let found = false
const idMap: Record<string, number> = {}

view.state.doc.descendants((node, pos) => {
if (node.type === headingSchema.type(ctx)) {
if (node.textContent.trim().length === 0) return

const attrs = node.attrs
const id = getId(node)
let id = getId(node)
if (idMap[id]) {
idMap[id]! += 1
id += `-#${idMap[id]}`
} else {
idMap[id] = 1
}

if (attrs.id !== id) {
found = true
Expand Down
Loading