feat: add HasHelper to the InputField interface (#6191)

vaadin · Apr 15, 2024 · 76eb9c7 · 76eb9c7
1 parent d5dd56c
commit 76eb9c7
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 27 deletions.
diff --git a/...arent/vaadin-checkbox-flow/src/main/java/com/vaadin/flow/component/checkbox/Checkbox.java b/...arent/vaadin-checkbox-flow/src/main/java/com/vaadin/flow/component/checkbox/Checkbox.java
@@ -21,7 +21,6 @@
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.Focusable;
 import com.vaadin.flow.component.HasAriaLabel;
-import com.vaadin.flow.component.HasHelper;
 import com.vaadin.flow.component.Synchronize;
 import com.vaadin.flow.component.Tag;
 import com.vaadin.flow.component.dependency.JsModule;
@@ -52,7 +51,6 @@
 @JsModule("@vaadin/checkbox/src/vaadin-checkbox.js")
 public class Checkbox extends AbstractSinglePropertyField<Checkbox, Boolean>
         implements ClickNotifier<Checkbox>, Focusable<Checkbox>, HasAriaLabel,
-        HasHelper,
         InputField<AbstractField.ComponentValueChangeEvent<Checkbox, Boolean>, Boolean> {
 
     private final Label labelElement;

diff --git a/.../vaadin-checkbox-flow/src/main/java/com/vaadin/flow/component/checkbox/CheckboxGroup.java b/.../vaadin-checkbox-flow/src/main/java/com/vaadin/flow/component/checkbox/CheckboxGroup.java
@@ -33,7 +33,6 @@
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.ComponentUtil;
 import com.vaadin.flow.component.HasAriaLabel;
-import com.vaadin.flow.component.HasHelper;
 import com.vaadin.flow.component.ItemLabelGenerator;
 import com.vaadin.flow.component.Tag;
 import com.vaadin.flow.component.UI;
@@ -92,8 +91,7 @@
 public class CheckboxGroup<T>
         extends AbstractSinglePropertyField<CheckboxGroup<T>, Set<T>>
         implements HasAriaLabel, HasClientValidation,
-        HasDataView<T, Void, CheckboxGroupDataView<T>>, HasHelper,
-        HasItemComponents<T>,
+        HasDataView<T, Void, CheckboxGroupDataView<T>>, HasItemComponents<T>,
         InputField<AbstractField.ComponentValueChangeEvent<CheckboxGroup<T>, Set<T>>, Set<T>>,
         HasListDataView<T, CheckboxGroupListDataView<T>>,
         HasThemeVariant<CheckboxGroupVariant>, HasValidationProperties,

diff --git a/.../vaadin-combo-box-flow/src/main/java/com/vaadin/flow/component/combobox/ComboBoxBase.java b/.../vaadin-combo-box-flow/src/main/java/com/vaadin/flow/component/combobox/ComboBoxBase.java
@@ -31,7 +31,6 @@
 import com.vaadin.flow.component.shared.HasAllowedCharPattern;
 import com.vaadin.flow.component.shared.HasOverlayClassName;
 import com.vaadin.flow.component.shared.HasClearButton;
-import com.vaadin.flow.component.HasHelper;
 import com.vaadin.flow.component.HasTheme;
 import com.vaadin.flow.component.ItemLabelGenerator;
 import com.vaadin.flow.component.Synchronize;
@@ -86,7 +85,7 @@ public abstract class ComboBoxBase<TComponent extends ComboBoxBase<TComponent, T
         extends AbstractSinglePropertyField<TComponent, TValue>
         implements Focusable<TComponent>, HasAllowedCharPattern, HasAriaLabel,
         HasAutoOpen, HasClearButton, HasClientValidation, HasOverlayClassName,
-        HasDataView<TItem, String, ComboBoxDataView<TItem>>, HasHelper,
+        HasDataView<TItem, String, ComboBoxDataView<TItem>>,
         InputField<AbstractField.ComponentValueChangeEvent<TComponent, TValue>, TValue>,
         HasLazyDataView<TItem, String, ComboBoxLazyDataView<TItem>>,
         HasListDataView<TItem, ComboBoxListDataView<TItem>>, HasTheme,

diff --git a/...in-custom-field-flow/src/main/java/com/vaadin/flow/component/customfield/CustomField.java b/...in-custom-field-flow/src/main/java/com/vaadin/flow/component/customfield/CustomField.java
@@ -19,7 +19,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.vaadin.flow.component.HasHelper;
 import com.vaadin.flow.component.dependency.JsModule;
 import com.vaadin.flow.component.dependency.NpmPackage;
 import com.vaadin.flow.component.shared.InputField;
@@ -53,7 +52,7 @@
 @NpmPackage(value = "@vaadin/custom-field", version = "24.4.0-alpha22")
 @JsModule("@vaadin/custom-field/src/vaadin-custom-field.js")
 public abstract class CustomField<T> extends AbstractField<CustomField<T>, T>
-        implements Focusable<CustomField<T>>, HasHelper,
+        implements Focusable<CustomField<T>>,
         InputField<AbstractField.ComponentValueChangeEvent<CustomField<T>, T>, T>,
         HasTheme, HasValidationProperties {
 

diff --git a/...aadin-date-picker-flow/src/main/java/com/vaadin/flow/component/datepicker/DatePicker.java b/...aadin-date-picker-flow/src/main/java/com/vaadin/flow/component/datepicker/DatePicker.java
@@ -34,7 +34,6 @@
 import com.vaadin.flow.component.ComponentEventListener;
 import com.vaadin.flow.component.Focusable;
 import com.vaadin.flow.component.HasAriaLabel;
-import com.vaadin.flow.component.HasHelper;
 import com.vaadin.flow.component.HasPlaceholder;
 import com.vaadin.flow.component.HasValue;
 import com.vaadin.flow.component.Synchronize;
@@ -92,7 +91,7 @@
 public class DatePicker
         extends AbstractSinglePropertyField<DatePicker, LocalDate>
         implements Focusable<DatePicker>, HasAllowedCharPattern, HasAriaLabel,
-        HasAutoOpen, HasClearButton, HasClientValidation, HasHelper,
+        HasAutoOpen, HasClearButton, HasClientValidation,
         InputField<AbstractField.ComponentValueChangeEvent<DatePicker, LocalDate>, LocalDate>,
         HasOverlayClassName, HasPrefix, HasThemeVariant<DatePickerVariant>,
         HasValidationProperties, HasValidator<LocalDate>, HasPlaceholder {

diff --git a/...me-picker-flow/src/main/java/com/vaadin/flow/component/datetimepicker/DateTimePicker.java b/...me-picker-flow/src/main/java/com/vaadin/flow/component/datetimepicker/DateTimePicker.java
@@ -29,7 +29,6 @@
 import com.vaadin.flow.component.AbstractSinglePropertyField;
 import com.vaadin.flow.component.AttachEvent;
 import com.vaadin.flow.component.Focusable;
-import com.vaadin.flow.component.HasHelper;
 import com.vaadin.flow.component.Tag;
 import com.vaadin.flow.component.datepicker.DatePicker.DatePickerI18n;
 import com.vaadin.flow.component.dependency.JsModule;
@@ -117,9 +116,9 @@ protected boolean isInputValuePresent() {
 @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js")
 @NpmPackage(value = "@vaadin/date-time-picker", version = "24.4.0-alpha22")
 @JsModule("@vaadin/date-time-picker/src/vaadin-date-time-picker.js")
-public class DateTimePicker extends
-        AbstractSinglePropertyField<DateTimePicker, LocalDateTime> implements
-        Focusable<DateTimePicker>, HasAutoOpen, HasClientValidation, HasHelper,
+public class DateTimePicker
+        extends AbstractSinglePropertyField<DateTimePicker, LocalDateTime>
+        implements Focusable<DateTimePicker>, HasAutoOpen, HasClientValidation,
         InputField<AbstractField.ComponentValueChangeEvent<DateTimePicker, LocalDateTime>, LocalDateTime>,
         HasOverlayClassName, HasThemeVariant<DateTimePickerVariant>,
         HasValidationProperties, HasValidator<LocalDateTime> {

diff --git a/...aadin-flow-components-base/src/main/java/com/vaadin/flow/component/shared/InputField.java b/...aadin-flow-components-base/src/main/java/com/vaadin/flow/component/shared/InputField.java
@@ -16,6 +16,7 @@
 package com.vaadin.flow.component.shared;
 
 import com.vaadin.flow.component.HasEnabled;
+import com.vaadin.flow.component.HasHelper;
 import com.vaadin.flow.component.HasLabel;
 import com.vaadin.flow.component.HasSize;
 import com.vaadin.flow.component.HasStyle;
@@ -28,6 +29,7 @@
  * The following interfaces are included:
  * <ul>
  * <li>{@link HasEnabled}</li>
+ * <li>{@link HasHelper}</li>
  * <li>{@link HasLabel}</li>
  * <li>{@link HasStyle}</li>
  * <li>{@link HasTooltip}</li>
@@ -43,7 +45,8 @@
  * @author Vaadin Ltd
  * @since 24.1
  */
-public interface InputField<E extends HasValue.ValueChangeEvent<V>, V> extends
-        HasEnabled, HasLabel, HasSize, HasStyle, HasTooltip, HasValue<E, V> {
+public interface InputField<E extends HasValue.ValueChangeEvent<V>, V>
+        extends HasEnabled, HasHelper, HasLabel, HasSize, HasStyle, HasTooltip,
+        HasValue<E, V> {
 
 }
diff --git a/...dio-button-flow/src/main/java/com/vaadin/flow/component/radiobutton/RadioButtonGroup.java b/...dio-button-flow/src/main/java/com/vaadin/flow/component/radiobutton/RadioButtonGroup.java
@@ -22,7 +22,6 @@
 import com.vaadin.flow.component.ComponentUtil;
 import com.vaadin.flow.component.DetachEvent;
 import com.vaadin.flow.component.HasAriaLabel;
-import com.vaadin.flow.component.HasHelper;
 import com.vaadin.flow.component.ItemLabelGenerator;
 import com.vaadin.flow.component.Tag;
 import com.vaadin.flow.component.UI;
@@ -79,7 +78,7 @@
 public class RadioButtonGroup<T>
         extends AbstractSinglePropertyField<RadioButtonGroup<T>, T>
         implements HasAriaLabel, HasClientValidation,
-        HasDataView<T, Void, RadioButtonGroupDataView<T>>, HasHelper,
+        HasDataView<T, Void, RadioButtonGroupDataView<T>>,
         HasListDataView<T, RadioButtonGroupListDataView<T>>,
         InputField<AbstractField.ComponentValueChangeEvent<RadioButtonGroup<T>, T>, T>,
         HasThemeVariant<RadioGroupVariant>, HasValidationProperties,

diff --git a/...flow-parent/vaadin-select-flow/src/main/java/com/vaadin/flow/component/select/Select.java b/...flow-parent/vaadin-select-flow/src/main/java/com/vaadin/flow/component/select/Select.java
@@ -25,7 +25,6 @@
 import com.vaadin.flow.component.Focusable;
 import com.vaadin.flow.component.HasAriaLabel;
 import com.vaadin.flow.component.HasComponents;
-import com.vaadin.flow.component.HasHelper;
 import com.vaadin.flow.component.HasPlaceholder;
 import com.vaadin.flow.component.ItemLabelGenerator;
 import com.vaadin.flow.component.Synchronize;
@@ -89,7 +88,6 @@
 public class Select<T> extends AbstractSinglePropertyField<Select<T>, T>
         implements Focusable<Select<T>>, HasAriaLabel, HasClientValidation,
         HasDataView<T, Void, SelectDataView<T>>, HasItemComponents<T>,
-        HasHelper,
         InputField<AbstractField.ComponentValueChangeEvent<Select<T>, T>, T>,
         HasListDataView<T, SelectListDataView<T>>, HasOverlayClassName,
         HasPrefix, HasThemeVariant<SelectVariant>, HasValidationProperties,

diff --git a/...adin-text-field-flow/src/main/java/com/vaadin/flow/component/textfield/TextFieldBase.java b/...adin-text-field-flow/src/main/java/com/vaadin/flow/component/textfield/TextFieldBase.java
@@ -21,7 +21,6 @@
 import com.vaadin.flow.component.CompositionNotifier;
 import com.vaadin.flow.component.Focusable;
 import com.vaadin.flow.component.HasAriaLabel;
-import com.vaadin.flow.component.HasHelper;
 import com.vaadin.flow.component.HasPlaceholder;
 import com.vaadin.flow.component.InputNotifier;
 import com.vaadin.flow.component.KeyNotifier;
@@ -51,9 +50,9 @@ public abstract class TextFieldBase<TComponent extends TextFieldBase<TComponent,
         extends AbstractSinglePropertyField<TComponent, TValue>
         implements CompositionNotifier, Focusable<TComponent>, HasAriaLabel,
         HasAutocapitalize, HasAutocomplete, HasAutocorrect, HasClearButton,
-        HasClientValidation, HasHelper, HasPrefixAndSuffix,
-        HasValidationProperties, HasValidator<TValue>, HasValueChangeMode,
-        HasPlaceholder, InputNotifier, KeyNotifier,
+        HasClientValidation, HasPrefixAndSuffix, HasValidationProperties,
+        HasValidator<TValue>, HasValueChangeMode, HasPlaceholder, InputNotifier,
+        KeyNotifier,
         InputField<AbstractField.ComponentValueChangeEvent<TComponent, TValue>, TValue> {
 
     private ValueChangeMode currentMode;

diff --git a/...aadin-time-picker-flow/src/main/java/com/vaadin/flow/component/timepicker/TimePicker.java b/...aadin-time-picker-flow/src/main/java/com/vaadin/flow/component/timepicker/TimePicker.java
@@ -31,7 +31,6 @@
 import com.vaadin.flow.component.ComponentEventListener;
 import com.vaadin.flow.component.Focusable;
 import com.vaadin.flow.component.HasAriaLabel;
-import com.vaadin.flow.component.HasHelper;
 import com.vaadin.flow.component.HasPlaceholder;
 import com.vaadin.flow.component.HasValue;
 import com.vaadin.flow.component.Synchronize;
@@ -77,7 +76,7 @@
 public class TimePicker
         extends AbstractSinglePropertyField<TimePicker, LocalTime>
         implements Focusable<TimePicker>, HasAllowedCharPattern, HasAriaLabel,
-        HasAutoOpen, HasClearButton, HasClientValidation, HasHelper,
+        HasAutoOpen, HasClearButton, HasClientValidation,
         InputField<AbstractField.ComponentValueChangeEvent<TimePicker, LocalTime>, LocalTime>,
         HasPrefix, HasOverlayClassName, HasThemeVariant<TimePickerVariant>,
         HasValidationProperties, HasValidator<LocalTime>, HasPlaceholder {