rsuite 5.10.0 → 5.13.0

package/cjs/Dropdown/DropdownMenu.js

@@ -25,8 +25,6 @@ var _utils = require("../utils");
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _Sidenav = require("../Sidenav/Sidenav");
-
 var _AngleLeft = _interopRequireDefault(require("@rsuite/icons/legacy/AngleLeft"));
 
 var _AngleRight = _interopRequireDefault(require("@rsuite/icons/legacy/AngleRight"));
@@ -35,15 +33,15 @@ var _useCustom2 = _interopRequireDefault(require("../utils/useCustom"));
 
 var _DropdownContext = _interopRequireDefault(require("./DropdownContext"));
 
-var _Navbar = require("../Navbar");
-
 var _Menubar = _interopRequireDefault(require("../Menu/Menubar"));
 
-var _SidenavDropdownMenu = _interopRequireDefault(require("../Sidenav/SidenavDropdownMenu"));
+var _Nav = _interopRequireDefault(require("../Nav"));
+
+var _NavContext = _interopRequireDefault(require("../Nav/NavContext"));
 
-var _Disclosure = _interopRequireDefault(require("../Disclosure"));
+var _warnOnce = _interopRequireDefault(require("../utils/warnOnce"));
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4;
+var _templateObject, _templateObject2;
 
 /**
  * The <Dropdown.Menu> API
@@ -73,9 +71,8 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       classPrefix = _props$classPrefix === void 0 ? 'dropdown-menu' : _props$classPrefix,
       children = props.children,
       rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["onToggle", "eventKey", "title", "activeKey", "onSelect", "classPrefix", "children"]);
+  var nav = (0, _react.useContext)(_NavContext.default);
   var dropdown = (0, _react.useContext)(_DropdownContext.default);
-  var sidenav = (0, _react.useContext)(_Sidenav.SidenavContext);
-  var withinNavbar = Boolean((0, _react.useContext)(_Navbar.NavbarContext));
 
   var _useCustom = (0, _useCustom2.default)('DropdownMenu'),
       rtl = _useCustom.rtl;
@@ -103,9 +100,18 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       activeKey: activeKey,
       onSelect: onSelect
     };
-  }, [activeKey, onSelect]); // <Dropdown.Menu> is used outside of <Dropdown>
+  }, [activeKey, onSelect]); // If rendered within a <Nav>
+  // Suggest <Nav.Menu>
+
+  if (nav) {
+    (0, _warnOnce.default)('Usage of <Dropdown.Menu> within <Nav> is deprecated. Replace with <Nav.Menu>');
+    return /*#__PURE__*/_react.default.createElement(_Nav.default.Menu, (0, _extends2.default)({
+      ref: ref
+    }, props));
+  } // <Dropdown.Menu> is used outside of <Dropdown>
   // renders a vertical `menubar`
 
+
   if (!dropdown) {
     var classes = merge(props.className, withClassPrefix());
     return /*#__PURE__*/_react.default.createElement(_DropdownContext.default.Provider, {
@@ -118,10 +124,6 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
         className: classes
       }, menubar, rest), children);
     }));
-  }
-
-  if (sidenav !== null && sidenav !== void 0 && sidenav.expanded) {
-    return /*#__PURE__*/_react.default.createElement(_SidenavDropdownMenu.default, (0, _omit2.default)(props, 'classPrefix'));
   } // Parent menu exists. This is a submenu.
   // Should render a `menuitem` that controls this submenu.
 
@@ -132,65 +134,19 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       disabled = _omit.disabled,
       menuProps = (0, _objectWithoutPropertiesLoose2.default)(_omit, ["icon", "className", "disabled"]);
 
