From 5158bda5df1cb166f59435966803152a8e3df09f Mon Sep 17 00:00:00 2001 From: "David K. Coleman" Date: Thu, 22 Feb 2018 10:56:39 -0500 Subject: [PATCH] fix merge conflicts with PR #2174 looks like I missed this one line after reviewing my diff remove dist restore old dist revert this Merge remote-tracking branch 'origin/master' --- .gitignore | 4 + HISTORY.md | 7 + README.md | 4 +- bower.json | 2 +- dist/react-select.css | 426 ------ dist/react-select.es.js | 2663 ------------------------------------ dist/react-select.js | 2674 ------------------------------------- dist/react-select.min.css | 1 - dist/react-select.min.js | 1 - less/menu.less | 1 + lib/Select.js | 4 +- package.json | 2 +- scss/control.scss | 1 + scss/menu.scss | 1 + src/Option.js | 2 +- src/Select.js | 39 +- 16 files changed, 42 insertions(+), 5790 deletions(-) delete mode 100644 dist/react-select.css delete mode 100644 dist/react-select.es.js delete mode 100644 dist/react-select.js delete mode 100644 dist/react-select.min.css delete mode 100644 dist/react-select.min.js diff --git a/.gitignore b/.gitignore index 39fb330d7d..8330851ec1 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,7 @@ bower_components .DS_Store .env yarn.lock + +# v2 ignores +.NOTES.md +.TODO.md diff --git a/HISTORY.md b/HISTORY.md index cc8eac4e34..c106ee42d6 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,12 @@ # React-Select +## v1.2.1 / 2018-01-13 + +* Fixed blocking the Del key when deleteRemoves is false, thanks [Nachtigall, Jens (init)](https://github.com/jnachtigall) - [see PR](https://github.com/JedWatson/react-select/pull/2291) +* Fixed inline-block rendering for arrowRenderer without autosize, thanks [Harry Kao](https://github.com/harrykao) - [see PR](https://github.com/JedWatson/react-select/pull/2276) +* Fixed dropdown menu positioning issues in IE 11, thanks [jharris4](https://github.com/jharris4) - [see PR](https://github.com/JedWatson/react-select/pull/2273) +* Added missing rule to the `scss` stylesheet, thanks [Jordan Whitfield](https://github.com/mantissa7) - [see PR](https://github.com/JedWatson/react-select/pull/2280) + ## v1.2.0 / 2018-01-08 * Source cleanup, thanks to [Yuri S](https://github.com/yuri-sakharov) and diff --git a/README.md b/README.md index da44290f20..e15ae95e2a 100644 --- a/README.md +++ b/README.md @@ -66,8 +66,8 @@ class App extends React.Component { console.log(`Selected: ${selectedOption.label}`); } render() { - const { selectedOption } = this.state; - const value = selectedOption && selectedOption.value; + const { selectedOption } = this.state; + const value = selectedOption && selectedOption.value; return ( tag with this field name for html forms - noResultsText: stringOrNode, // placeholder displayed when there are no matching search results - onBlur: PropTypes.func, // onBlur handler: function (event) {} - onBlurResetsInput: PropTypes.bool, // whether input is cleared on blur - onChange: PropTypes.func, // onChange handler: function (newValue) {} - onClose: PropTypes.func, // fires when the menu is closed - onCloseResetsInput: PropTypes.bool, // whether input is cleared when menu is closed through the arrow - onFocus: PropTypes.func, // onFocus handler: function (event) {} - onInputChange: PropTypes.func, // onInputChange handler: function (inputValue) {} - onInputKeyDown: PropTypes.func, // input keyDown handler: function (event) {} - onMenuScrollToBottom: PropTypes.func, // fires when the menu is scrolled to the bottom; can be used to paginate options - onOpen: PropTypes.func, // fires when the menu is opened - onSelectResetsInput: PropTypes.bool, // whether input is cleared on select (works only for multiselect) - onValueClick: PropTypes.func, // onClick handler for value labels: function (value, event) {} - openOnClick: PropTypes.bool, // boolean to control opening the menu when the control is clicked - openOnFocus: PropTypes.bool, // always open options menu on focus - optionClassName: PropTypes.string, // additional class(es) to apply to the