Merge branch 'develop'

Author: michael-braun

.babelrc

@@ -1,6 +1,8 @@
 {
   "presets": [
-    "es2015",
+    ["es2015", {
+      "modules": false
+    }],
     "stage-0",
     "react"
   ],

.gitignore

@@ -112,4 +112,5 @@ cert.txt
 
 lib
 /react-*/
-/polyfills/
+/polyfills/
+lib_esnext/

package-lock.json

@@ -1,13 +1,16 @@
 {
   "name": "chayns-components",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "some standalone react components",
   "main": "lib/index.js",
+  "jsnext:main": "lib_esnext/index.js",
   "scripts": {
     "start": "webpack-dev-server --config ./webpack/dev.babel.js",
     "prepublish": "npm run eslint & npm run build",
     "build": "npm run build:js && npm run build:sass",
-    "build:js": "babel src/ --out-dir ./lib",
+    "build:js": "npm run build:es5 & npm run build:es-next",
+    "build:es5": "babel src/ --out-dir ./lib",
+    "build:es-next": "babel --no-babelrc src/ --out-dir ./lib_esnext --presets=es2016,stage-0,react,minify --plugins=transform-decorators-legacy",
     "build:sass": "node-sass src/ -o ./lib",
     "eslint": "./node_modules/.bin/eslint src --ext .jsx --ext .js"
   },
@@ -22,9 +25,11 @@
     "babel-core": "^6.26.0",
     "babel-eslint": "^8.2.1",
     "babel-loader": "^7.1.2",
+    "babel-minify": "^0.2.0",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "babel-preset-env": "^1.6.1",
     "babel-preset-es2015": "^6.24.0",
+    "babel-preset-es2016": "^6.24.1",
     "babel-preset-react": "^6.23.0",
     "babel-preset-stage-0": "^6.22.0",
     "css-loader": "^0.28.8",

package.json

@@ -174,6 +174,7 @@ export default class AmountInput extends React.Component {
 
         return (
             <Input
+                type="number"
                 value={this.getInputValue()}
                 onChange={this.onInputChange}
                 className="cc__amount-control__input"

src/react-chayns-amountcontrol/component/AmountInput.jsx

@@ -112,8 +112,10 @@ export default class Checkbox extends React.Component {
                         className="switch"
                         ref={(ref) => { this._node = ref; }}
                         onChange={this.onChange}
-                        disabled={disabled}
                         id={this.id}
+                        disabled={disabled}
+                        checked={checked}
+                        defaultChecked={defaultChecked}
                     />
                     <label
                         htmlFor={this.id}

src/react-chayns-checkbox/component/Checkbox.jsx

@@ -23,6 +23,7 @@ The following properties can be set on the Input-Component
 
 | Property     | Description                                                                       | Type          | Default Value |
 |--------------|-----------------------------------------------------------------------------------|---------------|---------------|
+| type         | The type that should be set on the input (e.g. text, password, number)            | string        | "text"        |
 | style        | Additional styles that should be set to the input                                 | object        |               |
 | className    | Additional CSS-Classes that should be set to the button                           | string        |               |
 | placeholder  | Animated placeholder that will be shown inside the input                          | string        |               |

src/react-chayns-input/README.md

@@ -20,7 +20,8 @@ export default class Input extends React.Component {
         onBlur: PropTypes.func,
         responsive: PropTypes.bool,
         regExp: PropTypes.string,
-        inputRef: PropTypes.func
+        inputRef: PropTypes.func,
+        type: PropTypes.string,
     };
 
     static defaultProps = {
@@ -34,7 +35,8 @@ export default class Input extends React.Component {
         onChange: null,
         onBlur: null,
         regExp: null,
-        inputRef: null
+        inputRef: null,
+        type: 'text',
     };
 
     constructor(props) {
@@ -85,6 +87,7 @@ export default class Input extends React.Component {
 
     render() {
         const {
+            type,
             value,
             defaultValue,
             placeholder,
@@ -128,7 +131,7 @@ export default class Input extends React.Component {
                     onChange={this.onChange}
                     onBlur={this.onBlur}
                     className="input"
-                    type="text"
+                    type={type || 'text'}
                     required
                     {...other}
                 />
@@ -153,7 +156,7 @@ export default class Input extends React.Component {
                 onKeyUp={this.onKeyUp}
                 onChange={this.onChange}
                 onBlur={this.onBlur}
-                type="text"
+                type={type || 'text'}
                 required
                 {...other}
             />