diff --git a/docs/src/demos/Extensions/Link/index.vue b/docs/src/demos/Extensions/Link/index.vue index 7b0e6a98..eec5c0d4 100644 --- a/docs/src/demos/Extensions/Link/index.vue +++ b/docs/src/demos/Extensions/Link/index.vue @@ -10,7 +10,7 @@ import { EditorContent } from '@tiptap/vue' import Document from '@tiptap/extension-document' import Paragraph from '@tiptap/extension-paragraph' import Text from '@tiptap/extension-text' -// import Link from '@tiptap/extension-link' +import Link from '@tiptap/extension-link' export default { components: { @@ -29,7 +29,7 @@ export default { Document(), Paragraph(), Text(), - // Link(), + Link(), ], content: `
diff --git a/packages/core/index.ts b/packages/core/index.ts
index 13b1a00a..822ac111 100644
--- a/packages/core/index.ts
+++ b/packages/core/index.ts
@@ -18,3 +18,4 @@ export { default as getHtmlFromFragment } from './src/utils/getHtmlFromFragment'
export { default as getTopNodeFromExtensions } from './src/utils/getTopNodeFromExtensions'
export { default as getNodesFromExtensions } from './src/utils/getNodesFromExtensions'
export { default as getMarksFromExtensions } from './src/utils/getMarksFromExtensions'
+export { default as getMarkAttrs } from './src/utils/getMarkAttrs'
diff --git a/packages/core/src/pasteRules/markPasteRule.ts b/packages/core/src/pasteRules/markPasteRule.ts
index 25cf7e44..c10340b0 100644
--- a/packages/core/src/pasteRules/markPasteRule.ts
+++ b/packages/core/src/pasteRules/markPasteRule.ts
@@ -14,14 +14,15 @@ export default function (regexp: RegExp, type: MarkType, getAttrs?: Function) {
// eslint-disable-next-line
while ((match = regexp.exec(text)) !== null) {
- const m = match.length - 1
+ const outerMatch = Math.max(match.length - 2, 0)
+ const innerMatch = Math.max(match.length - 1, 0)
- if (parent.type.allowsMarkType(type) && match[1]) {
+ if (parent.type.allowsMarkType(type)) {
const start = match.index
- const matchStart = start + match[0].indexOf(match[m - 1])
- const matchEnd = matchStart + match[m - 1].length // TODO: why is there no -1
- const textStart = matchStart + match[m - 1].lastIndexOf(match[m])
- const textEnd = textStart + match[m].length
+ const matchStart = start + match[0].indexOf(match[outerMatch])
+ const matchEnd = matchStart + match[outerMatch].length
+ const textStart = matchStart + match[outerMatch].lastIndexOf(match[innerMatch])
+ const textEnd = textStart + match[innerMatch].length
const attrs = getAttrs instanceof Function ? getAttrs(match) : getAttrs
// adding text before markdown to nodes
diff --git a/packages/extension-link/index.ts b/packages/extension-link/index.ts
new file mode 100644
index 00000000..40b020a8
--- /dev/null
+++ b/packages/extension-link/index.ts
@@ -0,0 +1,85 @@
+import {
+ Command, Mark, markPasteRule, getMarkAttrs,
+} from '@tiptap/core'
+import { Plugin, PluginKey } from 'prosemirror-state'
+
+export interface LinkOptions {
+ openOnClick: boolean,
+ target: string,
+}
+
+export type LinkCommand = () => Command
+
+declare module '@tiptap/core/src/Editor' {
+ interface Commands {
+ link: LinkCommand,
+ }
+}
+
+export const pasteRegex = /https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z]{2,}\b(?:[-a-zA-Z0-9@:%_+.~#?&//=]*)/gi
+
+export default new Mark