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.

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

Delay setting src attribute after <img> is in DOM to prevent extraneous image loading #176

Merged
merged 1 commit into from
Feb 23, 2021
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
1 change: 1 addition & 0 deletions addon/components/responsive-image.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,6 @@
(if this.showLqipBlurhash (hash background-image=this.lqipBlurhash background-size="cover"))
}}
{{on "load" this.onLoad}}
{{did-insert this.setRendered}}
/>
</picture>
16 changes: 15 additions & 1 deletion addon/components/responsive-image.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ declare global {
const __eri_blurhash: {
bh2url: (hash: string, width: number, height: number) => string | undefined;
};

const FastBoot: unknown;
}

interface ResponsiveImageComponentArgs {
Expand Down Expand Up @@ -59,6 +61,9 @@ export default class ResponsiveImageComponent extends Component<ResponsiveImageC
@tracked
isLoaded = false;

@tracked
isRendered = false;

constructor(owner: unknown, args: ResponsiveImageComponentArgs) {
super(owner, args);
assert('No image argument supplied for <ResponsiveImage>', args.src);
Expand Down Expand Up @@ -151,7 +156,11 @@ export default class ResponsiveImageComponent extends Component<ResponsiveImageC
* the image source which fits at best for the size and screen
*/
get src(): string | undefined {
return this.imageMeta
// We *must not* set the src attribute before the <img> is actually rendered, and a child of <picture>
// Otherwise some browsers (FF, Safari) will eagerly load it, although the image isn't the one the browser
// should load given the other source/srcset variants. Also prevents native lazy loading.
return (this.isRendered || typeof FastBoot !== 'undefined') &&
this.imageMeta
? `${this.imageMeta.image}${
this.args.cacheBreaker ? '?' + this.args.cacheBreaker : ''
}`
Expand Down Expand Up @@ -244,4 +253,9 @@ export default class ResponsiveImageComponent extends Component<ResponsiveImageC
onLoad(): void {
this.isLoaded = true;
}

@action
setRendered(): void {
this.isRendered = true;
}
}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"postpack": "ember ts:clean"
},
"dependencies": {
"@ember/render-modifiers": "^1.0.2",
"@embroider/macros": "^0.36.0",
"@glimmer/component": "^1.0.3",
"@glimmer/tracking": "^1.0.3",
Expand Down
10 changes: 9 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1122,6 +1122,14 @@
mkdirp "^1.0.4"
silent-error "^1.1.1"

"@ember/render-modifiers@^1.0.2":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@ember/render-modifiers/-/render-modifiers-1.0.2.tgz#2e87c48db49d922ce4850d707215caaac60d8444"
integrity sha512-6tEnHl5+62NTSAG2mwhGMFPhUrJQjoVqV+slsn+rlTknm2Zik+iwxBQEbwaiQOU1FUYxkS8RWcieovRNMR8inQ==
dependencies:
ember-cli-babel "^7.10.0"
ember-modifier-manager-polyfill "^1.1.0"

"@ember/test-helpers@^2.2.1":
version "2.2.1"
resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-2.2.1.tgz#584eb8359c4bf84670320a95e6af629d7526bc2a"
Expand Down Expand Up @@ -6518,7 +6526,7 @@ ember-maybe-import-regenerator@^0.1.6:
ember-cli-babel "^6.0.0-beta.4"
regenerator-runtime "^0.9.5"

ember-modifier-manager-polyfill@^1.2.0:
ember-modifier-manager-polyfill@^1.1.0, ember-modifier-manager-polyfill@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/ember-modifier-manager-polyfill/-/ember-modifier-manager-polyfill-1.2.0.tgz#cf4444e11a42ac84f5c8badd85e635df57565dda"
integrity sha512-bnaKF1LLKMkBNeDoetvIJ4vhwRPKIIumWr6dbVuW6W6p4QV8ZiO+GdF8J7mxDNlog9CeL9Z/7wam4YS86G8BYA==
Expand Down