From 9293cfc04f084020a8989d05cde045e9b66a781e Mon Sep 17 00:00:00 2001
From: Wim Leers <wim.leers@acquia.com>
Date: Wed, 13 Jul 2016 13:29:32 +0200
Subject: [PATCH 1/5] ip1

---
 core/modules/big_pipe/src/Render/BigPipe.php                  | 11 ++++-------
 .../big_pipe/src/Render/Placeholder/BigPipeStrategy.php       |  4 +++-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/core/modules/big_pipe/src/Render/BigPipe.php b/core/modules/big_pipe/src/Render/BigPipe.php
index b312d76..0939ae8 100644
--- a/core/modules/big_pipe/src/Render/BigPipe.php
+++ b/core/modules/big_pipe/src/Render/BigPipe.php
@@ -716,14 +716,11 @@ protected function renderPlaceholder($placeholder, array $placeholder_render_arr
    *   only keep the first occurrence.
    */
   protected function getPlaceholderOrder($html, $placeholders) {
-    $fragments = explode('<span data-big-pipe-placeholder-id="', $html);
-    array_shift($fragments);
     $placeholder_ids = [];
-
-    foreach ($fragments as $fragment) {
-      $t = explode('"></span>', $fragment, 2);
-      $placeholder_id = $t[0];
-      $placeholder_ids[] = $placeholder_id;
+    $dom = Html::load($html);
+    $xpath = new \DOMXPath($dom);
+    foreach ($xpath->query('//span[@data-big-pipe-placeholder-id]') as $node) {
+      $placeholder_ids[] = Html::escape($node->getAttribute('data-big-pipe-placeholder-id'));
     }
     $placeholder_ids = array_unique($placeholder_ids);
 
diff --git a/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php b/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php
index f967eba..a28e622 100644
--- a/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php
+++ b/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php
@@ -198,8 +198,10 @@ protected static function placeholderIsAttributeSafe($placeholder) {
   protected static function createBigPipeJsPlaceholder($original_placeholder, array $placeholder_render_array) {
     $big_pipe_placeholder_id = static::generateBigPipePlaceholderId($original_placeholder, $placeholder_render_array);
 
+    $interface_preview = "<strong>THIS IS A VERY CRAPPY PREVIEW OF $big_pipe_placeholder_id</strong>";
+
     return [
-      '#markup' => '<span data-big-pipe-placeholder-id="' . Html::escape($big_pipe_placeholder_id) . '"></span>',
+      '#markup' => '<span data-big-pipe-placeholder-id="' . Html::escape($big_pipe_placeholder_id) . '">' . $interface_preview . '</span>',
       '#cache' => [
         'max-age' => 0,
         'contexts' => [
-- 
2.10.1


From 05827e2b502d80fcde71d50acd62846633b1c94a Mon Sep 17 00:00:00 2001
From: Wim Leers <wim.leers@acquia.com>
Date: Thu, 14 Jul 2016 09:46:37 +0200
Subject: [PATCH 2/5] ip2

---
 .../src/Render/Placeholder/BigPipeStrategy.php         | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php b/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php
index a28e622..831f732 100644
--- a/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php
+++ b/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php
@@ -5,6 +5,7 @@
 use Drupal\Component\Utility\Crypt;
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\UrlHelper;
+use Drupal\Core\Render\Markup;
 use Drupal\Core\Render\Placeholder\PlaceholderStrategyInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Session\SessionConfigurationInterface;
@@ -198,10 +199,23 @@ protected static function placeholderIsAttributeSafe($placeholder) {
   protected static function createBigPipeJsPlaceholder($original_placeholder, array $placeholder_render_array) {
     $big_pipe_placeholder_id = static::generateBigPipePlaceholderId($original_placeholder, $placeholder_render_array);
 
-    $interface_preview = "<strong>THIS IS A VERY CRAPPY PREVIEW OF $big_pipe_placeholder_id</strong>";
+    $interface_preview = '';
+
+    if (isset($placeholder_render_array['#lazy_builder'])) {
+      if (in_array($placeholder_render_array['#lazy_builder'][0], ['comment.lazy_builders:renderLinks', 'Drupal\node\NodeViewBuilder::renderLinks'])) {
+        $interface_preview_style = "<style>span[data-big-pipe-placeholder-id='$big_pipe_placeholder_id'] nav ul li a { -webkit-filter: contrast(5%); filter: contrast(5%); }</style>";
+        $interface_preview_markup = "<nav><ul class='links inline'><li><a>▆▆▆▆▆</a></li><li><a>▆▆▆▆▆</a></li></ul>";
+        $interface_preview = $interface_preview_style . $interface_preview_markup;
+      }
+      elseif ($placeholder_render_array['#lazy_builder'][0] === 'comment.lazy_builders:renderForm') {
+        $interface_preview_style = '';
+        $interface_preview_markup = "<div style='height: 430px; background-color: #f8f8f8'><div style='position: absolute; bottom: 20px; width: 150px; height: 30px; background-color: #e8e8e8'></div></div>";
+        $interface_preview = $interface_preview_style . $interface_preview_markup;
+      }
+    }
 
     return [
-      '#markup' => '<span data-big-pipe-placeholder-id="' . Html::escape($big_pipe_placeholder_id) . '">' . $interface_preview . '</span>',
+      '#markup' => Markup::create('<span data-big-pipe-placeholder-id="' . Html::escape($big_pipe_placeholder_id) . '">' . $interface_preview . '</span>'),
       '#cache' => [
         'max-age' => 0,
         'contexts' => [
-- 
2.10.1


From 06a9786627ee99c0bbe69588fe62925ce34104df Mon Sep 17 00:00:00 2001
From: Wim Leers <wim.leers@acquia.com>
Date: Thu, 14 Jul 2016 10:19:13 +0200
Subject: [PATCH 3/5] ip3

---
 .../src/Render/Placeholder/BigPipeStrategy.php     | 24 ++++++++++++++--------
 core/modules/comment/src/CommentLazyBuilders.php   | 16 +++++++++++++++
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php b/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php
index 831f732..ecd2558 100644
--- a/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php
+++ b/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php
@@ -202,15 +202,23 @@ protected static function createBigPipeJsPlaceholder($original_placeholder, arra
     $interface_preview = '';
 
     if (isset($placeholder_render_array['#lazy_builder'])) {
-      if (in_array($placeholder_render_array['#lazy_builder'][0], ['comment.lazy_builders:renderLinks', 'Drupal\node\NodeViewBuilder::renderLinks'])) {
-        $interface_preview_style = "<style>span[data-big-pipe-placeholder-id='$big_pipe_placeholder_id'] nav ul li a { -webkit-filter: contrast(5%); filter: contrast(5%); }</style>";
-        $interface_preview_markup = "<nav><ul class='links inline'><li><a>▆▆▆▆▆</a></li><li><a>▆▆▆▆▆</a></li></ul>";
-        $interface_preview = $interface_preview_style . $interface_preview_markup;
+      $callable = $placeholder_render_array['#lazy_builder'][0];
+      if (is_string($callable)) {
+        if (strpos($callable, ':') !== FALSE && strpos($callable, '::') === FALSE) {
+          try {
+            $callable = \Drupal::service('controller_resolver')->getControllerFromDefinition($callable . 'Preview');
+          }
+          catch (\InvalidArgumentException $e) {}
+        }
+        else {
+          $callable .= 'Preview';
+        }
+      }
+      else if (is_array($callable)) {
+        $callable[1] .= 'Preview';
       }
-      elseif ($placeholder_render_array['#lazy_builder'][0] === 'comment.lazy_builders:renderForm') {
-        $interface_preview_style = '';
-        $interface_preview_markup = "<div style='height: 430px; background-color: #f8f8f8'><div style='position: absolute; bottom: 20px; width: 150px; height: 30px; background-color: #e8e8e8'></div></div>";
-        $interface_preview = $interface_preview_style . $interface_preview_markup;
+      if (is_callable($callable)) {
+        $interface_preview = call_user_func_array($callable, array_merge([$big_pipe_placeholder_id], $placeholder_render_array['#lazy_builder'][1]));
       }
     }
 
diff --git a/core/modules/comment/src/CommentLazyBuilders.php b/core/modules/comment/src/CommentLazyBuilders.php
index 730c840..bbbf04c 100644
--- a/core/modules/comment/src/CommentLazyBuilders.php
+++ b/core/modules/comment/src/CommentLazyBuilders.php
@@ -111,6 +111,13 @@ public function renderForm($commented_entity_type_id, $commented_entity_id, $fie
   }
 
   /**
+   * Interface preview for ::renderForm().
+   */
+  public function renderFormPreview($big_pipe_placeholder_id, $commented_entity_type_id, $commented_entity_id, $field_name, $comment_type_id) {
+    return "<div style='height: 430px; background-color: #f8f8f8'><div style='position: absolute; bottom: 20px; width: 150px; height: 30px; background-color: #e8e8e8'></div></div>";
+  }
+
+  /**
    * #lazy_builder callback; builds a comment's links.
    *
    * @param string $comment_entity_id
@@ -151,6 +158,15 @@ public function renderLinks($comment_entity_id, $view_mode, $langcode, $is_in_pr
   }
 
   /**
+   * Interface preview for ::renderLinks().
+   */
+  public function renderLinksPreview($big_pipe_placeholder_id, $comment_entity_id, $view_mode, $langcode, $is_in_preview) {
+    $interface_preview_style = "<style>div[data-big-pipe-placeholder-id='$big_pipe_placeholder_id'] nav ul li a { -webkit-filter: contrast(5%); filter: contrast(5%); }</style>";
+    $interface_preview_markup = "<nav><ul class='links inline'><li><a>▆▆▆▆▆</a></li><li><a>▆▆▆▆▆</a></li></ul>";
+    return $interface_preview_style . $interface_preview_markup;
+  }
+
+  /**
    * Build the default links (reply, edit, delete …) for a comment.
    *
    * @param \Drupal\comment\CommentInterface $entity
-- 
2.10.1


From c40e05824697fca021d9baf635c924dbc6896263 Mon Sep 17 00:00:00 2001
From: Wim Leers <wim.leers@acquia.com>
Date: Thu, 14 Jul 2016 16:09:54 +0200
Subject: [PATCH 4/5] ip4

---
 core/modules/big_pipe/big_pipe.libraries.yml       |  3 +++
 core/modules/big_pipe/css/big_pipe.css             |  4 ++++
 .../src/Render/Placeholder/BigPipeStrategy.php     | 11 ++++++---
 core/modules/comment/src/CommentLazyBuilders.php   | 27 +++++++++++++++++-----
 .../form/form--comment--preview.html.twig          |  3 +++
 5 files changed, 39 insertions(+), 9 deletions(-)
 create mode 100644 core/modules/big_pipe/css/big_pipe.css
 create mode 100644 core/themes/classy/templates/form/form--comment--preview.html.twig

diff --git a/core/modules/big_pipe/big_pipe.libraries.yml b/core/modules/big_pipe/big_pipe.libraries.yml
index 6da49b7..9a49d6a 100644
--- a/core/modules/big_pipe/big_pipe.libraries.yml
+++ b/core/modules/big_pipe/big_pipe.libraries.yml
@@ -1,5 +1,8 @@
 big_pipe:
   version: VERSION
+  css:
+    theme:
+      css/big_pipe.css: {}
   js:
     js/big_pipe.js: {}
   drupalSettings:
diff --git a/core/modules/big_pipe/css/big_pipe.css b/core/modules/big_pipe/css/big_pipe.css
new file mode 100644
index 0000000..49b1259
--- /dev/null
+++ b/core/modules/big_pipe/css/big_pipe.css
@@ -0,0 +1,4 @@
+div[data-big-pipe-placeholder-id] {
+  -webkit-filter: opacity(0.2) blur(1px);
+  filter: opacity(0.2) blur(1px);
+}
diff --git a/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php b/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php
index ecd2558..6ff5469 100644
--- a/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php
+++ b/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php
@@ -199,7 +199,7 @@ protected static function placeholderIsAttributeSafe($placeholder) {
   protected static function createBigPipeJsPlaceholder($original_placeholder, array $placeholder_render_array) {
     $big_pipe_placeholder_id = static::generateBigPipePlaceholderId($original_placeholder, $placeholder_render_array);
 
-    $interface_preview = '';
+    $interface_preview = [];
 
     if (isset($placeholder_render_array['#lazy_builder'])) {
       $callable = $placeholder_render_array['#lazy_builder'][0];
@@ -218,12 +218,17 @@ protected static function createBigPipeJsPlaceholder($original_placeholder, arra
         $callable[1] .= 'Preview';
       }
       if (is_callable($callable)) {
-        $interface_preview = call_user_func_array($callable, array_merge([$big_pipe_placeholder_id], $placeholder_render_array['#lazy_builder'][1]));
+        $interface_preview = $callable();
+        assert('is_array($interface_preview)', "Interface preview for $original_placeholder must be a render array.");
       }
     }
 
+    $interface_preview = [];
+
     return [
-      '#markup' => Markup::create('<span data-big-pipe-placeholder-id="' . Html::escape($big_pipe_placeholder_id) . '">' . $interface_preview . '</span>'),
+      '#prefix' => '<span data-big-pipe-placeholder-id="' . Html::escape($big_pipe_placeholder_id) . '">',
+      'interface preview' => $interface_preview,
+      '#suffix' => '</span>',
       '#cache' => [
         'max-age' => 0,
         'contexts' => [
diff --git a/core/modules/comment/src/CommentLazyBuilders.php b/core/modules/comment/src/CommentLazyBuilders.php
index bbbf04c..f223b32 100644
--- a/core/modules/comment/src/CommentLazyBuilders.php
+++ b/core/modules/comment/src/CommentLazyBuilders.php
@@ -3,6 +3,7 @@
 namespace Drupal\comment;
 
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
+use Drupal\Component\Utility\Random;
 use Drupal\Core\Entity\EntityFormBuilderInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
@@ -113,8 +114,12 @@ public function renderForm($commented_entity_type_id, $commented_entity_id, $fie
   /**
    * Interface preview for ::renderForm().
    */
-  public function renderFormPreview($big_pipe_placeholder_id, $commented_entity_type_id, $commented_entity_id, $field_name, $comment_type_id) {
-    return "<div style='height: 430px; background-color: #f8f8f8'><div style='position: absolute; bottom: 20px; width: 150px; height: 30px; background-color: #e8e8e8'></div></div>";
+  public function renderFormPreview() {
+    return [
+      '#type' => 'form',
+      '#theme' => 'form__comment__preview',
+      '#form_id' => 'comment_form_preview',
+    ];
   }
 
   /**
@@ -160,10 +165,20 @@ public function renderLinks($comment_entity_id, $view_mode, $langcode, $is_in_pr
   /**
    * Interface preview for ::renderLinks().
    */
-  public function renderLinksPreview($big_pipe_placeholder_id, $comment_entity_id, $view_mode, $langcode, $is_in_preview) {
-    $interface_preview_style = "<style>div[data-big-pipe-placeholder-id='$big_pipe_placeholder_id'] nav ul li a { -webkit-filter: contrast(5%); filter: contrast(5%); }</style>";
-    $interface_preview_markup = "<nav><ul class='links inline'><li><a>▆▆▆▆▆</a></li><li><a>▆▆▆▆▆</a></li></ul>";
-    return $interface_preview_style . $interface_preview_markup;
+  public function renderLinksPreview() {
+    return [
+      '#theme' => 'links__comment__preview',
+      '#pre_render' => ['drupal_pre_render_links'],
+      '#attributes' => ['class' => ['links', 'inline']],
+      'preview' => [
+        '#theme' => 'links__node',
+        '#links' => [
+          ['title' => '▆▆▆▆▆', 'url' =>  Url::fromRoute('<none>')],
+          ['title' => '▆▆▆▆▆', 'url' =>  Url::fromRoute('<none>')],
+        ],
+      ],
+    ];
+    return $this->renderer->renderPlain($links);
   }
 
   /**
diff --git a/core/themes/classy/templates/form/form--comment--preview.html.twig b/core/themes/classy/templates/form/form--comment--preview.html.twig
new file mode 100644
index 0000000..ec91299
--- /dev/null
+++ b/core/themes/classy/templates/form/form--comment--preview.html.twig
@@ -0,0 +1,3 @@
+<div style='height: 450px; background-color: lightgrey'>
+    <div style='position: absolute; bottom: 20px; width: 150px; height: 30px; background-color: darkgrey'></div>
+</div>
-- 
2.10.1


From b4ea512943411fdf109b689baaaa3463212c7e98 Mon Sep 17 00:00:00 2001
From: Wim Leers <wim.leers@acquia.com>
Date: Thu, 14 Jul 2016 17:28:42 +0200
Subject: [PATCH 5/5] =?UTF-8?q?ip5=20=E2=80=94=20oops,=20left=20my=20reset?=
 =?UTF-8?q?ting=20code=20in=20there=20for=20recording=20the=20screencast!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php b/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php
index 6ff5469..3d4be72 100644
--- a/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php
+++ b/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php
@@ -223,8 +223,6 @@ protected static function createBigPipeJsPlaceholder($original_placeholder, arra
       }
     }
 
-    $interface_preview = [];
-
     return [
       '#prefix' => '<span data-big-pipe-placeholder-id="' . Html::escape($big_pipe_placeholder_id) . '">',
       'interface preview' => $interface_preview,
-- 
2.10.1