diff options
| -rw-r--r-- | server/src/main/java/com/vaadin/ui/AbstractDateField.java | 1 | ||||
| -rw-r--r-- | uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/server/src/main/java/com/vaadin/ui/AbstractDateField.java b/server/src/main/java/com/vaadin/ui/AbstractDateField.java index 3db6ce42ea..f70246f2c6 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractDateField.java +++ b/server/src/main/java/com/vaadin/ui/AbstractDateField.java @@ -228,6 +228,7 @@ public abstract class AbstractDateField<T extends Temporal & TemporalAdjuster & parsedDate.ifOk(this::setValue); if (parsedDate.isError()) { doSetValue(null); + dateString = null; uiHasValidDateString = false; currentParseErrorMessage = parsedDate.getMessage().orElse("Parsing error"); setComponentError(new UserError(getParseErrorMessage())); diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java index c92010b66c..84cb6f3e05 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java @@ -65,6 +65,7 @@ public class DisabledParentLayoutTest extends MultiBrowserTest { textField.getAttribute("value")); dataFieldButton.click(); + dataFieldButton.click();//Requires two clicks because of error message. TODO fix Assert.assertFalse("Unexpected disabled element found", isElementPresent(By.className("v-disabled"))); |