Change default back to local time (Hacker0x01#1066)

* Change default back to local time

* unit test

Author: aij

src/calendar.jsx

@@ -6,8 +6,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import classnames from 'classnames'
 import {
-  getUTCOffset,
-  newDateWithOffset,
+  now,
   setMonth,
   getMonth,
   addMonths,
@@ -100,7 +99,6 @@ export default class Calendar extends React.Component {
   static get defaultProps () {
     return {
       onDropdownFocus: () => {},
-      utcOffset: getUTCOffset(),
       monthsShown: 1,
       forceShowMonthNavigation: false
     }
@@ -150,7 +148,7 @@ export default class Calendar extends React.Component {
     const { preSelection, selected, openToDate, utcOffset } = this.props
     const minDate = getEffectiveMinDate(this.props)
     const maxDate = getEffectiveMaxDate(this.props)
-    const current = newDateWithOffset(utcOffset)
+    const current = now(utcOffset)
     const initialDate = openToDate || selected || preSelection
     if (initialDate) {
       return initialDate
@@ -306,7 +304,7 @@ export default class Calendar extends React.Component {
     return (
       <div
           className="react-datepicker__today-button"
-          onClick={e => this.props.onSelect(getStartOfDate(newDateWithOffset(this.props.utcOffset)), e)}>
+          onClick={e => this.props.onSelect(getStartOfDate(now(this.props.utcOffset)), e)}>
         {this.props.todayButton}
       </div>
     )

src/date_utils.js

@@ -54,6 +54,13 @@ export function newDateWithOffset (utcOffset) {
   return moment().utc().utcOffset(utcOffset)
 }
 
+export function now (maybeFixedUtcOffset) {
+  if (maybeFixedUtcOffset == null) {
+    return newDate()
+  }
+  return newDateWithOffset(maybeFixedUtcOffset)
+}
+
 export function cloneDate (date) {
   return date.clone()
 }

src/datepicker.jsx

@@ -5,9 +5,8 @@ import PopperComponent, { popperPlacementPositions } from './popper_component'
 import classnames from 'classnames'
 import {
   newDate,
-  newDateWithOffset,
+  now,
   cloneDate,
-  getUTCOffset,
   isMoment,
   isDate,
   isBefore,
@@ -136,7 +135,6 @@ export default class DatePicker extends React.Component {
       onSelect () {},
       onClickOutside () {},
       onMonthChange () {},
-      utcOffset: getUTCOffset(),
       monthsShown: 1,
       withPortal: false,
       shouldCloseOnSelect: true,
@@ -166,8 +164,7 @@ export default class DatePicker extends React.Component {
     this.props.openToDate ? newDate(this.props.openToDate)
     : this.props.selectsEnd && this.props.startDate ? newDate(this.props.startDate)
     : this.props.selectsStart && this.props.endDate ? newDate(this.props.endDate)
-    : (typeof this.props.utcOffset !== 'undefined') ? newDateWithOffset(this.props.utcOffset)
-    : newDate()
+    : now(this.props.utcOffset)
   )
 
   calcInitialState = () => {

src/day.jsx

@@ -2,11 +2,10 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import classnames from 'classnames'
 import {
-  getUTCOffset,
   getDay,
   getMonth,
   getDate,
-  newDateWithOffset,
+  now,
   isMoment,
 
   isSameDay,
@@ -34,10 +33,6 @@ export default class Day extends React.Component {
     utcOffset: PropTypes.number
   }
 
-  static defaultProps = {
-    utcOffset: getUTCOffset()
-  }
-
   handleClick = (event) => {
     if (!this.isDisabled() && this.props.onClick) {
       this.props.onClick(event)
@@ -179,7 +174,7 @@ export default class Day extends React.Component {
       'react-datepicker__day--in-selecting-range': this.isInSelectingRange(),
       'react-datepicker__day--selecting-range-start': this.isSelectingRangeStart(),
       'react-datepicker__day--selecting-range-end': this.isSelectingRangeEnd(),
-      'react-datepicker__day--today': this.isSameDay(newDateWithOffset(this.props.utcOffset)),
+      'react-datepicker__day--today': this.isSameDay(now(this.props.utcOffset)),
       'react-datepicker__day--weekend': this.isWeekend(),
       'react-datepicker__day--outside-month': this.isOutsideMonth()
     }, this.getHighLightedClass('react-datepicker__day--highlighted'))

test/datepicker_test.js

@@ -335,23 +335,18 @@ describe('DatePicker', () => {
     var m = utils.newDate()
     var copyM = utils.cloneDate(m)
     var testFormat = 'YYYY-MM-DD'
+    var exactishFormat = 'YYYY-MM-DD HH: ZZ'
     var callback = sandbox.spy()
     var datePicker = TestUtils.renderIntoDocument(
       <DatePicker selected={m}
           onChange={callback}
-          inline={opts.inline}
-          excludeDates={opts.excludeDates}
-          filterDate={opts.filterDate}
-          minDate={opts.minDate}
-          maxDate={opts.maxDate}
-          monthsShown={opts.monthsShown}
-          shouldCloseOnSelect={opts.shouldCloseOnSelect}/>
+          {...opts}/>
     )
     var dateInput = datePicker.input
     var nodeInput = ReactDOM.findDOMNode(dateInput)
     TestUtils.Simulate.focus(nodeInput)
     return {
-      m, copyM, testFormat, callback, datePicker, dateInput, nodeInput
+      m, copyM, testFormat, exactishFormat, callback, datePicker, dateInput, nodeInput
     }
   }
   it('should handle onInputKeyDown ArrowLeft', () => {
@@ -499,6 +494,17 @@ describe('DatePicker', () => {
     TestUtils.Simulate.keyDown(data.nodeInput, getKey('ArrowLeft'))
     expect(data.datePicker.state.open).to.be.true
   })
+  it('should default to the current day on Enter', () => {
+    const data = getOnInputKeyDownStuff({selected: null})
+    TestUtils.Simulate.keyDown(data.nodeInput, getKey('Enter'))
+    expect(data.callback.calledOnce).to.be.true
+    const selected = data.callback.getCall(0).args[0]
+    expect(
+      utils.formatDate(selected, data.exactishFormat)
+    ).to.equal(utils.formatDate(data.copyM, data.exactishFormat))
+    expect(selected.isLocal()).to.equal(true)
+  })
+
   it('should autofocus the input given the autoFocus prop', () => {
     var div = document.createElement('div')
     document.body.appendChild(div)