Skip to content

Commit daf18b7

Browse files
authored
fix(grids): adjust cell merging sample heights (#3762)
1 parent f9954df commit daf18b7

6 files changed

Lines changed: 4 additions & 12 deletions

File tree

src/app/hierarchical-grid/hierarchical-grid-cell-merge-custom/hierarchical-grid-cell-merge-custom.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="grid__wrapper">
22
<igx-hierarchical-grid [igxPreventDocumentScroll]="true" #hGrid [data]="localData" [moving]="true" [sortingExpressions]="sortExpr"
3-
[cellMergeMode]="cellMergeMode" [mergeStrategy]="perCountryMergeStrategy" [height]="'740px'" [width]="'100%'" [allowFiltering]="true" >
3+
[cellMergeMode]="cellMergeMode" [mergeStrategy]="perCountryMergeStrategy" [height]="'400px'" [width]="'100%'" [allowFiltering]="true" >
44
<igx-column field="CompanyName" [sortable]="true" [resizable]="true" [editable]="true"></igx-column>
55
<igx-column field="ContactName" [sortable]="true" [resizable]="true" [editable]="true"></igx-column>
66
<igx-column field="ContactTitle" [sortable]="true" [resizable]="true" [merge]="true" [editable]="true"></igx-column>

src/app/hierarchical-grid/hierarchical-grid-cell-merge-custom/hierarchical-grid-cell-merge-custom.component.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ import { FormsModule } from '@angular/forms';
1717
IgxPreventDocumentScrollDirective,
1818
IgxColumnComponent,
1919
IgxRowIslandComponent,
20-
IgxGridToolbarComponent,
21-
IgxSelectComponent,
22-
IgxSelectItemComponent,
23-
IgxLabelDirective,
2420
FormsModule
2521
]
2622
})

src/app/hierarchical-grid/hierarchical-grid-cell-merge/hierarchical-grid-cell-merge.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="grid__wrapper">
22
<igx-hierarchical-grid [igxPreventDocumentScroll]="true" #hGrid [data]="localData" [moving]="true" [sortingExpressions]="sortExpr"
3-
[cellMergeMode]="cellMergeMode" [height]="'740px'" [width]="'100%'" [allowFiltering]="true" >
3+
[cellMergeMode]="cellMergeMode" [height]="'450px'" [width]="'100%'" [allowFiltering]="true" >
44
<igx-grid-toolbar>
55
<igx-select [(ngModel)]="cellMergeMode">
66
<label igxLabel>Select Merge Type Root</label>

src/app/tree-grid/tree-grid-cell-merge-custom-sample/tree-grid-cell-merge-custom-sample.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="grid__wrapper">
2-
<igx-tree-grid #treeGrid [igxPreventDocumentScroll]="true" [data]="data" width="100%" height="800px"
2+
<igx-tree-grid #treeGrid [igxPreventDocumentScroll]="true" [data]="data" width="100%" height="720px"
33
[sortingExpressions]="sortExpr" [autoGenerate]="false" primaryKey="ID" foreignKey="ParentID"
44
[cellMergeMode]="cellMergeMode" [mergeStrategy]="mergeStrategy">
55
<igx-column [field]="'Name'" dataType="string" width="250px" [editable]="true"></igx-column>

src/app/tree-grid/tree-grid-cell-merge-custom-sample/tree-grid-cell-merge-custom-sample.component.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ import { generateEmployeeDetailedFlatData2 } from '../data/employees-flat-detail
1616
IgxTreeGridComponent,
1717
IgxPreventDocumentScrollDirective,
1818
IgxColumnComponent,
19-
IgxSelectComponent,
20-
IgxSelectItemComponent,
21-
IgxLabelDirective,
22-
IgxGridToolbarComponent,
2319
FormsModule
2420
]
2521
})

src/app/tree-grid/tree-grid-cell-merge-sample/tree-grid-cell-merge-sample.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="grid__wrapper">
2-
<igx-tree-grid #treeGrid [igxPreventDocumentScroll]="true" [data]="data" width="100%" height="800px"
2+
<igx-tree-grid #treeGrid [igxPreventDocumentScroll]="true" [data]="data" width="100%" height="720px"
33
[sortingExpressions]="sortExpr" [autoGenerate]="false" primaryKey="ID" foreignKey="ParentID"
44
[cellMergeMode]="cellMergeMode" [mergeStrategy]="mergeStrategy">
55
<igx-grid-toolbar>

0 commit comments

Comments
 (0)