Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor ensureUpdateQueues to avoid returning a tuple #10437

Merged
merged 4 commits into from
Aug 28, 2017
Merged

Refactor ensureUpdateQueues to avoid returning a tuple #10437

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5a07c88
remove tuple
zombieJ Aug 14, 2017
5215475
clean up
zombieJ Aug 14, 2017
4690e50
prettier code
zombieJ Aug 14, 2017
787edfd
Use module-level varibles
zombieJ Aug 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions src/renderers/shared/fiber/ReactFiberUpdateQueue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ export type UpdateQueue = {
isProcessing?: boolean,
};

let _queue1;
let _queue2;

function comparePriority(a: PriorityLevel, b: PriorityLevel): number {
// When comparing update priorities, treat sync and Task work as equal.
// TODO: Could we avoid the need for this by always coercing sync priority
Expand Down Expand Up @@ -160,7 +163,7 @@ function findInsertionPosition(queue, update): Update | null {
return insertAfter;
}

function ensureUpdateQueues(fiber: Fiber): [UpdateQueue, UpdateQueue | null] {
function ensureUpdateQueues(fiber: Fiber) {
const alternateFiber = fiber.alternate;

let queue1 = fiber.updateQueue;
Expand All @@ -178,12 +181,9 @@ function ensureUpdateQueues(fiber: Fiber): [UpdateQueue, UpdateQueue | null] {
queue2 = null;
}

// TODO: Refactor to avoid returning a tuple.
return [
queue1,
// Return null if there is no alternate queue, or if its queue is the same.
queue2 !== queue1 ? queue2 : null,
];
_queue1 = queue1;
// Return null if there is no alternate queue, or if its queue is the same.
_queue2 = queue2 !== queue1 ? queue2 : null;
}

// The work-in-progress queue is a subset of the current queue (if it exists).
Expand Down Expand Up @@ -217,7 +217,9 @@ function ensureUpdateQueues(fiber: Fiber): [UpdateQueue, UpdateQueue | null] {
// If the update is cloned, it returns the cloned update.
function insertUpdate(fiber: Fiber, update: Update): Update | null {
// We'll have at least one and at most two distinct update queues.
const [queue1, queue2] = ensureUpdateQueues(fiber);
ensureUpdateQueues(fiber);
const queue1 = _queue1;
const queue2 = _queue2;

// Warn if an update is scheduled from inside an updater function.
if (__DEV__) {
Expand Down Expand Up @@ -370,7 +372,8 @@ function addTopLevelUpdate(
if (isTopLevelUnmount) {
// TODO: Redesign the top-level mount/update/unmount API to avoid this
// special case.
const [queue1, queue2] = ensureUpdateQueues(fiber);
const queue1 = _queue1;
const queue2 = _queue2;

// Drop all updates that are lower-priority, so that the tree is not
// remounted. We need to do this for both queues.
Expand Down