Skip to content

Commit bb0fc24

Browse files
kdinevkdinev
authored
Merge pull request #2982 from IgniteUI/mkirova/set-ri-heights
Set null height for row islands so that they have consistent size in …
2 parents 1a45eb2 + a26c1a8 commit bb0fc24

File tree

79 files changed

+212
-212
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+212
-212
lines changed

‎projects/app-lob/src/app/hierarchical-grid/hierarchical-grid-column-resizing/hierarchical-grid-resizing.component.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,20 @@
2424
</ng-template>
2525
</igx-column>
2626

27-
<igx-row-island [key]="'Albums'" [autoGenerate]="false">
27+
<igx-row-island [height]="null" [key]="'Albums'" [autoGenerate]="false">
2828
<igx-column field="Album" [resizable]="true"></igx-column>
2929
<igx-column field="LaunchDate" header="Launch Date" [resizable]="true" [dataType]="'date'"></igx-column>
3030
<igx-column field="BillboardReview" header="Billboard Review" [resizable]="true"></igx-column>
3131
<igx-column field="USBillboard200" header="US Billboard 200" [resizable]="true"></igx-column>
32-
<igx-row-island [key]="'Songs'" [autoGenerate]="false">
32+
<igx-row-island [height]="null" [key]="'Songs'" [autoGenerate]="false">
3333
<igx-column field="Number" header="No." [resizable]="true"></igx-column>
3434
<igx-column field="Title" [resizable]="true"></igx-column>
3535
<igx-column field="Released" dataType="date" [resizable]="true"></igx-column>
3636
<igx-column field="Genre" [resizable]="true"></igx-column>
3737
</igx-row-island>
3838
</igx-row-island>
3939

40-
<igx-row-island [key]="'Tours'" [autoGenerate]="false">
40+
<igx-row-island [height]="null" [key]="'Tours'" [autoGenerate]="false">
4141
<igx-column field="Tour" [resizable]="true"></igx-column>
4242
<igx-column field="StartedOn" header="Started on" [resizable]="true"></igx-column>
4343
<igx-column field="Location" [resizable]="true"></igx-column>

‎src/app/hierarchical-grid/column-group-selection/hierarchical-grid-column-group-selection.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</igx-column-group>
2323
</igx-column-group>
2424

25-
<igx-row-island [key]="'Orders'" [autoGenerate]="false" columnSelection="multi">
25+
<igx-row-island [height]="null" [key]="'Orders'" [autoGenerate]="false" columnSelection="multi">
2626
<igx-column-group header="Order Information">
2727
<igx-column-group header="Order Details">
2828
<igx-column field="OrderID"></igx-column>
@@ -43,7 +43,7 @@
4343
<igx-column field="ShipCountry"></igx-column>
4444
</igx-column-group>
4545
</igx-column-group>
46-
<igx-row-island [key]="'OrderDetails'" [autoGenerate]="false" columnSelection="single">
46+
<igx-row-island [height]="null" [key]="'OrderDetails'" [autoGenerate]="false" columnSelection="single">
4747
<igx-column field="ProductID" ></igx-column>
4848
<igx-column field="UnitPrice"></igx-column>
4949
<igx-column field="Quantity" [selectable]="false"></igx-column>

