fix: onError 对应的生命周期应是 componentDidCatchError (#2571)

NervJS · Mar 25, 2019 · abbe73f · abbe73f
1 parent ed7e73f
commit abbe73f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/docs/taroize.md b/docs/taroize.md
@@ -137,7 +137,7 @@ Taro 会将原始文件的生命周期钩子函数转换为 Taro 的生命周期
 | onHide | componentDidHide |
 | onReady | componentDidMount |
 | onUnload | componentWillUnmount |
-| onError | componentCatchError |
+| onError | componentDidCatchError |
 | App.onLaunch | componentWillMount |
 | Component.created | componentWillMount |
 | attached | componentDidMount |

diff --git a/packages/taro-cli/__tests__/__snapshots__/rn.test.js.snap b/packages/taro-cli/__tests__/__snapshots__/rn.test.js.snap
@@ -19,7 +19,7 @@ let App = (_temp = _class = class App extends Component {
   componentDidMount() {}
   componentDidShow() {}
   componentDidHide() {}
-  componentCatchError() {}
+  componentDidCatchError() {}
   render() {
     return <RootStack />;
   }
@@ -79,7 +79,7 @@ let App = (_temp = _class = class App extends Component {
 
   componentDidHide() {}
 
-  componentCatchError() {}
+  componentDidCatchError() {}
 
   render() {
     return <RootStack />;
@@ -161,7 +161,7 @@ let App = (_temp = _class = class App extends Component {
 
   componentDidHide() {}
 
-  componentCatchError() {}
+  componentDidCatchError() {}
 
   render() {
     return <Provider store={store}>
@@ -217,7 +217,7 @@ let App = (_temp = _class = class App extends Component {
 
   componentDidHide() {}
 
-  componentCatchError() {}
+  componentDidCatchError() {}
 
   render() {
     return <RootStack />;

diff --git a/packages/taro-cli/__tests__/mocks/app.js b/packages/taro-cli/__tests__/mocks/app.js
@@ -51,7 +51,7 @@ class App extends Component {
 
   componentDidHide () {}
 
-  componentCatchError () {}
+  componentDidCatchError () {}
 
   render () {
     return (
@@ -88,7 +88,7 @@ class App extends Component {
 
   componentDidHide () {}
 
-  componentCatchError () {}
+  componentDidCatchError () {}
 
   render () {
     return (
@@ -133,7 +133,7 @@ class App extends Component {
 
   componentDidHide () {}
 
-  componentCatchError () {}
+  componentDidCatchError () {}
 
   render () {
     return (

diff --git a/packages/taro-cli/templates/redux/appjs b/packages/taro-cli/templates/redux/appjs
@@ -49,8 +49,6 @@ class App extends Component {
 
   componentDidHide () {}
 
-  componentCatchError () {}
-
   componentDidCatchError () {}
 
   // 在 App 类中的 render() 函数没有实际作用

diff --git a/packages/taroize/src/lifecycle.ts b/packages/taroize/src/lifecycle.ts
@@ -12,7 +12,7 @@ export const enum Lifecycle {
   componentDidMoved = 'componentDidMoved',
   shouldComponentUpdate = 'shouldComponentUpdate',
   componentWillReceiveProps = 'componentWillReceiveProps',
-  componentCatchError = 'componentCatchError'
+  componentDidCatchError = 'componentDidCatchError'
 }
 
 export const PageLifecycle = new Map<string, string>()
@@ -22,5 +22,5 @@ PageLifecycle.set('onShow', Lifecycle.componentDidShow)
 PageLifecycle.set('onReady', Lifecycle.componentDidMount)
 PageLifecycle.set('onHide', Lifecycle.componentDidHide)
 PageLifecycle.set('onUnload', Lifecycle.componentWillUnmount)
-PageLifecycle.set('onError', Lifecycle.componentCatchError)
+PageLifecycle.set('onError', Lifecycle.componentDidCatchError)
 PageLifecycle.set('onLaunch', Lifecycle.componentWillMount)