Merge pull request #186 from cal-smith/combobox

Combobox fixes

Author: zvonimirfras

src/combobox/combobox.component.ts

@@ -67,7 +67,7 @@ import { NG_VALUE_ACCESSOR } from "@angular/forms";
 				class="bx--text-input"
 				aria-label="ListBox input field"
 				autocomplete="off"
-				placeholder="Filter..."/>
+				[placeholder]="placeholder"/>
 			<div
 				[ngClass]="{'bx--list-box__menu-icon--open': open}"
 				class="bx--list-box__menu-icon">
@@ -132,7 +132,7 @@ export class ComboBox implements OnChanges, OnInit, AfterViewInit, AfterContentI
 	 * Text to show when nothing is selected.
 	 * @memberof ComboBox
 	 */
-	@Input() placeholder = "";
+	@Input() placeholder = "Filter...";
 	/**
 	 * Combo box type (supporting single or multi selection of items).
 	 * @type {("single" | "multi")}
@@ -351,6 +351,9 @@ export class ComboBox implements OnChanges, OnInit, AfterViewInit, AfterContentI
 		});
 		this.view["updateList"](this.items);
 		this.updatePills();
+		// clearSelected can only fire on type=multi
+		// so we just emit getSelected() (just in case there's any disabled but selected items)
+		this.selected.emit(this.view.getSelected() as any);
 	}
 
 	/**

src/combobox/combobox.stories.ts

@@ -16,7 +16,7 @@ storiesOf("Combobox", module)
 	.addDecorator(withKnobs)
 	.add("Basic", () => ({
 		template: `
-			<ibm-combo-box [items]="items">
+			<ibm-combo-box [items]="items" (selected)="selected($event)">
 				<ibm-dropdown-list></ibm-dropdown-list>
 			</ibm-combo-box>
 		`,
@@ -40,7 +40,7 @@ storiesOf("Combobox", module)
 	}))
 	.add("Multi-select", () => ({
 		template: `
-			<ibm-combo-box [items]="items" type="multi">
+			<ibm-combo-box [items]="items" type="multi" (selected)="selected($event)">
 				<ibm-dropdown-list></ibm-dropdown-list>
 			</ibm-combo-box>
 		`,