e

winetree94 · Dec 21, 2023 · 06d1289 · 06d1289
1 parent ecd57c1
commit 06d1289
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/packages/core/src/commands/index.ts b/packages/core/src/commands/index.ts
@@ -1,4 +1,4 @@
 export * from './transform-range-to-block';
 export * from './set-text-align';
 export * from './clear-marks';
-export * from './toggle-mark';
+export * from './toggle-mark-with-attrs';
diff --git a/packages/core/src/commands/toggle-mark.ts → ...re/src/commands/toggle-mark-with-attrs.ts b/packages/core/src/commands/toggle-mark.ts → ...re/src/commands/toggle-mark-with-attrs.ts
@@ -52,10 +52,14 @@ export const toggleMarkWithAttrs = (
               if (missing) {
                 return false;
               }
+              console.log(node);
               missing =
                 !(
                   markType.isInSet(node.marks) &&
-                  attrsComparator(attrs, node.attrs)
+                  attrsComparator(
+                    attrs,
+                    node.marks.find((m) => m.type === markType)?.attrs || null,
+                  )
                 ) &&
                 !!parent &&
                 parent.type.allowsMarkType(markType) &&
@@ -70,6 +74,7 @@ export const toggleMarkWithAttrs = (
                 );
               return undefined;
             });
+            console.log(missing);
             return !missing;
           });
         }

diff --git a/packages/font-family/src/commands/toggle-font-family.ts b/packages/font-family/src/commands/toggle-font-family.ts
@@ -10,6 +10,7 @@ export const toggleFontFamily = (
   return toggleMarkWithAttrs(markType, attr, {
     removeWhenPresent: false,
     attrComparator(a, b) {
+      console.log(a, b);
       return (
         (a as null | EdimFontFamilyAttrs)?.['fontFamily'] ===
         (b as null | EdimFontFamilyAttrs)?.['fontFamily']