jodit 3.9.2 → 3.9.3

package/.idea/workspace.xml

@@ -10,6 +10,19 @@
   <component name="ChangeListManager">
     <list default="true" id="5da7ff7f-03a8-49de-9fbb-8f8640d83b83" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/CHANGELOG.MD" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.MD" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/build/jodit.css" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/build/jodit.es2018.css" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/build/jodit.es2018.en.css" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/build/jodit.es2018.en.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/build/jodit.es2018.en.min.css" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/build/jodit.es2018.en.min.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/build/jodit.es2018.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/build/jodit.es2018.min.css" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/build/jodit.es2018.min.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/build/jodit.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/build/jodit.min.css" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/build/jodit.min.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/tests/acceptance/tableTest.js" beforeDir="false" afterPath="$PROJECT_DIR$/test/tests/acceptance/tableTest.js" afterDir="false" />
     </list>
     <list id="5049e1d4-15bc-4e3a-b46b-d2ce7537fc13" name="Revert &quot;Some small fixes&quot;" comment="Revert &quot;Some small fixes&quot;&#10;&#10;This reverts commit bc391ec6" />
     <option name="SHOW_DIALOG" value="false" />
@@ -715,28 +728,8 @@
       <workItem from="1634910036285" duration="662000" />
       <workItem from="1634943329348" duration="2687000" />
       <workItem from="1635075276233" duration="6076000" />
-      <workItem from="1635150885789" duration="60303000" />
-    </task>
-    <task id="LOCAL-00819" summary="In EventEmiter added mute/unmute/isMuted methods">
-      <created>1634313215564</created>
-      <option name="number" value="00819" />
-      <option name="presentableId" value="LOCAL-00819" />
-      <option name="project" value="LOCAL" />
-      <updated>1634313215564</updated>
-    </task>
-    <task id="LOCAL-00820" summary="Added static markTemporary isTemporary in Dom module">
-      <created>1634313334803</created>
-      <option name="number" value="00820" />
-      <option name="presentableId" value="LOCAL-00820" />
-      <option name="project" value="LOCAL" />
-      <updated>1634313334804</updated>
-    </task>
-    <task id="LOCAL-00821" summary="Misspeling">
-      <created>1634313348854</created>
-      <option name="number" value="00821" />
-      <option name="presentableId" value="LOCAL-00821" />
-      <option name="project" value="LOCAL" />
-      <updated>1634313348854</updated>
+      <workItem from="1635150885789" duration="62089000" />
+      <workItem from="1635274751066" duration="4725000" />
     </task>
     <task id="LOCAL-00822" summary="Allow use attr with dictionary">
       <created>1634313365187</created>
@@ -1060,7 +1053,28 @@
       <option name="project" value="LOCAL" />
       <updated>1635267402759</updated>
     </task>
-    <option name="localTasksCounter" value="868" />
+    <task id="LOCAL-00868" summary="Fixed tests in FF">
+      <created>1635267507492</created>
+      <option name="number" value="00868" />
+      <option name="presentableId" value="LOCAL-00868" />
+      <option name="project" value="LOCAL" />
+      <updated>1635267507492</updated>
+    </task>
+    <task id="LOCAL-00869" summary="Remove gitter">
+      <created>1635268743480</created>
+      <option name="number" value="00869" />
+      <option name="presentableId" value="LOCAL-00869" />
+      <option name="project" value="LOCAL" />
+      <updated>1635268743480</updated>
+    </task>
+    <task id="LOCAL-00870" summary="Fixed tables resizing">
+      <created>1635278972581</created>
+      <option name="number" value="00870" />
+      <option name="presentableId" value="LOCAL-00870" />
+      <option name="project" value="LOCAL" />
+      <updated>1635278972581</updated>
+    </task>
+    <option name="localTasksCounter" value="871" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1201,8 +1215,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Fixed work in IE11&#10;toolbar menus are almost not visible on IE11 #458&#10;Issue: https://github.com/xdan/jodit/issues/458" />
-    <MESSAGE value="Rename events-native to event-emitter" />
     <MESSAGE value="Fixed build system for child project" />
     <MESSAGE value="Rename events-native.ts to event-emitter.ts" />
     <MESSAGE value="ReBuild" />
@@ -1226,7 +1238,9 @@
     <MESSAGE value="Added test for issue https://github.com/xdan/jodit/issues/522" />
     <MESSAGE value="Goodbye Travis! You were a good helper" />
     <MESSAGE value="Fixed tests in FF" />
