From 7521d88975b20458ae20444815d44bbf1caef03d Mon Sep 17 00:00:00 2001
From: Olivier Tassinari <olivier.tassinari@gmail.com>
Date: Sat, 22 Jun 2019 10:35:05 +0200
Subject: [PATCH] fix height issue

---
 packages/material-ui-styles/src/index.js            |  6 +++++-
 packages/material-ui/src/MenuList/MenuList.js       |  8 ++------
 packages/material-ui/src/Select/Select.test.js      | 12 ++++++++++++
 packages/material-ui/src/Select/SelectInput.test.js |  8 ++++----
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/packages/material-ui-styles/src/index.js b/packages/material-ui-styles/src/index.js
index ed32ed97aa3c60..23eb3c0589e0fb 100644
--- a/packages/material-ui-styles/src/index.js
+++ b/packages/material-ui-styles/src/index.js
@@ -1,7 +1,11 @@
 import { ponyfillGlobal } from '@material-ui/utils';
 
 /* Warning if there are several instances of @material-ui/styles */
-if (process.env.NODE_ENV !== 'production' && typeof window !== 'undefined') {
+if (
+  process.env.NODE_ENV !== 'production' &&
+  process.env.NODE_ENV !== 'test' &&
+  typeof window !== 'undefined'
+) {
   ponyfillGlobal['__@material-ui/styles-init__'] =
     ponyfillGlobal['__@material-ui/styles-init__'] || 0;
 
diff --git a/packages/material-ui/src/MenuList/MenuList.js b/packages/material-ui/src/MenuList/MenuList.js
index 83f222b9898e41..3a0f1a1bac7587 100644
--- a/packages/material-ui/src/MenuList/MenuList.js
+++ b/packages/material-ui/src/MenuList/MenuList.js
@@ -50,11 +50,7 @@ function textCriteriaMatches(nextFocus, textCriteria) {
 
 function moveFocus(list, currentFocus, disableListWrap, traversalFunction, textCriteria) {
   let wrappedOnce = false;
-  let nextFocus = traversalFunction(
-    list,
-    currentFocus,
-    currentFocus && currentFocus !== list ? disableListWrap : false,
-  );
+  let nextFocus = traversalFunction(list, currentFocus, currentFocus ? disableListWrap : false);
 
   while (nextFocus) {
     // Prevent infinite loop.
@@ -88,8 +84,8 @@ const MenuList = React.forwardRef(function MenuList(props, ref) {
     actions,
     autoFocus = false,
     className,
-    disableListWrap = false,
     onKeyDown,
+    disableListWrap = false,
     ...other
   } = props;
   const listRef = React.useRef(null);
diff --git a/packages/material-ui/src/Select/Select.test.js b/packages/material-ui/src/Select/Select.test.js
index 893c6ba6bf2038..f35f4ca445e487 100644
--- a/packages/material-ui/src/Select/Select.test.js
+++ b/packages/material-ui/src/Select/Select.test.js
@@ -105,5 +105,17 @@ describe('<Select />', () => {
       );
       assert.strictEqual(wrapper.find(`.${classes.select}`).text(), 'Twenty');
     });
+
+    it('should render a placeholder when the value is missing', () => {
+      const wrapper = mount(
+        <Select {...defaultProps} value={0}>
+          <MenuItem value={10}>Ten</MenuItem>
+          <MenuItem value={20}>Twenty</MenuItem>
+          <MenuItem value={30}>Thirty</MenuItem>
+        </Select>,
+      );
+      const selectDisplay = wrapper.find('[role="button"]');
+      assert.strictEqual(selectDisplay.find('span').exists(), true);
+    });
   });
 });
diff --git a/packages/material-ui/src/Select/SelectInput.test.js b/packages/material-ui/src/Select/SelectInput.test.js
index a524b10bc74b43..99f03062008290 100644
--- a/packages/material-ui/src/Select/SelectInput.test.js
+++ b/packages/material-ui/src/Select/SelectInput.test.js
@@ -122,7 +122,7 @@ describe('<SelectInput />', () => {
         <SelectInput {...defaultProps} SelectDisplayProps={{ 'data-test': 'SelectDisplay' }} />,
       );
 
-      const selectDisplay = wrapper.find('[data-mui-test="SelectDisplay"]');
+      const selectDisplay = wrapper.find('[role="button"]');
       assert.strictEqual(selectDisplay.props()['data-test'], 'SelectDisplay');
     });
   });
@@ -287,7 +287,7 @@ describe('<SelectInput />', () => {
   describe('prop: autoWidth', () => {
     it('should take the anchor width into account', () => {
       const wrapper = mount(<SelectInput {...defaultProps} />);
-      const selectDisplay = wrapper.find('[data-mui-test="SelectDisplay"]').instance();
+      const selectDisplay = wrapper.find('[role="button"]').instance();
       stub(selectDisplay, 'clientWidth').get(() => 14);
       wrapper.find(`.${defaultProps.classes.select}`).simulate('click');
       assert.strictEqual(wrapper.find(Menu).props().PaperProps.style.minWidth, 14);
@@ -295,7 +295,7 @@ describe('<SelectInput />', () => {
 
     it('should not take the anchor width into account', () => {
       const wrapper = mount(<SelectInput {...defaultProps} autoWidth />);
-      const selectDisplay = wrapper.find('[data-mui-test="SelectDisplay"]').instance();
+      const selectDisplay = wrapper.find('[role="button"]').instance();
       stub(selectDisplay, 'clientWidth').get(() => 14);
       wrapper.find(`.${defaultProps.classes.select}`).simulate('click');
       assert.strictEqual(wrapper.find(Menu).props().PaperProps.style.minWidth, null);
@@ -305,7 +305,7 @@ describe('<SelectInput />', () => {
   describe('prop: multiple', () => {
     it('should take precedence', () => {
       const wrapper = shallow(<SelectInput {...defaultProps} disabled tabIndex={0} />);
-      assert.strictEqual(wrapper.find('[data-mui-test="SelectDisplay"]').props().tabIndex, 0);
+      assert.strictEqual(wrapper.find('[role="button"]').props().tabIndex, 0);
     });
 
     it('should serialize multiple select value', () => {