@wiris/mathtype-ckeditor5 8.2.6 → 8.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wiris/mathtype-ckeditor5",
-  "version": "8.2.6",
+  "version": "8.3.1",
   "description": "MathType Web for CKEditor5 editor",
   "keywords": [
     "chem",
@@ -39,6 +39,6 @@
     "@ckeditor/ckeditor5-engine": ">=23.0.0",
     "@ckeditor/ckeditor5-ui": ">=23.0.0",
     "@ckeditor/ckeditor5-widget": ">=23.0.0",
-    "@wiris/mathtype-html-integration-devkit": "1.11.4"
+    "@wiris/mathtype-html-integration-devkit": "1.12.1"
   }
 }

package/src/integration.js

@@ -2,6 +2,7 @@ import IntegrationModel from '@wiris/mathtype-html-integration-devkit/src/integr
 import Util from '@wiris/mathtype-html-integration-devkit/src/util';
 import Configuration from '@wiris/mathtype-html-integration-devkit/src/configuration';
 import Latex from '@wiris/mathtype-html-integration-devkit/src/latex';
+import Parser from '@wiris/mathtype-html-integration-devkit/src/parser';
 import MathML from '@wiris/mathtype-html-integration-devkit/src/mathml';
 import Telemeter from '@wiris/mathtype-html-integration-devkit/src/telemeter';
 
@@ -211,7 +212,12 @@ export default class CKEditor5Integration extends IntegrationModel {
     const range = this.editorObject.model.createRangeIn(element);
     const descendants = Array.from(range.getItems());
     for (const node of descendants) {
-      if (node.is('textProxy') && node.data === viewElement.data.replace(String.fromCharCode(160), ' ')) {
+      let viewElementData = viewElement.data;
+      if (viewElement.nodeType === 3) {
+        // Remove invisible white spaces
+        viewElementData = viewElementData.replaceAll(String.fromCharCode(8288), '')
+      }
+      if (node.is('textProxy') && node.data === viewElementData.replace(String.fromCharCode(160), ' ')) {
         return node.textNode;
       }
     }
@@ -234,14 +240,45 @@ export default class CKEditor5Integration extends IntegrationModel {
         const startNode = this.findText(latexRange.startContainer);
         const endNode = this.findText(latexRange.endContainer);
 
-        const startPosition = writer.createPositionAt(startNode.parent, startNode.startOffset + latexRange.startOffset);
-        const endPosition = writer.createPositionAt(endNode.parent, endNode.startOffset + latexRange.endOffset);
-
-        const range = writer.createRange(
+        let startPosition = writer.createPositionAt(startNode.parent, startNode.startOffset + latexRange.startOffset);
+        let endPosition = writer.createPositionAt(endNode.parent, endNode.startOffset + latexRange.endOffset);
+        
+        let range = writer.createRange(
           startPosition,
           endPosition,
         );
 
+        
+
+        // When Latex is next to image/formula.
+        if (latexRange.startContainer.nodeType === 3 && latexRange.startContainer.previousSibling?.nodeType === 1) {
+          // Get the position of the latex to be replaced.
+          let latexEdited = '$$' +(Latex.getLatexFromMathML(MathML.safeXmlDecode(this.core.editionProperties.temporalImage.dataset.mathml))) + '$$';
+          let data = latexRange.startContainer.data;
+
+          // Remove invisible characters.
+          data = data.replaceAll(String.fromCharCode(8288), '')
+
+          // Get to the start of the latex we are editing.
+          let offset = data.indexOf(latexEdited);
+          let dataOffset = data.substring(offset);
+          let second$ = dataOffset.substring(2).indexOf("$$") + 4;
+          let substring = dataOffset.substr(0, second$);
+          data = data.replace(substring, '');
+          
+          if (!data) {
+            startPosition = writer.createPositionBefore(startNode);
+            range = startNode;
+          } else {
+            startPosition = startPosition = writer.createPositionAt(startNode.parent, startNode.startOffset + offset);
+            endPosition = writer.createPositionAt(endNode.parent, endNode.startOffset + second$ + offset);      
+            range = writer.createRange(
+              startPosition,
+              endPosition,
+            );
+          }
+        } 
+
         writer.remove(range);
         writer.insertText(`$$${returnObject.latex}$$`, startNode.getAttributes(), startPosition);
       });

package/src/plugin.js

@@ -65,7 +65,7 @@ export default class MathType extends Plugin {
    * Inherited from Plugin class: Executed when CKEditor5 is destroyed
    */
   destroy() { // eslint-disable-line class-methods-use-this
-    currentInstance.removeEvents();
+    currentInstance.destroy();
   }
 
   /**
@@ -366,10 +366,10 @@ export default class MathType extends Plugin {
     });
 
     /**
-         * Makes a copy of the given view node.
-         * @param {module:engine/view/node~Node} sourceNode Node to copy.
-         * @returns {module:engine/view/node~Node} Copy of the node.
-         */
+     * Makes a copy of the given view node.
+     * @param {module:engine/view/node~Node} sourceNode Node to copy.
+     * @returns {module:engine/view/node~Node} Copy of the node.
+     */
     function clone(viewWriter, sourceNode) {
       if (sourceNode.is('text')) {
         return viewWriter.createText(sourceNode.data);
@@ -392,11 +392,6 @@ export default class MathType extends Plugin {
 
       let mathString = Parser.endParseSaveMode(modelItem.getAttribute('formula'));
 
-      // Remove the traces from Hand. This code should be removed once PLUGINS-1307 is solved.
-      if (!Configuration.get('saveHandTraces')) {
-        mathString = MathML.removeAnnotation(mathString, 'application/json');
-      }
-
       const sourceMathElement = htmlDataProcessor.toView(mathString).getChild(0);
 
       return clone(viewWriter, sourceMathElement);
@@ -412,11 +407,11 @@ export default class MathType extends Plugin {
     const { get } = editor.data;
 
     /**
-         * Hack to transform $$latex$$ into <math> in editor.getData()'s output.
-         */
+     * Hack to transform $$latex$$ into <math> in editor.getData()'s output.
+     */
     editor.data.get = (options) => {
       const output = get.bind(editor.data)(options);
-      return Parser.endParse(output);
+      return Parser.endParse(MathML.mathMLEntities(output));
     };
   }