Merge branch 'main' of github.com:helsingborg-stad/modularity-frontend-form

Author: Sebastian Thulin

source/php/Module/FormatSteps.php

@@ -156,26 +156,10 @@ private function mapUrl(array $field): array
 
         return $mapped;
     }
-    
-    // TODO: We do not have anything like this
+
     private function mapButtonGroup(array $field): array
     {
-        $mapped = $this->mapBasic($field, 'buttonGroup');
-        $mapped['type'] = 'radio';
-
-        $mapped['choices'] = [];
-        foreach ($field['choices'] as $key => $value) {
-            $mapped['choices'][$key] = [
-                'type' => $mapped['type'],
-                'label' => $value,
-                'required' => $mapped['required'] ?? false,
-                'name' => $field['key'],
-                'value' => $key,
-                'checked' => ($field['default_value'] ?? '') === $key,
-            ];
-        }
-
-        return $mapped; 
+        return $this->mapRadio($field);
     }
 
     private function mapTimePicker(array $field): array
@@ -269,31 +253,15 @@ private function mapEmail(array $field): array
 
     private function mapTrueFalse(array $field): array
     {
-        $mapped = $this->mapBasic($field, 'trueFalse');
-
-        $mapped['checked'] = !empty($field['default_value']) ? true : false;
-        $mapped['type']    = 'radio';
-        $mapped['attributeList']['role'] = 'radiogroup';
-        $mapped['attributeList']['style'] = 'display: flex;';
 
-        $mapped['choices'] = [
-            [
-                'type' => $mapped['type'],
-                'label' => __('No', 'modularity-frontend-form'),
-                'name' => $field['key'],
-                'value' => false,
-                'checked' => !$mapped['checked'],
-            ],
-            [
-                'type' => $mapped['type'],
-                'label' => __('Yes', 'modularity-frontend-form'),
-                'required' => $mapped['required'] ?? false,
-                'name' => $field['key'],
-                'value' => true,
-                'checked' => $mapped['checked'],
-            ],
+        $field['choices'] = [
+            0 => __('No', 'modularity-frontend-form'),
+            1 => __('Yes', 'modularity-frontend-form'),
         ];
 
+        $mapped = $this->mapRadio($field);
+
+        $mapped['attributeList']['style'] = 'display: flex;';
 
         return $mapped;
     }