Skip to content

Commit 2cea049

Browse files
authored
Merge pull request #3327 from IgniteUI/vnext
Updating PROD with latest fix and enhacements
2 parents 5d2411c + 13a385f commit 2cea049

18 files changed

+71
-36
lines changed

live-editing/configs/AccordionConfigGenerator.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ import {
44
IgxTimePickerModule,
55
IgxSliderModule,
66
IgxCheckboxModule,
7-
IgxSwitchModule
7+
IgxSwitchModule,
8+
IgxIconModule
89
} from 'igniteui-angular';
910
import { AppModuleConfig, Config, IConfigGenerator } from 'igniteui-live-editing';
1011

@@ -37,10 +38,10 @@ export class AccordionConfigGenerator implements IConfigGenerator {
3738
component: 'AccordionSample3Component',
3839
appModuleConfig: new AppModuleConfig({
3940
imports: ['IgxCheckboxModule', 'IgxSliderModule',
40-
'IgxRadioModule', 'IgxTimePickerModule', 'AccordionSample3Component', 'IgxAccordionModule'],
41+
'IgxRadioModule', 'IgxTimePickerModule', 'AccordionSample3Component', 'IgxAccordionModule', 'IgxIconModule'],
4142
ngDeclarations: ['AccordionSample3Component'],
4243
ngImports: ['IgxCheckboxModule', 'IgxSliderModule',
43-
'IgxRadioModule', 'IgxTimePickerModule', 'IgxAccordionModule']
44+
'IgxRadioModule', 'IgxTimePickerModule', 'IgxAccordionModule', 'IgxIconModule']
4445
}),
4546
shortenComponentPathBy: '/layouts/accordion/'
4647
}));

