Skip to content

Commit c883b43

Browse files
Merge pull request #3540 from IgniteUI/ganastasov/fix-simple-combo-cascading-sample
fix(simple-combo): correct cascading sample clear buttons behavior
2 parents 30d7090 + f2fc217 commit c883b43

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
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
}));

src/app/lists/combo/simple-combo-cascading/simple-combo-cascading.component.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,16 @@ export class SimpleComboCascadingComponent implements OnInit {
2828
this.regionData = [];
2929
this.isLoadingRegions = true;
3030
this.loadingTime = 2000;
31+
} else {
32+
this.selectedRegion = undefined;
33+
this.selectedCity = undefined;
3134
}
3235
setTimeout(() => {
3336
this.regionData = getCitiesByCountry([this.selectedCountry?.name])
3437
.map(c => ({name: c.region, country: c.country}))
3538
.filter((v, i, a) => a.findIndex(r => r.name === v.name) === i);
3639
this.isLoadingRegions = false;
3740
}, this.loadingTime)
38-
this.selectedRegion = null;
39-
this.selectedCity = null;
4041
this.citiesData = [];
4142
this.loadingTime = 0;
4243
}
@@ -47,13 +48,14 @@ export class SimpleComboCascadingComponent implements OnInit {
4748
this.citiesData = [];
4849
this.isLoadingCities = true;
4950
this.loadingTime = 2000;
51+
} else {
52+
this.selectedCity = undefined;
5053
}
5154
setTimeout(() => {
5255
this.citiesData = getCitiesByCountry([this.selectedCountry?.name])
5356
.filter(c => c.region === this.selectedRegion?.name);
5457
this.isLoadingCities = false;
5558
}, this.loadingTime)
56-
this.selectedCity = null;
5759
this.loadingTime = 0;
5860
}
5961
}

src/app/lists/lists.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,15 @@ import { SimpleComboRemoteComponent } from './combo/simple-combo-remote/simple-c
8989
IgxButtonModule,
9090
IgxSliderModule,
9191
IgxComboModule,
92+
IgxSimpleComboModule,
9293
IgxSwitchModule,
9394
IgxToastModule,
9495
IgxButtonGroupModule,
9596
IgxRippleModule,
9697
IgxCardModule,
9798
IgxTreeModule,
9899
IgxTooltipModule,
99-
IgxFinancialChartModule,
100-
IgxSimpleComboModule,
101100
IgxProgressBarModule,
101+
IgxFinancialChartModule,
102102
IgxIconButtonDirective], providers: [provideHttpClient(withInterceptorsFromDi())] })
103103
export class ListsModule { }

0 commit comments

Comments
 (0)