@wiris/mathtype-ckeditor5 7.27.2 → 7.29.0

package/README.md

@@ -53,7 +53,7 @@ This npm module uses remotely hosted services to render MathML data. In case of
 
 In order to display mathematical formulas on the target page, i.e. the page where content produced by the HTML editor will be visible, the target page needs to include the [MathType script](https://docs.wiris.com/en/mathtype/mathtype_web/integrations/mathml-mode#add_a_script_to_head). For example for the default setting this would be:
 ```html
-<script src="https://wiris.net/demo/plugins/app/WIRISplugins.js?viewer=image"></script>
+<script src="https://www.wiris.net/demo/plugins/app/WIRISplugins.js?viewer=image"></script>
 ```
 
 ## Documentation
@@ -61,11 +61,10 @@ In order to display mathematical formulas on the target page, i.e. the page wher
 To find out more information about MathType, please go to the following documentation:
 
 [comment]: <> (TODO: link to install instructions)
-* [MathType documentation](http://docs.wiris.com/en/mathtype/mathtype_web/start)
-* [Introductory tutorials](http://docs.wiris.com/en/mathtype/mathtype_web/intro_tutorials)
-* [Service customization](http://docs.wiris.com/en/mathtype/mathtype_web/integrations/config-table)
-* [Testing](http://docs.wiris.com/en/mathtype/mathtype_web/integrations/html/plugins-test)
-
+* [MathType documentation](https://docs.wiris.com/en/mathtype/mathtype_web/start?utm_source=npmjs&utm_medium=referral)
+* [Introductory tutorials](https://docs.wiris.com/en/mathtype/mathtype_web/intro_tutorials?utm_source=npmjs&utm_medium=referral)
+* [Service customization](https://docs.wiris.com/en/mathtype/mathtype_web/integrations/config-table?utm_source=npmjs&utm_medium=referral)
+* [Testing](https://docs.wiris.com/en/mathtype/mathtype_web/integrations/html/plugins-test?utm_source=npmjs&utm_medium=referral)
 ## Privacy policy
 
-The [MathType Privacy Policy](http://www.wiris.com/mathtype/privacy-policy) covers the data processing operations for the MathType users. It is an addendum of the company’s general Privacy Policy and the [general Privacy Policy](https://wiris.com/en/privacy-policy) still applies to MathType users.
+The [MathType Privacy Policy](https://www.wiris.com/en/mathtype-privacy-policy/?utm_source=npmjs&utm_medium=referral) covers the data processing operations for the MathType users. It is an addendum of the company’s general Privacy Policy and the [general Privacy Policy](https://www.wiris.com/en/privacy-policy?utm_source=npmjs&utm_medium=referral) still applies to MathType users.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wiris/mathtype-ckeditor5",
-  "version": "7.27.2",
+  "version": "7.29.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.6.1"
+    "@wiris/mathtype-html-integration-devkit": "1.8.0"
   }
 }

package/src/integration.js

@@ -43,7 +43,7 @@ export default class CKEditor5Integration extends IntegrationModel {
         // eslint-disable-next-line no-prototype-builtins
         if (languageObject.hasOwnProperty('ui')) {
           return languageObject.ui;
-        } return super.getLanguage();
+        } return languageObject;
       }
       return languageObject;
     }
@@ -162,6 +162,10 @@ export default class CKEditor5Integration extends IntegrationModel {
             writer.remove(this.editorObject.editing.mapper.toModelRange(range));
           }
         }
+
+        // Set carret after the formula
+        const position = this.editorObject.model.createPositionAfter(modelElementNew);
+        writer.setSelection(position);
       } else {
         const img = core.editionProperties.temporalImage;
         const viewElement = this.editorObject.editing.view.domConverter.domToView(img).parent;

package/src/plugin.js

@@ -18,6 +18,7 @@ import Configuration from '@wiris/mathtype-html-integration-devkit/src/configura
 import Listeners from '@wiris/mathtype-html-integration-devkit/src/listeners';
 import MathML from '@wiris/mathtype-html-integration-devkit/src/mathml';
 import Latex from '@wiris/mathtype-html-integration-devkit/src/latex';
+import StringManager from '@wiris/mathtype-html-integration-devkit/src/stringmanager';
 
 // Local imports
 import { MathTypeCommand, ChemTypeCommand } from './commands';
@@ -58,6 +59,13 @@ export default class MathType extends Plugin {
     this._exposeWiris();
   }
 
+  /**
+   * Inherited from Plugin class: Executed when CKEditor5 is destroyed
+   */
+  destroy() { // eslint-disable-line class-methods-use-this
+    currentInstance.removeEvents();
+  }
+
   /**
      * Create the MathType API Integration object
      * @returns {CKEditor5Integration} the integration object
@@ -125,51 +133,57 @@ export default class MathType extends Plugin {
   _addViews(integration) {
     const { editor } = this;
 
-    // Add button for the formula editor
-    editor.ui.componentFactory.add('MathType', (locale) => {
-      const view = new ButtonView(locale);
+    // Check if MathType editor is enabled
+    if (Configuration.get('editorEnabled')) {
+      // Add button for the formula editor
+      editor.ui.componentFactory.add('MathType', (locale) => {
+        const view = new ButtonView(locale);
 
-      // View is enabled iff command is enabled
-      view.bind('isEnabled').to(editor.commands.get('MathType'), 'isEnabled');
+        // View is enabled iff command is enabled
+        view.bind('isEnabled').to(editor.commands.get('MathType'), 'isEnabled');
 
-      view.set({
-        label: 'Insert a math equation - MathType',
-        icon: mathIcon,
-        tooltip: true,
-      });
+        view.set({
+          label: StringManager.get('insert_math'),
+          icon: mathIcon,
+          tooltip: true,
+        });
 
-      // Callback executed once the image is clicked.
-      view.on('execute', () => {
-        editor.execute('MathType', {
-          integration, // Pass integration as parameter
+        // Callback executed once the image is clicked.
+        view.on('execute', () => {
+          editor.execute('MathType', {
+            integration, // Pass integration as parameter
+          });
         });
-      });
 
-      return view;
-    });
+        return view;
+      });
+    }
 
-    // Add button for the chemistry formula editor
-    editor.ui.componentFactory.add('ChemType', (locale) => {
-      const view = new ButtonView(locale);
+    // Check if ChemType editor is enabled
+    if (Configuration.get('chemEnabled')) {
+      // Add button for the chemistry formula editor
+      editor.ui.componentFactory.add('ChemType', (locale) => {
+        const view = new ButtonView(locale);
 
-      // View is enabled iff command is enabled
-      view.bind('isEnabled').to(editor.commands.get('ChemType'), 'isEnabled');
+        // View is enabled iff command is enabled
+        view.bind('isEnabled').to(editor.commands.get('ChemType'), 'isEnabled');
 
-      view.set({
-        label: 'Insert a chemistry formula - ChemType',
-        icon: chemIcon,
-        tooltip: true,
-      });
+        view.set({
+          label: StringManager.get('insert_chem'),
+          icon: chemIcon,
+          tooltip: true,
+        });
 
-      // Callback executed once the image is clicked.
-      view.on('execute', () => {
-        editor.execute('ChemType', {
-          integration, // Pass integration as parameter
+        // Callback executed once the image is clicked.
+        view.on('execute', () => {
+          editor.execute('ChemType', {
+            integration, // Pass integration as parameter
+          });
         });
-      });
 
-      return view;
-    });
+        return view;
+      });
+    }
 
     // Observer for the double click event
     editor.editing.view.addObserver(ClickObserver);
@@ -327,8 +341,8 @@ export default class MathType extends Plugin {
             we must create a new EmptyElement which is independent of the
             DataProcessor being used by this editor instance */
       return viewWriter.createEmptyElement('img', imgElement.getAttributes(), {
-        renderUnsafeAttributes: [ 'src' ]
-      } );
+        renderUnsafeAttributes: ['src'],
+      });
     }
 
     // Model -> Editing view