‎src/app/hierarchical-grid/column-selection-styles/hierarchical-grid-column-selection-styles.component.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@
1212
<igx-column field="Debut" dataType="number" [formatter]="formatter" [selectable]="false"></igx-column>
1313
<igx-column field="GrammyNominations" header="Grammy Nominations"></igx-column>
1414
<igx-column field="GrammyAwards" header="Grammy Awards"></igx-column>
15-
<igx-row-island [key]="'Albums'" [autoGenerate]="false" columnSelection='multiple'>
15+
<igx-row-island [height]="null" [key]="'Albums'" [autoGenerate]="false" columnSelection='multiple'>
1616
<igx-column field="Album"></igx-column>
1717
<igx-column field="LaunchDate" header="Launch Date" [dataType]="'date'" [selectable]="false"></igx-column>
1818
<igx-column field="BillboardReview" header="Billboard Review"></igx-column>
1919
<igx-column field="USBillboard200" header="US Billboard 200"></igx-column>
20-
<igx-row-island [key]="'Songs'" [autoGenerate]="false" columnSelection='multiple'>
20+
<igx-row-island [height]="null" [key]="'Songs'" [autoGenerate]="false" columnSelection='multiple'>
2121
<igx-column field="Number" header="No."></igx-column>
2222
<igx-column field="Title"></igx-column>
2323
<igx-column field="Released" dataType="date" [selectable]="false"></igx-column>
2424
<igx-column field="Genre"></igx-column>
2525
</igx-row-island>
2626
</igx-row-island>
27-
<igx-row-island [key]="'Tours'" [autoGenerate]="false" columnSelection="single">
27+
<igx-row-island [height]="null" [key]="'Tours'" [autoGenerate]="false" columnSelection="single">
2828
<igx-column field="Tour" [selectable]="false"></igx-column>
2929
<igx-column field="StartedOn" header="Started on" [selectable]="false"></igx-column>
3030
<igx-column field="Location" [selectable]="false"></igx-column>

‎src/app/hierarchical-grid/column-selection/hierarchical-grid-column-selection.component.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@
2323
<igx-column field="Debut" dataType="number" [formatter]="formatter" [selectable]="false"></igx-column>
2424
<igx-column field="GrammyNominations" header="Grammy Nominations"></igx-column>
2525
<igx-column field="GrammyAwards" header="Grammy Awards"></igx-column>
26-
<igx-row-island [key]="'Albums'" [autoGenerate]="false" [columnSelection]="currentColumnSelection">
26+
<igx-row-island [height]="null" [key]="'Albums'" [autoGenerate]="false" [columnSelection]="currentColumnSelection">
2727
<igx-column field="Album"></igx-column>
2828
<igx-column field="LaunchDate" header="Launch Date" [dataType]="'date'" [selectable]="false"></igx-column>
2929
<igx-column field="BillboardReview" header="Billboard Review"></igx-column>
3030
<igx-column field="USBillboard200" header="US Billboard 200"></igx-column>
31-
<igx-row-island [key]="'Songs'" [autoGenerate]="false" [columnSelection]="currentColumnSelection">
31+
<igx-row-island [height]="null" [key]="'Songs'" [autoGenerate]="false" [columnSelection]="currentColumnSelection">
3232
<igx-column field="Number" header="No."></igx-column>
3333
<igx-column field="Title"></igx-column>
3434
<igx-column field="Released" dataType="date" [selectable]="false"></igx-column>
3535
<igx-column field="Genre"></igx-column>
3636
</igx-row-island>
3737
</igx-row-island>
38-
<igx-row-island [key]="'Tours'" [autoGenerate]="false" [columnSelection]="currentColumnSelection">
38+
<igx-row-island [height]="null" [key]="'Tours'" [autoGenerate]="false" [columnSelection]="currentColumnSelection">
3939
<igx-column field="Tour" [selectable]="false"></igx-column>
4040
<igx-column field="StartedOn" header="Started on" [selectable]="false"></igx-column>
4141
<igx-column field="Location" [selectable]="false"></igx-column>

‎src/app/hierarchical-grid/hgrid-editing-lifecycle-sample/hgrid-editing-lifecycle.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<igx-column field="GrammyNominations" header="Grammy Nominations" dataType="number"></igx-column>
2626
<igx-column field="GrammyAwards" header="Grammy Awards" dataType="number"></igx-column>
2727

28-
<igx-row-island key="Albums" primaryKey="Album" [autoGenerate]="false"
28+
<igx-row-island [height]="null" key="Albums" primaryKey="Album" [autoGenerate]="false"
2929
rowEditable="true"
3030
(rowEditEnter)="rowEditEnter($event)"
3131
(cellEditEnter)="cellEditEnter($event)"

