rsuite 5.64.0 → 5.64.1

package/esm/DateInput/DateField.js

@@ -166,7 +166,7 @@ export var useDateField = function useDateField(format, localize, date) {
       hour = dateField.hour,
       minute = dateField.minute,
       second = dateField.second;
-    var date = new Date(year || 0, typeof month === 'number' ? month - 1 : 0,
+    var date = new Date(year || 0, typeof month === 'number' ? Math.max(month - 1, 0) : 0,
     // The default day is 1 when the value is null, otherwise it becomes the last day of the month.
     day || 1, hour || 0, minute || 0, second || 0);
     if (typeof type === 'undefined' || typeof value === 'undefined') {
@@ -179,7 +179,7 @@ export var useDateField = function useDateField(format, localize, date) {
 
       // Invalid Date
       return new Date('');
-    } else if (type === 'day' && value === 0) {
+    } else if ((type === 'day' || type === 'month') && value === 0) {
       // Invalid Date. If the type is day and the value is 0, it is considered an invalid date.
       return new Date('');
     }

package/esm/DateInput/DateInput.js

@@ -54,6 +54,7 @@ var DateInput = /*#__PURE__*/React.forwardRef(function (props, ref) {
     isEmptyValue = _useDateInputState.isEmptyValue;
   var _useFieldCursor = useFieldCursor(formatStr, valueProp),
     isMoveCursor = _useFieldCursor.isMoveCursor,
+    isResetValue = _useFieldCursor.isResetValue,
     increment = _useFieldCursor.increment,
     reset = _useFieldCursor.reset;
   var dateString = toDateString();
@@ -80,7 +81,11 @@ var DateInput = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }));
     setSelectedState(state);
     setSelectionRange(state.selectionStart, state.selectionEnd);
-    reset();
+
+    // If the selected field changes, reset the input state
+    if (selectedState.selectedPattern !== state.selectedPattern) {
+      reset();
+    }
   });
   var onSegmentValueChange = useEventCallback(function (event) {
     var input = event.target;
@@ -103,14 +108,12 @@ var DateInput = /*#__PURE__*/React.forwardRef(function (props, ref) {
     if (!pattern) {
       return;
     }
-    increment();
     var field = getDateField(pattern);
     var value = parseInt(key, 10);
     var padValue = parseInt("" + (field.value || '') + key, 10);
     var newValue = value;
-
-    // Check if the value entered by the user is a valid date
-    if (validateDateTime(field.name, padValue)) {
+    if (validateDateTime(field.name, padValue) && !isResetValue()) {
+      // Check if the value entered by the user is a valid date
       newValue = padValue;
     }
     setDateField(pattern, newValue, function (date) {
@@ -126,6 +129,7 @@ var DateInput = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }));
     setSelectedState(nextState);
     setSelectionRange(nextState.selectionStart, nextState.selectionEnd);
+    increment();
 
     // If the field is full value, move the cursor to the next field
     if (isMoveCursor(newValue, pattern) && input.selectionEnd !== input.value.length) {
@@ -154,6 +158,9 @@ var DateInput = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }));
     setSelectedState(state);
     setSelectionRange(state.selectionStart, state.selectionEnd);
+    if (selectedState.selectedPattern !== state.selectedPattern) {
+      reset();
+    }
   });
   var onKeyboardInput = useKeyboardInputEvent({
     onSegmentChange: onSegmentChange,

package/esm/DateInput/hooks/useFieldCursor.d.ts

@@ -2,5 +2,6 @@ export declare function useFieldCursor<V = Date | null>(format: string, value?:
     increment: () => void;
     reset: () => void;
     isMoveCursor: (value: number, pattern: string) => boolean;
+    isResetValue: () => boolean;
 };
 export default useFieldCursor;

package/esm/DateInput/hooks/useFieldCursor.js

@@ -4,12 +4,17 @@ import { getPatternGroups } from "../utils.js";
 import { useUpdateEffect } from "../../internals/hooks/index.js";
 export function useFieldCursor(format, value) {
   var typeCount = useRef(0);
-  var increment = function increment() {
+  var increment = useCallback(function () {
     typeCount.current += 1;
-  };
-  var reset = function reset() {
+  }, []);
+  var reset = useCallback(function () {
     typeCount.current = 0;
-  };
+  }, []);
+  var isResetValue = useCallback(function () {
+    return typeCount.current === 0;
+  }, []);
+
+  // Check if the cursor should move to the next field
   var isMoveCursor = useCallback(function (value, pattern) {
     var patternGroup = getPatternGroups(format, pattern);
     if (value.toString().length === patternGroup.length) {
@@ -43,7 +48,8 @@ export function useFieldCursor(format, value) {
   return {
     increment: increment,
     reset: reset,
-    isMoveCursor: isMoveCursor
+    isMoveCursor: isMoveCursor,
+    isResetValue: isResetValue
   };
 }
 export default useFieldCursor;

package/esm/DateRangeInput/DateRangeInput.js

@@ -63,6 +63,7 @@ var DateRangeInput = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }));
   var _useFieldCursor = useFieldCursor(formatStr, valueProp),
     isMoveCursor = _useFieldCursor.isMoveCursor,
+    isResetValue = _useFieldCursor.isResetValue,
     increment = _useFieldCursor.increment,
     reset = _useFieldCursor.reset;
   var getActiveState = function getActiveState(type) {
@@ -120,7 +121,11 @@ var DateRangeInput = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }));
     setSelectedState(state);
     setSelectionRange(state.selectionStart, state.selectionEnd);
-    reset();
+
+    // If the selected field changes, reset the input state
+    if (selectedState.selectedPattern !== state.selectedPattern) {
+      reset();
+    }
   });
   var onSegmentValueChange = useEventCallback(function (event) {
     var input = event.target;
@@ -143,14 +148,13 @@ var DateRangeInput = /*#__PURE__*/React.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);
     var newValue = value;
 
     // Check if the value entered by the user is a valid date
-    if (validateDateTime(field.name, padValue)) {
+    if (validateDateTime(field.name, padValue) && !isResetValue()) {
       newValue = padValue;
     }
     getActiveState().setDateField(pattern, newValue, function (date) {
@@ -166,6 +170,7 @@ var DateRangeInput = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }));
     setSelectedState(nextState);
     setSelectionRange(nextState.selectionStart, nextState.selectionEnd);
+    increment();
 
     // If the field is full value, move the cursor to the next field
     if (isMoveCursor(newValue, pattern) && input.selectionEnd !== input.value.length) {
@@ -202,6 +207,9 @@ var DateRangeInput = /*#__PURE__*/React.forwardRef(function (props, ref) {
     setDateType(dateType);
     setSelectedState(state);
     setSelectionRange(state.selectionStart, state.selectionEnd);
+    if (selectedState.selectedPattern !== state.selectedPattern) {
+      reset();
+    }
   });
   var onKeyboardInput = useKeyboardInputEvent({
     onSegmentChange: onSegmentChange,

package/esm/Drawer/Drawer.d.ts

@@ -6,7 +6,7 @@ import DrawerHeader from './DrawerHeader';
 import DrawerActions from './DrawerActions';
 import DrawerFooter from './DrawerFooter';
 import DrawerTitle from './DrawerTitle';
-export interface DrawerProps extends ModalProps {
+export interface DrawerProps extends Omit<ModalProps, 'overflow'> {
     /** The placement of Drawer */
     placement?: TypeAttributes.Placement4;
     /** Custom close button */

package/esm/Modal/Modal.js

@@ -86,7 +86,6 @@ var Modal = /*#__PURE__*/React.forwardRef(function (props, ref) {
   // The style of the Modal body will be updated with the size of the window or container.
   var _useBodyStyles = useBodyStyles(dialogRef, {
       overflow: overflow,
-      drawer: isDrawer,
       prefix: prefix,
       size: size
     }),

package/esm/Modal/utils.d.ts

@@ -3,7 +3,6 @@ import { TypeAttributes } from '../internals/types';
 export type ModalSize = TypeAttributes.Size | 'full' | number | string;
 export declare const useBodyStyles: (ref: React.RefObject<HTMLElement>, options: {
     overflow: boolean;
-    drawer: boolean;
     size?: ModalSize | undefined;
     prefix: (...classes: any) => string;
 }) => [import("react").CSSProperties | null, (entering?: boolean) => void, () => void];

package/esm/Modal/utils.js

@@ -8,7 +8,6 @@ export var useBodyStyles = function useBodyStyles(ref, options) {
     bodyStyles = _useState[0],
     setBodyStyles = _useState[1];
   var overflow = options.overflow,
-    drawer = options.drawer,
     prefix = options.prefix,
     size = options.size;
   var windowResizeListener = useRef();
@@ -47,11 +46,11 @@ export var useBodyStyles = function useBodyStyles(ref, options) {
     contentElementResizeObserver.current = null;
   }, []);
   var onChangeBodyStyles = useCallback(function (entering) {
-    if (drawer || size === 'full') {
+    if (!overflow || size === 'full') {
       setBodyStyles(null);
       return;
     }
-    if (overflow && ref.current) {
+    if (ref.current) {
       updateBodyStyles(undefined, entering);
       contentElement.current = ref.current.querySelector("." + prefix('content'));
       if (!windowResizeListener.current) {
@@ -64,7 +63,7 @@ export var useBodyStyles = function useBodyStyles(ref, options) {
         contentElementResizeObserver.current.observe(contentElement.current);
       }
     }
-  }, [drawer, overflow, prefix, ref, size, updateBodyStyles]);
+  }, [overflow, prefix, ref, size, updateBodyStyles]);
   useEffect(function () {
     return onDestroyEvents;
     // eslint-disable-next-line react-hooks/exhaustive-deps

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsuite",
-  "version": "5.64.0",
+  "version": "5.64.1",
   "description": "A suite of react components",
   "main": "cjs/index.js",
   "module": "esm/index.js",
@@ -38,7 +38,8 @@
     "prop-types": "^15.8.1",
     "react-use-set": "^1.0.0",
     "react-window": "^1.8.8",
-    "rsuite-table": "^5.18.2",
+    "rsuite": "^5.64.0",
+    "rsuite-table": "^5.18.3",
     "schema-typed": "^2.2.2"
   },
   "peerDependencies": {