simplify change

vaadin · Nov 21, 2024 · b6132ac · b6132ac
1 parent 5130a6d
commit b6132ac
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 45 deletions.
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
@@ -759,7 +759,7 @@ public void setValue(LocalDate value) {
         boolean isOldValueEmpty = valueEquals(oldValue, getEmptyValue());
         boolean isNewValueEmpty = valueEquals(value, getEmptyValue());
         boolean isValueRemainedEmpty = isOldValueEmpty && isNewValueEmpty;
-        boolean isInputValuePresent = isInputValuePresent();
+        String oldInputElementValue = getInputElementValue();
 
         // When the value is cleared programmatically, there is no change event
         // that would synchronize _inputElementValue, so we reset it ourselves
@@ -772,7 +772,7 @@ public void setValue(LocalDate value) {
 
         // Revalidate if setValue(null) didn't result in a value change but
         // cleared bad input
-        if (isValueRemainedEmpty && isInputValuePresent) {
+        if (isValueRemainedEmpty && !oldInputElementValue.isEmpty()) {
             validate();
             fireValidationStatusChangeEvent();
         }

diff --git a/...in-text-field-flow/src/main/java/com/vaadin/flow/component/textfield/BigDecimalField.java b/...in-text-field-flow/src/main/java/com/vaadin/flow/component/textfield/BigDecimalField.java
@@ -18,7 +18,6 @@
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.text.DecimalFormatSymbols;
-import java.time.LocalDate;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
@@ -166,13 +165,6 @@ public BigDecimalField() {
         addValueChangeListener(e -> validate());
     }
 
-    @Override
-    public void setValueChangeMode(ValueChangeMode valueChangeMode) {
-        super.setValueChangeMode(valueChangeMode);
-        getSynchronizationRegistration()
-                .synchronizeProperty("_inputElementValue");
-    }
-
     /**
      * Constructs an empty {@code BigDecimalField} with the given label.
      *
@@ -318,20 +310,14 @@ public void setValue(BigDecimal value) {
         boolean isOldValueEmpty = valueEquals(oldValue, getEmptyValue());
         boolean isNewValueEmpty = valueEquals(value, getEmptyValue());
         boolean isValueRemainedEmpty = isOldValueEmpty && isNewValueEmpty;
-        boolean isInputElementValueEmpty = getInputElementValue().isEmpty();
-
-        // When the value is cleared programmatically, there is no change event
-        // that would synchronize _inputElementValue, so we reset it ourselves
-        // to prevent the following validation from treating this as bad input.
-        if (isNewValueEmpty) {
-            setInputElementValue("");
-        }
+        String oldInputElementValue = getInputElementValue();
 
         super.setValue(value);
 
-        // Revalidate if setValue(null) didn't result in a value change but
-        // cleared bad input
-        if (isValueRemainedEmpty && !isInputElementValueEmpty) {
+        // Revalidate and clear input element value if setValue(null) didn't
+        // result in a value change but there was bad input.
+        if (isValueRemainedEmpty && !oldInputElementValue.isEmpty()) {
+            setInputElementValue("");
             validate();
             fireValidationStatusChangeEvent();
         }
@@ -404,27 +390,12 @@ private void fireValidationStatusChangeEvent() {
                 .forEach(listener -> listener.validationStatusChanged(event));
     }
 
-    /**
-     * Gets the value of the input element. This value is updated on the server
-     * when the web component dispatches a `change` event. Except when clearing
-     * the value, {@link #setValue(LocalDate)} does not update the input element
-     * value on the server because it requires date formatting, which is
-     * implemented on the web component's side.
-     *
-     * @return the value of the input element
-     */
     private String getInputElementValue() {
-        return getElement().getProperty("_inputElementValue", "");
+        return getElement().getProperty("value", "");
     }
 
-    /**
-     * Sets the value of the input element.
-     *
-     * @param value
-     *            the value to set
-     */
     private void setInputElementValue(String value) {
-        getElement().setProperty("_inputElementValue", value);
+        getElement().setProperty("value", value);
     }
 
     /**

diff --git a/...va/com/vaadin/flow/component/textfield/validation/BigDecimalFieldBasicValidationTest.java b/...va/com/vaadin/flow/component/textfield/validation/BigDecimalFieldBasicValidationTest.java
@@ -35,14 +35,12 @@ public void addValidationStatusChangeListener_addAnotherListenerOnInvocation_noE
         });
 
         // Trigger ValidationStatusChangeEvent
-        fakeClientPropertyChange(testField, "_inputElementValue", "foo");
         fakeClientPropertyChange(testField, "value", "foo");
         testField.clear();
     }
 
     @Test
     public void badInput_validate_emptyErrorMessageDisplayed() {
-        fakeClientPropertyChange(testField, "_inputElementValue", "foo");
         fakeClientPropertyChange(testField, "value", "foo");
         Assert.assertEquals("", testField.getErrorMessage());
     }
@@ -51,7 +49,6 @@ public void badInput_validate_emptyErrorMessageDisplayed() {
     public void badInput_setI18nErrorMessage_validate_i18nErrorMessageDisplayed() {
         testField.setI18n(new BigDecimalField.BigDecimalFieldI18n()
                 .setBadInputErrorMessage("Value has invalid format"));
-        fakeClientPropertyChange(testField, "_inputElementValue", "foo");
         fakeClientPropertyChange(testField, "value", "foo");
         Assert.assertEquals("Value has invalid format",
                 testField.getErrorMessage());

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
@@ -17,7 +17,6 @@
 
 import java.io.Serializable;
 import java.time.Duration;
-import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.temporal.ChronoUnit;
 import java.util.Locale;
@@ -367,7 +366,7 @@ public void setValue(LocalTime value) {
         boolean isOldValueEmpty = valueEquals(oldValue, getEmptyValue());
         boolean isNewValueEmpty = valueEquals(value, getEmptyValue());
         boolean isValueRemainedEmpty = isOldValueEmpty && isNewValueEmpty;
-        boolean isInputValuePresent = isInputValuePresent();
+        String oldInputElementValue = getInputElementValue();
 
         // When the value is cleared programmatically, there is no change event
         // that would synchronize _inputElementValue, so we reset it ourselves
@@ -380,7 +379,7 @@ public void setValue(LocalTime value) {
 
         // Revalidate if setValue(null) didn't result in a value change but
         // cleared bad input
-        if (isValueRemainedEmpty && isInputValuePresent) {
+        if (isValueRemainedEmpty && !oldInputElementValue.isEmpty()) {
             validate();
             fireValidationStatusChangeEvent();
         }
@@ -454,7 +453,7 @@ protected boolean isInputValuePresent() {
     /**
      * Gets the value of the input element. This value is updated on the server
      * when the web component dispatches a `change` or `unparsable-change`
-     * event. Except when clearing the value, {@link #setValue(LocalDate)} does
+     * event. Except when clearing the value, {@link #setValue(LocalTime)} does
      * not update the input element value on the server because it requires date
      * formatting, which is implemented on the web component's side.
      *