Skip to content

Add option for view transitions for both views #11

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

Merged
rhoerr merged 7 commits into from
Sep 20, 2025
Merged

Add option for view transitions for both views #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
732379b
DEL: inline if
GrimLink Sep 19, 2025
d9204e6
FIX: order
GrimLink Sep 19, 2025
154db80
ADD: admin option
GrimLink Sep 19, 2025
33af016
IMP: etc/adminhtml/system.xml with feedback
GrimLink Sep 19, 2025
f25ecb3
IMP: make admin config enabled
GrimLink Sep 19, 2025
70d857b
IMP: tooltip text
GrimLink Sep 19, 2025
c482758
Merge branch 'main' into feature/view-transiton-option-for-both-views
GrimLink Sep 19, 2025
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
5 changes: 5 additions & 0 deletions etc/adminhtml/system.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,11 @@
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
<comment>Enable view transitions when loading pages on the same domain.</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>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
<tooltip>Disable if you don't want the view transitions, or when using the Mage-OS Admin Theme or any other Admin theme that has View Transitions built in</tooltip>
</field>
<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>
Expand Down
1 change: 1 addition & 0 deletions etc/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ productalert</exclude_paths>
</bfcache>
<view_transitions>
<enable>1</enable>
<enable_admin>1</enable_admin>
<enable_for_bfcache>0</enable_for_bfcache>
</view_transitions>
</system>
Expand Down
7 changes: 4 additions & 3 deletions view/adminhtml/layout/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body>
<referenceContainer name="before.body.end">
<block name="theme-optimization.view-transitions"
template="MageOS_ThemeOptimization::view-transitions.phtml"
ifconfig="system/view_transitions/enable"
<block
name="theme-optimization.view-transitions"
template="MageOS_ThemeOptimization::view-transitions.phtml"
ifconfig="system/view_transitions/enable_admin"
>
<arguments>
<argument name="view_model" xsi:type="object">\MageOS\ThemeOptimization\ViewModel\ViewTransitions</argument>
Expand Down
13 changes: 5 additions & 8 deletions view/base/templates/view-transitions.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
<?php
/** @var Template $block */
/** @var Escaper $escaper */

/** @var SecureHtmlRenderer $secureRenderer */
<?php declare(strict_types=1);

use Magento\Framework\Escaper;
use Magento\Framework\View\Element\Template;
use Magento\Framework\View\Helper\SecureHtmlRenderer;
use MageOS\ThemeOptimization\ViewModel\ViewTransitions;

/** @var Template $block */
/** @var Escaper $escaper */
/** @var SecureHtmlRenderer $secureRenderer */

/** @var ViewTransitions $viewModel */
$viewModel = $block->getViewModel();
if (!$viewModel->isEnabled()) {
return;
}

$style = <<<CSS
@media not (prefers-reduced-motion: reduce) {
Expand Down