@@ -1846,8 +1846,7 @@ export abstract class IgxGridBaseDirective implements GridType,
18461846
18471847 @HostBinding ( 'attr.aria-rowcount' )
18481848 protected get ariaRowCount ( ) : number {
1849- const totalRows = ( this as any ) . totalItemCount ?? this . data ?. length ?? 0 ;
1850- return ( this . paginator ? this . _totalRecords : totalRows ) + 1 ;
1849+ return this . _rendered ? this . _rowCount : null ;
18511850 }
18521851
18531852 /**
@@ -3309,6 +3308,7 @@ export abstract class IgxGridBaseDirective implements GridType,
33093308 private _sortDescendingHeaderIconTemplate : TemplateRef < IgxGridHeaderTemplateContext > = null ;
33103309 private _gridSize : Size = Size . Large ;
33113310 private _defaultRowHeight = 50 ;
3311+ private _rowCount : number ;
33123312
33133313 /**
33143314 * @hidden @internal
@@ -4130,6 +4130,7 @@ export abstract class IgxGridBaseDirective implements GridType,
41304130 if ( this . hasColumnsToAutosize ) {
41314131 this . autoSizeColumnsInView ( ) ;
41324132 }
4133+ this . _calculateRowCount ( ) ;
41334134 this . _rendered = true ;
41344135 } ) ;
41354136 Promise . resolve ( ) . then ( ( ) => this . rendered . next ( true ) ) ;
@@ -6772,6 +6773,7 @@ export abstract class IgxGridBaseDirective implements GridType,
67726773
67736774 this . initColumns ( this . _columns , ( col : IgxColumnComponent ) => this . columnInit . emit ( col ) ) ;
67746775 this . columnListDiffer . diff ( this . columnList ) ;
6776+ this . _calculateRowCount ( ) ;
67756777
67766778 this . columnList . changes
67776779 . pipe ( takeUntil ( this . destroy$ ) )
@@ -7995,4 +7997,15 @@ export abstract class IgxGridBaseDirective implements GridType,
79957997 return recreateTreeFromFields ( value , this . _columns ) as IFilteringExpressionsTree ;
79967998 }
79977999 }
8000+
8001+ private _calculateRowCount ( ) : void {
8002+ if ( this . verticalScrollContainer ?. isRemote ) {
8003+ this . _rowCount = this . verticalScrollContainer . totalItemCount ?? 0 ;
8004+ } else if ( this . paginator ) {
8005+ this . _rowCount = this . totalRecords ?? 0 ;
8006+ } else {
8007+ this . _rowCount = this . verticalScrollContainer ?. igxForOf ?. length ?? 0 ;
8008+ }
8009+ this . _rowCount += 1 ; // include header row
8010+ }
79988011}
0 commit comments