Skip to content

Commit dc6486c

Browse files
chuccvchuccv
authored
Merge pull request #44 from mageplaza/2.4-develop
2.4 develop
2 parents 591c7d6 + 07e0547 commit dc6486c

File tree

13 files changed

+278
-237
lines changed

13 files changed

+278
-237
lines changed

‎Plugin/Controller/Category/View.php‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,12 @@ public function __construct(
5656
*/
5757
public function afterExecute(\Magento\Catalog\Controller\Category\View $action, $page)
5858
{
59-
if ($this->moduleManager->isOutputEnabled('Mageplaza_SeoUrl')){
60-
return $page;
61-
}
6259
if ($this->_moduleHelper->ajaxEnabled() && $action->getRequest()->isAjax()) {
6360
$navigation = $page->getLayout()->getBlock('catalog.leftnav');
64-
$products = $page->getLayout()->getBlock('category.products');
65-
$result = ['products' => $products->toHtml(), 'navigation' => $navigation->toHtml()];
61+
$products = $page->getLayout()->getBlock('category.products');
62+
$result = ['products' => $products->toHtml(), 'navigation' => $navigation->toHtml()];
6663
if ($this->_moduleHelper->getConfigValue('mpquickview/general/enabled')) {
67-
$quickView = $page->getLayout()->getBlock('mpquickview.quickview');
64+
$quickView = $page->getLayout()->getBlock('mpquickview.quickview');
6865
$result['quickview'] = $quickView->toHtml();
6966
}
7067
$action->getResponse()->representJson(LayerData::jsonEncode($result));

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"name": "mageplaza/module-ajax-layered-navigation",
33
"description": "Magento 2 Ajax Layered Navigation Extension",
44
"require": {
5-
"mageplaza/module-core": "^1.5.7"
5+
"mageplaza/module-core": "^1.5.11"
66
},
77
"type": "magento2-module",
8-
"version": "4.1.2",
8+
"version": "4.1.3",
99
"license": "proprietary",
1010
"authors": [
1111
{

‎etc/config.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
2424
<default>
2525
<layered_navigation>
26+
<module>
27+
<user_guide>magento/ajax-layered-navigation</user_guide>
28+
</module>
2629
<general>
2730
<ajax_enable>1</ajax_enable>
2831
</general>

‎view/frontend/layout/hyva_catalog_category_view.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
1212
<update handle="catalog_list_item"/>
1313
<body>
14+
<block name="mplayer_loader" template="Mageplaza_AjaxLayer::hyva/ui/loading.phtml"/>
1415
<referenceBlock name="product_list_toolbar">
1516
<action method="setTemplate" ifconfig="layered_navigation/general/ajax_enable">
1617
<argument name="template" xsi:type="string">Mageplaza_AjaxLayer::hyva/product/list/toolbar.phtml</argument>

‎view/frontend/layout/hyva_catalog_category_view_type_layered.xml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,18 @@
2222
-->
2323
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
2424
<head>
25-
<css src="Mageplaza_AjaxLayer::css/hyva/view.css"/>
25+
<remove src="Mageplaza_AjaxLayer::css/hyva/view.css"/>
2626
</head>
27+
<update handle="hyva_mp_add_js_css"/>
2728
<body>
29+
<!-- Define multiple custom JS/Css files -->
30+
<referenceBlock name="mp_add_js_css">
31+
<action method="setFiles">
32+
<argument name="files" xsi:type="array">
33+
<item name="style_css" xsi:type="string">Mageplaza_AjaxLayer::css/hyva/view.css</item>
34+
</argument>
35+
</action>
36+
</referenceBlock>
2837
<referenceBlock name="catalog.leftnav">
2938
<action method="setTemplate" ifconfig="layered_navigation/general/ajax_enable" >
3039
<argument name="template" xsi:type="string">Mageplaza_AjaxLayer::hyva/layer/view.phtml</argument>

‎view/frontend/layout/hyva_catalogsearch_result_index.xml‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,25 @@
2222
-->
2323
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
2424
<head>
25-
<css src="Mageplaza_AjaxLayer::css/hyva/view.css"/>
25+
<remove src="Mageplaza_AjaxLayer::css/hyva/view.css"/>
2626
</head>
27+
<update handle="hyva_mp_add_js_css"/>
2728
<body>
29+
<!-- Define multiple custom JS/Css files -->
30+
<referenceBlock name="mp_add_js_css">
31+
<action method="setFiles">
32+
<argument name="files" xsi:type="array">
33+
<item name="style_css" xsi:type="string">Mageplaza_AjaxLayer::css/hyva/view.css</item>
34+
</argument>
35+
</action>
36+
</referenceBlock>
37+
38+
<block name="mplayer_loader" template="Mageplaza_AjaxLayer::hyva/ui/loading.phtml"/>
39+
<referenceBlock name="product_list_toolbar">
40+
<action method="setTemplate" ifconfig="layered_navigation/general/ajax_enable">
41+
<argument name="template" xsi:type="string">Mageplaza_AjaxLayer::hyva/product/list/toolbar.phtml</argument>
42+
</action>
43+
</referenceBlock>
2844
<referenceBlock name="catalogsearch.leftnav">
2945
<action method="setTemplate" ifconfig="layered_navigation/general/ajax_enable">
3046
<argument name="template" xsi:type="string">Mageplaza_AjaxLayer::hyva/layer/view.phtml</argument>

‎view/frontend/templates/hyva/layer/filter.phtml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,9 @@ declare(strict_types=1);
2323

2424
use Hyva\Theme\Model\LocaleFormatter;
2525
use Magento\Catalog\Helper\Data;
26-
use Magento\Framework\Escaper;
27-
use Magento\LayeredNavigation\Block\Navigation\FilterRenderer;
2826

29-
/** @var FilterRenderer $block */
30-
/** @var Escaper $escaper */
27+
/** @var \Magento\LayeredNavigation\Block\Navigation\FilterRenderer $block */
28+
/** @var \Magento\Framework\Escaper $escaper */
3129
/** @var LocaleFormatter $localeFormatter */
3230

3331
$catalogHelper = $this->helper(Data::class);

‎view/frontend/templates/hyva/layer/state.phtml‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,11 @@
2121

2222
declare(strict_types=1);
2323

24-
use Hyva\Theme\Model\ViewModelRegistry;
2524
use Hyva\Theme\ViewModel\HeroiconsOutline;
26-
use Magento\Framework\Escaper;
27-
use Magento\LayeredNavigation\Block\Navigation\State;
2825

29-
/** @var State $block */
30-
/** @var Escaper $escaper */
31-
/** @var ViewModelRegistry $viewModels */
26+
/** @var \Magento\LayeredNavigation\Block\Navigation\State $block */
27+
/** @var \Magento\Framework\Escaper $escaper */
28+
/** @var \Hyva\Theme\Model\ViewModelRegistry $viewModels */
3229

3330
/** @var HeroiconsOutline $heroicons */
3431
$heroicons = $viewModels->require(HeroiconsOutline::class);
@@ -84,7 +81,7 @@ $heroicons = $viewModels->require(HeroiconsOutline::class);
8481
</span>
8582
<span>
8683
<a class="py-2 px-2 text-center block action remove text-primary hover:text-primary-darker"
87-
onclick="handleClickLink('<?= $escaper->escapeUrl($filter->getRemoveUrl()) ?>')"
84+
@click.prevent="handleClickLink('<?= $escaper->escapeUrl($filter->getRemoveUrl()) ?>', $event)"
8885
href="<?= $escaper->escapeUrl($filter->getRemoveUrl()) ?>"
8986
title="<?= /* @noEscape */ $escaper->escapeHtmlAttr(__('Remove active %1 filter: %2', $filterName, $filterLabel)) ?>">
9087
<?= $heroicons->trashHtml('', 20, 20, ["aria-hidden" => "true"]); ?>
@@ -95,7 +92,7 @@ $heroicons = $viewModels->require(HeroiconsOutline::class);
9592
</div>
9693
<?php if ($block->getLayer()->getState()->getFilters()): ?>
9794
<div class="block-actions filter-actions">
98-
<a onclick="handleClickLink('<?= $escaper->escapeUrl($block->getClearUrl()) ?>')" href="<?= $escaper->escapeUrl($block->getClearUrl()) ?>"
95+
<a @click.prevent="handleClickLink('<?= $escaper->escapeUrl($block->getClearUrl()) ?>', $event)" href="<?= $escaper->escapeUrl($block->getClearUrl()) ?>"
9996
class="text-xs text-primary hover:text-primary-darker"><?= $escaper->escapeHtml(__('Clear All')) ?></a>
10097
</div>
10198
<?php endif; ?>
@@ -104,4 +101,4 @@ $heroicons = $viewModels->require(HeroiconsOutline::class);
104101
<script>
105102

106103

107-
</script>
104+
</script>

0 commit comments

Comments
 (0)