Bram Driesen · 18c868cb · 5446efe3 · 5446efe3
--- a/core/modules/views/src/Plugin/views/filter/EntityReference.php 0 → 100644
+++ b/core/modules/views/src/Plugin/views/filter/EntityReference.php 0 → 100644
+    ];
+  }
+
+  /**
+   * Change the required to conditionally required only to prevent focus errors.
+   *
+   * @param array $element
+   *   The form element.
+   * @param string $sub_handler
+   *   The sub handler to conditionally require the field for.
+   */
+  protected function setRequiredViaStatesOnChildren(array &$element, $sub_handler) {
+    if (isset($element['#required']) && $element['#required']) {
+      $element['#required'] = FALSE;
+      $element['#element_validate'][] = [static::class, 'validateRequired'];
+      // @todo Conditionally required does not work within config handler extra.
--- a/core/modules/views/src/Plugin/views/filter/EntityReference.php 0 → 100644
+++ b/core/modules/views/src/Plugin/views/filter/EntityReference.php 0 → 100644
+  /**
+   * Validates that a required field for a sub handler has a value.
+   *
+   * @param array $element
+   *   The cardinality form render array.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The form state.
+   */
+  public static function validateRequired(array &$element, FormStateInterface $form_state): void {
+    if (!empty($element['value'])) {
+      return;
+    }
+
+    // Config extra handler does not output validation messages and
+    // closes the modal with no feedback to the user.
+    // @todo Find or create a core issue and link here.
--- a/core/modules/views/views.views.inc
+++ b/core/modules/views/views.views.inc
    $target_base_table = $target_entity_type->getDataTable() ?: $target_entity_type->getBaseTable();
    $field_name = $field_storage->getName();

+    if ($target_entity_type instanceof EntityTypeInterface) {
+      foreach ($table_data as $table_field_name => $table_field_data) {
+        if (isset($table_field_data['filter']) && $table_field_name != 'delta') {
+          // Create separate views data to allow use of the entity_reference
--- a/core/modules/views/src/EntityViewsData.php
+++ b/core/modules/views/src/EntityViewsData.php
      $table_data[$schema_field_name]['entity field'] = $field_name;
      $first = FALSE;
    }
+
+    // Check if the field has a target entity entity.
+    $field_storage = $field_definition->getFieldStorageDefinition();
--- a/core/modules/views/src/EntityViewsData.php
+++ b/core/modules/views/src/EntityViewsData.php
      $table_data[$schema_field_name]['entity field'] = $field_name;
      $first = FALSE;
    }
+
+    // Check if the field has a target entity entity.
+    $field_storage = $field_definition->getFieldStorageDefinition();
+    $target_entity_type_id = $field_storage->getSetting('target_type');
+    if ($target_entity_type_id) {
+      $target_entity_type = $this->entityTypeManager->getDefinition($target_entity_type_id);
+      if ($target_entity_type instanceof EntityTypeInterface) {