-    <option name="LAST_COMMIT_MESSAGE" value="Fixed tests in FF" />
+    <MESSAGE value="Remove gitter" />
+    <MESSAGE value="Fixed tables resizing" />
+    <option name="LAST_COMMIT_MESSAGE" value="Fixed tables resizing" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>

package/CHANGELOG.MD

@@ -9,6 +9,12 @@
 > -   :house: [Internal]
 > -   :nail_care: [Polish]
 
+## 3.9.3
+
+#### :boom: Breaking Change
+
+-   The style `table-layout: fixed` has been removed from tables. When inserting a table, the width of the columns is immediately set for it.
+
 ## 3.9.1
 
 #### :boom: Breaking Change
@@ -709,11 +715,11 @@ Related with https://github.com/xdan/jodit/issues/574. In some cases need to lim
 -   @property {number} link.selectSizeClassName=3 The size of the select (to use with modeClassName="select")
 -   @property {IUIOption[]} link.selectOptionsClassName=[] The list of the option for the select (to use with modeClassName="select")
 -   ex: [
--                                                             	{ value: "", text: "" },
--                                                             	{ value: "val1", text: "text1" },
--                                                             	{ value: "val2", text: "text2" },
--                                                             	{ value: "val3", text: "text3" }
--                                                             ]
+-                                                               	{ value: "", text: "" },
+-                                                               	{ value: "val1", text: "text1" },
+-                                                               	{ value: "val2", text: "text2" },
+-                                                               	{ value: "val3", text: "text3" }
+-                                                               ]
     PR: https://github.com/xdan/jodit/pull/577 Thanks @s-renier-taonix-fr
 
 ##### New option `statusbar: boolean = true`

package/README.md

