Skip to content

Commit e3f4262

Browse files
ChronosSFChronosSF
authored
Merge pull request #3553 from IgniteUI/vnext
Updating production from staging
2 parents f2d5067 + 921b194 commit e3f4262

File tree

35 files changed

+5314
-6793
lines changed

35 files changed

+5314
-6793
lines changed

‎live-editing/configs/ComboConfigGenerator.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import {
1010
IgxToastModule,
1111
IgxIconModule,
1212
IgxPrefixModule,
13-
IgxSimpleComboModule
13+
IgxSimpleComboModule,
14+
IgxProgressBarModule
1415
} from 'igniteui-angular';
1516
import { IgxFinancialChartModule } from 'igniteui-angular-charts';
1617
import { AppModuleConfig, Config, IConfigGenerator } from 'igniteui-live-editing';
@@ -131,9 +132,9 @@ export class ComboConfigGenerator implements IConfigGenerator {
131132
configs.push(new Config({
132133
additionalFiles: ['/src/app/data/cities15000-regions-countries.ts'],
133134
appModuleConfig: new AppModuleConfig({
134-
imports: ['IgxComboModule', 'IgxSimpleComboModule', 'SimpleComboCascadingComponent'],
135+
imports: ['IgxComboModule', 'IgxSimpleComboModule', 'IgxProgressBarModule', 'SimpleComboCascadingComponent'],
135136
ngDeclarations: ['SimpleComboCascadingComponent'],
136-
ngImports: ['IgxComboModule', 'IgxSimpleComboModule']
137+
ngImports: ['IgxComboModule', 'IgxSimpleComboModule', 'IgxProgressBarModule']
137138
}),
138139
component: 'SimpleComboCascadingComponent'
139140
}));

‎package-lock.json

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

‎package.json

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,18 @@
4444
"url": "git://github.com/IgniteUI/igniteui-angular-samples/repository.git"
4545
},
4646
"dependencies": {
47-
"@angular/animations": "^18.0.1",
48-
"@angular/cdk": "^18.0.1",
49-
"@angular/common": "^18.0.1",
50-
"@angular/compiler": "^18.0.1",
51-
"@angular/core": "^18.0.1",
52-
"@angular/forms": "^18.0.1",
53-
"@angular/localize": "^18.0.1",
54-
"@angular/material": "^18.0.1",
55-
"@angular/platform-browser": "^18.0.1",
56-
"@angular/platform-browser-dynamic": "^18.0.1",
57-
"@angular/router": "^18.0.1",
58-
"@igniteui/material-icons-extended": "^3.0.2",
47+
"@angular/animations": "^18.2.8",
48+
"@angular/cdk": "^18.2.9",
49+
"@angular/common": "^18.2.8",
50+
"@angular/compiler": "^18.2.8",
51+
"@angular/core": "^18.2.8",
52+
"@angular/forms": "^18.2.8",
53+
"@angular/localize": "^18.2.8",
54+
"@angular/material": "^18.2.9",
55+
"@angular/platform-browser": "^18.2.8",
56+
"@angular/platform-browser-dynamic": "^18.2.8",
57+
"@angular/router": "^18.2.8",
58+
"@igniteui/material-icons-extended": "^3.1.0",
5959
"@microsoft/signalr": "^7.0.12",
6060
"@ng-bootstrap/ng-bootstrap": "^17.0.0",
6161
"@popperjs/core": "2.11.8",
@@ -65,30 +65,35 @@
6565
"bootstrap": "5.3.2",
6666
"file-saver": "^2.0.2",
6767
"hammerjs": "^2.0.8",
68-
"igniteui-angular": "^18.1.7",
68+
"igniteui-angular": "^18.2.0",
6969
"igniteui-angular-charts": "^18.0.0",
7070
"igniteui-angular-core": "^18.0.0",
71-
"igniteui-angular-extras": "^18.0.5",
72-
"igniteui-angular-i18n": "^18.1.0",
71+
"igniteui-angular-extras": "^18.2.3",
72+
"igniteui-angular-i18n": "^18.2.0",
7373
"igniteui-dockmanager": "^1.14.2",
7474
"igniteui-live-editing": "^2.3.0",
7575
"igniteui-webcomponents": "^4.7.0",
7676
"minireset.css": "0.0.6",
7777
"rxjs": "^7.8.1",
7878
"tslib": "^2.6.1",
79-
"zone.js": "~0.14.4"
79+
"zone.js": "~0.14.10"
80+
},
81+
"overrides": {
82+
"igniteui-angular-extras": {
83+
"igniteui-angular": "^18.2.0"
84+
}
8085
},
8186
"devDependencies": {
82-
"@angular-devkit/build-angular": "^18.0.2",
83-
"@angular-eslint/builder": "^18.0.1",
84-
"@angular-eslint/eslint-plugin": "^18.0.1",
85-
"@angular-eslint/eslint-plugin-template": "^18.0.1",
86-
"@angular-eslint/schematics": "^18.0.1",
87-
"@angular-eslint/template-parser": "^18.0.1",
88-
"@angular/cli": "^18.0.2",
89-
"@angular/compiler-cli": "^18.0.1",
90-
"@angular/language-service": "^18.0.1",
91-
"@igniteui/angular-schematics": "18.1.1340",
87+
"@angular-devkit/build-angular": "^18.2.9",
88+
"@angular-eslint/builder": "^18.4.0",
89+
"@angular-eslint/eslint-plugin": "^18.4.0",
90+
"@angular-eslint/eslint-plugin-template": "^18.4.0",
91+
"@angular-eslint/schematics": "^18.4.0",
92+
"@angular-eslint/template-parser": "^18.4.0",
93+
"@angular/cli": "^18.2.9",
94+
"@angular/compiler-cli": "^18.2.8",
95+
"@angular/language-service": "^18.2.8",
96+
"@igniteui/angular-schematics": "18.1.1410",
9297
"@juggle/resize-observer": "^3.3.1",
9398
"@types/jasmine": "^5.1.2",
9499
"@types/jasminewd2": "^2.0.13",

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
.selection-area {
3434

35-
@include scrollbar(scrollbar-theme($scrollbar-size: 6px));
35+
@include scrollbar(scrollbar-theme($sb-size: 6px));
3636
width: 100%;
3737
height: 90%;
3838
display: inline-flex;
@@ -50,7 +50,6 @@
5050

5151
$custom-badge-theme: badge-theme(
5252
$border-color: contrast-color($color: 'gray', $variant: 900),
53-
$border-width: #{rem(2px)},
5453
$icon-color: contrast-color($color: 'gray', $variant: 900),
5554
$text-color: contrast-color($color: 'gray', $variant: 50),
5655
$background-color: contrast-color($color: 'gray', $variant: 500),
@@ -92,7 +91,7 @@ $custom-badge-theme: badge-theme(
9291

9392
.grid-chart-contextmenu-wrapper {
9493
igx-grid {
95-
@include scrollbar(scrollbar-theme($scrollbar-size: 16px));
94+
@include scrollbar(scrollbar-theme($sb-size: 16px));
9695
}
9796
}
9897

@@ -125,7 +124,7 @@ $custom-badge-theme: badge-theme(
125124
}
126125

127126
igx-tab-content {
128-
@include scrollbar(scrollbar-theme($scrollbar-size: 10px));
127+
@include scrollbar(scrollbar-theme($sb-size: 10px));
129128
}
130129

131130
}
@@ -147,7 +146,7 @@ $custom-badge-theme: badge-theme(
147146
$font-family: 'Titillium Web', 'Roboto', 'Helvetica Neue', sans-serif;
148147

149148
.tab-options-wrapper {
150-
@include scrollbar(scrollbar-theme($scrollbar-size: 6px));
149+
@include scrollbar(scrollbar-theme($sb-size: 6px));
151150

152151
display: flex;
153152
flex-flow: column;

‎projects/app-lob/src/app/index/docs-layout.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
::ng-deep {
22
.custom-body {
33
color: var(--ig-surface-500-contrast);
4-
background: hsla(var(--ig-surface-500));
4+
background: var(--ig-surface-500);
55
}
66
}

‎src/app/data-display/badge/badge-styling-sample/badge-styling-sample.component.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
$custom-badge-theme: badge-theme(
2323
$border-color: white,
24-
$border-width: 1px,
2524
$icon-color: white,
2625
$text-color: black
2726
);

‎src/app/data-display/icon/icon-service-sample/icon-service-sample.component.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ igx-avatar {
1616
z-index: 1;
1717
--ig-size: var(--ig-size-medium);
1818
--background: hsla(var(--ig-secondary-500), 6%);
19-
border: 1px solid hsl(var(--ig-secondary-500));
19+
border: 1px solid var(--ig-secondary-500);
2020
border-radius: rem(4px);
2121

2222
igx-icon {
2323
--size: #{rem(48px)};
24-
color: hsl(var(--ig-secondary-500));
24+
color: var(--ig-secondary-500);
2525
}
2626
}
2727

@@ -31,5 +31,5 @@ igx-icon[backdrop] {
3131
inset-inline: calc(100% - var(--size));
3232
z-index: -1;
3333
position: absolute;
34-
color: hsl(var(--ig-gray-300));
34+
color: var(--ig-gray-300);
3535
}

‎src/app/grid/grid-external-advanced-filtering/grid-external-advanced-filtering.component.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
display: flex;
33
flex-flow: column;
44
margin: 15px;
5+
align-items: stretch;
56
}
67

78
.advanced-dialog {
89
margin-bottom: 2px;
9-
height: 300px;
10-
}
10+
height: 325px;
11+
overflow-y: auto;
12+
}

‎src/app/grid/grid-multi-cell-selection/grid-multi-cell-selection.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export class GridMultiCellSelectionComponent {
1515

1616
public transferData(source: IgxGridComponent, target: IgxGridComponent,
1717
notification: IgxToastComponent) {
18-
target.shouldGenerate = true;
18+
target.autoGenerate = true;
1919
target.clearCellSelection();
2020
this.targetData = source.getSelectedData();
2121
notification.positionSettings.verticalDirection = VerticalAlignment.Middle;

‎src/app/grid/grid-summary-template/grid-summary-template.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ igx-buttongroup {
4242
min-width: 70px;
4343
justify-self: flex-start;
4444
text-align: left;
45-
color: hsla(var(--ig-secondary-600));
45+
color: var(--ig-secondary-600);
4646
user-select: none;
4747
}
4848
}

‎src/app/hierarchical-grid/hgrid-summary-export/hgrid-summary-export.component.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ igx-buttongroup {
2828
align-items: center;
2929
gap: 4px;
3030
justify-content: space-between;
31-
color: hsla(var(--ig-gray-900));
31+
color: var(--ig-gray-900);
3232

3333
span {
3434
user-select: all;
@@ -42,15 +42,15 @@ igx-buttongroup {
4242
min-width: 70px;
4343
justify-self: flex-start;
4444
text-align: left;
45-
color: hsla(var(--ig-secondary-600));
45+
color: var(--ig-secondary-600);
4646
user-select: none;
4747
}
4848
}
4949

5050
> * {
5151
padding: 8px 0;
5252
line-height: 18px;
53-
border-bottom: 1px dashed hsla(var(--ig-gray-400));
53+
border-bottom: 1px dashed var(--ig-gray-400);
5454

5555
&:last-child {
5656
border-bottom: none;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ igx-buttongroup {
4242
min-width: 70px;
4343
justify-self: flex-start;
4444
text-align: left;
45-
color: hsla(var(--ig-secondary-600));
45+
color: var(--ig-secondary-600);
4646
user-select: none;
4747
}
4848
}

‎src/app/hierarchical-grid/hierarchical-grid-external-advanced-filtering/hierarchical-grid-external-advanced-filtering.component.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
margin: 15px;
33
display: flex;
44
flex-flow: column;
5+
align-items: stretch;
56
}
67

78
.photo {
@@ -14,5 +15,6 @@
1415

1516
.advanced-dialog {
1617
margin-bottom: 2px;
17-
height: 300px;
18-
}
18+
height: 325px;
19+
overflow-y: auto;
20+
}

‎src/app/index/docs-layout.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
::ng-deep {
22
.custom-body {
33
color: var(--ig-surface-500-contrast);
4-
background: hsla(var(--ig-surface-500));
4+
background: var(--ig-surface-500);
55
}
66
}

‎src/app/interactions/drag-drop/kanban-sample/kanban-sample.component.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ interface IListItem {
2020
styleUrls: ['./kanban-sample.component.scss']
2121
})
2222
export class KanbanSampleComponent implements OnInit {
23+
@ViewChild('toDo', { read: ElementRef }) public toDo: ElementRef;
24+
@ViewChild('inProgress', { read: ElementRef }) public inProgress: ElementRef;
25+
@ViewChild('done', { read: ElementRef }) public done: ElementRef;
2326
public toDoList: IListItem[];
2427
public inProgressList: IListItem[];
2528
public doneList: IListItem[];

‎src/app/interactions/overlay/overlay-scroll-2/overlay-scroll-sample-2.component.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@ body {
44

55
.overlay-sample {
66
padding: 32px 0px 32px 32px;
7-
overflow-y: scroll;
87
display: flex;
98
flex-direction: row;
109
height: 200px;
1110
overflow-y: scroll;
1211
}
1312

14-
1513
.container__row > div, .section__container--wide > span, .section__position-element > div {
1614
display: inline-block;
1715
}
16+
1817
.section__row--wide, .container__row, .section__header {
1918
width: 100%;
2019
}
2120

2221
.section__row > span {
2322
height: 48px;
2423
}
24+
2525
.section__row--wide, .section__container--wide > span {
2626
height: 80px;
2727
max-width: 320px;
@@ -59,6 +59,7 @@ span:hover {
5959
.section__separator {
6060
width: 32px;
6161
}
62+
6263
.container {
6364
width: 50%;
6465
height: 600px;
@@ -84,6 +85,7 @@ span:hover {
8485
text-align: left;
8586
margin-top: 16px;
8687
}
88+
8789
.section__position-element, .section__row--wide {
8890
box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.2), 0 1px 1px 0 rgba(0, 0, 0, 0.14), 0 2px 1px -1px rgba(0, 0, 0, 0.12);
8991
}

‎src/app/interactions/overlay/overlay-scroll-2/overlay-scroll-sample-2.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export class OverlayScrollSample2Component implements OnInit, OnDestroy {
6868
this._target = this.scrollDemo.nativeElement.children[1];
6969
break;
7070
case ('close'):
71-
scrollStrategy = new CloseScrollStrategy(this.mainContainer.nativeElement);
71+
scrollStrategy = new CloseScrollStrategy();
7272
this._target = this.scrollDemo.nativeElement.children[2];
7373
break;
7474
default:

0 commit comments

Comments
 (0)