fix(dropdown): starts with search and clear active when hiding

bullhorn · Jun 21, 2017 · 191204c · 191204c
1 parent 08bc5af
commit 191204c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/demo/pages/elements/dropdown/templates/DropdownDemo.html b/demo/pages/elements/dropdown/templates/DropdownDemo.html
@@ -2,13 +2,13 @@
     <button type="button" theme="secondary" icon="collapse" inverse>Actions</button>
     <list>
         <dropdown-item-header>Section 1</dropdown-item-header>
-        <item (action)="clickMe('Hello!')">Action 1</item>
-        <item (action)="clickMe('Another!')">Action 2</item>
-        <item tooltip="Test tooltip :)" tooltipPosition="right" [disabled]="true" (action)="clickMe()">Action 3</item>
+        <item (action)="clickMe('Hello!')">Test</item>
+        <item (action)="clickMe('Another!')">Josh</item>
+        <item tooltip="Test tooltip :)" tooltipPosition="right" [disabled]="true" (action)="clickMe()">Poop</item>
         <dropdown-item-header>Section 2</dropdown-item-header>
-        <item (action)="clickMe('Hello!')">Action 4</item>
-        <item (action)="clickMe('Another!')">Action 5</item>
-        <item tooltip="Test tooltip :)" tooltipPosition="right" [disabled]="true" (action)="clickMe()">Action 6</item>
+        <item (action)="clickMe('Hello!')">Germany</item>
+        <item (action)="clickMe('Another!')">Algerbra</item>
+        <item tooltip="Test tooltip :)" tooltipPosition="right" [disabled]="true" (action)="clickMe()">Blah</item>
     </list>
 </novo-dropdown>
 <novo-dropdown side="right">

diff --git a/src/elements/dropdown/Dropdown.ts b/src/elements/dropdown/Dropdown.ts
@@ -180,6 +180,11 @@ export class NovoDropdownElement extends OutsideClick implements OnInit, OnDestr
                 this.parentScrollElement.removeEventListener('scroll', this.closeHandler);
             }
         }
+        // Clear active index
+        if (this.activeIndex !== -1) {
+            this._items.toArray()[this.activeIndex].active = false;
+        }
+        this.activeIndex = -1;
     }
 
     @HostListener('keydown', ['$event'])
@@ -234,7 +239,7 @@ export class NovoDropdownElement extends OutsideClick implements OnInit, OnDestr
             let char = String.fromCharCode(event.keyCode);
             this.filterTerm = this.filterTerm.concat(char);
             let index = this._textItems.findIndex((value: string) => {
-                return value.toLocaleLowerCase().indexOf(this.filterTerm.toLowerCase()) !== -1;
+                return new RegExp(`^${this.filterTerm.toLowerCase()}`).test(value.toLocaleLowerCase());
             });
             if (index !== -1) {
                 if (this.activeIndex !== -1) {