Get link extension working better

This commit is contained in:
Jon Staab
2024-09-23 15:18:39 -07:00
parent ad4944d512
commit d7dba6c61a
4 changed files with 109 additions and 69 deletions
+1 -1
View File
@@ -16,7 +16,7 @@
let editor: Readable<Editor> let editor: Readable<Editor>
onMount(() => { onMount(() => {
editor = createEditor(getViewOptions(root.content)) editor = createEditor(getViewOptions(root))
}) })
</script> </script>
+40 -7
View File
@@ -1,14 +1,11 @@
import {Node, nodePasteRule, type PasteRuleMatch} from "@tiptap/core" import {last} from '@welshman/lib'
import {Node, InputRule, nodePasteRule, type PasteRuleMatch} from "@tiptap/core"
import type {Node as ProsemirrorNode} from "@tiptap/pm/model" import type {Node as ProsemirrorNode} from "@tiptap/pm/model"
import type {MarkdownSerializerState} from "prosemirror-markdown" import type {MarkdownSerializerState} from "prosemirror-markdown"
import {createPasteRuleMatch, createInputRuleMatch} from './util'
export const LINK_REGEX = export const LINK_REGEX =
/^([a-z\+:]{2,30}:\/\/)?[^<>\(\)\s]+\.[a-z]{2,6}[^\s]*[^<>"'\.!?,:\s\)\(]*/gi /([a-z\+:]{2,30}:\/\/)?[^<>\(\)\s]+\.[a-z]{2,6}[^\s]*[^<>"'\.!?,:\s\)\(]*/gi
export const createPasteRuleMatch = <T extends Record<string, unknown>>(
match: RegExpMatchArray,
data: T,
): PasteRuleMatch => ({index: match.index!, replaceWith: match[2], text: match[0], match, data})
export interface LinkAttributes { export interface LinkAttributes {
url: string url: string
@@ -65,6 +62,42 @@ export const LinkExtension = Node.create({
}, },
} }
}, },
addInputRules() {
return [
new InputRule({
find: text => {
const match = last(Array.from(text.matchAll(LINK_REGEX)))
if (match && text.length === match.index + match[0].length + 1) {
return {
index: match.index!,
text: match[0],
data: {
url: match[0],
},
}
}
return null
},
handler: ({state, range, match}) => {
const {tr} = state
if (match[0]) {
try {
tr.insert(range.from - 1, this.type.create(match.data))
.delete(tr.mapping.map(range.from - 1), tr.mapping.map(range.to))
.insert(tr.mapping.map(range.to), this.editor.schema.text(last(Array.from(match.input!))))
} catch (e) {
// If the node was already linkified, the above code breaks for whatever reason
}
}
tr.scrollIntoView()
},
}),
]
},
addPasteRules() { addPasteRules() {
return [ return [
nodePasteRule({ nodePasteRule({
+5 -3
View File
@@ -78,8 +78,7 @@ export const getEditorOptions = ({
loading, loading,
getPubkeyHints, getPubkeyHints,
submitOnEnter, submitOnEnter,
}: EditorOptions) => { }: EditorOptions) => ({
return {
content: "", content: "",
autofocus: true, autofocus: true,
extensions: [ extensions: [
@@ -138,8 +137,11 @@ export const getEditorOptions = ({
}, },
}), }),
], ],
onTransaction() {
// @ts-ignore
console.log(this.getJSON())
} }
} })
type ViewOptions = { type ViewOptions = {
content: string content: string
+7 -2
View File
@@ -1,4 +1,4 @@
import type {JSONContent, PasteRuleMatch} from "@tiptap/core" import type {JSONContent, PasteRuleMatch, InputRuleMatch} from "@tiptap/core"
import {Editor} from "@tiptap/core" import {Editor} from "@tiptap/core"
import {choice} from "@welshman/lib" import {choice} from "@welshman/lib"
@@ -8,10 +8,15 @@ export const asInline = (extend: Record<string, any>) => ({
...extend, ...extend,
}) })
export const createInputRuleMatch = <T extends Record<string, unknown>>(
match: RegExpMatchArray,
data: T,
): InputRuleMatch => ({index: match.index!, text: match[0], match, data})
export const createPasteRuleMatch = <T extends Record<string, unknown>>( export const createPasteRuleMatch = <T extends Record<string, unknown>>(
match: RegExpMatchArray, match: RegExpMatchArray,
data: T, data: T,
): PasteRuleMatch => ({index: match.index!, replaceWith: match[2], text: match[0], match, data}) ): PasteRuleMatch => ({index: match.index!, text: match[0], match, data})
export const findNodes = (type: string, json: JSONContent) => { export const findNodes = (type: string, json: JSONContent) => {
const results: JSONContent[] = [] const results: JSONContent[] = []