jodit 4.18.8 → 4.18.10

package/esm/plugins/backspace/cases/check-join-neighbors.js

@@ -11,6 +11,12 @@ import { getMoveFilter } from "../helpers.js";
  * @private
  */
 export function checkJoinNeighbors(jodit, fakeNode, backspace) {
+    return joinNeighbors(jodit, fakeNode, backspace, false);
+}
+/**
+ * `moved` is set on the one re-entrant pass after `moveToNextLine`
+ */
+function joinNeighbors(jodit, fakeNode, backspace, moved) {
     if (checkJoinBareText(jodit, fakeNode, backspace)) {
         return true;
     }
@@ -44,6 +50,16 @@ export function checkJoinNeighbors(jodit, fakeNode, backspace) {
             return true;
         }
         const box = findCaretBox(fakeNode, mainClosestBox);
+        // One pass only: the line now sits beside the next one, so the
+        // cases below join them. The DOM has changed either way
+        if (!moved &&
+            sibling &&
+            moveToNextLine(jodit, fakeNode, box, sibling, backspace)) {
+            if (!joinNeighbors(jodit, fakeNode, backspace, true)) {
+                jodit.s.setCursorBefore(fakeNode);
+            }
+            return true;
+        }
         if (sibling &&
             (checkPullNextLine(jodit, fakeNode, box, sibling, backspace) ||
                 checkMoveListContent(jodit, box, sibling, backspace) ||
@@ -109,6 +125,82 @@ function resolveTableSibling(sibling, backspace) {
     });
     return cells.length ? cells[backspace ? cells.length - 1 : 0] : null;
 }
+/**
+ * On Delete, Word joins two lines where the next one is, inside or outside
+ * its box or quote, and the joined line keeps the caret line's kind, list item
+ * or paragraph. Two paragraphs already join that way. When either line is a
+ * list item, this moves the caret's line beside the next one, and the usual
+ * cases then join them: `<p>one|</p><div><ul><li>two</li></ul></div>` becomes
+ * `<div><p>one|</p><ul><li>two</li></ul></div>`
+ * @private
+ */
+function moveToNextLine(jodit, fakeNode, box, sibling, backspace) {
+    if (backspace ||
+        Dom.isTag(sibling, 'table') ||
+        Dom.isTag(sibling, INSEPARABLE_TAGS) ||
+        !Dom.isContentEditable(sibling, jodit.editor)) {
+        return false;
+    }
+    const line = Dom.up(fakeNode, Dom.isBlock, box, true);
+    const next = findEdgeBlock(sibling, false, jodit.editor);
+    if (!line ||
+        !next ||
+        !Dom.isContentEditable(next, jodit.editor) ||
+        !(Dom.isLeaf(line) || Dom.isLeaf(next)) ||
+        // A paragraph inside a list item is left as it is
+        Dom.isLeaf(line.parentElement) ||
+        Dom.isLeaf(next.parentElement) ||
+        boxOf(line) === boxOf(next)) {
+        return false;
+    }
+    const from = line.parentElement;
+    if (Dom.isLeaf(line) && Dom.isLeaf(next)) {
+        Dom.before(next, line);
+    }
+    else if (Dom.isLeaf(line)) {
+        // A list item keeps its bullet, in a list of its own
+        Dom.before(next, ownList(line));
+    }
+    else {
+        // A paragraph can't go inside a list, so it goes in front of it
+        Dom.before(next.parentElement, line);
+    }
+    let remove = from;
+    while (remove && remove !== jodit.editor && Dom.isEmpty(remove)) {
+        const parent = remove.parentElement;
+        Dom.safeRemove(remove);
+        remove = parent;
+    }
+    return true;
+}
+/**
+ * The box or quote a line is in, past its lists
+ */
+function boxOf(line) {
+    let box = line.parentElement;
+    while (Dom.isList(box) || Dom.isLeaf(box)) {
+        box = box.parentElement;
+    }
+    return box;
+}
+/**
+ * Moves a list item into a list of its own, which carries on its numbering
+ */
+function ownList(item) {
+    const list = item.parentElement;
+    const own = list.cloneNode(false);
+    const index = Array.from(list.children).indexOf(item);
+    if (index) {
+        // Two lists cannot share one id
+        own.removeAttribute('id');
+        if (Dom.isTag(list, 'ol')) {
+            const start = parseInt(list.getAttribute('start') || '1', 10) || 1;
+            own.setAttribute('start', String(start + index));
+        }
+    }
+    Dom.append(own, item);
+    return own;
+}
 /**
  * Delete at the edge of a list pulls the next line up to the caret, as the
  * browsers do, instead of moving the caret's line into the next block:

package/esm/plugins/bold/config.js

@@ -6,11 +6,11 @@
 import { Config } from "../../config.js";
 Config.prototype.controls.subscript = {
     tags: ['sub'],
-    tooltip: 'subscript'
+    tooltip: 'Subscript'
 };
 Config.prototype.controls.superscript = {
     tags: ['sup'],
-    tooltip: 'superscript'
+    tooltip: 'Superscript'
 };
 Config.prototype.controls.bold = {
     tagRegExp: /^(strong|b)$/i,

package/package.json

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

package/types/langs/ar.d.ts

@@ -223,5 +223,6 @@ declare const _exports: {
     'Start at...': string;
     'Start numbering at': string;
     'Number for the first item': string;
+    Close: string;
 };
 export = _exports;

package/types/langs/az.d.ts

@@ -229,5 +229,6 @@ declare const _exports: {
     'Start at...': string;
     'Start numbering at': string;
     'Number for the first item': string;
+    Close: string;
 };
 export = _exports;

package/types/langs/cs_cz.d.ts

@@ -221,5 +221,6 @@ declare const _exports: {
     'Start at...': string;
     'Start numbering at': string;
     'Number for the first item': string;
+    Close: string;
 };
 export = _exports;

package/types/langs/de.d.ts

@@ -225,5 +225,6 @@ declare const _exports: {
     'Start at...': string;
     'Start numbering at': string;
     'Number for the first item': string;
+    Close: string;
 };
 export = _exports;

package/types/langs/es.d.ts

@@ -225,5 +225,6 @@ declare const _exports: {
     'Start at...': string;
     'Start numbering at': string;
     'Number for the first item': string;
+    Close: string;
 };
 export = _exports;

package/types/langs/fa.d.ts

@@ -220,5 +220,6 @@ declare const _exports: {
     'Start at...': string;
     'Start numbering at': string;
     'Number for the first item': string;
+    Close: string;
 };
 export = _exports;

package/types/langs/fi.d.ts

@@ -226,5 +226,6 @@ declare const _exports: {
     'Start at...': string;
     'Start numbering at': string;
     'Number for the first item': string;
+    Close: string;
 };
 export = _exports;

package/types/langs/fr.d.ts

@@ -220,5 +220,6 @@ declare const _exports: {
     'Start at...': string;
     'Start numbering at': string;
     'Number for the first item': string;
+    Close: string;
 };
 export = _exports;

package/types/langs/he.d.ts

@@ -220,5 +220,6 @@ declare const _exports: {
     'Start at...': string;
     'Start numbering at': string;
     'Number for the first item': string;
+    Close: string;
 };
 export = _exports;

package/types/langs/hu.d.ts

@@ -222,5 +222,6 @@ declare const _exports: {
     'Start at...': string;
     'Start numbering at': string;
     'Number for the first item': string;
+    Close: string;
 };
 export = _exports;

package/types/langs/id.d.ts

@@ -221,5 +221,6 @@ declare const _exports: {
     'Start at...': string;
     'Start numbering at': string;
     'Number for the first item': string;
+    Close: string;
 };
 export = _exports;

package/types/langs/it.d.ts

@@ -225,5 +225,6 @@ declare const _exports: {
     'Start at...': string;
     'Start numbering at': string;
     'Number for the first item': string;
+    Close: string;
 };
 export = _exports;

package/types/langs/ja.d.ts

@@ -225,5 +225,6 @@ declare const _exports: {
     'Start at...': string;
     'Start numbering at': string;
     'Number for the first item': string;
+    Close: string;
 };
 export = _exports;

package/types/langs/ko.d.ts

@@ -219,5 +219,6 @@ declare const _exports: {
     'Start at...': string;
     'Start numbering at': string;
     'Number for the first item': string;
+    Close: string;
 };
 export = _exports;

package/types/langs/mn.d.ts

@@ -220,5 +220,6 @@ declare const _exports: {
     'Start at...': string;
     'Start numbering at': string;
     'Number for the first item': string;
+    Close: string;
 };
 export = _exports;

package/types/langs/nl.d.ts

@@ -221,5 +221,6 @@ declare const _exports: {
     'Start at...': string;
     'Start numbering at': string;
     'Number for the first item': string;
+    Close: string;
 };
 export = _exports;

package/types/langs/no.d.ts

@@ -229,5 +229,6 @@ declare const _exports: {
     'Start at...': string;
     'Start numbering at': string;
     'Number for the first item': string;
+    Close: string;
 };
 export = _exports;

package/types/langs/pl.d.ts

@@ -220,5 +220,6 @@ declare const _exports: {
     'Start at...': string;
     'Start numbering at': string;
     'Number for the first item': string;
+    Close: string;
 };
 export = _exports;

package/types/langs/pt_br.d.ts

@@ -225,5 +225,6 @@ declare const _exports: {
     'Start at...': string;
     'Start numbering at': string;
     'Number for the first item': string;
+    Close: string;
 };
 export = _exports;

package/types/langs/ru.d.ts

@@ -219,5 +219,6 @@ declare const _exports: {
     'Start at...': string;
     'Start numbering at': string;
     'Number for the first item': string;
+    Close: string;
 };
 export = _exports;

package/types/langs/sk.d.ts

@@ -227,5 +227,6 @@ declare const _exports: {
     'Start at...': string;
     'Start numbering at': string;
     'Number for the first item': string;
+    Close: string;
 };
 export = _exports;

package/types/langs/sv.d.ts

@@ -228,5 +228,6 @@ declare const _exports: {
     'Start at...': string;
     'Start numbering at': string;
     'Number for the first item': string;
+    Close: string;
 };
 export = _exports;

package/types/langs/tr.d.ts

@@ -220,5 +220,6 @@ declare const _exports: {
     'Start at...': string;
     'Start numbering at': string;
     'Number for the first item': string;
+    Close: string;
 };
 export = _exports;

package/types/langs/ua.d.ts

@@ -219,5 +219,6 @@ declare const _exports: {
     'Start at...': string;
     'Start numbering at': string;
     'Number for the first item': string;
+    Close: string;
 };
 export = _exports;

package/types/langs/zh_cn.d.ts

@@ -221,5 +221,6 @@ declare const _exports: {
     'Start at...': string;
     'Start numbering at': string;
     'Number for the first item': string;
+    Close: string;
 };
 export = _exports;

package/types/langs/zh_tw.d.ts

@@ -220,5 +220,6 @@ declare const _exports: {
     'Start at...': string;
     'Start numbering at': string;
     'Number for the first item': string;
+    Close: string;
 };
 export = _exports;