lib/appCtx - requesting update/delete for a node during hydration wil…

…l postpone the request for next idle
CrimsonChi · Jul 15, 2024 · 94fa564 · 94fa564
1 parent d3cdb52
commit 94fa564
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/packages/lib/src/appContext.ts b/packages/lib/src/appContext.ts
@@ -93,11 +93,21 @@ export class AppContext<T extends Record<string, unknown> = {}> {
 
   requestUpdate(node: VNode) {
     if (node.effectTag === EffectTag.DELETION) return
-    return this.scheduler?.queueUpdate(node)
+    if (renderMode.current === "hydrate") {
+      return this.scheduler?.nextIdle((s) => {
+        node.effectTag !== EffectTag.DELETION && s.queueUpdate(node)
+      })
+    }
+    this.scheduler?.queueUpdate(node)
   }
 
   requestDelete(node: VNode) {
     if (node.effectTag === EffectTag.DELETION) return
+    if (renderMode.current === "hydrate") {
+      return this.scheduler?.nextIdle((s) => {
+        node.effectTag !== EffectTag.DELETION && s.queueDelete(node)
+      })
+    }
     this.scheduler?.queueDelete(node)
   }
 

diff --git a/packages/lib/src/scheduler.ts b/packages/lib/src/scheduler.ts
@@ -16,7 +16,7 @@ export class Scheduler {
   private currentTreeIndex = 0
   private isRunning = false
   private queuedNodeEffectSets: Function[][] = []
-  private nextIdleEffects: Function[] = []
+  private nextIdleEffects: ((scheduler: this) => void)[] = []
   private deletions: VNode[] = []
   private frameDeadline = 0
   private pendingCallback: IdleRequestCallback | undefined
@@ -143,7 +143,7 @@ export class Scheduler {
     this.nodeEffects = []
   }
 
-  nextIdle(fn: () => void) {
+  nextIdle(fn: (scheduler: this) => void) {
     this.nextIdleEffects.push(fn)
   }
 
@@ -186,7 +186,7 @@ export class Scheduler {
     if (!this.nextUnitOfWork) {
       this.sleep()
       while (this.nextIdleEffects.length) {
-        this.nextIdleEffects.shift()!()
+        this.nextIdleEffects.shift()!(this)
       }
       return
     }