Issue #2789909 by vaplas, Lendude, lucur, dawehner: Remove spaces around row.content

core/modules/views/templates/views-view-grid.html.twig

@@ -59,7 +59,7 @@
       <div{{ row.attributes.addClass(row_classes, options.row_class_default ? 'row-' ~ loop.index) }}>
         {% for column in row.content %}
           <div{{ column.attributes.addClass(col_classes, options.col_class_default ? 'col-' ~ loop.index) }}>
-            {{ column.content }}
+            {{- column.content -}}
           </div>
         {% endfor %}
       </div>
@@ -69,7 +69,7 @@
       <div{{ column.attributes.addClass(col_classes, options.col_class_default ? 'col-' ~ loop.index) }}>
         {% for row in column.content %}
           <div{{ row.attributes.addClass(row_classes, options.row_class_default ? 'row-' ~ loop.index) }}>
-            {{ row.content }}
+            {{- row.content -}}
           </div>
         {% endfor %}
       </div>

core/modules/views/templates/views-view-list.html.twig

@@ -28,7 +28,9 @@
   <{{ list.type }}{{ list.attributes }}>
 
     {% for row in rows %}
-      <li{{ row.attributes }}>{{ row.content }}</li>
+      <li{{ row.attributes }}>
+        {{- row.content -}}
+      </li>
     {% endfor %}
 
   </{{ list.type }}>

core/modules/views/templates/views-view-unformatted.html.twig

@@ -27,6 +27,6 @@
     ]
   %}
   <div{{ row.attributes.addClass(row_classes) }}>
-    {{ row.content }}
+    {{- row.content -}}
   </div>
 {% endfor %}

core/modules/views/tests/modules/views_test_data/views_test_data.views_execution.inc

@@ -74,6 +74,11 @@ function views_test_data_placeholders() {
  */
 function views_test_data_views_post_render(ViewExecutable $view, &$output, CachePluginBase $cache) {
   \Drupal::state()->set('views_hook_test_views_post_render', TRUE);
+  if ($view->storage->id() === 'test_page_display' && $view->current_display === 'empty_row') {
+    for ($i = 0; $i < 5; $i++) {
+      $output['#rows'][0]['#rows'][] = [];
+    }
+  }
 }
 
 /**

core/modules/views/tests/src/Kernel/Plugin/DisplayPageTest.php

@@ -30,7 +30,7 @@ class DisplayPageTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $modules = ['system', 'user', 'field'];
+  public static $modules = ['system', 'user', 'field', 'views_test_data'];
 
   /**
    * The router dumper to get all routes.
@@ -220,4 +220,40 @@ public function testReadMore() {
     $this->assertTrue($view->getDisplay()->getOption('use_more_always'), 'Always display the more link by default.');
   }
 
+  /**
+   * Tests the templates with empty rows.
+   */
+  public function testEmptyRow() {
+    $view = Views::getView('test_page_display');
+    $view->initDisplay();
+    $view->newDisplay('page', 'Page', 'empty_row');
+    $view->save();
+
+    $styles = [
+      'default' => '//div[@class="views-row"]',
+      'grid' => '//div[contains(@class, "views-col")]',
+      'html_list' => '//div[@class="item-list"]//li',
+    ];
+
+    $themes = ['bartik', 'classy', 'seven', 'stable', 'stark'];
+
+    foreach ($themes as $theme) {
+      \Drupal::service('theme_handler')->install([$theme]);
+      \Drupal::theme()->setActiveTheme(\Drupal::service('theme.initialization')->initTheme($theme));
+      foreach ($styles as $type => $xpath) {
+        $view = Views::getView('test_page_display');
+        $view->storage->invalidateCaches();
+        $view->initDisplay();
+        $view->setDisplay('empty_row');
+        $view->displayHandlers->get('empty_row')->default_display->options['style']['type'] = $type;
+        $view->initStyle();
+        $this->executeView($view);
+        $output = $view->preview();
+        $output = \Drupal::service('renderer')->renderRoot($output);
+        $this->setRawContent($output);
+        $this->assertCount(5, $this->xpath("{$xpath}[not(text()) and not(node())]"), "Empty rows in theme '$theme', type '$type'.");
+      }
+    }
+  }
+
 }

core/themes/classy/templates/views/views-view-grid.html.twig

@@ -57,7 +57,7 @@
       <div{{ row.attributes.addClass(row_classes, options.row_class_default ? 'row-' ~ loop.index) }}>
         {% for column in row.content %}
           <div{{ column.attributes.addClass(col_classes, options.col_class_default ? 'col-' ~ loop.index) }}>
-            {{ column.content }}
+            {{- column.content -}}
           </div>
         {% endfor %}
       </div>
@@ -67,7 +67,7 @@
       <div{{ column.attributes.addClass(col_classes, options.col_class_default ? 'col-' ~ loop.index) }}>
         {% for row in column.content %}
           <div{{ row.attributes.addClass(row_classes, options.row_class_default ? 'row-' ~ loop.index) }}>
-            {{ row.content }}
+            {{- row.content -}}
           </div>
         {% endfor %}
       </div>

core/themes/classy/templates/views/views-view-list.html.twig

@@ -26,7 +26,9 @@
   <{{ list.type }}{{ list.attributes }}>
 
     {% for row in rows %}
-      <li{{ row.attributes }}>{{ row.content }}</li>
+      <li{{ row.attributes }}>
+        {{- row.content -}}
+      </li>
     {% endfor %}
 
   </{{ list.type }}>

core/themes/classy/templates/views/views-view-unformatted.html.twig

@@ -25,6 +25,6 @@
     ]
   %}
   <div{{ row.attributes.addClass(row_classes) }}>
-    {{ row.content }}
+    {{- row.content -}}
   </div>
 {% endfor %}

core/themes/stable/templates/views/views-view-grid.html.twig

@@ -57,7 +57,7 @@
       <div{{ row.attributes.addClass(row_classes, options.row_class_default ? 'row-' ~ loop.index) }}>
         {% for column in row.content %}
           <div{{ column.attributes.addClass(col_classes, options.col_class_default ? 'col-' ~ loop.index) }}>
-            {{ column.content }}
+            {{- column.content -}}
           </div>
         {% endfor %}
       </div>
@@ -67,7 +67,7 @@
       <div{{ column.attributes.addClass(col_classes, options.col_class_default ? 'col-' ~ loop.index) }}>
         {% for row in column.content %}
           <div{{ row.attributes.addClass(row_classes, options.row_class_default ? 'row-' ~ loop.index) }}>
-            {{ row.content }}
+            {{- row.content -}}
           </div>
         {% endfor %}
       </div>

core/themes/stable/templates/views/views-view-list.html.twig

@@ -26,7 +26,9 @@
   <{{ list.type }}{{ list.attributes }}>
 
     {% for row in rows %}
-      <li{{ row.attributes }}>{{ row.content }}</li>
+      <li{{ row.attributes }}>
+        {{- row.content -}}
+      </li>
     {% endfor %}
 
   </{{ list.type }}>

core/themes/stable/templates/views/views-view-unformatted.html.twig

@@ -25,6 +25,6 @@
     ]
   %}
   <div{{ row.attributes.addClass(row_classes) }}>
-    {{ row.content }}
+    {{- row.content -}}
   </div>
 {% endfor %}