Merge pull request #12 from ueberdosis/feature/code-block-with-language-support

add language support to code blocks
This commit is contained in:
Philipp Kühn
2020-09-27 09:29:59 +02:00
committed by GitHub
2 changed files with 28 additions and 6 deletions

View File

@@ -59,9 +59,24 @@ context('/api/extensions/code-block', () => {
}) })
it('should make a code block from markdown shortcuts', () => { it('should make a code block from markdown shortcuts', () => {
cy.get('.ProseMirror').then(([{ editor }]) => {
editor.clearContent()
cy.get('.ProseMirror') cy.get('.ProseMirror')
.type('``` {enter}Code') .type('``` Code')
.find('pre') .find('pre>code')
.should('contain', 'Code') .should('contain', 'Code')
}) })
})
it('should make a code block for js', () => {
cy.get('.ProseMirror').then(([{ editor }]) => {
editor.clearContent()
cy.get('.ProseMirror')
.type('```js Code')
.find('pre>code.language-js')
.should('contain', 'Code')
})
})
}) })

View File

@@ -9,9 +9,16 @@ declare module '@tiptap/core/src/Editor' {
} }
} }
export const inputRegex = /^```(?<language>[a-z]*)? $/
export default new Node() export default new Node()
.name('code_block') .name('code_block')
.schema(() => ({ .schema(() => ({
attrs: {
language: {
default: null,
},
},
content: 'text*', content: 'text*',
marks: '', marks: '',
group: 'block', group: 'block',
@@ -21,7 +28,7 @@ export default new Node()
parseDOM: [ parseDOM: [
{ tag: 'pre', preserveWhitespace: 'full' }, { tag: 'pre', preserveWhitespace: 'full' },
], ],
toDOM: () => ['pre', ['code', 0]], toDOM: node => ['pre', ['code', { class: node.attrs.language && `language-${node.attrs.language}` }, 0]],
})) }))
.commands(({ name }) => ({ .commands(({ name }) => ({
codeBlock: attrs => ({ commands }) => { codeBlock: attrs => ({ commands }) => {
@@ -32,6 +39,6 @@ export default new Node()
'Shift-Control-\\': () => editor.codeBlock(), 'Shift-Control-\\': () => editor.codeBlock(),
})) }))
.inputRules(({ type }) => [ .inputRules(({ type }) => [
textblockTypeInputRule(/^```$/, type), textblockTypeInputRule(inputRegex, type, ({ groups }: any) => groups),
]) ])
.create() .create()