🩹 Respect default alignment when blocks are cached (Fixes #302) (#310)

Author: Log1x

src/Block.php

@@ -363,6 +363,37 @@ public function getStyles(): array
  return $styles->all();
  }
 
+ /**
+ * Retrieve the block support attributes.
+ */
+ public function getSupportAttributes(): array
+ {
+ $attributes = [];
+
+ if ($this->align) {
+ $attributes['align'] = [
+ 'type' => 'string',
+ 'default' => $this->align,
+ ];
+ }
+
+ if ($this->align_text) {
+ $attributes['alignText'] = [
+ 'type' => 'string',
+ 'default' => $this->align_text,
+ ];
+ }
+
+ if ($this->align_content) {
+ $attributes['alignContent'] = [
+ 'type' => 'string',
+ 'default' => $this->align_content,
+ ];
+ }
+
+ return $attributes;
+ }
+
  /**
  * Retrieve the inline block styles.
  */
@@ -603,22 +634,29 @@ public function settings(): Collection
  */
  public function toJson(): string
  {
- $settings = $this->settings()->forget([
- 'acf_block_version',
- 'enqueue_assets',
- 'mode',
- 'post_types',
- 'render_callback',
- 'use_post_meta',
- 'validate',
- ])->put('acf', [
- 'blockVersion' => $this->blockVersion,
- 'mode' => $this->mode,
- 'postTypes' => $this->post_types,
- 'renderTemplate' => $this::class,
- 'usePostMeta' => $this->usePostMeta,
- 'validate' => $this->validate,
- ])->put('name', $this->namespace);
+ $settings = $this->settings()
+ ->put('name', $this->namespace)
+ ->put('attributes', $this->getSupportAttributes())
+ ->put('acf', [
+ 'blockVersion' => $this->blockVersion,
+ 'mode' => $this->mode,
+ 'postTypes' => $this->post_types,
+ 'renderTemplate' => $this::class,
+ 'usePostMeta' => $this->usePostMeta,
+ 'validate' => $this->validate,
+ ])
+ ->forget([
+ 'acf_block_version',
+ 'align',
+ 'alignContent',
+ 'alignText',
+ 'enqueue_assets',
+ 'mode',
+ 'post_types',
+ 'render_callback',
+ 'use_post_meta',
+ 'validate',
+ ]);
 
  return $settings->filter()->toJson(JSON_PRETTY_PRINT);
  }