Skip to content
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
40 changes: 29 additions & 11 deletions resources/views/responsiveImage.blade.php
Original file line number Diff line number Diff line change
@@ -1,25 +1,43 @@
@once
<script>
window.addEventListener('load', function () {
document.addEventListener('DOMContentLoaded', function () {
window.responsiveResizeObserver = new ResizeObserver((entries) => {
entries.forEach(entry => {
const imgWidth = entry.target.getBoundingClientRect().width;
entry.target.parentNode.querySelectorAll('source').forEach((source) => {
source.sizes = Math.ceil(imgWidth / window.innerWidth * 100) + 'vw';
});
entries.forEach(({ target, contentRect }) => {
const vw = Math.ceil(contentRect.width / window.innerWidth * 100) + 'vw';

target.parentNode.querySelectorAll('source').forEach(source => source.sizes = vw);
});
});

document.querySelectorAll('[data-statamic-responsive-images]').forEach(responsiveImage => {
responsiveResizeObserver.onload = null;
responsiveResizeObserver.observe(responsiveImage);
document.querySelectorAll('[data-statamic-responsive-images]').forEach(img => {
window.responsiveResizeObserver.observe(img);
});

@if(request()->isLivePreview())
new MutationObserver(mutations => {
for (const { addedNodes } of mutations) {
for (const node of addedNodes) {
if (node.nodeType !== Node.ELEMENT_NODE) {
continue;
}

if (node.hasAttribute('data-statamic-responsive-images')) {
window.responsiveResizeObserver.observe(node);
}

node.querySelectorAll('[data-statamic-responsive-images]').forEach(img => {
window.responsiveResizeObserver.observe(img);
});
}
}
}).observe(document.body, { childList: true, subtree: true });
@endif
});
</script>
@endonce

<picture>
@foreach (($breakpoints ?? []) as $breakpoint)
@foreach(($breakpoints ?? []) as $breakpoint)
@foreach($breakpoint->sources() ?? [] as $source)
@php
$srcSet = $source->getSrcset();
Expand All @@ -39,7 +57,7 @@
<img
{!! $attributeString ?? '' !!}
src="{{ $src }}"
@unless (\Illuminate\Support\Str::contains($attributeString, 'alt'))
@unless(\Illuminate\Support\Str::contains($attributeString, 'alt'))
alt="{{ (string) $asset['alt'] ?: (string) $asset['title'] }}"
@endunless
@isset($width) width="{{ $width }}" @endisset
Expand Down
10 changes: 10 additions & 0 deletions tests/Feature/ResponsiveTagTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,16 @@ function assertMatchesSnapshotWithoutSvg($value)
]));
});

it('includes MutationObserver script for live preview', function () {
Request::macro('isLivePreview', fn () => true);

expect(ResponsiveTag::render($this->asset))->toContain('MutationObserver');
});

it('does not include MutationObserver script outside of live preview', function () {
expect(ResponsiveTag::render($this->asset))->not->toContain('MutationObserver');
});

it('does not output <source> when no dimensions are returned from dimension calculator', function () {
$this->mock(DimensionCalculator::class, function ($mock) {
$mock->shouldReceive('calculateForBreakpoint')->andReturn(collect([]));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
<script>
window.addEventListener('load', function () {
document.addEventListener('DOMContentLoaded', function () {
window.responsiveResizeObserver = new ResizeObserver((entries) => {
entries.forEach(entry => {
const imgWidth = entry.target.getBoundingClientRect().width;
entry.target.parentNode.querySelectorAll('source').forEach((source) => {
source.sizes = Math.ceil(imgWidth / window.innerWidth * 100) + 'vw';
});
entries.forEach(({ target, contentRect }) => {
const vw = Math.ceil(contentRect.width / window.innerWidth * 100) + 'vw';

target.parentNode.querySelectorAll('source').forEach(source => source.sizes = vw);
});
});

document.querySelectorAll('[data-statamic-responsive-images]').forEach(responsiveImage => {
responsiveResizeObserver.onload = null;
responsiveResizeObserver.observe(responsiveImage);
document.querySelectorAll('[data-statamic-responsive-images]').forEach(img => {
window.responsiveResizeObserver.observe(img);
});
});

});
</script>

<picture>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
<script>
window.addEventListener('load', function () {
document.addEventListener('DOMContentLoaded', function () {
window.responsiveResizeObserver = new ResizeObserver((entries) => {
entries.forEach(entry => {
const imgWidth = entry.target.getBoundingClientRect().width;
entry.target.parentNode.querySelectorAll('source').forEach((source) => {
source.sizes = Math.ceil(imgWidth / window.innerWidth * 100) + 'vw';
});
entries.forEach(({ target, contentRect }) => {
const vw = Math.ceil(contentRect.width / window.innerWidth * 100) + 'vw';

target.parentNode.querySelectorAll('source').forEach(source => source.sizes = vw);
});
});

document.querySelectorAll('[data-statamic-responsive-images]').forEach(responsiveImage => {
responsiveResizeObserver.onload = null;
responsiveResizeObserver.observe(responsiveImage);
document.querySelectorAll('[data-statamic-responsive-images]').forEach(img => {
window.responsiveResizeObserver.observe(img);
});
});

});
</script>

<picture>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
<script>
window.addEventListener('load', function () {
document.addEventListener('DOMContentLoaded', function () {
window.responsiveResizeObserver = new ResizeObserver((entries) => {
entries.forEach(entry => {
const imgWidth = entry.target.getBoundingClientRect().width;
entry.target.parentNode.querySelectorAll('source').forEach((source) => {
source.sizes = Math.ceil(imgWidth / window.innerWidth * 100) + 'vw';
});
entries.forEach(({ target, contentRect }) => {
const vw = Math.ceil(contentRect.width / window.innerWidth * 100) + 'vw';

target.parentNode.querySelectorAll('source').forEach(source => source.sizes = vw);
});
});

document.querySelectorAll('[data-statamic-responsive-images]').forEach(responsiveImage => {
responsiveResizeObserver.onload = null;
responsiveResizeObserver.observe(responsiveImage);
document.querySelectorAll('[data-statamic-responsive-images]').forEach(img => {
window.responsiveResizeObserver.observe(img);
});
});

});
</script>

<picture>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
<script>
window.addEventListener('load', function () {
document.addEventListener('DOMContentLoaded', function () {
window.responsiveResizeObserver = new ResizeObserver((entries) => {
entries.forEach(entry => {
const imgWidth = entry.target.getBoundingClientRect().width;
entry.target.parentNode.querySelectorAll('source').forEach((source) => {
source.sizes = Math.ceil(imgWidth / window.innerWidth * 100) + 'vw';
});
entries.forEach(({ target, contentRect }) => {
const vw = Math.ceil(contentRect.width / window.innerWidth * 100) + 'vw';

target.parentNode.querySelectorAll('source').forEach(source => source.sizes = vw);
});
});

document.querySelectorAll('[data-statamic-responsive-images]').forEach(responsiveImage => {
responsiveResizeObserver.onload = null;
responsiveResizeObserver.observe(responsiveImage);
document.querySelectorAll('[data-statamic-responsive-images]').forEach(img => {
window.responsiveResizeObserver.observe(img);
});
});

});
</script>

<picture>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
<script>
window.addEventListener('load', function () {
document.addEventListener('DOMContentLoaded', function () {
window.responsiveResizeObserver = new ResizeObserver((entries) => {
entries.forEach(entry => {
const imgWidth = entry.target.getBoundingClientRect().width;
entry.target.parentNode.querySelectorAll('source').forEach((source) => {
source.sizes = Math.ceil(imgWidth / window.innerWidth * 100) + 'vw';
});
entries.forEach(({ target, contentRect }) => {
const vw = Math.ceil(contentRect.width / window.innerWidth * 100) + 'vw';

target.parentNode.querySelectorAll('source').forEach(source => source.sizes = vw);
});
});

document.querySelectorAll('[data-statamic-responsive-images]').forEach(responsiveImage => {
responsiveResizeObserver.onload = null;
responsiveResizeObserver.observe(responsiveImage);
document.querySelectorAll('[data-statamic-responsive-images]').forEach(img => {
window.responsiveResizeObserver.observe(img);
});
});

});
</script>

<picture>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
<script>
window.addEventListener('load', function () {
document.addEventListener('DOMContentLoaded', function () {
window.responsiveResizeObserver = new ResizeObserver((entries) => {
entries.forEach(entry => {
const imgWidth = entry.target.getBoundingClientRect().width;
entry.target.parentNode.querySelectorAll('source').forEach((source) => {
source.sizes = Math.ceil(imgWidth / window.innerWidth * 100) + 'vw';
});
entries.forEach(({ target, contentRect }) => {
const vw = Math.ceil(contentRect.width / window.innerWidth * 100) + 'vw';

target.parentNode.querySelectorAll('source').forEach(source => source.sizes = vw);
});
});

document.querySelectorAll('[data-statamic-responsive-images]').forEach(responsiveImage => {
responsiveResizeObserver.onload = null;
responsiveResizeObserver.observe(responsiveImage);
document.querySelectorAll('[data-statamic-responsive-images]').forEach(img => {
window.responsiveResizeObserver.observe(img);
});
});

});
</script>

<picture>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
<script>
window.addEventListener('load', function () {
document.addEventListener('DOMContentLoaded', function () {
window.responsiveResizeObserver = new ResizeObserver((entries) => {
entries.forEach(entry => {
const imgWidth = entry.target.getBoundingClientRect().width;
entry.target.parentNode.querySelectorAll('source').forEach((source) => {
source.sizes = Math.ceil(imgWidth / window.innerWidth * 100) + 'vw';
});
entries.forEach(({ target, contentRect }) => {
const vw = Math.ceil(contentRect.width / window.innerWidth * 100) + 'vw';

target.parentNode.querySelectorAll('source').forEach(source => source.sizes = vw);
});
});

document.querySelectorAll('[data-statamic-responsive-images]').forEach(responsiveImage => {
responsiveResizeObserver.onload = null;
responsiveResizeObserver.observe(responsiveImage);
document.querySelectorAll('[data-statamic-responsive-images]').forEach(img => {
window.responsiveResizeObserver.observe(img);
});
});

});
</script>

<picture>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
<script>
window.addEventListener('load', function () {
document.addEventListener('DOMContentLoaded', function () {
window.responsiveResizeObserver = new ResizeObserver((entries) => {
entries.forEach(entry => {
const imgWidth = entry.target.getBoundingClientRect().width;
entry.target.parentNode.querySelectorAll('source').forEach((source) => {
source.sizes = Math.ceil(imgWidth / window.innerWidth * 100) + 'vw';
});
entries.forEach(({ target, contentRect }) => {
const vw = Math.ceil(contentRect.width / window.innerWidth * 100) + 'vw';

target.parentNode.querySelectorAll('source').forEach(source => source.sizes = vw);
});
});

document.querySelectorAll('[data-statamic-responsive-images]').forEach(responsiveImage => {
responsiveResizeObserver.onload = null;
responsiveResizeObserver.observe(responsiveImage);
document.querySelectorAll('[data-statamic-responsive-images]').forEach(img => {
window.responsiveResizeObserver.observe(img);
});
});

});
</script>

<picture>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
<script>
window.addEventListener('load', function () {
document.addEventListener('DOMContentLoaded', function () {
window.responsiveResizeObserver = new ResizeObserver((entries) => {
entries.forEach(entry => {
const imgWidth = entry.target.getBoundingClientRect().width;
entry.target.parentNode.querySelectorAll('source').forEach((source) => {
source.sizes = Math.ceil(imgWidth / window.innerWidth * 100) + 'vw';
});
entries.forEach(({ target, contentRect }) => {
const vw = Math.ceil(contentRect.width / window.innerWidth * 100) + 'vw';

target.parentNode.querySelectorAll('source').forEach(source => source.sizes = vw);
});
});

document.querySelectorAll('[data-statamic-responsive-images]').forEach(responsiveImage => {
responsiveResizeObserver.onload = null;
responsiveResizeObserver.observe(responsiveImage);
document.querySelectorAll('[data-statamic-responsive-images]').forEach(img => {
window.responsiveResizeObserver.observe(img);
});
});

});
</script>

<picture>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
<script>
window.addEventListener('load', function () {
document.addEventListener('DOMContentLoaded', function () {
window.responsiveResizeObserver = new ResizeObserver((entries) => {
entries.forEach(entry => {
const imgWidth = entry.target.getBoundingClientRect().width;
entry.target.parentNode.querySelectorAll('source').forEach((source) => {
source.sizes = Math.ceil(imgWidth / window.innerWidth * 100) + 'vw';
});
entries.forEach(({ target, contentRect }) => {
const vw = Math.ceil(contentRect.width / window.innerWidth * 100) + 'vw';

target.parentNode.querySelectorAll('source').forEach(source => source.sizes = vw);
});
});

document.querySelectorAll('[data-statamic-responsive-images]').forEach(responsiveImage => {
responsiveResizeObserver.onload = null;
responsiveResizeObserver.observe(responsiveImage);
document.querySelectorAll('[data-statamic-responsive-images]').forEach(img => {
window.responsiveResizeObserver.observe(img);
});
});

});
</script>

<picture>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
<script>
window.addEventListener('load', function () {
document.addEventListener('DOMContentLoaded', function () {
window.responsiveResizeObserver = new ResizeObserver((entries) => {
entries.forEach(entry => {
const imgWidth = entry.target.getBoundingClientRect().width;
entry.target.parentNode.querySelectorAll('source').forEach((source) => {
source.sizes = Math.ceil(imgWidth / window.innerWidth * 100) + 'vw';
});
entries.forEach(({ target, contentRect }) => {
const vw = Math.ceil(contentRect.width / window.innerWidth * 100) + 'vw';

target.parentNode.querySelectorAll('source').forEach(source => source.sizes = vw);
});
});

document.querySelectorAll('[data-statamic-responsive-images]').forEach(responsiveImage => {
responsiveResizeObserver.onload = null;
responsiveResizeObserver.observe(responsiveImage);
document.querySelectorAll('[data-statamic-responsive-images]').forEach(img => {
window.responsiveResizeObserver.observe(img);
});
});

});
</script>

<picture>
Expand Down
Loading