use anchor tag as default

craftcms · brandonkelly · Nov 19, 2023 · Jul 31, 2023 · Aug 2, 2023 · Aug 2, 2023
commit 93994f1aded22073f83fd8e0cf583591b6068c94
diff --git a/src/controllers/ElementsController.php b/src/controllers/ElementsController.php
@@ -776,7 +776,6 @@ private function _additionalMenuComponents(
         if ($isCurrent) {
             if ($canDeleteForSite) {
                 $components[] = [
-                    'tag' => 'a',
                     'label' => Craft::t('app', 'Delete {type} for this site', [
                         'type' => $isUnpublishedDraft ? Craft::t('app', 'draft') : $type,
                     ]),
@@ -793,7 +792,6 @@ private function _additionalMenuComponents(
 
             if ($canDeleteCanonical) {
                 $components[] = [
-                    'tag' => 'a',
                     'label' => Craft::t('app', 'Delete {type}', [
                         'type' => $isUnpublishedDraft ? Craft::t('app', 'draft') : $type,
                     ]),
@@ -813,7 +811,6 @@ private function _additionalMenuComponents(
         } elseif ($isDraft && $canDeleteDraft) {
             if ($canDeleteForSite) {
                 $components[] = [
-                    'tag' => 'a',
                     'label' => Craft::t('app', 'Delete {type} for this site', [
                         'type' => Craft::t('app', 'draft'),
                     ]),
@@ -829,7 +826,6 @@ private function _additionalMenuComponents(
             }
 
             $components[] = [
-                'tag' => 'a',
                 'label' => Craft::t('app', 'Delete {type}', [
                     'type' => Craft::t('app', 'draft'),
                 ]),

diff --git a/src/elements/Asset.php b/src/elements/Asset.php
@@ -1435,13 +1435,11 @@ public function getAdditionalMenuComponents(): array
             $userSession->checkPermission("editImages:$volume->uid") &&
             ($userSession->getId() == $this->uploaderId || $userSession->checkPermission("editPeerImages:$volume->uid"))
         );
-        $isMobile = Craft::$app->getRequest()->isMobileBrowser(true);
 
         $components = [];
 
         if (($url = $this->getUrl()) !== null) {
             $components[] = [
-                'tag' => 'a',
                 'label' => Craft::t('app', 'View'),
                 'options' => [
                     'href' => $url,
@@ -1557,7 +1555,10 @@ public function getAdditionalMenuComponents(): array
                 'label' => Craft::t('app', 'Preview'),
                 'options' => [
                     'id' => 'preview-btn',
-                    'class' => ['btn', 'preview-btn'],
+                    'class' => ['btn'],
+                ],
+                'data' => [
+                    'icon' => 'view',
                 ],
             ];
 

diff --git a/src/templates/_layouts/components/additional-menu.twig b/src/templates/_layouts/components/additional-menu.twig
@@ -3,7 +3,33 @@
 {% set safeComponents = additionalMenuComponents|filter(a => not (a.data.destructive ?? false)) %}
 {% set destructiveComponents = additionalMenuComponents|filter(a => a.data.destructive ?? false) %}
 
+{% if safeComponents is not empty or destructiveComponents is not empty %}
+    <button class="btn" id="additional-menu-btn" title="{{ 'Additional Menu'|t('app') }}"
+            aria-label="{{ 'Additional Menu'|t('app') }}" aria-controls="{{ menuId }}"
+            data-icon="ellipsis" data-disclosure-trigger="true" role="listbox" type="button"></button>
+
+    <div id="{{ menuId }}" class="menu additional-menu">
+        <ul>
+            {% for component in safeComponents %}
+                <li>
+                    {{ _self.renderComponent(component, false) }}
+                </li>
+            {% endfor %}
+            {% if safeComponents is not empty and destructiveComponents is not empty %}
+                <hr />
+            {% endif %}
+            {% for component in destructiveComponents %}
+                <li>
+                    {{ _self.renderComponent(component, true) }}
+                </li>
+            {% endfor %}
+        </ul>
+    </div>
+{% endif %}
+
 {% macro renderComponent(component, destructive) %}
+    {% set tag = component.tag ?? 'a' %}
+
     {% set dataAttrs = [] %}
     {% if component.data is defined and component.data is not empty %}
         {% for key,value in component.data %}
@@ -43,32 +69,8 @@
         aria: ariaAttrs,
     }|merge(otherAttrs) %}
 
-    <{{ component.tag }} {{ attr(componentAttributes) }}>
-        {{ component.label }}
-    </{{ component.tag }}>
+    <{{ tag }} {{ attr(componentAttributes) }}>
+    {{ component.label }}
+    </{{ tag }}>
 
-{% endmacro %}
-
-{% if safeComponents is not empty or destructiveComponents is not empty %}
-    <button class="btn" id="additional-menu-btn" title="{{ 'Additional Menu'|t('app') }}"
-            aria-label="{{ 'Additional Menu'|t('app') }}" aria-controls="{{ menuId }}"
-            data-icon="settings" data-disclosure-trigger="true" role="listbox" type="button"></button>
-
-    <div id="{{ menuId }}" class="menu additional-menu">
-        <ul>
-            {% for component in safeComponents %}
-                <li>
-                    {{ _self.renderComponent(component, false) }}
-                </li>
-            {% endfor %}
-            {% if safeComponents is not empty and destructiveComponents is not empty %}
-                <hr />
-            {% endif %}
-            {% for component in destructiveComponents %}
-                <li>
-                    {{ _self.renderComponent(component, true) }}
-                </li>
-            {% endfor %}
-        </ul>
-    </div>
-{% endif %}
+{% endmacro %}