@mhamz.01/easyflow-texteditor 0.1.142 → 0.1.145

package/dist/index.mjs

@@ -7564,11 +7564,39 @@ var FontFamilyBlock = Extension2.create({
     ];
   }
 });
-var FontFamilyPersistence = Extension2.create({
-  name: "fontFamilyPersistence",
+var ColorBlock = Extension2.create({
+  name: "colorBlock",
+  addGlobalAttributes() {
+    return [
+      {
+        types: [
+          "paragraph",
+          "heading",
+          "listItem",
+          "taskItem",
+          "blockquote"
+        ],
+        attributes: {
+          color: {
+            default: null,
+            parseHTML: (element) => element.style.color || null,
+            renderHTML: (attributes) => {
+              if (!attributes.color) return {};
+              return {
+                style: `color: ${attributes.color}`
+              };
+            }
+          }
+        }
+      }
+    ];
+  }
+});
+var StylePersistence = Extension2.create({
+  name: "stylePersistence",
   addOptions() {
     return {
-      // Marks that should NOT inherit font family
+      // Marks that should NOT inherit font family or color
       excludedMarks: ["code", "codeBlock"]
     };
   },
@@ -7593,15 +7621,26 @@ var FontFamilyPersistence = Extension2.create({
     if (hasExcludedMarks() || isInCodeBlock()) {
       return;
     }
-    const font = state.selection.$from.parent.attrs.fontFamily;
-    if (!font) return;
+    const blockFont = state.selection.$from.parent.attrs.fontFamily;
+    const blockColor = state.selection.$from.parent.attrs.color;
+    const existingTextStyleMark = state.selection.$from.marks().find(
+      (mark) => mark.type.name === "textStyle"
+    );
+    const markFont = existingTextStyleMark?.attrs.fontFamily;
+    const markColor = existingTextStyleMark?.attrs.color;
+    const finalFont = markFont || blockFont;
+    const finalColor = markColor || blockColor;
+    if (!finalFont && !finalColor) return;
     const storedMarks = state.storedMarks || state.selection.$from.marks();
     const filteredMarks = storedMarks.filter(
       (mark) => mark.type.name !== "textStyle" && !excludedMarks.includes(mark.type.name)
     );
+    const textStyleAttrs = {};
+    if (finalFont) textStyleAttrs.fontFamily = finalFont;
+    if (finalColor) textStyleAttrs.color = finalColor;
     const newMarks = [
       ...filteredMarks,
-      state.schema.marks.textStyle.create({ fontFamily: font })
+      state.schema.marks.textStyle.create(textStyleAttrs)
     ];
     editor.view.dispatch(
       state.tr.setStoredMarks(newMarks)
@@ -7628,15 +7667,78 @@ var FontFamilyPersistence = Extension2.create({
     if (hasExcludedMarks() || isInCodeBlock()) {
       return;
     }
-    const font = state.selection.$from.parent.attrs.fontFamily;
-    if (!font) return;
+    const blockFont = state.selection.$from.parent.attrs.fontFamily;
+    const blockColor = state.selection.$from.parent.attrs.color;
+    const existingTextStyleMark = state.selection.$from.marks().find(
+      (mark) => mark.type.name === "textStyle"
+    );
+    const markFont = existingTextStyleMark?.attrs.fontFamily;
+    const markColor = existingTextStyleMark?.attrs.color;
+    const finalFont = markFont || blockFont;
+    const finalColor = markColor || blockColor;
+    if (!finalFont && !finalColor) return;
+    const storedMarks = state.storedMarks || state.selection.$from.marks();
+    const filteredMarks = storedMarks.filter(
+      (mark) => mark.type.name !== "textStyle" && !excludedMarks.includes(mark.type.name)
+    );
+    const textStyleAttrs = {};
+    if (finalFont) textStyleAttrs.fontFamily = finalFont;
+    if (finalColor) textStyleAttrs.color = finalColor;
+    const newMarks = [
+      ...filteredMarks,
+      state.schema.marks.textStyle.create(textStyleAttrs)
+    ];
+    editor.view.dispatch(
+      state.tr.setStoredMarks(newMarks)
+    );
+  },
+  // CRITICAL: Handle transaction updates to catch any textStyle changes
+  onTransaction({ editor, transaction }) {
+    if (!transaction.selectionSet && !transaction.docChanged) return;
+    const { state } = editor;
+    const excludedMarks = this.options.excludedMarks;
+    const hasExcludedMarks = () => {
+      const { $from } = state.selection;
+      const marks = $from.marks();
+      return marks.some((mark) => excludedMarks.includes(mark.type.name));
+    };
+    const isInCodeBlock = () => {
+      const { $from } = state.selection;
+      for (let depth = $from.depth; depth > 0; depth--) {
+        const node = $from.node(depth);
+        if (node.type.name === "codeBlock") {
+          return true;
+        }
+      }
+      return false;
+    };
+    if (hasExcludedMarks() || isInCodeBlock()) {
+      return;
+    }
+    const blockFont = state.selection.$from.parent.attrs.fontFamily;
+    const blockColor = state.selection.$from.parent.attrs.color;
+    const existingTextStyleMark = state.selection.$from.marks().find(
+      (mark) => mark.type.name === "textStyle"
+    );
+    const markFont = existingTextStyleMark?.attrs.fontFamily;
+    const markColor = existingTextStyleMark?.attrs.color;
+    const finalFont = markFont || blockFont;
+    const finalColor = markColor || blockColor;
+    if (!finalFont && !finalColor) return;
     const storedMarks = state.storedMarks || state.selection.$from.marks();
+    const existingStoredTextStyle = storedMarks.find((mark) => mark.type.name === "textStyle");
+    const hasCorrectFont = !finalFont || existingStoredTextStyle?.attrs.fontFamily === finalFont;
+    const hasCorrectColor = !finalColor || existingStoredTextStyle?.attrs.color === finalColor;
+    if (hasCorrectFont && hasCorrectColor && existingStoredTextStyle) return;
     const filteredMarks = storedMarks.filter(
       (mark) => mark.type.name !== "textStyle" && !excludedMarks.includes(mark.type.name)
     );
+    const textStyleAttrs = {};
+    if (finalFont) textStyleAttrs.fontFamily = finalFont;
+    if (finalColor) textStyleAttrs.color = finalColor;
     const newMarks = [
       ...filteredMarks,
-      state.schema.marks.textStyle.create({ fontFamily: font })
+      state.schema.marks.textStyle.create(textStyleAttrs)
     ];
     editor.view.dispatch(
       state.tr.setStoredMarks(newMarks)
@@ -7755,7 +7857,8 @@ function SimpleEditor() {
       Subscript,
       Selection2,
       FontFamilyBlock,
-      FontFamilyPersistence,
+      ColorBlock,
+      StylePersistence,
       ImageUploadNode2.configure({
         accept: "image/*",
         maxSize: MAX_FILE_SIZE,