Skip to content

Commit ade6939

Browse files
zdrawkuzdrawku
committed
Merge branch 'vNext' of https://github.com/IgniteUI/igniteui-angular-samples into vNext
2 parents baab7bd + 4f0acd2 commit ade6939

113 files changed

Lines changed: 2034 additions & 3159 deletions

File tree

Some content is hidden

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

‎gulpfile.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const submodule = "igniteui-live-editing-samples";
1818

1919
gulp.task("generate-live-editing", async () => {
2020
var appDv = argv.appDv !== undefined && argv.appDv.toLowerCase().trim() === "true";
21-
const liveEditingOptions = appDv ?
21+
const liveEditingOptions = appDv ?
2222
{
2323
platform: 'angular',
2424
projectDir: "./projects/app-lob",
@@ -30,7 +30,7 @@ gulp.task("generate-live-editing", async () => {
3030
}
3131
:
3232
{
33-
platform: 'angular',
33+
platform: 'angular',
3434
samplesDir: "./src/assets",
3535
configGeneratorPath: "./live-editing/generators/ConfigGenerators.ts",
3636
module: {
@@ -231,4 +231,4 @@ const cleanupAngularDemosLob = (cb) => {
231231
cb();
232232
}
233233
exports.repositoryfyAngularDemos = repositoryfyAngularDemos = gulp.series(cleanupAngularDemos, processDemosWithScss);
234-
exports.repositoryfyAngularDemosLob = repositoryfyAngularDemosLob = gulp.series(cleanupAngularDemosLob, processDemosLobWithScss);
234+
exports.repositoryfyAngularDemosLob = repositoryfyAngularDemosLob = gulp.series(cleanupAngularDemosLob, processDemosLobWithScss);

‎package-lock.json‎

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

‎package.json‎

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -40,37 +40,37 @@
4040
"url": "git://github.com/IgniteUI/igniteui-angular-samples/repository.git"
4141
},
4242
"dependencies": {
43-
"@angular/animations": "^15.0.0",
44-
"@angular/cdk": "^15.0.0",
45-
"@angular/common": "^15.0.0",
46-
"@angular/compiler": "^15.0.0",
47-
"@angular/core": "^15.0.0",
48-
"@angular/forms": "^15.0.0",
49-
"@angular/localize": "^15.0.0",
50-
"@angular/material": "^15.0.0",
51-
"@angular/platform-browser": "^15.0.0",
52-
"@angular/platform-browser-dynamic": "^15.0.0",
53-
"@angular/router": "^15.0.0",
43+
"@angular/animations": "^15.0.2",
44+
"@angular/cdk": "^15.0.1",
45+
"@angular/common": "^15.0.2",
46+
"@angular/compiler": "^15.0.2",
47+
"@angular/core": "^15.0.2",
48+
"@angular/forms": "^15.0.2",
49+
"@angular/localize": "^15.0.2",
50+
"@angular/material": "^15.0.1",
51+
"@angular/platform-browser": "^15.0.2",
52+
"@angular/platform-browser-dynamic": "^15.0.2",
53+
"@angular/router": "^15.0.2",
5454
"@igniteui/material-icons-extended": "^2.10.0",
5555
"@microsoft/signalr": "^5.0.11",
5656
"@ng-bootstrap/ng-bootstrap": "^13.1.1",
5757
"@popperjs/core": "2.11.6",
5858
"@types/file-saver": "^2.0.2",
5959
"@types/hammerjs": "^2.0.39",
6060
"angular-in-memory-web-api": "0.9.0",
61-
"bootstrap": "^5.2.1",
61+
"bootstrap": "^5.2.3",
6262
"core-js": "2.6.2",
6363
"domino": "^2.1.4",
6464
"file-saver": "^2.0.2",
6565
"hammerjs": "^2.0.8",
66-
"igniteui-angular": "^15.0.0",
66+
"igniteui-angular": "^15.0.2",
6767
"igniteui-angular-charts": "^14.0.0",
6868
"igniteui-angular-core": "^14.0.0",
6969
"igniteui-angular-i18n": "^14.2.0",
70-
"igniteui-dockmanager": "^1.8.0",
70+
"igniteui-dockmanager": "^1.11.3",
7171
"igniteui-live-editing": "^2.0.5",
7272
"igniteui-theming": "^1.1.4",
73-
"igniteui-webcomponents": "^3.4.0",
73+
"igniteui-webcomponents": "^4.0.0",
7474
"immediate": "^3.2.3",
7575
"intl": "^1.2.5",
7676
"minireset.css": "0.0.6",
@@ -81,23 +81,22 @@
8181
"zone.js": "~0.11.4"
8282
},
8383
"devDependencies": {
84-
"@angular-devkit/build-angular": "^15.0.0",
85-
"@angular-eslint/builder": "^15.0.0",
86-
"@angular-eslint/eslint-plugin": "^15.0.0",
87-
"@angular-eslint/eslint-plugin-template": "^15.0.0",
88-
"@angular-eslint/schematics": "^15.0.0",
89-
"@angular-eslint/template-parser": "^15.0.0",
90-
"@angular/cli": "^15.0.0",
91-
"@angular/compiler-cli": "^15.0.0",
92-
"@angular/language-service": "^15.0.0",
84+
"@angular-devkit/build-angular": "^15.0.2",
85+
"@angular-eslint/builder": "^15.1.0",
86+
"@angular-eslint/eslint-plugin": "^15.1.0",
87+
"@angular-eslint/eslint-plugin-template": "^15.1.0",
88+
"@angular-eslint/schematics": "^15.1.0",
89+
"@angular-eslint/template-parser": "^15.1.0",
90+
"@angular/cli": "^15.0.2",
91+
"@angular/compiler-cli": "^15.0.2",
92+
"@angular/language-service": "^15.0.2",
9393
"@igniteui/angular-schematics": "15.0.1100",
9494
"@juggle/resize-observer": "^3.3.1",
9595
"@types/jasmine": "^3.10.2",
9696
"@types/jasminewd2": "^2.0.9",
9797
"@types/node": "^13.13.52",
9898
"@typescript-eslint/eslint-plugin": "^5.29.0",
9999
"@typescript-eslint/parser": "^5.29.0",
100-
"codelyzer": "^6.0.2",
101100
"eslint": "^8.18.0",
102101
"eslint-plugin-import": "2.26.0",
103102
"eslint-plugin-jsdoc": "39.3.3",
@@ -108,8 +107,6 @@
108107
"jasmine-core": "~4.2.0",
109108
"karma": "^6.4.0",
110109
"karma-chrome-launcher": "~3.1.0",
111-
"karma-cli": "~2.0.0",
112-
"karma-coverage-istanbul-reporter": "^3.0.3",
113110
"karma-jasmine": "~5.1.0",
114111
"karma-jasmine-html-reporter": "^2.0.0",
115112
"sass-embedded": "^1.52.2",
@@ -118,4 +115,4 @@
118115
"typescript": "4.8.4",
119116
"webpack-bundle-analyzer": "^4.5.0"
120117
}
121-
}
118+
}

‎projects/app-lob/src/app/grid-dynamic-chart-data/data-analysis-dock-manager/data-analysis-dock-manager.component.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ $custom-badge-theme: badge-theme(
5656
.selected {
5757
igx-badge {
5858
& {
59-
@include badge($custom-badge-theme);
59+
@include css-vars($custom-badge-theme);
6060
}
6161

6262
position: absolute;

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<div class="controls-wrapper">
22
<div class="controls-holder">
33
<div class="switches">
4+
<div class="control-item" *ngIf="isThemeSwitchVisible">
5+
<igx-switch [checked]="false" [(ngModel)]="theme" (change)="onChange('theme', $event)">Dark</igx-switch>
6+
</div>
47
<div class="control-item">
58
<igx-switch [checked]="true" (change)="onChange('grouped', $event)" color="blue"
69
cssClass="finjs-sample-switch">

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Component, EventEmitter, OnDestroy, OnInit, Output, ViewChild } from '@angular/core';
2+
import { ActivatedRoute } from '@angular/router';
23
import {
34
IButtonGroupEventArgs, IChangeSwitchEventArgs, IgxButtonGroupComponent,
45
IgxSliderComponent, IgxToastComponent, ISliderValueChangeEventArgs, VerticalAlignment }
@@ -23,6 +24,8 @@ export class ControllerComponent implements OnInit, OnDestroy {
2324
@Output() public playAction = new EventEmitter<{ action: string }>();
2425

2526
public volume = 1000;
27+
public theme = false;
28+
public isThemeSwitchVisible = true;
2629
public frequency = 500;
2730
public controls = [
2831
{
@@ -51,6 +54,8 @@ export class ControllerComponent implements OnInit, OnDestroy {
5154
private frequencyChanged$: Observable<ISliderValueChangeEventArgs>;
5255
private frequencyChangedSubscription: Subscription;
5356

57+
constructor(private router: ActivatedRoute) {}
58+
5459
public ngOnInit(): void {
5560
this.volumeChanged$ = this.volumeSlider.valueChange.pipe(debounce(() => timer(200)));
5661
this.volumeChangedSubscription = this.volumeChanged$.subscribe(x => this.volumeChanged.emit(this.volumeSlider.value as number));
@@ -60,6 +65,11 @@ export class ControllerComponent implements OnInit, OnDestroy {
6065
.subscribe(() => this.frequencyChanged.emit(this.intervalSlider.value as number));
6166

6267
this.toast.positionSettings.verticalDirection = VerticalAlignment.Middle;
68+
69+
// Hide theme switcher
70+
if (this.router.snapshot.queryParamMap.get('theme-switch') === 'false') {
71+
this.isThemeSwitchVisible = false;
72+
}
6373
}
6474

6575
public ngOnDestroy(): void {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979

8080
.changePos2 {
8181
.igx-grid__td-text {
82-
--igx-success-l: 40%;
82+
--ig-success-l: 40%;
8383
border-inline-end: rem(4px) solid color(null, 'success', 500, .5);
8484
padding-inline-end: rem(15px);
8585
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="main__wrapper igx-scrollbar">
1+
<div class="main__wrapper igx-scrollbar" [class.fin-dark-theme]="darkTheme">
22
<app-finjs-controllers #controllers
33
(switchChanged)="onSwitchChanged($event)"
44
(volumeChanged)="onVolumeChanged($event)"

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ export class FinJSDemoComponent implements OnDestroy, AfterViewInit {
2222
closeOnOutsideClick: true
2323
};
2424

25+
@HostBinding('class.dark-theme')
26+
public darkTheme = false;
27+
2528
public properties = ['price', 'country'];
2629
public chartData: Stock[] = [];
2730
public volume = 1000;
@@ -38,6 +41,10 @@ export class FinJSDemoComponent implements OnDestroy, AfterViewInit {
3841
this.finGrid.toggleGrouping();
3942
break;
4043
}
44+
case 'theme': {
45+
this.darkTheme = event.value;
46+
break;
47+
}
4148
default: break;
4249
}
4350
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ $progressBar-sample-theme: progress-linear-theme(
1616

1717
::ng-deep .default-theme {
1818
.grid__wrapper {
19-
@include grid($grid-sample-theme);
20-
@include progress-linear($progressBar-sample-theme);
19+
@include css-vars($grid-sample-theme);
20+
@include css-vars($progressBar-sample-theme);
2121
}
2222
}
2323

0 commit comments

Comments
 (0)