From dfaddfbce4d9e59ca2ab994ff53959f75fcf645e Mon Sep 17 00:00:00 2001
From: Bhavin K <58818598+techbhavin@users.noreply.github.com>
Date: Thu, 27 Jan 2022 11:42:39 +0530
Subject: [PATCH] fix: Datepicker closeOnSelection will now remain true by
 default for new widget drops(#10479)

---
 .../src/widgets/DatePickerWidget2/component/index.tsx    | 9 ++++-----
 app/client/src/widgets/DatePickerWidget2/index.ts        | 2 +-
 .../src/widgets/DatePickerWidget2/widget/index.tsx       | 1 +
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/client/src/widgets/DatePickerWidget2/component/index.tsx b/app/client/src/widgets/DatePickerWidget2/component/index.tsx
index 8cb4d44543..8d8a34f743 100644
--- a/app/client/src/widgets/DatePickerWidget2/component/index.tsx
+++ b/app/client/src/widgets/DatePickerWidget2/component/index.tsx
@@ -235,16 +235,15 @@ class DatePickerComponent extends React.Component<
    * checks if selelectedDate is null or not,
    * sets state and calls props onDateSelected
    * if its null, don't call onDateSelected
+   * update internal state while changing month/year to update calender
    *
    * @param selectedDate
    */
   onDateSelected = (selectedDate: Date | null, isUserChange: boolean) => {
+    const { onDateSelected } = this.props;
+    const date = selectedDate ? selectedDate.toISOString() : "";
+    this.setState({ selectedDate: date });
     if (isUserChange) {
-      const { onDateSelected } = this.props;
-      const date = selectedDate ? selectedDate.toISOString() : "";
-      this.setState({
-        selectedDate: date,
-      });
       onDateSelected(date);
     }
   };
diff --git a/app/client/src/widgets/DatePickerWidget2/index.ts b/app/client/src/widgets/DatePickerWidget2/index.ts
index cd9e27c77f..8643c4ec49 100644
--- a/app/client/src/widgets/DatePickerWidget2/index.ts
+++ b/app/client/src/widgets/DatePickerWidget2/index.ts
@@ -21,7 +21,7 @@ export const CONFIG = {
     maxDate: "2121-12-31T18:29:00.000Z",
     version: 2,
     isRequired: false,
-    closeOnSelection: false,
+    closeOnSelection: true,
     shortcuts: false,
     firstDayOfWeek: 0,
     timePrecision: TimePrecision.MINUTE,
diff --git a/app/client/src/widgets/DatePickerWidget2/widget/index.tsx b/app/client/src/widgets/DatePickerWidget2/widget/index.tsx
index 83652f2435..fe8071969d 100644
--- a/app/client/src/widgets/DatePickerWidget2/widget/index.tsx
+++ b/app/client/src/widgets/DatePickerWidget2/widget/index.tsx
@@ -215,6 +215,7 @@ class DatePickerWidget extends BaseWidget<DatePickerWidget2Props, WidgetState> {
             label: "Close On Selection",
             helpText: "Calender should close when a date is selected",
             controlType: "SWITCH",
+            defaultValue: true,
             isJSConvertible: false,
             isBindProperty: true,
             isTriggerProperty: false,