Simplify daySize

react-dates · Mar 27, 2017 · 6dfdab4 · 6dfdab4
1 parent fe5ee49
commit 6dfdab4
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 13 deletions.
diff --git a/src/components/CalendarDay.jsx b/src/components/CalendarDay.jsx
@@ -18,7 +18,7 @@ const propTypes = forbidExtraProps({
 
 const defaultProps = {
   day: moment(),
-  daySize: 39,
+  daySize: 40,
   isOutsideDay: false,
   modifiers: {},
   onDayClick() {},

diff --git a/src/components/CalendarMonth.jsx b/src/components/CalendarMonth.jsx
@@ -41,7 +41,7 @@ const defaultProps = {
   enableOutsideDays: false,
   modifiers: {},
   orientation: HORIZONTAL_ORIENTATION,
-  daySize: 39,
+  daySize: 40,
   onDayClick() {},
   onDayMouseEnter() {},
   onDayMouseLeave() {},

diff --git a/src/components/CalendarMonthGrid.jsx b/src/components/CalendarMonthGrid.jsx
@@ -54,7 +54,7 @@ const defaultProps = {
   onMonthTransitionEnd() {},
   renderDay: null,
   transformValue: 'none',
-  daySize: 39,
+  daySize: 40,
 
   // i18n
   monthFormat: 'MMMM YYYY', // english locale

diff --git a/src/components/DateRangePicker.jsx b/src/components/DateRangePicker.jsx
@@ -63,7 +63,7 @@ const defaultProps = {
   keepOpenOnDateSelect: false,
   reopenPickerOnClearDates: false,
   renderCalendarInfo: null,
-  daySize: 39,
+  daySize: 40,
 
   // navigation related props
   navPrev: null,

diff --git a/src/components/DayPicker.jsx b/src/components/DayPicker.jsx
@@ -68,7 +68,7 @@ const defaultProps = {
   hidden: false,
   initialVisibleMonth: () => moment(),
   renderCalendarInfo: null,
-  daySize: 39,
+  daySize: 40,
 
   // navigation props
   navPrev: null,

diff --git a/src/components/DayPickerRangeController.jsx b/src/components/DayPickerRangeController.jsx
@@ -80,7 +80,7 @@ const defaultProps = {
   withPortal: false,
 
   initialVisibleMonth: () => moment(),
-  daySize: 39,
+  daySize: 40,
 
   navPrev: null,
   navNext: null,

diff --git a/src/components/SingleDatePicker.jsx b/src/components/SingleDatePicker.jsx
@@ -57,7 +57,7 @@ const defaultProps = {
   keepOpenOnDateSelect: false,
   reopenPickerOnClearDate: false,
   renderCalendarInfo: null,
-  daySize: 39,
+  daySize: 40,
 
   // navigation related props
   navPrev: null,

diff --git a/src/utils/getCalendarMonthWidth.js b/src/utils/getCalendarMonthWidth.js
@@ -1,5 +1,3 @@
-const CALENDAR_MONTH_PADDING = 9;
-
-export default function getCalendarMonthWidth(daySize) {
-  return (7 * (daySize + 1)) + (2 * (CALENDAR_MONTH_PADDING + 1));
+export default function getCalendarMonthWidth(daySize, monthPadding = 10) {
+  return (7 * daySize) + (2 * monthPadding);
 }
diff --git a/test/utils/getCalendarMonthWidth_spec.js b/test/utils/getCalendarMonthWidth_spec.js
@@ -3,7 +3,7 @@ import { expect } from 'chai';
 import getCalendarMonthWidth from '../../src/utils/getCalendarMonthWidth';
 
 describe('#getCalendarMonthWidth', () => {
-  it('correctly calculates width for default day size of 39', () => {
-    expect(getCalendarMonthWidth(39)).to.equal(300);
+  it('correctly calculates width for default day size of 40', () => {
+    expect(getCalendarMonthWidth(40)).to.equal(300);
   });
 });