improve the highlight extension, add pasteRule and inputRule

This commit is contained in:
Hans Pagel
2020-10-27 22:14:40 +01:00
parent a1a3ecd2d0
commit 47109ed97f
3 changed files with 32 additions and 4 deletions

View File

@@ -69,7 +69,8 @@ export default {
content: ` content: `
<p>This isnt highlighted.</s></p> <p>This isnt highlighted.</s></p>
<p><mark>But that one is.</mark></p> <p><mark>But that one is.</mark></p>
<p><mark style="background-color: #ffa8a8;">And this is highlighted too, but in a different color.</mark></p> <p><mark style="background-color: red;">And this is highlighted too, but in a different color.</mark></p>
<p><mark data-color="#ffa8a8">And this one has a data attribute.</mark></p>
`, `,
}) })
}, },

View File

@@ -13,7 +13,7 @@ export default function markHasAttributes(state: EditorState, type: MarkType, at
// @ts-ignore // @ts-ignore
return Object.keys(attrs).filter((key: string) => { return Object.keys(attrs).filter((key: string) => {
// @ts-ignore // @ts-ignore
console.log(attrs[key], originalAttrs[key], attrs[key] === originalAttrs[key]) // console.log(attrs[key], originalAttrs[key], attrs[key] === originalAttrs[key])
return attrs[key] === originalAttrs[key] return attrs[key] === originalAttrs[key]
}).length }).length
} }

View File

@@ -1,11 +1,14 @@
import { import {
Command, createMark, Command, createMark, markInputRule, markPasteRule,
} from '@tiptap/core' } from '@tiptap/core'
export interface HighlightOptions { export interface HighlightOptions {
color: string, color: string,
} }
export const inputRegex = /(?:^|\s)((?:==)((?:[^~]+))(?:==))$/gm
export const pasteRegex = /(?:^|\s)((?:==)((?:[^~]+))(?:==))/gm
const Highlight = createMark({ const Highlight = createMark({
name: 'highlight', name: 'highlight',
@@ -14,8 +17,11 @@ const Highlight = createMark({
color: { color: {
default: null, default: null,
parseHTML: element => { parseHTML: element => {
console.log(element.getAttribute('data-color'))
return { return {
color: element.style.backgroundColor, color:
element.getAttribute('data-color')
|| element.style.backgroundColor,
} }
}, },
renderHTML: attributes => { renderHTML: attributes => {
@@ -24,6 +30,7 @@ const Highlight = createMark({
} }
return { return {
'data-color': attributes.color,
style: `background-color: ${attributes.color}`, style: `background-color: ${attributes.color}`,
} }
}, },
@@ -36,6 +43,14 @@ const Highlight = createMark({
{ {
tag: 'mark', tag: 'mark',
}, },
{
style: 'background-color',
// getAttrs: value => {
// return {
// color: value,
// }
// },
},
] ]
}, },
@@ -56,6 +71,18 @@ const Highlight = createMark({
'Mod-e': () => this.editor.highlight(), 'Mod-e': () => this.editor.highlight(),
} }
}, },
addInputRules() {
return [
markInputRule(inputRegex, this.type),
]
},
addPasteRules() {
return [
markPasteRule(inputRegex, this.type),
]
},
}) })
export default Highlight export default Highlight