@mpxjs/core 2.8.23 → 2.8.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.8.23",
+  "version": "2.8.24",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -47,5 +47,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "8d573d2c89a59e94ac464a42ef022a38441ac541"
+  "gitHead": "f019e3d3dc8b0c512e3e0f95f3f0b47f716e576c"
 }

package/src/core/proxy.js

@@ -507,7 +507,7 @@ export default class MpxProxy {
   initRender () {
     if (this.options.__nativeRender__) return this.doRender()
 
-    this.effect = new ReactiveEffect(() => {
+    const effect = this.effect = new ReactiveEffect(() => {
       if (this.target.__injectedRender) {
         try {
           return this.target.__injectedRender()
@@ -520,8 +520,10 @@ export default class MpxProxy {
       }
     }, () => queueJob(update), this.scope)
 
-    const update = this.effect.run.bind(this.effect)
+    const update = this.update = this.effect.run.bind(this.effect)
     update.id = this.uid
+    // render effect允许自触发
+    effect.allowRecurse = update.allowRecurse = true
     update()
   }
 

package/src/observer/effect.js

@@ -10,6 +10,7 @@ export class ReactiveEffect {
   newDeps = []
   depIds = new Set()
   newDepIds = new Set()
+  allowRecurse = false
 
   constructor (
     fn,
@@ -69,12 +70,12 @@ export class ReactiveEffect {
   // same as trigger
   update () {
     // avoid dead cycle
-    // sometimes may be not dead cycle, depend on scheduler to avoid it.
-    // if (Dep.target === this) return
-    if (this.pausedState !== PausedState.resumed) {
-      this.pausedState = PausedState.dirty
-    } else {
-      this.scheduler ? this.scheduler() : this.run()
+    if (Dep.target !== this || this.allowRecurse) {
+      if (this.pausedState !== PausedState.resumed) {
+        this.pausedState = PausedState.dirty
+      } else {
+        this.scheduler ? this.scheduler() : this.run()
+      }
     }
   }