Merge pull request #40 from geoblink/feature/CORE-8095-GeoCalendar-di…

…sable-input-when-necessary Feature/core 8095 geo calendar disable input when necessary
geoblink · Mar 23, 2020 · a0eb0f2 · a0eb0f2 · vercel · Mar 23, 2020
2 parents 41783e3 + f3f48a5
commit a0eb0f2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 29.5.5
+
+Fix:
+
+- date inputs are disabled in `GeoCalendar` when granularity is non-daily
+
 ## 29.5.4
 
 New:

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@geoblink/design-system",
-  "version": "29.5.4",
+  "version": "29.5.5",
   "description": "Geoblink Design System for Vue.js",
   "author": "Geoblink <contact@geoblink.com>",
   "main": "dist/system.js",

diff --git a/src/elements/GeoCalendar/GeoCalendar.vue b/src/elements/GeoCalendar/GeoCalendar.vue
@@ -18,6 +18,7 @@
             v-model="fromFormattedDate"
             :placeholder="fromInputPlaceholder"
             type="text"
+            :disabled="isInputDisabled"
             :error="showFromFormatError"
             :focus="isFromInputFieldFocused"
             @focus="focusFromDateInput"
@@ -54,6 +55,7 @@
             v-model="toFormattedDate"
             :placeholder="toInputPlaceholder"
             type="text"
+            :disabled="isInputDisabled"
             :error="showToFormatError"
             :focus="isToInputFieldFocused"
             @focus="focusToDateInput"
@@ -211,6 +213,10 @@ export default {
 
     isValidDate () {
       return (date) => date && isValid(date) && this.isDateWithinBounds(date)
+    },
+
+    isInputDisabled () {
+      return this.granularityId !== GRANULARITY_IDS.day
     }
   },