-  var Icon = rtl ? _AngleLeft.default : _AngleRight.default; // Renders a disclosure when used within <Navbar>
-
-  if (withinNavbar) {
-    return /*#__PURE__*/_react.default.createElement(_Disclosure.default, {
-      hideOnClickOutside: true,
-      trigger: ['click', 'mouseover']
-    }, function (_ref, containerRef) {
-      var open = _ref.open,
-          props = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["open"]);
-      var classes = mergeItemClassNames(className, withItemClassPrefix({
-        disabled: disabled,
-        open: open,
-        submenu: true
-      }));
-      return /*#__PURE__*/_react.default.createElement("li", (0, _extends2.default)({
-        ref: (0, _utils.mergeRefs)(ref, containerRef),
-        className: classes
-      }, props), /*#__PURE__*/_react.default.createElement(_Disclosure.default.Button, null, function (_ref2, buttonRef) {
-        var open = _ref2.open,
-            buttonProps = (0, _objectWithoutPropertiesLoose2.default)(_ref2, ["open"]);
-        var classes = mergeItemClassNames(className, prefixItemClassName(_templateObject || (_templateObject = (0, _taggedTemplateLiteralLoose2.default)(["toggle"]))), withItemClassPrefix({
-          'with-icon': icon,
-          open: open,
-          disabled: disabled
-        }));
-        return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
-          ref: (0, _utils.mergeRefs)(buttonRef, buttonRef),
-          className: classes,
-          "data-event-key": eventKey,
-          "data-event-key-type": typeof eventKey
-        }, buttonProps), icon && /*#__PURE__*/_react.default.cloneElement(icon, {
-          className: prefix('menu-icon')
-        }), title, /*#__PURE__*/_react.default.createElement(Icon, {
-          className: prefix(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteralLoose2.default)(["toggle-icon"])))
-        }));
-      }), /*#__PURE__*/_react.default.createElement(_Disclosure.default.Content, null, function (_ref3, elementRef) {
-        var open = _ref3.open;
-        var menuClassName = mergeMenuClassName(className, withMenuClassPrefix());
-        return /*#__PURE__*/_react.default.createElement("ul", (0, _extends2.default)({
-          ref: elementRef,
-          className: menuClassName,
-          hidden: !open
-        }, menuProps), children);
-      }));
-    });
-  }
-
+  var Icon = rtl ? _AngleLeft.default : _AngleRight.default;
   return /*#__PURE__*/_react.default.createElement(_Menu.default, {
     openMenuOn: ['mouseover', 'click'],
-    renderMenuButton: function renderMenuButton(_ref4, buttonRef) {
-      var open = _ref4.open,
-          menuButtonProps = (0, _objectWithoutPropertiesLoose2.default)(_ref4, ["open"]);
+    renderMenuButton: function renderMenuButton(_ref, buttonRef) {
+      var open = _ref.open,
+          menuButtonProps = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["open"]);
       return /*#__PURE__*/_react.default.createElement(_MenuItem.default, {
         disabled: disabled
-      }, function (_ref5, menuitemRef) {
-        var selected = _ref5.selected,
-            active = _ref5.active,
-            menuitem = (0, _objectWithoutPropertiesLoose2.default)(_ref5, ["selected", "active"]);
-        var classes = mergeItemClassNames(className, prefixItemClassName(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteralLoose2.default)(["toggle"]))), withItemClassPrefix({
+      }, function (_ref2, menuitemRef) {
+        var selected = _ref2.selected,
+            active = _ref2.active,
+            menuitem = (0, _objectWithoutPropertiesLoose2.default)(_ref2, ["selected", "active"]);
+        var classes = mergeItemClassNames(className, prefixItemClassName(_templateObject || (_templateObject = (0, _taggedTemplateLiteralLoose2.default)(["toggle"]))), withItemClassPrefix({
           'with-icon': icon,
           open: open,
           active: selected,
@@ -205,13 +161,13 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
         }, menuitem, (0, _omit2.default)(menuButtonProps, ['role'])), icon && /*#__PURE__*/_react.default.cloneElement(icon, {
           className: prefix('menu-icon')
         }), title, /*#__PURE__*/_react.default.createElement(Icon, {
-          className: prefix(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteralLoose2.default)(["toggle-icon"])))
+          className: prefix(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteralLoose2.default)(["toggle-icon"])))
         }));
       });
     },
