Merge branch 'master' into fix/KB-48969/jump-caret-test

wiris · Aug 28, 2024 · 4f16af0 · 4f16af0
2 parents ed6cf5f + 5ea23eb
commit 4f16af0
Show file tree

Hide file tree

Showing 10 changed files with 21,444 additions and 21,935 deletions.
diff --git a/packages/ckeditor5/dist/browser/index-editor.css b/packages/ckeditor5/dist/browser/index-editor.css
diff --git a/packages/ckeditor5/dist/browser/index.js b/packages/ckeditor5/dist/browser/index.js
diff --git a/packages/ckeditor5/dist/browser/index.js.map b/packages/ckeditor5/dist/browser/index.js.map
diff --git a/packages/ckeditor5/dist/browser/index.umd.js b/packages/ckeditor5/dist/browser/index.umd.js
diff --git a/packages/ckeditor5/dist/browser/index.umd.js.map b/packages/ckeditor5/dist/browser/index.umd.js.map
diff --git a/packages/ckeditor5/dist/index.js b/packages/ckeditor5/dist/index.js
diff --git a/packages/ckeditor5/dist/index.js.map b/packages/ckeditor5/dist/index.js.map
diff --git a/packages/ckeditor5/package.json b/packages/ckeditor5/package.json
@@ -35,8 +35,8 @@
   "type": "module",
   "exports": {
     ".": "./src/plugin.js",
-    "./dist/*.css": "./dist/*.css",
     "./dist/*": "./dist/*",
+    "./browser/*": null,
     "./src/*": "./src/*",
     "./theme/*": "./theme/*",
     "./package.json": "./package.json"
@@ -50,10 +50,10 @@
     "@wiris/mathtype-html-integration-devkit": "1.17.3"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-dev-build-tools": "^40.2.0",
-    "ckeditor5": ">=42.0.0"
+    "@ckeditor/ckeditor5-dev-build-tools": "^42.0.0",
+    "ckeditor5": ">=43.0.0"
   },
   "peerDependencies": {
-    "ckeditor5": ">=42.0.0"
+    "ckeditor5": ">=43.0.0"
   }
 }
diff --git a/packages/ckeditor5/src/integration.js b/packages/ckeditor5/src/integration.js
@@ -134,7 +134,10 @@ export default class CKEditor5Integration extends IntegrationModel {
   openNewFormulaEditor() {
     // Store the editor selection as it will be lost upon opening the modal
     this.core.editionProperties.selection = this.editorObject.editing.view.document.selection;
+
+    // Focus on the selected editor when multiple editor instances are present
     WirisPlugin.currentInstance = this;
+
     return super.openNewFormulaEditor();
   }
 

diff --git a/packages/devkit/src/util.js b/packages/devkit/src/util.js
@@ -432,7 +432,7 @@ export default class Util {
     let annotation = html.match(annotationRegex);
     // Sanitize html code without removing our supported MathML tags and attributes.
     html = DOMPurify.sanitize(html, {
-      ADD_TAGS: ["semantics", "annotation", "mstack", "msline", "msrow"],
+      ADD_TAGS: ["semantics", "annotation", "mstack", "msline", "msrow", "none"],
       ADD_ATTR: ["linebreak", "charalign", "stackalign"],
     });
     // Readd old annotation content.