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
13 changes: 9 additions & 4 deletions compat/src/suspense.js
Original file line number Diff line number Diff line change
Expand Up @@ -243,18 +243,23 @@ export function suspended(vnode) {

export function lazy(loader) {
let prom;
let component;
let component = null;
let error;
let resolved;

function Lazy(props) {
if (!prom) {
prom = loader();
prom.then(
exports => {
component = exports.default || exports;
if (exports) {
component = exports.default || exports;
}
resolved = true;
},
e => {
error = e;
resolved = true;
}
);
}
Expand All @@ -263,11 +268,11 @@ export function lazy(loader) {
throw error;
}

if (!component) {
if (!resolved) {
throw prom;
}

return createElement(component, props);
return component ? createElement(component, props) : null;
}

Lazy.displayName = 'Lazy';
Expand Down
53 changes: 53 additions & 0 deletions compat/test/browser/suspense.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,59 @@ describe('suspense', () => {
});
});

it('should handle lazy component that rejects without returning a component', async () => {
const errorSpy = sinon.spy();
let renderCount = 0;

let resolve;
function fakeImport() {
const p = new Promise((_, reject) => {
resolve = () => {
reject(new Error('import failed'));
return p;
};
});
return p;
}

const SomeComponent = lazy(() =>
fakeImport().catch(e => {
console.log('caught', e);
errorSpy(e);
})
);

const App = () => {
renderCount++;
if (renderCount > 5) {
throw new Error('Infinite loop detected!');
}

console.log('RENDER COUNT', renderCount);
return (
<div>
<Suspense fallback={<div>loading</div>}>
<SomeComponent />
</Suspense>
</div>
);
};

render(<App />, scratch);
rerender();

expect(scratch.innerHTML).to.contain('loading');

const assert = () => {
rerender();

expect(scratch.innerHTML).to.contain('<div></div>');
expect(errorSpy).to.have.been.called;
};

resolve().then(assert).catch(assert);
});

it('should reset hooks of components', () => {
/** @type {(v) => void} */
let set;
Expand Down
Loading