@tiptap/extension-code-block-lowlight 2.0.0-beta.47 → 2.0.0-beta.51

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiptap/extension-code-block-lowlight",
   "description": "code block extension for tiptap",
-  "version": "2.0.0-beta.47",
+  "version": "2.0.0-beta.51",
   "homepage": "https://tiptap.dev",
   "keywords": [
     "tiptap",
@@ -24,17 +24,17 @@
     "@tiptap/core": "^2.0.0-beta.1"
   },
   "dependencies": {
-    "@tiptap/extension-code-block": "^2.0.0-beta.24",
+    "@tiptap/extension-code-block": "^2.0.0-beta.26",
     "@types/lowlight": "^0.0.3",
     "lowlight": "^1.20.0",
-    "prosemirror-model": "^1.14.3",
+    "prosemirror-model": "^1.15.0",
     "prosemirror-state": "^1.3.4",
-    "prosemirror-view": "^1.20.3"
+    "prosemirror-view": "^1.21.0"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/ueberdosis/tiptap",
     "directory": "packages/extension-code-block-lowlight"
   },
-  "gitHead": "9948e2499a3aa6ca72b677ef2ca96de1db1cb6b5"
+  "gitHead": "3c32e66c02efb30d7e083e06cdf81bceb3582a33"
 }

package/src/code-block-lowlight.ts

@@ -4,12 +4,16 @@ import { LowlightPlugin } from './lowlight-plugin'
 
 export interface CodeBlockLowlightOptions extends CodeBlockOptions {
   lowlight: any,
+  defaultLanguage: string | null | undefined,
 }
 
 export const CodeBlockLowlight = CodeBlock.extend<CodeBlockLowlightOptions>({
-  defaultOptions: {
-    ...CodeBlock.options,
-    lowlight,
+  addOptions() {
+    return {
+      ...this.parent?.(),
+      lowlight,
+      defaultLanguage: null,
+    }
   },
 
   addProseMirrorPlugins() {
@@ -18,6 +22,7 @@ export const CodeBlockLowlight = CodeBlock.extend<CodeBlockLowlightOptions>({
       LowlightPlugin({
         name: this.name,
         lowlight: this.options.lowlight,
+        defaultLanguage: this.options.defaultLanguage,
       }),
     ]
   },

package/src/lowlight-plugin.ts

@@ -30,13 +30,19 @@ function getHighlightNodes(result: any) {
   return result.value || result.children || []
 }
 
-function getDecorations({ doc, name, lowlight }: { doc: ProsemirrorNode, name: string, lowlight: any }) {
+function getDecorations({
+  doc,
+  name,
+  lowlight,
+  defaultLanguage,
+}: { doc: ProsemirrorNode, name: string, lowlight: any, defaultLanguage: string | null | undefined }) {
   const decorations: Decoration[] = []
 
   findChildren(doc, node => node.type.name === name)
     .forEach(block => {
       let from = block.pos + 1
-      const { language } = block.node.attrs
+      const language = block.node.attrs.language || defaultLanguage
+      console.log({ language, defaultLanguage })
       const languages = lowlight.listLanguages()
       const nodes = language && languages.includes(language)
         ? getHighlightNodes(lowlight.highlight(language, block.node.textContent))
@@ -60,12 +66,17 @@ function getDecorations({ doc, name, lowlight }: { doc: ProsemirrorNode, name: s
   return DecorationSet.create(doc, decorations)
 }
 
-export function LowlightPlugin({ name, lowlight }: { name: string, lowlight: any }) {
+export function LowlightPlugin({ name, lowlight, defaultLanguage }: { name: string, lowlight: any, defaultLanguage: string | null | undefined }) {
   return new Plugin({
     key: new PluginKey('lowlight'),
 
     state: {
-      init: (_, { doc }) => getDecorations({ doc, name, lowlight }),
+      init: (_, { doc }) => getDecorations({
+        doc,
+        name,
+        lowlight,
+        defaultLanguage,
+      }),
       apply: (transaction, decorationSet, oldState, newState) => {
         const oldNodeName = oldState.selection.$head.parent.type.name
         const newNodeName = newState.selection.$head.parent.type.name
@@ -97,7 +108,12 @@ export function LowlightPlugin({ name, lowlight }: { name: string, lowlight: any
             })
           )
         ) {
-          return getDecorations({ doc: transaction.doc, name, lowlight })
+          return getDecorations({
+            doc: transaction.doc,
+            name,
+            lowlight,
+            defaultLanguage,
+          })
         }
 
         return decorationSet.map(transaction.mapping, transaction.doc)