rsuite 5.49.0 → 5.51.0

package/cjs/DateRangePicker/types.d.ts

@@ -9,12 +9,20 @@ export interface RangeType<T = DateRange> {
     placement?: 'bottom' | 'left';
 }
 export declare type DisabledDateFunction = (
-/** Date used to determine if disabling is required. */
+/**
+ * Date used to determine if disabling is required.
+ */
 date: Date, 
-/** Date selected. */
+/**
+ * Date selected.
+ */
 selectDate?: ValueType, 
 /**
  * Whether to choose to finish now.
  * If `false`, only the start date is selected, waiting for the selection end date.
  */
-selectedDone?: boolean, target?: DATERANGE_DISABLED_TARGET) => boolean;
+selectedDone?: boolean, 
+/**
+ * Call the target of the `shouldDisableDate` function.
+ */
+target?: DATERANGE_DISABLED_TARGET) => boolean;

package/cjs/DateRangePicker/utils.d.ts

@@ -1,7 +1,8 @@
 import { DateRange } from './types';
-export declare function getSafeCalendarDate({ value, calendarKey }: {
+export declare function getSafeCalendarDate({ value, calendarKey, allowAameMonth }: {
     value: [] | [Date] | [Date, Date] | null;
     calendarKey?: 'start' | 'end';
+    allowAameMonth?: boolean;
 }): DateRange;
 export declare const isSameRange: (source: DateRange | null, dest: DateRange | null, format: string) => boolean;
 export declare const getMonthHoverRange: (date: Date) => DateRange;

package/cjs/DateRangePicker/utils.js

@@ -9,29 +9,31 @@ function getSafeCalendarDate(_ref) {
   var _value;
   var value = _ref.value,
     _ref$calendarKey = _ref.calendarKey,
-    calendarKey = _ref$calendarKey === void 0 ? 'start' : _ref$calendarKey;
+    calendarKey = _ref$calendarKey === void 0 ? 'start' : _ref$calendarKey,
+    allowAameMonth = _ref.allowAameMonth;
   // Update calendarDate if the value is not null
   value = (_value = value) !== null && _value !== void 0 ? _value : [];
+  var gap = allowAameMonth ? 0 : 1;
   if (value[0] && value[1]) {
     var diffMonth = (0, _dateUtils.differenceInCalendarMonths)(value[1], value[0]);
     if (calendarKey === 'start') {
       return [value[0], diffMonth <= 0 ? (0, _dateUtils.copyTime)({
         from: value[1],
-        to: (0, _dateUtils.addMonths)(value[0], 1)
+        to: (0, _dateUtils.addMonths)(value[0], gap)
       }) : value[1]];
     } else if (calendarKey === 'end') {
       return [diffMonth <= 0 ? (0, _dateUtils.copyTime)({
         from: value[0],
-        to: (0, _dateUtils.addMonths)(value[1], -1)
+        to: (0, _dateUtils.addMonths)(value[1], -gap)
       }) : value[0], value[1]];
     }
 
     // If only the start date
   } else if (value[0]) {
-    return [value[0], (0, _dateUtils.addMonths)(value[0], 1)];
+    return [value[0], (0, _dateUtils.addMonths)(value[0], gap)];
   }
   var todayDate = new Date();
-  return [todayDate, (0, _dateUtils.addMonths)(todayDate, 1)];
+  return [todayDate, (0, _dateUtils.addMonths)(todayDate, gap)];
 }
 var isSameRange = function isSameRange(source, dest, format) {
   // If both are null, reguard as same

package/cjs/Form/Form.d.ts

@@ -32,6 +32,20 @@ export interface FormProps<T = Record<string, any>, errorMsgType = any, E = {
     disabled?: boolean;
     /** The error message comes from context */
     errorFromContext?: boolean;
+    /**
+     * The form data is nested.
+     * You may now nest fields with "dot syntax" (e.g. address.city).
+     *
+     * @default false
+     * @version v5.51.0
+     * @example
+     * ```jsx
+     * <Form formValue={{ address: { city: 'Shanghai' } }} nestedField>
+     *  <FormControl name="address.city" />
+     * </Form>
+     * ```
+     */
+    nestedField?: boolean;
     /** Callback fired when data changing */
     onChange?: (formValue: T, event?: React.SyntheticEvent) => void;
     /** Callback fired when error checking */

package/cjs/Form/Form.js

@@ -10,6 +10,7 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _omit = _interopRequireDefault(require("lodash/omit"));
+var _set = _interopRequireDefault(require("lodash/set"));
 var _schemaTyped = require("schema-typed");
 var _FormContext = _interopRequireWildcard(require("./FormContext"));
 var _FormControl = _interopRequireDefault(require("../FormControl"));
@@ -36,6 +37,8 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     formValue = props.formValue,
     formError = props.formError,
     fluid = props.fluid,
+    _props$nestedField = props.nestedField,
+    nestedField = _props$nestedField === void 0 ? false : _props$nestedField,
     _props$layout = props.layout,
     layout = _props$layout === void 0 ? 'vertical' : _props$layout,
     _props$model = props.model,
@@ -49,7 +52,7 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     onCheck = props.onCheck,
     onError = props.onError,
     onChange = props.onChange,
-    rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["checkTrigger", "classPrefix", "errorFromContext", "formDefaultValue", "formValue", "formError", "fluid", "layout", "model", "readOnly", "plaintext", "className", "children", "disabled", "onSubmit", "onCheck", "onError", "onChange"]);
+    rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["checkTrigger", "classPrefix", "errorFromContext", "formDefaultValue", "formValue", "formError", "fluid", "nestedField", "layout", "model", "readOnly", "plaintext", "className", "children", "disabled", "onSubmit", "onCheck", "onError", "onChange"]);
   var _useSchemaModel = (0, _useSchemaModel2.default)(formModel),
     getCombinedModel = _useSchemaModel.getCombinedModel,
     pushFieldRule = _useSchemaModel.pushFieldRule,
@@ -79,7 +82,7 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
    * The error message after verification is returned in the callback.
    * @param callback
    */
-  var check = (0, _react.useCallback)(function (callback) {
+  var check = (0, _utils.useEventCallback)(function (callback) {
     var formValue = realFormValue || {};
     var formError = {};
     var errorCount = 0;
@@ -99,14 +102,14 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       return false;
     }
     return true;
-  }, [realFormValue, getCombinedModel, setFormError, onCheck, onError]);
+  });
 
   /**
    * Check the data field
    * @param fieldName
    * @param callback
    */
-  var checkForField = (0, _react.useCallback)(function (fieldName, callback) {
+  var checkForField = (0, _utils.useEventCallback)(function (fieldName, callback) {
     var _extends2;
     var formValue = realFormValue || {};
     var model = getCombinedModel();
@@ -119,12 +122,12 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       onError === null || onError === void 0 ? void 0 : onError(formError);
     }
     return !checkResult.hasError;
-  }, [realFormValue, getCombinedModel, realFormError, setFormError, onCheck, onError]);
+  });
 
   /**
    * Check form data asynchronously and return a Promise
    */
