Merge pull request #1 from weui/develop

n7best · n7best · commit ae3e4f4b33a4 · 2016-02-18T11:06:45.000-05:00
Develop
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,8 @@
 language: node_js
 node_js:
-  - "stable"
+  - stable
 script:
-  - npm test
+  - npm test
+  - npm run coverage
+after_script:
+    npm install coveralls && cat ./coverage/lcov.info | coveralls
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-WeUI 为微信Web服务量身设计  [![Build Status](https://travis-ci.org/weui/react-weui.svg?branch=master)](https://travis-ci.org/weui/react-weui) [![npm version](https://img.shields.io/npm/v/react-weui.svg)](https://www.npmjs.org/package/react-weui)
+WeUI 为微信Web服务量身设计  [![Build Status](https://travis-ci.org/weui/react-weui.svg?branch=master)](https://travis-ci.org/weui/react-weui) [![npm version](https://img.shields.io/npm/v/react-weui.svg)](https://www.npmjs.org/package/react-weui) [![Coverage Status](https://coveralls.io/repos/github/weui/react-weui/badge.svg?branch=master)](https://coveralls.io/github/weui/react-weui?branch=master)
 ====
 
 
diff --git a/docs/cell.md b/docs/cell.md
@@ -10,7 +10,6 @@
 属性名|类型|默认值|可选值|备注
 ------|----|------|------|----|
 access|bool|false | true, false| 控制Cell是否显示小箭头以及点击的Active态
-form  |bool|false | true, false| 当Cell内有表单元素时使用
 
 #### CellsTitle
 
@@ -100,4 +99,4 @@ body{
         text-overflow: ellipsis;
     }
 }
-```
+```
diff --git a/example/app.js b/example/app.js
@@ -6,7 +6,8 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { Router, Route} from 'react-router';
+import ReactCSSTransitionGroup from 'react-addons-css-transition-group';
+import { Router, Route, IndexRoute} from 'react-router';
 import WeUI from '../src/index';
 import 'weui';
 
@@ -21,17 +22,36 @@ import Article from './pages/article/index';
 import ActionSheet from './pages/actionsheet/index';
 import Icons from './pages/icons/index';
 
+class App extends React.Component {
+        render() {
+                return (
+                    <ReactCSSTransitionGroup
+                        component="div"
+                        transitionName="page"
+                        transitionEnterTimeout={500}
+                        transitionLeaveTimeout={500}
+                    >
+                            {React.cloneElement(this.props.children, {
+                                    key: this.props.location.pathname
+                            })}
+                    </ReactCSSTransitionGroup>
+                );
+        }
+}
+
 ReactDOM.render((
     <Router>
-        <Route path="/" component={Home}/>
-        <Route path="button" component={Button}/>
-        <Route path="cell" component={Cell}/>
-        <Route path="toast" component={Toast}/>
-        <Route path="dialog" component={Dialog}/>
-        <Route path="progress" component={Progress}/>
-        <Route path="msg" component={Msg}/>
-        <Route path="article" component={Article}/>
-        <Route path="actionsheet" component={ActionSheet}/>
-        <Route path="icons" component={Icons}/>
+            <Route path="/" component={App}>
+                    <IndexRoute component={Home}/>
+                    <Route path="button" component={Button}/>
+                    <Route path="cell" component={Cell}/>
+                    <Route path="toast" component={Toast}/>
+                    <Route path="dialog" component={Dialog}/>
+                    <Route path="progress" component={Progress}/>
+                    <Route path="msg" component={Msg}/>
+                    <Route path="article" component={Article}/>
+                    <Route path="actionsheet" component={ActionSheet}/>
+                    <Route path="icons" component={Icons}/>
+            </Route>
     </Router>
 ), document.getElementById('container'));
diff --git a/example/component/page.less b/example/component/page.less
@@ -1,11 +1,21 @@
 
-body{
+html, body, .container {
+    height: 100%;
+    overflow: hidden;
+}
+
+body {
     background-color: #FBF9FE;
 }
 
-.page{
+.page {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
     background-color: #FBF9FE;
-    .hd{
+    .hd {
         padding: 2em 0;
         .title {
             text-align: center;
@@ -20,13 +30,53 @@ body{
             font-size: 14px;
         }
     }
-    .bd{
-        &.spacing{
+    .bd {
+        &.spacing {
             padding: 0 15px;
         }
     }
+
+    &.cell {
+        .bd {
+            padding-bottom: 30px;
+        }
+    }
+
+    &.home {
+        &.page-enter {
+            z-index: 0;
+            opacity: 1;
+            transform: translate3d(0, 0, 0);
+            &.page-enter-active {
+
+            }
+        }
+        &.page-leave {
+            &.page-leave-active {
+                opacity: 1;
+                transform: translate3d(0, 0, 0);
+            }
+        }
+    }
 }
 
-.page.cell .bd {
-    padding-bottom: 30px;
+.page-enter {
+    z-index: 1024;
+    opacity: 0.01;
+    transform: translate3d(100%, 0, 0);
+    transition: all .2s ease;
+    &.page-enter-active {
+        opacity: 1;
+        transform: translate3d(0, 0, 0);
+    }
+}
+
+.page-leave {
+    opacity: 1;
+    transform: translate3d(0, 0, 0);
+    transition: all .2s ease;
+    &.page-leave-active {
+        opacity: 0.01;
+        transform: translate3d(100%, 0, 0);
+    }
 }
diff --git a/example/index.html b/example/index.html
@@ -6,7 +6,7 @@
     <title>react-weui</title>
 </head>
 <body ontouchstart>
-<div id="container"></div>
+<div class="container" id="container"></div>
 <script src="bundle.js"></script>
 </body>
 </html>
diff --git a/example/pages/cell/index.js b/example/pages/cell/index.js
@@ -164,10 +164,12 @@ export default class CellDemo extends React.Component {
                 <CellsTitle>文本域</CellsTitle>
                 <Form>
                     <FormCell>
-                        <TextArea placeholder="请输入评论" rows="3" maxlength="200"></TextArea>
+                        <CellBody>
+                            <TextArea placeholder="请输入评论" rows="3" maxlength="200"></TextArea>
+                        </CellBody>
                     </FormCell>
                 </Form>
             </Page>
         );
     }
-};
+};
diff --git a/package.json b/package.json
@@ -1,66 +1,67 @@
 {
-  "name": "react-weui",
-  "version": "0.2.0",
-  "description": "weui for react",
-  "main": "./lib",
-  "scripts": {
-    "start": "webpack-dev-server --devtool eval --progress --hot --colors --content-base example",
-    "clean": "rimraf ./lib ./coverage",
-    "build": "npm run clean & babel ./src --out-dir ./lib",
-    "lint": "eslint 'src/**/*.@(js|jsx)'",
-    "pretest": "npm run lint",
-    "test": "mocha --compilers js:babel-core/register --recursive",
-    "test:watch": "npm run test -- --watch",
-    "coverage": "npm run lint & istanbul cover _mocha -- --compilers js:babel-core/register --recursive"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/weui/react-weui.git"
-  },
-  "keywords": [
-    "mobile",
-    "ui",
-    "framework",
-    "weui",
-    "react"
-  ],
-  "author": "wechat ui team",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/weui/react-weui/issues"
-  },
-  "homepage": "https://github.com/weui/react-weui",
-  "dependencies": {
-    "classnames": "^2.2.0",
-    "history": "^1.17.0",
-    "react": "^0.14.2"
-  },
-  "devDependencies": {
-    "autoprefixer-loader": "^3.1.0",
-    "babel": "^5.8.23",
-    "babel-core": "^5.8.23",
-    "babel-eslint": "^4.1.6",
-    "babel-loader": "^5.3.2",
-    "css-loader": "^0.23.0",
-    "enzyme": "^1.1.0",
-    "eslint": "^1.10.3",
-    "eslint-plugin-react": "^3.11.3",
-    "file-loader": "^0.8.5",
-    "istanbul": "^0.4.1",
-    "less": "^2.5.3",
-    "less-loader": "^2.2.1",
-    "mocha": "^2.3.4",
-    "open-browser-webpack-plugin": "0.0.1",
-    "react-addons-test-utils": "^0.14.3",
-    "react-dom": "^0.14.2",
-    "react-router": "^1.0.2",
-    "rimraf": "^2.4.3",
-    "sinon": "^1.17.2",
-    "style-loader": "^0.13.0",
-    "uglify-loader": "^1.2.0",
-    "url-loader": "^0.5.7",
-    "webpack": "^1.12.2",
-    "webpack-dev-server": "^1.12.1",
-    "weui": "^0.3.0"
-  }
+    "name": "react-weui",
+    "version": "0.2.0",
+    "description": "weui for react",
+    "main": "./lib",
+    "scripts": {
+        "start": "webpack-dev-server --devtool eval --progress --hot --colors --content-base example",
+        "clean": "rimraf ./lib ./coverage",
+        "build": "npm run clean & babel ./src --out-dir ./lib",
+        "lint": "eslint 'src/**/*.@(js|jsx)'",
+        "pretest": "npm run lint",
+        "test": "mocha --compilers js:babel-core/register --recursive",
+        "test:watch": "npm run test -- --watch",
+        "coverage": "npm run lint & istanbul cover _mocha -- --compilers js:babel-core/register --recursive"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/weui/react-weui.git"
+    },
+    "keywords": [
+        "mobile",
+        "ui",
+        "framework",
+        "weui",
+        "react"
+    ],
+    "author": "wechat ui team",
+    "license": "MIT",
+    "bugs": {
+        "url": "https://github.com/weui/react-weui/issues"
+    },
+    "homepage": "https://github.com/weui/react-weui",
+    "dependencies": {
+        "classnames": "^2.2.0",
+        "history": "^1.17.0",
+        "react": "^0.14.2"
+    },
+    "devDependencies": {
+        "autoprefixer-loader": "^3.1.0",
+        "babel": "^5.8.23",
+        "babel-core": "^5.8.23",
+        "babel-eslint": "^4.1.6",
+        "babel-loader": "^5.3.2",
+        "css-loader": "^0.23.0",
+        "enzyme": "^1.1.0",
+        "eslint": "^1.10.3",
+        "eslint-plugin-react": "^3.11.3",
+        "file-loader": "^0.8.5",
+        "istanbul": "^0.4.1",
+        "less": "^2.5.3",
+        "less-loader": "^2.2.1",
+        "mocha": "^2.3.4",
+        "open-browser-webpack-plugin": "0.0.1",
+        "react-addons-css-transition-group": "^0.14.7",
+        "react-addons-test-utils": "^0.14.3",
+        "react-dom": "^0.14.2",
+        "react-router": "^1.0.2",
+        "rimraf": "^2.4.3",
+        "sinon": "^1.17.2",
+        "style-loader": "^0.13.0",
+        "uglify-loader": "^1.2.0",
+        "url-loader": "^0.5.7",
+        "webpack": "^1.12.2",
+        "webpack-dev-server": "^1.12.1",
+        "weui": "^0.3.0"
+    }
 }
diff --git a/src/components/cell/cells.js b/src/components/cell/cells.js
@@ -8,17 +8,28 @@ import React from 'react';
 import classNames from 'classnames';
 
 export default class Cells extends React.Component {
+    static propTypes = {
+        access: React.PropTypes.bool,
+        radio: React.PropTypes.bool,
+        checkbox: React.PropTypes.bool
+    };
+
+    static defaultProps = {
+        access: false,
+        radio: false,
+        checkbox: false
+    };
+
     render() {
-        const {children, className, access, radio, checkbox, form, ...others} = this.props;
+        const {children, className, access, radio, checkbox, ...others} = this.props;
         const cls = classNames({
             weui_cells: true,
             weui_cells_access: access,
-            weui_cells_form: form,
             [className]: className
         });
 
         return (
             <div className={cls} {...others}>{children}</div>
         );
     }
-};
+};
diff --git a/src/components/form/textarea.js b/src/components/form/textarea.js
diff --git a/src/components/input/input.js b/src/components/input/input.js

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-WeUI 为微信Web服务量身设计 [![Build Status](https://travis-ci.org/weui/react-weui.svg?branch=master)](https://travis-ci.org/weui/react-weui) [![npm version](https://img.shields.io/npm/v/react-weui.svg)](https://www.npmjs.org/package/react-weui)`
	`1`	`+WeUI 为微信Web服务量身设计 [![Build Status](https://travis-ci.org/weui/react-weui.svg?branch=master)](https://travis-ci.org/weui/react-weui) [![npm version](https://img.shields.io/npm/v/react-weui.svg)](https://www.npmjs.org/package/react-weui) [![Coverage Status](https://coveralls.io/repos/github/weui/react-weui/badge.svg?branch=master)](https://coveralls.io/github/weui/react-weui?branch=master)`
`2`	`2`	`====`
`3`	`3`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`属性名\|类型\|默认值\|可选值\|备注`
`11`	`11`	`------\|----\|------\|------\|----\|`
`12`	`12`	`access\|bool\|false \| true, false\| 控制Cell是否显示小箭头以及点击的Active态`
`13`		`-form \|bool\|false \| true, false\| 当Cell内有表单元素时使用`
`14`	`13`
`15`	`14`	`#### CellsTitle`
`16`	`15`
`@@ -100,4 +99,4 @@ body{`
`100`	`99`	`text-overflow: ellipsis;`
`101`	`100`	`}`
`102`	`101`	`}`
`103`		-```
	`102`	+```