Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 26 additions & 3 deletions src/extensions/Markdown.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ import type { MarkdownSerializerState } from 'prosemirror-markdown'
import { Extension, getExtensionField } from '@tiptap/core'
import { DOMParser } from '@tiptap/pm/model'
import { Plugin, PluginKey } from '@tiptap/pm/state'
import { normalizeReference } from 'markdown-it/lib/common/utils.mjs'
import { defaultMarkdownSerializer, MarkdownSerializer } from 'prosemirror-markdown'
import markdownit from '../markdownit/index.js'
import Link from '../marks/Link.ts'
import transformPastedHTML from './transformPastedHTML.ts'

// taken from prosemirror-markdown
Expand Down Expand Up @@ -191,13 +193,34 @@ function createMarkdownSerializer(schema: {
extractMarksToMarkdown(schema.marks),
),
serialize(content: Node) {
// Extend serialize options to carry reference definitions (populated by `toMarkdown` callbacks in link mark)
const referenceDefinitions = new Map()
const body = this.serializer.serialize(content, {
tightLists: true,
referenceDefinitions,
} as { tightLists: boolean })

const referenceDefinitions = new Map()
content.descendants((node: Node) => {
const link = node.marks.find((m: Mark) => m.type.name === Link.name)
if (!link) {
return
}
const { href, referenceLabel: label, referenceType: type, title } = link.attrs as {
href: string
referenceLabel?: string
referenceType?: string
title?: string
}
if (label && type) {
const key = normalizeReference(label)
if (!referenceDefinitions.has(key)) {
referenceDefinitions.set(key, {
label,
href,
title: title ?? null,
})
}
}
return false // do not descend into nodes that already have a link mark.
})
if (referenceDefinitions.size === 0) {
return body
}
Expand Down
21 changes: 0 additions & 21 deletions src/marks/Link.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import type { MarkdownSerializerState } from 'prosemirror-markdown'

import { getMarkRange, isMarkActive, markInputRule } from '@tiptap/core'
import TipTapLink, { isAllowedUri } from '@tiptap/extension-link'
import { normalizeReference } from 'markdown-it/lib/common/utils.mjs'
import { defaultMarkdownSerializer } from 'prosemirror-markdown'
import { domHref, parseHref } from '../helpers/links.js'
import { logger } from '../helpers/logger.ts'
Expand Down Expand Up @@ -317,26 +316,6 @@ const Link = TipTapLink.extend<RelativePathLinkOptions>({
| 'shortcut'
| 'collapsed'
| 'full'
const defs
// Cast `state.options` locally as `referenceDefinitions` doesn't exist in upstream type definition
= (
state.options as {
referenceDefinitions?: Map<
string,
{ label: string, href: string, title: string | null }
>
}
).referenceDefinitions
if (defs) {
const key = normalizeReference(label)
if (!defs.has(key)) {
defs.set(key, {
label,
href: mark.attrs.href as string,
title: (mark.attrs.title as string) ?? null,
})
}
}
switch (type) {
case 'shortcut':
return ']'
Expand Down
Loading