fix(redux): props传递 && 组件卸载时执行顺序

NervJS · Apr 22, 2018 · ec56a1e · ec56a1e
1 parent 0a5b715
commit ec56a1e
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/packages/taro-redux/src/connect/connect.js b/packages/taro-redux/src/connect/connect.js
@@ -27,8 +27,7 @@ export default function connect (mapStateToProps, mapDispatchToProps) {
     let unSubscribe = null
     return class Connect extends Component {
       constructor () {
-        super(...arguments)
-        this.props = Object.assign(this.props, initMapState, initMapDispatch)
+        super(Object.assign(initMapState, initMapDispatch))
         Object.keys(initMapDispatch).forEach(key => {
           this[`__event_${key}`] = initMapDispatch[key]
         })
@@ -43,13 +42,13 @@ export default function connect (mapStateToProps, mapDispatchToProps) {
       }
 
       componentWillUnmount () {
+        if (super.componentWillUnmount) {
+          super.componentWillUnmount()
+        }
         if (unSubscribe) {
           unSubscribe()
         }
         unSubscribe = null
-        if (super.componentWillUnmount) {
-          super.componentWillUnmount()
-        }
       }
     }
   }