v1.4.1

- feat(blocks): Generate blocks with InnerBlock support when using compatible ACF versions (Fixes #16)
- enhance(partials): Optimize conditional order for partials

src/Composer.php

@@ -110,18 +110,18 @@ protected function build($fields = [])
     protected function get($partial = null)
     {
         if (
-            ! is_subclass_of($partial, Partial::class) ||
-            (new ReflectionClass($partial))->isAbstract()
+            is_subclass_of($partial, Partial::class) &&
+            ! (new ReflectionClass($partial))->isAbstract()
         ) {
-            return is_string($partial) ? include $this->app->path(
-                Str::finish(
-                    Str::finish($path, '/'),
-                    Str::finish($name, '.php')
-                )
-            ) : $partial;
+            return (new $partial($this->app))->compose();
         }
 
-        return (new $partial($this->app))->compose();
+        return is_string($partial) ? include $this->app->path(
+            Str::finish(
+                Str::finish($path, '/'),
+                Str::finish($name, '.php')
+            )
+        ) : $partial;
     }
 
     /**

src/Console/BlockMakeCommand.php

@@ -2,6 +2,8 @@
 
 namespace Log1x\AcfComposer\Console;
 
+use Illuminate\Support\Str;
+
 class BlockMakeCommand extends MakeCommand
 {
     /**
@@ -41,10 +43,21 @@ class BlockMakeCommand extends MakeCommand
      */
     protected function getStub()
     {
+        if (
+            ! empty($version = get_option('acf_version')) &&
+            Str::before($version, '-') >= '5.9.0'
+        ) {
+            $this->view = 'repeater-innerblock';
+        }
+
         if ($this->option('full')) {
             return __DIR__ . '/stubs/block.full.stub';
         }
 
+        if (Str::before($version, '-') >= '5.9.0') {
+            return __DIR__ . '/stubs/block.innerblock.stub';
+        }
+
         return __DIR__ . '/stubs/block.stub';
     }
 }

src/Console/stubs/block.full.stub

@@ -68,7 +68,9 @@ class DummyClass extends Block
      *
      * @var array
      */
-    public $supports = [];
+    public $supports = [
+        '__experimental_jsx' => true,
+    ];
 
     /**
      * Data to be passed to the block before rendering.

src/Console/stubs/block.innerblock.stub

@@ -0,0 +1,86 @@
+<?php
+
+namespace DummyNamespace;
+
+use Log1x\AcfComposer\Block;
+use StoutLogic\AcfBuilder\FieldsBuilder;
+
+class DummyClass extends Block
+{
+    /**
+     * The block name.
+     *
+     * @var string
+     */
+    public $name = 'DummyClass';
+
+    /**
+     * The block description.
+     *
+     * @var string
+     */
+    public $description = 'Lorem ipsum...';
+
+    /**
+     * The block category.
+     *
+     * @var string
+     */
+    public $category = 'common';
+
+    /**
+     * The block icon.
+     *
+     * @var string|array
+     */
+    public $icon = 'star-half';
+
+    /**
+     * The block features.
+     *
+     * @var array
+     */
+    public $supports = [
+        '__experimental_jsx' => true,
+        'mode' => false,
+    ];
+
+    /**
+     * Data to be passed to the block before rendering.
+     *
+     * @return array
+     */
+    public function with()
+    {
+        return [
+            'items' => $this->items(),
+        ];
+    }
+
+    /**
+     * The block field group.
+     *
+     * @return array
+     */
+    public function fields()
+    {
+        $DummyCamel = new FieldsBuilder('DummySnake');
+
+        $DummyCamel
+            ->addRepeater('items')
+                ->addText('item')
+            ->endRepeater();
+
+        return $DummyCamel->build();
+    }
+
+    /**
+     * Return the items field.
+     *
+     * @return array
+     */
+    public function items()
+    {
+        return get_field('items') ?: [];
+    }
+}

src/Console/stubs/views/repeater-innerblock.stub

@@ -0,0 +1,11 @@
+@if ($items)
+  <ul>
+    @foreach ($items as $item)
+      <li>{{ $item['item'] }}</li>
+    @endforeach
+  </ul>
+@else
+  <p>No items found!</p>
+@endif
+
+<InnerBlock />