Skip to content

Commit ff2ad0e

Browse files
dobromirtsdobromirts
committed
Merge branch 'vnext' of https://github.com/IgniteUI/igniteui-angular-samples into vnext
2 parents 1d51e8f + bc3c431 commit ff2ad0e

44 files changed

Lines changed: 5546 additions & 7038 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.

‎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.0",
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/grid/grid-boston-marathon/grid.component.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,12 @@ export class GridComponent implements OnInit, OnDestroy, AfterViewInit {
197197
}
198198

199199
public filter(target: EventTarget): void {
200-
this.grid1.filter('CountryName', (target as HTMLInputElement).value, IgxStringFilteringOperand.instance().condition('contains'), true);
201-
this.grid1.markForCheck();
200+
const value = (target as HTMLInputElement).value;
201+
if (value) {
202+
this.grid1.filter('CountryName', value, IgxStringFilteringOperand.instance().condition('contains'));
203+
} else {
204+
this.grid1.clearFilter('CountryName');
205+
}
202206
}
203207

204208
public showAlert(element: ElementRef): void {

‎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-cascading-combos/grid-cascading-combos.component.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<igx-simple-combo [id]="'country-' + cell.row.data.ID" [data]="countriesData"
1010
(selectionChanging)="countryChanging($event, cell)" placeholder="Choose Country..."
1111
[ngModel]="cell.value === '' ? undefined : cell.value" [valueKey]="'name'" [displayKey]="'name'"
12-
width="100%">
12+
width="100%" [overlaySettings]="{ outlet: grid1.outlet }">
1313
</igx-simple-combo>
1414
</ng-template>
1515
</igx-column>
@@ -19,7 +19,7 @@
1919
<igx-simple-combo [id]="'region-' + cell.row.data.ID"
2020
(selectionChanging)="regionChanging($event, cell)" placeholder="Choose Region..."
2121
[ngModel]="cell.value === '' ? undefined : cell.value" [valueKey]="'name'"
22-
[displayKey]="'name'" [disabled]="cell.row.cells[1].value === ''">
22+
[displayKey]="'name'" [disabled]="cell.row.cells[1].value === ''" [overlaySettings]="{ outlet: grid1.outlet }">
2323
</igx-simple-combo>
2424
<igx-linear-bar *ngIf="cell.row.data.loadingRegion" [id]="'region-progress-' + cell.row.data.ID"
2525
type="info" [indeterminate]="true">
@@ -33,7 +33,7 @@
3333
<igx-simple-combo [id]="'city-' + cell.row.data.ID" placeholder="Choose City..."
3434
(selectionChanging)="cityChanging($event, cell)"
3535
[ngModel]="!cell.value ? undefined : cell.value" [valueKey]="'id'" [displayKey]="'name'"
36-
[disabled]="cell.row.cells[2].value === ''">
36+
[disabled]="cell.row.cells[2].value === ''" [overlaySettings]="{ outlet: grid1.outlet }">
3737
</igx-simple-combo>
3838
<igx-linear-bar *ngIf="cell.row.data.loadingCity" [id]="'city-progress-' + cell.row.data.ID"
3939
type="info" [indeterminate]="true">

‎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+
}

0 commit comments

Comments
 (0)