@sedoo/unidoo 0.0.38 → 0.0.42

package/package.json

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

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

@@ -13,7 +13,7 @@
           :data-day="formatDate(day.date)"
           :data-count="day.count"
           :data-color="day.colorIndex"
-          :style="{ opacity : ((day.date < now) ? 1 : 0.3), backgroundColor: getColor(day.colorIndex) }"
+          :style="{ opacity : ((day.date <= now) ? 1 : 0.3), backgroundColor: getColor(day.colorIndex) }"
           v-tooltip="tooltipOptions(day)"
           @click="handleClick($event,day)">
             <div v-if="day.date < now" :style="{ color: getTextColor(day) }">{{ dayIndex + 1 }}</div> 
@@ -86,7 +86,7 @@ export default {
     }
   },
   data: () => ({
-    now: new Date() 
+    now: new Date(new Date().setHours(23,59,59,999)) 
   }),
   watch: {
     dateValue (val) {
@@ -139,7 +139,7 @@ export default {
   },
   methods: {
     computeClass (day) {
-      return `monthday ${((day.date < this.now) ? 'clickable' : 'not-clickable')} ${(this.isSameDay(day.date, this.dateValue) ? 'day-focus' : '')}`
+      return `monthday ${((day.date <= this.now) ? 'clickable' : 'not-clickable')} ${(this.isSameDay(day.date, this.dateValue) ? 'day-focus' : '')}`
     },
     tooltipOptions (day) {
       if (this.tooltip) {
@@ -171,7 +171,7 @@ export default {
     },
     handleClick (e, day) {
       if (day) {
-        if (day.date < this.now && (typeof day.count === 'number' || this.missingAllowed)) {
+        if (day.date <= this.now && (typeof day.count === 'number' || this.missingAllowed)) {
           if(this.returnObject){
             this.$emit('input', day);
           } else {
@@ -278,6 +278,7 @@ export default {
   }
   section[heatmap-calendar] [month] .monthday{
     margin-right: 2px;
+    margin-bottom: 2px;
     width:15px;
     height:15px;
     text-align: center;

package/src/components/unidoo-player/level-selector/level-selector-row.vue

@@ -55,7 +55,11 @@ export default {
   watch: {
     availableOptions(val) {
       if (val.length) {
-        this.$emit('input', val[0]);
+        if(this.value && val.includes(this.value)){
+          this.$emit('input', this.value);
+        } else {
+          this.$emit('input', val[0]);
+        }
       }
     }
     

package/src/components/unidoo-player/level-selector/level-selector.vue

@@ -53,23 +53,7 @@ export default {
 
     selector: {
       handler(val) {
-        // update options by level
-        if (val) {
-          if (!this.availableOptions) {
-            this.availableOptions = {};
-          }
-          const keys = Object.keys(val);
-          keys.sort();
-          const self = this;
-          keys.forEach(k => {
-            const values = self.optionsFromLevel(k);
-            if (JSON.stringify(values) != JSON.stringify(self.availableOptions[k])) {
-              self.availableOptions[k] = values;
-            }
-          })
-        }
-        // return data from entries map and selector value
-        this.$emit('input', this.sort(this.entries[this.getLevelIdFromSelector(val)]));
+        this.loadSelector(val);
       },
       deep: true
     },
@@ -98,13 +82,32 @@ export default {
       }
     },
 
+    loadSelector(val){
+      // update options by level
+      if (val) {
+        if (!this.availableOptions) {
+          this.availableOptions = {};
+        }
+        const keys = Object.keys(val);
+        keys.sort();
+        const self = this;
+        keys.forEach(k => {
+          const values = self.optionsFromLevel(k);
+          if (JSON.stringify(values) != JSON.stringify(self.availableOptions[k])) {
+            self.availableOptions[k] = values;
+          }
+        })
+      }
+      // return data from entries map and selector value
+      this.$emit('input', this.sort(this.entries[this.getLevelIdFromSelector(val)]));
+    },
+
    initLevels(levels, entries){
 
       if(levels.length > 0 && entries.length > 0){
         this.levelKeys = [];
         this.levels = {};
         this.entries = {};
-        this.selector = {};
         this.levelOptions = {};
 
         levels.forEach(l => {
@@ -113,10 +116,11 @@ export default {
         });
 
         this.levelKeys.sort();
-
-        // init selector using first entry
-        entries[0].levels.forEach(l => {  
-          this.$set(this.selector, l.name, l.value);
+        
+        // init default selector using first entry
+        let defaultSelector = {};
+        entries[0].levels.forEach(l => {
+          defaultSelector[l.name] = l.value;
         });
 
         // init options tree
@@ -159,8 +163,23 @@ export default {
             // store data by options combination
             this.entries[levelId].push(entry);
           }
+
         });
+        
         this.levelOptions = tempOptions;
+  
+        if(this.selector){
+          // try to return data from entries map and last selector value
+          // else use selector default value
+          let lastSelectionEntries = this.entries[this.getLevelIdFromSelector(this.selector)];
+          if(lastSelectionEntries && lastSelectionEntries.length > 0){
+            this.loadSelector(this.selector);
+          } else {
+            this.selector = defaultSelector;
+          }
+        } else {
+          this.selector = defaultSelector;
+        }
       }
     },