diff --git a/src/Plugin/BetterExposedFiltersWidgetBase.php b/src/Plugin/BetterExposedFiltersWidgetBase.php index 469b5bc..74d0688 100644 --- a/src/Plugin/BetterExposedFiltersWidgetBase.php +++ b/src/Plugin/BetterExposedFiltersWidgetBase.php @@ -164,26 +164,6 @@ abstract class BetterExposedFiltersWidgetBase extends PluginBase implements Bett $form[$group]['#open'] = TRUE; } } - - /** @var \Drupal\Core\Render\ElementInfoManager $element_info_manager */ - $element_info_manager = \Drupal::service('plugin.manager.element_info'); - $element_info_plugin = $element_info_manager->createInstance($form[$element]['#type']); - $element_info = $element_info_plugin->getInfo(); - if (!empty($element_info['#process'])) { - foreach ($element_info['#process'] as $process) { - if (is_array($process) && $process[1] === 'processGroup') { - // This element already supports #group. - return; - } - } - } - - // Workaround to add support for #group FAPI to all elements currently not - // supported. - // @todo remove once core issue is resolved. - // @see https://www.drupal.org/project/drupal/issues/2190333 - $form[$element]['#process'][] = ['\Drupal\Core\Render\Element\RenderElement', 'processGroup']; - $form[$element]['#pre_render'][] = ['\Drupal\Core\Render\Element\RenderElement', 'preRenderGroup']; } /** diff --git a/src/Plugin/better_exposed_filters/filter/DefaultWidget.php b/src/Plugin/better_exposed_filters/filter/DefaultWidget.php index 89d57ea..2a5ec2a 100644 --- a/src/Plugin/better_exposed_filters/filter/DefaultWidget.php +++ b/src/Plugin/better_exposed_filters/filter/DefaultWidget.php @@ -21,24 +21,4 @@ class DefaultWidget extends FilterWidgetBase { return TRUE; } - /** - * {@inheritdoc} - */ - public function exposedFormAlter(array &$form, FormStateInterface $form_state) { - $field_id = $this->getExposedFilterFieldId(); - $type = $this->getExposedFilterWidgetType(); - - parent::exposedFormAlter($form, $form_state); - - if ($type === 'select') { - // Workaround to add support for merging process and pre-render functions - // to the render array of an element. - // @todo remove once core issue is resolved. - // @see https://www.drupal.org/project/drupal/issues/2070131 - $form[$field_id]['#process'][] = ['\Drupal\Core\Render\Element\Select', 'processSelect']; - $form[$field_id]['#process'][] = ['\Drupal\Core\Render\Element\Select', 'processAjaxForm']; - $form[$field_id]['#pre_render'][] = ['\Drupal\Core\Render\Element\Select', 'preRenderSelect']; - } - } - } diff --git a/src/Plugin/better_exposed_filters/filter/FilterWidgetBase.php b/src/Plugin/better_exposed_filters/filter/FilterWidgetBase.php index c0dbe40..460532e 100644 --- a/src/Plugin/better_exposed_filters/filter/FilterWidgetBase.php +++ b/src/Plugin/better_exposed_filters/filter/FilterWidgetBase.php @@ -172,7 +172,7 @@ abstract class FilterWidgetBase extends BetterExposedFiltersWidgetBase implement if ($this->configuration['advanced']['sort_options']) { $form[$field_id]['#nested'] = $filter->options['hierarchy'] ?? FALSE; $form[$field_id]['#nested_delimiter'] = '-'; - $form[$field_id]['#process'][] = [$this, 'processSortedOptions']; + $form[$field_id]['#pre_process'][] = [$this, 'processSortedOptions']; } // Check for placeholder text. @@ -325,9 +325,6 @@ abstract class FilterWidgetBase extends BetterExposedFiltersWidgetBase implement $filter = $this->handler; $filter_id = $filter->options['expose']['identifier']; - /** @var \Drupal\views\Plugin\views\filter\FilterPluginBase $filter */ - $filter->buildExposedForm($form, $form_state); - return $form[$filter_id]['#type'] ?? $form[$filter_id]['value']['#type'] ?? ''; } diff --git a/src/Plugin/better_exposed_filters/filter/RadioButtons.php b/src/Plugin/better_exposed_filters/filter/RadioButtons.php index 15006ed..4c4a742 100644 --- a/src/Plugin/better_exposed_filters/filter/RadioButtons.php +++ b/src/Plugin/better_exposed_filters/filter/RadioButtons.php @@ -95,7 +95,6 @@ class RadioButtons extends FilterWidgetBase { if (!empty($form[$field_id]['#multiple'])) { $form[$field_id]['#theme'] = 'bef_checkboxes'; $form[$field_id]['#type'] = 'checkboxes'; - $form[$field_id]['#process'][] = ['\Drupal\Core\Render\Element\Checkboxes', 'processCheckboxes']; // Show all/none option. $form[$field_id]['#bef_select_all_none'] = $this->configuration['select_all_none']; @@ -108,7 +107,6 @@ class RadioButtons extends FilterWidgetBase { else { $form[$field_id]['#theme'] = 'bef_radios'; $form[$field_id]['#type'] = 'radios'; - $form[$field_id]['#process'][] = ['\Drupal\Core\Render\Element\Radios', 'processRadios']; } } } diff --git a/src/Plugin/better_exposed_filters/filter/Single.php b/src/Plugin/better_exposed_filters/filter/Single.php index d444ba6..f2bc094 100644 --- a/src/Plugin/better_exposed_filters/filter/Single.php +++ b/src/Plugin/better_exposed_filters/filter/Single.php @@ -69,7 +69,6 @@ class Single extends FilterWidgetBase { $form[$field_id]['#default_value'] = 0; $form[$field_id]['#return_value'] = 1; $form[$field_id]['#value'] = $checked ? 1 : 0; - $form[$field_id]['#process'][] = ['\Drupal\Core\Render\Element\Checkbox', 'processCheckbox']; } } diff --git a/src/Plugin/better_exposed_filters/pager/RadioButtons.php b/src/Plugin/better_exposed_filters/pager/RadioButtons.php index ef9e024..fa3b203 100644 --- a/src/Plugin/better_exposed_filters/pager/RadioButtons.php +++ b/src/Plugin/better_exposed_filters/pager/RadioButtons.php @@ -22,10 +22,6 @@ class RadioButtons extends PagerWidgetBase { if (!empty($form['items_per_page'])) { $form['items_per_page']['#type'] = 'radios'; - if (empty($form['items_per_page']['#process'])) { - $form['items_per_page']['#process'] = []; - } - array_unshift($form['items_per_page']['#process'], ['\Drupal\Core\Render\Element\Radios', 'processRadios']); $form['items_per_page']['#prefix'] = '