Merge pull request #1658 from craftcms/feature/1606-custom-options-support-radio-checkbox

adds support for importing custom options to radio and checkboxes field types

Author: angrybrad

src/fields/Checkboxes.php

@@ -55,22 +55,32 @@ public function parseField(): mixed
         $preppedData = [];
 
         $options = Hash::get($this->field, 'settings.options');
+        $customOptions = Hash::get($this->field, 'settings.customOptions', false);
         $match = Hash::get($this->fieldInfo, 'options.match', 'value');
 
         foreach ($options as $option) {
-            foreach ($value as $dataValue) {
+            foreach ($value as $key => $dataValue) {
                 if ($dataValue === $option[$match]) {
                     $preppedData[] = $option['value'];
+                    unset($value[$key]);
                 }
 
                 // special case for when mapping by label, but also using a default value
                 // which relies on $option['value']
                 if (empty($dataValue) && in_array($option['value'], $default)) {
                     $preppedData[] = $option['value'];
+                    unset($value[$key]);
                 }
             }
         }
 
+        // if custom options are allowed, and we still have values left in the $value variable - process those too
+        if ($customOptions && !empty($value)) {
+            foreach ($value as $dataValue) {
+                $preppedData[] = $dataValue;
+            }
+        }
+
         return $preppedData;
     }
 }

src/fields/RadioButtons.php

@@ -51,6 +51,7 @@ public function parseField(): mixed
         $default = Hash::get($this->fieldInfo, 'default');
 
         $options = Hash::get($this->field, 'settings.options');
+        $customOptions = Hash::get($this->field, 'settings.customOptions', false);
         $match = Hash::get($this->fieldInfo, 'options.match', 'value');
 
         foreach ($options as $option) {
@@ -62,7 +63,8 @@ public function parseField(): mixed
             }
         }
 
-        if (empty($value)) {
+        // if value is empty or the field supports adding custom options - return the value
+        if (empty($value) || $customOptions) {
             return $value;
         }