Merge branch 'feature/105672' into test/stage

SnowdogApps · Jun 19, 2024 · 6a94670 · 6a94670
2 parents fa9c7a3 + f1e6886
commit 6a94670
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - `width` and `height` attributes to menu node images (DEV-102271)
 - Snowdog branding in admin panel (DEV-105762)
 - Automatically open collapsed menu node when dragging another node inside (DEV-101986)
+- Duplicate node functionality (DEV-104364)
+### Fixed
+- Impossible to change Cms block, Cms page link after selecting displayed block (DEV-104546)
+### Updated
+- vue-select to 3.20.0 (DEV-104546)
 
 ## [2.26.0] - 2024-03-29
 ### Fixed

diff --git a/Model/TemplateResolver.php b/Model/TemplateResolver.php
@@ -39,12 +39,12 @@ class TemplateResolver
      * @var Registry
      */
     private $registry;
-    
+
     /**
      * @var Validator
      */
     private $validator;
-    
+
     /**
      * @var AssetRepository
      */
@@ -164,7 +164,7 @@ private function getTemplateList($nodeType = '', $defaultTemplateLabel = '')
                     continue;
                 }
 
-                $fileName = str_replace([$themeDir, '.' . $extension], '', $file);
+                $fileName = $this->ioFile->getPathInfo($file)['filename'];
                 if (!in_array($fileName, array_column($result, 'id'))) {
                     $result[] = ['id' => $fileName];
                 }

diff --git a/view/adminhtml/web/vue/app.vue b/view/adminhtml/web/vue/app.vue
@@ -145,7 +145,7 @@
                         node = {
                             ...node,
                             id: this.uuid(),
-                            uuid: this.uuid(),
+                            uuid: this.uuid()
                         };
                         if (node.columns?.length) {
                             node.columns = node.columns.map(this.setUniqueIds);

diff --git a/view/frontend/templates/hyva-topmenu-desktop/menu.phtml b/view/frontend/templates/hyva-topmenu-desktop/menu.phtml
@@ -55,7 +55,10 @@ $uniqueId = '_' . uniqid();
             class="snowdog-topmenu-desktop container lg:block"
             aria-label="<?= $escaper->escapeHtmlAttr(__('Main menu')) ?>"
         >
-            <ul class="relative flex justify-between h-20">
+            <ul
+                class="relative flex justify-between h-20"
+                @mouseleave="openSubmenuId = null"
+            >
                 <?php foreach ($block->getNodes() as $node): ?>
                     <?php
                     $childrenLevel = $node->getLevel() + 1;
@@ -75,7 +78,6 @@ $uniqueId = '_' . uniqid();
                             'bg-white rounded-t-lg shadow-md' : '<?= /* @noEscape */ !!$children ?>' && openSubmenuId === '<?= /* @noEscape */ (string) $nodeId ?>'
                         }"
                         @mouseenter="openSubmenuId = '<?= /* @noEscape */ (string) $nodeId ?>'"
-                        @mouseleave="openSubmenuId = null"
                         @keydown.escape="onSubmenuEscape"
                     >
                         <div class="group uppercase [&>a]:py-7 [&>a]:!text-primary">