Issue #3347291: Combine field storage and field instance forms

core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/DefaultSelection.php

@@ -159,7 +159,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
     $form = parent::buildConfigurationForm($form, $form_state);
 
     $configuration = $this->getConfiguration();
-    $entity_type_id = $form_state->getValue('field_storage')['subform']['settings']['target_type'] ?? $configuration['target_type'];
+    $entity_type_id = $configuration['target_type'];
     $entity_type = $this->entityTypeManager->getDefinition($entity_type_id);
     $bundles = $this->entityTypeBundleInfo->getBundleInfo($entity_type_id);
 
@@ -171,7 +171,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
       natsort($bundle_options);
       $selected_bundles = array_intersect_key(
         $bundle_options,
-        array_filter(array_merge(($form_state->getUserInput()['settings']['handler_settings']['target_bundles'] ?? []), (array) $configuration['target_bundles']))
+        array_filter((array) $configuration['target_bundles'])
       );
 
       $form['target_bundles'] = [
@@ -198,7 +198,6 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
       ];
     }
     else {
-      $selected_bundles = [];
       $form['target_bundles'] = [
         '#type' => 'value',
         '#value' => [],