rc-calendar - npm Package Compare versions

Comparing version 9.12.3 to 9.12.4

es/RangeCalendar.js

@@ -105,3 +105,4 @@ import _extends from 'babel-runtime/helpers/extends';
       showTimePicker: false,
-      mode: props.mode || ['date', 'date']
+      mode: props.mode || ['date', 'date'],
+      panelTriggerSource: '' // Trigger by which picker panel: 'start' & 'end'
     };
@@ -183,6 +184,2 @@ return _this;
 
-    // console.warn('Render:', selectedValue.map(t => t.format('YYYY-MM-DD')).join(', '));
-    // console.log('start:', startValue.format('YYYY-MM-DD'));
-    // console.log('end:', endValue.format('YYYY-MM-DD'));
-
     var extraFooter = props.renderFooter();
@@ -647,7 +644,9 @@
     var newMode = [mode, state.mode[1]];
+    var newState = {
+      panelTriggerSource: 'start'
+    };
     if (!('mode' in props)) {
-      _this2.setState({
-        mode: newMode
-      });
+      newState.mode = newMode;
     }
+    _this2.setState(newState);
     var newValue = [value || state.value[0], state.value[1]];
@@ -662,7 +661,9 @@ props.onPanelChange(newValue, newMode);
     var newMode = [state.mode[0], mode];
+    var newState = {
+      panelTriggerSource: 'end'
+    };
     if (!('mode' in props)) {
-      _this2.setState({
-        mode: newMode
-      });
+      newState.mode = newMode;
     }
+    _this2.setState(newState);
     var newValue = [state.value[0], value || state.value[1]];
