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(gatsby-plugin-image): do not show placeholder if image already lo… #28868

Merged
merged 4 commits into from
Jan 12, 2021
Merged

fix(gatsby-plugin-image): do not show placeholder if image already lo… #28868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e33ef58
fix(gatsby-plugin-image): do not show placeholder if image already lo…
wardpeet Jan 5, 2021
65d3673
remove console.log
wardpeet Jan 6, 2021
8833736
Merge branch 'master' into fix/image-caching-route
wardpeet Jan 6, 2021
dae795c
merge
Jan 12, 2021
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
18 changes: 7 additions & 11 deletions packages/gatsby-plugin-image/src/components/gatsby-image.browser.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,14 @@ export const GatsbyImageHydrator: FunctionComponent<GatsbyImageProps> = function
if (hasSSRHtml.complete) {
customOnLoad?.()
storeImageloaded(JSON.stringify(images))
}
hasSSRHtml.addEventListener(`load`, function onLoad() {
hasSSRHtml.removeEventListener(`load`, onLoad)
} else {
hasSSRHtml.addEventListener(`load`, function onLoad() {
hasSSRHtml.removeEventListener(`load`, onLoad)

customOnLoad?.()
storeImageloaded(JSON.stringify(images))
})
customOnLoad?.()
storeImageloaded(JSON.stringify(images))
})
}
return undefined
}

Expand Down Expand Up @@ -157,11 +158,6 @@ export const GatsbyImageHydrator: FunctionComponent<GatsbyImageProps> = function
return
}

// When no ssrHtml is found (develop) we should force render instead of hydrate
if (!hasSSRHtml) {
hydrated.current = true
}

import(`./lazy-hydrate`).then(({ lazyHydrate }) => {
lazyHydrator.current = lazyHydrate(
{
Expand Down
5 changes: 4 additions & 1 deletion packages/gatsby-plugin-image/src/components/lazy-hydrate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ type LazyHydrateProps = Omit<GatsbyImageProps, "as" | "style" | "className"> & {
ref: MutableRefObject<HTMLImageElement | undefined>
}

const IS_DEV = process.env.NODE_ENV === `development`

export function lazyHydrate(
{
image,
Expand Down Expand Up @@ -97,7 +99,8 @@ export function lazyHydrate(
</LayoutWrapper>
)

const doRender = hydrated.current ? render : hydrate
// Force render to mitigate "Expected server HTML to contain a matching" in develop
const doRender = hydrated.current || IS_DEV ? render : hydrate
doRender(component, root.current)
hydrated.current = true

Expand Down