Issue 128 - Fix to incorrect table layout with rowSpan and colSpan

Author: speedytwenty

src/layout-manager.js

@@ -5,9 +5,10 @@ const { ColSpanCell, RowSpanCell } = Cell;
 (function () {
   function layoutTable(table) {
     table.forEach(function (row, rowIndex) {
+      let prevCell = null;
       row.forEach(function (cell, columnIndex) {
         cell.y = rowIndex;
-        cell.x = columnIndex;
+        cell.x = prevCell ? prevCell.x + 1 : columnIndex;
         for (let y = rowIndex; y >= 0; y--) {
           let row2 = table[y];
           let xMax = y === rowIndex ? columnIndex : row2.length;
@@ -17,6 +18,7 @@ const { ColSpanCell, RowSpanCell } = Cell;
               cell.x++;
             }
           }
+          prevCell = cell;
         }
       });
     });

test/layout-manager-test.js

@@ -106,6 +106,48 @@ describe('layout-manager', function () {
       ]);
     });
 
+    it('complex layout 2', function () {
+      let table = [
+        [
+          { c: 'a', rowSpan: 3 },
+          { c: 'b', rowSpan: 2 },
+          { c: 'cd', colSpan: 2 },
+          { c: 'e', rowSpan: 2 },
+        ],
+        [{ c: 'c' }, { c: 'd' }],
+        [{ c: 'b' }, { c: 'c' }, { c: 'd' }, { c: 'e' }],
+        [{ c: 'a' }, { c: 'b' }, { c: 'c' }, { c: 'd' }, { c: 'e' }],
+      ];
+
+      layoutTable(table);
+
+      expect(table).toEqual([
+        [
+          { c: 'a', y: 0, x: 0, rowSpan: 3 },
+          { c: 'b', y: 0, x: 1, rowSpan: 2 },
+          { c: 'cd', y: 0, x: 2, colSpan: 2 },
+          { c: 'e', y: 0, x: 4, rowSpan: 2 },
+        ],
+        [
+          { c: 'c', y: 1, x: 2 },
+          { c: 'd', y: 1, x: 3 },
+        ],
+        [
+          { c: 'b', y: 2, x: 1 },
+          { c: 'c', y: 2, x: 2 },
+          { c: 'd', y: 2, x: 3 },
+          { c: 'e', y: 2, x: 4 },
+        ],
+        [
+          { c: 'a', y: 3, x: 0 },
+          { c: 'b', y: 3, x: 1 },
+          { c: 'c', y: 3, x: 2 },
+          { c: 'd', y: 3, x: 3 },
+          { c: 'e', y: 3, x: 4 },
+        ],
+      ]);
+    });
+
     it('maxWidth of single element', function () {
       let table = [[{}]];
       layoutTable(table);