Skip to content

Dispatch endGlobalLoad if no components requires async load. #88

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.

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

Open
wants to merge 1 commit into
base: v1
Choose a base branch
from
Open
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
16 changes: 12 additions & 4 deletions modules/ReduxAsyncConnect.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,19 @@ function loadAsyncConnect({components, filter = () => true, ...rest}) {

export function loadOnServer(args) {
const result = loadAsyncConnect(args);
if (result.async) {
result.promise.then(() => {
args.store.dispatch(endGlobalLoad());
});
const {store: {dispatch}} = args

// Some of the routes might have no async components.
// For such cases signal that global loading has been completed
if (!result.async) {
dispatch(endGlobalLoad());
return result.promise;
}

result.promise.then(() => {
dispatch(endGlobalLoad());
});

return result.promise;
}

Expand Down