feat: add lazy tree expansion for selective block rendering

Author: eldomagan

src/Http/Controllers/Admin/ThemeEditorController.php

@@ -87,13 +87,9 @@ public function persistUpdates(Request $request)
             'updates.regions' => ['present', 'array'],
         ]);
 
-        $result = $this->persistEditorUpdates->handle($validated);
-        $loadedBlocks = $result['loadedBlocks'] ?? [];
+        $this->persistEditorUpdates->handle($validated);
 
-        $changedBlockIds = $this->extractChangedBlockIds(
-            $validated['updates'],
-            $loadedBlocks
-        );
+        $changedBlockIds = $this->extractChangedBlockIds($validated['updates']);
 
         $url = $request->input('template.url');
 
@@ -370,36 +366,16 @@ protected function getVisualThemes(): array
     }
 
     /**
-     * Extract changed block IDs from updates and include all parent blocks.
+     * Extract changed block IDs from updates.
+     * Tree expansion (parents + children) happens during render via BlockRenderFilter.
      */
-    protected function extractChangedBlockIds(array $updates, array $loadedBlocks): array
+    protected function extractChangedBlockIds(array $updates): array
     {
         $changes = $updates['changes'] ?? [];
 
-        $changedIds = array_merge($changes['added'] ?? [], $changes['updated'] ?? []);
-
-        return $this->includeParentBlocks($changedIds, $loadedBlocks);
-    }
-
-    /**
-     * Include all parent blocks for the given block IDs.
-     */
-    protected function includeParentBlocks(array $blockIds, array $loadedBlocks): array
-    {
-        $result = [];
-
-        foreach ($blockIds as $id) {
-            $result[] = $id;
-
-            // Walk up the parent chain using parentId
-            $currentId = $id;
-            while (isset($loadedBlocks[$currentId]['parentId']) && $loadedBlocks[$currentId]['parentId'] !== null) {
-                $parentId = $loadedBlocks[$currentId]['parentId'];
-                $result[] = $parentId;
-                $currentId = $parentId;
-            }
-        }
-
-        return array_unique($result);
+        return array_merge(
+            $changes['added'] ?? [],
+            $changes['updated'] ?? []
+        );
     }
 }

src/Providers/CoreServiceProvider.php

@@ -10,6 +10,7 @@
 use BagistoPlus\Visual\Middlewares\DisableResponseCacheInDesignMode;
 use BagistoPlus\Visual\Middlewares\UseShopThemeFromRequest;
 use BagistoPlus\Visual\Settings\Support as SettingTransformers;
+use BagistoPlus\Visual\Support\BlockRenderFilter;
 use BagistoPlus\Visual\Support\UrlGenerator;
 use BagistoPlus\Visual\TemplateRegistrar;
 use BagistoPlus\Visual\ThemePathsResolver;
@@ -105,13 +106,13 @@ protected function bootCraftile(): void
         Craftile::normalizeTemplateUsing(new \BagistoPlus\Visual\Support\TemplateNormalizer);
 
         Craftile::checkIfBlockCanRenderUsing(function (BlockData $blockData) {
-            if (ThemeEditor::inDesignMode() && request()->has('_blocks')) {
-                $blocksToRender = explode(',', request()->query('_blocks'));
-
-                return in_array($blockData->id, $blocksToRender);
+            if (! ThemeEditor::inDesignMode() || ! request()->has('_blocks')) {
+                return ! $blockData->disabled;
             }
 
-            return ! $blockData->disabled;
+            $filter = app(BlockRenderFilter::class);
+
+            return $filter->shouldRender($blockData);
         });
 
         $this->registerPropertyTransformers();
@@ -252,6 +253,9 @@ protected function registerSingletons(): void
                 $app->get('files')
             );
         });
+
+        // Register BlockRenderFilter as singleton for request-scoped caching
+        $this->app->singleton(BlockRenderFilter::class);
     }
 
     protected function registerCustomUrlGenerator(): void

src/Support/BlockRenderFilter.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace BagistoPlus\Visual\Support;
+
+use BagistoPlus\Visual\Data\BlockData;
+use Craftile\Laravel\Facades\BlockDatastore;
+
+class BlockRenderFilter
+{
+    protected ?array $renderSet = null;
+
+    protected array $processed = [];
+
+    /**
+     * Check if a block should be rendered based on the _blocks query parameter.
+     */
+    public function shouldRender(BlockData $blockData): bool
+    {
+        if ($this->renderSet === null) {
+            $this->buildRenderSet();
+        }
+
+        return isset($this->renderSet[$blockData->id]);
+    }
+
+    /**
+     * Build the set of blocks to render from query parameter.
+     */
+    protected function buildRenderSet(): void
+    {
+        $changedBlocks = explode(',', request()->query('_blocks', ''));
+        $this->renderSet = array_flip($changedBlocks);
+
+        foreach ($changedBlocks as $blockId) {
+            $this->expandBlockTree($blockId);
+        }
+    }
+
+    /**
+     * Recursively expand block tree to include all parents and children.
+     */
+    protected function expandBlockTree(string $blockId): void
+    {
+        if (isset($this->processed[$blockId])) {
+            return;
+        }
+
+        $this->processed[$blockId] = true;
+
+        try {
+            $blockData = BlockDatastore::getBlock($blockId);
+
+            if (! $blockData) {
+                return;
+            }
+
+            $this->renderSet[$blockData->id] = true;
+
+            // Walk up: include all parents
+            if ($blockData->parentId) {
+                $this->expandBlockTree($blockData->parentId);
+            }
+
+            // Walk down: include all children
+            if ($blockData->hasChildren()) {
+                foreach ($blockData->childrenIds() as $childId) {
+                    $this->expandBlockTree($childId);
+                }
+            }
+        } catch (\Exception $e) {
+            // Block not found or error - skip silently
+            return;
+        }
+    }
+
+    /**
+     * Reset the filter state (useful for testing).
+     */
+    public function reset(): void
+    {
+        $this->renderSet = null;
+        $this->processed = [];
+    }
+}