Fix #790

spicywebau · Sep 27, 2023 · bfbc783 · bfbc783
1 parent c1a07b4
commit bfbc783
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## Unreleased
+
+### Fixed
+- Fixed a bug where nested fields that depend on external CSS or JavaScript files weren't loading correctly when lazy loading new blocks
+
 ## 3.9.3 - 2023-09-27
 
 ### Added

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/BlockType.js b/src/assets/src/input/BlockType.js
@@ -108,6 +108,14 @@ export default Garnish.Base.extend({
 
     const renderedBlocks = await Craft.sendActionRequest('POST', 'neo/input/render-blocks', { data })
     if (renderedBlocks.data.success) {
+      if (renderedBlocks.data.headHtml) {
+        Craft.appendHeadHtml(renderedBlocks.data.headHtml)
+      }
+
+      if (renderedBlocks.data.bodyHtml) {
+        Craft.appendBodyHtml(renderedBlocks.data.bodyHtml)
+      }
+
       const tabs = renderedBlocks.data.blocks[0].tabs
       this._tabs = tabs.tabNames?.map(
         tab => new Tab({

diff --git a/src/controllers/Input.php b/src/controllers/Input.php
@@ -82,6 +82,7 @@ public function actionRenderBlocks(): Response
         $this->requirePostRequest();
 
         $requestService = Craft::$app->getRequest();
+        $view = $this->getView();
 
         $blocks = $requestService->getRequiredBodyParam('blocks');
         $namespace = $requestService->getParam('namespace');
@@ -121,6 +122,8 @@ public function actionRenderBlocks(): Response
         return $this->asJson([
             'success' => true,
             'blocks' => $renderedBlocks,
+            'bodyHtml' => $view->getBodyHtml(),
+            'headHtml' => $view->getHeadHtml(),
         ]);
     }