Use last selected date in date panel navigation

SergioCrisostomo
1 parent 6f816027
Showing 1 changed file with 3 additions and 2 deletions Show diff stats
src/components/date-picker/panel/Date/date.vue
@@ -150,7 +150,8 @@
         watch: {
             value (newVal) {
                 this.dates = newVal;
-                this.panelDate = this.startDate || (this.multiple ? this.dates[this.dates.length - 1] : this.dates[0]) || new Date();
+                const panelDate = this.multiple ? this.dates[this.dates.length - 1] : (this.startDate || this.dates[0]);
+                this.panelDate = panelDate || new Date();
             },
             currentView (currentView) {
                 this.$emit('on-selection-mode-change', currentView);
@@ -170,7 +171,7 @@
                 const isDifferentYear = date.getFullYear() !== this.panelDate.getFullYear();
                 const isDifferentMonth = isDifferentYear || date.getMonth() !== this.panelDate.getMonth();
                 if (isDifferentYear || isDifferentMonth){
-                    this.panelDate = date;
+                    if (!this.multiple) this.panelDate = date;
                 }
             }
         },