craftcms · brandonkelly · Jan 27, 2024 · Jan 27, 2024 · Jan 27, 2024
diff --git a/CHANGELOG-WIP.md b/CHANGELOG-WIP.md
@@ -25,7 +25,7 @@
 - Improved checkbox-style deselection behavior for control panel items, to account for double-clicks.
 - Table views are no longer available for element indexes on mobile.
 - Address conditions now have “Address Line 1”, “Address Line 2”, “Administrative Area”, “Country”, “Dependent Locality”, “First Name”, “Full Name”, “Last Name”, “Locality”, “Organization Tax ID”, “Organization”, “Postal Code”, and “Sorting Code” rules.
-- Added live conditional field support to user edit pages. ([#14115](https://github.com/craftcms/cms/pull/14115))
+- Added live conditional field support to user edit pages and inline-editable Matrix blocks. ([#14115](https://github.com/craftcms/cms/pull/14115), [#14223](https://github.com/craftcms/cms/pull/14223))
 - Earth icons are now localized based on the system time zone.
 
 ### User Management

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- Added live conditional field support to inline-editable Matrix blocks. ([#14223](https://github.com/craftcms/cms/pull/14223))
 - Inline-editable Matrix blocks have been redesigned to be visually lighter. ([#14187](https://github.com/craftcms/cms/pull/14187))
 - Matrix fields set to the inline-editable blocks view mode no longer show inline entry-creation buttons unless there’s a single entry type. ([#14187](https://github.com/craftcms/cms/pull/14187))
 - Improved the accessibility of Matrix fields with the “inline-editable blocks” view mode. ([#14187](https://github.com/craftcms/cms/pull/14187))

diff --git a/src/base/NestedElementTrait.php b/src/base/NestedElementTrait.php
@@ -189,7 +189,9 @@ public function getField(): ?ElementContainerFieldInterface
             return null;
         }
 
-        $field = $this->getOwner()->getFieldLayout()->getFieldById($this->fieldId);
+        $field = $this->getOwner()?->getFieldLayout()->getFieldById($this->fieldId)
+            ?? Craft::$app->getFields()->getFieldById($this->fieldId);
+
         if (!$field instanceof ElementContainerFieldInterface) {
             throw new InvalidConfigException("Invalid field ID: $this->fieldId");
         }

diff --git a/src/controllers/ElementsController.php b/src/controllers/ElementsController.php
@@ -188,29 +188,9 @@ public function actionRedirect(?int $elementId = null, ?string $elementUid = nul
      */
     public function actionCreate(): Response
     {
-        if (!$this->_elementType) {
-            throw new BadRequestHttpException('Request missing required body param.');
-        }
-
-        $this->_validateElementType($this->_elementType);
-
-        /** @var ElementInterface $element */
-        $element = $this->element = Craft::createObject($this->_elementType);
-        if ($this->_siteId) {
-            $element->siteId = $this->_siteId;
-        }
-        $element->setAttributes($this->_attributes);
-
+        $element = $this->_createElement();
         $user = static::currentUser();
 
-        if (!Craft::$app->getElements()->canSave($element, $user)) {
-            throw new ForbiddenHttpException('User not authorized to create this element.');
-        }
-
-        if (!$element->slug) {
-            $element->slug = ElementHelper::tempSlug();
-        }
-
         // Save it
         $element->setScenario(Element::SCENARIO_ESSENTIALS);
         if (!Craft::$app->getDrafts()->saveElementAsDraft($element, $user->id, null, null, false)) {
@@ -1747,9 +1727,13 @@ public function actionUpdateFieldLayout(): ?Response
         $this->requirePostRequest();
         $this->requireCpRequest();
 
-        /** @var Element|DraftBehavior|null $element */
-        $element = $this->_element();
+        if ($this->_elementId || $this->_elementUid) {
+            $element = $this->_element();
+        } else {
+            $element = $this->_createElement();
+        }
 
+        /** @var Element|DraftBehavior|null $element */
         if (!$element || $element->getIsRevision()) {
             throw new BadRequestHttpException('No element was identified by the request.');
         }
@@ -2034,6 +2018,38 @@ private function _element(?int $elementId = null, ?string $elementUid = null, ?b
         return $element;
     }
 
+    /**
+     * Creates a new element.
+     *
+     * @throws BadRequestHttpException
+     * @throws ForbiddenHttpException
+     */
+    private function _createElement(): ElementInterface
+    {
+        if (!$this->_elementType) {
+            throw new BadRequestHttpException('Request missing required body param.');
+        }
+
+        $this->_validateElementType($this->_elementType);
+
+        /** @var ElementInterface $element */
+        $element = $this->element = Craft::createObject($this->_elementType);
+        if ($this->_siteId) {
+            $element->siteId = $this->_siteId;
+        }
+        $element->setAttributes($this->_attributes);
+
+        if (!Craft::$app->getElements()->canSave($element)) {
+            throw new ForbiddenHttpException('User not authorized to create this element.');
+        }
+
+        if (!$element->slug) {
+            $element->slug = ElementHelper::tempSlug();
+        }
+
+        return $element;
+    }
+
     /**
      * Ensures the given element type is valid.
      *

diff --git a/src/fields/Matrix.php b/src/fields/Matrix.php
@@ -521,15 +521,25 @@ public function getSupportedSitesForElement(NestedElementInterface $element): ar
      */
     public function canViewElement(NestedElementInterface $element, User $user): ?bool
     {
-        return Craft::$app->getElements()->canView($element->getOwner(), $user);
+        $owner = $element->getOwner();
+        if (!$owner) {
+            return true;
+        }
+
+        return Craft::$app->getElements()->canView($owner, $user);
     }
 
     /**
      * @inheritdoc
      */
     public function canSaveElement(NestedElementInterface $element, User $user): ?bool
     {
-        if (!Craft::$app->getElements()->canSave($element->getOwner(), $user)) {
+        $owner = $element->getOwner();
+        if (!$owner) {
+            return true;
+        }
+
+        if (!Craft::$app->getElements()->canSave($owner, $user)) {
             return false;
         }
 
@@ -547,6 +557,10 @@ public function canSaveElement(NestedElementInterface $element, User $user): ?bo
     public function canDuplicateElement(NestedElementInterface $element, User $user): ?bool
     {
         $owner = $element->getOwner();
+        if (!$owner) {
+            return true;
+        }
+
         if (!Craft::$app->getElements()->canSave($owner, $user)) {
             return false;
         }
@@ -561,6 +575,10 @@ public function canDuplicateElement(NestedElementInterface $element, User $user)
     public function canDeleteElement(NestedElementInterface $element, User $user): ?bool
     {
         $owner = $element->getOwner();
+        if (!$owner) {
+            return true;
+        }
+
         if (!Craft::$app->getElements()->canSave($element->getOwner(), $user)) {
             return false;
         }
@@ -575,6 +593,10 @@ public function canDeleteElement(NestedElementInterface $element, User $user): ?
     public function canDeleteElementForSite(NestedElementInterface $element, User $user): ?bool
     {
         $owner = $element->getOwner();
+        if (!$owner) {
+            return true;
+        }
+
         if (!Craft::$app->getElements()->canSave($owner, $user)) {
             return false;
         }
@@ -1016,19 +1038,21 @@ public function getStaticHtml(mixed $value, ElementInterface $element): string
             return '<p class="light">' . Craft::t('app', 'No entries.') . '</p>';
         }
 
-        $id = StringHelper::randomString();
+        $view = Craft::$app->getView();
+        $view->registerAssetBundle(MatrixAsset::class);
 
+        $id = StringHelper::randomString();
         $js = '';
 
         foreach ($entries as $entry) {
             $js .= <<<JS
-Craft.cp.initMatrixTabs($('.matrixblock[data-uid="$entry->uid"] > .titlebar .matrixblock-tabs'));
+Craft.MatrixInput.initTabs($('.matrixblock[data-uid="$entry->uid"] > .titlebar .matrixblock-tabs'));
 JS;
         }
 
-        Craft::$app->getView()->registerJs("(() => {\n$js\n})();");
+        $view->registerJs("(() => {\n$js\n})();");
 
-        return Craft::$app->getView()->renderTemplate('_components/fieldtypes/Matrix/input.twig', [
+        return $view->renderTemplate('_components/fieldtypes/Matrix/input.twig', [
             'id' => $id,
             'name' => $id,
             'entryTypes' => $this->getEntryTypes(),

diff --git a/src/templates/_components/fieldtypes/Matrix/block.twig b/src/templates/_components/fieldtypes/Matrix/block.twig
@@ -119,11 +119,15 @@
   }|filter,
   data: {
     uid: entry.uid,
+    'owner-id': entry.ownerId,
+    'field-id': entry.fieldId,
     type: entryType.handle,
     'type-name': entryTypeName,
     collapsed: entry.collapsed,
     'type-id': entry.typeId,
     'field-layout-id': entry.getFieldLayout().id,
+    'visible-layout-elements': form.getVisibleElements(),
+    'base-input-name': baseInputName|namespaceInputName,
   },
   role: 'listitem',
 } %}
@@ -165,23 +169,18 @@
       {% endtag %}
     {% endif %}
     <div class="preview"></div>
-    {% if tabs|length > 1 %}
-      {% tag 'div' with {
-        class: ['matrixblock-tabs'],
-        style: {
-          '--custom-sel-tab-shadow-color': entryType.color.cssVar(200) ?? null,
-        }|filter,
-      } %}
+    {% tag 'div' with {
+      class: ['matrixblock-tabs'],
+      style: {
+        '--custom-sel-tab-shadow-color': entryType.color.cssVar(200) ?? null,
+      }|filter,
+    } %}
+      {% if tabs|length > 1 %}
         {% namespace baseInputName %}
-          {% include '_includes/tabs.twig' with {
-            tabs,
-            containerAttributes: {
-              id: 'tabs',
-            },
-          } %}
+          {% include '_includes/tabs.twig' %}
         {% endnamespace %}
-      {% endtag %}
-    {% endif %}
+      {% endif %}
+    {% endtag %}
   {% endtag %}{# /.titlebar #}
 
   {% if not static %}

diff --git a/src/web/Request.php b/src/web/Request.php
@@ -838,7 +838,7 @@ public function getBodyParams(): array
             // Was a namespace passed?
             $namespace = $this->getHeaders()->get('X-Craft-Namespace');
             if ($namespace) {
-                $params = $params[$namespace] ?? [];
+                $params = ArrayHelper::getValue($params, $namespace, []);
             }
 
             $this->setBodyParams($this->_utf8AllTheThings($params));

diff --git a/src/web/assets/cp/dist/cp.js b/src/web/assets/cp/dist/cp.js
diff --git a/src/web/assets/cp/dist/cp.js.map b/src/web/assets/cp/dist/cp.js.map
diff --git a/src/web/assets/cp/src/js/CP.js b/src/web/assets/cp/src/js/CP.js
@@ -685,47 +685,6 @@ Craft.CP = Garnish.Base.extend(
       }
     },
 
-    initMatrixTabs: function (container) {
-      const $tabs = $(container).find('div[id$="tabs"].pane-tabs');
-      if (!$tabs.length) {
-        return;
-      }
-
-      // init tab manager
-      let tabManager = new Craft.Tabs($tabs);
-
-      // prevent items in the disclosure menu from changing the URL
-      let disclosureMenu = tabManager.$menuBtn.data('trigger');
-      $(disclosureMenu.$container)
-        .find('li, a')
-        .on('click', function (ev) {
-          ev.preventDefault();
-        });
-
-      tabManager.on('selectTab', (ev) => {
-        const href = ev.$tab.attr('href');
-
-        // Show its content area
-        if (href && href.charAt(0) === '#') {
-          $(href).removeClass('hidden');
-        }
-
-        // Trigger a resize event to update any UI components that are listening for it
-        Garnish.$win.trigger('resize');
-
-        // Fixes Redactor fixed toolbars on previously hidden panes
-        Garnish.$doc.trigger('scroll');
-      });
-
-      tabManager.on('deselectTab', (ev) => {
-        const href = ev.$tab.attr('href');
-        if (href && href.charAt(0) === '#') {
-          // Hide its content area
-          $(ev.$tab.attr('href')).addClass('hidden');
-        }
-      });
-    },
-
     handleBreadcrumbVisibility: function () {
       if (!this.$crumbItems.length) {
         return;

diff --git a/src/web/assets/matrix/dist/MatrixInput.js b/src/web/assets/matrix/dist/MatrixInput.js
diff --git a/src/web/assets/matrix/dist/MatrixInput.js.map b/src/web/assets/matrix/dist/MatrixInput.js.map