-  var checkAsync = (0, _react.useCallback)(function () {
+  var checkAsync = (0, _utils.useEventCallback)(function () {
     var formValue = realFormValue || {};
     var promises = [];
     var keys = [];
@@ -152,13 +155,13 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
         formError: formError
       };
     });
-  }, [realFormValue, getCombinedModel, onCheck, setFormError, onError]);
+  });
 
   /**
    * Asynchronously check form fields and return Promise
    * @param fieldName
    */
-  var checkForFieldAsync = (0, _react.useCallback)(function (fieldName) {
+  var checkForFieldAsync = (0, _utils.useEventCallback)(function (fieldName) {
     var formValue = realFormValue || {};
     var model = getCombinedModel();
     return model.checkForFieldAsync(fieldName, formValue).then(function (checkResult) {
@@ -171,19 +174,19 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       }
       return checkResult;
     });
-  }, [realFormValue, getCombinedModel, realFormError, onCheck, setFormError, onError]);
-  var cleanErrors = (0, _react.useCallback)(function () {
+  });
+  var cleanErrors = (0, _utils.useEventCallback)(function () {
     setFormError({});
-  }, [setFormError]);
-  var cleanErrorForField = (0, _react.useCallback)(function (fieldName) {
+  });
+  var cleanErrorForField = (0, _utils.useEventCallback)(function (fieldName) {
     setFormError((0, _omit.default)(realFormError, [fieldName]));
-  }, [realFormError, setFormError]);
-  var resetErrors = (0, _react.useCallback)(function (formError) {
+  });
+  var resetErrors = (0, _utils.useEventCallback)(function (formError) {
     if (formError === void 0) {
       formError = {};
     }
     setFormError(formError);
-  }, [setFormError]);
+  });
   (0, _react.useImperativeHandle)(ref, function () {
     return {
       root: rootRef.current,
@@ -196,7 +199,7 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       resetErrors: resetErrors
     };
   });