live-editing/configs/BannerConfigGenerator.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ export class BannerConfigGenerator implements IConfigGenerator {
8888
additionalFiles: ["/src/app/notifications/banner/banner-samples.scss"],
8989
appModuleConfig: new AppModuleConfig({
9090
imports: ['IgxBannerModule', 'IgxCardModule', 'IgxToastModule', 'IgxNavbarModule', 'IgxButtonModule',
91-
'IgxRippleModule', 'IgxIconModule', 'IgxButtonModule',
92-
'IgxRippleModule', 'BannerStylingComponent'],
91+
'IgxRippleModule', 'IgxIconModule', 'BannerStylingComponent'],
9392
ngDeclarations: ['BannerStylingComponent'],
9493
ngImports: ['IgxBannerModule', 'IgxCardModule', 'IgxToastModule', 'IgxNavbarModule', 'IgxButtonModule',
9594
'IgxRippleModule', 'IgxIconModule', 'IgxButtonModule',

live-editing/configs/CardConfigGenerator.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,16 @@ export class CardConfigGenerator implements IConfigGenerator {
102102
'IgxButtonModule',
103103
'IgxCardModule',
104104
'IgxRippleModule',
105-
'CardSample3Component'
105+
'CardSample3Component',
106+
'IgxLayoutModule',
106107
],
107108
ngDeclarations: ['CardSample3Component'],
108109
ngImports: [
109110
'IgxAvatarModule',
110111
'IgxButtonModule',
111112
'IgxCardModule',
112-
'IgxRippleModule'
113+
'IgxRippleModule',
114+
'IgxLayoutModule',
113115
]
114116
}),
115117
additionalFiles: [

live-editing/configs/DateRangePickerConfigGenerator.ts

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import {IgxDateRangePickerModule,
22
IgxIconModule,
33
IgxInputGroupModule,
4+
IgxDateTimeEditorModule,
5+
IgxDatePickerModule,
46
IgxSelectModule} from 'igniteui-angular';
57
import {AppModuleConfig, Config, IConfigGenerator} from 'igniteui-live-editing'
68
export class DateRangePickerConfigGenerator implements IConfigGenerator {
@@ -50,10 +52,10 @@ export class DateRangePickerConfigGenerator implements IConfigGenerator {
5052
new Config({
5153
component: 'DateRangePickerStartEndComponent',
5254
appModuleConfig: new AppModuleConfig({
53-
imports: ['IgxDateRangePickerModule', 'DateRangePickerStartEndComponent',
55+
imports: ['IgxDateRangePickerModule', 'DateRangePickerStartEndComponent', 'IgxDatePickerModule', 'IgxDateTimeEditorModule',
5456
'IgxInputGroupModule', 'IgxIconModule' ],
5557
ngDeclarations: ['DateRangePickerStartEndComponent'],
56-
ngImports: ['IgxDateRangePickerModule', 'IgxInputGroupModule', 'IgxIconModule']
58+
ngImports: ['IgxDateRangePickerModule', 'IgxDatePickerModule', 'IgxDateTimeEditorModule', 'IgxInputGroupModule', 'IgxIconModule']
5759
}),
5860
shortenComponentPathBy: "/scheduling/daterangepicker/"
5961
})
@@ -63,10 +65,10 @@ export class DateRangePickerConfigGenerator implements IConfigGenerator {
6365
new Config({
6466
component: 'DateRangePickerValidationComponent',
6567
appModuleConfig: new AppModuleConfig({
66-
imports: ['IgxDateRangePickerModule', 'DateRangePickerValidationComponent',
67-
'IgxInputGroupModule', 'IgxIconModule'],
68+
imports: ['IgxDateRangePickerModule', 'DateRangePickerValidationComponent', 'IgxDatePickerModule',
69+
'IgxInputGroupModule', 'IgxIconModule', 'IgxDateTimeEditorModule'],
6870
ngDeclarations: ['DateRangePickerValidationComponent'],
69-
ngImports: ['IgxDateRangePickerModule', 'IgxInputGroupModule', 'IgxIconModule']
71+
ngImports: ['IgxDateRangePickerModule', 'IgxDatePickerModule', 'IgxInputGroupModule', 'IgxIconModule', 'IgxDateTimeEditorModule']
7072
}),
7173
shortenComponentPathBy: "/scheduling/daterangepicker/"
7274
})
@@ -77,9 +79,9 @@ export class DateRangePickerConfigGenerator implements IConfigGenerator {
7779
component: 'StyledDateRangePickerComponent',
7880
appModuleConfig: new AppModuleConfig({
7981
imports: ['IgxDateRangePickerModule', 'StyledDateRangePickerComponent',
80-
'IgxInputGroupModule', 'IgxIconModule'],
82+
'IgxInputGroupModule', 'IgxIconModule', 'IgxDatePickerModule' , 'IgxDateTimeEditorModule'],
8183
ngDeclarations: ['StyledDateRangePickerComponent'],
82-
ngImports: ['IgxDateRangePickerModule', 'IgxInputGroupModule', 'IgxIconModule']
84+
ngImports: ['IgxDateRangePickerModule', 'IgxDatePickerModule', 'IgxDateTimeEditorModule', 'IgxInputGroupModule', 'IgxIconModule']
8385
}),
8486
shortenComponentPathBy: "/scheduling/daterangepicker/"
8587
})

live-editing/configs/GridConfigGenerator.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1016,9 +1016,9 @@ export class GridConfigGenerator implements IConfigGenerator {
10161016
component: 'GridColumnDataTypesSampleComponent',
10171017
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/nwindData.ts'],
10181018
appModuleConfig: new AppModuleConfig({
1019-
imports: ['GridColumnDataTypesSampleComponent', 'IgxGridModule', 'IgxTooltipModule', 'IgxPreventDocumentScrollModule'],
1019+
imports: ['GridColumnDataTypesSampleComponent', 'IgxGridModule', 'IgxTooltipModule', 'IgxInputGroupModule', 'IgxSelectModule', 'IgxPreventDocumentScrollModule'],
10201020
ngDeclarations: ['GridColumnDataTypesSampleComponent'],
1021-
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxTooltipModule']
1021+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxTooltipModule', 'IgxInputGroupModule', 'IgxSelectModule']
10221022
})
10231023
}));
10241024

live-editing/configs/NavbarConfigGenerator.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ export class NavbarConfigGenerator implements IConfigGenerator {
3232
component: 'NavbarSample2Component',
3333
appModuleConfig: new AppModuleConfig({
3434
imports: ['IgxIconModule', 'IgxNavbarModule', 'IgxButtonModule', 'NavbarSample2Component'],
35-
ngDeclarations: ['NavbarSample2Component', 'IgxButtonModule' ],
36-
ngImports: ['IgxIconModule', 'IgxNavbarModule']
35+
ngDeclarations: ['NavbarSample2Component'],
36+
ngImports: ['IgxIconModule', 'IgxNavbarModule', 'IgxButtonModule' ]
3737
}),
3838
shortenComponentPathBy: "/menus/navbar/"
3939
}));

