rc-calendar
Advanced tools
Comparing version 9.3.0 to 9.3.1
@@ -43,3 +43,5 @@ import React from 'react'; | ||
componentDidUpdate: function componentDidUpdate() { | ||
this.dateInputInstance.setSelectionRange(this.cachedSelectionStart, this.cachedSelectionEnd); | ||
if (!this.state.invalid) { | ||
this.dateInputInstance.setSelectionRange(this.cachedSelectionStart, this.cachedSelectionEnd); | ||
} | ||
}, | ||
@@ -46,0 +48,0 @@ onInputChange: function onInputChange(event) { |
@@ -50,6 +50,8 @@ import _extends from 'babel-runtime/helpers/extends'; | ||
function generateOptions(length) { | ||
var arr = []; | ||
function generateOptions(length, extraOptionGen) { | ||
var arr = extraOptionGen ? extraOptionGen() : []; | ||
for (var value = 0; value < length; value++) { | ||
arr.push(value); | ||
if (arr.indexOf(value) === -1) { | ||
arr.push(value); | ||
} | ||
} | ||
@@ -326,3 +328,5 @@ return arr; | ||
value = _state4.value; | ||
var disabledTime = this.props.disabledTime; | ||
var userSettingDisabledTime = disabledTime(null, 'end') || {}; | ||
var startValue = selectedValue && selectedValue[0] || value[0].clone(); | ||
@@ -335,5 +339,9 @@ // if startTime and endTime is same day.. | ||
var second = startValue.second(); | ||
var _disabledHours = generateOptions(hours); | ||
var _disabledMinutes = generateOptions(minutes); | ||
var _disabledSeconds = generateOptions(second); | ||
var _disabledHours = userSettingDisabledTime.disabledHours, | ||
_disabledMinutes = userSettingDisabledTime.disabledMinutes, | ||
_disabledSeconds = userSettingDisabledTime.disabledSeconds; | ||
_disabledHours = generateOptions(hours, _disabledHours); | ||
_disabledMinutes = generateOptions(minutes, _disabledMinutes); | ||
_disabledSeconds = generateOptions(second, _disabledSeconds); | ||
return { | ||
@@ -357,3 +365,3 @@ disabledHours: function disabledHours() { | ||
} | ||
return null; | ||
return userSettingDisabledTime; | ||
}, | ||
@@ -360,0 +368,0 @@ isAllowedDateAndTime: function isAllowedDateAndTime(selectedValue) { |
@@ -63,3 +63,5 @@ 'use strict'; | ||
componentDidUpdate: function componentDidUpdate() { | ||
this.dateInputInstance.setSelectionRange(this.cachedSelectionStart, this.cachedSelectionEnd); | ||
if (!this.state.invalid) { | ||
this.dateInputInstance.setSelectionRange(this.cachedSelectionStart, this.cachedSelectionEnd); | ||
} | ||
}, | ||
@@ -66,0 +68,0 @@ onInputChange: function onInputChange(event) { |
@@ -89,6 +89,8 @@ 'use strict'; | ||
function generateOptions(length) { | ||
var arr = []; | ||
function generateOptions(length, extraOptionGen) { | ||
var arr = extraOptionGen ? extraOptionGen() : []; | ||
for (var value = 0; value < length; value++) { | ||
arr.push(value); | ||
if (arr.indexOf(value) === -1) { | ||
arr.push(value); | ||
} | ||
} | ||
@@ -365,3 +367,5 @@ return arr; | ||
value = _state4.value; | ||
var disabledTime = this.props.disabledTime; | ||
var userSettingDisabledTime = disabledTime(null, 'end') || {}; | ||
var startValue = selectedValue && selectedValue[0] || value[0].clone(); | ||
@@ -374,5 +378,9 @@ // if startTime and endTime is same day.. | ||
var second = startValue.second(); | ||
var _disabledHours = generateOptions(hours); | ||
var _disabledMinutes = generateOptions(minutes); | ||
var _disabledSeconds = generateOptions(second); | ||
var _disabledHours = userSettingDisabledTime.disabledHours, | ||
_disabledMinutes = userSettingDisabledTime.disabledMinutes, | ||
_disabledSeconds = userSettingDisabledTime.disabledSeconds; | ||
_disabledHours = generateOptions(hours, _disabledHours); | ||
_disabledMinutes = generateOptions(minutes, _disabledMinutes); | ||
_disabledSeconds = generateOptions(second, _disabledSeconds); | ||
return { | ||
@@ -396,3 +404,3 @@ disabledHours: function disabledHours() { | ||
} | ||
return null; | ||
return userSettingDisabledTime; | ||
}, | ||
@@ -399,0 +407,0 @@ isAllowedDateAndTime: function isAllowedDateAndTime(selectedValue) { |
{ | ||
"name": "rc-calendar", | ||
"version": "9.3.0", | ||
"version": "9.3.1", | ||
"description": "React Calendar", | ||
@@ -5,0 +5,0 @@ "keywords": [ |
@@ -219,3 +219,3 @@ # rc-calendar | ||
<td>'date'</td> | ||
<td>controll which kind of panel should be shown</td> | ||
<td>control which kind of panel should be shown</td> | ||
</tr> | ||
@@ -368,3 +368,3 @@ <tr> | ||
<td>['date', 'date']</td> | ||
<td>controll which kind of panels should be shown</td> | ||
<td>control which kind of panels should be shown</td> | ||
</tr> | ||
@@ -381,3 +381,3 @@ <tr> | ||
<td></td> | ||
<td>controll hover value</td> | ||
<td>control hover value</td> | ||
</tr> | ||
@@ -384,0 +384,0 @@ <tr> |
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
1414565
21974