From 453826eec2f70f93047ff1ebbe68d41b52577817 Mon Sep 17 00:00:00 2001
From: Noah Lemen <noah.lemen@gmail.com>
Date: Mon, 28 Aug 2023 13:30:48 -0400
Subject: [PATCH] set priority on TaskController instead of on postTask/yield

---
 .../scheduler/src/__tests__/SchedulerPostTask-test.js  | 10 ++++++----
 packages/scheduler/src/forks/SchedulerPostTask.js      | 10 +++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/scheduler/src/__tests__/SchedulerPostTask-test.js b/packages/scheduler/src/__tests__/SchedulerPostTask-test.js
index d76ca570c2f31..c572ec595bb10 100644
--- a/packages/scheduler/src/__tests__/SchedulerPostTask-test.js
+++ b/packages/scheduler/src/__tests__/SchedulerPostTask-test.js
@@ -83,7 +83,8 @@ describe('SchedulerPostTask', () => {
     const scheduler = {};
     global.scheduler = scheduler;
 
-    scheduler.postTask = function (callback, {priority, signal}) {
+    scheduler.postTask = function (callback, {signal}) {
+      const {priority} = signal;
       const id = idCounter++;
       log(
         `Post Task ${id} [${priority === undefined ? '<default>' : priority}]`,
@@ -94,7 +95,8 @@ describe('SchedulerPostTask', () => {
       });
     };
 
-    scheduler.yield = function ({priority, signal}) {
+    scheduler.yield = function ({signal}) {
+      const {priority} = signal;
       const id = idCounter++;
       log(`Yield ${id} [${priority === undefined ? '<default>' : priority}]`);
       const controller = signal._controller;
@@ -111,8 +113,8 @@ describe('SchedulerPostTask', () => {
     };
 
     global.TaskController = class TaskController {
-      constructor() {
-        this.signal = {_controller: this};
+      constructor({priority}) {
+        this.signal = {_controller: this, priority};
       }
       abort() {
         const task = taskQueue.get(this);
diff --git a/packages/scheduler/src/forks/SchedulerPostTask.js b/packages/scheduler/src/forks/SchedulerPostTask.js
index 5af147117ef56..e5f45c06ce8c9 100644
--- a/packages/scheduler/src/forks/SchedulerPostTask.js
+++ b/packages/scheduler/src/forks/SchedulerPostTask.js
@@ -10,7 +10,7 @@
 import type {PriorityLevel} from '../SchedulerPriorities';
 
 declare class TaskController {
-  constructor(priority?: string): TaskController;
+  constructor(options?: {priority?: string}): TaskController;
   signal: mixed;
   abort(): void;
 }
@@ -95,9 +95,8 @@ export function unstable_scheduleCallback<T>(
       break;
   }
 
-  const controller = new TaskController();
+  const controller = new TaskController({priority: postTaskPriority});
   const postTaskOptions = {
-    priority: postTaskPriority,
     delay: typeof options === 'object' && options !== null ? options.delay : 0,
     signal: controller.signal,
   };
@@ -130,9 +129,10 @@ function runTask<T>(
     if (typeof result === 'function') {
       // Assume this is a continuation
       const continuation: SchedulerCallback<T> = (result: any);
-      const continuationController = new TaskController();
-      const continuationOptions = {
+      const continuationController = new TaskController({
         priority: postTaskPriority,
+      });
+      const continuationOptions = {
         signal: continuationController.signal,
       };
       // Update the original callback node's controller, since even though we're