From ae9dfbb96ceb05908e38675b76d6786815d423aa Mon Sep 17 00:00:00 2001
From: Jason Moon <jmoon@coupang.com>
Date: Fri, 10 Jun 2016 14:03:03 -0700
Subject: [PATCH] Close opened menu if disabled becomes true

---
 src/Select.js       | 1 +
 test/Select-test.js | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/src/Select.js b/src/Select.js
index acee0830dc..9f4d3004b1 100644
--- a/src/Select.js
+++ b/src/Select.js
@@ -212,6 +212,7 @@ const Select = React.createClass({
 		}
 		if (prevProps.disabled !== this.props.disabled) {
 			this.setState({ isFocused: false }); // eslint-disable-line react/no-did-update-set-state
+			this.closeMenu();
 		}
 	},
 
diff --git a/test/Select-test.js b/test/Select-test.js
index 6ac47d2900..0316b6a885 100644
--- a/test/Select-test.js
+++ b/test/Select-test.js
@@ -1904,6 +1904,15 @@ describe('Select', () => {
 				    ReactDOM.render(<Select disabled={true} searchable={true} value="three" options={defaultOptions} />, node);
 						expect(instance.state.isFocused, 'to equal', false);
 				});
+
+				it('should close the opened menu if disabled=true', function(){
+
+					findAndFocusInputControl();
+					TestUtils.Simulate.mouseDown(getSelectControl(instance));
+					expect(node, 'queried for', '.Select-option', 'to have length', 4);
+					ReactDOM.render(<Select disabled={true} searchable={true} value="three" options={defaultOptions} />, node);
+					expect(node, 'to contain no elements matching', '.Select-option');
+				});
 			});
 		});