From 03533ac58f4833fba57a59257fe4ee27b55eb00f Mon Sep 17 00:00:00 2001
From: Tony deCatanzaro <tonydecat@gmail.com>
Date: Fri, 6 May 2016 10:00:48 -0400
Subject: [PATCH] Fixed a bug where searchingText was not being shown when a
 refined search did not match any previous results

---
 src/Async.js       |  7 ++++---
 test/Async-test.js | 21 ++++++++++++++++++++-
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/Async.js b/src/Async.js
index 0ab36f8744..66226b5d96 100644
--- a/src/Async.js
+++ b/src/Async.js
@@ -141,9 +141,10 @@ const Async = React.createClass({
 		let { isLoading, options } = this.state;
 		if (this.props.isLoading) isLoading = true;
 		let placeholder = isLoading ? this.props.loadingPlaceholder : this.props.placeholder;
-		if (!options.length) {
-			if (this._lastInput.length < this.props.minimumInput) noResultsText = this.props.searchPromptText;
-			if (isLoading) noResultsText = this.props.searchingText;
+		if (isLoading) {
+			noResultsText = this.props.searchingText;
+		} else if (!options.length && this._lastInput.length < this.props.minimumInput) {
+			noResultsText = this.props.searchPromptText;
 		}
 		return (
 			<Select
diff --git a/test/Async-test.js b/test/Async-test.js
index 2a0b830a13..59a3ffb871 100644
--- a/test/Async-test.js
+++ b/test/Async-test.js
@@ -82,7 +82,6 @@ describe('Async', () => {
 				/>);
 		});
 
-
 		it('shows the returns options when the result returns', () => {
 
 			// Unexpected comes with promises built in - we'll use them
@@ -105,6 +104,26 @@ describe('Async', () => {
 			});
 		});
 
+		it('shows "Loading..." after typing if refined search matches none of the previous results', () => {
+
+			loadOptions.returns(expect.promise((resolve, reject) => {
+				resolve({ options: [{ value: 1, label: 'test' }] });
+			}));
+
+			typeSearchText('te');
+
+			return loadOptions.firstCall.returnValue.then(() => {
+
+				typeSearchText('ten');
+
+				return expect(renderer, 'to have rendered',
+					<Select
+						isLoading
+						placeholder="Loading..."
+						noResultsText="Searching..."
+					/>);
+			});
+		});
 
 		it('ignores the result of an earlier call, when the responses come in the wrong order', () => {