projects/app-lob/src/app/grid-finjs-dock-manager/grid-finjs-dock-manager.component.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</div>
1010
<div class="actionItem">
1111
<!-- Change volume -->
12-
<igx-select [(ngModel)]="dataVolume" (ngModelChange)="paramsChanged()" [overlaySettings]="customOverlaySettings">
12+
<igx-select [(ngModel)]="dataVolume" (ngModelChange)="paramsChanged()" [overlaySettings]="customOverlaySettings" [displayDensity]="'compact'">
1313
<label igxLabel>Change data volume</label>
1414
<igx-prefix>
1515
<igx-icon>view_list</igx-icon>
@@ -21,7 +21,7 @@
2121
</div>
2222
<div class="actionItem">
2323
<!-- Change frequency -->
24-
<igx-select [(ngModel)]="frequency" (ngModelChange)="paramsChanged()" [overlaySettings]="freqOverlaySettings" #freq>
24+
<igx-select [(ngModel)]="frequency" (ngModelChange)="paramsChanged()" [overlaySettings]="freqOverlaySettings" [displayDensity]="'compact'" #freq>
2525
<label igxLabel>Change update frequency</label>
2626
<igx-prefix>
2727
<igx-icon>cell_wifi</igx-icon>
@@ -166,4 +166,4 @@
166166
<ng-template #host gridHost>
167167
</ng-template>
168168
</igc-dockmanager>
169-
<div class="dark-theme" #filteringOverlayOutlet="overlay-outlet" igxOverlayOutlet></div>
169+
<div [class]="isDarkTheme ? 'dark-theme' : 'light-theme'" #filteringOverlayOutlet="overlay-outlet" igxOverlayOutlet></div>

projects/app-lob/src/app/grid-finjs-dock-manager/grid-finjs-dock-manager.component.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
}
128128
}
129129

