Skip to content

Commit adfa994

Browse files
authored
Merge pull request #1212 from IgniteUI/fix-code-issue-finjs
Fix the trend icon for grid finjs demo, debounce the slider value changed event
2 parents 07ed3b7 + 2e4ed0b commit adfa994

File tree

4 files changed

+24
-13
lines changed

4 files changed

+24
-13
lines changed

src/app/grid-finjs/grid-finjs-demo.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</div>
1313
<div class="finjs-slider control-item">
1414
<label for="slider">Records: {{volume}}</label>
15-
<igx-slider #slider1 id="slider" [minValue]="0" [maxValue]="10000" [(ngModel)]="volume" [step]="100" (onValueChange)="onVolumeChanged($event)" thumbLabelVisibilityDuration="250"></igx-slider>
15+
<igx-slider #slider1 id="slider" [minValue]="0" [maxValue]="10000" [(ngModel)]="volume" [step]="100" thumbLabelVisibilityDuration="250"></igx-slider>
1616
</div>
1717
<div class="finjs-slider control-item">
1818
<label for="slider">Frequency: {{frequency}} ms</label>
@@ -51,8 +51,8 @@
5151
<ng-template igxCell let-cell="cell">
5252
<div class="finjs-icons">
5353
<span>{{cell.value | currency:'USD':'symbol':'1.4-4'}}</span>
54-
<igx-icon *ngIf="trends.positive(cell.row.rowData)" name="trending_up">trending_up</igx-icon>
55-
<igx-icon *ngIf="trends.negative(cell.row.rowData)" name="trending_down">trending_down</igx-icon>
54+
<igx-icon *ngIf="trends.positive(cell.row.rowData)">trending_up</igx-icon>
55+
<igx-icon *ngIf="trends.negative(cell.row.rowData)">trending_down</igx-icon>
5656
</div>
5757
</ng-template>
5858
</igx-column>

src/app/grid-finjs/grid-finjs-demo.component.ts

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { AfterViewInit, Component, ElementRef, OnDestroy, OnInit, ViewChild } from "@angular/core";
22
import { DefaultSortingStrategy, IgxButtonGroupComponent, IgxGridComponent, IgxSliderComponent,
33
SortingDirection} from "igniteui-angular";
4-
import { Observable } from "rxjs";
4+
import { Observable, timer } from "rxjs";
5+
import { debounce } from "rxjs/operators";
56
import { LocalDataService } from "./localData.service";
67

78
@Component({
@@ -44,6 +45,7 @@ export class FinJSDemoComponent implements OnInit, AfterViewInit, OnDestroy {
4445
private subscription;
4546
private selectedButton;
4647
private _timer;
48+
private volumeChanged;
4749

4850
constructor(private localService: LocalDataService, private elRef: ElementRef) {
4951
this.subscription = this.localService.getData(this.volume);
@@ -70,6 +72,12 @@ export class FinJSDemoComponent implements OnInit, AfterViewInit, OnDestroy {
7072
strategy: DefaultSortingStrategy.instance()
7173
}
7274
];
75+
this.volumeChanged = this.volumeSlider.onValueChange.pipe(debounce(() => timer(200)));
76+
this.volumeChanged.subscribe(
77+
(x) => {
78+
this.localService.getData(this.volume);
79+
},
80+
(err) => console.log("Error: " + err));
7381
}
7482

7583
public ngAfterViewInit() {
@@ -149,10 +157,6 @@ export class FinJSDemoComponent implements OnInit, AfterViewInit, OnDestroy {
149157
return "$" + value.toFixed(3);
150158
}
151159

152-
public onVolumeChanged(event: any) {
153-
this.localService.getData(this.volume);
154-
}
155-
156160
/**
157161
* the below code is needed when accessing the sample through the navigation
158162
* it will style all the space below the sample component element, but not the navigation menu
@@ -168,6 +172,7 @@ export class FinJSDemoComponent implements OnInit, AfterViewInit, OnDestroy {
168172

169173
public ngOnDestroy() {
170174
this.stopFeed();
175+
this.volumeChanged.unsubscribe();
171176
}
172177

173178
public toggleToolbar(event: any) {

src/app/treegrid-finjs/tree-grid-finjs-sample.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</div>
1010
<div class="finjs-slider control-item">
1111
<label for="slider">Records: {{volume}}</label>
12-
<igx-slider #slider1 id="slider" [minValue]="0" [maxValue]="10000" [(ngModel)]="volume" [step]="100" (onValueChange)="onVolumeChanged($event)" thumbLabelVisibilityDuration="250"></igx-slider>
12+
<igx-slider #slider1 id="slider" [minValue]="0" [maxValue]="10000" [(ngModel)]="volume" [step]="100" thumbLabelVisibilityDuration="250"></igx-slider>
1313
</div>
1414
<div class="finjs-slider control-item">
1515
<label for="slider">Frequency: {{frequency}} ms</label>

src/app/treegrid-finjs/tree-grid-finjs-sample.component.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import { AfterViewInit, Component, ElementRef, NgZone, OnDestroy, ViewChild } fr
33
import { AbsoluteScrollStrategy, ConnectedPositioningStrategy, HorizontalAlignment,
44
IgxButtonGroupComponent, IgxSliderComponent, IgxTreeGridComponent, OverlaySettings,
55
PositionSettings, SortingDirection, VerticalAlignment} from "igniteui-angular";
6+
import { timer } from "rxjs";
7+
import { debounce } from "rxjs/operators";
68
import { LocalDataService } from "../grid-finjs/localData.service";
79
import { ITreeGridAggregation } from "./tree-grid-grouping.pipe";
810

@@ -86,6 +88,7 @@ export class TreeGridFinJSComponent implements AfterViewInit, OnDestroy {
8688
private subscription;
8789
private selectedButton;
8890
private _timer;
91+
private volumeChanged;
8992

9093
constructor(private zone: NgZone, private localService: LocalDataService, private elRef: ElementRef) {
9194
this.subscription = this.localService.getData(this.volume);
@@ -94,6 +97,12 @@ export class TreeGridFinJSComponent implements AfterViewInit, OnDestroy {
9497

9598
public ngOnInit() {
9699
this.grid1.sortingExpressions = [{ fieldName: this.groupColumnKey, dir: SortingDirection.Desc }];
100+
this.volumeChanged = this.volumeSlider.onValueChange.pipe(debounce(() => timer(200)));
101+
this.volumeChanged.subscribe(
102+
(x) => {
103+
this.localService.getData(this.volume);
104+
},
105+
(err) => console.log("Error: " + err));
97106
}
98107

99108
public ngAfterViewInit() {
@@ -144,10 +153,6 @@ export class TreeGridFinJSComponent implements AfterViewInit, OnDestroy {
144153
return value ? "$" + value.toFixed(3) : "";
145154
}
146155

147-
public onVolumeChanged(event: any) {
148-
this.localService.getData(this.volume);
149-
}
150-
151156
/**
152157
* the below code is needed when accessing the sample through the navigation
153158
* it will style all the space below the sample component element, but not the navigation menu
@@ -163,6 +168,7 @@ export class TreeGridFinJSComponent implements AfterViewInit, OnDestroy {
163168

164169
public ngOnDestroy() {
165170
this.stopFeed();
171+
this.volumeChanged.unsubscribe();
166172
}
167173

168174
public toggleToolbar(event: any) {

0 commit comments

Comments
 (0)