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

package/dist/index.js

@@ -3140,6 +3140,11 @@ import { isObject, debounce, isEqual, throttle } from 'lodash-es';
                 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,
@@ -3149,10 +3154,17 @@ import { isObject, debounce, isEqual, throttle } from 'lodash-es';
                     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++;
                     }
                 }
             }
@@ -7384,14 +7396,7 @@ function colorConfigToColorGridDefinitions(colorConfig) {
             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,
@@ -9686,14 +9691,7 @@ const FLOAT_VALUES_REG_EXP = /^(left|none|right)$/;
             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,