-  var removeFieldError = (0, _react.useCallback)(function (name) {
+  var removeFieldError = (0, _utils.useEventCallback)(function (name) {
     /**
      * when this function is called when the children component is unmount, it's an old render frame
      * so use Ref to get future error
@@ -205,8 +208,8 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     realFormErrorRef.current = formError;
     setFormError(formError);
     onCheck === null || onCheck === void 0 ? void 0 : onCheck(formError);
-  }, [onCheck, setFormError]);
-  var removeFieldValue = (0, _react.useCallback)(function (name) {
+  });
+  var removeFieldValue = (0, _utils.useEventCallback)(function (name) {
     /**
      * when this function is called when the children component is unmount, it's an old render frame
      * so use Ref to get future value
@@ -215,8 +218,8 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     realFormValueRef.current = formValue;
     setFormValue(formValue);
     onChange === null || onChange === void 0 ? void 0 : onChange(formValue);
-  }, [onChange, setFormValue]);
-  var handleSubmit = (0, _react.useCallback)(function (event) {
+  });
+  var handleSubmit = (0, _utils.useEventCallback)(function (event) {
     if (disabled || readOnly || plaintext) {
       return;
     }
@@ -224,24 +227,29 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     event.stopPropagation();
     var checkStatus = check();
     onSubmit === null || onSubmit === void 0 ? void 0 : onSubmit(checkStatus, event);
-  }, [disabled, readOnly, plaintext, check, onSubmit]);
-  var handleFieldError = (0, _react.useCallback)(function (name, errorMessage) {
+  });
+  var handleFieldError = (0, _utils.useEventCallback)(function (name, errorMessage) {
     var _extends4;
     var formError = (0, _extends6.default)({}, realFormError, (_extends4 = {}, _extends4[name] = errorMessage, _extends4));
     setFormError(formError);
     onError === null || onError === void 0 ? void 0 : onError(formError);
     onCheck === null || onCheck === void 0 ? void 0 : onCheck(formError);
-  }, [realFormError, setFormError, onError, onCheck]);
-  var handleFieldSuccess = (0, _react.useCallback)(function (name) {
+  });
+  var handleFieldSuccess = (0, _utils.useEventCallback)(function (name) {
     removeFieldError(name);
-  }, [removeFieldError]);
-  var handleFieldChange = (0, _react.useCallback)(function (name, value, event) {
+  });
+  var setFieldValue = function setFieldValue(formValue, fieldName, fieldValue) {
     var _extends5;
-    var formValue = realFormValue;
-    var nextFormValue = (0, _extends6.default)({}, formValue, (_extends5 = {}, _extends5[name] = value, _extends5));
+    if (nestedField) {
+      return (0, _set.default)((0, _extends6.default)({}, formValue), fieldName, fieldValue);
+    }
+    return (0, _extends6.default)({}, formValue, (_extends5 = {}, _extends5[fieldName] = fieldValue, _extends5));
+  };
+  var handleFieldChange = (0, _utils.useEventCallback)(function (name, value, event) {
+    var nextFormValue = setFieldValue(realFormValue, name, value);
     setFormValue(nextFormValue);
     onChange === null || onChange === void 0 ? void 0 : onChange(nextFormValue, event);
-  }, [realFormValue, setFormValue, onChange]);
+  });
   var rootRef = (0, _react.useRef)(null);
   var formContextValue = (0, _react.useMemo)(function () {
     return {
@@ -252,6 +260,7 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       plaintext: plaintext,
       disabled: disabled,
       formError: realFormError,
+      nestedField: nestedField,
       removeFieldValue: removeFieldValue,
       removeFieldError: removeFieldError,
       pushFieldRule: pushFieldRule,
@@ -260,7 +269,7 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       onFieldError: handleFieldError,
       onFieldSuccess: handleFieldSuccess
     };
-  }, [getCombinedModel, checkTrigger, errorFromContext, readOnly, plaintext, disabled, realFormError, removeFieldValue, removeFieldError, pushFieldRule, removeFieldRule, handleFieldChange, handleFieldError, handleFieldSuccess]);
+  }, [getCombinedModel, checkTrigger, errorFromContext, readOnly, plaintext, disabled, realFormError, nestedField, removeFieldValue, removeFieldError, pushFieldRule, removeFieldRule, handleFieldChange, handleFieldError, handleFieldSuccess]);
   return /*#__PURE__*/_react.default.createElement("form", (0, _extends6.default)({}, rest, {
     ref: rootRef,
     onSubmit: handleSubmit,

package/cjs/Form/FormContext.d.ts

@@ -7,6 +7,7 @@ interface TrulyFormContextValue<T = Record<string, any>, errorMsgType = any, E =
 }> {
     getCombinedModel: () => Schema;
     formError: E;
+    nestedField: boolean;
     removeFieldValue: (name: string) => void;
     removeFieldError: (name: string) => void;
     pushFieldRule: (name: string, fieldRule: FieldRuleType) => void;

package/cjs/FormControl/FormControl.d.ts

@@ -9,7 +9,17 @@ export declare type FormControlAccepterProps<ValueType = any> = FormControlBaseP
 export interface FormControlProps<P = any, ValueType = any> extends WithAsProps, Omit<React.HTMLAttributes<HTMLFormElement>, 'value' | 'onChange'> {
     /** Proxied components */
     accepter?: React.ElementType<P & FormControlBaseProps<ValueType>>;
-    /** The name of form-control */
+    /**
+     * The name of form-control, support nested path. such as `address.city`.
+     * The path will be used to get and set form values.
+     *
+     * @example
+     * ```js
+     * <Form formValue={{ address: { city: 'Shanghai' } }}>
+     *   <FormControl name="address.city" />
+     * </Form>
+     * ```
+     **/
     name: string;
     /** Value */
     value?: ValueType;

package/cjs/FormControl/FormControl.js

@@ -11,6 +11,8 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _isUndefined = _interopRequireDefault(require("lodash/isUndefined"));
+var _get = _interopRequireDefault(require("lodash/get"));
+var _set = _interopRequireDefault(require("lodash/set"));
 var _Input = _interopRequireDefault(require("../Input"));
 var _FormErrorMessage = _interopRequireDefault(require("../FormErrorMessage"));
 var _utils = require("../utils");
@@ -35,6 +37,7 @@ var FormControl = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     disabledContext = _useContext.disabled,
     errorFromContext = _useContext.errorFromContext,
     formError = _useContext.formError,
+    nestedField = _useContext.nestedField,
     removeFieldValue = _useContext.removeFieldValue,
     removeFieldError = _useContext.removeFieldError,
     pushFieldRule = _useContext.pushFieldRule,
@@ -84,47 +87,67 @@ var FormControl = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   });
   var trigger = checkTrigger || contextCheckTrigger;
   var formValue = (0, _react.useContext)(_FormContext.FormValueContext);
-  var val = (0, _isUndefined.default)(value) ? formValue === null || formValue === void 0 ? void 0 : formValue[name] : value;
+  var getFieldValue = function getFieldValue(fieldName) {
+    if (!(0, _isUndefined.default)(value)) {
+      return value;
+    }
+    return nestedField ? (0, _get.default)(formValue, fieldName) : formValue === null || formValue === void 0 ? void 0 : formValue[name];
+  };
+  var setFieldValue = function setFieldValue(fieldName, fieldValue) {
+    var _extends2;
+    if (nestedField) {
+      return (0, _set.default)((0, _extends3.default)({}, formValue), fieldName, fieldValue);
+    }
+    return (0, _extends3.default)({}, formValue, (_extends2 = {}, _extends2[fieldName] = fieldValue, _extends2));
+  };
+  var getFieldError = function getFieldError(fieldName) {
+    if (nestedField) {
+      var _name = fieldName.includes('.') ? fieldName.replace('.', '.object.') + '.errorMessage' : fieldName;
+      return (0, _get.default)(formError, _name);
+    }
+    return formError === null || formError === void 0 ? void 0 : formError[fieldName];
+  };
+  var fieldValue = getFieldValue(name);
   var _useClassNames = (0, _utils.useClassNames)(classPrefix),
     withClassPrefix = _useClassNames.withClassPrefix,
     prefix = _useClassNames.prefix;
   var classes = withClassPrefix('wrapper');
-  var handleFieldChange = function handleFieldChange(value, event) {
+  var handleFieldChange = (0, _utils.useEventCallback)(function (value, event) {
     handleFieldCheck(value, trigger === 'change');
     onFieldChange === null || onFieldChange === void 0 ? void 0 : onFieldChange(name, value, event);
     onChange === null || onChange === void 0 ? void 0 : onChange(value, event);
-  };
-  var handleFieldBlur = function handleFieldBlur(event) {
-    handleFieldCheck(val, trigger === 'blur');
+  });
+  var handleFieldBlur = (0, _utils.useEventCallback)(function (event) {
+    handleFieldCheck(fieldValue, trigger === 'blur');
     onBlur === null || onBlur === void 0 ? void 0 : onBlur(event);
-  };
-  var handleFieldCheck = function handleFieldCheck(value, isCheckTrigger) {
-    var _extends2;
+  });
+  var handleFieldCheck = (0, _utils.useEventCallback)(function (value, isCheckTrigger) {
+    var checkFieldName = nestedField ? name.split('.')[0] : name;
     var callbackEvents = function callbackEvents(checkResult) {
       // The relevant event is triggered only when the inspection is allowed.
       if (isCheckTrigger) {
         if (checkResult.hasError) {
-          onFieldError === null || onFieldError === void 0 ? void 0 : onFieldError(name, (checkResult === null || checkResult === void 0 ? void 0 : checkResult.errorMessage) || checkResult);
+          onFieldError === null || onFieldError === void 0 ? void 0 : onFieldError(checkFieldName, (checkResult === null || checkResult === void 0 ? void 0 : checkResult.errorMessage) || checkResult);
         } else {
-          onFieldSuccess === null || onFieldSuccess === void 0 ? void 0 : onFieldSuccess(name);
+          onFieldSuccess === null || onFieldSuccess === void 0 ? void 0 : onFieldSuccess(checkFieldName);
         }
       }
       return checkResult;
     };
-    var nextFormValue = (0, _extends3.default)({}, formValue, (_extends2 = {}, _extends2[name] = value, _extends2));
+    var nextFormValue = setFieldValue(name, value);
     var model = getCombinedModel();
     if (checkAsync) {
-      return model === null || model === void 0 ? void 0 : model.checkForFieldAsync(name, nextFormValue).then(function (checkResult) {
+      return model === null || model === void 0 ? void 0 : model.checkForFieldAsync(checkFieldName, nextFormValue).then(function (checkResult) {
         return callbackEvents(checkResult);
       });
     }
-    return Promise.resolve(callbackEvents(model === null || model === void 0 ? void 0 : model.checkForField(name, nextFormValue)));
-  };
+    return Promise.resolve(callbackEvents(model === null || model === void 0 ? void 0 : model.checkForField(checkFieldName, nextFormValue)));
+  });
   var messageNode = null;
   if (!(0, _isUndefined.default)(errorMessage)) {
     messageNode = errorMessage;
   } else if (errorFromContext) {
-    var fieldError = formError === null || formError === void 0 ? void 0 : formError[name];
+    var fieldError = getFieldError(name);
     if (typeof fieldError === 'string' || !(fieldError !== null && fieldError !== void 0 && fieldError.array) && !(fieldError !== null && fieldError !== void 0 && fieldError.object) && fieldError !== null && fieldError !== void 0 && fieldError.hasError) {
       messageNode = fieldError;
     }
@@ -138,7 +161,7 @@ var FormControl = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   if (AccepterComponent === _Toggle.default) {
     valueKey = 'checked';
   }
-  var accepterProps = (_accepterProps = {}, _accepterProps[valueKey] = val === undefined ? defaultValue : val, _accepterProps);
+  var accepterProps = (_accepterProps = {}, _accepterProps[valueKey] = fieldValue === undefined ? defaultValue : fieldValue, _accepterProps);
   return /*#__PURE__*/_react.default.createElement(Component, {
     className: classes,
     ref: ref,
@@ -157,7 +180,7 @@ var FormControl = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     onChange: handleFieldChange,
     onBlur: handleFieldBlur
   })), /*#__PURE__*/_react.default.createElement(_FormErrorMessage.default, {
-    id: controlId + "-error-message",
+    id: controlId ? controlId + "-error-message" : undefined,
     role: "alert",
     "aria-relevant": "all",
     show: !!messageNode,

package/cjs/FormGroup/FormGroup.js

@@ -22,13 +22,14 @@ var FormGroup = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     Component = _props$as === void 0 ? 'div' : _props$as,
     _props$classPrefix = props.classPrefix,
     classPrefix = _props$classPrefix === void 0 ? 'form-group' : _props$classPrefix,
-    controlId = props.controlId,
+    controlIdProp = props.controlId,
     className = props.className,
     rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "classPrefix", "controlId", "className"]);
   var _useClassNames = (0, _utils.useClassNames)(classPrefix),
     withClassPrefix = _useClassNames.withClassPrefix,
     merge = _useClassNames.merge;
   var classes = merge(className, withClassPrefix());
+  var controlId = (0, _utils.useUniqueId)('rs-', controlIdProp);
   var contextValue = (0, _react.useMemo)(function () {
     return {
       controlId: controlId