-    renderMenuPopup: function renderMenuPopup(_ref6, popupRef) {
-      var open = _ref6.open,
-          popupProps = (0, _objectWithoutPropertiesLoose2.default)(_ref6, ["open"]);
+    renderMenuPopup: function renderMenuPopup(_ref3, popupRef) {
+      var open = _ref3.open,
+          popupProps = (0, _objectWithoutPropertiesLoose2.default)(_ref3, ["open"]);
       var menuClassName = mergeMenuClassName(className, withMenuClassPrefix());
       return /*#__PURE__*/_react.default.createElement("ul", (0, _extends2.default)({
         ref: popupRef,
@@ -220,9 +176,9 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       }, popupProps, menuProps), children);
     },
     onToggleMenu: handleToggleSubmenu
-  }, function (_ref7, menuContainerRef) {
-    var open = _ref7.open,
-        menuContainer = (0, _objectWithoutPropertiesLoose2.default)(_ref7, ["open"]);
+  }, function (_ref4, menuContainerRef) {
+    var open = _ref4.open,
+        menuContainer = (0, _objectWithoutPropertiesLoose2.default)(_ref4, ["open"]);
     var classes = mergeItemClassNames(className, withItemClassPrefix({
       disabled: disabled,
       open: open,

package/cjs/Dropdown/DropdownToggle.js

@@ -1,7 +1,5 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
-
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
@@ -11,7 +9,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
@@ -21,10 +19,6 @@ var _utils = require("../utils");
 
 var _useToggleCaret = _interopRequireDefault(require("../utils/useToggleCaret"));
 
-var _Sidenav = require("../Sidenav/Sidenav");
-
-var _NavContext = _interopRequireDefault(require("../Nav/NavContext"));
-
 var DropdownToggle = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var _props$as = props.as,
       Component = _props$as === void 0 ? _Button.default : _props$as,
@@ -38,10 +32,6 @@ var DropdownToggle = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       _props$placement = props.placement,
       placement = _props$placement === void 0 ? 'bottomStart' : _props$placement,
       rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "className", "classPrefix", "renderToggle", "children", "icon", "noCaret", "placement"]);
-  var sidenav = (0, _react.useContext)(_Sidenav.SidenavContext);
-
-  var _useContext = (0, _react.useContext)(_NavContext.default),
-      withinNav = _useContext.withinNav;
 
   var _useClassNames = (0, _utils.useClassNames)(classPrefix),
       prefix = _useClassNames.prefix,
@@ -50,14 +40,11 @@ var DropdownToggle = /*#__PURE__*/_react.default.forwardRef(function (props, ref
 
   var classes = merge(className, withClassPrefix({
     'no-caret': noCaret
-  }));
-  var inSidenav = !!sidenav; // Caret icon is down by default, when Dropdown is used in Sidenav.
+  })); // Caret icon is down by default, when Dropdown is used in Sidenav.
 
-  var Caret = (0, _useToggleCaret.default)(inSidenav ? 'bottomStart' : placement);
+  var Caret = (0, _useToggleCaret.default)(placement);
 
-  var toggle = /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({
-    appearance: withinNav ? 'subtle' : undefined
-  }, rest, {
+  var toggle = /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({}, rest, {
     ref: ref,
     className: classes
   }), icon && /*#__PURE__*/_react.default.cloneElement(icon, {

package/cjs/Form/Form.js

@@ -35,6 +35,8 @@ var _FormHelpText = _interopRequireDefault(require("../FormHelpText"));
 
 var _useFormClassNames = require("./useFormClassNames");
 
+var _useSchemaModel2 = _interopRequireDefault(require("./useSchemaModel"));
+
 var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var _props$checkTrigger = props.checkTrigger,
       checkTrigger = _props$checkTrigger === void 0 ? 'change' : _props$checkTrigger,
@@ -50,7 +52,7 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       _props$layout = props.layout,
       layout = _props$layout === void 0 ? 'vertical' : _props$layout,
       _props$model = props.model,
-      model = _props$model === void 0 ? (0, _schemaTyped.SchemaModel)({}) : _props$model,
+      formModel = _props$model === void 0 ? (0, _schemaTyped.SchemaModel)({}) : _props$model,
       readOnly = props.readOnly,
       plaintext = props.plaintext,
       className = props.className,
@@ -61,6 +63,12 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       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"]);
+
+  var _useSchemaModel = (0, _useSchemaModel2.default)(formModel),
+      getCombinedModel = _useSchemaModel.getCombinedModel,
+      pushFieldRule = _useSchemaModel.pushFieldRule,
+      removeFieldRule = _useSchemaModel.removeFieldRule;
+
   var classes = (0, _useFormClassNames.useFormClassNames)({
     classPrefix: classPrefix,
     className: className,
@@ -95,6 +103,7 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     var formValue = getFormValue() || {};
     var formError = {};
     var errorCount = 0;
+    var model = getCombinedModel();
     Object.keys(model.spec).forEach(function (key) {
       var checkResult = model.checkForField(key, formValue);
 
@@ -113,7 +122,7 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     }
 
     return true;
-  }, [onCheck, onError, model, getFormValue]);
+  }, [getFormValue, getCombinedModel, onCheck, onError]);
   /**
    * Check the data field
    * @param fieldName
@@ -124,6 +133,7 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     var _extends2;
 
     var formValue = getFormValue() || {};
+    var model = getCombinedModel();
     var checkResult = model.checkForField(fieldName, formValue);
     var formError = (0, _extends6.default)({}, getFormError(), (_extends2 = {}, _extends2[fieldName] = (checkResult === null || checkResult === void 0 ? void 0 : checkResult.errorMessage) || checkResult, _extends2));
     setFormError(formError);
@@ -135,7 +145,7 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     }
 
     return !checkResult.hasError;
-  }, [model, getFormValue, getFormError, onCheck, onError]);
+  }, [getFormValue, getCombinedModel, getFormError, onCheck, onError]);
   /**
    * Check form data asynchronously and return a Promise
    */
@@ -144,6 +154,7 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     var formValue = getFormValue() || {};
     var promises = [];
     var keys = [];
+    var model = getCombinedModel();
     Object.keys(model.spec).forEach(function (key) {
       keys.push(key);
       promises.push(model.checkForFieldAsync(key, formValue));
@@ -171,7 +182,7 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
         formError: formError
       };
     });
-  }, [model, getFormValue, onCheck, onError]);
+  }, [getFormValue, getCombinedModel, onCheck, onError]);
   /**
    * Asynchronously check form fields and return Promise
    * @param fieldName
@@ -179,6 +190,7 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
 
   var checkForFieldAsync = (0, _react.useCallback)(function (fieldName) {
     var formValue = getFormValue() || {};
+    var model = getCombinedModel();
     return model.checkForFieldAsync(fieldName, formValue).then(function (checkResult) {
       var _extends3;
 
@@ -192,7 +204,7 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
 
       return checkResult;
     });
-  }, [model, getFormValue, getFormError, onCheck, onError]);
+  }, [getFormValue, getCombinedModel, getFormError, onCheck, onError]);
   var cleanErrors = (0, _react.useCallback)(function () {
     setFormError({});
   }, []);
@@ -260,7 +272,7 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var rootRef = (0, _react.useRef)(null);
   var formContextValue = (0, _react.useMemo)(function () {
     return {
-      model: model,
+      getCombinedModel: getCombinedModel,
       checkTrigger: checkTrigger,
       formDefaultValue: formDefaultValue,
       errorFromContext: errorFromContext,
@@ -270,11 +282,13 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       formError: getFormError(),
       removeFieldValue: removeFieldValue,
       removeFieldError: removeFieldError,
+      pushFieldRule: pushFieldRule,
+      removeFieldRule: removeFieldRule,
       onFieldChange: handleFieldChange,
       onFieldError: handleFieldError,
       onFieldSuccess: handleFieldSuccess
     };
-  }, [model, checkTrigger, formDefaultValue, errorFromContext, readOnly, plaintext, disabled, getFormError, removeFieldValue, removeFieldError, handleFieldChange, handleFieldError, handleFieldSuccess]);
+  }, [getCombinedModel, checkTrigger, formDefaultValue, errorFromContext, readOnly, plaintext, disabled, getFormError, 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

@@ -1,26 +1,31 @@
 import React from 'react';
-import { Schema } from 'schema-typed';
 import { TypeAttributes } from '../@types/common';
-export interface FormContextValue<T = Record<string, any>, errorMsgType = any, E = {
+import type { Schema } from 'schema-typed';
+import type { FieldRuleType } from './useSchemaModel';
+interface TrulyFormContextValue<T = Record<string, any>, errorMsgType = any, E = {
     [P in keyof T]?: errorMsgType;
 }> {
-    model?: Schema;
+    getCombinedModel: () => Schema;
+    formError: E;
+    removeFieldValue: (name: string) => void;
+    removeFieldError: (name: string) => void;
+    pushFieldRule: (name: string, fieldRule: FieldRuleType) => void;
+    removeFieldRule: (name: string) => void;
+    onFieldChange: (name: string, value: any, event: React.SyntheticEvent) => void;
+    onFieldError: (name: string, errorMessage: string) => void;
+    onFieldSuccess: (name: string) => void;
+}
+declare type ExternalPropsContextValue<T> = {
     checkTrigger?: TypeAttributes.CheckTrigger;
     formDefaultValue?: T;
     errorFromContext?: boolean;
     readOnly?: boolean;
     plaintext?: boolean;
     disabled?: boolean;
-    formError?: E;
-    removeFieldValue?: (name: string) => void;
-    removeFieldError?: (name: string) => void;
-    onFieldChange?: (name: string, value: any, event: React.SyntheticEvent) => void;
-    onFieldError?: (name: string, errorMessage: string) => void;
-    onFieldSuccess?: (name: string) => void;
-}
-export declare const FormContext: React.Context<FormContextValue<Record<string, any>, any, {
-    [x: string]: any;
-}>>;
+};
+declare type InitialContextType = Partial<Record<keyof TrulyFormContextValue, undefined>>;
+export declare type FormContextValue<T = Record<string, any>, errorMsgType = any> = (TrulyFormContextValue<T, errorMsgType> | InitialContextType) & ExternalPropsContextValue<T>;
+export declare const FormContext: React.Context<FormContextValue<Record<string, any>, any>>;
 export declare const FormValueContext: React.Context<Record<string, any> | undefined>;
 export declare const FormPlaintextContext: React.Context<boolean>;
 export default FormContext;

package/cjs/Form/useSchemaModel.d.ts

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

package/cjs/Form/useSchemaModel.js

@@ -0,0 +1,46 @@
+"use strict";
+
+exports.__esModule = true;
+exports.default = void 0;
+
+var _schemaTyped = require("schema-typed");
+
+var _react = require("react");
+
+function useSchemaModel(formModel) {
+  var subRulesRef = (0, _react.useRef)([]);
+  var pushFieldRule = (0, _react.useCallback)(function (name, fieldRule) {
+    subRulesRef.current.push({
+      name: name,
+      fieldRule: fieldRule
+    });
+  }, []);
+  var removeFieldRule = (0, _react.useCallback)(function (name) {
+    var index = subRulesRef.current.findIndex(function (v) {
+      return v.name === name;
+    });
+    subRulesRef.current.splice(index, 1);
+  }, []);
+  var getCombinedModel = (0, _react.useCallback)(function () {
+    var realSubRules = subRulesRef.current.filter(function (v) {
+      return Boolean(v.fieldRule.current);
+    });
+    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;
+    }).reduce(function (a, b) {
+      return Object.assign(a, b);
+    }, {})));
+  }, [formModel]);
+  return {
+    getCombinedModel: getCombinedModel,
+    pushFieldRule: pushFieldRule,
+    removeFieldRule: removeFieldRule
+  };
+}
+
+var _default = useSchemaModel;
+exports.default = _default;

package/cjs/FormControl/FormControl.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import Input from '../Input';
 import { TypeAttributes, FormControlBaseProps, WithAsProps } from '../@types/common';
+import type { CheckType } from 'schema-typed';
 /**
  * Props that FormControl passes to its accepter
  */
