Merge pull request #2082 from antonioribeiro/capsules-blocks

Allow creating blocks and repeaters inside Capsules
area17 · Feb 3, 2023 · ff6c7ef · ff6c7ef
2 parents c089ee2 + 0b2e2e8
commit ff6c7ef
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/Helpers/Capsule.php b/src/Helpers/Capsule.php
@@ -119,6 +119,8 @@ public function autoloadConfigFiles(): void
     public function registerViews(): void
     {
         View::addLocation(Str::replaceLast(DIRECTORY_SEPARATOR . $this->name, '', $this->path));
+
+        $this->registerBlocksAndRepeatersViewPaths();
     }
 
     public function loadMigrations(): void
@@ -376,4 +378,22 @@ public function getType(): string
     {
         return '';
     }
+
+    public function registerBlocksAndRepeatersViewPaths(): void
+    {
+        $resourcePath = $this->getConfig()['views_path'] ?? 'resources/views/admin';
+
+        foreach(['blocks', 'repeaters'] as $type) {
+            if (file_exists($path = "{$this->path}/$resourcePath/$type")) {
+                $paths = config("twill.block_editor.directories.source.$type");
+
+                $paths[] = [
+                    'path' => $path,
+                    'source' => 'capsule::'.$this->name
+                ];
+
+                config(["twill.block_editor.directories.source.$type" => $paths]);
+            }
+        }
+    }
 }
diff --git a/views/partials/form/utils/_block_editor_store.blade.php b/views/partials/form/utils/_block_editor_store.blade.php
@@ -1,4 +1,4 @@
-window['{{ config('twill.js_namespace') }}'].STORE.form.blocks = {!! json_encode($form_fields['blocks']) !!}
+window['{{ config('twill.js_namespace') }}'].STORE.form.blocks = {!! json_encode($form_fields['blocks'] ?? []) !!}
 
 @foreach($form_fields['blocksFields'] ?? [] as $field)
     window['{{ config('twill.js_namespace') }}'].STORE.form.fields.push({!! json_encode($field) !!})