refactor to use common methods

justinrubek · Jan 19, 2019 · 82280a0 · 82280a0
1 parent af264fa
commit 82280a0
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 18 deletions.
diff --git a/docs/bundle.css.map b/docs/bundle.css.map
diff --git a/docs/bundle.js b/docs/bundle.js
diff --git a/docs/bundle.js.map b/docs/bundle.js.map
diff --git a/docs/test.css.map b/docs/test.css.map
diff --git a/docs/test.js b/docs/test.js
diff --git a/docs/test.js.map b/docs/test.js.map
diff --git a/src/Components/Week.html b/src/Components/Week.html
@@ -9,7 +9,7 @@
         class="day--label" 
         class:selected="datesAreSameDay(day.date,selected)"
         on:click="fire('dateSelected',day.date)"
-        disabled="{isBefore(start, day.date) || isAfter(end, day.date)}"
+        disabled="{!isDaySelectable(day.date, start, end)}"
       >
         {day.date.getDate()}
       </button>
@@ -82,19 +82,16 @@
 </style>
 
 <script>
+  import { isDaySelectable } from './lib/helpers'
+
   export default { 
     helpers: { 
       datesAreSameDay(a,b) {
         return a.getDate() == b.getDate() 
           && a.getMonth() == b.getMonth()
           && a.getFullYear() == b.getFullYear()
       },
-      isBefore (start, day) {
-        return day < start
-      },
-      isAfter (end, day) {
-        return day > end
-      },
+      isDaySelectable
     }
   }
 </script>
diff --git a/src/Components/lib/helpers.js b/src/Components/lib/helpers.js
@@ -19,16 +19,20 @@ const getCalendarPage = (month,year,dayProps) => {
   return { month, year, weeks }
 }
 
+function isDaySelectable (day, start, end) {
+  return day >= start && day <= end;
+}
+
 const getDayPropsHandler = (start,end) => {
   let today = new Date(); 
   today.setHours(0,0,0,0);
   return date => ({
-    selectable: date >= start && date <= end,
+    selectable: isDaySelectable(today, start, end),
     isToday: date.getTime() == today.getTime()
   });
 };
 
-export function getMonths(start, end) { 
+function getMonths(start, end) { 
   start.setHours(0,0,0,0);
   end.setHours(0,0,0,0);
   let endDate = new Date(end.getFullYear(), end.getMonth() + 1, 1); 
@@ -40,4 +44,9 @@ export function getMonths(start, end) {
     date.setMonth(date.getMonth() + 1); 
   }
   return months;
-}
+}
+
+export {
+  getMonths,
+  isDaySelectable
+};