rc-calendar
Advanced tools
Comparing version 9.15.1 to 9.15.2
@@ -22,2 +22,9 @@ import _extends from 'babel-runtime/helpers/extends'; | ||
var getMomentObjectIfValid = function getMomentObjectIfValid(date) { | ||
if (moment.isMoment(date) && date.isValid()) { | ||
return date; | ||
} | ||
return false; | ||
}; | ||
var Calendar = function (_React$Component) { | ||
@@ -35,3 +42,3 @@ _inherits(Calendar, _React$Component); | ||
mode: _this.props.mode || 'date', | ||
value: props.value || props.defaultValue || moment(), | ||
value: getMomentObjectIfValid(props.value) || getMomentObjectIfValid(props.defaultValue) || moment(), | ||
selectedValue: props.selectedValue || props.defaultSelectedValue | ||
@@ -58,3 +65,3 @@ }; | ||
if ('value' in nextProps) { | ||
newState.value = value || nextProps.defaultValue || getNowByCurrentStateValue(state.value); | ||
newState.value = getMomentObjectIfValid(value) || getMomentObjectIfValid(nextProps.defaultValue) || getNowByCurrentStateValue(state.value); | ||
} | ||
@@ -61,0 +68,0 @@ if ('selectedValue' in nextProps) { |
@@ -200,4 +200,4 @@ import _classCallCheck from 'babel-runtime/helpers/classCallCheck'; | ||
this.onKeyDown = function (_ref) { | ||
var keyCode = _ref.keyCode; | ||
this.onKeyDown = function (event) { | ||
var keyCode = event.keyCode; | ||
var _props2 = _this2.props, | ||
@@ -213,2 +213,3 @@ onSelect = _props2.onSelect, | ||
} | ||
event.preventDefault(); | ||
} | ||
@@ -215,0 +216,0 @@ }; |
@@ -125,3 +125,2 @@ import _extends from 'babel-runtime/helpers/extends'; | ||
monthCellRender: PropTypes.func, | ||
dateCellRender: PropTypes.func, | ||
value: PropTypes.object, | ||
@@ -128,0 +127,0 @@ defaultValue: PropTypes.object, |
@@ -126,2 +126,3 @@ import _classCallCheck from 'babel-runtime/helpers/classCallCheck'; | ||
align: PropTypes.object, | ||
dateRender: PropTypes.func, | ||
onBlur: PropTypes.func | ||
@@ -128,0 +129,0 @@ }; |
@@ -42,2 +42,3 @@ import _extends from 'babel-runtime/helpers/extends'; | ||
clearIcon = props.clearIcon, | ||
showClear = props.showClear, | ||
inputMode = props.inputMode; | ||
@@ -74,3 +75,3 @@ | ||
value: value, | ||
showClear: false, | ||
showClear: showClear || false, | ||
selectedValue: selectedValue[index], | ||
@@ -149,4 +150,5 @@ onChange: onInputChange, | ||
clearIcon: PropTypes.node, | ||
dateRender: PropTypes.func, | ||
inputMode: PropTypes.string | ||
}; | ||
export default CalendarPart; |
# History | ||
---- | ||
## 9.15.0 / 2019-05-26 | ||
- Support Malay locales | ||
## 9.15.0 / 2019-06-06 | ||
@@ -5,0 +8,0 @@ |
@@ -20,3 +20,3 @@ // Type definitions for rc-calendar 9.6 | ||
locale?: object; | ||
format?: string; | ||
format?: string | string[]; | ||
showDateInput?: boolean; | ||
@@ -23,0 +23,0 @@ showWeekNumber?: boolean; |
@@ -71,2 +71,9 @@ 'use strict'; | ||
var getMomentObjectIfValid = function getMomentObjectIfValid(date) { | ||
if (_moment2['default'].isMoment(date) && date.isValid()) { | ||
return date; | ||
} | ||
return false; | ||
}; | ||
var Calendar = function (_React$Component) { | ||
@@ -84,3 +91,3 @@ (0, _inherits3['default'])(Calendar, _React$Component); | ||
mode: _this.props.mode || 'date', | ||
value: props.value || props.defaultValue || (0, _moment2['default'])(), | ||
value: getMomentObjectIfValid(props.value) || getMomentObjectIfValid(props.defaultValue) || (0, _moment2['default'])(), | ||
selectedValue: props.selectedValue || props.defaultSelectedValue | ||
@@ -107,3 +114,3 @@ }; | ||
if ('value' in nextProps) { | ||
newState.value = value || nextProps.defaultValue || (0, _CalendarMixin.getNowByCurrentStateValue)(state.value); | ||
newState.value = getMomentObjectIfValid(value) || getMomentObjectIfValid(nextProps.defaultValue) || (0, _CalendarMixin.getNowByCurrentStateValue)(state.value); | ||
} | ||
@@ -110,0 +117,0 @@ if ('selectedValue' in nextProps) { |
@@ -231,4 +231,4 @@ 'use strict'; | ||
this.onKeyDown = function (_ref) { | ||
var keyCode = _ref.keyCode; | ||
this.onKeyDown = function (event) { | ||
var keyCode = event.keyCode; | ||
var _props2 = _this2.props, | ||
@@ -244,2 +244,3 @@ onSelect = _props2.onSelect, | ||
} | ||
event.preventDefault(); | ||
} | ||
@@ -246,0 +247,0 @@ }; |
@@ -162,3 +162,2 @@ 'use strict'; | ||
monthCellRender: _propTypes2['default'].func, | ||
dateCellRender: _propTypes2['default'].func, | ||
value: _propTypes2['default'].object, | ||
@@ -165,0 +164,0 @@ defaultValue: _propTypes2['default'].object, |
@@ -162,2 +162,3 @@ 'use strict'; | ||
align: _propTypes2['default'].object, | ||
dateRender: _propTypes2['default'].func, | ||
onBlur: _propTypes2['default'].func | ||
@@ -164,0 +165,0 @@ }; |
@@ -74,2 +74,3 @@ 'use strict'; | ||
clearIcon = props.clearIcon, | ||
showClear = props.showClear, | ||
inputMode = props.inputMode; | ||
@@ -106,3 +107,3 @@ | ||
value: value, | ||
showClear: false, | ||
showClear: showClear || false, | ||
selectedValue: selectedValue[index], | ||
@@ -181,2 +182,3 @@ onChange: onInputChange, | ||
clearIcon: _propTypes2['default'].node, | ||
dateRender: _propTypes2['default'].func, | ||
inputMode: _propTypes2['default'].string | ||
@@ -183,0 +185,0 @@ }; |
{ | ||
"name": "rc-calendar", | ||
"version": "9.15.1", | ||
"version": "9.15.2", | ||
"description": "React Calendar", | ||
@@ -5,0 +5,0 @@ "keywords": [ |
@@ -518,8 +518,2 @@ # rc-calendar | ||
<tr> | ||
<td>dateCellRender</td> | ||
<td>function</td> | ||
<td></td> | ||
<td>Custom date cell render method</td> | ||
</tr> | ||
<tr> | ||
<td>monthCellContentRender</td> | ||
@@ -526,0 +520,0 @@ <td>function</td> |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
1540846
165
23539
747