jodit 4.18.6 → 4.18.8

package/esm/plugins/backspace/config.d.ts

@@ -7,6 +7,8 @@ declare module 'jodit/config' {
     interface Config {
         /**
          * Keyboard hotkey mappings for delete and backspace operations (character, word, sentence).
+         * On macOS the defaults leave out Cmd+Backspace, Ctrl+Backspace, Ctrl+Option+Backspace
+         * and Cmd+Option+Backspace, so the browser applies the system's own bindings to them.
          */
         delete: {
             hotkeys: {
@@ -22,8 +24,8 @@ declare module 'jodit/config' {
              * key, so the plugin no longer applies that particular behavior.
              * Available keys: `remove-unbreakable`, `remove-not-editable`,
              * `remove-char`, `table-cell`, `remove-empty-parent`,
-             * `remove-empty-neighbor`, `join-two-lists`, `join-neighbors`,
-             * `unwrap-first-list-item`.
+             * `remove-empty-neighbor`, `join-two-lists`, `unwrap-list-item`,
+             * `join-neighbors`, `unwrap-first-list-item`.
              *
              * ```javascript
              * Jodit.make('#editor', {

package/esm/plugins/backspace/config.js

@@ -6,14 +6,17 @@
 /**
  * @module plugins/backspace
  */
+import { IS_MAC } from "../../core/constants.js";
 import { Config } from "../../config.js";
 Config.prototype.delete = {
     hotkeys: {
-        delete: ['delete', 'cmd+backspace'],
-        deleteWord: ['ctrl+delete', 'cmd+alt+backspace', 'ctrl+alt+backspace'],
+        delete: IS_MAC ? ['delete'] : ['delete', 'cmd+backspace'],
+        deleteWord: IS_MAC
+            ? ['ctrl+delete']
+            : ['ctrl+delete', 'cmd+alt+backspace', 'ctrl+alt+backspace'],
         deleteSentence: ['ctrl+shift+delete', 'cmd+shift+delete'],
         backspace: ['backspace'],
-        backspaceWord: ['ctrl+backspace'],
+        backspaceWord: IS_MAC ? [] : ['ctrl+backspace'],
         backspaceSentence: ['ctrl+shift+backspace', 'cmd+shift+backspace']
     }
 };

package/esm/plugins/enter/enter.js

@@ -68,7 +68,7 @@ export class enter extends Plugin {
             moveCursorOutFromSpecialTags(jodit, fake, ['a']);
             let block = getBlockWrapper(fake, jodit);
             const isLi = Dom.isLeaf(block);
-            // if use <br> defaultTag for break line or when was entered SHIFt key or in <td> or <th> or <blockquote>
+            // if use <br> defaultTag for break line or when was entered SHIFt key or in <td>, <th> or <blockquote> without an inner block
             if ((!isLi || (event === null || event === void 0 ? void 0 : event.shiftKey)) &&
                 checkBR(fake, jodit, event === null || event === void 0 ? void 0 : event.shiftKey, block)) {
                 return false;

package/esm/plugins/enter/helpers/check-br.js

@@ -11,7 +11,12 @@ import { scrollIntoViewIfNeeded } from "../../../core/helpers/utils/scroll-into-
  * @private
  */
 export function checkBR(fake, jodit, shiftKeyPressed, block) {
-    const isMultiLineBlock = Boolean(Dom.closest(fake, ['pre', 'blockquote'], jodit.editor));
+    // Text in a <pre>, or bare text in a quote, gets a BR. A real block inside
+    // a quote (<p>, <h3>, ...) is split like anywhere else, as in a cell below.
+    const isMultiLineBlock = Boolean(Dom.closest(fake, 'pre', jodit.editor)) ||
+        (block
+            ? Dom.isTag(block, 'blockquote')
+            : Boolean(Dom.closest(fake, 'blockquote', jodit.editor)));
     // A cell itself can't be split into two cells, so bare cell content gets
     // a BR. But when the cell already holds a real block (<p>, <h3>, ...) that
     // block is split like anywhere else, otherwise every line of the cell
@@ -21,7 +26,7 @@ export function checkBR(fake, jodit, shiftKeyPressed, block) {
             ? Dom.isCell(block)
             : Boolean(Dom.closest(fake, ['td', 'th'], jodit.editor)));
     const isBRMode = jodit.o.enter.toLowerCase() === BR.toLowerCase();
-    // if you use <br> defaultTag for break line or when was entered SHIFt key or in <td> or <th> or <blockquote>
+    // if you use <br> defaultTag for break line or when was entered SHIFt key or in <td>, <th> or <blockquote> without an inner block
     if (isBRMode ||
         isCell ||
         (shiftKeyPressed && !isMultiLineBlock) ||

package/esm/plugins/image-properties/image-properties.d.ts

@@ -52,6 +52,11 @@ export declare class imageProperties extends Plugin {
      * ```
      */
     protected open(): void | false;
+    /**
+     * Keys typed while the dialog is open must not reach the editor behind it,
+     * so focus the active tab's first field, or else the first field shown
+     */
+    private __focusFirstField;
     private __lock;
     private __unlock;
     /** @override **/

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

@@ -16,7 +16,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { cache, cached, watch } from "../../core/decorators/index.js";
 import { Dom } from "../../core/dom/dom.js";
 import { pluginSystem } from "../../core/global.js";
-import { isAbortError, isNumeric, markOwner } from "../../core/helpers/index.js";
+import { isAbortError, isNumeric, markOwner, toArray } from "../../core/helpers/index.js";
 import { Plugin } from "../../core/plugin/plugin.js";
 import { Button } from "../../core/ui/button/index.js";
 import "./config.js";
@@ -99,8 +99,12 @@ export class imageProperties extends Plugin {
             dialog.close();
         });
         buttons.remove.onAction(() => {
+            const caret = j.s.createRange();
+            caret.setStartBefore(this.state.sourceImage);
+            caret.collapse(true);
             j.s.removeNode(this.state.sourceImage);
             dialog.close();
+            j.s.selectRange(caret);
         });
         buttons.cancel.onAction(() => {
             dialog.close();
@@ -108,11 +112,20 @@ export class imageProperties extends Plugin {
         dialog.setHeader(j.i18n('Image properties'));
         dialog.setContent(this.form);
         dialog.setFooter([[buttons.cancel, buttons.remove], buttons.check]);
-        j.e.on(dialog, 'afterClose', () => {
-            if (this.state.image.parentNode &&
-                j.o.image.selectImageAfterClose) {
-                j.s.select(this.state.sourceImage);
+        // The dialog fires `afterClose` on its own emitter, not the editor's
+        dialog.e.on(dialog, 'afterClose', () => {
+            const { sourceImage } = this.state;
+            if (j.isInDestruct || !Dom.isOrContains(j.editor, sourceImage)) {
+                return;
             }
+            if (j.o.image.selectImageAfterClose) {
+                j.s.select(sourceImage);
+                return;
+            }
+            const caret = j.s.createRange();
+            caret.setStartAfter(sourceImage);
+            caret.collapse(true);
+            j.s.selectRange(caret);
         });
         dialog.setSize(j.o.image.dialogWidth);
         markOwner(j, dialog.container);
@@ -144,6 +157,7 @@ export class imageProperties extends Plugin {
         this.activeTabState.activeTab = 'Image';
         this.__lock();
         this.dialog.open().setModal(true).setPosition();
+        this.__focusFirstField();
         this.async
             .promise((resolve, reject) => readValuesFromImage(this.j, this.state).then(resolve, reject))
             .catch((e) => {
@@ -154,6 +168,17 @@ export class imageProperties extends Plugin {
             .finally(() => this.__unlock());
         return false;
     }
+    /**
+     * Keys typed while the dialog is open must not reach the editor behind it,
+     * so focus the active tab's first field, or else the first field shown
+     */
+    __focusFirstField() {
+        var _a;
+        const fields = (box) => toArray(box.querySelectorAll('input, select, textarea'));
+        (_a = fields(this.form.getElm('tabsBox'))
+            .concat(fields(this.form.container))
+            .find(field => field.offsetParent != null)) === null || _a === void 0 ? void 0 : _a.focus();
+    }
     __lock() {
         this.dialog.lock();
         this.form.setMod('lock', true);

package/esm/plugins/mobile/mobile.js

@@ -78,9 +78,11 @@ function fitToButtons(list, editor) {
     return cleaned;
 }
 /**
- * The width that decides which breakpoint set the toolbar uses. A toolbar
- * rendered into an external container (`toolbar` set to an element or a
- * selector) lays out in that container, so its width is what matters there.
+ * The width that decides which breakpoint set the toolbar uses: the editor's
+ * own width, or its parent's while the editor has none yet (for example
+ * while hidden at init). A toolbar rendered into an external container
+ * (`toolbar` set to an element or a selector) lays out in that container, so
+ * its width is what matters there.
  */
 function adaptiveWidth(editor) {
     var _a;
@@ -91,7 +93,8 @@ function adaptiveWidth(editor) {
             return width;
         }
     }
-    return ((_a = editor.container.parentElement) !== null && _a !== void 0 ? _a : editor.container).offsetWidth;
+    return (editor.container.offsetWidth ||
+        ((_a = editor.container.parentElement) !== null && _a !== void 0 ? _a : editor.container).offsetWidth);
 }
 /**
  * Rebuild toolbar in depends on editor's width

package/package.json

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

package/types/config.d.ts

@@ -1034,6 +1034,8 @@ interface Config {
 interface Config {
     /**
      * Keyboard hotkey mappings for delete and backspace operations (character, word, sentence).
+     * On macOS the defaults leave out Cmd+Backspace, Ctrl+Backspace, Ctrl+Option+Backspace
+     * and Cmd+Option+Backspace, so the browser applies the system's own bindings to them.
      */
     delete: {
         hotkeys: {
@@ -1049,8 +1051,8 @@ interface Config {
          * key, so the plugin no longer applies that particular behavior.
          * Available keys: `remove-unbreakable`, `remove-not-editable`,
          * `remove-char`, `table-cell`, `remove-empty-parent`,
-         * `remove-empty-neighbor`, `join-two-lists`, `join-neighbors`,
-         * `unwrap-first-list-item`.
+         * `remove-empty-neighbor`, `join-two-lists`, `unwrap-list-item`,
+         * `join-neighbors`, `unwrap-first-list-item`.
          *
          * ```javascript
          * Jodit.make('#editor', {

package/types/plugins/backspace/cases/check-remove-char.d.ts

@@ -19,6 +19,7 @@ import type { DeleteMode } from "../interface";
  * ```html
  * t|st
  * ```
+ * With `stopBeforeSpace`, nothing is removed when the next char is a space.
  * @private
  */
-export declare function checkRemoveChar(jodit: IJodit, fakeNode: Node, backspace: boolean, mode: DeleteMode): boolean;
+export declare function checkRemoveChar(jodit: IJodit, fakeNode: Node, backspace: boolean, mode: DeleteMode, stopBeforeSpace?: boolean): boolean;

package/types/plugins/backspace/cases/check-unwrap-list-item.d.ts

@@ -0,0 +1,26 @@
+/*!
+ * Jodit Editor (https://xdsoft.net/jodit/)
+ * Released under MIT see LICENSE.txt in the project root for license information.
+ * Copyright (c) 2013-2026 Valerii Chupurnov. All rights reserved. https://xdsoft.net
+ */
+/**
+ * @module plugins/backspace
+ */
+import type { IJodit } from "../../../types/index";
+/**
+ * Backspace at the start of a later list item takes the bullet off, as Word
+ * does: the item becomes a paragraph where it was, and the list is split
+ * around it. A split `<ol>` carries its numbering on with `start`.
+ *
+ * @example
+ * ```html
+ * <ol><li>first</li><li>|second</li><li>third</li></ol>
+ * ```
+ * Result
+ * ```html
+ * <ol><li>first</li></ol><p>|second</p><ol start="2"><li>third</li></ol>
+ * ```
+ *
+ * @private
+ */
+export declare function checkUnwrapListItem(jodit: IJodit, fakeNode: Node, backspace: boolean): boolean;

package/types/plugins/backspace/config.d.ts

@@ -7,6 +7,8 @@ declare module 'jodit/config' {
     interface Config {
         /**
          * Keyboard hotkey mappings for delete and backspace operations (character, word, sentence).
+         * On macOS the defaults leave out Cmd+Backspace, Ctrl+Backspace, Ctrl+Option+Backspace
+         * and Cmd+Option+Backspace, so the browser applies the system's own bindings to them.
          */
         delete: {
             hotkeys: {
@@ -22,8 +24,8 @@ declare module 'jodit/config' {
              * key, so the plugin no longer applies that particular behavior.
              * Available keys: `remove-unbreakable`, `remove-not-editable`,
              * `remove-char`, `table-cell`, `remove-empty-parent`,
-             * `remove-empty-neighbor`, `join-two-lists`, `join-neighbors`,
-             * `unwrap-first-list-item`.
+             * `remove-empty-neighbor`, `join-two-lists`, `unwrap-list-item`,
+             * `join-neighbors`, `unwrap-first-list-item`.
              *
              * ```javascript
              * Jodit.make('#editor', {

package/types/plugins/image-properties/image-properties.d.ts

@@ -52,6 +52,11 @@ export declare class imageProperties extends Plugin {
      * ```
      */
     protected open(): void | false;
+    /**
+     * Keys typed while the dialog is open must not reach the editor behind it,
+     * so focus the active tab's first field, or else the first field shown
+     */
+    private __focusFirstField;
     private __lock;
     private __unlock;
     /** @override **/