@@ -30,6 +31,8 @@ export interface FormControlProps<P = any, ValueType = any> extends WithAsProps,
     checkAsync?: boolean;
     /** Remove field value and error message when component is unmounted  */
     shouldResetWithUnmount?: boolean;
+    /** Validation rule */
+    rule?: CheckType<unknown, any>;
 }
 interface FormControlComponent extends React.FC<FormControlProps> {
     <Accepter extends React.ElementType = typeof Input>(props: FormControlProps & {

package/cjs/FormControl/FormControl.js

@@ -29,6 +29,8 @@ var _FormContext = _interopRequireWildcard(require("../Form/FormContext"));
 
 var _FormGroup = require("../FormGroup/FormGroup");
 
+var _useRegisterModel = _interopRequireDefault(require("./useRegisterModel"));
+
 var _templateObject;
 
 var FormControl = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
@@ -42,10 +44,12 @@ var FormControl = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       formError = _useContext.formError,
       removeFieldValue = _useContext.removeFieldValue,
       removeFieldError = _useContext.removeFieldError,
+      pushFieldRule = _useContext.pushFieldRule,
+      removeFieldRule = _useContext.removeFieldRule,
       onFieldChange = _useContext.onFieldChange,
       onFieldError = _useContext.onFieldError,
       onFieldSuccess = _useContext.onFieldSuccess,
-      model = _useContext.model,
+      getCombinedModel = _useContext.getCombinedModel,
       contextCheckTrigger = _useContext.checkTrigger;
 
   var _props$as = props.as,
@@ -73,7 +77,8 @@ var FormControl = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       defaultValue = props.defaultValue,
       _props$shouldResetWit = props.shouldResetWithUnmount,
       shouldResetWithUnmount = _props$shouldResetWit === void 0 ? false : _props$shouldResetWit,
-      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "accepter", "classPrefix", "className", "checkAsync", "checkTrigger", "errorPlacement", "errorMessage", "name", "value", "readOnly", "plaintext", "disabled", "onChange", "onBlur", "defaultValue", "shouldResetWithUnmount"]);
+      rule = props.rule,
+      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "accepter", "classPrefix", "className", "checkAsync", "checkTrigger", "errorPlacement", "errorMessage", "name", "value", "readOnly", "plaintext", "disabled", "onChange", "onBlur", "defaultValue", "shouldResetWithUnmount", "rule"]);
 
   var _useContext2 = (0, _react.useContext)(_FormGroup.FormGroupContext),
       controlId = _useContext2.controlId;
