Skip to content

Commit 0154e75

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Add handling for treegrid and hierarchical grid.
1 parent b214e17 commit 0154e75

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.component.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@
9999
| visibleColumns:hasVisibleColumns
100100
| gridRowPinning:id:true:pipeTrigger
101101
| gridFiltering:filteringExpressionsTree:filterStrategy:advancedFilteringExpressionsTree:id:pipeTrigger:filteringPipeTrigger:true
102-
| gridSort:sortingExpressions:sortStrategy:id:pipeTrigger:true as pinnedData">
102+
| gridSort:sortingExpressions:sortStrategy:id:pipeTrigger:true
103+
| gridAddRow:true:pipeTrigger as pinnedData">
103104
<div #pinContainer *ngIf='pinnedData.length > 0' class='igx-grid__tr--pinned'
104105
[ngClass]="{ 'igx-grid__tr--pinned-bottom': !isRowPinningToTop, 'igx-grid__tr--pinned-top': isRowPinningToTop }"
105106
[style.width.px]='calcWidth'>
@@ -120,7 +121,7 @@
120121
| gridHierarchicalPaging:page:perPage:id:pipeTrigger
121122
| gridHierarchical:expansionStates:id:primaryKey:childLayoutKeys:pipeTrigger
122123
| gridRowPinning:id:false:pipeTrigger
123-
| gridAddRow:pipeTrigger"
124+
| gridAddRow:false:pipeTrigger"
124125
[igxForScrollOrientation]="'vertical'" [igxForScrollContainer]='verticalScroll'
125126
[igxForContainerSize]='calcHeight' [igxForItemSize]="renderedRowHeight" [igxForTrackBy]='trackChanges'
126127
#verticalScrollContainer (onChunkPreload)="dataLoading($event)">
@@ -136,8 +137,8 @@
136137
</igx-hierarchical-grid-row>
137138
</ng-template>
138139

139-
<ng-template #pinned_hierarchical_record_template let-rowIndex="index" let-rowData>
140-
<igx-hierarchical-grid-row [gridID]="id" [index]="rowIndex" [rowData]="rowData" #row #pinnedRow>
140+
<ng-template #pinned_hierarchical_record_template let-rowIndex="index" let-rowData let-isAddRow="addRow">
141+
<igx-hierarchical-grid-row [gridID]="id" [index]="rowIndex" [rowData]="rowData" [addRow]="isAddRow" #row #pinnedRow>
141142
</igx-hierarchical-grid-row>
142143
</ng-template>
143144
<ng-template #child_record_template let-rowIndex="index" let-rowData>

projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@
8181
| treeGridNormalizeRecord:pipeTrigger
8282
| gridRowPinning:id:true:pipeTrigger
8383
| treeGridFiltering:filteringExpressionsTree:filterStrategy:advancedFilteringExpressionsTree:id:pipeTrigger:filteringPipeTrigger:true
84-
| treeGridSorting:sortingExpressions:sortStrategy:id:pipeTrigger:true as pinnedData'>
84+
| treeGridSorting:sortingExpressions:sortStrategy:id:pipeTrigger:true
85+
| gridAddRow:true:pipeTrigger as pinnedData'>
8586
<div #pinContainer *ngIf='pinnedData.length > 0'
8687
[ngClass]="{
8788
'igx-grid__tr--pinned-bottom': !isRowPinningToTop,
@@ -106,7 +107,7 @@
106107
| treeGridPaging:page:perPage:id:pipeTrigger
107108
| treeGridSummary:hasSummarizedColumns:summaryCalculationMode:summaryPosition:showSummaryOnCollapse:id:pipeTrigger:summaryPipeTrigger
108109
| gridRowPinning:id:false:pipeTrigger
109-
| gridAddRow:pipeTrigger"
110+
| gridAddRow:false:pipeTrigger"
110111
let-rowIndex="index" [igxForScrollOrientation]="'vertical'" [igxForScrollContainer]='verticalScroll'
111112
[igxForContainerSize]='calcHeight' [igxForItemSize]="renderedRowHeight" #verticalScrollContainer>
112113
<ng-template [igxTemplateOutlet]='isSummaryRow(rowData) ? summary_template : record_template'
@@ -119,8 +120,8 @@
119120
<igx-tree-grid-row [gridID]="id" [index]="rowIndex" [treeRow]="rowData" [disabled]="disabledRow" [addRow]="isAddRow" #row>
120121
</igx-tree-grid-row>
121122
</ng-template>
122-
<ng-template #pinned_record_template let-rowIndex="index" let-rowData>
123-
<igx-tree-grid-row [gridID]="id" [index]="rowIndex" [treeRow]="rowData" #row #pinnedRow>
123+
<ng-template #pinned_record_template let-rowIndex="index" let-rowData let-isAddRow="addRow">
124+
<igx-tree-grid-row [gridID]="id" [index]="rowIndex" [treeRow]="rowData" [addRow]="isAddRow" #row #pinnedRow>
124125
</igx-tree-grid-row>
125126
</ng-template>
126127
<ng-template #summary_template let-rowIndex="index" let-rowData>

src/app/hierarchical-grid-add-row/hierarchical-grid-add-row.sample.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
(mouseover)="onMouseOver($event, hGrid, actionstrip)"
66
[rowEditable]="true">
77
<igx-action-strip #actionstrip>
8+
<igx-grid-pinning-actions></igx-grid-pinning-actions>
89
<igx-grid-editing-actions [addRow]="true"></igx-grid-editing-actions>
910
</igx-action-strip>
1011
<igx-row-island #island [key]="'childData'" [autoGenerate]="true"

src/app/tree-grid-add-row/tree-grid-add-row.sample.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
[minWidth]="c.minWidth" [maxWidth]="c.maxWidth">
1010
</igx-column>
1111
<igx-action-strip #actionstrip>
12+
<igx-grid-pinning-actions></igx-grid-pinning-actions>
1213
<igx-grid-editing-actions [addRow]="true" [addChild]='true'></igx-grid-editing-actions>
1314
</igx-action-strip>
1415
</igx-tree-grid>

0 commit comments

Comments
 (0)