Merge branch 'master' into vslavov/expansion-panel-cancel-interaction

IgniteUI · Oct 6, 2020 · 5015ca0 · 5015ca0
2 parents b6ba3ce + 1598e52
commit 5015ca0
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts b/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts
@@ -4378,7 +4378,7 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
     public refreshGridState(args?) {
         this.endEdit(true);
         this.selectionService.clearHeaderCBState();
-        this.summaryService.clearSummaryCache(args);
+        this.summaryService.clearSummaryCache();
     }
 
     // TODO: We have return values here. Move them to event args ??

diff --git a/projects/igniteui-angular/src/lib/grids/grid.rowEdit.directive.ts b/projects/igniteui-angular/src/lib/grids/grid.rowEdit.directive.ts
@@ -1,28 +1,27 @@
 import { Directive, ElementRef, HostListener } from '@angular/core';
 import { GridBaseAPIService } from './api.service';
-import { GridType } from './common/grid.interface';
 
-/** @hidden */
+/** @hidden @internal */
 @Directive({
     selector: '[igxRowEdit]'
 })
 export class IgxRowEditTemplateDirective { }
 
-/** @hidden */
+/** @hidden @internal */
 @Directive({
     selector: '[igxRowEditText]'
 })
 export class IgxRowEditTextDirective { }
 
-/** @hidden */
+/** @hidden @internal */
 @Directive({
     selector: '[igxRowEditActions]'
 })
 export class IgxRowEditActionsDirective { }
 
 
 // TODO: Refactor circular ref, deps and logic
-/** @hidden */
+/** @hidden @internal */
 @Directive({
     selector: `[igxRowEditTabStop]`
 })

diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-add-row.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-add-row.spec.ts
@@ -3,7 +3,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { async, TestBed, fakeAsync } from '@angular/core/testing';
 import { configureTestSuite } from '../../test-utils/configure-suite';
 import { DebugElement } from '@angular/core';
-import { GridFunctions } from '../../test-utils/grid-functions.spec';
+import { GridFunctions, GridSummaryFunctions } from '../../test-utils/grid-functions.spec';
 import {
     IgxAddRowComponent
 } from '../../test-utils/grid-samples.spec';
@@ -14,6 +14,7 @@ import { IgxActionStripModule } from '../../action-strip/action-strip.module';
 import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec';
 
 describe('IgxGrid - Row Adding #grid', () => {
+        const SUMMARY_ROW = 'igx-grid-summary-row';
         let fixture;
         let grid: IgxGridComponent;
         let gridContent: DebugElement;
@@ -196,5 +197,21 @@ describe('IgxGrid - Row Adding #grid', () => {
              expect(rowOffsets.top >= gridOffsets.top && rowOffsets.bottom <= gridOffsets.bottom).toBeTruthy();
         });
 
+        it('should update summaries after row is added via the UI.', () => {
+            grid.getColumnByName('ID').hasSummary = true;
+            fixture.detectChanges();
+            let summaryRow = fixture.debugElement.query(By.css(SUMMARY_ROW));
+            GridSummaryFunctions.verifyColumnSummaries(summaryRow, 0, ['Count'], ['27']);
+
+            grid.rowList.first.beginAddRow();
+            fixture.detectChanges();
+
+            grid.endEdit(true);
+            fixture.detectChanges();
+
+            summaryRow = fixture.debugElement.query(By.css(SUMMARY_ROW));
+            GridSummaryFunctions.verifyColumnSummaries(summaryRow, 0, ['Count'], ['28']);
+        });
+
     });
 });
diff --git a/src/app/grid-add-row/grid-add-row.sample.html b/src/app/grid-add-row/grid-add-row.sample.html
@@ -19,6 +19,7 @@
             [pinned]="c.pinned"
             [hidden]="c.hidden"
             [groupable]='true'
+            [hasSummary]="true"
         >
         </igx-column>