Skip to content
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
5 changes: 5 additions & 0 deletions .changeset/heavy-sloths-cry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'preact-render-to-string': patch
---

Ensure that in streaming mode throwing a suspension multiple times from the same component works
36 changes: 22 additions & 14 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -380,11 +380,12 @@ function _renderToString(

try {
rendered = type.call(component, props, cctx);
} catch (e) {
if (asyncMode) {
} catch (error) {
if (asyncMode && error && typeof error.then == 'function') {
vnode._suspended = true;
}
throw e;

throw error;
}
}

Expand Down Expand Up @@ -508,17 +509,24 @@ function _renderToString(
return str;
} catch (error) {
if (!asyncMode && renderer && renderer.onError) {
let res = renderer.onError(error, vnode, (child, parent) =>
_renderToString(
child,
context,
isSvgMode,
selectValue,
parent,
asyncMode,
renderer
)
);
const onError = (error) => {
return renderer.onError(error, vnode, (child, parent) => {
try {
return _renderToString(
child,
context,
isSvgMode,
selectValue,
parent,
asyncMode,
renderer
);
} catch (e) {
return onError(e);
}
});
};
let res = onError(error);

if (res !== undefined) return res;

Expand Down
34 changes: 34 additions & 0 deletions test/compat/render-chunked.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -190,4 +190,38 @@ describe('renderToChunks', () => {
'</div>'
]);
});

it('should support a component that suspends multiple times', async () => {
const { Suspender, suspended } = createSuspender();
const { Suspender: Suspender2, suspended: suspended2 } = createSuspender();

function MultiSuspender() {
return (
<Suspense fallback="loading part 1...">
<Suspender />
<Suspender2 />
</Suspense>
);
}

const result = [];
const promise = renderToChunks(
<div>
<MultiSuspender />
</div>,
{ onWrite: (s) => result.push(s) }
);

suspended.resolve();
suspended2.resolve();
await promise;

expect(result).to.deep.equal([
'<div><!--preact-island:49-->loading part 1...<!--/preact-island:49--></div>',
'<div hidden>',
createInitScript(1),
createSubtree('49', '<p>it works</p><p>it works</p>'),
'</div>'
]);
});
});