@wiris/mathtype-ckeditor5 8.15.1 → 8.15.3

package/src/plugin.js

@@ -446,9 +446,7 @@ export default class MathType extends Plugin {
        *  DataProcessor being used by this editor instance
        */
       if (imgElement) {
-        return viewWriter.createEmptyElement("img", imgElement.getAttributes(), {
-          renderUnsafeAttributes: ["src"],
-        });
+        return viewWriter.createEmptyElement("img", imgElement.getAttributes());
       }
 
       return null;
@@ -557,7 +555,7 @@ export default class MathType extends Plugin {
           const previewOutput = output.replace(/<img([^>]*class="Wirisformula"[^>]*)>/g, (match, attributes) => {
             // Extract Track Changes attributes
             const trackChangesAttrs = [];
-            
+
             attributesToPreserve.forEach((prefix) => {
               const regex = new RegExp(`(${prefix}[^=]*="[^"]*")`, "g");
               let attrMatch;
@@ -578,8 +576,11 @@ export default class MathType extends Plugin {
           return;
         }
 
-        // In save mode, convert formula images back to clean MathML
-        const parsedResult = Parser.endParse(output);
+        // Clean track changes markers only from LaTeX content before converting to MathML.
+        const latexParsedOutput = this._endParseEditModeWithTrackChangesSupport(output);
+
+        // Convert formula images to MathML. It's important to use the save mode to prevent issues.
+        const parsedResult = Parser.endParseSaveMode(latexParsedOutput);
 
         // Remove all semantic annotations (including handwritten data points)
         // to ensure clean, standard MathML format for storage
@@ -629,6 +630,45 @@ export default class MathType extends Plugin {
     );
   }
 
+  /**
+   * When track changes markers are present inside a LaTeX block:
+   * - The LaTeX is preserved as text (not converted to MathML) to maintain suggestions.
+   * - It also prevents the issue where the suggestions were placed as MathML tags.
+   *
+   * When no track changes markers are inside a LaTeX block:
+   * - The LaTeX is converted to MathML normally. (previous default behavior)
+   *
+   * This is to ensure that:
+   * 1. LaTeX without suggestions gets converted to MathML for final output.
+   * 2. LaTeX with pending suggestions is preserved so setData(getData()) works correctly.
+   */
+  _endParseEditModeWithTrackChangesSupport(code) {
+    if (!Configuration.get("parseModes").includes("latex")) {
+      return code;
+    }
+
+    const latexBlockRegex = /\$\$([\s\S]*?)\$\$/g;
+    const trackChangesRegex = /<(suggestion|comment)-(start|end)/i;
+
+    //TODO: Validate if replace all is needed instead of just replace when it is all implemented.
+    return code.replace(latexBlockRegex, (fullMatch, latexContent) => {
+      // Check if this LaTeX contains track changes markers to prevent conversion.
+      if (trackChangesRegex.test(latexContent)) {
+        return fullMatch;
+      }
+
+      // When LaTeX has no suggestion, it can be converted to MathML.
+      const decodedLatex = Util.htmlEntitiesDecode(latexContent);
+      let mathml = Util.htmlSanitize(Latex.getMathMLFromLatex(decodedLatex, true));
+
+      if (!Configuration.get("saveHandTraces")) {
+        mathml = MathML.removeAnnotation(mathml, "application/json");
+      }
+
+      return mathml;
+    });
+  }
+
   /**
    * Expose the WirisPlugin variable to the window
    */
@@ -666,6 +706,24 @@ export default class MathType extends Plugin {
           (quantity > 1 ? `${quantity} ` : "") +
           StringManager.get(quantity > 1 ? "formulas" : "formula", integration?.getLanguage() || "en"),
       );
+
+      this._registerLatexTrackChangesAdapter(integration);
     }
   }
+
+  /**
+   * Register a custom adapter for handling LaTeX text changes.
+   * This ensures that LaTeX formulas ($$...$$) are treated as atomic units
+   * when used by the track changes feature and avoid partial edits.
+   */
+  _registerLatexTrackChangesAdapter(integration) {
+    const { editor } = this;
+
+    editor.model.document.on("change:data", () => {
+      if (integration) {
+        integration._trackChangesEnabled =
+          editor.commands.get("trackChanges")?.value ?? false;
+      }
+    });
+  }
 }