@@ -673,20 +674,34 @@ props.onPanelChange(newValue, newMode);
   this.getStartValue = function () {
-    var value = _this2.state.value[0];
-    var selectedValue = _this2.state.selectedValue;
+    var _state4 = _this2.state,
+        selectedValue = _state4.selectedValue,
+        showTimePicker = _state4.showTimePicker,
+        value = _state4.value,
+        mode = _state4.mode,
+        panelTriggerSource = _state4.panelTriggerSource;
+
+    var startValue = value[0];
     // keep selectedTime when select date
     if (selectedValue[0] && _this2.props.timePicker) {
-      value = value.clone();
-      syncTime(selectedValue[0], value);
+      startValue = startValue.clone();
+      syncTime(selectedValue[0], startValue);
     }
-    if (_this2.state.showTimePicker && selectedValue[0]) {
-      return selectedValue[0];
+    if (showTimePicker && selectedValue[0]) {
+      startValue = selectedValue[0];
     }
-    return value;
+
+    // Adjust month if date not align
+    if (panelTriggerSource === 'end' && mode[0] === 'date' && mode[1] === 'date' && startValue.isSame(value[1], 'month')) {
+      startValue = startValue.clone().subtract(1, 'month');
+    }
+
+    return startValue;
   };
 
   this.getEndValue = function () {
-    var _state4 = _this2.state,
-        value = _state4.value,
-        selectedValue = _state4.selectedValue,
-        showTimePicker = _state4.showTimePicker;
+    var _state5 = _this2.state,
+        value = _state5.value,
+        selectedValue = _state5.selectedValue,
+        showTimePicker = _state5.showTimePicker,
+        mode = _state5.mode,
+        panelTriggerSource = _state5.panelTriggerSource;
 
@@ -699,4 +714,10 @@ var endValue = value[1] ? value[1].clone() : value[0].clone().add(1, 'month');
     if (showTimePicker) {
-      return selectedValue[1] ? selectedValue[1] : _this2.getStartValue();
+      endValue = selectedValue[1] ? selectedValue[1] : _this2.getStartValue();
     }
+
+    // Adjust month if date not align
+    if (panelTriggerSource !== 'end' && mode[0] === 'date' && mode[1] === 'date' && endValue.isSame(value[0], 'month')) {
+      endValue = endValue.clone().add(1, 'month');
+    }
+
     return endValue;
@@ -706,5 +727,5 @@ };
   this.getEndDisableTime = function () {
-    var _state5 = _this2.state,
-        selectedValue = _state5.selectedValue,
-        value = _state5.value;
+    var _state6 = _this2.state,
+        selectedValue = _state6.selectedValue,
+        value = _state6.value;
     var disabledTime = _this2.props.disabledTime;
@@ -711,0 +732,0 @@

lib/RangeCalendar.js

@@ -153,3 +153,4 @@ 'use strict';
       showTimePicker: false,
-      mode: props.mode || ['date', 'date']
+      mode: props.mode || ['date', 'date'],
+      panelTriggerSource: '' // Trigger by which picker panel: 'start' & 'end'
     };
@@ -231,6 +232,2 @@ return _this;
 
-    // console.warn('Render:', selectedValue.map(t => t.format('YYYY-MM-DD')).join(', '));
-    // console.log('start:', startValue.format('YYYY-MM-DD'));
-    // console.log('end:', endValue.format('YYYY-MM-DD'));
-
     var extraFooter = props.renderFooter();
@@ -695,7 +692,9 @@
     var newMode = [mode, state.mode[1]];
+    var newState = {
+      panelTriggerSource: 'start'
+    };
     if (!('mode' in props)) {
-      _this2.setState({
-        mode: newMode
-      });
+      newState.mode = newMode;
     }
+    _this2.setState(newState);
     var newValue = [value || state.value[0], state.value[1]];
@@ -710,7 +709,9 @@ props.onPanelChange(newValue, newMode);
     var newMode = [state.mode[0], mode];
+    var newState = {
+      panelTriggerSource: 'end'
+    };
     if (!('mode' in props)) {
-      _this2.setState({
-        mode: newMode
-      });
+      newState.mode = newMode;
     }
+    _this2.setState(newState);
     var newValue = [state.value[0], value || state.value[1]];
@@ -721,20 +722,34 @@ props.onPanelChange(newValue, newMode);
   this.getStartValue = function () {
-    var value = _this2.state.value[0];
-    var selectedValue = _this2.state.selectedValue;
+    var _state4 = _this2.state,
+        selectedValue = _state4.selectedValue,
+        showTimePicker = _state4.showTimePicker,
+        value = _state4.value,
+        mode = _state4.mode,
+        panelTriggerSource = _state4.panelTriggerSource;
+
+    var startValue = value[0];
     // keep selectedTime when select date
     if (selectedValue[0] && _this2.props.timePicker) {
-      value = value.clone();
-      (0, _util.syncTime)(selectedValue[0], value);
+      startValue = startValue.clone();
+      (0, _util.syncTime)(selectedValue[0], startValue);
     }
-    if (_this2.state.showTimePicker && selectedValue[0]) {
-      return selectedValue[0];
+    if (showTimePicker && selectedValue[0]) {
+      startValue = selectedValue[0];
     }
-    return value;
+
+    // Adjust month if date not align
+    if (panelTriggerSource === 'end' && mode[0] === 'date' && mode[1] === 'date' && startValue.isSame(value[1], 'month')) {
+      startValue = startValue.clone().subtract(1, 'month');
+    }
+
+    return startValue;
   };
 
   this.getEndValue = function () {
-    var _state4 = _this2.state,
-        value = _state4.value,
-        selectedValue = _state4.selectedValue,
-        showTimePicker = _state4.showTimePicker;
+    var _state5 = _this2.state,
+        value = _state5.value,
+        selectedValue = _state5.selectedValue,
+        showTimePicker = _state5.showTimePicker,
+        mode = _state5.mode,
+        panelTriggerSource = _state5.panelTriggerSource;
 
@@ -747,4 +762,10 @@ var endValue = value[1] ? value[1].clone() : value[0].clone().add(1, 'month');
     if (showTimePicker) {
-      return selectedValue[1] ? selectedValue[1] : _this2.getStartValue();
+      endValue = selectedValue[1] ? selectedValue[1] : _this2.getStartValue();
     }
+
+    // Adjust month if date not align
+    if (panelTriggerSource !== 'end' && mode[0] === 'date' && mode[1] === 'date' && endValue.isSame(value[0], 'month')) {
+      endValue = endValue.clone().add(1, 'month');
+    }
+
     return endValue;
@@ -754,5 +775,5 @@ };
   this.getEndDisableTime = function () {
-    var _state5 = _this2.state,
-        selectedValue = _state5.selectedValue,
-        value = _state5.value;
+    var _state6 = _this2.state,
+        selectedValue = _state6.selectedValue,
+        value = _state6.value;
     var disabledTime = _this2.props.disabledTime;
@@ -759,0 +780,0 @@

package.json

 {
   "name": "rc-calendar",
-  "version": "9.12.3",
+  "version": "9.12.4",
   "description": "React Calendar",
@@ -5,0 +5,0 @@ "keywords": [

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1527381

increased by0.1%

Lines of code

23233

increased by0.15%

No dependency changes