Merge pull request #98 from systopia/correct-default-value-for-disabled-radios

Ensure the correct default value is used for disabled radios elements

Author: dontub

src/Form/Control/Callbacks/OptionValueCallbacks.php

@@ -54,7 +54,12 @@ public static function validate(array $element, FormStateInterface $formState):
   public static function value(array $element, $input, FormStateInterface $formState) {
     $defaultUsed = FALSE;
     if (FALSE === $input) {
-      $input = $element['#default_value'] ?? NULL;
+      if (array_key_exists('#_actual_default_value', $element)) {
+        $input = $element['#_actual_default_value'];
+      }
+      else {
+        $input = $element['#default_value'] ?? NULL;
+      }
       $defaultUsed = TRUE;
     }
 

src/Form/Control/RadiosArrayFactory.php

@@ -58,10 +58,12 @@ public function createFormArray(
 
     if (is_bool($form['#default_value'] ?? NULL)) {
       // If default value is a boolean, the corresponding radio is not selected.
+      $form['#_actual_default_value'] = $form['#default_value'];
       $form['#default_value'] = $form['#default_value'] ? '1' : '0';
     }
     elseif (0 === ($form['#default_value'] ?? NULL)) {
       // If default value is 0, the corresponding radio is not selected.
+      $form['#_actual_default_value'] = $form['#default_value'];
       $form['#default_value'] = '0';
     }