Skip to content

Commit 5651c04

Browse files
authored
Update simple combo samples (#2876)
1 parent 803cde9 commit 5651c04

11 files changed

Lines changed: 28 additions & 18 deletions

src/app/data/cities15000-regions-countries.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176719,7 +176719,8 @@ export const cities: City[] = [
176719176719
];
176720176720

176721176721
export const getCitiesByPopulation = (population = 100000): City[] => cities
176722-
.filter(c => c.population > population);
176722+
.filter(c => c.population > population)
176723+
.sort((a, b) => b.population - a.population);
176723176724

176724176725
export const getCountries = (countries: string[], population = 100000): Country[] => getCitiesByPopulation(population)
176725176726
.filter(c => countries.findIndex(s => s === c.country) > -1)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55
(selectionChanging)="countryChanging($event)"
66
placeholder="Choose Country..."
77
[(ngModel)]="selectedCountry"
8-
[displayKey]="'name'"></igx-simple-combo>
8+
[displayKey]="'name'">
9+
</igx-simple-combo>
910
</div>
1011
<div class="combo-section">
11-
<igx-simple-combo #province
12+
<igx-simple-combo #region
1213
[data]="regionData"
13-
(selectionChanging)="provinceChanging($event)"
14+
(selectionChanging)="regionChanging($event)"
1415
placeholder="Choose Region..."
1516
[(ngModel)]="selectedRegion"
1617
[displayKey]="'name'"
@@ -23,7 +24,6 @@
2324
placeholder="Choose City..."
2425
[(ngModel)]="selectedCity"
2526
[displayKey]="'name'"
26-
[valueKey]="'id'"
2727
[disabled]="citiesData.length === 0">
2828
</igx-simple-combo>
2929
</div>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export class SimpleComboCascadingComponent implements OnInit {
2828
this.citiesData = [];
2929
}
3030

31-
public provinceChanging(e: ISimpleComboSelectionChangingEventArgs) {
31+
public regionChanging(e: ISimpleComboSelectionChangingEventArgs) {
3232
this.selectedRegion = e.newSelection as Region;
3333
this.citiesData = getCitiesByCountry([this.selectedCountry?.name])
3434
.filter(c => c.region === this.selectedRegion?.name);

src/app/lists/combo/simple-combo-main/simple-combo-main.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="sample-wrapper">
22
<div class="combo-section">
3-
<igx-simple-combo
3+
<igx-simple-combo class="input-container"
44
[data]="trendLineTypes"
55
[(ngModel)]="trendLineType"
66
[type]="'border'"

src/app/lists/combo/simple-combo-main/simple-combo-main.component.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,8 @@
88
justify-content: space-between;
99
margin-bottom: 3rem;
1010
}
11+
12+
.input-container {
13+
flex-grow: 1;
14+
max-width: 300px;
15+
}

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component } from '@angular/core';
1+
import { Component, OnInit } from '@angular/core';
22
import { IgRect } from 'igniteui-angular-core';
33
import { StockData, updatedStockData } from '../../../data/stocks-data';
44

@@ -7,7 +7,7 @@ import { StockData, updatedStockData } from '../../../data/stocks-data';
77
templateUrl: 'simple-combo-main.component.html',
88
styleUrls: ['simple-combo-main.component.scss']
99
})
10-
export class SimpleComboMainComponent {
10+
export class SimpleComboMainComponent implements OnInit {
1111
public data: StockData[] = updatedStockData;
1212
public selectedRange: string;
1313
public trendLineType: string;
@@ -52,8 +52,6 @@ export class SimpleComboMainComponent {
5252
startDate = this.data[0].time;
5353
break;
5454
}
55-
console.log('Start: ', startDate);
56-
console.log('End: ', this.data[this.data.length - 1].time);
5755
this.windowRect = this.getWindowRect(startDate);
5856
}
5957

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<div class="sample-wrapper">
22
<div class="input-row">
3-
<igx-simple-combo [data]="cities" [displayKey]="'name'"></igx-simple-combo>
3+
<igx-simple-combo
4+
[overlaySettings]="{ outlet: element.nativeElement }"
5+
[data]="cities" [displayKey]="'name'">
6+
</igx-simple-combo>
47
</div>
58
</div>

src/app/lists/combo/simple-combo-styling/simple-combo-styling.component.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import '../../../../variables';
1+
@use '../../../../variables' as *;
22

33
// Browser samples related styling
44
.sample-wrapper {
@@ -29,7 +29,7 @@ $custom-drop-down-theme: igx-drop-down-theme(
2929
$selected-focus-item-text-color: #1a5214,
3030
);
3131

32-
:host {
32+
:host ::ng-deep {
3333
@include igx-css-vars($custom-simple-combo-theme);
3434
@include igx-css-vars($custom-drop-down-theme);
3535
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component, OnInit } from '@angular/core';
1+
import { Component, ElementRef, OnInit } from '@angular/core';
22
import { City, getCitiesByPopulation } from '../../../data/cities15000-regions-countries';
33

44
@Component({
@@ -8,6 +8,9 @@ import { City, getCitiesByPopulation } from '../../../data/cities15000-regions-c
88
})
99
export class SimpleComboStylingComponent implements OnInit {
1010
public cities: City[];
11+
12+
constructor(public element: ElementRef) { }
13+
1114
ngOnInit(): void {
1215
this.cities = getCitiesByPopulation(10000000);
1316
}

src/app/lists/combo/simple-combo-usage/simple-combo-usage.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</igx-simple-combo>
55
</div>
66
<div *ngIf="!!selectedCity">
7-
<h6>Selected City:</h6>
7+
<h6>Selected City's Id:</h6>
88
<div>{{ selectedCity }}</div>
99
</div>
1010
</div>

0 commit comments

Comments
 (0)