File tree Expand file tree Collapse file tree 5 files changed +34
-12
lines changed
projects/igniteui-angular/src/lib Expand file tree Collapse file tree 5 files changed +34
-12
lines changed Original file line number Diff line number Diff line change @@ -1436,10 +1436,14 @@ export class IgxGridForOfDirective<T> extends IgxForOfDirective<T> implements On
1436
1436
* @internal
1437
1437
*/
1438
1438
public get sizesCache ( ) : number [ ] {
1439
- if ( this . syncService . isMaster ( this ) ) {
1439
+ if ( this . igxForScrollOrientation === 'horizontal' ) {
1440
+ if ( this . syncService . isMaster ( this ) ) {
1441
+ return this . _sizesCache ;
1442
+ }
1443
+ return this . syncService . sizesCache ( this . igxForScrollOrientation ) ;
1444
+ } else {
1440
1445
return this . _sizesCache ;
1441
1446
}
1442
- return this . syncService . sizesCache ( this . igxForScrollOrientation ) ;
1443
1447
}
1444
1448
/**
1445
1449
* @hidden
@@ -1744,10 +1748,15 @@ export class IgxGridForOfDirective<T> extends IgxForOfDirective<T> implements On
1744
1748
* @hidden
1745
1749
*/
1746
1750
protected _calcMaxChunkSize ( ) : number {
1747
- if ( this . syncService . isMaster ( this ) ) {
1751
+ if ( this . igxForScrollOrientation === 'horizontal' ) {
1752
+ if ( this . syncService . isMaster ( this ) ) {
1753
+ return super . _calcMaxChunkSize ( ) ;
1754
+ }
1755
+ return this . syncService . chunkSize ( this . igxForScrollOrientation ) ;
1756
+ } else {
1748
1757
return super . _calcMaxChunkSize ( ) ;
1749
1758
}
1750
- return this . syncService . chunkSize ( this . igxForScrollOrientation ) ;
1759
+
1751
1760
}
1752
1761
}
1753
1762
Original file line number Diff line number Diff line change @@ -2931,7 +2931,7 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
2931
2931
@Inject ( IGX_GRID_SERVICE_BASE ) public gridAPI : GridServiceType ,
2932
2932
protected transactionFactory : IgxFlatTransactionFactory ,
2933
2933
private elementRef : ElementRef < HTMLElement > ,
2934
- private zone : NgZone ,
2934
+ protected zone : NgZone ,
2935
2935
@Inject ( DOCUMENT ) public document : any ,
2936
2936
public cdr : ChangeDetectorRef ,
2937
2937
protected resolver : ComponentFactoryResolver ,
@@ -6945,7 +6945,7 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
6945
6945
this . cdr . markForCheck ( ) ;
6946
6946
}
6947
6947
6948
- private verticalScrollHandler ( event ) {
6948
+ protected verticalScrollHandler ( event ) {
6949
6949
this . verticalScrollContainer . onScroll ( event ) ;
6950
6950
this . disableTransitions = true ;
6951
6951
Original file line number Diff line number Diff line change 26
26
[igxForContainerSize] ='calcHeight '
27
27
[igxForItemSize] ="hasColumnLayouts ? rowHeight * multiRowLayoutRowSize + 1 : renderedRowHeight "
28
28
#verticalRowDimScrollContainer >
29
- < igx-pivot-row-dimension-content role ='row ' class ="igx-grid-thead " [grid] ="this " [hasMRL] =" hasColumnLayouts "
29
+ < igx-pivot-row-dimension-content role ='row ' class ="igx-grid-thead " [grid] ="this "
30
30
[rowIndex] ='rowIndex ' [rowData] ='rowData '
31
- [density] ="displayDensity " [activeDescendant] =" activeDescendant " [ width] ="pivotRowWidths ">
31
+ [density] ="displayDensity " [width] ="pivotRowWidths ">
32
32
</ igx-pivot-row-dimension-content >
33
33
</ ng-template >
34
34
</ div >
Original file line number Diff line number Diff line change @@ -62,6 +62,7 @@ import { IFilteringExpressionsTree } from '../../data-operations/filtering-expre
62
62
import { IgxGridTransaction } from '../common/types' ;
63
63
import { SortingDirection } from '../../data-operations/sorting-strategy' ;
64
64
import { GridBaseAPIService } from '../api.service' ;
65
+ import { IgxGridForOfDirective } from '../../directives/for-of/for_of.directive' ;
65
66
66
67
let NEXT_ID = 0 ;
67
68
const MINIMUM_COLUMN_WIDTH = 200 ;
@@ -1030,6 +1031,18 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
1030
1031
return this . values . length > 1 ;
1031
1032
}
1032
1033
1034
+ /**
1035
+ * @hidden @internal
1036
+ */
1037
+ @ViewChild ( 'verticalRowDimScrollContainer' , { read : IgxGridForOfDirective , static : true } )
1038
+ public verticalRowDimScrollContainer : IgxGridForOfDirective < any > ;
1039
+
1040
+ protected verticalScrollHandler ( event ) {
1041
+ this . verticalRowDimScrollContainer . onScroll ( event ) ;
1042
+ super . verticalScrollHandler ( event ) ;
1043
+
1044
+ }
1045
+
1033
1046
/**
1034
1047
* @hidden
1035
1048
*/
Original file line number Diff line number Diff line change 1
1
< div role ="rowgroup " class ="igx-grid-thead__wrapper " [style.width.px] ="width "
2
- [attr.aria-activedescendant] =" activeDescendant " [ class.igx-grid__tr--mrl] ="hasMRL ">
2
+ [class.igx-grid__tr--mrl] ="hasMRL ">
3
3
< div class ="igx-grid__tr " role ="row " [style.width.px] ="width ">
4
4
< ng-template ngFor #headerVirtualContainer let-column
5
5
[ngForOf] ="rowDimension ">
15
15
16
16
< ng-template #headerTemplate let-column >
17
17
< div class ='igx-grid__tr--header igx-grid__row-indentation--level-{{getLevel(column)}} '
18
- (click ) ="this. selectPivotRow(column, $event) ">
19
- < igx-icon [attr.draggable] =" false " (click ) ="grid.toggleRow(getRowDimensionKey(column)) ">
18
+ (pointerdown ) ="selectPivotRow(column, $event) ">
19
+ < igx-icon [attr.draggable] =" false " (pointerdown ) ="grid.toggleRow(getRowDimensionKey(column)) ">
20
20
{{ getExpandState(column) ? 'expand_more' : 'chevron_right'}}</ igx-icon >
21
21
{{column.header}}
22
22
</ div >
25
25
< ng-template #headerDefaultTemplate let-column >
26
26
27
27
< div class ='igx-grid__tr--header igx-grid__row-indentation--level-{{getLevel(column)}} '
28
- (click ) ="this. selectPivotRow(column, $event) ">
28
+ (pointerdown ) ="selectPivotRow(column, $event) ">
29
29
< igx-icon style ='flex-shrink: 0; ' [attr.draggable] =" false ">
30
30
</ igx-icon >
31
31
{{column.header}}
You can’t perform that action at this time.
0 commit comments