Reset panel date when dates are null

Sergio Crisostomo
1 parent b52e02e4
Showing 2 changed files with 10 additions and 3 deletions Show diff stats
src/components/date-picker/panel/Date/date-range.vue
src/components/date-picker/panel/Date/date.vue
@@ -184,10 +184,16 @@
             value(newVal) {
                 const minDate = newVal[0] ? toDate(newVal[0]) : null;
                 const maxDate = newVal[1] ? toDate(newVal[1]) : null;
-                this.dates = [minDate, maxDate];
+                this.dates = [minDate, maxDate].sort();
+                if (JSON.stringify(this.dates) === '[null,null]') {
+                    const leftPanelDate = this.startDate || new Date();
+                    this.leftPanelDate = leftPanelDate,
+                    this.rightPanelDate = new Date(leftPanelDate.getFullYear(), leftPanelDate.getMonth() + 1, leftPanelDate.getDate());
+                }
+
                 this.rangeState = {
-                    from: minDate,
-                    to: maxDate,
+                    from: this.dates[0],
+                    to: this.dates[1],
                     selecting: false
                 };
             },
@@ -138,6 +138,7 @@
         watch: {
             value (newVal) {
                 this.dates = newVal;
+                if (JSON.stringify(newVal) === '[null]') this.panelDate = this.startDate || new Date();
             },
             selectionMode(){
                 this.currentView = this.selectionMode;