fix(scheduler): adjust yield timing logic to improve task scheduling …

.changeset/fast-geckos-kiss.md

@@ -0,0 +1,5 @@
+---
+"solid-js": patch
+---
+
+fix(scheduler): adjust yield timing logic to improve task scheduling …

packages/solid/src/reactive/scheduler.ts

@@ -20,8 +20,9 @@ let taskIdCounter = 1,
   yieldInterval = 5,
   deadline = 0,
   maxYieldInterval = 300,
+  maxDeadline = 0,
   scheduleCallback: (() => void) | null = null,
-  scheduledCallback: ((hasTimeRemaining: boolean, initialTime: number) => boolean) | null = null;
+  scheduledCallback: ((initialTime: number) => boolean) | null = null;
 
 const maxSigned31BitInt = 1073741823;
 /* istanbul ignore next */
@@ -33,9 +34,9 @@ function setupScheduler() {
     if (scheduledCallback !== null) {
       const currentTime = performance.now();
       deadline = currentTime + yieldInterval;
-      const hasTimeRemaining = true;
+      maxDeadline = currentTime + maxYieldInterval;
       try {
-        const hasMoreWork = scheduledCallback(hasTimeRemaining, currentTime);
+        const hasMoreWork = scheduledCallback(currentTime);
         if (!hasMoreWork) {
           scheduledCallback = null;
         } else port.postMessage(null);
@@ -70,7 +71,7 @@ function setupScheduler() {
         }
         // There's no pending input. Only yield if we've reached the max
         // yield interval.
-        return currentTime >= maxYieldInterval;
+        return currentTime >= maxDeadline;
       } else {
         // There's still time left in the frame.
         return false;
@@ -128,23 +129,23 @@ export function cancelCallback(task: Task) {
   task.fn = null;
 }
 
-function flushWork(hasTimeRemaining: boolean, initialTime: number) {
+function flushWork(initialTime: number) {
   // We'll need a host callback the next time work is scheduled.
   isCallbackScheduled = false;
   isPerformingWork = true;
   try {
-    return workLoop(hasTimeRemaining, initialTime);
+    return workLoop(initialTime);
   } finally {
     currentTask = null;
     isPerformingWork = false;
   }
 }
 
-function workLoop(hasTimeRemaining: boolean, initialTime: number) {
+function workLoop(initialTime: number) {
   let currentTime = initialTime;
   currentTask = taskQueue[0] || null;
   while (currentTask !== null) {
-    if (currentTask.expirationTime > currentTime && (!hasTimeRemaining || shouldYieldToHost!())) {
+    if (currentTask.expirationTime > currentTime && shouldYieldToHost!()) {
       // This currentTask hasn't expired, and we've reached the deadline.
       break;
     }