Fix slideout new block values not being saved for conditionally-shown…

… fields
spicywebau · Dec 3, 2023 · 3ba1685 · 3ba1685
1 parent 1f415d1
commit 3ba1685
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## Unreleased
+
+### Fixed
+- Fixed a bug when lazy loading new blocks in a slideout element editor, where the values of new blocks' fields affected by condition rules weren't being saved
+
 ## 3.9.9 - 2023-11-24
 
 ### Fixed

diff --git a/src/assets/dist/neo-main.js b/src/assets/dist/neo-main.js
diff --git a/src/assets/dist/neo-main.js.map b/src/assets/dist/neo-main.js.map
diff --git a/src/assets/src/input/Input.js b/src/assets/src/input/Input.js
@@ -849,7 +849,9 @@ export default Garnish.Base.extend({
 
         elementEditor.pause()
         const siteId = elementEditor.settings.siteId
+        NS.enter(this.getNamespace())
         const data = {
+          namespace: NS.toFieldName(),
           blocks: {},
           sortOrder: [],
           fieldId: this._id,
@@ -858,6 +860,7 @@ export default Garnish.Base.extend({
           isProvisionalDraft: elementEditor.settings.isProvisionalDraft,
           siteId
         }
+        NS.leave()
         const originalBlockIds = {}
         this._blocks.forEach((block) => {
           const selectedTabId = block.$contentContainer

diff --git a/src/controllers/Input.php b/src/controllers/Input.php
@@ -203,6 +203,7 @@ public function actionUpdateVisibleElements(): Response
         $sortOrder = $request->getRequiredBodyParam('sortOrder');
 
         $field = $fieldsService->getFieldById($fieldId);
+        $namespace = $request->getBodyParam('namespace', "fields[{$field->handle}][blocks]");
         $canonicalOwner = $elementsService->getElementById($ownerCanonicalId, null, $siteId);
         $draftsQueryMethod = $isProvisionalDraft ? 'provisionalDrafts' : 'drafts';
 
@@ -245,10 +246,10 @@ public function actionUpdateVisibleElements(): Response
             }
 
             $view = Craft::$app->getView();
-            $namespace = "fields[{$field->handle}][blocks][{$blockId}]";
+            $blockNamespace = "{$namespace}[{$blockId}]";
             $fieldLayout = $block->getFieldLayout();
             $form = $fieldLayout->createForm($block, false, [
-                'namespace' => $namespace,
+                'namespace' => $blockNamespace,
                 'registerDeltas' => false,
                 'visibleElements' => $blockData['visibleLayoutElements'],
             ]);
@@ -304,7 +305,7 @@ public function actionUpdateVisibleElements(): Response
                     'tabs' => $tabs,
                     'selectedTab' => $selectedTab,
                     'block' => $block,
-                ], View::TEMPLATE_MODE_CP), $namespace);
+                ], View::TEMPLATE_MODE_CP), $blockNamespace);
             } else {
                 $tabHtml = null;
             }