Merge 19ffa6e into 49bc058

TeamWertarbyte · Dec 29, 2018 · 3873af0 · 3873af0
2 parents 49bc058 + 19ffa6e
commit 3873af0
Show file tree

Hide file tree

Showing 11 changed files with 179 additions and 123 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
 node_modules
-lib
 .idea
 coverage
+lib
+styleguide
+.storybook
diff --git a/README.md b/README.md
@@ -54,7 +54,8 @@ import ChipInput from 'material-ui-chip-input'
 |InputLabelProps|`object`||Props to pass through to the `InputLabel`.|
 |InputProps|`object`||Props to pass through to the [`Input`](https://material-ui.com/api/input/).|
 |inputRef|`func`||Use this property to pass a ref callback to the native input component.|
-|label|`node`|||
+|inputValue|`string`||The input value (enables controlled mode for the text input if set).|
+|label|`node`||The content of the floating label.|
 |newChipKeyCodes|`arrayOf`|`[13]`|The key codes used to determine when to create a new chip.|
 |onAdd|`func`||Callback function that is called when a new chip was added (in controlled mode).|
 |onBeforeAdd|`func`||Callback function that is called with the chip to be added and should return true to add the chip or false to prevent the chip from being added without clearing the text input.|

diff --git a/package-lock.json b/package-lock.json