refactor(select): extract conditional code into separate methods

akveo · Apr 25, 2019 · c8822b2 · c8822b2
1 parent 17f2e1b
commit c8822b2
Showing 1 changed file with 21 additions and 13 deletions.
diff --git a/src/framework/theme/components/select/select.component.ts b/src/framework/theme/components/select/select.component.ts
@@ -670,19 +670,8 @@ export class NbSelectComponent<T> implements AfterViewInit, AfterContentInit, On
 
   show() {
     if (this.isHidden) {
-      if (!this.ref) {
-        this.createOverlay();
-        this.subscribeOnPositionChange();
-        this.createKeyManager();
-        this.subscribeOnOverlayKeys();
-      }
-
-      this.ref.attach(this.portal);
-      if (this.selectionModel.length) {
-        this.keyManager.setActiveItem(this.selectionModel[0]);
-      } else {
-        this.keyManager.setFirstItemActive();
-      }
+      this.attachToOverlay();
+      this.setActiveOption();
       this.cd.markForCheck();
     }
   }
@@ -787,6 +776,25 @@ export class NbSelectComponent<T> implements AfterViewInit, AfterContentInit, On
     this.emitSelected(this.selectionModel.map((opt: NbOptionComponent<T>) => opt.value));
   }
 
+  protected attachToOverlay() {
+    if (!this.ref) {
+      this.createOverlay();
+      this.subscribeOnPositionChange();
+      this.createKeyManager();
+      this.subscribeOnOverlayKeys();
+    }
+
+    this.ref.attach(this.portal);
+  }
+
+  protected setActiveOption() {
+    if (this.selectionModel.length) {
+      this.keyManager.setActiveItem(this.selectionModel[ 0 ]);
+    } else {
+      this.keyManager.setFirstItemActive();
+    }
+  }
+
   protected createOverlay() {
     const scrollStrategy = this.createScrollStrategy();
     this.positionStrategy = this.createPositionStrategy();