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

add zoom on hover and show spinner when image loading #2314

Merged
merged 3 commits into from
Feb 23, 2023
Merged

add zoom on hover and show spinner when image loading #2314

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
060666e
add zoom on hover and show spinner when image loading
metamoni Feb 17, 2023
b7f7b67
change spinner stroke width from 6 to 4
metamoni Feb 22, 2023
72aa630
reply on parent element instead of media id to toggle spinner
metamoni Feb 23, 2023
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
33 changes: 27 additions & 6 deletions assets/magnify.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,42 @@
// create a container and set the full-size image as its background
function createOverlay(image) {
const overlayImage = document.createElement('img');
overlayImage.setAttribute('src', `${image.src}`);
overlay = document.createElement('div');
overlay.setAttribute('class', 'image-magnify-full-size');
overlay.setAttribute('aria-hidden', 'true');
overlay.style.backgroundImage = `url('${image.src}')`;
image.parentElement.insertBefore(overlay, image);
prepareOverlay(overlay, overlayImage);

image.style.opacity = '50%';
toggleLoadingSpinner(image);

overlayImage.onload = () => {
toggleLoadingSpinner(image);
image.parentElement.insertBefore(overlay, image);
image.style.opacity = '100%';
}

return overlay;
};

function prepareOverlay(container, image) {
container.setAttribute('class', 'image-magnify-full-size');
container.setAttribute('aria-hidden', 'true');
container.style.backgroundImage = `url('${image.src}')`;
container.style.backgroundColor = 'var(--gradient-background)';
}

function toggleLoadingSpinner(image) {
const loadingSpinner = image.parentElement.parentElement.querySelector(`.loading-overlay__spinner`);
loadingSpinner.classList.toggle('hidden');
}

function moveWithHover(image, event, zoomRatio) {
// calculate mouse position
const ratio = image.height / image.width;
const container = event.target.getBoundingClientRect();
const xPosition = event.clientX - container.left;
const yPosition = event.clientY - container.top;
const xPercent = `${xPosition / (overlay.clientWidth / 100)}%`;
const yPercent = `${yPosition / ((overlay.clientWidth * ratio) / 100)}%`;
const xPercent = `${xPosition / (image.clientWidth / 100)}%`;
const yPercent = `${yPosition / ((image.clientWidth * ratio) / 100)}%`;

// determine what to show in the frame
overlay.style.backgroundPosition = `${xPercent} ${yPercent}`;
Expand Down
16 changes: 16 additions & 0 deletions assets/section-main-product.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1167,6 +1167,22 @@ a.product__text {
display: none;
}

.product__modal-opener > .loading-overlay__spinner {
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
position: absolute;
metamoni marked this conversation as resolved.
Show resolved Hide resolved
display: flex;
align-items: center;
height: 48px;
width: 48px;
metamoni marked this conversation as resolved.
Show resolved Hide resolved
}

.product__modal-opener .path {
stroke: rgb(var(--color-base-accent-1));
opacity: 0.75;
}

@media (hover: hover) {
.product__media-zoom-hover,
.product__media-icon--hover {
Expand Down
7 changes: 6 additions & 1 deletion sections/featured-product.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1424,13 +1424,18 @@
"value": "lightbox",
"label": "t:sections.main-product.settings.image_zoom.options__1.label"
},
{
"value": "hover",
"label": "t:sections.main-product.settings.image_zoom.options__2.label"
},
{
"value": "none",
"label": "t:sections.main-product.settings.image_zoom.options__3.label"
}
],
"default": "lightbox",
"label": "t:sections.main-product.settings.image_zoom.label"
"label": "t:sections.main-product.settings.image_zoom.label",
"info": "t:sections.main-product.settings.image_zoom.info"
},
{
"type": "checkbox",
Expand Down
7 changes: 6 additions & 1 deletion sections/main-product.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1998,13 +1998,18 @@
"value": "lightbox",
"label": "t:sections.main-product.settings.image_zoom.options__1.label"
},
{
"value": "hover",
"label": "t:sections.main-product.settings.image_zoom.options__2.label"
},
{
"value": "none",
"label": "t:sections.main-product.settings.image_zoom.options__3.label"
}
],
"default": "lightbox",
"label": "t:sections.main-product.settings.image_zoom.label"
"label": "t:sections.main-product.settings.image_zoom.label",
"info": "t:sections.main-product.settings.image_zoom.info"
},
{
"type": "select",
Expand Down
11 changes: 11 additions & 0 deletions snippets/product-thumbnail.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,17 @@
endcase
-%}
</span>
<div class="loading-overlay__spinner hidden">
<svg
aria-hidden="true"
focusable="false"
class="spinner"
viewBox="0 0 66 66"
xmlns="http://www.w3.org/2000/svg"
>
<circle class="path" fill="none" stroke-width="4" cx="33" cy="33" r="30"></circle>
</svg>
</div>
<div class="product__media media media--transparent">
{{ media.preview_image | image_url: width: 1946 | image_tag:
class: image_class,
Expand Down