From 786963c0edb0ff843424d34bf528259c4073be37 Mon Sep 17 00:00:00 2001
From: Chi <Chi@556138.no-reply.drupal.org>
Date: Wed, 29 Apr 2020 09:20:10 +0000
Subject: [PATCH] Add ID to blocks

---
 src/View/BlockViewBuilder.php             |  1 +
 tests/src/Kernel/BlockViewBuilderTest.php | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/View/BlockViewBuilder.php b/src/View/BlockViewBuilder.php
index 957b396..ef54db7 100644
--- a/src/View/BlockViewBuilder.php
+++ b/src/View/BlockViewBuilder.php
@@ -135,6 +135,7 @@ class BlockViewBuilder {
       if ($wrapper && !Element::isEmpty($build['content'])) {
         $build += [
           '#theme' => 'block',
+          '#id' => $configuration['id'] ?? $id,
           '#attributes' => [],
           '#contextual_links' => [],
           '#configuration' => $block_plugin->getConfiguration(),
diff --git a/tests/src/Kernel/BlockViewBuilderTest.php b/tests/src/Kernel/BlockViewBuilderTest.php
index def9c13..4ed03d2 100644
--- a/tests/src/Kernel/BlockViewBuilderTest.php
+++ b/tests/src/Kernel/BlockViewBuilderTest.php
@@ -46,6 +46,7 @@ final class BlockViewBuilderTest extends KernelTestBase {
         ],
       ],
       '#theme' => 'block',
+      '#id' => 'twig_tweak_test_foo',
       '#attributes' => [],
       '#contextual_links' => [],
       '#configuration' => [
@@ -71,21 +72,28 @@ final class BlockViewBuilderTest extends KernelTestBase {
       ],
     ];
     self::assertSame($expected_build, $build);
-    self::assertSame('<div>Foo</div>', $this->renderPlain($build));
+    self::assertSame('<div id="block-twig-tweak-test-foo">Foo</div>', $this->renderPlain($build));
 
     // -- Non-default configuration.
-    $build = $view_builder->build('twig_tweak_test_foo', ['content' => 'Bar', 'label' => 'Example']);
+    $configuration = [
+      'content' => 'Bar',
+      'label' => 'Example',
+      'id' => 'example',
+    ];
+    $build = $view_builder->build('twig_tweak_test_foo', $configuration);
     $expected_build['content']['#markup'] = 'Bar';
     $expected_build['#configuration']['label'] = 'Example';
     $expected_build['#configuration']['content'] = 'Bar';
+    $expected_build['#configuration']['id'] = 'example';
+    $expected_build['#id'] = 'example';
     $expected_build['#cache']['keys'] = [
       'twig_tweak_block',
       'twig_tweak_test_foo',
-      '[configuration]=373b0811b355fa153ac8934c897a021697ff6e848f00b85e711d36212b77a958',
+      '[configuration]=8e53716fcf7e5d5c45effd55e9b2a267bbaf333f7253766f572d58e4f7991b36',
       '[wrapper]=1',
     ];
     self::assertSame($expected_build, $build);
-    self::assertSame('<div><h2>Example</h2>Bar</div>', $this->renderPlain($build));
+    self::assertSame('<div id="block-example"><h2>Example</h2>Bar</div>', $this->renderPlain($build));
 
     // -- Without wrapper.
     $build = $view_builder->build('twig_tweak_test_foo', [], FALSE);