From 80fac295b704c9841a672ec206596a3606b7e95f Mon Sep 17 00:00:00 2001
From: Danny Feliz <dannyfeliz08@gmail.com>
Date: Fri, 18 Sep 2020 00:11:09 -0400
Subject: [PATCH] Make the props reactive

---
 src/components/TimedContent.vue | 79 ++++++++++++++++++++++-----------
 src/utils/helpers.js            |  8 ++++
 2 files changed, 60 insertions(+), 27 deletions(-)

diff --git a/src/components/TimedContent.vue b/src/components/TimedContent.vue
index dc6bd0c..39bf3c2 100644
--- a/src/components/TimedContent.vue
+++ b/src/components/TimedContent.vue
@@ -1,22 +1,24 @@
 <template>
-  <span v-if="shouldShow">
+  <span v-if="shouldShowContent">
     <slot />
   </span>
 </template>
 
 <script>
-import { isValidTimeZone } from "../utils/helpers";
+import { isValidTimeZone, isValidDate } from "../utils/helpers";
 
 export default {
   name: "TimedContent",
   props: {
     from: {
       type: Date,
-      required: true
+      required: true,
+      validator: isValidDate
     },
     to: {
       type: Date,
-      required: true
+      required: true,
+      validator: isValidDate
     },
     timeZone: {
       type: String,
@@ -26,47 +28,70 @@ export default {
   },
   data() {
     return {
-      shouldShow: false,
       countdown: null,
-      formattedFrom: new Date(this.from.toLocaleString("en-US", { timeZone: this.timeZone })),
-      formattedTo: new Date(this.to.toLocaleString("en-US", { timeZone: this.timeZone }))
+      currentDate: new Date().getTime()
     };
   },
   created() {
-    this.checkDatesValidity();
-    this.toggleContent();
-    this.countdown = setInterval(() => this.toggleContent(), 1000);
+    this.init();
   },
   beforeDestroy() {
-    clearInterval(this.countdown);
+    this.stopCountdown();
   },
-  methods: {
-    shouldShowContent() {
-      const currentDate = new Date().getTime();
-      return currentDate >= this.formattedFrom.getTime() && currentDate <= this.formattedTo.getTime();
+  watch: {
+    from() {
+      this.init();
     },
-    toggleContent() {
-      const wasShown = this.shouldShow;
-      this.shouldShow = this.shouldShowContent();
-
-      if (!wasShown && this.shouldShow) {
+    to() {
+      this.init();
+    },
+    timeZone() {
+      this.init();
+    },
+    shouldShowContent() {
+      if (this.shouldShowContent) {
         this.$emit("show");
-      } else if (wasShown && !this.shouldShow) {
+      } else {
         this.$emit("hide");
         this.stopCountdown();
       }
+    }
+  },
+  computed: {
+    convertedFrom() {
+      return new Date(this.from.toLocaleString("en-US", { timeZone: this.timeZone }));
     },
-    stopCountdown() {
-      clearInterval(this.countdown);
+    formattedTo() {
+      return new Date(this.to.toLocaleString("en-US", { timeZone: this.timeZone }));
+    },
+    shouldShowContent() {
+      return this.currentDate >= this.convertedFrom.getTime() && this.currentDate <= this.formattedTo.getTime();
+    }
+  },
+  methods: {
+    init() {
+      if (this.countdown) {
+        this.stopCountdown();
+      }
+
+      this.checkDatesValidity();
+
+      this.countdown = setInterval(() => {
+        this.currentDate = new Date().getTime();
+        this.checkDatesValidity();
+      }, 1000);
     },
     checkDatesValidity() {
-      if (this.formattedFrom.getTime() > this.formattedTo.getTime()) {
-        throw new Error(`The 'from' date is after the 'to' date. Please check: FROM ${this.from} TO ${this.to}`);
+      if (this.convertedFrom.getTime() > this.formattedTo.getTime()) {
+        throw new Error("The 'from' date is after the 'to' date");
       }
 
-      if (this.formattedTo.getTime() < this.formattedFrom.getTime()) {
-        throw new Error(`The 'to' date is before the 'from' date. Please check: FROM ${this.from} TO ${this.to}`);
+      if (this.formattedTo.getTime() < this.convertedFrom.getTime()) {
+        throw new Error("The 'to' date is before the 'from' date.");
       }
+    },
+    stopCountdown() {
+      clearInterval(this.countdown);
     }
   }
 };
diff --git a/src/utils/helpers.js b/src/utils/helpers.js
index d4c9e65..7227f0a 100644
--- a/src/utils/helpers.js
+++ b/src/utils/helpers.js
@@ -12,3 +12,11 @@ export function isValidTimeZone(timeZone) {
     return false;
   }
 }
+
+/**
+ * @param {Date} date
+ * @returns Boolean
+ */
+export function isValidDate(date) {
+  return date instanceof Date && !isNaN(date.valueOf());
+}