From 8a2b24f7bdb8c7eb277f7909cf7ae601350a0e42 Mon Sep 17 00:00:00 2001
From: Evgeny Lupanov <e.lupanov@akveo.com>
Date: Fri, 3 Apr 2020 17:57:34 +0300
Subject: [PATCH] fix(form-inputs): show material inputs

---
 .../form-inputs/form-inputs.component.html    |  2 +-
 .../form-inputs/form-inputs.component.ts      | 23 +++++++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/app/pages/forms/form-inputs/form-inputs.component.html b/src/app/pages/forms/form-inputs/form-inputs.component.html
index b0adf3a2..b3f1c92a 100644
--- a/src/app/pages/forms/form-inputs/form-inputs.component.html
+++ b/src/app/pages/forms/form-inputs/form-inputs.component.html
@@ -87,7 +87,7 @@
     </nb-card>
   </div>
 </div>
-<div *ngIf="materialTheme$ | async" class="row">
+<div *ngIf="showMaterialInputs" class="row">
   <div class="col-lg-12">
     <ngx-material-inputs></ngx-material-inputs>
   </div>
diff --git a/src/app/pages/forms/form-inputs/form-inputs.component.ts b/src/app/pages/forms/form-inputs/form-inputs.component.ts
index 5ede35ff..84d4ae1e 100644
--- a/src/app/pages/forms/form-inputs/form-inputs.component.ts
+++ b/src/app/pages/forms/form-inputs/form-inputs.component.ts
@@ -1,25 +1,28 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { NbThemeService } from '@nebular/theme';
 import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { tap } from 'rxjs/operators';
 
 @Component({
   selector: 'ngx-form-inputs',
   styleUrls: ['./form-inputs.component.scss'],
   templateUrl: './form-inputs.component.html',
 })
-export class FormInputsComponent {
+export class FormInputsComponent implements OnInit {
   public constructor(private readonly themeService: NbThemeService) {
-    this.materialTheme$ = this.themeService.onThemeChange()
-      .pipe(map(theme => {
-        const themeName: string = theme?.name || '';
-        return themeName.startsWith('material');
-      }));
   }
 
-  public readonly materialTheme$: Observable<boolean>;
-
+  public materialTheme$: Observable<boolean>;
   public starRate: number = 2;
   public heartRate: number = 4;
   public radioGroupValue: string = 'This is value 2';
+  public showMaterialInputs = false;
+
+  ngOnInit() {
+    this.materialTheme$ = this.themeService.onThemeChange()
+    .pipe(tap(theme => {
+      const themeName: string = theme?.name || '';
+      this.showMaterialInputs = themeName.startsWith('material');
+    }));
+  }
 }