From d6fd3b300bb7ff0605fb39fe822bec9241008519 Mon Sep 17 00:00:00 2001 From: Niclas Date: Fri, 16 Feb 2024 11:24:36 +0100 Subject: [PATCH] refactor: set typography variant --- source/php/Component/Typography/Typography.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/source/php/Component/Typography/Typography.php b/source/php/Component/Typography/Typography.php index 98b8f970..c828e978 100644 --- a/source/php/Component/Typography/Typography.php +++ b/source/php/Component/Typography/Typography.php @@ -42,15 +42,13 @@ public function init() { private function getVariant($variant) { $element = $this->data['element']; + $headings = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6']; + if (!$variant) { return $element; } - if (in_array($element, ['h1', 'h2', 'h3', 'h4', 'h5', 'h6'])) { - if (in_array($variant, ['h1', 'h2', 'h3', 'h4', 'h5', 'h6'])) { - return $variant; - } - + if (in_array($element, $headings) && !in_array($variant, $headings)) { trigger_error( sprintf( 'Element "%s" and variant "%s" cannot be combined. Heading elements must use a heading variant.', @@ -63,7 +61,7 @@ private function getVariant($variant) { return $element; } - return 'p'; + return $variant; } private function setMaxHeading($element) {