@fundamental-ngx/platform 0.43.35 → 0.43.36

package/fesm2015/fundamental-ngx-platform-table.mjs

@@ -4103,6 +4103,7 @@ class TableComponent extends Table {
     }
     /** @hidden */
     onTableRowsChanged() {
+        this._reIndexTableRows();
         this._calculateVisibleTableRows();
         this._calculateCheckedAll();
     }
@@ -4174,7 +4175,17 @@ class TableComponent extends Table {
         }))
             .subscribe((items) => {
             items.forEach((rows, parentRow) => {
-                this._tableRows.splice(parentRow.index + parentRow.children.length + 1, 0, ...rows);
+                let nestedChildrenCount = 0;
+                function tallyNestedChildren(parent) {
+                    if (parent.children) {
+                        nestedChildrenCount = nestedChildrenCount + parent.children.length;
+                        parent.children.forEach((child) => {
+                            tallyNestedChildren(child);
+                        });
+                    }
+                }
+                tallyNestedChildren(parentRow);
+                this._tableRows.splice(parentRow.index + nestedChildrenCount + 1, 0, ...rows);
                 parentRow.children.push(...rows);
                 parentRow.lastChild = parentRow.children[parentRow.children.length - 1];
                 this._setTableRows(this._tableRows);
@@ -4299,7 +4310,6 @@ class TableComponent extends Table {
     _setTableRows(rows = this._dataSourceTableRows) {
         this._dataSourceTableRows = rows;
         this._tableRows = [...this._newTableRows, ...this._dataSourceTableRows];
-        this._reIndexTableRows();
         this.onTableRowsChanged();
         this._calculateIsShownNavigationColumn();
         this._rangeSelector.reset();