Merge branch 'master' of github.com:IBM/carbon-components-angular

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>
 		`,

src/index.ts

@@ -22,3 +22,4 @@ export * from "./input/input.module";
 export * from "./select/select.module";
 export * from "./tiles/tiles.module";
 export * from "./progress-indicator/progress-indicator.module";
+export * from "./pagination/pagination.module";

src/input/input.directive.ts

@@ -15,5 +15,5 @@ import { Directive, HostBinding } from "@angular/core";
 	selector: "[ibmText]"
 })
 export class TextInput {
-	@HostBinding("class") inputClass = "bx--text-input";
+	@HostBinding("class.bx--text-input") inputClass = true;
 }

src/modal/alert-modal.interface.ts

@@ -56,12 +56,16 @@ export interface ModalButton {
 	 * Display value of the button
 	 */
 	text: string;
+	/**
+	 * Optional unique ID for the button
+	 */
+	id?: string;
 	/**
 	 * Button type
 	 */
-	type: ModalButtonType;
+	type?: ModalButtonType;
 	/**
 	 * Callback for the button `click` event
 	 */
-	click: Function;
+	click?: Function;
 }