From 24f48c57b5bf0d7f200609d43a3ba5cbb9192e96 Mon Sep 17 00:00:00 2001
From: Mehul <5mehulhelp5@gmail.com>
Date: Wed, 1 Oct 2025 13:07:41 +0530
Subject: [PATCH 1/9] alpine js error fix

---
 view/frontend/templates/hyva/bfcache/handler.phtml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/view/frontend/templates/hyva/bfcache/handler.phtml b/view/frontend/templates/hyva/bfcache/handler.phtml
index 53f7d6e..70fa3ef 100644
--- a/view/frontend/templates/hyva/bfcache/handler.phtml
+++ b/view/frontend/templates/hyva/bfcache/handler.phtml
@@ -122,7 +122,7 @@ $autoCloseMenuMobile = $bfcacheConfig->autoCloseMenuMobile() ? 'true' : 'false';
                 if (!cartDrawer || typeof Alpine === 'undefined') {
                     return;
                 }
-                const cartDrawerData = Alpine.\$data(cartDrawer);
+                const cartDrawerData = Alpine.$data(cartDrawer);
                 if (cartDrawerData && typeof cartDrawerData.open !== 'undefined') {
                     cartDrawerData.open = false;
                     document.body.style.overflow = '';
@@ -140,7 +140,7 @@ $autoCloseMenuMobile = $bfcacheConfig->autoCloseMenuMobile() ? 'true' : 'false';
             handleMenuClosure() {
                 const mobileMenu = document.querySelector("[x-data^='initMenuMobile']");
                 if (mobileMenu && typeof Alpine !== 'undefined') {
-                    const mobileMenuData = Alpine.\$data(mobileMenu);
+                    const mobileMenuData = Alpine.$data(mobileMenu);
                     if (mobileMenuData && typeof mobileMenuData.open !== 'undefined') {
                         mobileMenuData.open = false;
                     }
@@ -148,7 +148,7 @@ $autoCloseMenuMobile = $bfcacheConfig->autoCloseMenuMobile() ? 'true' : 'false';
 
                 const desktopMenu = document.querySelector("[x-data^='initMenuDesktop']");
                 if (desktopMenu && typeof Alpine !== 'undefined') {
-                    const desktopMenuData = Alpine.\$data(desktopMenu);
+                    const desktopMenuData = Alpine.$data(desktopMenu);
                     if (desktopMenuData && typeof desktopMenuData.hoverPanelActiveId !== 'undefined') {
                         desktopMenuData.hoverPanelActiveId = 0;
                     }

From ea5b19dd5ca1d913bb85bee96188c062cb8df793 Mon Sep 17 00:00:00 2001
From: Mehul <5mehulhelp5@gmail.com>
Date: Wed, 1 Oct 2025 13:40:11 +0530
Subject: [PATCH 2/9] error fix

php variable are not defined properly in js also
when we click back it's not updating cart and other data so all that has been fixed
---
 .../templates/hyva/bfcache/handler.phtml      | 79 +++++--------------
 1 file changed, 19 insertions(+), 60 deletions(-)

diff --git a/view/frontend/templates/hyva/bfcache/handler.phtml b/view/frontend/templates/hyva/bfcache/handler.phtml
index 70fa3ef..bf21730 100644
--- a/view/frontend/templates/hyva/bfcache/handler.phtml
+++ b/view/frontend/templates/hyva/bfcache/handler.phtml
@@ -4,50 +4,35 @@ use Hyva\Theme\Model\ViewModelRegistry;
 use Hyva\Theme\ViewModel\HyvaCsp;
 use Magento\Framework\Escaper;
 use Magento\Framework\View\Element\Template;
-use MageOS\ThemeOptimization\ViewModel\BfCache;
+use Magexperts\ThemeOptimization\ViewModel\BfCache;
 
 /** @var Template $block */
 /** @var Escaper $escaper */
 /** @var ViewModelRegistry $viewModels */
 /** @var HyvaCsp $hyvaCsp */
-
 /** @var BfCache $bfcacheConfig */
 $bfcacheConfig = $viewModels->require(BfCache::class);
-
-$isCustomerLoggedIn = $bfcacheConfig->isCustomerLoggedIn() ? 'true' : 'false';
-$enableUserInteractionRefresh = $bfcacheConfig->isReloadMiniCartOnInteraction() ? 'true' : 'false';
-$autoCloseMenuMobile = $bfcacheConfig->autoCloseMenuMobile() ? 'true' : 'false';
 ?>
 
 <script>
     (() => {
         class BFCacheHandler {
-            /**
-             * Initialize BFCache handler with configuration options
-             */
             constructor() {
                 this.options = {
-                    isCustomerLoggedIn: {$isCustomerLoggedIn},
-                    enableUserInteractionRefreshMiniCart: {$enableUserInteractionRefresh},
-                    autoCloseMenuMobile: {$autoCloseMenuMobile}
+                    isCustomerLoggedIn: <?= json_encode($bfcacheConfig->isCustomerLoggedIn()) ?>,
+                    enableUserInteractionRefreshMiniCart: <?= json_encode($bfcacheConfig->isReloadMiniCartOnInteraction()) ?>,
+                    autoCloseMenuMobile: <?= json_encode($bfcacheConfig->autoCloseMenuMobile()) ?>
                 };
 
-                this.userInteractionEvents = ['touchstart', 'mouseover', 'wheel', 'scroll', 'keydown'];
+                this.userInteractionEvents = ['touchstart', 'mouseover', 'wheel', 'keydown'];
             }
 
-            /**
-             * Initialize all BFCache functionalities
-             */
             init() {
                 this.refreshMiniCart();
                 this.reloadCustomerLoginPage();
                 this.actionAutoCloseMenu(this.options.autoCloseMenuMobile);
             }
 
-            /**
-             * Refresh minicart based on configuration
-             * Either immediately or on first user interaction
-             */
             refreshMiniCart() {
                 if (this.options.enableUserInteractionRefreshMiniCart) {
                     this.refreshMiniCartOnUserInteraction();
@@ -56,10 +41,6 @@ $autoCloseMenuMobile = $bfcacheConfig->autoCloseMenuMobile() ? 'true' : 'false';
                 }
             }
 
-            /**
-             * Refresh minicart on first user interaction
-             * Removes event listeners after first trigger to avoid multiple calls
-             */
             refreshMiniCartOnUserInteraction() {
                 const refreshMiniCart = () => {
                     this.userInteractionEvents.forEach(eventType => {
@@ -76,10 +57,6 @@ $autoCloseMenuMobile = $bfcacheConfig->autoCloseMenuMobile() ? 'true' : 'false';
                 });
             }
 
-            /**
-             * Check customer login state consistency and reload if needed
-             * Compares backend state with frontend localStorage state
-             */
             reloadCustomerLoginPage() {
                 const backendLoggedInState = this.options.isCustomerLoggedIn;
 
@@ -102,46 +79,34 @@ $autoCloseMenuMobile = $bfcacheConfig->autoCloseMenuMobile() ? 'true' : 'false';
                 }
             }
 
-            /**
-             * Update minicart data from customer data sections
-             * Reloads cart section to ensure accurate item count and totals
-             */
             actionRefreshMiniCart() {
                 window.dispatchEvent(new CustomEvent('reload-customer-section-data'));
             }
 
-            /**
-             * Handles cart drawer menu and mobile menu state management
-             *
-             * @param {boolean} autoCloseMenuMobile - Whether to auto-close mobile menu
-             */
             actionAutoCloseMenu(autoCloseMenuMobile) {
                 window.dispatchEvent(new Event('clear-messages'));
 
                 const cartDrawer = document.querySelector("[x-data^='initCartDrawer']");
-                if (!cartDrawer || typeof Alpine === 'undefined') {
-                    return;
-                }
-                const cartDrawerData = Alpine.$data(cartDrawer);
-                if (cartDrawerData && typeof cartDrawerData.open !== 'undefined') {
-                    cartDrawerData.open = false;
-                    document.body.style.overflow = '';
-                }
+                requestAnimationFrame(() => {
+                    if (cartDrawer && typeof Alpine !== 'undefined') {
+                        const cartDrawerData = Alpine.$data(cartDrawer);
+                        if (cartDrawerData?.open !== undefined) {
+                            cartDrawerData.open = false;
+                            document.body.style.overflow = '';
+                        }
+                    }
+                });
 
                 if (autoCloseMenuMobile) {
                     this.handleMenuClosure();
                 }
             }
 
-            /**
-             * Close mobile and desktop menus
-             * Uses Alpine.js data binding to manage menu states
-             */
             handleMenuClosure() {
                 const mobileMenu = document.querySelector("[x-data^='initMenuMobile']");
                 if (mobileMenu && typeof Alpine !== 'undefined') {
                     const mobileMenuData = Alpine.$data(mobileMenu);
-                    if (mobileMenuData && typeof mobileMenuData.open !== 'undefined') {
+                    if (mobileMenuData?.open !== undefined) {
                         mobileMenuData.open = false;
                     }
                 }
@@ -149,24 +114,18 @@ $autoCloseMenuMobile = $bfcacheConfig->autoCloseMenuMobile() ? 'true' : 'false';
                 const desktopMenu = document.querySelector("[x-data^='initMenuDesktop']");
                 if (desktopMenu && typeof Alpine !== 'undefined') {
                     const desktopMenuData = Alpine.$data(desktopMenu);
-                    if (desktopMenuData && typeof desktopMenuData.hoverPanelActiveId !== 'undefined') {
+                    if (desktopMenuData?.hoverPanelActiveId !== undefined) {
                         desktopMenuData.hoverPanelActiveId = 0;
                     }
                 }
             }
         };
 
-        /**
-         * Handle pageshow event for BFCache scenarios
-         * Detects back/forward navigation and page restoration from BFCache
-         */
-        const handlePageShow = (event) => {
-            if (event.persisted) {
-                new BFCacheHandler().init();
-            }
+        // Always run init on pageshow (back/forward navigation + BFCache restore)
+        const handlePageShow = () => {
+            new BFCacheHandler().init();
         };
 
-        // Register event listener with proper cleanup capability
         window.addEventListener('pageshow', handlePageShow, { passive: true });
     })();
 </script>

From e46ba3f751e09c8da9b9c3ab201b44c4692ffba3 Mon Sep 17 00:00:00 2001
From: Mehul <5mehulhelp5@gmail.com>
Date: Wed, 1 Oct 2025 13:48:09 +0530
Subject: [PATCH 3/9] Update handler.phtml

by mistake Themeoptimization viewmodel file has changed
---
 view/frontend/templates/hyva/bfcache/handler.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/frontend/templates/hyva/bfcache/handler.phtml b/view/frontend/templates/hyva/bfcache/handler.phtml
index bf21730..e81bddd 100644
--- a/view/frontend/templates/hyva/bfcache/handler.phtml
+++ b/view/frontend/templates/hyva/bfcache/handler.phtml
@@ -4,7 +4,7 @@ use Hyva\Theme\Model\ViewModelRegistry;
 use Hyva\Theme\ViewModel\HyvaCsp;
 use Magento\Framework\Escaper;
 use Magento\Framework\View\Element\Template;
-use Magexperts\ThemeOptimization\ViewModel\BfCache;
+use MageOS\ThemeOptimization\ViewModel\BfCache;
 
 /** @var Template $block */
 /** @var Escaper $escaper */

From a8480d97305f636729a80bfd79b8d4f90b22595e Mon Sep 17 00:00:00 2001
From: Mehul <5mehulhelp5@gmail.com>
Date: Mon, 6 Oct 2025 00:34:23 +0530
Subject: [PATCH 4/9] Update handler.phtml

this is well optimized code for for hyva.
i have tested on my side and it working fine
---
 .../templates/hyva/bfcache/handler.phtml      | 211 ++++++++++--------
 1 file changed, 117 insertions(+), 94 deletions(-)

diff --git a/view/frontend/templates/hyva/bfcache/handler.phtml b/view/frontend/templates/hyva/bfcache/handler.phtml
index e81bddd..d06d317 100644
--- a/view/frontend/templates/hyva/bfcache/handler.phtml
+++ b/view/frontend/templates/hyva/bfcache/handler.phtml
@@ -15,118 +15,141 @@ $bfcacheConfig = $viewModels->require(BfCache::class);
 ?>
 
 <script>
-    (() => {
-        class BFCacheHandler {
-            constructor() {
-                this.options = {
-                    isCustomerLoggedIn: <?= json_encode($bfcacheConfig->isCustomerLoggedIn()) ?>,
-                    enableUserInteractionRefreshMiniCart: <?= json_encode($bfcacheConfig->isReloadMiniCartOnInteraction()) ?>,
-                    autoCloseMenuMobile: <?= json_encode($bfcacheConfig->autoCloseMenuMobile()) ?>
-                };
-
-                this.userInteractionEvents = ['touchstart', 'mouseover', 'wheel', 'keydown'];
+(() => {
+    class BFCacheHandler {
+        constructor() {
+            this.options = {
+                isCustomerLoggedIn: <?= json_encode($bfcacheConfig->isCustomerLoggedIn()) ?>,
+                enableUserInteractionRefreshMiniCart: <?= json_encode($bfcacheConfig->isReloadMiniCartOnInteraction()) ?>,
+                autoCloseMenuMobile: <?= json_encode($bfcacheConfig->autoCloseMenuMobile()) ?>
+            };
+
+            this.userInteractionEvents = ['touchstart', 'mouseover', 'wheel', 'scroll', 'keydown'];
+            this._reloadTriggered = false;
+
+            // Element selectors centralized
+            this.selectors = {
+                cartDrawer: "[x-data^='initCartDrawer']",
+                mobileMenu: "[x-data^='initMenuMobile']",
+                desktopMenu: "[x-data^='initMenuDesktop']"
+            };
+
+            this.dom = {};
+        }
+
+        /**
+         * Safe DOM getter (cached but re-queries if missing or removed from DOM)
+         */
+        getElement(key) {
+            const cached = this.dom[key];
+            if (cached && document.contains(cached)) {
+                return cached;
             }
-
-            init() {
-                this.refreshMiniCart();
-                this.reloadCustomerLoginPage();
-                this.actionAutoCloseMenu(this.options.autoCloseMenuMobile);
+            const el = document.querySelector(this.selectors[key]);
+            if (el) this.dom[key] = el;
+            return el;
+        }
+
+        init() {
+            this.refreshMiniCart();
+            this.reloadCustomerLoginPage();
+            this.actionAutoCloseMenu(this.options.autoCloseMenuMobile);
+        }
+
+        refreshMiniCart() {
+            if (this.options.enableUserInteractionRefreshMiniCart) {
+                this.refreshMiniCartOnUserInteraction();
+            } else {
+                this.actionRefreshMiniCart();
             }
-
-            refreshMiniCart() {
-                if (this.options.enableUserInteractionRefreshMiniCart) {
-                    this.refreshMiniCartOnUserInteraction();
-                } else {
-                    this.actionRefreshMiniCart();
+        }
+
+        refreshMiniCartOnUserInteraction() {
+            const refreshMiniCart = () => {
+                this.userInteractionEvents.forEach(eventType =>
+                    window.removeEventListener(eventType, refreshMiniCart)
+                );
+                this.actionRefreshMiniCart();
+            };
+
+            const opts = { once: true, passive: true };
+            this.userInteractionEvents.forEach(eventType =>
+                window.addEventListener(eventType, refreshMiniCart, opts)
+            );
+        }
+
+        reloadCustomerLoginPage() {
+            const backendLoggedInState = this.options.isCustomerLoggedIn;
+
+            let customerData = null;
+            try {
+                const cacheStorage = localStorage.getItem('mage-cache-storage');
+                if (cacheStorage) {
+                    customerData = JSON.parse(cacheStorage).customer || null;
                 }
+            } catch {
+                // Ignore parse errors silently
             }
 
-            refreshMiniCartOnUserInteraction() {
-                const refreshMiniCart = () => {
-                    this.userInteractionEvents.forEach(eventType => {
-                        window.removeEventListener(eventType, refreshMiniCart);
-                    });
-                    this.actionRefreshMiniCart();
-                };
-
-                this.userInteractionEvents.forEach(eventType => {
-                    window.addEventListener(eventType, refreshMiniCart, {
-                        once: true,
-                        passive: true
-                    });
-                });
-            }
+            const frontendLoggedInState = Boolean(customerData?.firstname);
 
-            reloadCustomerLoginPage() {
-                const backendLoggedInState = this.options.isCustomerLoggedIn;
-
-                const getCustomerDataFromStorage = () => {
-                    try {
-                        const cacheStorage = localStorage.getItem('mage-cache-storage');
-                        const customerData = cacheStorage ? JSON.parse(cacheStorage).customer : null;
-                        return customerData;
-                    } catch (error) {
-                        console.warn('BFCache: Failed to parse customer data from localStorage', error);
-                        return null;
-                    }
-                };
-
-                const customerData = getCustomerDataFromStorage();
-                const frontendLoggedInState = Boolean(customerData?.firstname);
-
-                if (frontendLoggedInState !== backendLoggedInState) {
-                    window.location.reload();
-                }
+            if (frontendLoggedInState !== backendLoggedInState && !this._reloadTriggered) {
+                this._reloadTriggered = true;
+                window.location.reload();
             }
+        }
 
-            actionRefreshMiniCart() {
-                window.dispatchEvent(new CustomEvent('reload-customer-section-data'));
-            }
+        actionRefreshMiniCart() {
+            window.dispatchEvent(new CustomEvent('reload-customer-section-data'));
+        }
 
-            actionAutoCloseMenu(autoCloseMenuMobile) {
-                window.dispatchEvent(new Event('clear-messages'));
+        actionAutoCloseMenu(autoCloseMenuMobile) {
+            window.dispatchEvent(new Event('clear-messages'));
 
-                const cartDrawer = document.querySelector("[x-data^='initCartDrawer']");
+            const cartDrawer = this.getElement('cartDrawer');
+            if (cartDrawer && typeof Alpine !== 'undefined' && Alpine.$data) {
                 requestAnimationFrame(() => {
-                    if (cartDrawer && typeof Alpine !== 'undefined') {
-                        const cartDrawerData = Alpine.$data(cartDrawer);
-                        if (cartDrawerData?.open !== undefined) {
-                            cartDrawerData.open = false;
-                            document.body.style.overflow = '';
-                        }
+                    const cartDrawerData = Alpine.$data(cartDrawer);
+                    if (cartDrawerData?.open !== undefined) {
+                        cartDrawerData.open = false;
+                        document.body.style.overflow = '';
                     }
                 });
+            }
 
-                if (autoCloseMenuMobile) {
-                    this.handleMenuClosure();
-                }
+            if (autoCloseMenuMobile) {
+                this.handleMenuClosure();
             }
+        }
 
-            handleMenuClosure() {
-                const mobileMenu = document.querySelector("[x-data^='initMenuMobile']");
-                if (mobileMenu && typeof Alpine !== 'undefined') {
-                    const mobileMenuData = Alpine.$data(mobileMenu);
-                    if (mobileMenuData?.open !== undefined) {
-                        mobileMenuData.open = false;
-                    }
-                }
+        handleMenuClosure() {
+            if (typeof Alpine === 'undefined' || !Alpine.$data) return;
 
-                const desktopMenu = document.querySelector("[x-data^='initMenuDesktop']");
-                if (desktopMenu && typeof Alpine !== 'undefined') {
-                    const desktopMenuData = Alpine.$data(desktopMenu);
-                    if (desktopMenuData?.hoverPanelActiveId !== undefined) {
-                        desktopMenuData.hoverPanelActiveId = 0;
-                    }
+            const mobileMenu = this.getElement('mobileMenu');
+            if (mobileMenu) {
+                const mobileMenuData = Alpine.$data(mobileMenu);
+                if (mobileMenuData?.open !== undefined) {
+                    mobileMenuData.open = false;
                 }
             }
-        };
 
-        // Always run init on pageshow (back/forward navigation + BFCache restore)
-        const handlePageShow = () => {
-            new BFCacheHandler().init();
-        };
-
-        window.addEventListener('pageshow', handlePageShow, { passive: true });
-    })();
+            const desktopMenu = this.getElement('desktopMenu');
+            if (desktopMenu) {
+                const desktopMenuData = Alpine.$data(desktopMenu);
+                if (desktopMenuData?.hoverPanelActiveId !== undefined) {
+                    desktopMenuData.hoverPanelActiveId = 0;
+                }
+            }
+        }
+    }
+
+    // Pageshow handler (BFCache restore)
+    window.addEventListener('pageshow', (event) => {
+        if (event.persisted) {
+            (window._bfcacheHandler ??= new BFCacheHandler()).init();
+        }
+    }, { passive: true });
+})();
 </script>
-<?php $hyvaCsp->registerInlineScript() ?>
+
+<?php $hyvaCsp->registerInlineScript() ?>
\ No newline at end of file

From b84e7d42a7d870aa42b3a5efc9be38e942a83a4b Mon Sep 17 00:00:00 2001
From: Mehul <5mehulhelp5@gmail.com>
Date: Mon, 6 Oct 2025 00:49:02 +0530
Subject: [PATCH 5/9] Update handler.phtml

simple but effective
---
 .../templates/hyva/bfcache/handler.phtml      | 42 +++++++++++++------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/view/frontend/templates/hyva/bfcache/handler.phtml b/view/frontend/templates/hyva/bfcache/handler.phtml
index d06d317..5c647cf 100644
--- a/view/frontend/templates/hyva/bfcache/handler.phtml
+++ b/view/frontend/templates/hyva/bfcache/handler.phtml
@@ -12,6 +12,9 @@ use MageOS\ThemeOptimization\ViewModel\BfCache;
 /** @var HyvaCsp $hyvaCsp */
 /** @var BfCache $bfcacheConfig */
 $bfcacheConfig = $viewModels->require(BfCache::class);
+$isCustomerLoggedIn = $bfcacheConfig->isCustomerLoggedIn() ? 'true' : 'false';
+$enableUserInteractionRefresh = $bfcacheConfig->isReloadMiniCartOnInteraction() ? 'true' : 'false';
+$autoCloseMenuMobile = $bfcacheConfig->autoCloseMenuMobile() ? 'true' : 'false';
 ?>
 
 <script>
@@ -19,32 +22,29 @@ $bfcacheConfig = $viewModels->require(BfCache::class);
     class BFCacheHandler {
         constructor() {
             this.options = {
-                isCustomerLoggedIn: <?= json_encode($bfcacheConfig->isCustomerLoggedIn()) ?>,
-                enableUserInteractionRefreshMiniCart: <?= json_encode($bfcacheConfig->isReloadMiniCartOnInteraction()) ?>,
-                autoCloseMenuMobile: <?= json_encode($bfcacheConfig->autoCloseMenuMobile()) ?>
+                isCustomerLoggedIn: <?= $isCustomerLoggedIn ?>,
+                enableUserInteractionRefreshMiniCart: <?= $enableUserInteractionRefresh ?>,
+                autoCloseMenuMobile: <?= $autoCloseMenuMobile ?>
             };
 
             this.userInteractionEvents = ['touchstart', 'mouseover', 'wheel', 'scroll', 'keydown'];
             this._reloadTriggered = false;
+            this.dom = {};
 
-            // Element selectors centralized
+            // Centralized selectors for reuse
             this.selectors = {
                 cartDrawer: "[x-data^='initCartDrawer']",
                 mobileMenu: "[x-data^='initMenuMobile']",
                 desktopMenu: "[x-data^='initMenuDesktop']"
             };
-
-            this.dom = {};
         }
 
         /**
-         * Safe DOM getter (cached but re-queries if missing or removed from DOM)
+         * Safe DOM getter with caching (re-queries only if element removed)
          */
         getElement(key) {
             const cached = this.dom[key];
-            if (cached && document.contains(cached)) {
-                return cached;
-            }
+            if (cached && document.contains(cached)) return cached;
             const el = document.querySelector(this.selectors[key]);
             if (el) this.dom[key] = el;
             return el;
@@ -56,6 +56,9 @@ $bfcacheConfig = $viewModels->require(BfCache::class);
             this.actionAutoCloseMenu(this.options.autoCloseMenuMobile);
         }
 
+        /**
+         * Refresh minicart on user interaction or immediately
+         */
         refreshMiniCart() {
             if (this.options.enableUserInteractionRefreshMiniCart) {
                 this.refreshMiniCartOnUserInteraction();
@@ -71,13 +74,15 @@ $bfcacheConfig = $viewModels->require(BfCache::class);
                 );
                 this.actionRefreshMiniCart();
             };
-
             const opts = { once: true, passive: true };
             this.userInteractionEvents.forEach(eventType =>
                 window.addEventListener(eventType, refreshMiniCart, opts)
             );
         }
 
+        /**
+         * Compare frontend & backend login state and reload if mismatched
+         */
         reloadCustomerLoginPage() {
             const backendLoggedInState = this.options.isCustomerLoggedIn;
 
@@ -99,15 +104,21 @@ $bfcacheConfig = $viewModels->require(BfCache::class);
             }
         }
 
+        /**
+         * Dispatch Magento event to refresh customer sections (minicart, etc.)
+         */
         actionRefreshMiniCart() {
             window.dispatchEvent(new CustomEvent('reload-customer-section-data'));
         }
 
+        /**
+         * Close cart drawer & optionally close mobile/desktop menus
+         */
         actionAutoCloseMenu(autoCloseMenuMobile) {
             window.dispatchEvent(new Event('clear-messages'));
 
             const cartDrawer = this.getElement('cartDrawer');
-            if (cartDrawer && typeof Alpine !== 'undefined' && Alpine.$data) {
+            if (cartDrawer && typeof Alpine !== 'undefined') {
                 requestAnimationFrame(() => {
                     const cartDrawerData = Alpine.$data(cartDrawer);
                     if (cartDrawerData?.open !== undefined) {
@@ -122,6 +133,9 @@ $bfcacheConfig = $viewModels->require(BfCache::class);
             }
         }
 
+        /**
+         * Handle closing of mobile & desktop menus via Alpine.js
+         */
         handleMenuClosure() {
             if (typeof Alpine === 'undefined' || !Alpine.$data) return;
 
@@ -143,7 +157,9 @@ $bfcacheConfig = $viewModels->require(BfCache::class);
         }
     }
 
-    // Pageshow handler (BFCache restore)
+    /**
+     * Page restoration handler — persistent global instance
+     */
     window.addEventListener('pageshow', (event) => {
         if (event.persisted) {
             (window._bfcacheHandler ??= new BFCacheHandler()).init();

From d797fd1f9b0ed5c0e150421c7d3ff818b1d44edc Mon Sep 17 00:00:00 2001
From: Ryan Hoerr <rhoerr@users.noreply.github.com>
Date: Sun, 5 Oct 2025 20:50:42 -0400
Subject: [PATCH 6/9] Wrapped method comments in PHP to not output to browser

---
 .../templates/hyva/bfcache/handler.phtml      | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/view/frontend/templates/hyva/bfcache/handler.phtml b/view/frontend/templates/hyva/bfcache/handler.phtml
index 5c647cf..ab999a3 100644
--- a/view/frontend/templates/hyva/bfcache/handler.phtml
+++ b/view/frontend/templates/hyva/bfcache/handler.phtml
@@ -39,9 +39,10 @@ $autoCloseMenuMobile = $bfcacheConfig->autoCloseMenuMobile() ? 'true' : 'false';
             };
         }
 
+        <?php
         /**
          * Safe DOM getter with caching (re-queries only if element removed)
-         */
+         */ ?>
         getElement(key) {
             const cached = this.dom[key];
             if (cached && document.contains(cached)) return cached;
@@ -56,9 +57,10 @@ $autoCloseMenuMobile = $bfcacheConfig->autoCloseMenuMobile() ? 'true' : 'false';
             this.actionAutoCloseMenu(this.options.autoCloseMenuMobile);
         }
 
+        <?php
         /**
          * Refresh minicart on user interaction or immediately
-         */
+         */ ?>
         refreshMiniCart() {
             if (this.options.enableUserInteractionRefreshMiniCart) {
                 this.refreshMiniCartOnUserInteraction();
@@ -80,9 +82,10 @@ $autoCloseMenuMobile = $bfcacheConfig->autoCloseMenuMobile() ? 'true' : 'false';
             );
         }
 
+        <?php
         /**
          * Compare frontend & backend login state and reload if mismatched
-         */
+         */ ?>
         reloadCustomerLoginPage() {
             const backendLoggedInState = this.options.isCustomerLoggedIn;
 
@@ -104,16 +107,18 @@ $autoCloseMenuMobile = $bfcacheConfig->autoCloseMenuMobile() ? 'true' : 'false';
             }
         }
 
+        <?php
         /**
          * Dispatch Magento event to refresh customer sections (minicart, etc.)
-         */
+         */ ?>
         actionRefreshMiniCart() {
             window.dispatchEvent(new CustomEvent('reload-customer-section-data'));
         }
 
+        <?php
         /**
          * Close cart drawer & optionally close mobile/desktop menus
-         */
+         */ ?>
         actionAutoCloseMenu(autoCloseMenuMobile) {
             window.dispatchEvent(new Event('clear-messages'));
 
@@ -133,9 +138,10 @@ $autoCloseMenuMobile = $bfcacheConfig->autoCloseMenuMobile() ? 'true' : 'false';
             }
         }
 
+        <?php
         /**
          * Handle closing of mobile & desktop menus via Alpine.js
-         */
+         */ ?>
         handleMenuClosure() {
             if (typeof Alpine === 'undefined' || !Alpine.$data) return;
 
@@ -157,9 +163,10 @@ $autoCloseMenuMobile = $bfcacheConfig->autoCloseMenuMobile() ? 'true' : 'false';
         }
     }
 
+    <?php
     /**
      * Page restoration handler — persistent global instance
-     */
+     */ ?>
     window.addEventListener('pageshow', (event) => {
         if (event.persisted) {
             (window._bfcacheHandler ??= new BFCacheHandler()).init();
@@ -168,4 +175,4 @@ $autoCloseMenuMobile = $bfcacheConfig->autoCloseMenuMobile() ? 'true' : 'false';
 })();
 </script>
 
-<?php $hyvaCsp->registerInlineScript() ?>
\ No newline at end of file
+<?php $hyvaCsp->registerInlineScript() ?>

From 53db283008aed3613ef19287645e170708f18f70 Mon Sep 17 00:00:00 2001
From: Ryan Hoerr <rhoerr@users.noreply.github.com>
Date: Sun, 5 Oct 2025 21:18:32 -0400
Subject: [PATCH 7/9] Update handler.phtml to match changes to
 hyva/bfcache/handler.phtml

---
 view/frontend/templates/bfcache/handler.phtml | 146 +++++++++---------
 1 file changed, 74 insertions(+), 72 deletions(-)

diff --git a/view/frontend/templates/bfcache/handler.phtml b/view/frontend/templates/bfcache/handler.phtml
index c81186a..679e5a9 100644
--- a/view/frontend/templates/bfcache/handler.phtml
+++ b/view/frontend/templates/bfcache/handler.phtml
@@ -18,31 +18,43 @@ $autoCloseMenuMobile = $bfcacheConfig->autoCloseMenuMobile() ? 'true' : 'false';
 $script = <<<JS
     (() => {
         class BFCacheHandler {
-            /**
-             * Initialize BFCache handler with configuration options
-             */
             constructor() {
                 this.options = {
                     isCustomerLoggedIn: {$isCustomerLoggedIn},
                     enableUserInteractionRefreshMiniCart: {$enableUserInteractionRefresh},
                     autoCloseMenuMobile: {$autoCloseMenuMobile}
                 };
-
+    
                 this.userInteractionEvents = ['touchstart', 'mouseover', 'wheel', 'scroll', 'keydown'];
+                this._reloadTriggered = false;
+                this.dom = {};
+    
+                // Centralized selectors for reuse
+                this.selectors = {
+                    minicartCloseButton: '#btn-minicart-close',
+                    htmlElement: 'html'
+                };
             }
-
+    
             /**
-             * Initialize all BFCache functionalities
+             * Safe DOM getter with caching (re-queries only if element removed)
              */
+            getElement(key) {
+                const cached = this.dom[key];
+                if (cached && document.contains(cached)) return cached;
+                const el = document.querySelector(this.selectors[key]);
+                if (el) this.dom[key] = el;
+                return el;
+            }
+    
             init() {
                 this.refreshMiniCart();
                 this.reloadCustomerLoginPage();
                 this.actionAutoCloseMenu(this.options.autoCloseMenuMobile);
             }
-
+    
             /**
-             * Refresh minicart based on configuration
-             * Either immediately or on first user interaction
+             * Refresh minicart on user interaction or immediately
              */
             refreshMiniCart() {
                 if (this.options.enableUserInteractionRefreshMiniCart) {
@@ -51,56 +63,46 @@ $script = <<<JS
                     this.actionRefreshMiniCart();
                 }
             }
-
-            /**
-             * Refresh minicart on first user interaction
-             * Removes event listeners after first trigger to avoid multiple calls
-             */
+    
             refreshMiniCartOnUserInteraction() {
                 const refreshMiniCart = () => {
-                    this.userInteractionEvents.forEach(eventType => {
-                        window.removeEventListener(eventType, refreshMiniCart);
-                    });
+                    this.userInteractionEvents.forEach(eventType =>
+                        window.removeEventListener(eventType, refreshMiniCart)
+                    );
                     this.actionRefreshMiniCart();
                 };
-
-                this.userInteractionEvents.forEach(eventType => {
-                    window.addEventListener(eventType, refreshMiniCart, {
-                        once: true,
-                        passive: true
-                    });
-                });
+                const opts = { once: true, passive: true };
+                this.userInteractionEvents.forEach(eventType =>
+                    window.addEventListener(eventType, refreshMiniCart, opts)
+                );
             }
-
+    
             /**
-             * Check customer login state consistency and reload if needed
-             * Compares backend state with frontend localStorage state
+             * Compare frontend & backend login state and reload if mismatched
              */
             reloadCustomerLoginPage() {
                 const backendLoggedInState = this.options.isCustomerLoggedIn;
-
-                const getCustomerDataFromStorage = () => {
-                    try {
-                        const cacheStorage = localStorage.getItem('mage-cache-storage');
-                        const customerData = cacheStorage ? JSON.parse(cacheStorage).customer : null;
-                        return customerData;
-                    } catch (error) {
-                        console.warn('BFCache: Failed to parse customer data from localStorage', error);
-                        return null;
+    
+                let customerData = null;
+                try {
+                    const cacheStorage = localStorage.getItem('mage-cache-storage');
+                    if (cacheStorage) {
+                        customerData = JSON.parse(cacheStorage).customer || null;
                     }
-                };
-
-                const customerData = getCustomerDataFromStorage();
+                } catch {
+                    // Ignore parse errors silently
+                }
+    
                 const frontendLoggedInState = Boolean(customerData?.firstname);
-
-                if (frontendLoggedInState !== backendLoggedInState) {
+    
+                if (frontendLoggedInState !== backendLoggedInState && !this._reloadTriggered) {
+                    this._reloadTriggered = true;
                     window.location.reload();
                 }
             }
-
+    
             /**
-             * Update minicart data from customer data sections
-             * Reloads cart section to ensure accurate item count and totals
+             * Dispatch Magento event to refresh customer sections (minicart, etc.)
              */
             actionRefreshMiniCart() {
                 require([
@@ -109,51 +111,51 @@ $script = <<<JS
                     customerData.reload(['cart'], true);
                 });
             }
-
+    
             /**
-             * Handles cart drawer menu and mobile menu state management
-             *
-             * @param {boolean} autoCloseMenuMobile - Whether to auto-close mobile menu
+             * Close minicart & optionally close mobile menu
              */
             actionAutoCloseMenu(autoCloseMenuMobile) {
                 require([
-                    'jquery',
                     'Magento_Customer/js/customer-data'
-                ], function ($, customerData) {
+                ], ((customerData) => {
                     customerData.reload(['messages'], true);
-
-                    const minicartCloseButton = $('#btn-minicart-close');
+    
+                    const minicartCloseButton = document.querySelector(this.selectors.minicartCloseButton);
                     if (minicartCloseButton.length) {
                         minicartCloseButton.trigger('click');
                     }
-
+    
                     if (autoCloseMenuMobile) {
-                        const htmlElement = $('html');
-
-                        const navigationClasses = ['nav-open', 'nav-before-open'];
-                        navigationClasses.forEach(function(className) {
-                            if (htmlElement.hasClass(className)) {
-                                htmlElement.removeClass(className);
-                            }
-                        });
+                        this.handleMenuClosure();
+                    }
+                }).bind(this));
+            }
+    
+            /**
+             * Handle closing of mobile menu
+             */
+            handleMenuClosure() {
+                const htmlElement = document.querySelector(this.selectors.htmlElement);
+    
+                const navigationClasses = ['nav-open', 'nav-before-open'];
+                navigationClasses.forEach(className => {
+                    if (htmlElement.hasClass(className)) {
+                        htmlElement.removeClass(className);
                     }
                 });
             }
-        };
-
+        }
+    
         /**
-         * Handle pageshow event for BFCache scenarios
-         * Detects back/forward navigation and page restoration from BFCache
+         * Page restoration handler — persistent global instance
          */
-        const handlePageShow = (event) => {
+        window.addEventListener('pageshow', (event) => {
             if (event.persisted) {
-                new BFCacheHandler().init();
+                (window._bfcacheHandler ??= new BFCacheHandler()).init();
             }
-        };
-
-        // Register event listener with proper cleanup capability
-        window.addEventListener('pageshow', handlePageShow, { passive: true });
+        }, { passive: true });
     })();
-JS;
+    JS;
 ?>
 <?= /* @noEscape */ $secureRenderer->renderTag('script', ['type' => 'text/javascript'], $script, false) ?>

From 6cdffbfdbde9251d038cb9efbe8a184abd5eecc0 Mon Sep 17 00:00:00 2001
From: Ryan Hoerr <rhoerr@users.noreply.github.com>
Date: Mon, 6 Oct 2025 21:13:32 -0400
Subject: [PATCH 8/9] Added Hyva CSP warning

---
 view/frontend/templates/hyva/bfcache/handler.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/frontend/templates/hyva/bfcache/handler.phtml b/view/frontend/templates/hyva/bfcache/handler.phtml
index ab999a3..fc1c444 100644
--- a/view/frontend/templates/hyva/bfcache/handler.phtml
+++ b/view/frontend/templates/hyva/bfcache/handler.phtml
@@ -174,5 +174,5 @@ $autoCloseMenuMobile = $bfcacheConfig->autoCloseMenuMobile() ? 'true' : 'false';
     }, { passive: true });
 })();
 </script>
-
 <?php $hyvaCsp->registerInlineScript() ?>
+<?php /** The $hyvaCsp->registerInlineScript() has to be called directly after the closing script tag! There must be no other HTML in between. */ ?>

From fa1c5bb2c242d95dd7b78351ef39e4fefd8d3093 Mon Sep 17 00:00:00 2001
From: Ryan Hoerr <rhoerr@users.noreply.github.com>
Date: Mon, 6 Oct 2025 21:32:44 -0400
Subject: [PATCH 9/9] JS fixes

---
 view/frontend/templates/bfcache/handler.phtml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/view/frontend/templates/bfcache/handler.phtml b/view/frontend/templates/bfcache/handler.phtml
index 679e5a9..b48b663 100644
--- a/view/frontend/templates/bfcache/handler.phtml
+++ b/view/frontend/templates/bfcache/handler.phtml
@@ -122,8 +122,8 @@ $script = <<<JS
                     customerData.reload(['messages'], true);
     
                     const minicartCloseButton = document.querySelector(this.selectors.minicartCloseButton);
-                    if (minicartCloseButton.length) {
-                        minicartCloseButton.trigger('click');
+                    if (minicartCloseButton) {
+                        minicartCloseButton.click();
                     }
     
                     if (autoCloseMenuMobile) {
@@ -140,8 +140,8 @@ $script = <<<JS
     
                 const navigationClasses = ['nav-open', 'nav-before-open'];
                 navigationClasses.forEach(className => {
-                    if (htmlElement.hasClass(className)) {
-                        htmlElement.removeClass(className);
+                    if (htmlElement.classList.contains(className)) {
+                        htmlElement.classList.remove(className);
                     }
                 });
             }