@wiris/mathtype-ckeditor5 8.3.1 → 8.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wiris/mathtype-ckeditor5",
-  "version": "8.3.1",
+  "version": "8.5.0",
   "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.12.1"
+    "@wiris/mathtype-html-integration-devkit": "1.13.0"
   }
 }

package/src/integration.js

@@ -2,7 +2,6 @@ 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';
 
@@ -37,9 +36,10 @@ export default class CKEditor5Integration extends IntegrationModel {
      */
   getLanguage() {
     // Returns the CKEDitor instance language taking into account that the language can be an object.
+    // Try to get editorParameters.language, fail silently otherwise
     try {
       return this.editorParameters.language;
-    } catch (e) { console.error(); }
+    } catch (e) {}
     const languageObject = this.editorObject.config.get('language');
     if (languageObject != null) {
       if (typeof (languageObject) === 'object') {
@@ -158,7 +158,7 @@ export default class CKEditor5Integration extends IntegrationModel {
         const viewSelection = this.core.editionProperties.selection || this.editorObject.editing.view.document.selection;
         const modelPosition = this.editorObject.editing.mapper.toModelPosition(viewSelection.getLastPosition());
 
-        writer.insert(modelElementNew, modelPosition);
+        this.editorObject.model.insertObject(modelElementNew, modelPosition);
 
         // Remove selection
         if (!viewSelection.isCollapsed) {
@@ -180,7 +180,7 @@ export default class CKEditor5Integration extends IntegrationModel {
 
         // If the given MathML is empty, don't insert a new formula.
         if (mathml) {
-          writer.insert(modelElementNew, position);
+          this.editorObject.model.insertObject(modelElementNew, position);
         }
         writer.remove(modelElementOld);
       }
@@ -242,13 +242,13 @@ export default class CKEditor5Integration extends IntegrationModel {
 
         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) {
@@ -265,19 +265,19 @@ export default class CKEditor5Integration extends IntegrationModel {
           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);      
+            endPosition = writer.createPositionAt(endNode.parent, endNode.startOffset + second$ + offset);
             range = writer.createRange(
               startPosition,
               endPosition,
             );
           }
-        } 
+        }
 
         writer.remove(range);
         writer.insertText(`$$${returnObject.latex}$$`, startNode.getAttributes(), startPosition);
@@ -312,7 +312,7 @@ export default class CKEditor5Integration extends IntegrationModel {
     Object.keys(payload).forEach(key => {
       if (key === 'mathml_origin' || key === 'editor_origin') !payload[key] ? delete payload[key] : {}
     });
-    
+
     try {
       Telemeter.telemeter.track("INSERTED_FORMULA", {
         ...payload,

package/src/plugin.js

@@ -199,9 +199,7 @@ export default class MathType extends Plugin {
     const { schema } = this.editor.model;
 
     schema.register('mathml', {
-      allowWhere: '$text',
-      isObject: true,
-      isInline: true,
+      inheritAllFrom: '$inlineObject',
       allowAttributes: ['formula'],
     });
   }
@@ -337,7 +335,7 @@ export default class MathType extends Plugin {
     function createViewImage(modelItem, { writer: viewWriter }) {
       const htmlDataProcessor = new HtmlDataProcessor(viewWriter.document);
 
-      const mathString = modelItem.getAttribute('formula');
+      const mathString = modelItem.getAttribute('formula').replace('ref="<"', 'ref="&lt;"');
       const imgHtml = Parser.initParse(mathString, editor.config.get('language'));
       const imgElement = htmlDataProcessor.toView(imgHtml).getChild(0);
 
@@ -410,8 +408,8 @@ export default class MathType extends Plugin {
      * 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(MathML.mathMLEntities(output));
+      let output = get.bind(editor.data)(options);
+      return Parser.endParse(output);
     };
   }