Skip to content

Update picture source markup and make sizes attribute configurable from shortcode. #34

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

Open
meigo wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Update picture source markup and make sizes attribute configurable from shortcode. #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a272b8a
images - 🎨 update picture source markup
meigo Oct 8, 2020
6afab5d
images - 🎨 update picture source markup
meigo Oct 8, 2020
58b62c6
images - 🎨 update picture source markup
meigo Oct 8, 2020
c94c6c7
change source sizes to vanillalazy data-sizes
meigo Oct 9, 2020
36f765d
Remove scale causing issues?
nickreese Oct 15, 2020
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
31 changes: 17 additions & 14 deletions packages/images/utils/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ function getSrcsets(maxWidth, fileSizes) {
let thisSrcSet = out[cv.format][cv.width] || '';
// let thisSrcSet = '';
if (cv.scale === 1) thisSrcSet = `${cv.relative}${thisSrcSet}`;
if (cv.scale === 2 && thisSrcSet.length) thisSrcSet = `${thisSrcSet}, ${cv.relative} 2x`;
//if (cv.scale === 2 && thisSrcSet.length) thisSrcSet = `${thisSrcSet}, ${cv.relative} 2x`;
out[cv.format][cv.width] = thisSrcSet;
return out;
},
Expand All @@ -25,28 +25,31 @@ function getSrcsets(maxWidth, fileSizes) {
};
}

function getSources(sizes, srcsets) {
function getSources(sizes, srcsets, srcSizes) {
const sources = {
webp: [],
jpeg: [],
png: [],
};

sizes.forEach((size, i, arr) => {
Object.keys(srcsets).forEach((type) => {
if (!srcsets[type][size]) return;
let source = `<source `;
if (type === 'webp') source += `type="image/webp" `;
if (type === 'png') source += `type="image/png" `;
source += `data-srcset="${srcsets[type][size]}" `;
Object.entries(srcsets).forEach((srcset) => {
let type = srcset[0];
let items = srcset[1];

if (i + 1 < arr.length) {
source += `media="(min-width: ${size}px)" `;
}
source += `/>`;
if (Object.keys(items).length === 0) return;

sources[type].push(source);
let source = `<source `;
if (type === 'webp') source += `type="image/webp" `;
if (type === 'png') source += `type="image/png" `;
source += `data-srcset="`;
Object.entries(items).forEach((item) => {
source += `${item[1]} ${item[0]}w, `; // ☝ image src with width w descriptor
});
source = source.replace(/,\s*$/, "");
source += `" data-sizes="${srcSizes ? srcSizes : '100vw'}" `; // ☝ sizes attribute must be set if w descriptors are used
source += `>`;

sources[type] = [source];
});

return sources;
Expand Down
2 changes: 1 addition & 1 deletion packages/images/utils/imageStore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const imageStore = (manifest, plugin) => {
//todo title

const { sizes, srcsets } = getSrcsets(maxWidth, file.sizes);
const sources = getSources(sizes, srcsets);
const sources = getSources(sizes, srcsets, opts.sizes);

let picture = `<picture class="${classStr ? ` ${classStr}` : ''}">`;

Expand Down