@sedoo/unidoo 0.0.61 → 0.0.65

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sedoo/unidoo",
-    "version": "0.0.61",
+    "version": "0.0.65",
     "private": false,
     "scripts": {
         "build": "vue-cli-service build --target lib --name unidoo src/plugin.js",

package/src/components/unidoo-heatmap/Heatmap.js

@@ -8,7 +8,7 @@ export default class CalendarHeatmap {
       this.max = Math.ceil((Math.max(...values.map(day => day.count)) / 5) * 4)
     }
     this.values = values.map(v => { return { date: this._valuesDateFormat(v.date), count: v.count } })
-    this.times = this._getTimes(year)
+    this.times = this._getTimes(this.year.getFullYear())
     this.times.sort()
   }
 

package/src/components/unidoo-heatmap/UnidooHeatmap.vue

@@ -1,3 +1,4 @@
+/* eslint-disable keyword-spacing */
 <template>
   <v-container>
     <section heatmap-calendar>
@@ -88,20 +89,21 @@ export default {
     }
   },
   data: () => ({
-    now: new Date(new Date().setHours(23,59,59,999)) 
+    now: new Date(new Date().setHours(23, 59, 59, 999)) 
   }),
   watch: {
     dateValue (val) {
       this.focusDate(val)
       this.updateDateSwitcher(val)
     },
-    year (val) {
-      if (val !== this.year) {
+    year (val, old) {
+      if (val !== old) {
         const rects = document.querySelectorAll('[heatmap-calendar] [month] .monthday')
         rects.forEach(element => {
           element.classList.remove('day-focus')
         });
         this.focusDate(this.dateValue)
+        this.updateDateSwitcher(null)
       }
     }
   },
@@ -122,7 +124,7 @@ export default {
       return DEFAULT_LOCALE
     },
     dateValue() {
-      if(this.value){
+      if (this.value) {
         return (this.value instanceof Date) ? this.value : this.value.date;
       } else {
         return this.value;
@@ -131,17 +133,17 @@ export default {
   },
   beforeMount () {
     Plugin.EventBus.$on("unidoo-heatmap-set-date", params => {
-      if(this.heatmapKey) {
-        if (params.key === this.heatmapKey && params.date){
+      if (this.heatmapKey) {
+        if (params.key === this.heatmapKey && params.date) {
           this.setDate(params.date)
         } 
-      } else if(params.date) {
+      } else if (params.date) {
         this.setDate(params.date)
       }
     })
     Plugin.EventBus.$on("unidoo-heatmap-get-date", params => {
-      if(this.heatmapKey) {
-        if (params.key === this.heatmapKey){
+      if (this.heatmapKey) {
+        if (params.key === this.heatmapKey) {
           this.updateDateSwitcher(this.dateValue)
         } 
       } else { 
@@ -184,7 +186,7 @@ export default {
     handleClick (e, day) {
       if (day) {
         if (day.date <= this.now && (typeof day.count === 'number' || this.missingAllowed)) {
-          if(this.returnObject){
+          if (this.returnObject) {
             this.$emit('input', day);
           } else {
             this.$emit('input', day.date);
@@ -200,22 +202,30 @@ export default {
     updateDateSwitcher (d) {
       this.$unidooDateSwitcher.update({
         hasPrevious: this.hasPreviousDate(d), 
-        hasNext : this.hasNextDate(d), 
-        previousAvailable : this.heatmap.getPreviousAvailableDate(d),
-        nextAvailable : this.heatmap.getNextAvailableDate(d) 
+        hasNext: this.hasNextDate(d), 
+        previousAvailable: this.heatmap.getPreviousAvailableDate(d),
+        nextAvailable: this.heatmap.getNextAvailableDate(d) 
       }, this.heatmapKey);
     },
     hasPreviousDate (d) {
-      if(!d || this.year != d.getFullYear()) return false
-      const firstDay = new Date(this.year, 0, 1);
-      if(d <= firstDay) return false;
+      if (!d || !this.compairDateWithYear(d)) return false;
+      const syear = (this.year instanceof Date) ? this.year.getFullYear() : this.year;
+      const firstDay = new Date(syear, 0, 1);
+      d.setHours(0, 0, 0, 0);
+      if (d <= firstDay) return false;
       return true; 
     },
     hasNextDate (d) {
-      if(!d || this.year != d.getFullYear()) return false
-      const today = new Date();
-      today.setHours(0,0,0,0);
-      if(d >= today) return false;
+      if (!d || !this.isDateInYear(d)) return false;
+      const syear = (this.year instanceof Date) ? this.year.getFullYear() : this.year;
+      let lastDay = null;
+      if (new Date(syear, 0, 1).getFullYear() === new Date().getFullYear()) {
+        lastDay = new Date();
+      } else {
+        lastDay = new Date(syear, 11, 31);
+      }
+      lastDay.setHours(0, 0, 0, 0);
+      if (d >= lastDay) return false;
       return true;
     },
     focusDate (d) {
@@ -284,6 +294,15 @@ export default {
       return first.getFullYear() === second.getFullYear() &&
         first.getMonth() === second.getMonth() &&
         first.getDate() === second.getDate()
+    },
+    compairDateWithYear (d) { 
+      if (this.year && d) {
+        const sd = '' + ((d instanceof Date) ? d.getFullYear() : d);
+        const syear = '' + ((this.year instanceof Date) ? this.year.getFullYear() : this.year);
+        return syear === sd;
+      } else {
+        return false
+      }
     }
   }
 }

package/src/components/unidoo-heatmap/date-switcher.vue

@@ -21,8 +21,8 @@ import Plugin from '../../plugin.js'
 
 export default {
   props: {
-    date : {
-      type : [String, Date],
+    date: {
+      type: [String, Date],
       default: null
     },
     heatmapKey: {
@@ -44,19 +44,21 @@ export default {
       },
     }
   },
-  computed:{
-    cleanedDate(){
+  computed: {
+    cleanedDate() {
       return this.cleanDate(this.date);
     }
   },
   beforeMount () {
     Plugin.EventBus.$on("unidoo-dateswitcher-update", params => {
-      if(this.heatmapKey) {
-        if (params.key === this.heatmapKey && params.data){
+      if (this.heatmapKey) {
+        if (params.key === this.heatmapKey && params.data) {
           this.updateNearDates(params.data);
         } 
-      } else if(params.data) {
+      } else if (params.data) {
         this.updateNearDates(params.data);
+      } else {
+        this.reset();
       }
     })
   },
@@ -66,31 +68,36 @@ export default {
   },
 
   methods: {
-  
+    reset() {
+      this.hasNext = false
+      this.hasPrevious = false
+      this.nextAvailable = null
+      this.previousAvailable = null
+    },
     goToNextAvailable() {
-      if(this.hasNext) {
+      if (this.hasNext) {
         this.$unidooHeatmap.setDate(this.cleanDate(this.nextAvailable), this.heatmapKey);
       }
     },
 
     goToPreviousAvailable() {
-      if(this.hasPrevious) {
+      if (this.hasPrevious) {
         this.$unidooHeatmap.setDate(this.cleanDate(this.previousAvailable), this.heatmapKey);
       }
     },
 
-    switchDate(n){
-      if(this.cleanedDate && n){
-        if((n > 0 && this.hasNext) || (n < 0 && this.hasPrevious)){
-          let newDate = new Date(this.cleanedDate);
+    switchDate(n) {
+      if (this.cleanedDate && n) {
+        if ((n > 0 && this.hasNext) || (n < 0 && this.hasPrevious)) {
+          const newDate = new Date(this.cleanedDate);
           newDate.setDate(this.cleanedDate.getDate() + n);
           this.$unidooHeatmap.setDate(newDate, this.heatmapKey);
         }
       }
     },
 
-    updateNearDates(data){
-      if(data){
+    updateNearDates(data) {
+      if (data) {
         this.hasNext = data.hasNext
         this.hasPrevious = data.hasPrevious
         this.nextAvailable = data.nextAvailable
@@ -98,11 +105,11 @@ export default {
       }
     },
 
-    cleanDate(date){
-      if(date){
-        if(date instanceof Date){
+    cleanDate(date) {
+      if (date) {
+        if (date instanceof Date) {
           return date;
-        } else if(typeof date === 'string'){
+        } else if (typeof date === 'string') {
           return new Date(date);
         }
       } 
@@ -121,6 +128,4 @@ export default {
     background: rgb(245,245,245);
     border-radius: 5px;
   }
-</style>
-
-
+</style>