Skip to content

[Fizz] Implement New Context #21255

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 9 commits into from
Apr 14, 2021
Merged

[Fizz] Implement New Context #21255

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cbc2d43
Add NewContext module
sebmarkbage Apr 12, 2021
cfbc68e
Implement recursive algorithm
sebmarkbage Apr 13, 2021
beb08e3
Move isPrimaryRenderer to ServerFormatConfig
sebmarkbage Apr 13, 2021
ea8f0dd
Wire up more element type matchers
sebmarkbage Apr 13, 2021
0459b9b
Wire up Context Provider type
sebmarkbage Apr 13, 2021
19fb829
Wire up Context Consumer
sebmarkbage Apr 13, 2021
99600c8
Test
sebmarkbage Apr 13, 2021
82bdc8b
Implement reader in class
sebmarkbage Apr 13, 2021
5acef5f
Update error codez
sebmarkbage Apr 13, 2021
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
Wire up Context Provider type
  • Loading branch information
@sebmarkbage
sebmarkbage committed Apr 13, 2021
commit 0459b9b0834e35330429def10f9f62732fa52f7d
4 changes: 2 additions & 2 deletions packages/react-server/src/ReactFizzNewContext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ export function pushProvider<T>(
return newNode;
}

export function popProvider<T>(context: ReactContext<T>): void {
export function popProvider<T>(context: ReactContext<T>): ContextSnapshot {
const prevSnapshot = currentActiveSnapshot;
invariant(
Copy link
Collaborator

@gaearon gaearon Apr 14, 2021

Choose a reason for hiding this comment

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

Why check this in prod?

Copy link
Collaborator Author

@sebmarkbage sebmarkbage Apr 14, 2021

Choose a reason for hiding this comment

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

It follows the principle that if it's getting checked by runtime type checks here anyway, it likely isn't a perf cost (other than the extra code). The prevSnapshot.context access after does that anyway.

prevSnapshot !== null,
Expand Down Expand Up @@ -263,7 +263,7 @@ export function popProvider<T>(context: ReactContext<T>): void {
context._currentRenderer2 = rendererSigil;
}
}
currentActiveSnapshot = prevSnapshot.parent;
return (currentActiveSnapshot = prevSnapshot.parent);
}

export function getActiveContext(): ContextSnapshot {
Expand Down
20 changes: 19 additions & 1 deletion packages/react-server/src/ReactFizzServer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ import {
rootContextSnapshot,
switchContext,
getActiveContext,
pushProvider,
popProvider,
} from './ReactFizzNewContext';

import {
Expand Down Expand Up @@ -748,7 +750,23 @@ function renderContextProvider(
type: ReactProviderType<any>,
props: Object,
): void {
throw new Error('Not yet implemented element type.');
const context = type._context;
const value = props.value;
const children = props.children;
let prevSnapshot;
if (__DEV__) {
prevSnapshot = task.context;
}
task.context = pushProvider(context, value);
renderNodeDestructive(request, task, children);
task.context = popProvider(context);
if (__DEV__) {
if (prevSnapshot !== task.context) {
console.error(
'Popping the context provider did not return back to the original snapshot. This is a bug in React.',
);
}
}
}

function renderLazyComponent(
Expand Down