From 17a9796d965aa9531d5199d39ad6e17fd3b2e91d Mon Sep 17 00:00:00 2001
From: grimlink <sean.grimlink@gmail.com>
Date: Fri, 2 Oct 2026 18:27:32 +0200
Subject: [PATCH] =?UTF-8?q?FIX:=20Don't=20load=20view=20transitions=20on?=
 =?UTF-8?q?=20Hyv=C3=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #32
---
 CHANGELOG.md                          |  6 ++++++
 README.md                             |  4 ++--
 etc/adminhtml/system.xml              | 12 ++++++++++--
 view/frontend/layout/default_hyva.xml |  1 +
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 632d155..0a4bde9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [Unreleased]
+
+### Changed
+- The view transitions style and script are no longer loaded on Hyvä themes. Hyvä includes view transitions in its theme CSS, so the module output only duplicated it and overrode theme specific adjustments ([#32](https://github.com/mage-os/module-theme-optimization/issues/32)).
+- The **Enable View Transitions** and **Apply on Back/Forward** settings now note that they have no effect on Hyvä themes.
+
 ## [2.3.0] - 2026-05-11
 
 ### Added
diff --git a/README.md b/README.md
index 8df34e1..b5690c1 100644
--- a/README.md
+++ b/README.md
@@ -135,9 +135,9 @@ All values can be configured at Default, Website, and Store View scopes.
 * **Exclude Selectors** - CSS selectors for links to never preload. Enter one selector per line. (Default: .do-not-prerender)
 
 ### View Transitions
-* **Enable View Transitions** - Toggle animated page changes for storefront. (Default: Yes)
+* **Enable View Transitions** - Toggle animated page changes for storefront. (Default: Yes) Has no effect on Hyvä themes, Hyvä includes view transitions in its theme CSS.
 * **Enable View Transitions for Admin** - Enable transitions in Admin; disable if using a theme with built-in transitions. (Default: Yes)
-* **Apply on Back/Forward** - Show transitions when using browser navigation; can be disabled for faster restores. (Default: Yes)
+* **Apply on Back/Forward** - Show transitions when using browser navigation; can be disabled for faster restores. (Default: Yes) Has no effect on Hyvä themes.
 
 ## Contributors
 
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 83cb140..4502962 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -121,7 +121,11 @@
                 <field id="enable" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Enable View Transitions</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <comment>Enable view transitions when loading pages on the same domain.</comment>
+                    <comment><![CDATA[
+                        Enable view transitions when loading pages on the same domain.<br>
+                        Has no effect on Hyvä themes, Hyvä includes view transitions in its theme CSS.
+                        ]]>
+                    </comment>
                 </field>
                 <field id="enable_admin" translate="label tooltip" type="select" sortOrder="12" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Enable View Transitions for Admin</label>
@@ -131,7 +135,11 @@
                 <field id="enable_for_bfcache" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Apply on Back/Forward</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <comment>Apply view transitions when going back or forward with browser navigation. Back/Forward Cache can render pages faster without.</comment>
+                    <comment><![CDATA[
+                        Apply view transitions when going back or forward with browser navigation. Back/Forward Cache can render pages faster without.<br>
+                        Has no effect on Hyvä themes, Hyvä includes view transitions in its theme CSS.
+                        ]]>
+                    </comment>
                 </field>
             </group>
         </section>
diff --git a/view/frontend/layout/default_hyva.xml b/view/frontend/layout/default_hyva.xml
index 9514561..be398a1 100644
--- a/view/frontend/layout/default_hyva.xml
+++ b/view/frontend/layout/default_hyva.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
+        <referenceBlock name="theme-optimization.view-transitions" remove="true"/>
         <referenceBlock name="before.body.end">
             <block
                 name="theme-optimization.bfcache.main"