‎src/app/hierarchical-grid/hgrid-keybarod-nav-guide-sample/hgrid-keyboard-guide.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</igx-column-group>
3030
</igx-column-group>
3131

32-
<igx-row-island [key]="'Orders'" [autoGenerate]="false" columnSelection="multi" (gridCreated)="onGridCreated($event)" (activeNodeChange)="onActiveNodeChange($event)" [allowAdvancedFiltering]="true" [allowFiltering]="true" [filterMode]="'excelStyleFilter'">
32+
<igx-row-island [height]="null" [key]="'Orders'" [autoGenerate]="false" columnSelection="multi" (gridCreated)="onGridCreated($event)" (activeNodeChange)="onActiveNodeChange($event)" [allowAdvancedFiltering]="true" [allowFiltering]="true" [filterMode]="'excelStyleFilter'">
3333
<igx-grid-toolbar [grid]="childGrid" *igxGridToolbar="let childGrid"></igx-grid-toolbar>
3434

3535
<igx-column-group header="Order Information">
@@ -52,7 +52,7 @@
5252
<igx-column field="ShipCountry"></igx-column>
5353
</igx-column-group>
5454
</igx-column-group>
55-
<igx-row-island [key]="'OrderDetails'" [autoGenerate]="false" columnSelection="single" (gridCreated)="onGridCreated($event)" [allowAdvancedFiltering]="true" [allowFiltering]="true" [filterMode]="'excelStyleFilter'" (activeNodeChange)="onActiveNodeChange($event)">
55+
<igx-row-island [height]="null" [key]="'OrderDetails'" [autoGenerate]="false" columnSelection="single" (gridCreated)="onGridCreated($event)" [allowAdvancedFiltering]="true" [allowFiltering]="true" [filterMode]="'excelStyleFilter'" (activeNodeChange)="onActiveNodeChange($event)">
5656
<igx-grid-toolbar [grid]="childGrid" *igxGridToolbar="let childGrid"></igx-grid-toolbar>
5757

5858
<igx-column [editable]="true" [sortable]="true" field="ProductID" ></igx-column>

‎src/app/hierarchical-grid/hgrid-rowClasses-sample/hgrid-rowClasses.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
</ng-template>
1818
</igx-column>
1919

20-
<igx-row-island [key]="'Albums'" [autoGenerate]="false">
20+
<igx-row-island [height]="null" [key]="'Albums'" [autoGenerate]="false">
2121
<igx-column field="Album" [editable]="true" [dataType]="'string'"></igx-column>
2222
<igx-column field="LaunchDate" header="Launch Date" [editable]="true" [dataType]="'date'"></igx-column>
2323
<igx-column field="BillboardReview" header="Billboard Review" [editable]="true" dataType="number"></igx-column>
2424
<igx-column field="USBillboard200" header="US Billboard 200" [editable]="true" dataType="number"></igx-column>
25-
<igx-row-island [key]="'Songs'" [autoGenerate]="false">
25+
<igx-row-island [height]="null" [key]="'Songs'" [autoGenerate]="false">
2626
<igx-column field="Number" header="No." [editable]="true" dataType="number"></igx-column>
2727
<igx-column field="Title" [editable]="true" [dataType]="'string'"></igx-column>
2828
<igx-column field="Released" [editable]="true" [dataType]="'date'"></igx-column>

‎src/app/hierarchical-grid/hgrid-rowStyle-sample/hgrid-rowStyles.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
</ng-template>
1818
</igx-column>
1919

