Facebook/react
1
0
Fork 0
mirror of https://github.com/facebook/react.git synced 2025-11-01 09:12:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify logic for mutable workInProgressSources (#18920)

Browse Source 
isPrimaryRenderer is always constant for a given React build, so these two arrays do nothing.
This commit is contained in:
Sophie Alpert
2020-05-14 14:30:44 -07:00
committed by GitHub
parent 0fb747f368
commit 21dc41c320
2 changed files with 16 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-reconciler/src/ReactMutableSource.new.js
+8 -18
View File
@@ -14,8 +14,7 @@ import {isPrimaryRenderer} from './ReactFiberHostConfig';
// Work in progress version numbers only apply to a single render,
// and should be reset before starting a new render.
// This tracks which mutable sources need to be reset after a render.
const workInProgressPrimarySources: Array<MutableSource<any>> = [];
const workInProgressSecondarySources: Array<MutableSource<any>> = [];
const workInProgressSources: Array<MutableSource<any>> = [];
let rendererSigil;
if (__DEV__) {
@@ -24,27 +23,19 @@ if (__DEV__) {
}
export function markSourceAsDirty(mutableSource: MutableSource<any>): void {
if (isPrimaryRenderer) {
workInProgressPrimarySources.push(mutableSource);
} else {
workInProgressSecondarySources.push(mutableSource);
}
workInProgressSources.push(mutableSource);
}
export function resetWorkInProgressVersions(): void {
if (isPrimaryRenderer) {
for (let i = 0; i < workInProgressPrimarySources.length; i++) {
const mutableSource = workInProgressPrimarySources[i];
for (let i = 0; i < workInProgressSources.length; i++) {
const mutableSource = workInProgressSources[i];
if (isPrimaryRenderer) {
mutableSource._workInProgressVersionPrimary = null;
}
workInProgressPrimarySources.length = 0;
} else {
for (let i = 0; i < workInProgressSecondarySources.length; i++) {
const mutableSource = workInProgressSecondarySources[i];
} else {
mutableSource._workInProgressVersionSecondary = null;
}
workInProgressSecondarySources.length = 0;
}
workInProgressSources.length = 0;
}
export function getWorkInProgressVersion(
@@ -63,11 +54,10 @@ export function setWorkInProgressVersion(
): void {
if (isPrimaryRenderer) {
mutableSource._workInProgressVersionPrimary = version;
workInProgressPrimarySources.push(mutableSource);
} else {
mutableSource._workInProgressVersionSecondary = version;
workInProgressSecondarySources.push(mutableSource);
}
workInProgressSources.push(mutableSource);
}
export function warnAboutMultipleRenderersDEV(
packages/react-reconciler/src/ReactMutableSource.old.js
+8 -18
View File
@@ -17,8 +17,7 @@ import {NoWork} from './ReactFiberExpirationTime.old';
// Work in progress version numbers only apply to a single render,
// and should be reset before starting a new render.
// This tracks which mutable sources need to be reset after a render.
const workInProgressPrimarySources: Array<MutableSource<any>> = [];
const workInProgressSecondarySources: Array<MutableSource<any>> = [];
const workInProgressSources: Array<MutableSource<any>> = [];
let rendererSigil;
if (__DEV__) {
@@ -55,27 +54,19 @@ export function setPendingExpirationTime(
}
export function markSourceAsDirty(mutableSource: MutableSource<any>): void {
if (isPrimaryRenderer) {
workInProgressPrimarySources.push(mutableSource);
} else {
workInProgressSecondarySources.push(mutableSource);
}
workInProgressSources.push(mutableSource);
}
export function resetWorkInProgressVersions(): void {
if (isPrimaryRenderer) {
for (let i = 0; i < workInProgressPrimarySources.length; i++) {
const mutableSource = workInProgressPrimarySources[i];
for (let i = 0; i < workInProgressSources.length; i++) {
const mutableSource = workInProgressSources[i];
if (isPrimaryRenderer) {
mutableSource._workInProgressVersionPrimary = null;
}
workInProgressPrimarySources.length = 0;
} else {
for (let i = 0; i < workInProgressSecondarySources.length; i++) {
const mutableSource = workInProgressSecondarySources[i];
} else {
mutableSource._workInProgressVersionSecondary = null;
}
workInProgressSecondarySources.length = 0;
}
workInProgressSources.length = 0;
}
export function getWorkInProgressVersion(
@@ -94,11 +85,10 @@ export function setWorkInProgressVersion(
): void {
if (isPrimaryRenderer) {
mutableSource._workInProgressVersionPrimary = version;
workInProgressPrimarySources.push(mutableSource);
} else {
mutableSource._workInProgressVersionSecondary = version;
workInProgressSecondarySources.push(mutableSource);
}
workInProgressSources.push(mutableSource);
}
export function warnAboutMultipleRenderersDEV(