From 0b9bfcc8864c3c543fe880be504fe817bccaa440 Mon Sep 17 00:00:00 2001 From: Sebastian Thulin Date: Tue, 7 Nov 2023 11:41:22 +0100 Subject: [PATCH] fix: typo in aria-label --- .../Component/Accordion/accordion.blade.php | 63 ++++++++++--------- .../Accordion__item/accordion__item.blade.php | 2 +- 2 files changed, 34 insertions(+), 31 deletions(-) diff --git a/source/php/Component/Accordion/accordion.blade.php b/source/php/Component/Accordion/accordion.blade.php index a5c626aa..7c7a505e 100644 --- a/source/php/Component/Accordion/accordion.blade.php +++ b/source/php/Component/Accordion/accordion.blade.php @@ -1,47 +1,50 @@ @if($list) <{{$componentElement}} class="{{ $class }}" js-expand-container {!! $attribute !!}> - @foreach($list as $section) - <{{$sectionElement}} class="{{$baseClass}}__section"> + @foreach($list as $section) + <{{$sectionElement}} class="{{$baseClass}}__section"> - <{{$sectionHeadingElement}} class="{{$baseClass}}__button" role="button" aria-label="{{$section['heading']}}" aria-controls="{{ $baseClass }}__aria-{{ $id }}-{{ $loop->index }}" aria-expanded="false" js-expand-button> - - {!!$beforeHeading!!} + <{{$sectionHeadingElement}} class="{{$baseClass}}__button" role="button" aria-label="{{$section['heading']}}" aria-controls="{{ $baseClass }}__aria-{{ $id }}-{{ $loop->index }}" aria-expanded="false" js-expand-button> + + {!!$beforeHeading!!} - {!! $section['heading'] !!} - @if($taxonomyPosition === 'top' && $taxonomy > 0) - @tags([ - 'tags' => $taxonomy - ]) - @endtags - @endif + {!! $section['heading'] !!} + @if($taxonomyPosition === 'top' && $taxonomy > 0) + @tags([ + 'tags' => $taxonomy + ]) + @endtags + @endif - {!!$afterHeading!!} + {!!$afterHeading!!} - @icon(['icon' => 'keyboard_arrow_down', 'size' => 'md', 'classList' => [$baseClass . '__icon']]) - @endicon - - + @icon(['icon' => 'keyboard_arrow_down', 'size' => 'md', 'classList' => [$baseClass . '__icon']]) + @endicon - <{{$sectionContentElement}} class="{{$baseClass}}__content" id="{{ $baseClass }}__aria-{{ $id }}-{{ $loop->index }}" aria-hidden="true"> - {!!$beforeContent!!} + + - {!! $section['content'] !!} + <{{$sectionContentElement}} class="{{$baseClass}}__content" id="{{ $baseClass }}__aria-{{ $id }}-{{ $loop->index }}" aria-hidden="true"> + + {!!$beforeContent!!} - {!!$afterContent!!} + {!! $section['content'] !!} - @if($taxonomyPosition === 'below' && $taxonomy > 0) - @tags([ - 'tags' => $taxonomy - ]) - @endtags - @endif + {!!$afterContent!!} - + @if($taxonomyPosition === 'below' && $taxonomy > 0) + @tags([ + 'tags' => $taxonomy + ]) + @endtags + @endif - - @endforeach + + + + @endforeach + @elseif($slotHasData) <{{$componentElement}} class="{{ $class }}" js-expand-container {!! $attribute !!}> {!! $slot !!} diff --git a/source/php/Component/Accordion__item/accordion__item.blade.php b/source/php/Component/Accordion__item/accordion__item.blade.php index cea53df4..cb1026cd 100644 --- a/source/php/Component/Accordion__item/accordion__item.blade.php +++ b/source/php/Component/Accordion__item/accordion__item.blade.php @@ -1,6 +1,6 @@ {{-- Accordion Item --}} <{{$sectionElement}} class="{{$class}}" {!! $attribute !!}"> - <{{$sectionHeadingElement}} class="{{$baseClass}}__button" aria-label="{{$heading}} aria-controls="{{ $baseClass }}__aria-{{ $id }}" aria-expanded="false" js-expand-button href="#{{$id}}"> + <{{$sectionHeadingElement}} class="{{$baseClass}}__button" aria-label="{{$heading}}" aria-controls="{{ $baseClass }}__aria-{{ $id }}" aria-expanded="false" js-expand-button href="#{{$id}}"> {!!$beforeHeading!!}