Skip to content

Commit 7760320

Browse files
simeonoffsimeonoff
authored
Merge branch 'vNext' into simeonoff/igniteui-theming
2 parents 58bd180 + 2dd030b commit 7760320

8 files changed

Lines changed: 78 additions & 78 deletions

File tree

‎live-editing/configs/SliderConfigGenerator.ts‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ import {IgxButtonModule,
22
IgxIconModule,
33
IgxInputGroupModule,
44
IgxSliderModule} from 'igniteui-angular';
5+
import { HammerModule } from '@angular/platform-browser';
56
import {AppModuleConfig, Config, IConfigGenerator} from 'igniteui-live-editing'
67
export class SliderConfigGenerator implements IConfigGenerator {
78

8-
99
public generateConfigs(): Config[] {
1010
const configs = new Array<Config>();
1111

1212
// slider sample 1
1313
configs.push(new Config({
1414
component: 'SliderSample1Component',
1515
appModuleConfig: new AppModuleConfig({
16-
imports: ['IgxInputGroupModule', 'IgxSliderModule', 'SliderSample1Component'],
16+
imports: ['IgxInputGroupModule', 'IgxSliderModule', 'SliderSample1Component', 'HammerModule'],
1717
ngDeclarations: ['SliderSample1Component'],
18-
ngImports: ['IgxInputGroupModule', 'IgxSliderModule']
18+
ngImports: ['IgxInputGroupModule', 'IgxSliderModule', 'HammerModule']
1919
}),
2020
shortenComponentPathBy: "/interactions/slider/"
2121
}));
@@ -24,9 +24,9 @@ export class SliderConfigGenerator implements IConfigGenerator {
2424
configs.push(new Config({
2525
component: 'SliderSample2Component',
2626
appModuleConfig: new AppModuleConfig({
27-
imports: ['IgxSliderModule', 'SliderSample2Component'],
27+
imports: ['IgxSliderModule', 'SliderSample2Component', 'HammerModule'],
2828
ngDeclarations: ['SliderSample2Component'],
29-
ngImports: ['IgxSliderModule']
29+
ngImports: ['IgxSliderModule', 'HammerModule']
3030
}),
3131
shortenComponentPathBy: "/interactions/slider/"
3232
}));
@@ -35,9 +35,9 @@ export class SliderConfigGenerator implements IConfigGenerator {
3535
configs.push(new Config({
3636
component: 'SliderSample3Component',
3737
appModuleConfig: new AppModuleConfig({
38-
imports: ['IgxInputGroupModule', 'IgxSliderModule', 'SliderSample3Component'],
38+
imports: ['IgxInputGroupModule', 'IgxSliderModule', 'SliderSample3Component', 'HammerModule'],
3939
ngDeclarations: ['SliderSample3Component'],
40-
ngImports: ['IgxInputGroupModule', 'IgxSliderModule']
40+
ngImports: ['IgxInputGroupModule', 'IgxSliderModule', 'HammerModule']
4141
}),
4242
shortenComponentPathBy: "/interactions/slider/"
4343
}));
@@ -46,9 +46,9 @@ export class SliderConfigGenerator implements IConfigGenerator {
4646
configs.push(new Config({
4747
component: 'SliderSample4Component',
4848
appModuleConfig: new AppModuleConfig({
49-
imports: ['IgxSliderModule', 'SliderSample4Component'],
49+
imports: ['IgxSliderModule', 'SliderSample4Component', 'HammerModule'],
5050
ngDeclarations: ['SliderSample4Component'],
51-
ngImports: ['IgxSliderModule']
51+
ngImports: ['IgxSliderModule', 'HammerModule']
5252
}),
5353
shortenComponentPathBy: "/interactions/slider/"
5454
}));
@@ -57,9 +57,9 @@ export class SliderConfigGenerator implements IConfigGenerator {
5757
configs.push(new Config({
5858
component: 'SliderSample5Component',
5959
appModuleConfig: new AppModuleConfig({
60-
imports: ['IgxSliderModule', 'SliderSample5Component'],
60+
imports: ['IgxSliderModule', 'SliderSample5Component', 'HammerModule'],
6161
ngDeclarations: ['SliderSample5Component'],
62-
ngImports: ['IgxSliderModule']
62+
ngImports: ['IgxSliderModule', 'HammerModule']
6363
}),
6464
shortenComponentPathBy: "/interactions/slider/"
6565
}));
@@ -68,79 +68,79 @@ export class SliderConfigGenerator implements IConfigGenerator {
6868
configs.push(new Config({
6969
component: 'SliderSample6Component',
7070
appModuleConfig: new AppModuleConfig({
71-
imports: ['IgxSliderModule', 'SliderSample6Component'],
71+
imports: ['IgxSliderModule', 'SliderSample6Component', 'HammerModule'],
7272
ngDeclarations: ['SliderSample6Component'],
73-
ngImports: ['IgxSliderModule']
73+
ngImports: ['IgxSliderModule', 'HammerModule']
7474
}),
7575
shortenComponentPathBy: "/interactions/slider/"
7676
}));
7777

7878
configs.push(new Config({
7979
component: 'SliderSecondaryTicksMirrorComponent',
8080
appModuleConfig: new AppModuleConfig({
81-
imports: ['IgxButtonModule', 'IgxIconModule', 'IgxSliderModule', 'SliderSecondaryTicksMirrorComponent'],
81+
imports: ['IgxButtonModule', 'IgxIconModule', 'IgxSliderModule', 'SliderSecondaryTicksMirrorComponent', 'HammerModule'],
8282
ngDeclarations: ['SliderSecondaryTicksMirrorComponent'],
83-
ngImports: ['IgxButtonModule', 'IgxIconModule', 'IgxSliderModule']
83+
ngImports: ['IgxButtonModule', 'IgxIconModule', 'IgxSliderModule', 'HammerModule']
8484
}),
8585
shortenComponentPathBy: "/interactions/slider/"
8686
}));
8787

8888
configs.push(new Config({
8989
component: 'SliderDiscreteTicksBottomComponent',
9090
appModuleConfig: new AppModuleConfig({
91-
imports: ['IgxSliderModule', 'SliderDiscreteTicksBottomComponent'],
91+
imports: ['IgxSliderModule', 'SliderDiscreteTicksBottomComponent', 'HammerModule'],
9292
ngDeclarations: ['SliderDiscreteTicksBottomComponent'],
93-
ngImports: ['IgxSliderModule']
93+
ngImports: ['IgxSliderModule', 'HammerModule']
9494
}),
9595
shortenComponentPathBy: "/interactions/slider/"
9696
}));
9797

9898
configs.push(new Config({
9999
component: 'SliderTicksBottomtotopLabelsComponent',
100100
appModuleConfig: new AppModuleConfig({
101-
imports: ['IgxInputGroupModule', 'IgxSliderModule', 'SliderTicksBottomtotopLabelsComponent'],
101+
imports: ['IgxInputGroupModule', 'IgxSliderModule', 'SliderTicksBottomtotopLabelsComponent', 'HammerModule'],
102102
ngDeclarations: ['SliderTicksBottomtotopLabelsComponent'],
103-
ngImports: ['IgxInputGroupModule', 'IgxSliderModule']
103+
ngImports: ['IgxInputGroupModule', 'IgxSliderModule', 'HammerModule']
104104
}),
105105
shortenComponentPathBy: "/interactions/slider/"
106106
}));
107107

108108
configs.push(new Config({
109109
component: 'SliderPrimaryTicksTopComponent',
110110
appModuleConfig: new AppModuleConfig({
111-
imports: ['IgxSliderModule', 'SliderPrimaryTicksTopComponent'],
111+
imports: ['IgxSliderModule', 'SliderPrimaryTicksTopComponent', 'HammerModule'],
112112
ngDeclarations: ['SliderPrimaryTicksTopComponent'],
113-
ngImports: ['IgxSliderModule']
113+
ngImports: ['IgxSliderModule', 'HammerModule']
114114
}),
115115
shortenComponentPathBy: "/interactions/slider/"
116116
}));
117117

118118
configs.push(new Config({
119119
component: 'SliderTimeframeComponent',
120120
appModuleConfig: new AppModuleConfig({
121-
imports: ['IgxSliderModule', 'SliderTimeframeComponent'],
121+
imports: ['IgxSliderModule', 'SliderTimeframeComponent', 'HammerModule'],
122122
ngDeclarations: ['SliderTimeframeComponent'],
123-
ngImports: ['IgxSliderModule']
123+
ngImports: ['IgxSliderModule', 'HammerModule']
124124
}),
125125
shortenComponentPathBy: "/interactions/slider/"
126126
}));
127127

128128
configs.push(new Config({
129129
component: 'TickLabelsTemplateComponent',
130130
appModuleConfig: new AppModuleConfig({
131-
imports: ['IgxSliderModule', 'TickLabelsTemplateComponent'],
131+
imports: ['IgxSliderModule', 'TickLabelsTemplateComponent', 'HammerModule'],
132132
ngDeclarations: ['TickLabelsTemplateComponent'],
133-
ngImports: ['IgxSliderModule']
133+
ngImports: ['IgxSliderModule', 'HammerModule']
134134
}),
135135
shortenComponentPathBy: "/interactions/slider/"
136136
}));
137137

138138
configs.push(new Config({
139139
component: 'AppSliderStylingComponent',
140140
appModuleConfig: new AppModuleConfig({
141-
imports: ['IgxSliderModule', 'AppSliderStylingComponent'],
141+
imports: ['IgxSliderModule', 'AppSliderStylingComponent', 'HammerModule'],
142142
ngDeclarations: ['AppSliderStylingComponent'],
143-
ngImports: ['IgxSliderModule']
143+
ngImports: ['IgxSliderModule', 'HammerModule']
144144
}),
145145
shortenComponentPathBy: "/interactions/slider/"
146146
}));

‎projects/app-lob/src/app/grid-finjs/main.component.html‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,23 @@
1212
</app-finjs-grid>
1313
</div>
1414

15-
<igx-dialog #dialog [closeOnOutsideSelect]="true" (closing)="onCloseHandler()">
16-
<div (keydown)="closeDialog()" class="chart-container">
17-
<igx-dialog-title> Chart </igx-dialog-title>
15+
<div igxOverlayOutlet #outlet="overlay-outlet">
16+
<igx-dialog #dialog [closeOnOutsideSelect]="true" (closing)="onCloseHandler()">
17+
<div (keydown)="closeDialog()" class="chart-container">
18+
<igx-dialog-title> Chart </igx-dialog-title>
1819

19-
<div>
20-
<igx-category-chart #chart1 [dataSource]="chartData" width="100%" chartType="column" xAxisInterval="20"
21-
xAxisLabelAngle="90" [includedProperties]="properties" height="400px" [tooltipTemplate]="seriesTooltip">
22-
</igx-category-chart>
23-
</div>
20+
<div>
21+
<igx-category-chart #chart1 [dataSource]="chartData" width="100%" chartType="column" xAxisInterval="20"
22+
xAxisLabelAngle="90" [includedProperties]="properties" height="400px" [tooltipTemplate]="seriesTooltip">
23+
</igx-category-chart>
24+
</div>
2425

25-
<div igxDialogActions>
26-
<button igxButton (click)="closeDialog()" [igxFocus]="dialog.isOpen">ОК</button>
26+
<div igxDialogActions>
27+
<button igxButton (click)="closeDialog()" [igxFocus]="dialog.isOpen">ОК</button>
28+
</div>
2729
</div>
28-
</div>
29-
</igx-dialog>
30+
</igx-dialog>
31+
</div>
3032

3133
<ng-template let-series="series" let-item="item" #seriesTooltip>
3234
<div class="tooltipTable">

‎projects/app-lob/src/app/grid-finjs/main.component.scss‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
}
1010

1111
.chart-container {
12-
1312
width: 50vw;
1413
}
1514

‎projects/app-lob/src/app/grid-finjs/main.component.ts‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Component, HostBinding, OnDestroy, ViewChild } from '@angular/core';
2-
import { IgxDialogComponent } from 'igniteui-angular';
1+
import { AfterViewInit, Component, HostBinding, OnDestroy, ViewChild } from '@angular/core';
2+
import { IgxDialogComponent, IgxOverlayOutletDirective, OverlaySettings } from 'igniteui-angular';
33
import { IgxCategoryChartComponent } from 'igniteui-angular-charts';
44
import { Stock } from '../data/financialData';
55
import { ControllerComponent } from './controllers.component';
@@ -10,11 +10,17 @@ import { GridFinJSComponent } from './grid-finjs.component';
1010
styleUrls: ['./main.component.scss'],
1111
templateUrl: './main.component.html'
1212
})
13-
export class FinJSDemoComponent implements OnDestroy {
13+
export class FinJSDemoComponent implements OnDestroy, AfterViewInit {
1414
@ViewChild('finGrid', { static: true }) public finGrid: GridFinJSComponent;
1515
@ViewChild('controllers', { static: true }) public controller: ControllerComponent;
1616
@ViewChild('dialog', { static: true }) public dialog: IgxDialogComponent;
1717
@ViewChild('chart1', { static: true }) public chart: IgxCategoryChartComponent;
18+
@ViewChild(IgxOverlayOutletDirective, { static: true }) public outlet: IgxOverlayOutletDirective;
19+
20+
public overlaySettings: OverlaySettings = {
21+
modal: false,
22+
closeOnOutsideClick: true
23+
};
1824

1925
@HostBinding('class.dark-theme')
2026
public darkTheme = false;
@@ -43,6 +49,10 @@ export class FinJSDemoComponent implements OnDestroy {
4349
}
4450
}
4551

52+
public ngAfterViewInit(): void {
53+
this.overlaySettings.outlet = this.outlet;
54+
}
55+
4656
public onVolumeChanged(volume: number): void {
4757
this.volume = volume;
4858
this.finGrid.dataService.hasRemoteConnection ? this.finGrid.dataService
@@ -71,7 +81,7 @@ export class FinJSDemoComponent implements OnDestroy {
7181
case 'chart': {
7282
if (this.finGrid.grid.selectedRows.length !== 0) {
7383
this.setChartData(this.finGrid.grid.selectedRows);
74-
this.dialog.open();
84+
this.dialog.open(this.overlaySettings);
7585
} else {
7686
this.controller.toast.open('Please select some rows first!');
7787
};
@@ -85,7 +95,8 @@ export class FinJSDemoComponent implements OnDestroy {
8595

8696
public setChartData(args: Stock[]): void {
8797
this.chartData = [];
88-
args.forEach(row => {
98+
args.forEach(rowKey => {
99+
const row: Stock = this.finGrid.grid.getRowByKey(rowKey).data;
89100
this.chartData.push(row);
90101
this.chart.notifyInsertItem(this.chartData, this.chartData.length - 1, row);
91102
});

‎projects/app-lob/src/app/grid/grid-boston-marathon/grid.component.scss‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ $progressBar-sample-theme: progress-linear-theme(
8080
linear-gradient(-45deg, transparent 75%, #222 75%);
8181
background-size: 20px 20px;
8282
background-position: 0 0, 0 10px, 10px -10px, -10px 0px;
83+
color: #000;
8384
}
8485

8586
> span {
@@ -89,6 +90,7 @@ $progressBar-sample-theme: progress-linear-theme(
8990

9091
> span {
9192
margin: 0 rem(8px);
93+
color: #000;
9294
}
9395
}
9496
}

‎src/app/pivot-grid/pivot-export/pivot-export.component.html‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1+
<div class="pivotgrid-sample">
2+
<div class="button-container">
3+
<button igxButton="raised" (click)="exportButtonHandler()">Export To Excel</button>
4+
Press the button to export the Pivot Grid as .xlsx file.
5+
</div>
16

2-
<div class="button-container">
3-
<button igxButton="raised" (click)="exportButtonHandler()">Export To Excel</button>
4-
Press the button to export the Pivot Grid as .xlsx file.
5-
</div>
6-
7-
<div class="pivot-container">
8-
<igx-pivot-grid #grid [data]="data" [height]="'800px'" [pivotConfiguration]="pivotConfig" [rowSelection]="'single'"
7+
<igx-pivot-grid #grid [data]="data" [pivotConfiguration]="pivotConfig" [rowSelection]="'single'"
98
[superCompactMode]="true" [defaultExpandState]='true'>
109
</igx-pivot-grid>
1110
</div>

‎src/app/pivot-grid/pivot-export/pivot-export.component.scss‎

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,15 @@
1-
:host {
2-
padding: 8px;
3-
display: flex;
4-
flex-direction: column;
5-
6-
::ng-deep {
7-
igx-pivot-data-selector {
8-
border: 1px solid hsla(var(--igx-grays-200));
9-
margin: 0 8px;
10-
}
1+
.pivotgrid-sample {
2+
justify-content: center;
3+
margin: 0 auto;
4+
width: 90%;
5+
height: 80%;
6+
7+
.button-container {
8+
align-items: flex-start;
9+
margin: 25px auto;
1110
}
1211

12+
igx-pivot-grid {
13+
align-items: center;
14+
}
1315
}
14-
15-
igx-pivot-grid {
16-
flex: 1;
17-
}
18-
19-
.button-container {
20-
margin: 0 0 25px 0;
21-
}
22-
23-
.pivot-container {
24-
display: flex;
25-
align-items: flex-start;
26-
flex: 1 1 auto;
27-
order: 0;
28-
}

‎src/app/pivot-grid/pivot-export/pivot-export.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,6 @@ export class PivotExportComponent {
123123
}
124124

125125
public exportButtonHandler() {
126-
this.excelExportService.export(this.grid, new IgxExcelExporterOptions('ExportedPivotGrid'));
126+
this.excelExportService.export(this.grid, new IgxExcelExporterOptions('ExportedDataFile'));
127127
}
128128
}

0 commit comments

Comments
 (0)