revert: "fix: remove empty text style handling (#5905)" (#5906)

This reverts commit df40b7f.

packages/extension-font-family/src/font-family.ts

@@ -72,15 +72,9 @@ export const FontFamily = Extension.create<FontFamilyOptions>({
           .setMark('textStyle', { fontFamily })
           .run()
       },
-      unsetFontFamily: () => ({ chain, tr }) => {
-        const { selection } = tr
-
-        // Retrieve all previous mark attributes applied to the current selection
-        const previousMarkAttributes = selection.$anchor.marks().map(mark => mark.attrs)
-
+      unsetFontFamily: () => ({ chain }) => {
         return chain()
-          // Only remove the font family attribute from the previous mark attributes
-          .setMark('textStyle', { ...previousMarkAttributes, fontFamily: null })
+          .setMark('textStyle', { fontFamily: null })
           .removeEmptyTextStyle()
           .run()
       },

packages/extension-text-style/src/text-style.ts

@@ -1,4 +1,5 @@
 import {
+  getMarkAttributes,
   Mark,
   mergeAttributes,
 } from '@tiptap/core'
@@ -63,32 +64,15 @@ export const TextStyle = Mark.create<TextStyleOptions>({
 
   addCommands() {
     return {
-      removeEmptyTextStyle: () => ({ tr }) => {
+      removeEmptyTextStyle: () => ({ state, commands }) => {
+        const attributes = getMarkAttributes(state, this.type)
+        const hasStyles = Object.entries(attributes).some(([, value]) => !!value)
 
-        const { selection } = tr
+        if (hasStyles) {
+          return true
+        }
 
-        // Gather all of the nodes within the selection range.
-        // We would need to go through each node individually
-        // to check if it has any inline style attributes.
-        // Otherwise, calling commands.unsetMark(this.name)
-        // removes everything from all the nodes
-        // within the selection range.
-        tr.doc.nodesBetween(selection.from, selection.to, (node, pos) => {
-
-          // Check if it's a paragraph element, if so, skip this node as we apply
-          // the text style to inline text nodes only (span).
-          if (node.isTextblock) {
-            return true
-          }
-
-          // Check if the node has no inline style attributes.
-          if (!node.marks.some(mark => Object.values(mark.attrs).some(value => !!value))) {
-            // Proceed with the removal of the `textStyle` mark for this node only
-            tr.removeMark(pos, pos + node.nodeSize, this.type)
-          }
-        })
-
-        return true
+        return commands.unsetMark(this.name)
       },
     }
   },