fix(wx-react): 修正didMount ,didFocus的执行顺序

areslabs · Jul 19, 2019 · c13e6e8 · c13e6e8
1 parent 5189ba2
commit c13e6e8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/packages/wx-react/miniprogram_dist/AllComponent.js b/packages/wx-react/miniprogram_dist/AllComponent.js
@@ -332,7 +332,7 @@ export class Component extends BaseComponent {
 
         render(subVnode, this, context, this._r, this._or, '_r')
 
-        // 一般发生于didFoucs里面的setState，此时还未调用firstUpdate
+        // firstRender既不是DONE，也不是PENDING，此时调用setState需要刷新_r数据
         if (this.firstRender !== FR_DONE) {
             return
         }

diff --git a/packages/wx-react/miniprogram_dist/WxNormalComp.js b/packages/wx-react/miniprogram_dist/WxNormalComp.js
@@ -9,7 +9,7 @@
 import {render, createElement, HocComponent, unstable_batchedUpdates} from "./index"
 import geneUUID from "./geneUUID"
 import instanceManager from "./InstanceManager"
-import {recursionUnmount} from './util'
+import {FR_DONE, recursionUnmount} from './util'
 
 
 export default function (CompMySelf, RNApp) {
@@ -97,7 +97,9 @@ export default function (CompMySelf, RNApp) {
 
         o.methods.onShow = function () {
             const compInst = instanceManager.getCompInstByUUID(this.data.diuu)
-            compInst.componentDidFocus && unstable_batchedUpdates(() => {
+
+            //如果组件还未初始化 didFocus方法，由firstUpdateUI负责
+            compInst.firstRender === FR_DONE && compInst.componentDidFocus && unstable_batchedUpdates(() => {
                 compInst.componentDidFocus()
             })
         }

diff --git a/packages/wx-react/miniprogram_dist/util.js b/packages/wx-react/miniprogram_dist/util.js
@@ -118,6 +118,11 @@ export function recursionMount(comp) {
     }
     comp.firstRender = FR_DONE
     comp.componentDidMount && comp.componentDidMount()
+
+    if (comp.isPageComp && !comp.hocWrapped && comp.componentDidFocus) {
+        comp.componentDidFocus()
+    }
+
     comp.firstRenderRes && comp.firstRenderRes()
 }