130-
:host ::ng-deep {
130+
igx-grid {
131131
.grid-area {
132132
margin-block-start: 1rem;
133133
overflow-y: hidden;

projects/app-lob/src/app/grid-finjs-dock-manager/grid-finjs-dock-manager.module.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import { CommonModule } from '@angular/common';
33
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
44
import { FormsModule } from '@angular/forms';
5-
import { IgxButtonModule, IgxDialogModule, IgxDividerModule, IgxGridModule, IgxSliderModule,
5+
import { IgxButtonModule, IgxDialogModule, IgxDividerModule, IgxGridModule, IgxIconModule, IgxSelectModule, IgxSliderModule,
66
IgxSwitchModule, IgxTabsModule, IgxToggleModule } from 'igniteui-angular';
77
import { GridFinJSDockManagerRoutingModule } from './grid-finjs-dock-manager-routing.module';
88
import { GridFinJSDockManagerComponent } from './grid-finjs-dock-manager.component';
@@ -27,7 +27,9 @@ import { IgxPreventDocumentScrollModule } from '../../../../../src/app/directive
2727
IgxDialogModule,
2828
IgxDividerModule,
2929
IgxTabsModule,
30-
IgxToggleModule
30+
IgxToggleModule,
31+
IgxSelectModule,
32+
IgxIconModule
3133
],
3234
providers: [],
3335
schemas: [CUSTOM_ELEMENTS_SCHEMA]
Loading
Loading
Loading
Loading
Loading
Loading

projects/app-lob/src/styles.scss

+9-1
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,16 @@ body {
2929
.grid-chart-contextmenu-wrapper {
3030
@include fluent-dark-theme($fluent-excel-palette);
3131
}
32+
// remove this workaround after resolving https://github.com/IgniteUI/igniteui-angular/issues/13039
33+
igx-grid,
34+
igx-hierarchical-grid,
35+
igx-pivot-grid,
36+
igx-tree-grid {
37+
--igx-chip-disabled-background: #616161;
38+
--igx-chip-disabled-border-color: #616161;
39+
--igx-chip-disabled-text-color: #BDBDBD;
40+
}
3241
}
33-
3442
.fin-dark-theme {
3543
@include dark-theme($green-palette);
3644
background: #333;

src/app/layouts/carousel/carousel-animations-sample/carousel-animations-sample.component.html

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="carousel-animation-wrapper">
22
<div class="action-wrapper">
3-
<span style="margin: 0 5px 0 10px;">Current animation: </span>
4-
<span style="max-width: 100px;">
3+
<span>Current animation: </span>
4+
<span class="select-container">
55
<igx-select #select [(ngModel)]="carousel.animationType">
66
<igx-select-item *ngFor="let animation of animations" [value]="animation">
77
{{animation | titlecase}}
@@ -17,15 +17,15 @@
1717
<igx-card-header>
1818
<h4 igxCardHeaderTitle>{{slide.heading}}</h4>
1919
</igx-card-header>
20-
20+
2121
<igx-card-content>
2222
<p>{{slide.description}}</p>
2323
</igx-card-content>
24-
24+
2525
<igx-card-media>
2626
<img [src]="slide.image">
2727
</igx-card-media>
28-
28+
2929
<igx-card-actions>
3030
<a igxButton href="{{slide.link}}" target="_blank" rel="noopener" style="text-decoration: none;" igxStart>visit page</a>
3131
</igx-card-actions>
@@ -36,3 +36,4 @@ <h4 igxCardHeaderTitle>{{slide.heading}}</h4>
3636
</igx-carousel>
3737
</div>
3838
</div>
39+

src/app/layouts/carousel/carousel-animations-sample/carousel-animations-sample.component.scss

+26-6
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,55 @@
55
justify-content: center;
66
height: 100%;
77
padding: 10px;
8-
8+
99
img {
1010
width: 100%;
1111
}
1212
}
13-
13+
1414
.carousel-wrapper {
1515
max-height: 600px;
1616
height: 100%;
1717
width: 90%;
1818
margin: 20px auto;
1919
}
20-
20+
2121
.action-wrapper {
2222
height: 40px;
2323
width: 70%;
2424
display: flex;
2525
align-items: baseline;
2626
margin-bottom: 1rem;
27-
margin-left: 1rem;
27+
margin-left: 5.7rem;
2828
}
29-
29+
3030
.carousel-animation-wrapper {
3131
height: 700px;
3232
margin: 16px auto;
3333
display: flex;
3434
flex-flow: column;
3535
}
36-
36+
3737
.igx-card {
3838
box-shadow: none;
3939
}
40+
41+
.select-container {
42+
margin-left: 10px;
43+
}
44+
45+
span:first-child {
46+
position: relative;
47+
bottom: 2px;
48+
}
49+
50+
igx-select {
51+
width: 150px;
52+
}
53+
54+
::ng-deep {
55+
.input.igx-input-group__input {
56+
top: 10px;
57+
left: 10px;
58+
}
59+
}

0 commit comments

Comments
 (0)