Unverified Commit 9059fe71 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3119279 by dww, Lendude, alexpott, lauriii: views-view-table.html.twig... 

Issue #3119279 by dww, Lendude, alexpott, lauriii: views-view-table.html.twig template directly uses details without render array and polyfills

(cherry picked from commit e43c9190)
parent 9141f3f2

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

+3 −9
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
 *     used.

 * - responsive: A flag indicating whether table is responsive.

 * - sticky: A flag indicating whether table header is sticky.

 * - summary_element: A render array with table summary information (if any).

 *

 * @see template_preprocess_views_view_table()

 *
@@ -47,15 +48,8 @@ 
    {% else %}

      {{ title }}

    {% endif %}

    {% if (summary is not empty) or (description is not empty) %}

      <details>

        {% if summary is not empty %}

          <summary>{{ summary }}</summary>

        {% endif %}

        {% if description is not empty %}

          {{ description }}

        {% endif %}

      </details>

    {% if (summary_element is not empty) %}

      {{ summary_element }}

    {% endif %}

    </caption>

  {% endif %}

core/modules/views/tests/src/Functional/Plugin/StyleTableTest.php

+4 −0
Original line number Diff line number Diff line
@@ -48,6 +48,10 @@ public function testAccessibilitySettings() { 
    $result = $this->xpath('//summary/child::text()');

    $this->assertNotEmpty($result, 'The summary appears on the table.');

    $this->assertEqual(trim($result[0]->getText()), 'summary-text');

    // Check that the summary has the right accessibility settings.

    $summary = $this->xpath('//summary')[0];

    $this->assertTrue($summary->hasAttribute('role'));

    $this->assertTrue($summary->hasAttribute('aria-expanded'));



    $result = $this->xpath('//caption/details/child::text()[normalize-space()]');

    $this->assertNotEmpty($result, 'The table description appears on the table.');

core/modules/views/views.theme.inc

+15 −0
Original line number Diff line number Diff line
@@ -660,8 +660,23 @@ function template_preprocess_views_view_table(&$variables) { 
    $variables['caption_needed'] = FALSE;

  }



  // For backwards compatibility, initialize the 'summary' and 'description'

  // variables, although core templates now all use 'summary_element' instead.

  $variables['summary'] = $handler->options['summary'];

  $variables['description'] = $handler->options['description'];

  $variables['summary_element'] = [

    '#type' => 'details',

    '#title' => $handler->options['summary'],

    // To ensure that the description is properly escaped during rendering, use

    // an 'inline_template' to let Twig do its magic, instead of 'markup'.

    'description' => [

      '#type' => 'inline_template',

      '#template' => '{{ description }}',

      '#context' => [

        'description' => $handler->options['description'],

      ],

    ],

  ];

  $variables['caption_needed'] |= !empty($variables['summary']) || !empty($variables['description']);



  $variables['responsive'] = FALSE;

core/profiles/demo_umami/themes/umami/templates/classy/views/views-view-table.html.twig

+3 −9
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
 *     used.

 * - responsive: A flag indicating whether table is responsive.

 * - sticky: A flag indicating whether table header is sticky.

 * - summary_element: A render array with table summary information (if any).

 *

 * @see template_preprocess_views_view_table()

 */
@@ -47,15 +48,8 @@ 
    {% else %}

      {{ title }}

    {% endif %}

    {% if (summary is not empty) or (description is not empty) %}

      <details>

        {% if summary is not empty %}

          <summary>{{ summary }}</summary>

        {% endif %}

        {% if description is not empty %}

          {{ description }}

        {% endif %}

      </details>

    {% if (summary_element is not empty) %}

      {{ summary_element }}

    {% endif %}

    </caption>

  {% endif %}

core/tests/Drupal/KernelTests/Core/Theme/ConfirmClassyCopiesTest.php

+1 −1
Original line number Diff line number Diff line
@@ -834,7 +834,7 @@ protected function getClassyHash($type, $file) { 
        'views-exposed-form.html.twig' => 'd88119f917c62e0caa75ca0becc8c327',

        'views-view-grouping.html.twig' => 'e766e383b51511b86fc0815c94167c18',

        'views-view-summary.html.twig' => '38639cb9e815e387782b126cb613bb40',

        'views-view-table.html.twig' => 'bff52235899b901aa6cd225e7e71bf31',

        'views-view-table.html.twig' => '206e53d257651ea8b0eead68888878c0',

        'views-view-list.html.twig' => '7480144ffa90384ad2c3162f03ad042f',

        'views-view-unformatted.html.twig' => 'b2faf1bd77678dba68e1e6bb05c3a219',

        'views-view-row-rss.html.twig' => '0721785e0471ca23bbed6358dde0df68',