fix(datepicker): if min date is last day of a month (#3113)

user should be able to navigate into fixes #3102
valor-software · Nov 27, 2017 · ec445e2 · ec445e2
1 parent a72fedc
commit ec445e2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/datepicker/engine/flag-days-calendar.ts b/src/datepicker/engine/flag-days-calendar.ts
@@ -7,6 +7,7 @@ import { isSameDay, isSameMonth } from '../../bs-moment/utils/date-getters';
 import { isAfter, isBefore } from '../../bs-moment/utils/date-compare';
 import { isMonthDisabled } from '../utils/bs-calendar-utils';
 import { shiftDate } from '../../bs-moment/utils/date-setters';
+import { endOf, startOf } from '../../bs-moment/utils/start-end-of';
 
 export interface FlagDaysCalendarOptions {
   isDisabled: boolean;

diff --git a/src/datepicker/utils/bs-calendar-utils.ts b/src/datepicker/utils/bs-calendar-utils.ts
@@ -4,8 +4,8 @@ import {
 } from '../../bs-moment/utils/date-getters';
 import { shiftDate } from '../../bs-moment/utils/date-setters';
 import {
-  isSameOrAfter,
-  isSameOrBefore
+  isAfter,
+  isBefore
 } from '../../bs-moment/utils/date-compare';
 import { endOf, startOf } from '../../bs-moment/utils/start-end-of';
 
@@ -32,15 +32,15 @@ export function calculateDateOffset(weekday: number, startingDayOffset: number):
 }
 
 export function isMonthDisabled(date: Date, min: Date, max: Date): boolean {
-  const minBound = min && isSameOrBefore(endOf(date, 'month'), min, 'day');
-  const maxBound = max && isSameOrAfter(startOf(date, 'month'), max, 'day');
+  const minBound = min && isBefore(endOf(date, 'month'), min, 'day');
+  const maxBound = max && isAfter(startOf(date, 'month'), max, 'day');
 
   return minBound || maxBound;
 }
 
 export function isYearDisabled(date: Date, min: Date, max: Date): boolean {
-  const minBound = min && isSameOrBefore(endOf(date, 'year'), min, 'day');
-  const maxBound = max && isSameOrAfter(startOf(date, 'year'), max, 'day');
+  const minBound = min && isBefore(endOf(date, 'year'), min, 'day');
+  const maxBound = max && isAfter(startOf(date, 'year'), max, 'day');
 
   return minBound || maxBound;
 }