Merge branch 'main' of github.com:ueberdosis/tiptap-next into main

packages/core/src/Extension.ts

@@ -19,7 +19,7 @@ export interface ExtensionConfig<Options = any, Commands = {}> {
    */
   addGlobalAttributes?: (this: {
     options: Options,
-  }) => GlobalAttributes,
+  }) => GlobalAttributes | {},
 
   /**
    * Commands

packages/core/src/Mark.ts

@@ -60,7 +60,7 @@ export interface MarkConfig<Options = any, Commands = {}> extends Overwrite<Exte
     this: {
       options: Options,
     },
-  ) => Attributes,
+  ) => Attributes | {},
 
   /**
    * Commands

packages/core/src/Node.ts

@@ -95,7 +95,7 @@ export interface NodeConfig<Options = any, Commands = {}> extends Overwrite<Exte
     this: {
       options: Options,
     },
-  ) => Attributes,
+  ) => Attributes | {},
 
   /**
    * Commands

packages/extension-highlight/src/index.ts

@@ -7,6 +7,7 @@ import {
 } from '@tiptap/core'
 
 export interface HighlightOptions {
+  multicolor: boolean,
   HTMLAttributes: {
     [key: string]: any
   },
@@ -19,10 +20,15 @@ const Highlight = Mark.create({
   name: 'highlight',
 
   defaultOptions: <HighlightOptions>{
+    multicolor: false,
     HTMLAttributes: {},
   },
 
   addAttributes() {
+    if (!this.options.multicolor) {
+      return {}
+    }
+
     return {
       color: {
         default: null,