Skip to content

Commit

Permalink
Merge branch 'master' into bugfix/webpack
Browse files Browse the repository at this point in the history
  • Loading branch information
ThinkTankShark committed Jun 15, 2017
2 parents 152627a + 49218a8 commit 536bcb7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ Below are is a sample of how to setup the loaders:
2. `npm test`

## History
# 0.3.4 - added ref crucial to 0.3.3 somehow missed in merge
* 0.3.3 - Workaround for nodeHeight.js not returning appropriate height in IE11
* 0.3.2 - Updates babel presets to babel-preset-latest
* 0.3.1 - Added transition update timeout so textinput waits on css transition before height calc
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ship-components-textinput",
"version": "0.3.3",
"version": "0.3.4",
"description": "Material Design Autosizing Text Input",
"main": "src/TextInput.jsx",
"scripts": {
Expand Down
5 changes: 4 additions & 1 deletion src/TextInput.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,10 @@ export default class TextInput extends React.Component {
}

return (
<div className={this.classNames()}>
<div
ref='wrapper'
className={this.classNames()}
>
<div className={css.fieldContainer}>
<textarea
placeholder={this.props.placeholder}
Expand Down

0 comments on commit 536bcb7

Please sign in to comment.