@@ -82,6 +87,7 @@ var FormControl = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     throw new Error("\n      <FormControl> must be inside a component decorated with <Form>.\n      And need to update React to 16.6.0 +.\n    ");
   }
 
+  (0, _useRegisterModel.default)(name, pushFieldRule, removeFieldRule, rule);
   (0, _utils.useWillUnmount)(function () {
     if (shouldResetWithUnmount) {
       removeFieldValue === null || removeFieldValue === void 0 ? void 0 : removeFieldValue(name);
@@ -127,6 +133,7 @@ var FormControl = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     };
 
     var nextFormValue = (0, _extends3.default)({}, formValue, (_extends2 = {}, _extends2[name] = value, _extends2));
+    var model = getCombinedModel();
 
     if (checkAsync) {
       return model === null || model === void 0 ? void 0 : model.checkForFieldAsync(name, nextFormValue).then(function (checkResult) {

package/cjs/FormControl/useRegisterModel.d.ts

@@ -0,0 +1,4 @@
+import type { FieldRuleType } from '../Form/useSchemaModel';
+import type { CheckType } from 'schema-typed';
+declare function useRegisterModel(name: string, pushFieldRule: (n: string, r: FieldRuleType) => void, removeFieldRule: (n: string) => void, rule?: CheckType<unknown, any>): void;
+export default useRegisterModel;

package/cjs/FormControl/useRegisterModel.js

@@ -0,0 +1,20 @@
+"use strict";
+
+exports.__esModule = true;
+exports.default = void 0;
+
+var _react = require("react");
+
+function useRegisterModel(name, pushFieldRule, removeFieldRule, rule) {
+  var refRule = (0, _react.useRef)(rule);
+  refRule.current = rule;
+  (0, _react.useEffect)(function () {
+    pushFieldRule(name, refRule);
+    return function () {
+      removeFieldRule(name);
+    };
+  }, [name, pushFieldRule, removeFieldRule]);
+}
+
+var _default = useRegisterModel;
+exports.default = _default;

package/cjs/Menu/Menu.d.ts

@@ -33,6 +33,7 @@ export interface MenuHandle {
 }
 /**
  * Headless ARIA `menu`
+ * @private
  */
 declare function Menu({ disabled, children, openMenuOn, defaultOpen, open: openProp, menuButtonText, renderMenuButton, renderMenuPopup, onToggleMenu }: MenuProps & React.HTMLAttributes<HTMLUListElement>): React.ReactElement<React.HTMLAttributes<HTMLDivElement>, string | React.JSXElementConstructor<any>>;
 declare namespace Menu {

package/cjs/Menu/Menu.js

@@ -34,6 +34,7 @@ var _dom = require("../utils/dom");
 var defaultOpenMenuOn = ['click'];
 /**
  * Headless ARIA `menu`
+ * @private
  */
 
 function Menu(_ref) {

package/cjs/Menu/MenuItem.d.ts

@@ -16,6 +16,7 @@ export interface MenuitemRenderProps {
 }
 /**
  * Headless ARIA `menuitem`
+ * @private
  */
 declare function MenuItem(props: MenuItemProps): React.ReactElement<any, string | React.JSXElementConstructor<any>>;
 declare namespace MenuItem {

package/cjs/Menu/MenuItem.js

@@ -19,6 +19,7 @@ var _MenuContext = _interopRequireWildcard(require("./MenuContext"));
 
 /**
  * Headless ARIA `menuitem`
+ * @private
  */
 function MenuItem(props) {
   var children = props.children,

package/cjs/Menu/Menubar.d.ts

@@ -7,4 +7,7 @@ export interface MenubarProps {
     /** Callback triggered when an item is being activated */
     onActivateItem?: (event: React.SyntheticEvent) => void;
 }
+/**
+ * @private
+ */
 export default function Menubar({ vertical, children, onActivateItem }: MenubarProps): JSX.Element;

package/cjs/Menu/Menubar.js

@@ -19,8 +19,16 @@ var _events = require("../utils/events");
 
 var _useMenu = _interopRequireDefault(require("./useMenu"));
 
+var _dom = require("../utils/dom");
+
 // Headless ARIA `menubar`
+
+/**
+ * @private
+ */
 function Menubar(_ref) {
+  var _items$activeItemInde3;
+
   var _ref$vertical = _ref.vertical,
       vertical = _ref$vertical === void 0 ? false : _ref$vertical,
       children = _ref.children,
@@ -35,7 +43,8 @@ function Menubar(_ref) {
   var menubarElementRef = (0, _react.useRef)(null);
   var onFocus = (0, _react.useCallback)(function (event) {
     // Focus moves inside Menubar
-    if ((0, _events.isFocusEntering)(event)) {
+    if ((0, _events.isFocusEntering)(event) && // Skip if focus is moving to a focusable element within this menu
+    !(event.target !== event.currentTarget && (0, _dom.isFocusableElement)(event.target))) {
       if (activeItemIndex === null) {
         dispatch({
           type: _MenuContext.MenuActionTypes.MoveFocus,
@@ -58,7 +67,9 @@ function Menubar(_ref) {
       rtl = _useCustom.rtl;
 
   var onKeyDown = (0, _react.useCallback)(function (event) {
-    var activeItemElement = (0, _isNil.default)(activeItemIndex) ? null : items[activeItemIndex].element;
+    var _items$activeItemInde, _items$activeItemInde2;
+
+    var activeItemElement = (0, _isNil.default)(activeItemIndex) ? null : (_items$activeItemInde = (_items$activeItemInde2 = items[activeItemIndex]) === null || _items$activeItemInde2 === void 0 ? void 0 : _items$activeItemInde2.element) !== null && _items$activeItemInde !== void 0 ? _items$activeItemInde : null;
 
     switch (true) {
       case !vertical && !rtl && event.key === _utils.KEY_VALUES.RIGHT:
@@ -138,7 +149,7 @@ function Menubar(_ref) {
     onBlur: onBlur,
     onKeyDown: onKeyDown,
     onClick: onClick,
-    'aria-activedescendant': (0, _isNil.default)(activeItemIndex) ? undefined : items[activeItemIndex].element.id,
+    'aria-activedescendant': (0, _isNil.default)(activeItemIndex) ? undefined : (_items$activeItemInde3 = items[activeItemIndex]) === null || _items$activeItemInde3 === void 0 ? void 0 : _items$activeItemInde3.element.id,
     'aria-orientation': vertical ? 'vertical' : undefined // implicitly set 'horizontal'
 
   }, menubarElementRef));