Merge branch '13.1.x' into vkombov/fix-10619-13.1.x

IgniteUI · Mar 29, 2022 · fb46410 · fb46410
2 parents 9aa8639 + 1f896eb
commit fb46410
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/calendar/_calendar-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/calendar/_calendar-theme.scss
@@ -1126,7 +1126,7 @@
 ) {
     $header-year: map.get($categories, 'header-year');
     $header-date: map.get($categories, 'header-date');
-    $weekday-label: map.get($categories, 'weekday-labels');
+    $weekday-label: map.get($categories, 'weekday-label');
     $picker-date: map.get($categories, 'picker-date');
     $content: map.get($categories, 'content');
 

diff --git a/...niteui-angular/src/lib/core/styles/components/expansion-panel/_expansion-panel-theme.scss b/...niteui-angular/src/lib/core/styles/components/expansion-panel/_expansion-panel-theme.scss
@@ -245,7 +245,7 @@
 ) {
     $title: map.get($categories, 'title');
     $description: map.get($categories, 'description');
-    $body: map.get($categories, '$body');
+    $body: map.get($categories, 'body');
 
     %igx-expansion-panel__header-title {
         @include type-style($type-scale, $title) {

diff --git a/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts b/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts
@@ -5964,18 +5964,22 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
                 console.warn('The record cannot be added as a child to an unspecified record.');
                 return;
             }
-            index = 0;
+            index = null;
         } else {
             // find the index of the record with that PK
             index = this.gridAPI.get_rec_index_by_id(rowID, this.dataView);
-            rowID = index;
             if (index === -1) {
                 console.warn('No row with the specified ID was found.');
                 return;
             }
         }
+
+        this._addRowForIndex(index, asChild);
+    }
+
+    protected _addRowForIndex(index: number, asChild?: boolean) {
         if (!this.dataView.length) {
-            this.beginAddRowForIndex(rowID, asChild);
+            this.beginAddRowForIndex(index, asChild);
             return;
         }
         // check if the index is valid - won't support anything outside the data view
@@ -5987,13 +5991,13 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
                 this.verticalScrollContainer.chunkLoad
                     .pipe(first(), takeUntil(this.destroy$))
                     .subscribe(() => {
-                        this.beginAddRowForIndex(rowID, asChild);
+                        this.beginAddRowForIndex(index, asChild);
                     });
                 this.navigateTo(index);
                 this.notifyChanges(true);
                 return;
             }
-            this.beginAddRowForIndex(rowID, asChild);
+            this.beginAddRowForIndex(index, asChild);
         } else {
             console.warn('The row with the specified PK or index is outside of the current data view.');
         }
@@ -6014,7 +6018,7 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
         if (index === 0) {
             return this.beginAddRowById(null);
         }
-        return this.beginAddRowById(this.gridAPI.get_rec_id_by_index(index - 1, this.dataView));
+        return this._addRowForIndex(index - 1);
     }
 
     /**

diff --git a/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.ts b/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.ts
@@ -633,7 +633,7 @@ export class IgxTreeGridComponent extends IgxGridBaseDirective implements GridTy
         if (index === null || index < 0) {
             return this.beginAddRowById(null, asChild);
         }
-        return this.beginAddRowById(this.gridAPI.get_rec_id_by_index(index, this.dataView), asChild);
+        return this._addRowForIndex(index - 1, asChild);
     }
 
     /**