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.

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

[Bugfix] Passive effects triggered by synchronous renders in a multi-root app #17347

Merged
merged 2 commits into from
Nov 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

'use strict';

const React = require('react');
let React;
let ReactFeatureFlags = require('shared/ReactFeatureFlags');

let ReactDOM;
Expand All @@ -26,6 +26,7 @@ describe('ReactDOMFiberAsync', () => {
beforeEach(() => {
jest.resetModules();
container = document.createElement('div');
React = require('react');
ReactDOM = require('react-dom');
Scheduler = require('scheduler');

Expand Down Expand Up @@ -587,6 +588,39 @@ describe('ReactDOMFiberAsync', () => {
);
});

it('regression test: does not drop passive effects across roots (#17066)', () => {
const {useState, useEffect} = React;

function App({label}) {
const [step, setStep] = useState(0);
useEffect(
() => {
if (step < 3) {
setStep(step + 1);
}
},
[step],
);

// The component should keep re-rendering itself until `step` is 3.
return step === 3 ? 'Finished' : 'Unresolved';
}

const containerA = document.createElement('div');
const containerB = document.createElement('div');
const containerC = document.createElement('div');

ReactDOM.render(<App label="A" />, containerA);
ReactDOM.render(<App label="B" />, containerB);
ReactDOM.render(<App label="C" />, containerC);

Scheduler.unstable_flushAll();

expect(containerA.textContent).toEqual('Finished');
expect(containerB.textContent).toEqual('Finished');
expect(containerC.textContent).toEqual('Finished');
});

describe('createBlockingRoot', () => {
it.experimental('updates flush without yielding in the next event', () => {
const root = ReactDOM.createBlockingRoot(container);
Expand Down
10 changes: 9 additions & 1 deletion packages/react-reconciler/src/ReactFiberWorkLoop.js
Original file line number Diff line number Diff line change
Expand Up @@ -1713,7 +1713,15 @@ function commitRoot(root) {
}

function commitRootImpl(root, renderPriorityLevel) {
flushPassiveEffects();
do {
// `flushPassiveEffects` will call `flushSyncUpdateQueue` at the end, which
// means `flushPassiveEffects` will sometimes result in additional
// passive effects. So we need to keep flushing in a loop until there are
// no more pending effects.
// TODO: Might be better if `flushPassiveEffects` did not automatically
// flush synchronous work at the end, to avoid factoring hazards like this.
flushPassiveEffects();
} while (rootWithPendingPassiveEffects !== null);
flushRenderPhaseStrictModeWarningsInDEV();

invariant(
Expand Down