rsuite 5.70.0 → 5.70.2

package/Breadcrumb/styles/index.css

@@ -36,9 +36,25 @@
   color: #717273;
   color: var(--rs-text-secondary);
 }
+.rs-breadcrumb ol {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-wrap: wrap;
+      flex-wrap: wrap;
+  list-style: none;
+  padding: 0;
+  margin: 0;
+}
 .rs-breadcrumb-item {
   -webkit-transition: color 0.3s linear;
   transition: color 0.3s linear;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
 }
 .rs-breadcrumb-item:focus {
   outline: 0;

package/Breadcrumb/styles/index.less

@@ -9,9 +9,19 @@
   font-size: @breadcrumb-font-size;
   color: var(--rs-text-secondary);
 
+  ol {
+    display: flex;
+    flex-wrap: wrap;
+    list-style: none;
+    padding: 0;
+    margin: 0;
+  }
+
   // If breadcrumbs has a ci
   &-item {
     transition: color 0.3s linear;
+    display: flex;
+    align-items: center;
 
     &:focus {
       .tab-focus();

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+## [5.70.2](https://github.com/rsuite/rsuite/compare/v5.70.1...v5.70.2) (2024-09-13)
+
+
+### Bug Fixes
+
+* **Form:** fix the error message of the nested field not displayed when the form is submitted ([#3960](https://github.com/rsuite/rsuite/issues/3960)) ([384dd70](https://github.com/rsuite/rsuite/commit/384dd70b0477470da233217d46af77315ff7089d))
+
+
+
+## [5.70.1](https://github.com/rsuite/rsuite/compare/v5.70.0...v5.70.1) (2024-09-06)
+
+
+### Bug Fixes
+
+* **Breadcrumb:** fix the rendering exception of the child node separator ([#3948](https://github.com/rsuite/rsuite/issues/3948)) ([7d54cc9](https://github.com/rsuite/rsuite/commit/7d54cc97b05e9b17797ad275b6f02ce679869579))
+* **Calendar:** fix the problem of displaying the first week of the year incorrectly ([#3951](https://github.com/rsuite/rsuite/issues/3951)) ([a2c6891](https://github.com/rsuite/rsuite/commit/a2c6891f76cc5e435eb1980f9176dbec21ac5735))
+
+
+
 # [5.70.0](https://github.com/rsuite/rsuite/compare/v5.69.0...v5.70.0) (2024-08-24)
 
 

package/cjs/Breadcrumb/Breadcrumb.d.ts

@@ -3,17 +3,27 @@ import BreadcrumbItem from './BreadcrumbItem';
 import { WithAsProps, RsRefForwardingComponent } from '../internals/types';
 import { BreadcrumbLocale } from '../locales';
 export interface BreadcrumbProps extends WithAsProps {
-    /** Shorthand for primary content of the React.ReactNode */
+    /**
+     * The separator between each breadcrumb item.
+     */
     separator?: React.ReactNode;
     /**
      * Set the maximum number of breadcrumbs to display.
      * When there are more than the maximum number,
      * only the first and last will be shown, with an ellipsis in between.
-     * */
+     */
     maxItems?: number;
-    /** Custom locale */
+    /**
+     * The locale of the component.
+     */
     locale?: BreadcrumbLocale;
-    /** A function to be called when you are in the collapsed view and click the ellipsis. */
+    /**
+     * The ellipsis element.
+     */
+    ellipsis?: React.ReactNode;
+    /**
+     * Callback function for clicking the ellipsis.
+     */
     onExpand?: (event: React.MouseEvent) => void;
 }
 export interface BreadcrumbComponent extends RsRefForwardingComponent<'ol', BreadcrumbProps> {

package/cjs/Breadcrumb/Breadcrumb.js

@@ -5,16 +5,21 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _taggedTemplateLiteralLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteralLoose"));
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _hooks = require("../internals/hooks");
+var _utils = require("../internals/utils");
 var _BreadcrumbItem = _interopRequireDefault(require("./BreadcrumbItem"));
-var _templateObject;
-var _excluded = ["as", "className", "classPrefix", "children", "maxItems", "separator", "locale", "onExpand"];
+var _excluded = ["as", "className", "classPrefix", "children", "ellipsis", "maxItems", "separator", "locale", "onExpand"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+var Separator = (0, _utils.createComponent)({
+  name: 'BreadcrumbSeparator',
+  componentAs: 'span',
+  'aria-hidden': true
+});
+
 /**
  * The Breadcrumb component is used to indicate the current page location and navigate.
  * @see https://rsuitejs.com/components/breadcrumb
@@ -26,6 +31,8 @@ var Breadcrumb = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     _props$classPrefix = props.classPrefix,
     classPrefix = _props$classPrefix === void 0 ? 'breadcrumb' : _props$classPrefix,
     children = props.children,
+    _props$ellipsis = props.ellipsis,
+    ellipsis = _props$ellipsis === void 0 ? '...' : _props$ellipsis,
     _props$maxItems = props.maxItems,
     maxItems = _props$maxItems === void 0 ? 5 : _props$maxItems,
     _props$separator = props.separator,
@@ -35,62 +42,53 @@ var Breadcrumb = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     rest = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
   var _useClassNames = (0, _hooks.useClassNames)(classPrefix),
     merge = _useClassNames.merge,
-    prefix = _useClassNames.prefix,
     withClassPrefix = _useClassNames.withClassPrefix;
   var _useState = (0, _react.useState)(true),
-    ellipsis = _useState[0],
-    setEllipsis = _useState[1];
+    showEllipsis = _useState[0],
+    setShowEllipsis = _useState[1];
   var _useCustom = (0, _hooks.useCustom)('Breadcrumb', overrideLocale),
     locale = _useCustom.locale;
-  var renderSeparator = function renderSeparator(key) {
-    return /*#__PURE__*/_react.default.createElement("span", {
-      key: "breadcrumb-separator-" + key,
-      "aria-hidden": true,
-      className: prefix(_templateObject || (_templateObject = (0, _taggedTemplateLiteralLoose2.default)(["separator"])))
-    }, separator);
-  };
-  var handleClickEllipsis = (0, _react.useCallback)(function (event) {
-    setEllipsis(false);
+  var handleClickEllipsis = (0, _hooks.useEventCallback)(function (event) {
+    setShowEllipsis(false);
     onExpand === null || onExpand === void 0 ? void 0 : onExpand(event);
-  }, [onExpand]);
-  var items = [];
-  var count = _react.default.Children.count(children);
-  if (count) {
-    _react.default.Children.forEach(children, function (item, index) {
-      items.push(item);
-      if (index < count - 1) {
-        items.push(renderSeparator(index));
-      }
+  });
+  var content = (0, _react.useMemo)(function () {
+    var count = _utils.ReactChildren.count(children);
+    var items = _utils.ReactChildren.mapCloneElement(children, function (item, index) {
+      var isLast = index === count - 1;
+      return (0, _extends2.default)({}, item.props, {
+        separator: isLast ? null : /*#__PURE__*/_react.default.createElement(Separator, null, separator)
+      });
     });
-  }
-  var renderCollapseItems = function renderCollapseItems() {
-    if (count > maxItems && count > 2 && ellipsis) {
-      return [].concat(items.slice(0, 2), [[/*#__PURE__*/_react.default.createElement(_BreadcrumbItem.default, {
+    if (count > maxItems && count > 2 && showEllipsis) {
+      return [].concat(items.slice(0, 1), [[/*#__PURE__*/_react.default.createElement(_BreadcrumbItem.default, {
         role: "button",
         key: "ellipsis",
         title: locale.expandText,
         "aria-label": locale.expandText,
+        separator: /*#__PURE__*/_react.default.createElement(Separator, null, separator),
         onClick: handleClickEllipsis
       }, /*#__PURE__*/_react.default.createElement("span", {
         "aria-hidden": true
-      }, "..."))]], items.slice(items.length - 2, items.length));
+      }, ellipsis))]], items.slice(items.length - 1, items.length));
     }
     return items;
-  };
+  }, [children, ellipsis, handleClickEllipsis, locale.expandText, maxItems, separator, showEllipsis]);
   var classes = merge(className, withClassPrefix());
   return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({}, rest, {
     ref: ref,
     className: classes
-  }), renderCollapseItems());
+  }), /*#__PURE__*/_react.default.createElement("ol", null, content));
 });
 Breadcrumb.Item = _BreadcrumbItem.default;
 Breadcrumb.displayName = 'Breadcrumb';
 Breadcrumb.propTypes = {
-  separator: _propTypes.default.node,
   as: _propTypes.default.elementType,
   children: _propTypes.default.node,
   className: _propTypes.default.string,
   classPrefix: _propTypes.default.string,
+  ellipsis: _propTypes.default.node,
+  separator: _propTypes.default.node,
   maxItems: _propTypes.default.number,
   onExpand: _propTypes.default.func
 };

package/cjs/Breadcrumb/BreadcrumbItem.d.ts

@@ -1,10 +1,30 @@
 import React from 'react';
 import { WithAsProps, RsRefForwardingComponent } from '../internals/types';
 export interface BreadcrumbItemProps extends WithAsProps<React.ElementType | string> {
+    /**
+     * The wrapper element of the BreadcrumbItem.
+     */
+    wrapperAs?: React.ElementType;
+    /**
+     * The active state of the BreadcrumbItem.
+     */
     active?: boolean;
+    /**
+     * The href attribute specifies the URL of the page the link goes to.
+     */
     href?: string;
+    /**
+     * The title attribute specifies extra information about an element.
+     */
     title?: string;
+    /**
+     * The target attribute specifies where to open the linked document.
+     */
     target?: string;
+    /**
+     * The separator between each breadcrumb item.
+     */
+    separator?: React.ReactNode;
 }
 /**
  * The `<Breadcrumb.Item>` component is used to specify each section of the Breadcrumb.

package/cjs/Breadcrumb/BreadcrumbItem.js

@@ -10,15 +10,17 @@ var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _SafeAnchor = _interopRequireDefault(require("../SafeAnchor"));
 var _hooks = require("../internals/hooks");
-var _excluded = ["as", "href", "classPrefix", "title", "target", "className", "style", "active", "children"];
+var _excluded = ["wrapperAs", "href", "as", "classPrefix", "title", "target", "className", "style", "active", "children", "separator"];
 /**
  * The `<Breadcrumb.Item>` component is used to specify each section of the Breadcrumb.
  * @see https://rsuitejs.com/components/breadcrumb
  */
 var BreadcrumbItem = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
-  var _props$as = props.as,
-    Component = _props$as === void 0 ? props.href ? _SafeAnchor.default : 'span' : _props$as,
+  var _props$wrapperAs = props.wrapperAs,
+    WrapperComponent = _props$wrapperAs === void 0 ? 'li' : _props$wrapperAs,
     href = props.href,
+    _props$as = props.as,
+    Component = _props$as === void 0 ? href ? _SafeAnchor.default : 'span' : _props$as,
     _props$classPrefix = props.classPrefix,
     classPrefix = _props$classPrefix === void 0 ? 'breadcrumb-item' : _props$classPrefix,
     title = props.title,
@@ -27,6 +29,7 @@ var BreadcrumbItem = /*#__PURE__*/_react.default.forwardRef(function (props, ref
     style = props.style,
     active = props.active,
     children = props.children,
+    separator = props.separator,
     rest = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
   var _useClassNames = (0, _hooks.useClassNames)(classPrefix),
     merge = _useClassNames.merge,
@@ -34,22 +37,15 @@ var BreadcrumbItem = /*#__PURE__*/_react.default.forwardRef(function (props, ref
   var classes = merge(className, withClassPrefix({
     active: active
   }));
-  if (active) {
-    return /*#__PURE__*/_react.default.createElement("span", (0, _extends2.default)({
-      ref: ref
-    }, rest, {
-      style: style,
-      className: classes
-    }), children);
-  }
-  return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({}, rest, {
+  return /*#__PURE__*/_react.default.createElement(WrapperComponent, (0, _extends2.default)({
+    style: style,
+    className: classes,
+    ref: ref
+  }, rest), active ? /*#__PURE__*/_react.default.createElement("span", null, children) : /*#__PURE__*/_react.default.createElement(Component, {
     href: href,
     title: title,
-    target: target,
-    ref: ref,
-    style: style,
-    className: classes
-  }), children);
+    target: target
+  }, children), separator);
 });
 BreadcrumbItem.displayName = 'BreadcrumbItem';
 BreadcrumbItem.propTypes = {

package/cjs/Button/Button.js

@@ -55,7 +55,7 @@ var Button = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     loading: loading,
     block: block
   }));
-  var renderButtonContent = (0, _react.useCallback)(function () {
+  var buttonContent = (0, _react.useMemo)(function () {
     var spin = /*#__PURE__*/_react.default.createElement("span", {
       className: prefix(_templateObject || (_templateObject = (0, _taggedTemplateLiteralLoose2.default)(["spin"])))
     });
@@ -73,7 +73,7 @@ var Button = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       "aria-disabled": disabled,
       disabled: disabled,
       className: classes
-    }), renderButtonContent());
+    }), buttonContent);
   }
   var Component = as || 'button';
   var type = typeProp || (Component === 'button' ? 'button' : undefined);
@@ -85,7 +85,7 @@ var Button = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     disabled: disabled,
     "aria-disabled": disabled,
     className: classes
-  }), renderButtonContent());
+  }), buttonContent);
 });
 Button.displayName = 'Button';
 Button.propTypes = {

package/cjs/Calendar/TableRow.js

@@ -16,6 +16,7 @@ var _excluded = ["as", "className", "classPrefix", "weekendDate", "rowIndex"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var TableRow = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
+  var _locale$dateLocale$op, _locale$dateLocale;
   var _props$as = props.as,
     Component = _props$as === void 0 ? 'div' : _props$as,
     className = props.className,
@@ -100,10 +101,13 @@ var TableRow = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     return days;
   };
   var classes = merge(className, prefix('row'));
+  var _ref3 = (_locale$dateLocale$op = locale === null || locale === void 0 ? void 0 : (_locale$dateLocale = locale.dateLocale) === null || _locale$dateLocale === void 0 ? void 0 : _locale$dateLocale.options) !== null && _locale$dateLocale$op !== void 0 ? _locale$dateLocale$op : {},
+    firstWeekContainsDate = _ref3.firstWeekContainsDate,
+    weekStartsOn = _ref3.weekStartsOn;
   var week = (0, _date.format)(weekendDate, isoWeek ? 'I' : 'w', {
     locale: locale === null || locale === void 0 ? void 0 : locale.dateLocale,
-    firstWeekContainsDate: 4,
-    weekStartsOn: weekStart
+    firstWeekContainsDate: firstWeekContainsDate,
+    weekStartsOn: weekStart || weekStartsOn
   });
   return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({}, rest, {
     ref: ref,

package/cjs/CustomProvider/CustomProvider.d.ts

@@ -1,18 +1,67 @@
 import React from 'react';
-import type { Locale as DateFnsLocale } from 'date-fns';
 import { Locale } from '../locales';
 import { ToastContainerInstance } from '../toaster/ToastContainer';
+import type { Locale as DateFnsLocale } from 'date-fns';
+import type { DateFns } from '../internals/types';
 export interface FormatDateOptions {
+    /**
+     * The locale object that contains the language and formatting rules for the date.
+     */
     locale?: DateFnsLocale;
-    weekStartsOn?: 0 | 1 | 2 | 3 | 4 | 5 | 6;
-    firstWeekContainsDate?: number;
+    /**
+     * Defines which day of the week should be considered the start of the week.
+     *
+     * The value should be an integer from 0 to 6, where:
+     * - `0` represents Sunday,
+     * - `1` represents Monday,
+     * - `2` represents Tuesday,
+     * - `3` represents Wednesday,
+     * - `4` represents Thursday,
+     * - `5` represents Friday,
+     * - `6` represents Saturday.
+     *
+     * This option is important for functions that operate on weeks, such as calculating
+     * the start or end of a week, determining which week a date falls in, or generating
+     * calendar views. The default value varies depending on the locale, with Monday (`1`)
+     * being the default in most regions following ISO 8601, while Sunday (`0`) is often
+     * the default in regions like the United States.
+     */
+    weekStartsOn?: DateFns.Day;
+    /**
+     * `firstWeekContainsDate` is used to determine which week is considered the first week of the year.
+     *
+     * This option specifies the minimum day of January that must be included in the first week.
+     *
+     * The value can be set to:
+     * - `1`: The first week of the year must include January 1st.
+     * - `4`: The first week of the year must include January 4th, which is the default according to ISO 8601.
+     *
+     * The choice between `1` and `4` typically depends on the regional or business conventions for week numbering.
+     *
+     * Please note that this option only accepts `1` (Sunday) or `4` (Thursday), aligning with common international standards.
+     *
+     * For more detailed information, please refer to https://en.wikipedia.org/wiki/Week#Week_numbering.
+     */
+    firstWeekContainsDate?: DateFns.FirstWeekContainsDate;
+    /**
+     * If true, allows usage of the week-numbering year tokens `YY` and `YYYY`.
+     * See: https://date-fns.org/docs/Unicode-Tokens
+     **/
     useAdditionalWeekYearTokens?: boolean;
+    /**
+     * If true, allows usage of the day of year tokens `D` and `DD`.
+     * See: https://date-fns.org/docs/Unicode-Tokens
+     */
     useAdditionalDayOfYearTokens?: boolean;
 }
 export interface CustomValue<T = Locale> {
-    /** Language configuration */
+    /**
+     * The locale object that contains the language and formatting rules for the date.
+     */
     locale: T;
-    /** Support right-to-left */
+    /**
+     * Right-to-left text direction.
+     */
     rtl: boolean;
     /**
      * Return the formatted date string in the given format. The result may vary by locale.
@@ -26,7 +75,7 @@ export interface CustomValue<T = Locale> {
      *    return format(date, formatStr, { locale: eo });
      *  }
      *
-     * */
+     */
     formatDate: (date: Date | number, format: string, options?: FormatDateOptions) => string;
     /**
      * Return the date parsed from string using the given format string.
@@ -40,13 +89,16 @@ export interface CustomValue<T = Locale> {
      *    return parse(date, formatStr, new Date(), { locale: eo });
      *  }
      *
-     * */
+     */
     parseDate: (dateString: string, formatString: string, referenceDate?: Date | number, options?: FormatDateOptions) => Date;
     /**
      * A Map of toast containers
      */
     toasters?: React.MutableRefObject<Map<string, ToastContainerInstance>>;
-    /** If true, the ripple effect is disabled. Affected components include: Button, Nav.Item, Pagination. */
+    /**
+     * If true, the ripple effect is disabled.
+     * Affected components include: Button, Nav.Item, Pagination.
+     */
     disableRipple?: boolean;
 }
 export interface CustomProviderProps<T = Locale> extends Partial<CustomValue<T>> {
@@ -68,7 +120,6 @@ declare const CustomContext: React.Context<CustomProviderProps<{
     } | undefined;
     Plaintext?: {
         unfilled: string;
-        /** Support right-to-left */
         notSelected: string;
         notUploaded: string;
     } | undefined;

package/cjs/Form/Form.js

@@ -58,7 +58,7 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     onError = props.onError,
     onChange = props.onChange,
     rest = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
-  var _useSchemaModel = (0, _useSchemaModel2.default)(formModel),
+  var _useSchemaModel = (0, _useSchemaModel2.default)(formModel, nestedField),
     getCombinedModel = _useSchemaModel.getCombinedModel,
     pushFieldRule = _useSchemaModel.pushFieldRule,
     removeFieldRule = _useSchemaModel.removeFieldRule;

package/cjs/Form/hooks/useFormValidate.js

@@ -37,12 +37,29 @@ function useFormValidate(formError, props) {
     var formError = {};
     var errorCount = 0;
     var model = getCombinedModel();
-    Object.keys(model.getSchemaSpec()).forEach(function (key) {
-      var checkResult = model.checkForField(key, formValue || {}, checkOptions);
+    var checkField = function checkField(key, type, value, formErrorObj) {
+      var checkResult = type.check(value);
       if (checkResult.hasError === true) {
         errorCount += 1;
-        formError[key] = (checkResult === null || checkResult === void 0 ? void 0 : checkResult.errorMessage) || checkResult;
+        formErrorObj[key] = (checkResult === null || checkResult === void 0 ? void 0 : checkResult.errorMessage) || checkResult;
+      }
+
+      // Check nested object
+      if (type !== null && type !== void 0 && type.objectTypeSchemaSpec) {
+        Object.entries(type.objectTypeSchemaSpec).forEach(function (_ref) {
+          var nestedKey = _ref[0],
+            nestedType = _ref[1];
+          formErrorObj[key] = formErrorObj[key] || {
+            object: {}
+          };
+          checkField(nestedKey, nestedType, value === null || value === void 0 ? void 0 : value[nestedKey], formErrorObj[key].object);
+        });
       }
+    };
+    Object.entries(model.getSchemaSpec()).forEach(function (_ref2) {
+      var key = _ref2[0],
+        type = _ref2[1];
+      checkField(key, type, formValue[key], formError);
     });
     setFormError(formError);
     onCheck === null || onCheck === void 0 ? void 0 : onCheck(formError);

package/cjs/Form/hooks/useSchemaModel.d.ts

@@ -1,7 +1,7 @@
 import type { MutableRefObject } from 'react';
 import type { CheckType, Schema } from 'schema-typed';
 export type FieldRuleType = MutableRefObject<CheckType<unknown, any> | undefined>;
-declare function useSchemaModel(formModel: Schema): {
+declare function useSchemaModel(formModel: Schema, nestedField: boolean): {
     getCombinedModel: () => Schema<any, string>;
     pushFieldRule: (name: string, fieldRule: FieldRuleType) => void;
     removeFieldRule: (name: string) => void;

package/cjs/Form/hooks/useSchemaModel.js

@@ -5,7 +5,59 @@ exports.__esModule = true;
 exports.default = void 0;
 var _schemaTyped = require("schema-typed");
 var _react = require("react");
-function useSchemaModel(formModel) {
+/**
+ * Convert a flat schema object to a nested schema object
+ *
+ * @example
+ *
+ * ```js
+ * const schema = {
+ *  'address.city': StringType().isRequired('City is required'),
+ *  'address.street': StringType().isRequired('Street is required')
+ * };
+ *
+ * const result = unflattenSchemaObject(schema);
+ *
+ * // result
+ * {
+ *    address: ObjectType().shape({
+ *      city: StringType().isRequired('City is required'),
+ *      street: StringType().isRequired('Street is required')
+ *    })
+ * }
+ * ```
+ */
+function unflattenSchemaObject(schema) {
+  var result = {};
+  var $type = Symbol('schema-type');
+  Object.keys(schema).forEach(function (key) {
+    if (key.includes('.')) {
+      var keys = key.split('.');
+      var lastKey = keys.pop() || '';
+      var current = result;
+      keys.forEach(function (subKey) {
+        var _ref;
+        current[subKey] = current[subKey] || (_ref = {}, _ref[$type] = 'object-type', _ref);
+        current = current[subKey];
+      });
+      current[lastKey] = schema[key];
+    } else {
+      result[key] = schema[key];
+    }
+  });
+  function convertToShape(obj) {
+    Object.keys(obj).forEach(function (key) {
+      var _obj$key;
+      if (((_obj$key = obj[key]) === null || _obj$key === void 0 ? void 0 : _obj$key[$type]) === 'object-type') {
+        delete obj[key][$type];
+        obj[key] = (0, _schemaTyped.ObjectType)().shape(convertToShape(obj[key]));
+      }
+    });
+    return obj;
+  }
+  return convertToShape(result);
+}
+function useSchemaModel(formModel, nestedField) {
   var subRulesRef = (0, _react.useRef)([]);
   var pushFieldRule = (0, _react.useCallback)(function (name, fieldRule) {
     subRulesRef.current.push({
@@ -28,15 +80,16 @@ function useSchemaModel(formModel) {
     if (realSubRules.length === 0) {
       return formModel;
     }
-    return _schemaTyped.SchemaModel.combine(formModel, (0, _schemaTyped.SchemaModel)(realSubRules.map(function (_ref) {
-      var _ref2;
-      var name = _ref.name,
-        fieldRule = _ref.fieldRule;
-      return _ref2 = {}, _ref2[name] = fieldRule.current, _ref2;
+    var subRuleObject = realSubRules.map(function (_ref2) {
+      var _ref3;
+      var name = _ref2.name,
+        fieldRule = _ref2.fieldRule;
+      return _ref3 = {}, _ref3[name] = fieldRule.current, _ref3;
     }).reduce(function (a, b) {
       return Object.assign(a, b);
-    }, {})));
-  }, [formModel]);
+    }, {});
+    return _schemaTyped.SchemaModel.combine(formModel, (0, _schemaTyped.SchemaModel)(nestedField ? unflattenSchemaObject(subRuleObject) : subRuleObject));
+  }, [formModel, nestedField]);
   return {
     getCombinedModel: getCombinedModel,
     pushFieldRule: pushFieldRule,

package/cjs/FormControl/hooks/useField.js

@@ -11,6 +11,10 @@ var _set = _interopRequireDefault(require("lodash/set"));
 var _utils = require("../utils");
 function getErrorMessage(error) {
   var _error$array;
+  if (typeof error === 'string') {
+    return error;
+  }
+
   /**
    * When using some components as the field, such as TagInput, and using `ArrayType().of` as the validation rule,
    * the error object won't contain the errorMessage directly. @see https://github.com/rsuite/rsuite/issues/3866

package/cjs/internals/types/index.d.ts

@@ -200,3 +200,17 @@ export type CursorPosition = {
     clientTop: number;
     clientLeft: number;
 };
+export declare namespace DateFns {
+    /**
+     * FirstWeekContainsDate is used to determine which week is the first week of the year, based on what day the January, 1 is in that week.
+     * The day in that week can only be 1 (Monday) or 4 (Thursday).
+     * Please see https://en.wikipedia.org/wiki/Week#The_ISO_week_date_system for more information.
+     */
+    type FirstWeekContainsDate = 1 | 4;
+    /**
+     * The day of the week type alias.
+     * Unlike the date (the number of days since the beginning of the month), which begins with 1 and is dynamic (can go up to 28, 30, or 31), the day starts with 0 and static (always ends at 6).
+     * Look at it as an index in an array where Sunday is the first element and Saturday is the last.
+     */
+    type Day = 0 | 1 | 2 | 3 | 4 | 5 | 6;
+}