From a52993ba9ca67c15e6ca311ca308528752b589c9 Mon Sep 17 00:00:00 2001
From: Anastasia Smirnova <anasmi@utu.fi>
Date: Wed, 17 Oct 2018 11:12:03 +0300
Subject: Rebuild calendar pop-up on readOnly state change (#11249)

* Rebuild calendar pop-up on readOnly state change

Fixes https://github.com/vaadin/framework/issues/6565
---
 .../main/java/com/vaadin/client/ui/VAbstractCalendarPanel.java   | 9 +++++++++
 .../com/vaadin/client/ui/datefield/TextualDateConnector.java     | 6 +++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'client')

diff --git a/client/src/main/java/com/vaadin/client/ui/VAbstractCalendarPanel.java b/client/src/main/java/com/vaadin/client/ui/VAbstractCalendarPanel.java
index 8a3c6c3325..655f18669c 100644
--- a/client/src/main/java/com/vaadin/client/ui/VAbstractCalendarPanel.java
+++ b/client/src/main/java/com/vaadin/client/ui/VAbstractCalendarPanel.java
@@ -938,6 +938,15 @@ public abstract class VAbstractCalendarPanel<R extends Enum<R>>
         renderCalendar(true);
     }
 
+    /**
+     * Returns the value of initialRenderDone
+     *
+     * @since
+     */
+    public boolean isInitialRenderDone() {
+        return initialRenderDone;
+    }
+
     /**
      * For internal use only. May be removed or replaced in the future.
      *
diff --git a/client/src/main/java/com/vaadin/client/ui/datefield/TextualDateConnector.java b/client/src/main/java/com/vaadin/client/ui/datefield/TextualDateConnector.java
index f29a053c56..c254833d18 100644
--- a/client/src/main/java/com/vaadin/client/ui/datefield/TextualDateConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/datefield/TextualDateConnector.java
@@ -117,7 +117,7 @@ public abstract class TextualDateConnector<PANEL extends VAbstractCalendarPanel<
     @Override
     public void onStateChanged(StateChangeEvent stateChangeEvent) {
         String oldLocale = getWidget().getCurrentLocale();
-
+        boolean isReadOnly = getWidget().isReadonly();
         getWidget().parsable = getState().parsable;
 
         super.onStateChanged(stateChangeEvent);
@@ -159,6 +159,10 @@ public abstract class TextualDateConnector<PANEL extends VAbstractCalendarPanel<
         } else {
             getWidget().calendarToggle.removeStyleName(
                     VAbstractPopupCalendar.CLASSNAME + "-button-readonly");
+            if (getState().readOnly != isReadOnly
+                    && getWidget().calendar.isInitialRenderDone()) {
+                getWidget().calendar.renderCalendar();
+            }
         }
 
         getWidget().setDescriptionForAssistiveDevices(
-- 
cgit v1.2.3