react-datetime-picker
Advanced tools
Comparing version 1.3.1 to 1.3.2
@@ -185,3 +185,3 @@ 'use strict'; | ||
}), | ||
_react2.default.createElement( | ||
this.props.clearIcon !== null && _react2.default.createElement( | ||
'button', | ||
@@ -197,3 +197,3 @@ { | ||
), | ||
_react2.default.createElement( | ||
this.props.calendarIcon !== null && _react2.default.createElement( | ||
'button', | ||
@@ -329,10 +329,10 @@ { | ||
if (nextProps.isCalendarOpen !== prevState.propsIsCalendarOpen) { | ||
if (nextProps.isCalendarOpen !== prevState.isCalendarOpenProps) { | ||
nextState.isCalendarOpen = nextProps.isCalendarOpen; | ||
nextState.propsIsCalendarOpen = nextProps.isCalendarOpen; | ||
nextState.isCalendarOpenProps = nextProps.isCalendarOpen; | ||
} | ||
if (nextProps.isClockOpen !== prevState.propsIsClockOpen) { | ||
if (nextProps.isClockOpen !== prevState.isClockOpenProps) { | ||
nextState.isClockOpen = nextProps.isClockOpen; | ||
nextState.propsIsClockOpen = nextProps.isClockOpen; | ||
nextState.isClockOpenProps = nextProps.isClockOpen; | ||
} | ||
@@ -339,0 +339,0 @@ |
{ | ||
"name": "react-datetime-picker", | ||
"version": "1.3.1", | ||
"version": "1.3.2", | ||
"description": "A date range picker for your React app.", | ||
@@ -9,3 +9,3 @@ "main": "dist/entry.js", | ||
"build": "npm run build-js && npm run copy-styles && npm run build-styles", | ||
"build-js": "babel src -d dist --ignore **/__tests__", | ||
"build-js": "babel src -d dist --ignore __tests__", | ||
"build-styles": "lessc ./dist/DateTimePicker.less ./dist/DateTimePicker.css", | ||
@@ -48,7 +48,7 @@ "copy-styles": "node ./copy-styles.js", | ||
"prop-types": "^15.6.0", | ||
"react-calendar": "^2.14.0", | ||
"react-calendar": "^2.15.1", | ||
"react-clock": "^2.2.1", | ||
"react-date-picker": "^6.10.0", | ||
"react-date-picker": "^6.10.2", | ||
"react-lifecycles-compat": "^1.1.0", | ||
"react-time-picker": "^2.4.0" | ||
"react-time-picker": "2.4.1" | ||
}, | ||
@@ -76,4 +76,4 @@ "devDependencies": { | ||
"less": "^2.7.3", | ||
"react": "^16.3.0", | ||
"react-dom": "^16.3.0" | ||
"react": "^16.4.0", | ||
"react-dom": "^16.4.0" | ||
}, | ||
@@ -80,0 +80,0 @@ "peerDependencies": { |
@@ -107,2 +107,3 @@ ![downloads](https://img.shields.io/npm/dt/react-datetime-picker.svg) ![build](https://img.shields.io/travis/wojtekmaj/react-datetime-picker/master.svg) ![dependencies](https://img.shields.io/david/wojtekmaj/react-datetime-picker.svg | ||
|required|Defines whether date input should be required. Defaults to false.|`true`| | ||
|showLeadingZeros|Defines whether leading zeros should be rendered in date inputs. Defaults to false.|`true`| | ||
|value|Defines the value of the input.|<ul><li>Date: `new Date()`</li><li>An array of dates: `[new Date(2017, 0, 1), new Date(2017, 7, 1)]`</li></ul>| | ||
@@ -109,0 +110,0 @@ |
@@ -19,10 +19,10 @@ import React, { PureComponent } from 'react'; | ||
if (nextProps.isCalendarOpen !== prevState.propsIsCalendarOpen) { | ||
if (nextProps.isCalendarOpen !== prevState.isCalendarOpenProps) { | ||
nextState.isCalendarOpen = nextProps.isCalendarOpen; | ||
nextState.propsIsCalendarOpen = nextProps.isCalendarOpen; | ||
nextState.isCalendarOpenProps = nextProps.isCalendarOpen; | ||
} | ||
if (nextProps.isClockOpen !== prevState.propsIsClockOpen) { | ||
if (nextProps.isClockOpen !== prevState.isClockOpenProps) { | ||
nextState.isClockOpen = nextProps.isClockOpen; | ||
nextState.propsIsClockOpen = nextProps.isClockOpen; | ||
nextState.isClockOpenProps = nextProps.isClockOpen; | ||
} | ||
@@ -157,21 +157,25 @@ | ||
/> | ||
<button | ||
className="react-datetime-picker__clear-button react-datetime-picker__button__icon" | ||
disabled={disabled} | ||
onClick={this.clear} | ||
onFocus={this.stopPropagation} | ||
type="button" | ||
> | ||
{this.props.clearIcon} | ||
</button> | ||
<button | ||
className="react-datetime-picker__calendar-button react-datetime-picker__button__icon" | ||
disabled={disabled} | ||
onClick={this.toggleCalendar} | ||
onFocus={this.stopPropagation} | ||
onBlur={this.resetValue} | ||
type="button" | ||
> | ||
{this.props.calendarIcon} | ||
</button> | ||
{this.props.clearIcon !== null && ( | ||
<button | ||
className="react-datetime-picker__clear-button react-datetime-picker__button__icon" | ||
disabled={disabled} | ||
onClick={this.clear} | ||
onFocus={this.stopPropagation} | ||
type="button" | ||
> | ||
{this.props.clearIcon} | ||
</button> | ||
)} | ||
{this.props.calendarIcon !== null && ( | ||
<button | ||
className="react-datetime-picker__calendar-button react-datetime-picker__button__icon" | ||
disabled={disabled} | ||
onClick={this.toggleCalendar} | ||
onFocus={this.stopPropagation} | ||
onBlur={this.resetValue} | ||
type="button" | ||
> | ||
{this.props.calendarIcon} | ||
</button> | ||
)} | ||
</div> | ||
@@ -178,0 +182,0 @@ ); |
@@ -20,6 +20,6 @@ import { | ||
const formattedTime = formatTime(date, 'de-DE'); | ||
const formattedTime = formatTime(date, 'en-US'); | ||
expect(formattedTime).toBe('13:27:00'); | ||
expect(formattedTime).toBe('1:27:00 PM'); | ||
}); | ||
}); |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
99677
2360
136
+ Addedreact-time-picker@2.4.1(transitive)
- Removedreact-time-picker@2.8.0(transitive)
Updatedreact-calendar@^2.15.1
Updatedreact-date-picker@^6.10.2
Updatedreact-time-picker@2.4.1