rsuite 5.60.1 → 5.60.2

package/cjs/DateInput/utils.js

@@ -10,7 +10,6 @@ exports.isCursorAfterMonth = isCursorAfterMonth;
 exports.getInputSelectedState = getInputSelectedState;
 exports.validateDateTime = validateDateTime;
 exports.modifyDate = modifyDate;
-exports.isFieldFullValue = isFieldFullValue;
 exports.useInputSelection = useInputSelection;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _dateUtils = require("../utils/dateUtils");
@@ -228,31 +227,10 @@ function modifyDate(date, type, value) {
   }
   return date;
 }
-function isFieldFullValue(formatStr, value, pattern) {
-  var patternGroup = getPatternGroups(formatStr, pattern);
-  if (value.toString().length === patternGroup.length) {
-    return true;
-  }
-  switch (pattern) {
-    case 'M':
-      return parseInt(value + "0") > 12;
-    case 'd':
-      return parseInt(value + "0") > 31;
-    case 'H':
-      return parseInt(value + "0") > 23;
-    case 'h':
-      return parseInt(value + "0") > 12;
-    case 'm':
-    case 's':
-      return parseInt(value + "0") > 59;
-    default:
-      return false;
-  }
-}
-var isTestEnvironment = typeof process !== 'undefined' && undefined === 'test';
 function useInputSelection(input) {
   return function setSelectionRange(selectionStart, selectionEnd) {
-    if (isTestEnvironment) {
+    var isTest = input.current.dataset.test === 'true';
+    if (isTest) {
       (0, _utils.safeSetSelection)(input.current, selectionStart, selectionEnd);
       return;
     }

package/cjs/DateRangeInput/DateRangeInput.js

@@ -40,13 +40,9 @@ var DateRangeInput = /*#__PURE__*/_react.default.forwardRef(function (props, ref
     merge = _useClassNames.merge;
   var classes = merge(className, withClassPrefix());
   var inputRef = (0, _react.useRef)();
-  var _useState = (0, _react.useState)({
-      selectedPattern: 'y',
-      selectionStart: 0,
-      selectionEnd: 0
-    }),
-    selectedState = _useState[0],
-    setSelectedState = _useState[1];
+  var _useSelectedState = (0, _DateInput.useSelectedState)(),
+    selectedState = _useSelectedState.selectedState,
+    setSelectedState = _useSelectedState.setSelectedState;
   var _useCustom = (0, _utils.useCustom)('Calendar'),
     locale = _useCustom.locale;
   var rangeFormatStr = "" + formatStr + character + formatStr;
@@ -55,9 +51,9 @@ var DateRangeInput = /*#__PURE__*/_react.default.forwardRef(function (props, ref
     value = _useControlled[0],
     setValue = _useControlled[1],
     isControlled = _useControlled[2];
-  var _useState2 = (0, _react.useState)(_utils2.DateType.Start),
-    dateType = _useState2[0],
-    setDateType = _useState2[1];
+  var _useState = (0, _react.useState)(_utils2.DateType.Start),
+    dateType = _useState[0],
+    setDateType = _useState[1];
   var dateInputOptions = {
     formatStr: formatStr,
     locale: dateLocale,
@@ -69,6 +65,10 @@ var DateRangeInput = /*#__PURE__*/_react.default.forwardRef(function (props, ref
   var endDateState = (0, _DateInput.useDateInputState)((0, _extends2.default)({}, dateInputOptions, {
     date: (value === null || value === void 0 ? void 0 : value[1]) || null
   }));
+  var _useFieldCursor = (0, _DateInput.useFieldCursor)(formatStr, valueProp),
+    isMoveCursor = _useFieldCursor.isMoveCursor,
+    increment = _useFieldCursor.increment,
+    reset = _useFieldCursor.reset;
   var getActiveState = function getActiveState(type) {
     if (type === void 0) {
       type = dateType;
@@ -122,8 +122,9 @@ var DateRangeInput = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       input: input,
       direction: direction
     }));
-    setSelectionRange(state.selectionStart, state.selectionEnd);
     setSelectedState(state);
+    setSelectionRange(state.selectionStart, state.selectionEnd);
+    reset();
   });
   var onSegmentValueChange = (0, _utils.useEventCallback)(function (event) {
     var input = event.target;
@@ -146,6 +147,7 @@ var DateRangeInput = /*#__PURE__*/_react.default.forwardRef(function (props, ref
     if (!pattern) {
       return;
     }
+    increment();
     var field = getActiveState().getDateField(pattern);
     var value = parseInt(key, 10);
     var padValue = parseInt("" + (field.value || '') + key, 10);
@@ -155,10 +157,6 @@ var DateRangeInput = /*#__PURE__*/_react.default.forwardRef(function (props, ref
     if ((0, _DateInput.validateDateTime)(field.name, padValue)) {
       newValue = padValue;
     }
-    if (pattern === 'M') {
-      // Month cannot be less than 1.
-      newValue = Math.max(1, newValue);
-    }
     getActiveState().setDateField(pattern, newValue, function (date) {
       return handleChange(date, event);
     });
@@ -174,7 +172,7 @@ var DateRangeInput = /*#__PURE__*/_react.default.forwardRef(function (props, ref
     setSelectionRange(nextState.selectionStart, nextState.selectionEnd);
 
     // If the field is full value, move the cursor to the next field
-    if ((0, _DateInput.isFieldFullValue)(formatStr, newValue, pattern) && input.selectionEnd !== input.value.length) {
+    if (isMoveCursor(newValue, pattern) && input.selectionEnd !== input.value.length) {
       onSegmentChange(event, 'right');
     }
   });
@@ -190,6 +188,7 @@ var DateRangeInput = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       getActiveState().setDateField(selectedState.selectedPattern, null, function (date) {
         return handleChange(date, event);
       });
+      reset();
     }
   });
   var handleClick = (0, _utils.useEventCallback)(function (event) {
@@ -198,7 +197,7 @@ var DateRangeInput = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       return;
     }
     var cursorIndex = input.selectionStart === renderedValue.length ? 0 : input.selectionStart;
-    var dateType = (0, _utils2.getDateType)(renderedValue, character, cursorIndex);
+    var dateType = (0, _utils2.getDateType)(renderedValue || rangeFormatStr, character, cursorIndex);
     var state = (0, _utils2.getInputSelectedState)((0, _extends2.default)({}, keyPressOptions, {
       dateType: dateType,
       selectedMonth: getActiveState(dateType).dateField.month,

package/dist/rsuite-no-reset-rtl.css

@@ -4487,6 +4487,7 @@ label:hover .rs-checkbox-control .rs-checkbox-inner::before {
 .rs-picker-date .rs-input-group-addon {
   color: #8e8e93;
   color: var(--rs-text-secondary);
+  cursor: pointer;
 }
 .rs-picker-date .rs-input-group-addon .rs-btn-close {
   padding: 0;
@@ -4627,6 +4628,7 @@ label:hover .rs-checkbox-control .rs-checkbox-inner::before {
 .rs-picker-daterange .rs-input-group-addon {
   color: #8e8e93;
   color: var(--rs-text-secondary);
+  cursor: pointer;
 }
 .rs-picker-daterange .rs-input-group-addon .rs-btn-close {
   padding: 0;
@@ -13190,7 +13192,7 @@ textarea.rs-inline-edit-sm .rs-plaintext {
 }
 .rs-slider-disabled .rs-slider-bar,
 .rs-slider-disabled .rs-slider-handle::before {
-  cursor: not-allowed;
+  pointer-events: none;
 }
 .rs-slider-with-mark:not(.rs-slider-vertical) {
   margin-bottom: 29px;
@@ -14620,7 +14622,12 @@ textarea.rs-inline-edit-sm .rs-plaintext {
   display: none;
 }
 .rs-toggle-inner {
-  display: block;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
   -webkit-transition: margin 0.15s ease-out;
   transition: margin 0.15s ease-out;
 }