mirror of
https://github.com/facebook/react.git
synced 2026-11-18 20:15:56 +00:00
Improved suspense support in ReactDOMServer (#14161)
This commit is contained in:
1 parent
4b163fee1c
commit
02e4848e3a
2 files changed
+103
-21
No files matched your search
@@ -43,16 +43,48 @@ describe('ReactDOMServerSuspense', () => {
|
||||
resetModules();
|
||||
});
|
||||
|
||||
it('should always render the fallback when a placeholder is encountered', async () => {
|
||||
const Suspended = props => {
|
||||
throw new Promise(() => {});
|
||||
};
|
||||
function Text(props) {
|
||||
return <div>{props.text}</div>;
|
||||
}
|
||||
|
||||
function AsyncText(props) {
|
||||
throw new Promise(() => {});
|
||||
}
|
||||
|
||||
it('should render the children when no promise is thrown', async () => {
|
||||
const e = await serverRender(
|
||||
<React.Suspense fallback={<div />}>
|
||||
<Suspended />
|
||||
<React.Suspense fallback={<Text text="Fallback" />}>
|
||||
<Text text="Children" />
|
||||
</React.Suspense>,
|
||||
);
|
||||
|
||||
expect(e.tagName).toBe('DIV');
|
||||
expect(e.textContent).toBe('Children');
|
||||
});
|
||||
|
||||
it('should render the fallback when a promise thrown', async () => {
|
||||
const e = await serverRender(
|
||||
<React.Suspense fallback={<Text text="Fallback" />}>
|
||||
<AsyncText text="Children" />
|
||||
</React.Suspense>,
|
||||
);
|
||||
|
||||
expect(e.tagName).toBe('DIV');
|
||||
expect(e.textContent).toBe('Fallback');
|
||||
});
|
||||
|
||||
it('should work with nested suspense components', async () => {
|
||||
const e = await serverRender(
|
||||
<React.Suspense fallback={<Text text="Fallback" />}>
|
||||
<div>
|
||||
<Text text="Children" />
|
||||
<React.Suspense fallback={<Text text="Fallback" />}>
|
||||
<AsyncText text="Children" />
|
||||
</React.Suspense>
|
||||
</div>
|
||||
</React.Suspense>,
|
||||
);
|
||||
|
||||
expect(e.innerHTML).toBe('<div>Children</div><div>Fallback</div>');
|
||||
});
|
||||
});
|
||||
+65
-15
@@ -707,6 +707,7 @@ type Frame = {
|
||||
type: mixed,
|
||||
domNamespace: string,
|
||||
children: FlatReactChildren,
|
||||
fallbackFrame?: Frame,
|
||||
childIndex: number,
|
||||
context: Object,
|
||||
footer: string,
|
||||
@@ -723,6 +724,7 @@ class ReactDOMServerRenderer {
|
||||
currentSelectValue: any;
|
||||
previousWasTextNode: boolean;
|
||||
makeStaticMarkup: boolean;
|
||||
suspenseDepth: number;
|
||||
|
||||
contextIndex: number;
|
||||
contextStack: Array<ReactContext<any>>;
|
||||
@@ -750,6 +752,7 @@ class ReactDOMServerRenderer {
|
||||
this.currentSelectValue = null;
|
||||
this.previousWasTextNode = false;
|
||||
this.makeStaticMarkup = makeStaticMarkup;
|
||||
this.suspenseDepth = 0;
|
||||
|
||||
// Context (new API)
|
||||
this.contextIndex = -1;
|
||||
@@ -825,16 +828,18 @@ class ReactDOMServerRenderer {
|
||||
ReactCurrentOwner.currentDispatcher = DispatcherWithoutHooks;
|
||||
}
|
||||
try {
|
||||
let out = '';
|
||||
while (out.length < bytes) {
|
||||
// Markup generated within <Suspense> ends up buffered until we know
|
||||
// nothing in that boundary suspended
|
||||
let out = [''];
|
||||
let suspended = false;
|
||||
while (out[0].length < bytes) {
|
||||
if (this.stack.length === 0) {
|
||||
this.exhausted = true;
|
||||
break;
|
||||
}
|
||||
const frame: Frame = this.stack[this.stack.length - 1];
|
||||
if (frame.childIndex >= frame.children.length) {
|
||||
if (suspended || frame.childIndex >= frame.children.length) {
|
||||
const footer = frame.footer;
|
||||
out += footer;
|
||||
if (footer !== '') {
|
||||
this.previousWasTextNode = false;
|
||||
}
|
||||
@@ -848,26 +853,57 @@ class ReactDOMServerRenderer {
|
||||
) {
|
||||
const provider: ReactProvider<any> = (frame.type: any);
|
||||
this.popProvider(provider);
|
||||
} else if (frame.type === REACT_SUSPENSE_TYPE) {
|
||||
this.suspenseDepth--;
|
||||
const buffered = out.pop();
|
||||
|
||||
if (suspended) {
|
||||
suspended = false;
|
||||
// If rendering was suspended at this boundary, render the fallbackFrame
|
||||
const fallbackFrame = frame.fallbackFrame;
|
||||
invariant(
|
||||
fallbackFrame,
|
||||
'suspense fallback not found, something is broken',
|
||||
);
|
||||
this.stack.push(fallbackFrame);
|
||||
// Skip flushing output since we're switching to the fallback
|
||||
continue;
|
||||
} else {
|
||||
out[this.suspenseDepth] += buffered;
|
||||
}
|
||||
}
|
||||
|
||||
// Flush output
|
||||
out[this.suspenseDepth] += footer;
|
||||
continue;
|
||||
}
|
||||
const child = frame.children[frame.childIndex++];
|
||||
|
||||
let outBuffer = '';
|
||||
if (__DEV__) {
|
||||
pushCurrentDebugStack(this.stack);
|
||||
// We're starting work on this frame, so reset its inner stack.
|
||||
((frame: any): FrameDev).debugElementStack.length = 0;
|
||||
try {
|
||||
// Be careful! Make sure this matches the PROD path below.
|
||||
out += this.render(child, frame.context, frame.domNamespace);
|
||||
} finally {
|
||||
}
|
||||
try {
|
||||
outBuffer += this.render(child, frame.context, frame.domNamespace);
|
||||
} catch (err) {
|
||||
if (enableSuspenseServerRenderer && typeof err.then === 'function') {
|
||||
suspended = true;
|
||||
} else {
|
||||
throw err;
|
||||
}
|
||||
} finally {
|
||||
if (__DEV__) {
|
||||
popCurrentDebugStack();
|
||||
}
|
||||
} else {
|
||||
// Be careful! Make sure this matches the DEV path above.
|
||||
out += this.render(child, frame.context, frame.domNamespace);
|
||||
}
|
||||
if (out.length <= this.suspenseDepth) {
|
||||
out.push('');
|
||||
}
|
||||
out[this.suspenseDepth] += outBuffer;
|
||||
}
|
||||
return out;
|
||||
return out[0];
|
||||
} finally {
|
||||
ReactCurrentOwner.currentDispatcher = prevDispatcher;
|
||||
}
|
||||
@@ -960,13 +996,25 @@ class ReactDOMServerRenderer {
|
||||
}
|
||||
case REACT_SUSPENSE_TYPE: {
|
||||
if (enableSuspenseServerRenderer) {
|
||||
const nextChildren = toArray(
|
||||
// Always use the fallback when synchronously rendering to string.
|
||||
const fallbackChildren = toArray(
|
||||
((nextChild: any): ReactElement).props.fallback,
|
||||
);
|
||||
const frame: Frame = {
|
||||
const nextChildren = toArray(
|
||||
((nextChild: any): ReactElement).props.children,
|
||||
);
|
||||
const fallbackFrame: Frame = {
|
||||
type: null,
|
||||
domNamespace: parentNamespace,
|
||||
children: fallbackChildren,
|
||||
childIndex: 0,
|
||||
context: context,
|
||||
footer: '',
|
||||
out: '',
|
||||
};
|
||||
const frame: Frame = {
|
||||
fallbackFrame,
|
||||
type: REACT_SUSPENSE_TYPE,
|
||||
domNamespace: parentNamespace,
|
||||
children: nextChildren,
|
||||
childIndex: 0,
|
||||
context: context,
|
||||
@@ -974,8 +1022,10 @@ class ReactDOMServerRenderer {
|
||||
};
|
||||
if (__DEV__) {
|
||||
((frame: any): FrameDev).debugElementStack = [];
|
||||
((fallbackFrame: any): FrameDev).debugElementStack = [];
|
||||
}
|
||||
this.stack.push(frame);
|
||||
this.suspenseDepth++;
|
||||
return '';
|
||||
} else {
|
||||
invariant(false, 'ReactDOMServer does not yet support Suspense.');
|
||||
|
||||
Reference in new issue
Block a user