Disable/enable text field for DateField on setEnable() method (#13124).

Change-Id: I49222e44f75ff228219042360f1764077da1016c

4 files changed, 36 insertions, 6 deletions

diff --git a/client/src/com/vaadin/client/ui/VPopupCalendar.java b/client/src/com/vaadin/client/ui/VPopupCalendar.java
index e180239fc1..b4f0cfa18d 100644
--- a/client/src/com/vaadin/client/ui/VPopupCalendar.java
+++ b/client/src/com/vaadin/client/ui/VPopupCalendar.java
@@ -459,6 +459,7 @@ public class VPopupCalendar extends VTextualDate implements Field,
     public void setEnabled(boolean enabled) {
         super.setEnabled(enabled);
 
+        calendarToggle.setEnabled(enabled);
         Roles.getButtonRole().setAriaDisabledState(calendarToggle.getElement(),
                 !enabled);
     }
diff --git a/client/src/com/vaadin/client/ui/VTextualDate.java b/client/src/com/vaadin/client/ui/VTextualDate.java
index 44a3321f6f..37a27b2580 100644
--- a/client/src/com/vaadin/client/ui/VTextualDate.java
+++ b/client/src/com/vaadin/client/ui/VTextualDate.java
@@ -216,6 +216,12 @@ public class VTextualDate extends VDateField implements Field, ChangeHandler,
 
     }
 
+    @Override
+    public void setEnabled(boolean enabled) {
+        super.setEnabled(enabled);
+        text.setEnabled(enabled);
+    }
+
     protected void setPrompting(boolean prompting) {
         this.prompting = prompting;
         if (prompting) {
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DisabledParentLayout.java b/uitest/src/com/vaadin/tests/components/datefield/DisabledParentLayout.java
index cf09ff029d..2140b0007e 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DisabledParentLayout.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DisabledParentLayout.java
@@ -35,7 +35,6 @@ public class DisabledParentLayout extends AbstractTestUI {
         content.setMargin(true);
 
         final VerticalLayout pane = new VerticalLayout();
-        pane.setEnabled(false);
         pane.addComponent(new DateField());
 
         content.addComponent(pane);
@@ -44,7 +43,7 @@ public class DisabledParentLayout extends AbstractTestUI {
         button.addClickListener(new Button.ClickListener() {
             @Override
             public void buttonClick(Button.ClickEvent event) {
-                pane.setEnabled(true);
+                pane.setEnabled(!pane.isEnabled());
             }
         });
         content.addComponent(button);
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java b/uitest/src/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java
index 3ee4544693..b511ca168a 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java
@@ -35,17 +35,41 @@ public class DisabledParentLayoutTest extends MultiBrowserTest {
         WebElement button = driver.findElement(By.className("v-button"));
         button.click();
 
+        WebElement textField = driver.findElement(By
+                .className("v-datefield-textfield"));
+        textField.click();
+
+        Assert.assertFalse(
+                "Date input text field shoud be disabled for disabled DateField",
+                textField.isEnabled());
+
         WebElement dataFieldButton = driver.findElement(By
                 .className("v-datefield-button"));
         dataFieldButton.click();
 
-        WebElement popup = driver
-                .findElement(By.className("v-datefield-popup"));
+        Assert.assertFalse(
+                "Disabled date popup is opened after click to its button",
+                isElementPresent(By.className("v-datefield-popup")));
+
+        button.click();
+
+        Assert.assertTrue(
+                "Date input text field shoud be enabled for enabled DateField",
+                textField.isEnabled());
 
+        textField.click();
+        String text = "text";
+        textField.sendKeys(text);
+
+        Assert.assertEquals("Unexpected text in date text field", text,
+                textField.getAttribute("value"));
+
+        dataFieldButton.click();
         Assert.assertFalse("Unexpected disabled element found",
                 isElementPresent(By.className("v-disabled")));
 
-        Assert.assertNotNull(
-                "Date popup is not opened after click to its button", popup);
+        Assert.assertTrue("Date popup is not opened after click to its button",
+                isElementPresent(By.className("v-datefield-popup")));
     }
+
 }