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

Jump to bottom

Don't warn about concurrently rendering contexts if we finished rendering #22797

Merged
merged 5 commits into from
Jan 12, 2023
Merged

Don't warn about concurrently rendering contexts if we finished rendering #22797

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
67b5c96
Expected behavior
eps1lon Nov 20, 2021
bb33098
Don't warn about concurrent provider renders if we finished rendering
eps1lon Nov 20, 2021
91b9705
Only need to reset in DEV since we only set in DEV
eps1lon Nov 20, 2021
2ab9b80
Restore currentRenderN instead of resetting it
eps1lon Mar 5, 2022
4e9a32e
Update packages/react-reconciler/src/__tests__/ReactNewContext-test.js
eps1lon Jan 11, 2023
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
27 changes: 26 additions & 1 deletion packages/react-reconciler/src/ReactFiberNewContext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,15 @@ import {REACT_SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED} from 'shared/ReactSymbols

const valueCursor: StackCursor<mixed> = createCursor(null);

let rendererCursorDEV: StackCursor<Object | null>;
if (__DEV__) {
rendererCursorDEV = createCursor(null);
}
let renderer2CursorDEV: StackCursor<Object | null>;
if (__DEV__) {
renderer2CursorDEV = createCursor(null);
}

let rendererSigil;
if (__DEV__) {
// Use this to detect multiple renderers using the same context
Expand Down Expand Up @@ -94,6 +103,8 @@ export function pushProvider<T>(

context._currentValue = nextValue;
if (__DEV__) {
push(rendererCursorDEV, context._currentRenderer, providerFiber);

if (
context._currentRenderer !== undefined &&
context._currentRenderer !== null &&
Expand All @@ -111,6 +122,8 @@ export function pushProvider<T>(

context._currentValue2 = nextValue;
if (__DEV__) {
push(renderer2CursorDEV, context._currentRenderer2, providerFiber);

if (
context._currentRenderer2 !== undefined &&
context._currentRenderer2 !== null &&
Expand All @@ -131,7 +144,7 @@ export function popProvider(
providerFiber: Fiber,
): void {
const currentValue = valueCursor.current;
pop(valueCursor, providerFiber);

if (isPrimaryRenderer) {
if (
enableServerContext &&
Expand All @@ -141,6 +154,11 @@ export function popProvider(
} else {
context._currentValue = currentValue;
}
if (__DEV__) {
const currentRenderer = rendererCursorDEV.current;
pop(rendererCursorDEV, providerFiber);
context._currentRenderer = currentRenderer;
}
} else {
if (
enableServerContext &&
Expand All @@ -150,7 +168,14 @@ export function popProvider(
} else {
context._currentValue2 = currentValue;
}
if (__DEV__) {
const currentRenderer2 = renderer2CursorDEV.current;
pop(renderer2CursorDEV, providerFiber);
context._currentRenderer2 = currentRenderer2;
}
}

pop(valueCursor, providerFiber);
}

export function scheduleContextWorkOnParentPath(
Expand Down
42 changes: 42 additions & 0 deletions packages/react-reconciler/src/__tests__/ReactNewContext-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,6 +874,48 @@ describe('ReactNewContext', () => {
}
});

it('warns not if multiple renderers finished rendering the same context', () => {
eps1lon marked this conversation as resolved.
Show resolved Hide resolved
spyOnDev(console, 'error');
const Context = React.createContext(0);

function Foo(props) {
Scheduler.unstable_yieldValue('Foo');
return null;
}

function App(props) {
return (
<Context.Provider value={props.value}>
<Foo />
<Foo />
</Context.Provider>
);
}

if (gate(flags => flags.enableSyncDefaultUpdates)) {
React.startTransition(() => {
ReactNoop.render(<App value={1} />);
});
} else {
ReactNoop.render(<App value={1} />);
}
expect(Scheduler).toFlushAndYield(['Foo', 'Foo']);
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The test above ("warns if multiple renderers concurrently render the same context") did not commit here. Without committing I would expect the warning. But here we actually commit so I don't think we should warn.


// Get a new copy of ReactNoop
jest.resetModules();
React = require('react');
ReactNoop = require('react-noop-renderer');
Scheduler = require('scheduler');

// Render the provider again using a different renderer
ReactNoop.render(<App value={1} />);
expect(Scheduler).toFlushAndYield(['Foo', 'Foo']);

if (__DEV__) {
expect(console.error).not.toHaveBeenCalled();
}
});

it('provider bails out if children and value are unchanged (like sCU)', () => {
const Context = React.createContext(0);

Expand Down