From 3b01b5b2195d2e41982acc88a608d7a9178ebd4f Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Mon, 5 Oct 2020 17:26:34 +0200
Subject: [PATCH] improve highlight toggling

---
 docs/src/demos/Extensions/Highlight/index.vue | 4 +++-
 packages/core/src/commands/toggleMark.ts      | 8 +++++++-
 packages/core/src/utils/markHasAttributes.ts  | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/docs/src/demos/Extensions/Highlight/index.vue b/docs/src/demos/Extensions/Highlight/index.vue
index 62766a30..81947723 100644
--- a/docs/src/demos/Extensions/Highlight/index.vue
+++ b/docs/src/demos/Extensions/Highlight/index.vue
@@ -1,7 +1,9 @@
 <template>
   <div v-if="editor">
     <button
-      @click="editor.chain().focus().highlight().run()"
+      @click="editor.chain().focus().highlight({
+        color: ''
+      }).run()"
       :class="{ 'is-active': editor.isActive('highlight', {
         color: ''
       }) }"
diff --git a/packages/core/src/commands/toggleMark.ts b/packages/core/src/commands/toggleMark.ts
index 49596cff..98010f19 100644
--- a/packages/core/src/commands/toggleMark.ts
+++ b/packages/core/src/commands/toggleMark.ts
@@ -2,6 +2,7 @@ import { toggleMark as originalToggleMark } from 'prosemirror-commands'
 import { MarkType } from 'prosemirror-model'
 import { Command } from '../Editor'
 import getMarkType from '../utils/getMarkType'
+import markIsActive from '../utils/markIsActive'
 
 type ToggleMarkCommand = (typeOrName: string | MarkType, attrs?: {}) => Command
 
@@ -11,8 +12,13 @@ declare module '../Editor' {
   }
 }
 
-export const toggleMark: ToggleMarkCommand = (typeOrName, attrs) => ({ state, dispatch }) => {
+export const toggleMark: ToggleMarkCommand = (typeOrName, attrs) => ({ state, dispatch, commands }) => {
   const type = getMarkType(typeOrName, state.schema)
 
+  if (markIsActive(state, type) && !markIsActive(state, type, attrs)) {
+    // @ts-ignore
+    return commands.updateMark(type, attrs)
+  }
+
   return originalToggleMark(type, attrs)(state, dispatch)
 }
diff --git a/packages/core/src/utils/markHasAttributes.ts b/packages/core/src/utils/markHasAttributes.ts
index 4fd4a4eb..76f7a67f 100644
--- a/packages/core/src/utils/markHasAttributes.ts
+++ b/packages/core/src/utils/markHasAttributes.ts
@@ -3,7 +3,7 @@ import { MarkType } from 'prosemirror-model'
 import getMarkAttrs from './getMarkAttrs'
 
 export default function markHasAttributes(state: EditorState, type: MarkType, attrs?: Object) {
-  return attrs === null || JSON.stringify(attrs) === JSON.stringify(
+  return attrs === undefined || JSON.stringify(attrs) === JSON.stringify(
     getMarkAttrs(state, type),
   )
 }