Merge branch '5.x' into bugfix/17099-nested-element-edit-btn-and-focus

Author: brandonkelly

CHANGELOG.md

@@ -2,7 +2,9 @@
 
 ## Unreleased
 
-- Fixed a styling issue. ([#17100](https://github.com/craftcms/cms/pull/17100))
+- Fixed a SQL error that could occur when executing an element query, if the `orderBy` param contained unexpected syntax.
+- Fixed a bug where nested element cards could be missing their action menus if their “Max” setting had been reached. ([#17103](https://github.com/craftcms/cms/issues/17103))
+- Fixed styling issues. ([#17100](https://github.com/craftcms/cms/pull/17100), [#17098](https://github.com/craftcms/cms/issues/17098))
 
 ## 5.7.0 - 2025-04-15
 
@@ -62,7 +64,7 @@
 - Double-clicking on entry type chips within entry type select inputs now opens the entry type’s settings in a slideout, rather than its override settings. ([#16838](https://github.com/craftcms/cms/pull/16838))
 - Color previews within card attribute designers now show a value from the color palette. ([#16985](https://github.com/craftcms/cms/pull/16985))
 - Number previews within card attribute designers now show an in-range value, if the Min Value and Max Value settings are set. ([#16986](https://github.com/craftcms/cms/pull/16986))
-- Range previews within card attribute designers new shew an in-range value. ([#16986](https://github.com/craftcms/cms/pull/16986))
+- Range previews within card attribute designers now show an in-range value. ([#16986](https://github.com/craftcms/cms/pull/16986))
 - Section and entry type names are now linked to their edit pages from entry indexes, for admins.
 - Added the `staticStatuses` config setting, for opting into entry statuses being stored statically and only updated on save. ([#17024](https://github.com/craftcms/cms/pull/17024))
 - Added the `db/repair` command. ([#16812](https://github.com/craftcms/cms/pull/16812))

src/elements/db/ElementQuery.php

@@ -3645,7 +3645,7 @@ private function _parseStrForColumnMappings(string $str): string
             return $this->_columnMappingSql($str) ?? $str;
         }
 
-        return preg_replace_callback('/\[\[(\w+(?:\.\w+)?)]]/', function(array $match) {
+        return preg_replace_callback('/(?<!\.)\[\[(\w+(?:\.\w+)?)]]/', function(array $match) {
             $mapping = $this->_columnMappingSql($match[1]);
             if ($mapping === null) {
                 return $match[0];

src/helpers/Cp.php

@@ -1120,10 +1120,6 @@ function() use ($component, $withEdit): string {
                     fn(array $item) => $item['showInChips'] ?? !($item['destructive'] ?? false)
                 );
 
-                if (empty($actionMenuItems)) {
-                    return '';
-                }
-
                 foreach ($actionMenuItems as $i => &$item) {
                     if (str_starts_with($item['id'] ?? '', 'action-edit-')) {
                         if (!$withEdit) {
@@ -1139,10 +1135,15 @@ function() use ($component, $withEdit): string {
                 return static::disclosureMenu($actionMenuItems, [
                     'hiddenLabel' => Craft::t('app', 'Actions'),
                     'buttonAttributes' => [
-                        'class' => ['action-btn', 'small'],
+                        'class' => array_keys(array_filter([
+                            'action-btn' => true,
+                            'small' => true,
+                            'hidden' => empty($actionMenuItems),
+                        ])),
                         'removeClass' => 'menubtn',
                         'data' => ['icon' => 'ellipsis'],
                     ],
+                    'omitIfEmpty' => false,
                 ]);
             },
             sprintf('action-menu-%s', mt_rand()),

src/web/assets/cp/dist/cp.js

@@ -3444,7 +3444,6 @@ table {
   position: relative;
   border-radius: var(--large-border-radius);
   color: var(--custom-text-color, var(--text-color));
-  overflow: hidden; // needed for status indicators
 
   --custom-border-color: initial;
   --custom-titlebar-bg-color: initial;
@@ -3471,6 +3470,8 @@ table {
 
 .chip,
 .card {
+  overflow: hidden; // needed for status indicators
+
   &.sel,
   tr.sel &,
   li.sel &,

src/web/assets/cp/dist/cp.js.map

@@ -602,6 +602,7 @@ Craft.NestedElementManager = Garnish.Base.extend(
 
         const actionDisclosure = $element
           .find('.action-btn')
+          .removeClass('hidden')
           .disclosureMenu()
           .data('disclosureMenu');