fix(select): Fixed selected option sometimes not appearing

edcarroll · Jul 19, 2017 · cf0973e · cf0973e
1 parent df06762
commit cf0973e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/modules/select/classes/select-base.ts b/src/modules/select/classes/select-base.ts
@@ -197,7 +197,7 @@ export abstract class SuiSelectBase<T, U> implements AfterContentInit {
         } else if (this.searchService.optionsLookup) {
             return o => this.labelGetter(o);
         } else {
-            return o => this.searchService.highlightMatches(this.labelGetter(o), this.query != undefined ? this.query : "");
+            return o => this.searchService.highlightMatches(this.labelGetter(o), this.query || "");
         }
     }
 

diff --git a/src/modules/select/components/select.ts b/src/modules/select/components/select.ts
@@ -13,9 +13,9 @@ import { ISelectRenderedOption } from "./select-option";
        [hidden]="!isSearchable || isSearchExternal">
 
 <!-- Placeholder text -->
-<div *ngIf="selectedOption == undefined" class="default text" [class.filtered]="query != undefined">{{ placeholder }}</div>
+<div *ngIf="selectedOption == undefined" class="default text" [class.filtered]="query">{{ placeholder }}</div>
 <!-- Selected item -->
-<div class="text" [class.filtered]="query != undefined || selectedOption == undefined">
+<div class="text" [class.filtered]="query || selectedOption == undefined">
     <span #optionTemplateSibling></span>
     <span *ngIf="!optionTemplate && selectedOption != undefined" [innerHTML]="configuredFormatter(selectedOption)"></span>
 </div>
@@ -132,7 +132,7 @@ export class SuiSelect<T, U> extends SuiSelectBase<T, U> implements ICustomValue
             this.onAvailableOptionsRendered();
         }
 
-        if (this.selectedOption && this.optionTemplate) {
+        if (this.selectedOption != undefined && this.optionTemplate) {
             this.drawTemplate(this._optionTemplateSibling, this.selectedOption);
         }
     }