Skip to content

[suspense] Avoid double commit by re-rendering immediately and reusing primary children #14083

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

Merged
merged 4 commits into from
Nov 6, 2018
Merged

[suspense] Avoid double commit by re-rendering immediately and reusing primary children #14083

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
65948d8
Add a failing test for remounting fallback in sync mode
gaearon Nov 3, 2018
0b31e6b
Add failing test for stuck Suspense fallback
gaearon Nov 4, 2018
8fab1de
Avoid double commit by re-rendering immediately and reusing children
acdlite Nov 3, 2018
d046c96
Toggle visibility of Suspense children in mutation phase, not layout
acdlite Nov 5, 2018
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
Prev Previous commit
Next Next commit
Add failing test for stuck Suspense fallback
  • Loading branch information
@gaearon @acdlite
gaearon authored and acdlite committed Nov 6, 2018
commit 0b31e6ba0d66146ab1c7c31d22eab725627ed4a9
28 changes: 28 additions & 0 deletions packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,5 +690,33 @@ describe('ReactSuspense', () => {
);
expect(mounts).toBe(1);
});

it('does not get stuck with fallback in concurrent mode for a large delay', () => {
function App(props) {
return (
<Suspense maxDuration={10} fallback={<Text text="Loading..." />}>
<AsyncText ms={1000} text="Child 1" />
<AsyncText ms={7000} text="Child 2" />
</Suspense>
);
}

const root = ReactTestRenderer.create(<App />, {
unstable_isConcurrent: true,
});

expect(root).toFlushAndYield([
'Suspend! [Child 1]',
'Suspend! [Child 2]',
'Loading...',
]);
jest.advanceTimersByTime(1000);
expect(ReactTestRenderer).toHaveYielded(['Promise resolved [Child 1]']);
expect(root).toFlushAndYield(['Child 1', 'Suspend! [Child 2]']);
jest.advanceTimersByTime(6000);
expect(ReactTestRenderer).toHaveYielded(['Promise resolved [Child 2]']);
expect(root).toFlushAndYield(['Child 1', 'Child 2']);
expect(root).toMatchRenderedOutput(['Child 1', 'Child 2'].join(''));
});
});
});