jodit 4.12.30 → 4.12.32

package/es2021/jodit.js

@@ -1,7 +1,7 @@
 /*!
  * jodit - Jodit is an awesome and useful wysiwyg editor with filebrowser
  * Author: Chupurnov <chupurnov@gmail.com> (https://xdsoft.net/jodit/)
- * Version: v4.12.30
+ * Version: v4.12.32
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -1810,7 +1810,7 @@ __webpack_require__.r(__webpack_exports__);
  * ```
  * @packageDocumentation
  * @module constants
- */ const APP_VERSION = "4.12.30";
+ */ const APP_VERSION = "4.12.32";
 // prettier-ignore
 const ES = "es2021";
 const IS_ES_MODERN = true;
@@ -6180,8 +6180,16 @@ function sanitizeHTMLElement(elm, { safeJavaScriptLink, removeOnError } = {
         (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_1__.attr)(elm, 'onerror', null);
         effected = true;
     }
+    const tagName = elm.nodeName.toLowerCase();
     const href = elm.getAttribute('href');
-    if (safeJavaScriptLink && href && href.trim().indexOf('javascript') === 0) {
+    // Neutralize executable-scheme `href`s with the same normalization used for
+    // every other URL attribute (`isDangerousUrl`), which strips control bytes,
+    // tabs and newlines and lowercases before matching the scheme. The previous
+    // bare `href.trim().indexOf('javascript') === 0` was case-sensitive and
+    // missed `JAVASCRIPT:`, a leading control byte, or a tab/newline inside the
+    // scheme (e.g. `java\tscript:`) — all of which the browser still resolves to
+    // `javascript:` on click. See GHSA-j839-gqq4-gf9j.
+    if (safeJavaScriptLink && href && isDangerousUrl(href, tagName)) {
         (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_1__.attr)(elm, 'href', location.protocol + '//' + href);
         effected = true;
     }
@@ -6192,7 +6200,6 @@ function sanitizeHTMLElement(elm, { safeJavaScriptLink, removeOnError } = {
             effected = true;
         }
         // Strip executable schemes from any other URL-bearing attribute.
-        const tagName = elm.nodeName.toLowerCase();
         for (const name of URL_ATTRIBUTES){
             const value = elm.getAttribute(name);
             if (value && isDangerousUrl(value, tagName)) {
@@ -40269,7 +40276,14 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.maxHeight = 'auto';
     /**
 	 * Returns service spaces: toolbar + statusbar
 	 */ __getNotWorkHeight() {
-        return (this.j.toolbarContainer?.offsetHeight || 0) + (this.j.statusbar?.getHeight() || 0) + 2;
+        // Only a toolbar that actually lives inside the editor container takes
+        // space away from the workplace. When the `toolbar` option points to an
+        // external element, the toolbar is rendered outside the container, so it
+        // must not be subtracted — otherwise the workplace is wrongly shrunk by
+        // the toolbar's height. See https://github.com/xdan/jodit/discussions/920
+        const toolbar = this.j.toolbarContainer;
+        const toolbarHeight = toolbar && this.j.container.contains(toolbar) ? toolbar.offsetHeight : 0;
+        return toolbarHeight + (this.j.statusbar?.getHeight() || 0) + 2;
     }
     /**
 	 * Calculate workspace height