Skip to content

Commit 84b4fc2

Browse files
ddariboddaribo
authored
Merge branch 'vnext' into mkirkova/timepicker-toggle-sample
2 parents a47cf4e + 05c7cb5 commit 84b4fc2

11 files changed

Lines changed: 16 additions & 29 deletions

File tree

‎src/app/grid/grid-sample-pinning-both-sides/grid-toolbar-pinning-both-sides.component.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
>
1515
<igx-grid-toolbar>
1616
<igx-grid-toolbar-actions>
17-
<button igxButton="contained" (click)="unpinColumn()"> Unpin Column </button>
18-
<button igxButton="contained" (click)="pinLeft()"> Pin Left </button>
19-
<button igxButton="contained" (click)="pinRight()"> Pin Right </button>
17+
<button igxButton="contained" (click)="unpinColumn()"> Unpin Selected Columns </button>
18+
<button igxButton="contained" (click)="pinLeft()"> Pin Selected Left </button>
19+
<button igxButton="contained" (click)="pinRight()"> Pin Selected Right </button>
2020
</igx-grid-toolbar-actions>
2121
</igx-grid-toolbar>
2222

‎src/app/grid/grid-select/grid-select-sample.component.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
</igx-column>
44
<igx-column field="race" header="Race" [editable]="true">
55
<ng-template igxCellEditor let-cell="cell" let-value>
6-
<igx-select class="cell-select" [(ngModel)]="cell.editValue" [igxFocus]="true">
6+
<igx-select [(ngModel)]="cell.editValue" [igxFocus]="true">
77
@for (race of races; track race) {
88
<igx-select-item [value]="race">
99
{{ race }}
@@ -14,7 +14,7 @@
1414
</igx-column>
1515
<igx-column field="class" header="Class" [editable]="true">
1616
<ng-template igxCellEditor let-cell="cell" let-value>
17-
<igx-select class="cell-select" [(ngModel)]="cell.editValue" [igxFocus]="true">
17+
<igx-select [(ngModel)]="cell.editValue" [igxFocus]="true">
1818
@for (class of classes; track class) {
1919
<igx-select-item [value]="class">
2020
{{ class }}
@@ -27,7 +27,7 @@
2727
</igx-column>
2828
<igx-column field="alignment" header="Alignment" [editable]="true">
2929
<ng-template igxCellEditor let-cell="cell" let-value>
30-
<igx-select class="cell-select" [(ngModel)]="cell.editValue" [igxFocus]="true">
30+
<igx-select [(ngModel)]="cell.editValue" [igxFocus]="true">
3131
@for (alignment of alignments; track alignment) {
3232
<igx-select-item [value]="alignment">
3333
{{ alignment }}

‎src/app/grid/grid-select/grid-select-sample.component.scss‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,3 @@
22
display: block;
33
padding: 16px;
44
}
5-
6-
.cell-select {
7-
width: 100%;
8-
height: 100%;
9-
}

‎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/hierarchical-grid/hierarchical-grid-sample-both-sides-pinning/hierarchical-grid-both-sides-pinning.component.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<igx-grid-toolbar>
1414
<igx-grid-toolbar-title>Hierarchical Grid</igx-grid-toolbar-title>
1515
<igx-grid-toolbar-actions>
16-
<button igxButton="contained" (click)="unpinColumn()"> Unpin Column </button>
17-
<button igxButton="contained" (click)="pinLeft()"> Pin Left </button>
18-
<button igxButton="contained" (click)="pinRight()"> Pin Right </button>
16+
<button igxButton="contained" (click)="unpinColumn()"> Unpin Selected Columns </button>
17+
<button igxButton="contained" (click)="pinLeft()"> Pin Selected Left </button>
18+
<button igxButton="contained" (click)="pinRight()"> Pin Selected Right </button>
1919
</igx-grid-toolbar-actions>
2020
</igx-grid-toolbar>
2121

‎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)