Skip to content
Open
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
33 changes: 30 additions & 3 deletions view/frontend/templates/bfcache/handler.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,38 @@ $script = <<<JS
/**
* Page restoration handler — persistent global instance
*/
const initHandler = () => (window._bfcacheHandler ??= new BFCacheHandler()).init();

// 1️⃣ Chrome / Firefox / Safari / Edge — BFCache restore

window.addEventListener('pageshow', (event) => {
if (event.persisted) {
(window._bfcacheHandler ??= new BFCacheHandler()).init();
}
const navType = performance.getEntriesByType('navigation')[0]?.type;
if (event.persisted || navType === 'back_forward') {
initHandler();
}
}, { passive: true });

// 2️⃣ Chrome / Edge — prerendering API
if ('prerendering' in document || 'onprerenderingchange' in document) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If a page is loaded without prerendering in Chrome/IE, does this prevent bfcache from initializing at all?

document.addEventListener('prerenderingchange', () => {
if (!window._bfcacheHandler?._initialized) {
window._bfcacheHandler = new BFCacheHandler();
window._bfcacheHandler._initialized = true;
window._bfcacheHandler.init();
}
}, { passive: true });
}

// 3️⃣ Safari / Legacy fallback — visibilitychange

document.addEventListener('visibilitychange', () => {
if (document.visibilityState === 'visible' && !window._bfcacheHandler?._initialized) {
window._bfcacheHandler = new BFCacheHandler();
window._bfcacheHandler._initialized = true;
window._bfcacheHandler.init();
}
}, { passive: true });

})();
JS;
?>
Expand Down
31 changes: 28 additions & 3 deletions view/frontend/templates/hyva/bfcache/handler.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,35 @@ $autoCloseMenuMobile = $bfcacheConfig->autoCloseMenuMobile() ? 'true' : 'false';
<?php
/**
* Page restoration handler — persistent global instance
*/ ?>
*/
// --- Initialization with full browser coverage ---?>
const initHandler = () => (window._bfcacheHandler ??= new BFCacheHandler()).init();

<?php // 1️⃣ Chrome / Firefox / Safari / Edge — BFCache restore ?>
window.addEventListener('pageshow', (event) => {
if (event.persisted) {
(window._bfcacheHandler ??= new BFCacheHandler()).init();
const navType = performance.getEntriesByType('navigation')[0]?.type;
if (event.persisted || navType === 'back_forward') {
initHandler();
}
}, { passive: true });

<?php // 2️⃣ Chrome / Edge — prerendering API ?>
if ('prerendering' in document || 'onprerenderingchange' in document) {
document.addEventListener('prerenderingchange', () => {
if (!window._bfcacheHandler?._initialized) {
window._bfcacheHandler = new BFCacheHandler();
window._bfcacheHandler._initialized = true;
window._bfcacheHandler.init();
}
}, { passive: true });
}

<?php // 3️⃣ Safari / Legacy fallback — visibilitychange ?>
document.addEventListener('visibilitychange', () => {
if (document.visibilityState === 'visible' && !window._bfcacheHandler?._initialized) {
window._bfcacheHandler = new BFCacheHandler();
window._bfcacheHandler._initialized = true;
window._bfcacheHandler.init();
}
}, { passive: true });
})();
Expand Down