jodit 4.2.7 → 4.2.10

package/es5/plugins/debug/debug.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.2.7
+ * Version: v4.2.10
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */

package/es5/plugins/debug/debug.min.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.2.7
+ * Version: v4.2.10
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */

package/es5/plugins/speech-recognize/speech-recognize.css

@@ -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.2.7
+ * Version: v4.2.10
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */

package/es5/plugins/speech-recognize/speech-recognize.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.2.7
+ * Version: v4.2.10
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */

package/es5/plugins/speech-recognize/speech-recognize.min.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.2.7
+ * Version: v4.2.10
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */

package/esm/core/constants.js

@@ -3,7 +3,7 @@
  * Released under MIT see LICENSE.txt in the project root for license information.
  * Copyright (c) 2013-2024 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
-export const APP_VERSION = "4.2.7";
+export const APP_VERSION = "4.2.10";
 // prettier-ignore
 export const ES = "es2020";
 export const IS_ES_MODERN = true;

package/esm/core/ui/group/list.js

@@ -112,7 +112,8 @@ let UIList = class UIList extends UIGroup {
                 group.append(elm);
             }
         };
-        const isNotRemoved = (b) => !this.removeButtons.includes(b.name);
+        const isNotRemoved = (b) => !this.removeButtons.includes(b.name) &&
+            (!b.isVisible || b.isVisible?.(this.j, b));
         items.forEach(item => {
             if (isButtonGroup(item)) {
                 const buttons = item.buttons.filter(b => b);

package/esm/plugins/color/config.js

@@ -4,13 +4,49 @@
  * Copyright (c) 2013-2024 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
 import { Dom } from "jodit/esm/core/dom/dom.js";
-import { css, dataBind } from "jodit/esm/core/helpers/index.js";
+import { css, dataBind, isJoditObject } from "jodit/esm/core/helpers/index.js";
 import { Icon } from "jodit/esm/core/ui/icon.js";
 import { ColorPickerWidget, TabsWidget } from "jodit/esm/modules/widget/index.js";
 import brushIcon from "./brush.svg.js";
 import { Config } from "jodit/esm/config.js";
 Icon.set('brush', brushIcon);
+Config.prototype.controls.brushCell = {
+    isVisible: (editor) => {
+        return !editor.o.disablePlugins.includes('color');
+    },
+    icon: 'brush',
+    popup: (editor, _, close) => {
+        if (!isJoditObject(editor)) {
+            return;
+        }
+        const tableModule = editor.getInstance('Table', editor.o), selected = tableModule.getAllSelectedCells();
+        if (!selected.length) {
+            return false;
+        }
+        const makeColorPicker = (key) => ColorPickerWidget(editor, (value) => {
+            selected.forEach(cell => {
+                css(cell, key, value);
+            });
+            editor.lock();
+            editor.synchronizeValues();
+            close();
+            editor.unlock();
+        }, css(selected[0], key));
+        return TabsWidget(editor, [
+            {
+                name: 'Background',
+                content: makeColorPicker('background-color')
+            },
+            { name: 'Text', content: makeColorPicker('color') },
+            { name: 'Border', content: makeColorPicker('border-color') }
+        ]);
+    },
+    tooltip: 'Background'
+};
 Config.prototype.controls.brush = {
+    isVisible: (editor) => {
+        return !editor.o.disablePlugins.includes('color');
+    },
     update(editor, button) {
         const color = dataBind(button, 'color');
         const update = (key, value) => {

package/esm/plugins/image-properties/readers/size.js

@@ -10,16 +10,21 @@ import { normalSizeFromString } from "../utils/utils";
 /** @private */
 export async function readSizes(image, values, state) {
     await image.decode();
-    const width = attr(image, 'width') || css(image, 'width', true) || false;
-    const height = attr(image, 'height') || css(image, 'height', true) || false;
+    const width = css(image, 'width', true) || attr(image, 'width') || false;
+    const height = css(image, 'height', true) || attr(image, 'height') || false;
     values.imageWidth =
         width !== false
             ? normalSizeFromString(width)
             : image.offsetWidth || image.naturalWidth;
-    values.imageHeight =
-        height !== false
-            ? normalSizeFromString(height)
-            : image.offsetHeight || image.naturalHeight;
+    if (isNumeric(values.imageWidth)) {
+        values.imageHeight =
+            height !== false
+                ? normalSizeFromString(height)
+                : image.offsetHeight || image.naturalHeight;
+    }
+    else {
+        values.imageHeight = height || '';
+    }
     const { imageWidth, imageHeight } = values;
     const w = parseFloat(imageWidth.toString());
     if (!isNumeric(imageWidth) || !isNumeric(imageHeight)) {

package/esm/plugins/image-properties/writers/size.js

@@ -3,6 +3,7 @@
  * Released under MIT see LICENSE.txt in the project root for license information.
  * Copyright (c) 2013-2024 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
+import { isNumeric } from "jodit/esm/core/helpers/checker/is-numeric.js";
 import { attr } from "jodit/esm/core/helpers/utils/attr.js";
 import { css } from "jodit/esm/core/helpers/utils/css.js";
 import { normalSizeToString } from "../utils/utils";
@@ -19,7 +20,9 @@ export function applySize(image, imageWidth, imageHeight, sizeIsLocked) {
             width: updatedWidth,
             height: updatedWidth && sizeIsLocked ? null : updatedHeight
         });
-        attr(image, 'width', attr(image, 'width') ? updatedWidth : null);
+        attr(image, 'width', updatedWidth && isNumeric(imageWidth) && attr(image, 'width')
+            ? updatedWidth
+            : null);
         if (!attr(image, 'width') || sizeIsLocked) {
             updatedHeight = null;
         }

package/esm/plugins/inline-popup/config/items/cells.js

@@ -5,41 +5,11 @@
  */
 import { isJoditObject, isString } from "jodit/esm/core/helpers/checker/index.js";
 import { css } from "jodit/esm/core/helpers/utils/css.js";
-import { ColorPickerWidget, TabsWidget } from "jodit/esm/modules/widget/index.js";
 const cmd = (control) => control.args && isString(control.args[0])
     ? control.args[0].toLowerCase()
     : '';
 export default [
-    {
-        name: 'brush',
-        popup: (editor, _, close) => {
-            if (!isJoditObject(editor)) {
-                return;
-            }
-            const tableModule = editor.getInstance('Table', editor.o), selected = tableModule.getAllSelectedCells();
-            if (!selected.length) {
-                return false;
-            }
-            const makeColorPicker = (key) => ColorPickerWidget(editor, (value) => {
-                selected.forEach(cell => {
-                    css(cell, key, value);
-                });
-                editor.lock();
-                editor.synchronizeValues();
-                close();
-                editor.unlock();
-            }, css(selected[0], key));
-            return TabsWidget(editor, [
-                {
-                    name: 'Background',
-                    content: makeColorPicker('background-color')
-                },
-                { name: 'Text', content: makeColorPicker('color') },
-                { name: 'Border', content: makeColorPicker('border-color') }
-            ]);
-        },
-        tooltip: 'Background'
-    },
+    'brushCell',
     {
         name: 'valign',
         list: ['Top', 'Middle', 'Bottom', 'Normal'],

package/esm/types/toolbar.d.ts

@@ -21,6 +21,7 @@ interface IControlType<T extends IViewBased = IJodit | IViewBased | IFileBrowser
     data?: IDictionary;
     isInput?: boolean;
     component?: 'button' | 'select';
+    isVisible?: (editor: T, control: IControlType) => boolean;
     /**
      * You can use it function for control - active/not active button
      *

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "jodit",
-	"version": "4.2.7",
+	"version": "4.2.10",
 	"description": "Jodit is an awesome and useful wysiwyg editor with filebrowser",
 	"main": "esm/index.js",
 	"types": "types/index.d.ts",

package/types/types/toolbar.d.ts

@@ -21,6 +21,7 @@ interface IControlType<T extends IViewBased = IJodit | IViewBased | IFileBrowser
     data?: IDictionary;
     isInput?: boolean;
     component?: 'button' | 'select';
+    isVisible?: (editor: T, control: IControlType) => boolean;
     /**
      * You can use it function for control - active/not active button
      *