@mhamz.01/easyflow-texteditor 0.1.157 → 0.1.158

package/dist/index.js

@@ -7326,23 +7326,32 @@ function ColorPicker({ type = "text" }) {
     (value) => {
       if (!editor) return;
       const { state } = editor;
-      const { $from, $to, empty } = state.selection;
+      const { $from } = state.selection;
       editor.chain().focus().setColor(value).run();
-      const depth = $from.depth;
-      const nodePos = $from.before(depth);
-      const node = $from.node(depth);
-      const supportsColor = [
-        "paragraph",
-        "heading",
-        "listItem",
-        "taskItem",
-        "blockquote"
-      ].includes(node.type.name);
-      if (supportsColor) {
-        const tr = state.tr.setNodeMarkup(nodePos, void 0, {
-          ...node.attrs,
-          color: value
-        });
+      const tr = editor.state.tr;
+      let trDirty = false;
+      for (let depth = $from.depth; depth >= 1; depth--) {
+        const node = $from.node(depth);
+        const pos = $from.before(depth);
+        const supportsColor = [
+          "paragraph",
+          "heading",
+          "listItem",
+          "taskItem",
+          "blockquote"
+        ].includes(node.type.name);
+        if (supportsColor && node.attrs.color !== value) {
+          tr.setNodeMarkup(pos, void 0, {
+            ...node.attrs,
+            color: value
+          });
+          trDirty = true;
+        }
+        if (node.type.name === "listItem" || node.type.name === "taskItem") {
+          break;
+        }
+      }
+      if (trDirty) {
         editor.view.dispatch(tr);
       }
       setTimeout(() => {
@@ -7423,7 +7432,7 @@ function ColorPicker({ type = "text" }) {
             {
               className: "flex flex-col gap-3",
               onMouseDown: (e) => e.stopPropagation(),
-              onMouseUp: ((e) => e.stopPropagation()),
+              onMouseUp: (e) => e.stopPropagation(),
               onPointerDown: (e) => e.stopPropagation(),
               onPointerUp: (e) => e.stopPropagation(),
               onClick: (e) => e.stopPropagation(),
@@ -7853,6 +7862,7 @@ var ColorBlock = import_core5.Extension.create({
   }
 });
 var stylePersistenceKey = new import_state5.PluginKey("stylePersistence");
+var STYLED_NODES = ["paragraph", "heading", "listItem", "taskItem", "blockquote"];
 var StylePersistence = import_core5.Extension.create({
   name: "stylePersistence",
   addOptions() {
@@ -7880,8 +7890,7 @@ var StylePersistence = import_core5.Extension.create({
             );
             let isInCodeBlock = false;
             for (let depth = $from.depth; depth > 0; depth--) {
-              const node = $from.node(depth);
-              if (node.type.name === "codeBlock") {
+              if ($from.node(depth).type.name === "codeBlock") {
                 isInCodeBlock = true;
                 break;
               }
@@ -7889,16 +7898,17 @@ var StylePersistence = import_core5.Extension.create({
             if (hasExcludedMarks || isInCodeBlock) {
               return value;
             }
-            const parentNode = $from.parent;
-            let font = parentNode.attrs.fontFamily;
-            let color = parentNode.attrs.color;
-            const textStyleMark = marks.find((m) => m.type.name === "textStyle");
-            if (!font && textStyleMark?.attrs.fontFamily) {
-              font = textStyleMark.attrs.fontFamily;
-            }
-            if (!color && textStyleMark?.attrs.color) {
-              color = textStyleMark.attrs.color;
+            let font = null;
+            let color = null;
+            for (let depth = $from.depth; depth >= 1; depth--) {
+              const node = $from.node(depth);
+              if (!font && node.attrs?.fontFamily) font = node.attrs.fontFamily;
+              if (!color && node.attrs?.color) color = node.attrs.color;
+              if (font && color) break;
             }
+            const textStyleMark = marks.find((m) => m.type.name === "textStyle");
+            if (!font && textStyleMark?.attrs.fontFamily) font = textStyleMark.attrs.fontFamily;
+            if (!color && textStyleMark?.attrs.color) color = textStyleMark.attrs.color;
             return {
               lastFont: font || value.lastFont,
               lastColor: color || value.lastColor
@@ -7914,15 +7924,13 @@ var StylePersistence = import_core5.Extension.create({
             return null;
           }
           const { $from } = newState.selection;
-          const parentNode = $from.parent;
           const marks = $from.marks();
           const hasExcludedMarks = marks.some(
             (mark) => excludedMarks.includes(mark.type.name)
           );
           let isInCodeBlock = false;
           for (let depth = $from.depth; depth > 0; depth--) {
-            const node = $from.node(depth);
-            if (node.type.name === "codeBlock") {
+            if ($from.node(depth).type.name === "codeBlock") {
               isInCodeBlock = true;
               break;
             }
@@ -7930,32 +7938,30 @@ var StylePersistence = import_core5.Extension.create({
           if (hasExcludedMarks || isInCodeBlock) {
             return null;
           }
-          const supportsAttributes = [
-            "paragraph",
-            "heading",
-            "listItem",
-            "taskItem",
-            "blockquote"
-          ].includes(parentNode.type.name);
-          if (!supportsAttributes) {
-            return null;
-          }
-          const currentFont = parentNode.attrs.fontFamily;
-          const currentColor = parentNode.attrs.color;
-          const needsFont = !currentFont && pluginState.lastFont;
-          const needsColor = !currentColor && pluginState.lastColor;
-          if (!needsFont && !needsColor) {
-            return null;
-          }
           const tr = newState.tr;
-          try {
-            const depth = $from.depth;
-            const pos = $from.before(depth);
+          let trDirty = false;
+          for (let depth = $from.depth; depth >= 1; depth--) {
             const node = $from.node(depth);
+            if (!STYLED_NODES.includes(node.type.name)) continue;
+            const pos = $from.before(depth);
+            const needsFont = !node.attrs.fontFamily && pluginState.lastFont;
+            const needsColor = !node.attrs.color && pluginState.lastColor;
+            if (!needsFont && !needsColor) {
+              break;
+            }
             const newAttrs = { ...node.attrs };
             if (needsFont) newAttrs.fontFamily = pluginState.lastFont;
             if (needsColor) newAttrs.color = pluginState.lastColor;
             tr.setNodeMarkup(pos, void 0, newAttrs);
+            trDirty = true;
+            if (node.type.name === "listItem" || node.type.name === "taskItem") {
+              break;
+            }
+          }
+          if (!trDirty) {
+            return null;
+          }
+          try {
             const storedMarks = newState.storedMarks || $from.marks();
             const filteredMarks = storedMarks.filter(
               (mark) => mark.type.name !== "textStyle" && !excludedMarks.includes(mark.type.name)
@@ -7968,11 +7974,9 @@ var StylePersistence = import_core5.Extension.create({
               newState.schema.marks.textStyle.create(textStyleAttrs)
             ];
             tr.setStoredMarks(newMarks);
-            return tr;
-          } catch (error) {
-            console.error("StylePersistence error:", error);
-            return null;
+          } catch (e) {
           }
+          return tr;
         },
         props: {
           handleKeyDown(view, event) {
@@ -7980,33 +7984,28 @@ var StylePersistence = import_core5.Extension.create({
               const { state } = view;
               const { $from } = state.selection;
               const marks = $from.marks();
-              const hasExcludedMarks = marks.some(
-                (mark) => excludedMarks.includes(mark.type.name)
-              );
-              if (hasExcludedMarks) {
+              if (marks.some((mark) => excludedMarks.includes(mark.type.name))) {
                 return false;
               }
               let isInCodeBlock = false;
               for (let depth = $from.depth; depth > 0; depth--) {
-                const node = $from.node(depth);
-                if (node.type.name === "codeBlock") {
+                if ($from.node(depth).type.name === "codeBlock") {
                   isInCodeBlock = true;
                   break;
                 }
               }
-              if (isInCodeBlock) {
-                return false;
+              if (isInCodeBlock) return false;
+              let font = null;
+              let color = null;
+              for (let depth = $from.depth; depth >= 1; depth--) {
+                const node = $from.node(depth);
+                if (!font && node.attrs?.fontFamily) font = node.attrs.fontFamily;
+                if (!color && node.attrs?.color) color = node.attrs.color;
+                if (font && color) break;
               }
-              const parentNode = $from.parent;
-              let font = parentNode.attrs.fontFamily;
-              let color = parentNode.attrs.color;
               const textStyleMark = marks.find((m) => m.type.name === "textStyle");
-              if (!font && textStyleMark?.attrs.fontFamily) {
-                font = textStyleMark.attrs.fontFamily;
-              }
-              if (!color && textStyleMark?.attrs.color) {
-                color = textStyleMark.attrs.color;
-              }
+              if (!font && textStyleMark?.attrs.fontFamily) font = textStyleMark.attrs.fontFamily;
+              if (!color && textStyleMark?.attrs.color) color = textStyleMark.attrs.color;
               if (font || color) {
                 const pluginState = stylePersistenceKey.getState(state);
                 pluginState.lastFont = font || pluginState.lastFont;