✨ Add support for block defaults (#327)

🧑‍💻 Improve block version handling

Author: Log1x

config/acf.php

@@ -37,6 +37,21 @@
         // 'phoneNumber' => 'phone_number',
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Default Block Settings
+    |--------------------------------------------------------------------------
+    |
+    | Here you may define default settings to merge with your block definition
+    | during composition. Any settings defined on the block will take
+    | precedence over these defaults.
+    |
+    */
+
+    'blocks' => [
+        'apiVersion' => 2,
+    ],
+
     /*
     |--------------------------------------------------------------------------
     | Generators

src/Block.php

@@ -271,18 +271,11 @@ abstract class Block extends Composer implements BlockContract
     public $usePostMeta = false;
 
     /**
-     * The ACF block API version.
+     * The block API version.
      *
-     * @var int
+     * @var int|null
      */
-    public $blockVersion = 2;
-
-    /**
-     * The ACF block API version.
-     *
-     * @var int
-     */
-    public $apiVersion = 2;
+    public $apiVersion = null;
 
     /**
      * Validate block fields as per the field group configuration.
@@ -304,12 +297,18 @@ public function attributes(): array
      */
     public function mergeAttributes(): void
     {
-        if (! $attributes = $this->attributes()) {
-            return;
+        foreach ($this->attributes() as $key => $value) {
+            if (! property_exists($this, $key)) {
+                continue;
+            }
+
+            $this->{$key} = $value;
         }
 
-        foreach ($attributes as $key => $value) {
-            if (! property_exists($this, $key)) {
+        $defaults = config('acf.blocks', []);
+
+        foreach ($defaults as $key => $value) {
+            if (! property_exists($this, $key) || filled($this->{$key})) {
                 continue;
             }
 
@@ -495,6 +494,14 @@ public function getClasses(): string
         );
     }
 
+    /**
+     * Retrieve the block API version.
+     */
+    public function getApiVersion(): int
+    {
+        return $this->apiVersion ?? 2;
+    }
+
     /**
      * Retrieve the block text domain.
      */
@@ -638,8 +645,8 @@ public function settings(): Collection
             'styles' => $this->getStyles(),
             'supports' => $this->getSupports(),
             'textdomain' => $this->getTextDomain(),
-            'acf_block_version' => $this->blockVersion,
-            'api_version' => $this->apiVersion,
+            'acf_block_version' => $this->getApiVersion(),
+            'apiVersion' => $this->getApiVersion(),
             'validate' => $this->validate,
             'use_post_meta' => $this->usePostMeta,
             'render_callback' => function (
@@ -694,7 +701,7 @@ public function toJson(): string
         $settings = $this->settings()
             ->put('name', $this->namespace)
             ->put('acf', [
-                'blockVersion' => $this->blockVersion,
+                'blockVersion' => $this->getApiVersion(),
                 'mode' => $this->mode,
                 'postTypes' => $this->post_types,
                 'renderTemplate' => $this::class,