Joachim Noreiko
--- a/src/Element/ConfiguredPlugin.php 0 → 100644
+++ b/src/Element/ConfiguredPlugin.php 0 → 100644
+    ];
+
+    if ($selected_plugin_id = $form_state->getValue([...$element['#array_parents'], 'plugin_id'])) {
+      // A value set in the form by the user prior to an AJAX submission takes
+      // precedence.
+    }
+    elseif ($selected_plugin_id = $form_state->getValue([...$element['#array_parents'], 'container', 'plugin_id'])) {
+      // On a non-JS 'Choose' button submission, the valueCallback has not
+      // (yet?) run, and so our value is still inside the container. WTF.
+    }
+    elseif (isset($element['#default_value']['plugin_id'])) {
+      $selected_plugin_id = $element['#default_value']['plugin_id'];
+    }
+    else {
+      // If we still don't have anything, use an empty value.
+      $selected_entity_type_id = '';