Merge pull request #89 from MurhafSousli/fix/2.1.0

v2.1.1

CHANGELOG.md

@@ -1,11 +1,15 @@
 # Changelog
 
-## 2.1.0
+## 2.1.1
 
  - Allow `<ng-progress>` component to be destroyed, fixes [#27](https://github.com/MurhafSousli/ngx-progressbar/issues/27), [#28](https://github.com/MurhafSousli/ngx-progressbar/issues/28), [#33](https://github.com/MurhafSousli/ngx-progressbar/issues/33), [#41](https://github.com/MurhafSousli/ngx-progressbar/issues/41), [#81](https://github.com/MurhafSousli/ngx-progressbar/issues/81), [#82](https://github.com/MurhafSousli/ngx-progressbar/issues/82) in [#86](https://github.com/MurhafSousli/ngx-progressbar/issues/86)
-
+ - Add `NgProgressState` interface for Progress state
  - **Breaking Changes**: `NgProgressService` has been renamed to `NgProgress`
 
+## 2.1.0
+
+ **Broken Release**
+
 ## 2.0.8
 
  - fix: remove unused code in [#68](https://github.com/MurhafSousli/ngx-progressbar/issues/68)

package.json

@@ -1,6 +1,6 @@
 {
     "name": "ngx-progressbar",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "description": "A nanoscopic progress bar. Featuring realistic trickle animations to convince your users that something is happening!",
     "main": "./bundles/ngx-progressbar.umd.js",
     "module": "./modules/ngx-progressbar.es5.js",

rollup.config.js

@@ -7,6 +7,7 @@ const globals = {
     '@angular/http': 'ng.http',
     'rxjs/Observable': 'Rx',
     'rxjs/Subject': 'Rx',
+    'rxjs/BehaviorSubject': 'Rx',
     'rxjs/add/observable/timer': 'Rx.Observable',
     'rxjs/add/operator/do': 'Rx.Observable.prototype',
     'rxjs/add/operator/takeWhile': 'Rx.Observable.prototype',

src/components/progress-bar.component.ts

@@ -1,4 +1,5 @@
 import { Component, Input, ChangeDetectionStrategy } from '@angular/core';
+import { NgProgressState } from '../models/progress.state';
 
 @Component({
   selector: 'ng-progress-bar',
@@ -126,14 +127,14 @@ import { Component, Input, ChangeDetectionStrategy } from '@angular/core';
 })
 export class ProgressBarComponent {
 
-  @Input() state;
-  @Input() positionUsing;
-  @Input() ease;
-  @Input() speed;
-  @Input() showSpinner;
-  @Input() direction;
-  @Input() thick;
-  @Input() color;
+  @Input() state: NgProgressState;
+  @Input() positionUsing: string;
+  @Input() ease: string;
+  @Input() speed: number;
+  @Input() showSpinner: boolean;
+  @Input() direction: string;
+  @Input() thick: string;
+  @Input() color: string;
 
   /** Styles for progressbar */
   barStyles() {

src/components/progress.component.ts

@@ -14,7 +14,7 @@ import { NgProgress } from '../services/progress.service';
     [direction]="direction"
     [color]="color"
     [thick]="thick"
-    [state]="progress.state | async"
+    [state]="ngProgress.state | async"
   ></ng-progress-bar>`,
   styles: [`
   :host {
@@ -94,5 +94,4 @@ export class ProgressComponent implements OnChanges {
       }
     }
   }
-
 }

src/models/progress.state.ts

@@ -0,0 +1,4 @@
+export interface NgProgressState {
+    active: boolean;
+    value: number;
+}

src/progressbar.ts

@@ -2,3 +2,4 @@ export { NgProgress } from './services/progress.service';
 export { NgProgressBrowserXhr } from './services/browser-xhr.provider';
 export { NgProgressInterceptor } from './services/interceptor.provider';
 export { NgProgressModule } from './modules/progress.module';
+export { NgProgressState } from './models/progress.state';

src/services/progress.service.ts

@@ -1,5 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Subject } from 'rxjs/Subject';
+import { NgProgressState } from '../models/progress.state';
+import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 import { Observable } from 'rxjs/Observable';
 
 import 'rxjs/add/observable/timer';
@@ -21,8 +23,14 @@ const clamp = (n, min, max) => {
 @Injectable()
 export class NgProgress {
 
+  /** Initial state */
+  initState: NgProgressState = {
+    active: false,
+    value: 0
+  };
+
   /** Progress state */
-  state = new Subject();
+  state = new BehaviorSubject(this.initState);
 
   /** Trickling stream */
   trickling = new Subject();

tslint.json

@@ -13,6 +13,7 @@
     "no-forward-ref": true,
     "use-life-cycle-interface": true,
     "use-pipe-transform-interface": true,
+    "interface-name": false,
     "component-class-suffix": [
       true,
       "Component"