Skip to content

🚀 Dont autogenerate sizes if the ssr image contains sizes already, or is ssr'd using a transformer #32647

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

Merged
kristoferbaxter merged 3 commits into from
Feb 16, 2021
+44 −2
Merged

🚀 Dont autogenerate sizes if the ssr image contains sizes already, or is ssr'd using a transformer #32647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40f8b29
Dont autogenerate sizes if the ssr image contains sizes already
kristoferbaxter Feb 12, 2021
3386db1
Adding change to prevent auto sizes generation when server rendered
kristoferbaxter Feb 12, 2021
6c23902
Update test/unit/test-amp-img.js
kristoferbaxter Feb 13, 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
7 changes: 6 additions & 1 deletion builtins/amp-img.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,13 @@ export class AmpImg extends BaseElement {
if (!this.img_) {
return;
}
// If the image is server rendered, do not generate sizes.
if (this.element.hasAttribute('i-amphtml-ssr')) {
Comment thread
kristoferbaxter marked this conversation as resolved.
return;
}
// No need to generate sizes if already present.
const sizes = this.element.getAttribute('sizes');
const sizes =
Comment thread
kristoferbaxter marked this conversation as resolved.
this.element.hasAttribute('sizes') || this.img_.hasAttribute('sizes');
Comment thread
kristoferbaxter marked this conversation as resolved.
if (sizes) {
return;
}
Expand Down
39 changes: 38 additions & 1 deletion test/unit/test-amp-img.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,44 @@ describes.sandboxed('amp-img', {}, (env) => {
return impl;
}

it('should not generate sizes for amp-imgs that already have sizes', async () => {
it('should not generate sizes for amp-imgs that already have sizes on their rendered image children', async () => {
const serverRenderedImg = document.createElement('img');
serverRenderedImg.setAttribute('src', '/examples/img/sample.jpg');
serverRenderedImg.setAttribute('srcset', SRCSET_STRING);
serverRenderedImg.setAttribute('sizes', '50vw');
const ampImg = await getImg(
{
src: '/examples/img/sample.jpg',
srcset: SRCSET_STRING,
sizes: '50vw',
width: 300,
height: 200,
},
[serverRenderedImg]
);
const impl = await ampImg.getImpl(false);
impl.buildCallback();
await impl.layoutCallback();
const img = impl.img_;
expect(img.getAttribute('sizes')).to.equal('50vw');
});

it('should not generate sizes for amp-imgs when rendered from the server', async () => {
const ampImg = await getImg({
src: '/examples/img/sample.jpg',
srcset: SRCSET_STRING,
width: 300,
height: 200,
'i-amphtml-ssr': '',
});
const impl = await ampImg.getImpl(false);
impl.buildCallback();
await impl.layoutCallback();
const img = impl.img_;
expect(img.hasAttribute('sizes')).to.be.false;
});

it('should not generate sizes for amp-imgs, rendered with sizes from the server', async () => {
const ampImg = await getImg({
src: '/examples/img/sample.jpg',
srcset: SRCSET_STRING,
Expand Down