Merge pull request #310 from z2014/master

fix flex_item component

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-weui",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "weui for react",
   "main": "./build/packages/index.js",
   "scripts": {
@@ -33,8 +33,8 @@
   },
   "homepage": "https://github.com/weui/react-weui",
   "dependencies": {
-    "babel-runtime": "^6.18.0",
-    "prop-types": "^15.5.10",
+    "babel-runtime": "^6.26.0",
+    "prop-types": "^15.7.2",
     "weui": "^1.1.0"
   },
   "devDependencies": {
@@ -95,7 +95,7 @@
     "rollup": "^0.41.6",
     "rollup-plugin-babel": "^2.7.1",
     "rollup-plugin-commonjs": "^8.0.2",
-    "rollup-plugin-less": "^0.1.3",
+    "rollup-plugin-less": "0.1.3",
     "rollup-plugin-node-resolve": "^3.0.0",
     "rollup-plugin-progress": "^0.2.1",
     "rollup-plugin-replace": "^1.1.1",

src/components/flex/flex_item.js

@@ -8,8 +8,7 @@ import PropTypes from 'prop-types';
  *
  */
 const FlexItem = (props) => {
-    const { component, children, ...others } = props;
-    const Component = component;
+    const { Component, children, ...others } = props;
     return (
         <Component className="weui-flex__item" {...others}>
             { children }
@@ -22,11 +21,11 @@ FlexItem.propTypes = {
      * pass component to replace the component but maintaing style
      *
      */
-    component: PropTypes.node
+    Component: PropTypes.node
 };
 
 FlexItem.defaultProps = {
-    component: 'div'
+    Component: 'div'
 };
 
 export default FlexItem;

src/version.js

@@ -1 +1 @@
-export default '1.2.0';
+export default '1.2.2';