@@ -6,7 +6,6 @@ An excellent WYSIWYG editor written in pure TypeScript without the use of additi
 [![Build Status](https://github.com/xdan/jodit/workflows/Run%20tests/badge.svg)](https://github.com/xdan/jodit/actions/workflows/tests.yml)
 [![npm version](https://badge.fury.io/js/jodit.svg)](https://badge.fury.io/js/jodit)
 [![npm](https://img.shields.io/npm/dm/jodit.svg)](https://www.npmjs.com/package/jodit)
-[![Gitter](https://badges.gitter.im/xdan/jodit.svg)](https://gitter.im/xdan/jodit?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
  * [Demo and Official site](https://xdsoft.net/jodit/)
  * [PRO Version](https://xdsoft.net/jodit/pro/)

package/build/jodit.css

@@ -1,14 +1,14 @@
 /*!
  * jodit - Jodit is awesome and usefully wysiwyg editor with filebrowser
  * Author: Chupurnov <chupurnov@gmail.com> (https://xdsoft.net/)
- * Version: v3.9.2
+ * Version: v3.9.3
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
 	/*!
  * jodit - Jodit is awesome and usefully wysiwyg editor with filebrowser
  * Author: Chupurnov <chupurnov@gmail.com> (https://xdsoft.net/)
- * Version: v3.9.2
+ * Version: v3.9.3
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -5391,7 +5391,6 @@ html.jodit_fullsize-box_true {
   margin-bottom: 1em;
   border-collapse: collapse;
   empty-cells: show;
-  table-layout: fixed;
 }
 .jodit-wysiwyg table tr {
   -webkit-user-select: none;

package/build/jodit.es2018.css

@@ -1,7 +1,7 @@
 /*!
  * jodit - Jodit is awesome and usefully wysiwyg editor with filebrowser
  * Author: Chupurnov <chupurnov@gmail.com> (https://xdsoft.net/)
- * Version: v3.9.2
+ * Version: v3.9.3
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -4497,7 +4497,6 @@ html.jodit_fullsize-box_true {
   margin-bottom: 1em;
   border-collapse: collapse;
   empty-cells: show;
-  table-layout: fixed;
 }
 .jodit-wysiwyg table tr {
   user-select: none;

package/build/jodit.es2018.en.css

@@ -1,7 +1,7 @@
 /*!
  * jodit - Jodit is awesome and usefully wysiwyg editor with filebrowser
  * Author: Chupurnov <chupurnov@gmail.com> (https://xdsoft.net/)
- * Version: v3.9.2
+ * Version: v3.9.3
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -4497,7 +4497,6 @@ html.jodit_fullsize-box_true {
   margin-bottom: 1em;
   border-collapse: collapse;
   empty-cells: show;
-  table-layout: fixed;
 }
 .jodit-wysiwyg table tr {
   user-select: none;

package/build/jodit.es2018.en.js

@@ -1,7 +1,7 @@
 /*!
  * jodit - Jodit is awesome and usefully wysiwyg editor with filebrowser
  * Author: Chupurnov <chupurnov@gmail.com> (https://xdsoft.net/)
- * Version: v3.9.2
+ * Version: v3.9.3
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -10567,7 +10567,7 @@ class View extends component/* Component */.wA {
         this.isView = true;
         this.mods = {};
         this.components = new Set();
-        this.version = "3.9.2";
+        this.version = "3.9.3";
         this.async = new Async();
         this.buffer = Storage.makeStorage();
         this.storage = Storage.makeStorage(true, this.componentName);
@@ -10665,10 +10665,10 @@ class View extends component/* Component */.wA {
         return this.__isFullSize;
     }
     getVersion() {
-        return "3.9.2";
+        return "3.9.3";
     }
     static getVersion() {
-        return "3.9.2";
+        return "3.9.3";
     }
     initOptions(options) {
         this.options = (0,helpers.ConfigProto)(options || {}, (0,helpers.ConfigProto)(this.options || {}, View.defaultOptions));
@@ -14690,6 +14690,7 @@ class StatusBar extends component/* ViewComponent */.Hr {
 
 
 
+const markedValue = new WeakMap();
 class Table extends component/* ViewComponent */.Hr {
     constructor() {
         super(...arguments);
@@ -14842,14 +14843,13 @@ class Table extends component/* ViewComponent */.Hr {
         const box = Table.formalMatrix(table);
         let dec;
         const row = table.rows[rowIndex];
-        (0,helpers.each)(box[rowIndex], (j, cell) => {
+        box[rowIndex].forEach((cell, j) => {
             dec = false;
             if (rowIndex - 1 >= 0 && box[rowIndex - 1][j] === cell) {
                 dec = true;
             }
             else if (box[rowIndex + 1] && box[rowIndex + 1][j] === cell) {
-                if (cell.parentNode === row &&
-                    cell.parentNode.nextSibling) {
+                if (cell.parentNode === row && cell.parentNode.nextSibling) {
                     dec = true;
                     let nextCell = j + 1;
                     while (box[rowIndex + 1][nextCell] === cell) {
@@ -14914,7 +14914,7 @@ class Table extends component/* ViewComponent */.Hr {
     static removeColumn(table, j) {
         const box = Table.formalMatrix(table);
         let dec;
-        (0,helpers.each)(box, (i, cells) => {
+        box.forEach((cells, i) => {
             const td = cells[j];
             dec = false;
             if (j - 1 >= 0 && box[i][j - 1] === td) {
@@ -14999,7 +14999,7 @@ class Table extends component/* ViewComponent */.Hr {
                     if (box[i][j] === undefined) {
                         continue;
                     }
-                    Table.__mark(box[i][j], 'colspan', box[i][j].colSpan - min + 1, __marked);
+                    Table.mark(box[i][j], 'colspan', box[i][j].colSpan - min + 1, __marked);
                 }
             }
         }
@@ -15021,7 +15021,7 @@ class Table extends component/* ViewComponent */.Hr {
                     if (box[i][j] === undefined) {
                         continue;
                     }
-                    Table.__mark(box[i][j], 'rowspan', box[i][j].rowSpan - min + 1, __marked);
+                    Table.mark(box[i][j], 'rowspan', box[i][j].rowSpan - min + 1, __marked);
                 }
             }
         }
@@ -15044,21 +15044,21 @@ class Table extends component/* ViewComponent */.Hr {
                 }
             }
         }
-        Table.__unmark(__marked);
+        Table.unmark(__marked);
     }
     static mergeSelected(table, jodit) {
         const html = [], bound = Table.getSelectedBound(table, Table.getSelectedCellsByTable(table));
         let w = 0, first = null, first_j = 0, td, cols = 0, rows = 0;
-        const __marked = [];
+        const alreadyMerged = new Set(), __marked = [];
         if (bound && (bound[0][0] - bound[1][0] || bound[0][1] - bound[1][1])) {
             Table.formalMatrix(table, (cell, i, j, cs, rs) => {
                 if (i >= bound[0][0] && i <= bound[1][0]) {
                     if (j >= bound[0][1] && j <= bound[1][1]) {
                         td = cell;
-                        if (td.__i_am_already_was) {
+                        if (alreadyMerged.has(td)) {
                             return;
                         }
-                        td.__i_am_already_was = true;
+                        alreadyMerged.add(td);
                         if (i === bound[0][0] && td.style.width) {
                             w += td.offsetWidth;
                         }
@@ -15076,7 +15076,7 @@ class Table extends component/* ViewComponent */.Hr {
                             first_j = j;
                         }
                         else {
-                            Table.__mark(td, 'remove', 1, __marked);
+                            Table.mark(td, 'remove', 1, __marked);
                             instance(jodit).removeSelection(td);
                         }
                     }
@@ -15086,23 +15086,23 @@ class Table extends component/* ViewComponent */.Hr {
             rows = bound[1][0] - bound[0][0] + 1;
             if (first) {
                 if (cols > 1) {
-                    Table.__mark(first, 'colspan', cols, __marked);
+                    Table.mark(first, 'colspan', cols, __marked);
                 }
                 if (rows > 1) {
-                    Table.__mark(first, 'rowspan', rows, __marked);
+                    Table.mark(first, 'rowspan', rows, __marked);
                 }
                 if (w) {
-                    Table.__mark(first, 'width', ((w / table.offsetWidth) * 100).toFixed(constants.ACCURACY) + '%', __marked);
+                    Table.mark(first, 'width', ((w / table.offsetWidth) * 100).toFixed(constants.ACCURACY) + '%', __marked);
                     if (first_j) {
                         Table.setColumnWidthByDelta(table, first_j, 0, true, __marked);
                     }
                 }
                 first.innerHTML = html.join('<br/>');
                 instance(jodit).addSelection(first);
-                delete first.__i_am_already_was;
-                Table.__unmark(__marked);
+                alreadyMerged.delete(first);
+                Table.unmark(__marked);
                 Table.normalizeTable(table);
-                (0,helpers.each)((0,helpers.toArray)(table.rows), (index, tr) => {
+                (0,helpers.toArray)(table.rows).forEach((tr, index) => {
                     if (!tr.cells.length) {
                         dom/* Dom.safeRemove */.i.safeRemove(tr);
                     }
@@ -15123,14 +15123,14 @@ class Table extends component/* ViewComponent */.Hr {
                     if (coord[0] === i &&
                         coord[1] !== j &&
                         tdElm !== cell) {
-                        Table.__mark(tdElm, 'rowspan', tdElm.rowSpan + 1, __marked);
+                        Table.mark(tdElm, 'rowspan', tdElm.rowSpan + 1, __marked);
                     }
                 });
                 dom/* Dom.after */.i.after(dom/* Dom.closest */.i.closest(cell, 'tr', table), tr);
                 tr.appendChild(td);
             }
             else {
-                Table.__mark(cell, 'rowspan', cell.rowSpan - 1, __marked);
+                Table.mark(cell, 'rowspan', cell.rowSpan - 1, __marked);
                 Table.formalMatrix(table, (tdElm, i, j) => {
                     if (i > coord[0] &&
                         i < coord[0] + cell.rowSpan &&
@@ -15151,9 +15151,9 @@ class Table extends component/* ViewComponent */.Hr {
                 }
             }
             if (cell.colSpan > 1) {
-                Table.__mark(td, 'colspan', cell.colSpan, __marked);
+                Table.mark(td, 'colspan', cell.colSpan, __marked);
             }
-            Table.__unmark(__marked);
+            Table.unmark(__marked);
             instance(jodit).removeSelection(cell);
         });
         this.normalizeTable(table);
@@ -15166,30 +15166,31 @@ class Table extends component/* ViewComponent */.Hr {
             if (cell.colSpan < 2) {
                 Table.formalMatrix(table, (tdElm, i, j) => {
                     if (coord[1] === j && coord[0] !== i && tdElm !== cell) {
-                        Table.__mark(tdElm, 'colspan', tdElm.colSpan + 1, __marked);
+                        Table.mark(tdElm, 'colspan', tdElm.colSpan + 1, __marked);
                     }
                 });
             }
             else {
-                Table.__mark(cell, 'colspan', cell.colSpan - 1, __marked);
+                Table.mark(cell, 'colspan', cell.colSpan - 1, __marked);
             }
             td = jodit.createInside.element('td');
             td.appendChild(jodit.createInside.element('br'));
             if (cell.rowSpan > 1) {
-                Table.__mark(td, 'rowspan', cell.rowSpan, __marked);
+                Table.mark(td, 'rowspan', cell.rowSpan, __marked);
             }
             const oldWidth = cell.offsetWidth;
             dom/* Dom.after */.i.after(cell, td);
             percentage = oldWidth / table.offsetWidth / 2;
-            Table.__mark(cell, 'width', (percentage * 100).toFixed(constants.ACCURACY) + '%', __marked);
-            Table.__mark(td, 'width', (percentage * 100).toFixed(constants.ACCURACY) + '%', __marked);
-            Table.__unmark(__marked);
+            Table.mark(cell, 'width', (percentage * 100).toFixed(constants.ACCURACY) + '%', __marked);
+            Table.mark(td, 'width', (percentage * 100).toFixed(constants.ACCURACY) + '%', __marked);
+            Table.unmark(__marked);
             instance(jodit).removeSelection(cell);
         });
         Table.normalizeTable(table);
     }
     static setColumnWidthByDelta(table, column, delta, noUnmark, marked) {
         const box = Table.formalMatrix(table);
+        let clearWidthIndex = 0;
         for (let i = 0; i < box.length; i += 1) {
             const cell = box[i][column];
             if (cell.colSpan > 1 && box.length > 1) {
@@ -15197,41 +15198,56 @@ class Table extends component/* ViewComponent */.Hr {
             }
             const w = cell.offsetWidth;
             const percent = ((w + delta) / table.offsetWidth) * 100;
-            Table.__mark(cell, 'width', percent.toFixed(constants.ACCURACY) + '%', marked);
+            Table.mark(cell, 'width', percent.toFixed(constants.ACCURACY) + '%', marked);
+            clearWidthIndex = i;
             break;
         }
+        for (let i = clearWidthIndex + 1; i < box.length; i += 1) {
+            const cell = box[i][column];
+            Table.mark(cell, 'width', null, marked);
+        }
         if (!noUnmark) {
-            Table.__unmark(marked);
+            Table.unmark(marked);
         }
     }
-    static __mark(cell, key, value, marked) {
+    static mark(cell, key, value, marked) {
+        var _a;
         marked.push(cell);
-        if (!cell.__marked_value) {
-            cell.__marked_value = {};
-        }
-        cell.__marked_value[key] = value === undefined ? 1 : value;
+        const dict = (_a = markedValue.get(cell)) !== null && _a !== void 0 ? _a : {};
+        dict[key] = value === undefined ? 1 : value;
+        markedValue.set(cell, dict);
     }
-    static __unmark(marked) {
+    static unmark(marked) {
         marked.forEach(cell => {
-            if (cell.__marked_value) {
-                (0,helpers.each)(cell.__marked_value, (key, value) => {
+            const dict = markedValue.get(cell);
+            if (dict) {
+                Object.keys(dict).forEach((key) => {
+                    const value = dict[key];
                     switch (key) {
                         case 'remove':
                             dom/* Dom.safeRemove */.i.safeRemove(cell);
                             break;
                         case 'rowspan':
-                            (0,helpers.attr)(cell, 'rowspan', value > 1 ? value : null);
+                            (0,helpers.attr)(cell, 'rowspan', (0,helpers.isNumber)(value) && value > 1 ? value : null);
                             break;
                         case 'colspan':
-                            (0,helpers.attr)(cell, 'colspan', value > 1 ? value : null);
+                            (0,helpers.attr)(cell, 'colspan', (0,helpers.isNumber)(value) && value > 1 ? value : null);
                             break;
                         case 'width':
-                            cell.style.width = value.toString();
+                            if (value == null) {
+                                cell.style.removeProperty('width');
+                                if (!(0,helpers.attr)(cell, 'style')) {
+                                    (0,helpers.attr)(cell, 'style', null);
+                                }
+                            }
+                            else {
+                                cell.style.width = value.toString();
+                            }
                             break;
                     }
-                    delete cell.__marked_value[key];
+                    delete dict[key];
                 });
-                delete cell.__marked_value;
+                markedValue.delete(cell);
             }
         });
     }
@@ -24741,6 +24757,7 @@ config/* Config.prototype.controls.table */.D.prototype.controls.table = {
                     if (!first_td) {
                         first_td = td;
                     }
+                    (0,helpers.css)(td, 'width', (100 / cols_count).toFixed(4) + '%');
                     td.appendChild(crt.element('br'));
                     tr.appendChild(crt.text('\n'));
                     tr.appendChild(crt.text('\t'));