Merge branch 'master' of https://github.com/Sharlaan/material-ui-supe…

…rselectfield into feature/typedefinitions

# Conflicts:
#	package.json

demo/src/CodeExample1.js

@@ -1,5 +1,5 @@
 import React, { Component } from 'react'
-import SuperSelectField from '../../src/SuperSelectField'
+import SuperSelectField from 'material-ui-superselectfield'
 
 const containerStyle = {
   padding: 40,

demo/src/CodeExample2.js

@@ -1,6 +1,6 @@
 import React, { Component } from 'react'
 import FlatButton from 'material-ui/FlatButton/FlatButton'
-import SuperSelectField from '../../src/SuperSelectField'
+import SuperSelectField from 'material-ui-superselectfield'
 
 const containerStyle = {
   padding: 40,

demo/src/CodeExample3.js

@@ -1,5 +1,5 @@
 import React, { Component } from 'react'
-import SuperSelectField from '../../src/SuperSelectField'
+import SuperSelectField from 'material-ui-superselectfield'
 import FlatButton from 'material-ui/FlatButton/FlatButton'
 import Chip from 'material-ui/Chip/Chip'
 import countries from './assets/countries'

demo/src/CodeExample4.js

@@ -1,5 +1,5 @@
 import React, { Component } from 'react'
-import SuperSelectField from '../../src/SuperSelectField'
+import SuperSelectField from 'material-ui-superselectfield'
 import Chip from 'material-ui/Chip/Chip'
 import continents from './assets/continents'
 import countries from './assets/countries'

demo/src/CodeExample5.js

@@ -1,6 +1,6 @@
 import React, { Component } from 'react'
 import CircularProgress from 'material-ui/CircularProgress/CircularProgress'
-import SuperSelectField from '../../src/SuperSelectField'
+import SuperSelectField from 'material-ui-superselectfield'
 import data from './assets/states'
 
 class CodeExample extends Component {

nwb.config.js

@@ -1,7 +1,14 @@
+const path = require('path')
+
 module.exports = {
   type: 'react-component',
   npm: {
     esModules: true,
     umd: false
+  },
+  webpack: {
+    aliases: {
+      'material-ui-superselectfield': path.resolve('src')
+    }
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "material-ui-superselectfield",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "original Material-UI's SelectField component enhanced with autocompletion, multiselection, custom renderers, and infinite loading.",
   "keywords": [
     "react",
@@ -43,7 +43,9 @@
     "start": "nwb serve-react-demo",
     "test": "nwb test-react",
     "test:coverage": "nwb test-react --coverage",
-    "test:watch": "nwb test-react --server"
+    "test:watch": "nwb test-react --server",
+    "storybook": "start-storybook -p 6006",
+    "build-storybook": "build-storybook"
   },
   "dependencies": {
     "react-infinite": "^0.12.1"
@@ -54,6 +56,9 @@
     "material-ui": ">= 0.17 < 1"
   },
   "devDependencies": {
+    "@storybook/addon-actions": "^3.2.15",
+    "@storybook/addon-links": "^3.2.15",
+    "@storybook/react": "^3.2.15",
     "enzyme": "^3.1.1",
     "enzyme-adapter-react-16": "^1.0.4",
     "eslint": "^4.10.0",
@@ -65,6 +70,7 @@
     "react-dom": "^16.1.0",
     "react-router": "^4.2.0",
     "react-router-dom": "^4.2.2",
-    "react-to-typescript-definitions": "^0.22.0"
+    "react-to-typescript-definitions": "^0.22.0",
+    "storybook-addon-material-ui": "^0.8.2"
   }
-}
+}

src/index.js

@@ -0,0 +1 @@
+export default from './SuperSelectField'