Fixed null reference and layout issue

2sky · May 19, 2016 · 75dae34 · 75dae34
1 parent d121564
commit 75dae34
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/WebComponents/PersistentObjectGroup/persistent-object-group.ts b/src/WebComponents/PersistentObjectGroup/persistent-object-group.ts
@@ -176,8 +176,8 @@
 
                         groupX += item.width;
                         if (groupX >= this.columns) {
-                            if (rows[groupY].cells.some(cell => cell.rowSpan === 0)) {
-                                const totalRowHeight = Enumerable.from(rows[groupY].cells).max(cell => cell.rowSpan);
+                            if (rows[groupY].cells.some(cell => cell && cell.rowSpan === 0)) {
+                                const totalRowHeight = Enumerable.from(rows[groupY].cells.filter(c => !!c)).max(cell => cell.rowSpan);
                                 rows[groupY].cells.forEach(cell => {
                                     if (!cell.rowSpan)
                                         cell.rowSpan = totalRowHeight;
@@ -215,8 +215,10 @@
             rows.forEach(r => {
                 for (let i = columns - 1; i >= 0; i--) {
                     if (!r.cells[i])
-                        r.host.appendChild(document.createElement("td"));
+                        r.cells[i] = document.createElement("td");
                 }
+
+                r.cells.filter(c => !c.parentElement || c.parentElement === r.host).forEach(c => r.host.appendChild(c));
             });
 
             if (this._layout)