Skip to content

Commit 7164c8c

Browse files
authored
Merge pull request #2737 from IgniteUI/zkolev/update-topics-based-on-sheet-master
Updates based on property sheet, overlaySettings and additional context
2 parents 70e0727 + b2bcac4 commit 7164c8c

7 files changed

Lines changed: 31 additions & 12 deletions

File tree

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"domino": "^2.1.4",
6868
"file-saver": "^2.0.2",
6969
"hammerjs": "^2.0.8",
70-
"igniteui-angular": "^12.0.3",
70+
"igniteui-angular": "^12.0.7",
7171
"igniteui-angular-charts": "^11.1.1",
7272
"igniteui-angular-core": "^11.1.1",
7373
"igniteui-angular-excel": "^11.1.1",

src/app/grid/grid-column-hiding-sample/grid-column-hiding-sample.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<div class="gridContainer">
1515
<igx-grid igxPreventDocumentScroll #grid [data]="data" [autoGenerate]="false" width="100%" height="560px" columnWidth="200px"
1616
[allowFiltering]="true">
17-
<igx-column [field]="'ID'" dataType="string" [sortable]="true"></igx-column>
18-
<igx-column [field]="'ContactName'" dataType="string" [sortable]="true" [disableHiding]="true"></igx-column>
17+
<igx-column [field]="'ID'" dataType="string" [sortable]="true" [hidden]="true"></igx-column>
18+
<igx-column [field]="'ContactName'" dataType="string" [sortable]="true" [disableHiding]="true" [hidden]="true"></igx-column>
1919
<igx-column [field]="'ContactTitle'" dataType="string" [sortable]="true" [disableHiding]="true"></igx-column>
2020
<igx-column [field]="'City'" dataType="string" [sortable]="true"></igx-column>
2121
<igx-column [field]="'CompanyName'" dataType="string" [sortable]="true"></igx-column>

src/app/grid/grid-toolbar-sample/grid-toolbar-sample-2.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<igx-grid-toolbar>
1515
<igx-grid-toolbar-title>{{ toolbarTitle }}</igx-grid-toolbar-title>
1616
<igx-grid-toolbar-actions>
17-
<igx-grid-toolbar-hiding *ngIf="enableHiding"></igx-grid-toolbar-hiding>
18-
<igx-grid-toolbar-pinning *ngIf="enablePinning"></igx-grid-toolbar-pinning>
17+
<igx-grid-toolbar-hiding *ngIf="enableHiding" [overlaySettings]="overlaySettingsAuto"></igx-grid-toolbar-hiding>
18+
<igx-grid-toolbar-pinning *ngIf="enablePinning" [overlaySettings]="overlaySettingsScaleCenter"></igx-grid-toolbar-pinning>
1919
<igx-grid-toolbar-exporter *ngIf="enableExport"></igx-grid-toolbar-exporter>
2020
</igx-grid-toolbar-actions>
2121
</igx-grid-toolbar>

src/app/grid/grid-toolbar-sample/grid-toolbar-sample-2.component.ts

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Component } from '@angular/core';
2+
import { GlobalPositionStrategy, scaleInCenter, scaleOutCenter, AbsoluteScrollStrategy, AutoPositionStrategy } from 'igniteui-angular';
23
import { athletesData } from '../../data/athletesData';
34

45
@Component({
@@ -13,6 +14,24 @@ export class GridToolbarSample2Component {
1314
enableHiding = true;
1415
enablePinning = true;
1516
enableExport = true;
17+
public positionStrategyScaleCenter = new GlobalPositionStrategy({
18+
openAnimation: scaleInCenter,
19+
closeAnimation: scaleOutCenter
20+
});
21+
public overlaySettingsScaleCenter = {
22+
positionStrategy: this.positionStrategyScaleCenter,
23+
scrollStrategy: new AbsoluteScrollStrategy(),
24+
modal: true,
25+
closeOnEscape: true
26+
};
27+
28+
public positionStrategyAuto = new AutoPositionStrategy();
29+
public overlaySettingsAuto = {
30+
positionStrategy: this.positionStrategyAuto,
31+
scrollStrategy: new AbsoluteScrollStrategy(),
32+
modal: false,
33+
closeOnEscape: false
34+
};
1635

1736
constructor() {
1837
this.data = athletesData;

src/app/hierarchical-grid/hierarchical-grid-column-hiding/hierarchical-grid-hiding.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
</div>
1616
</ng-template>
1717
</igx-column>
18-
<igx-column field="Debut" [sortable]="true" dataType="number" [formatter]="formatter"></igx-column>
19-
<igx-column field="GrammyNominations" header="Grammy Nominations" [sortable]="true" dataType="number"></igx-column>
18+
<igx-column field="Debut" [sortable]="true" dataType="number" [formatter]="formatter" [hidden]="true"></igx-column>
19+
<igx-column field="GrammyNominations" header="Grammy Nominations" [sortable]="true" dataType="number" [hidden]="true"></igx-column>
2020
<igx-column field="GrammyAwards" header="Grammy Awards" [sortable]="true" dataType="number"></igx-column>
2121

2222
<igx-row-island [key]="'Albums'" [autoGenerate]="false" hiddenColumnsText="Hidden">

src/app/tree-grid/tree-grid-column-hiding-sample/tree-grid-column-hiding-sample.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
<igx-column [field]="'Name'" dataType="string" [sortable]="true" [disableHiding]="true"></igx-column>
1818
<igx-column [field]="'ID'" dataType="number" [sortable]="true"></igx-column>
1919
<igx-column [field]="'Title'" dataType="string" [sortable]="true" [disableHiding]="true"></igx-column>
20-
<igx-column [field]="'HireDate'" dataType="date" [sortable]="true"></igx-column>
21-
<igx-column [field]="'Age'" dataType="number" [sortable]="true"></igx-column>
20+
<igx-column [field]="'HireDate'" dataType="date" [sortable]="true" [hidden]="true"></igx-column>
21+
<igx-column [field]="'Age'" dataType="number" [sortable]="true" [hidden]="true"></igx-column>
2222
<igx-column [field]="'Address'" dataType="string" [sortable]="true"></igx-column>
2323
<igx-column [field]="'City'" dataType="string" [sortable]="true"></igx-column>
2424
<igx-column [field]="'Country'" dataType="string" [sortable]="true"></igx-column>

0 commit comments

Comments
 (0)