Merge branch 'master' of github.com:JedWatson/react-select

JedWatson · Jan 13, 2018 · ab52641 · ab52641
2 parents fdd5a34 + b73e31e
commit ab52641
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 3 deletions.
diff --git a/dist/react-select.css b/dist/react-select.css
@@ -278,6 +278,7 @@
   margin-top: -1px;
   max-height: 200px;
   position: absolute;
+  left: 0;
   top: 100%;
   width: 100%;
   z-index: 1;

diff --git a/dist/react-select.min.css b/dist/react-select.min.css
diff --git a/less/menu.less b/less/menu.less
@@ -19,6 +19,7 @@
 	margin-top: -1px;
 	max-height: @select-menu-max-height;
 	position: absolute;
+	left: 0;
 	top: 100%;
 	width: 100%;
 	z-index: @select-menu-zindex;

diff --git a/scss/control.scss b/scss/control.scss
@@ -176,6 +176,7 @@
 	vertical-align: middle;
 
 	> input {
+		width: 100%;
 		background: none transparent;
 		border: 0 none;
 		box-shadow: none;

diff --git a/scss/menu.scss b/scss/menu.scss
@@ -19,6 +19,7 @@
 	margin-top: -1px;
 	max-height: $select-menu-max-height;
 	position: absolute;
+	left: 0;
 	top: 100%;
 	width: 100%;
 	z-index: $select-menu-zindex;

diff --git a/src/Select.js b/src/Select.js
@@ -546,8 +546,8 @@ class Select extends React.Component {
 				this.focusStartOption();
 				break;
 			case 46: // delete
-				event.preventDefault();
 				if (!this.state.inputValue && this.props.deleteRemoves) {
+					event.preventDefault();
 					this.popValue();
 				}
 				break;
@@ -925,7 +925,7 @@ class Select extends React.Component {
 			);
 		}
 		return (
-			<div className={ className } key="input-wrap">
+			<div className={ className } key="input-wrap" style={{display: 'inline-block'}}>
 				<input id={this.props.id} {...inputProps} />
 			</div>
 		);