20-
<igx-row-island [key]="'Albums'" [autoGenerate]="false" [rowStyles]="childRowStyles">
20+
<igx-row-island [height]="null" [key]="'Albums'" [autoGenerate]="false" [rowStyles]="childRowStyles">
2121
<igx-column field="Album" [editable]="true" [dataType]="'string'"></igx-column>
2222
<igx-column field="LaunchDate" header="Launch Date" [editable]="true" [dataType]="'date'"></igx-column>
2323
<igx-column field="BillboardReview" header="Billboard Review" [editable]="true" dataType="number"></igx-column>
2424
<igx-column field="USBillboard200" header="US Billboard 200" [editable]="true" dataType="number"></igx-column>
25-
<igx-row-island [key]="'Songs'" [autoGenerate]="false">
25+
<igx-row-island [height]="null" [key]="'Songs'" [autoGenerate]="false">
2626
<igx-column field="Number" header="No." [editable]="true" dataType="number"></igx-column>
2727
<igx-column field="Title" [editable]="true" [dataType]="'string'"></igx-column>
2828
<igx-column field="Released" [editable]="true" [dataType]="'date'"></igx-column>

‎src/app/hierarchical-grid/hgrid-summary-template/hgrid-summary-template.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<igx-column field="GrammyAwards" header="Grammy Awards" [hasSummary]='hasSummary' [dataType]="'number'"
3434
[summaries]="numberSummary"></igx-column>
3535

36-
<igx-row-island [key]="'Albums'" [summaryRowHeight]="summaryHeight">
36+
<igx-row-island [height]="null" [key]="'Albums'" [summaryRowHeight]="summaryHeight">
3737
<igx-column field="Album" [hasSummary]='hasSummary'></igx-column>
3838
<igx-column field="LaunchDate" header="Launch Date" [hasSummary]='hasSummary' [dataType]="'date'">
3939
<ng-template igxSummary let-summaryResults>
@@ -45,7 +45,7 @@
4545
</igx-column>
4646
<igx-column field="BillboardReview" header="Billboard Review" [hasSummary]='hasSummary'></igx-column>
4747
<igx-column field="USBillboard200" header="US Billboard 200" [hasSummary]='hasSummary'></igx-column>
48-
<igx-row-island [key]="'Songs'">
48+
<igx-row-island [height]="null" [key]="'Songs'">
4949
<igx-column field="Number" header="No." [hasSummary]='hasSummary'></igx-column>
5050
<igx-column field="Title" [hasSummary]='hasSummary'></igx-column>
5151
<igx-column field="Released" dataType="date" [hasSummary]='hasSummary'></igx-column>

‎src/app/hierarchical-grid/hierarchical-grid-action-strip/hierarchical-grid-action-strip-sample.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@
1313
<igx-column field="GrammyNominations" header="Grammy Nominations" [sortable]="true" dataType="number" [width]="'200px'"></igx-column>
1414
<igx-column field="GrammyAwards" header="Grammy Awards" [sortable]="true" dataType="number" [width]="'200px'"></igx-column>
1515

16-
<igx-row-island [key]="'Albums'" [autoGenerate]="false">
16+
<igx-row-island [height]="null" [key]="'Albums'" [autoGenerate]="false">
1717
<igx-column field="Album" [sortable]="true"></igx-column>
1818
<igx-column field="LaunchDate" header="Launch Date" [sortable]="true" [dataType]="'date'"></igx-column>
1919
<igx-column field="BillboardReview" header="Billboard Review" [sortable]="true"></igx-column>
2020
<igx-column field="USBillboard200" header="US Billboard 200" [sortable]="true"></igx-column>
21-
<igx-row-island [key]="'Songs'" [autoGenerate]="false">
21+
<igx-row-island [height]="null" [key]="'Songs'" [autoGenerate]="false">
2222
<igx-column field="Number" header="No."></igx-column>
2323
<igx-column field="Title"></igx-column>
2424
<igx-column field="Released" dataType="date"></igx-column>
2525
<igx-column field="Genre"></igx-column>
2626
</igx-row-island>
2727
</igx-row-island>
2828

29-
<igx-row-island [key]="'Tours'" [autoGenerate]="false">
29+
<igx-row-island [height]="null" [key]="'Tours'" [autoGenerate]="false">
3030
<igx-column field="Tour"></igx-column>
3131
<igx-column field="StartedOn" header="Started on"></igx-column>
3232
<igx-column field="Location"></igx-column>

0 commit comments

Comments
 (0)