diff --git a/source/php/Component/Accordion__item/Accordion__item.php b/source/php/Component/Accordion__item/Accordion__item.php index 909c1a1c..e2346bf1 100644 --- a/source/php/Component/Accordion__item/Accordion__item.php +++ b/source/php/Component/Accordion__item/Accordion__item.php @@ -16,7 +16,8 @@ public function init() { $this->data['classList'][] = 'c-accordion__section'; $this->data['id'] = uniqid(); - $this->data['headingType'] = ( isset($this->heading) && is_array($this->heading) ) ? $this->data['baseClass'] . '__heading-is-array' : ''; + $this->data['headingType'] = $this->headingType() ? $this->data['baseClass'] . '__heading-is-array' : ''; + $this->data['ariaLabel'] = $this->headingType() ? $this->heading[0] : $this->heading; //Removes duplicate baseclass (Autogenerated) if (function_exists('add_filter')) { @@ -25,4 +26,8 @@ public function init() { }, 10, 3); } } + + private function headingType() { + return isset($this->heading) && is_array($this->heading); + } } diff --git a/source/php/Component/Accordion__item/accordion__item.blade.php b/source/php/Component/Accordion__item/accordion__item.blade.php index 0b7405a6..18188d85 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="{{$ariaLabel}}" aria-controls="{{ $baseClass }}__aria-{{ $id }}" aria-expanded="false" js-expand-button href="#{{$id}}">
{!!$beforeHeading!!}