Skip to content
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

Jump to bottom

Fix loading showing before pastDelay #6628

Merged
merged 3 commits into from
Mar 12, 2019
+6 −5
Merged

Fix loading showing before pastDelay #6628

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d95c13c
Fix loading showing before pastDelay
ijjk Mar 12, 2019
c123346
Update test
ijjk Mar 12, 2019
8953f9a
Update other test
ijjk Mar 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/next-server/lib/dynamic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ export default function dynamic (dynamicOptions, options) {
let loadableFn = Loadable
let loadableOptions = {
// A loading component is not required, so we default it
loading: ({ error, isLoading }) => {
loading: ({ error, isLoading, pastDelay }) => {
if (!pastDelay) return null
if (process.env.NODE_ENV === 'development') {
if (isLoading) {
return <DefaultLoading />
Expand Down