@ckeditor/ckeditor5-table 42.0.2 → 43.0.0-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-table",
-  "version": "42.0.2",
+  "version": "43.0.0-alpha.0",
   "description": "Table feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -13,13 +13,13 @@
   "type": "module",
   "main": "src/index.js",
   "dependencies": {
-    "ckeditor5": "42.0.2",
-    "@ckeditor/ckeditor5-clipboard": "42.0.2",
-    "@ckeditor/ckeditor5-core": "42.0.2",
-    "@ckeditor/ckeditor5-engine": "42.0.2",
-    "@ckeditor/ckeditor5-ui": "42.0.2",
-    "@ckeditor/ckeditor5-utils": "42.0.2",
-    "@ckeditor/ckeditor5-widget": "42.0.2",
+    "ckeditor5": "43.0.0-alpha.0",
+    "@ckeditor/ckeditor5-clipboard": "43.0.0-alpha.0",
+    "@ckeditor/ckeditor5-core": "43.0.0-alpha.0",
+    "@ckeditor/ckeditor5-engine": "43.0.0-alpha.0",
+    "@ckeditor/ckeditor5-ui": "43.0.0-alpha.0",
+    "@ckeditor/ckeditor5-utils": "43.0.0-alpha.0",
+    "@ckeditor/ckeditor5-widget": "43.0.0-alpha.0",
     "lodash-es": "4.17.21"
   },
   "author": "CKSource (http://cksource.com/)",

package/src/tablecellproperties/ui/tablecellpropertiesview.js

@@ -167,14 +167,7 @@ export default class TableCellPropertiesView extends View {
         });
         // Maintain continuous focus cycling over views that have focusable children and focus cyclers themselves.
         [this.borderColorInput, this.backgroundInput].forEach(view => {
-            view.fieldView.focusCycler.on('forwardCycle', evt => {
-                this._focusCycler.focusNext();
-                evt.stop();
-            });
-            view.fieldView.focusCycler.on('backwardCycle', evt => {
-                this._focusCycler.focusPrevious();
-                evt.stop();
-            });
+            this._focusCycler.chain(view.fieldView.focusCycler);
         });
         [
             this.borderStyleDropdown,

package/src/tableproperties/ui/tablepropertiesview.js

@@ -149,14 +149,7 @@ export default class TablePropertiesView extends View {
         });
         // Maintain continuous focus cycling over views that have focusable children and focus cyclers themselves.
         [this.borderColorInput, this.backgroundInput].forEach(view => {
-            view.fieldView.focusCycler.on('forwardCycle', evt => {
-                this._focusCycler.focusNext();
-                evt.stop();
-            });
-            view.fieldView.focusCycler.on('backwardCycle', evt => {
-                this._focusCycler.focusPrevious();
-                evt.stop();
-            });
+            this._focusCycler.chain(view.fieldView.focusCycler);
         });
         [
             this.borderStyleDropdown,

package/src/tableutils.js

@@ -595,6 +595,11 @@ export default class TableUtils extends Plugin {
                 if (colspan > 1) {
                     newCellsAttributes.colspan = colspan;
                 }
+                // Accumulator that stores distance from the last inserted cell span.
+                // It helps with evenly splitting larger cell spans (for example 10 cells collapsing into 3 cells).
+                // We split these cells into 3, 3, 4 cells and we have to call `createCells` only when distance between
+                // these cells is equal or greater than the new cells span size.
+                let distanceFromLastCellSpan = 0;
                 for (const tableSlot of tableMap) {
                     const { column, row } = tableSlot;
                     // As both newly created cells and the split cell might have rowspan,
@@ -604,10 +609,17 @@ export default class TableUtils extends Plugin {
                     const isAfterSplitCell = row >= splitCellRow + updatedSpan;
                     // 2. Is on the same column.
                     const isOnSameColumn = column === cellColumn;
-                    // 3. And it's row index is after previous cell height.
-                    const isInEvenlySplitRow = (row + splitCellRow + updatedSpan) % newCellsSpan === 0;
-                    if (isAfterSplitCell && isOnSameColumn && isInEvenlySplitRow) {
-                        createCells(1, writer, tableSlot.getPositionBefore(), newCellsAttributes);
+                    // Reset distance from the last cell span if we are on the same column and we exceeded the new cells span size.
+                    if (distanceFromLastCellSpan >= newCellsSpan && isOnSameColumn) {
+                        distanceFromLastCellSpan = 0;
+                    }
+                    if (isAfterSplitCell && isOnSameColumn) {
+                        // Create new cells only if the distance from the last cell span is equal or greater than the new cells span.
+                        if (!distanceFromLastCellSpan) {
+                            createCells(1, writer, tableSlot.getPositionBefore(), newCellsAttributes);
+                        }
+                        // Increase the distance from the last cell span.
+                        distanceFromLastCellSpan++;
                     }
                 }
             }