rsuite 5.9.0 → 5.12.0

package/ButtonToolbar/styles/index.less

@@ -10,6 +10,6 @@
   line-height: 0;
 
   > :not(:first-child):not(.rs-btn-block) {
-    margin-left: 5px;
+    margin-left: 10px;
   }
 }

package/CHANGELOG.md

@@ -1,3 +1,27 @@
+# [5.12.0](https://github.com/rsuite/rsuite/compare/v5.11.0...v5.12.0) (2022-05-12)
+
+### Features
+
+- **Form.Control:** add `rule` prop ([#2482](https://github.com/rsuite/rsuite/issues/2482)) ([d1917df](https://github.com/rsuite/rsuite/commit/d1917dfcb9474236f756551fa8908edc85e37197))
+
+# [5.11.0](https://github.com/rsuite/rsuite/compare/v5.10.0...v5.11.0) (2022-05-05)
+
+### Bug Fixes
+
+- **ButtonToolbar:** change item gap to 10px ([#2475](https://github.com/rsuite/rsuite/issues/2475)) ([d97810a](https://github.com/rsuite/rsuite/commit/d97810ab4cd401b27be929569ce85bff0f498498))
+- **Dropdown.Menu:** fix expected highlight item when focus moving in ([#2477](https://github.com/rsuite/rsuite/issues/2477)) ([b9fdea5](https://github.com/rsuite/rsuite/commit/b9fdea5d57ce76ddc80f5e9776feab02e4ebfacd))
+- **Menubar:** fix unhandled nullish value ([#2478](https://github.com/rsuite/rsuite/issues/2478)) ([10d515d](https://github.com/rsuite/rsuite/commit/10d515d06dd08f2b93e5d7dbd3be7b1114185cab))
+
+### Features
+
+- **DateRangePicker:** expose calendars renderTitle ([#2480](https://github.com/rsuite/rsuite/issues/2480)) ([4461e09](https://github.com/rsuite/rsuite/commit/4461e09ec3917f379b5df213db16cedade6f39e1))
+
+# [5.10.0](https://github.com/rsuite/rsuite/compare/v5.9.0...v5.10.0) (2022-04-28)
+
+### Features
+
+- **FormControl:** support `shouldResetWithUnmount` on `<FormControl>` ([#2468](https://github.com/rsuite/rsuite/issues/2468)) ([69dee5e](https://github.com/rsuite/rsuite/commit/69dee5ece1c20bdc1e1f42429e93150afb7995d8))
+
 # [5.9.0](https://github.com/rsuite/rsuite/compare/v5.8.1...v5.9.0) (2022-04-21)
 
 ### Features

package/README.md

@@ -99,6 +99,10 @@ You can go through [full documentation][rsuite-doc-guide] or start with followin
 - [Use in Vite][demo-vite]
 </details>
 
+<a href="https://vercel.com?utm_source=rsuite&utm_campaign=oss" target="_blank">
+  <img src="https://www.datocms-assets.com/31049/1618983297-powered-by-vercel.svg" alt="Vercel banner" />
+</a>
+
 ## Previous major versions
 
 The previous major version 4.x will no longer receive new features,

package/cjs/DateRangePicker/DateRangePicker.d.ts

@@ -35,6 +35,8 @@ export interface DateRangePickerProps extends PickerBaseProps, FormControlBasePr
     onClean?: (event: React.MouseEvent) => void;
     /** Custom render value */
     renderValue?: (value: DateRange, format: string) => React.ReactNode;
+    /** Custom render for calendar title */
+    renderTitle?: (date: Date) => React.ReactNode;
 }
 export interface DateRangePicker extends PickerComponent<DateRangePickerProps> {
     /** Allow the maximum number of days specified, other dates are disabled */

package/cjs/DateRangePicker/DateRangePicker.js

@@ -93,7 +93,8 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
       onOk = props.onOk,
       onOpen = props.onOpen,
       onSelect = props.onSelect,
-      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "classPrefix", "className", "appearance", "cleanable", "character", "defaultCalendarValue", "defaultValue", "disabled", "disabledDate", "format", "hoverRange", "isoWeek", "limitEndYear", "locale", "menuClassName", "menuStyle", "oneTap", "placeholder", "placement", "ranges", "renderValue", "showOneCalendar", "showWeekNumbers", "showMeridian", "style", "toggleAs", "caretAs", "value", "onChange", "onClean", "onClose", "onEnter", "onEntered", "onExited", "onOk", "onOpen", "onSelect"]);
+      renderTitle = props.renderTitle,
+      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "classPrefix", "className", "appearance", "cleanable", "character", "defaultCalendarValue", "defaultValue", "disabled", "disabledDate", "format", "hoverRange", "isoWeek", "limitEndYear", "locale", "menuClassName", "menuStyle", "oneTap", "placeholder", "placement", "ranges", "renderValue", "showOneCalendar", "showWeekNumbers", "showMeridian", "style", "toggleAs", "caretAs", "value", "onChange", "onClean", "onClose", "onEnter", "onEntered", "onExited", "onOk", "onOpen", "onSelect", "renderTitle"]);
 
   var _useClassNames = (0, _utils.useClassNames)(classPrefix),
       merge = _useClassNames.merge,
@@ -561,7 +562,8 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
       onChangeCalendarTime: handleChangeCalendarTime,
       onMouseMove: handleMouseMove,
       onSelect: handleSelectDate,
-      onToggleMeridian: handleToggleMeridian
+      onToggleMeridian: handleToggleMeridian,
+      renderTitle: renderTitle
     };
     return /*#__PURE__*/_react.default.createElement(_Picker.PickerOverlay, {
       className: classes,

package/cjs/Form/Form.d.ts

@@ -33,7 +33,7 @@ export interface FormProps<T = Record<string, any>, errorMsgType = any, E = {
     /** The error message comes from context */
     errorFromContext?: boolean;
     /** Callback fired when data changing */
-    onChange?: (formValue: T, event: React.SyntheticEvent) => void;
+    onChange?: (formValue: T, event?: React.SyntheticEvent) => void;
     /** Callback fired when error checking */
     onError?: (formError: E) => void;
     /** Callback fired when data cheking */

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({});
   }, []);
@@ -218,6 +230,16 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       resetErrors: resetErrors
     };
   });
+  var removeFieldError = (0, _react.useCallback)(function (name) {
+    var formError = (0, _omit.default)(getFormError(), [name]);
+    setFormError(formError);
+    onCheck === null || onCheck === void 0 ? void 0 : onCheck(formError);
+  }, [getFormError, onCheck]);
+  var removeFieldValue = (0, _react.useCallback)(function (name) {
+    var formValue = (0, _omit.default)(getFormValue(), [name]);
+    setFormValue(formValue);
+    onChange === null || onChange === void 0 ? void 0 : onChange(formValue);
+  }, [getFormValue, onChange]);
   var handleSubmit = (0, _react.useCallback)(function (event) {
     if (disabled || readOnly || plaintext) {
       return;
@@ -237,10 +259,8 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     onCheck === null || onCheck === void 0 ? void 0 : onCheck(formError);
   }, [onError, onCheck, getFormError]);
   var handleFieldSuccess = (0, _react.useCallback)(function (name) {
-    var formError = (0, _omit.default)(getFormError(), [name]);
-    setFormError(formError);
-    onCheck === null || onCheck === void 0 ? void 0 : onCheck(formError);
-  }, [onCheck, getFormError]);
+    removeFieldError(name);
+  }, [removeFieldError]);
   var handleFieldChange = (0, _react.useCallback)(function (name, value, event) {
     var _extends5;
 
@@ -252,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,
@@ -260,11 +280,15 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       plaintext: plaintext,
       disabled: disabled,
       formError: getFormError(),
+      removeFieldValue: removeFieldValue,
+      removeFieldError: removeFieldError,
+      pushFieldRule: pushFieldRule,
+      removeFieldRule: removeFieldRule,
       onFieldChange: handleFieldChange,
       onFieldError: handleFieldError,
       onFieldSuccess: handleFieldSuccess
     };
-  }, [model, checkTrigger, formDefaultValue, errorFromContext, readOnly, plaintext, disabled, getFormError, 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,24 +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;
-    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
  */
@@ -28,6 +29,10 @@ export interface FormControlProps<P = any, ValueType = any> extends WithAsProps,
     disabled?: boolean;
     /** Asynchronous check value */
     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) {
@@ -40,10 +42,14 @@ var FormControl = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       _useContext$formDefau = _useContext.formDefaultValue,
       formDefaultValue = _useContext$formDefau === void 0 ? {} : _useContext$formDefau,
       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,
@@ -69,7 +75,10 @@ var FormControl = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       onChange = props.onChange,
       onBlur = props.onBlur,
       defaultValue = props.defaultValue,
-      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "accepter", "classPrefix", "className", "checkAsync", "checkTrigger", "errorPlacement", "errorMessage", "name", "value", "readOnly", "plaintext", "disabled", "onChange", "onBlur", "defaultValue"]);
+      _props$shouldResetWit = props.shouldResetWithUnmount,
+      shouldResetWithUnmount = _props$shouldResetWit === void 0 ? false : _props$shouldResetWit,
+      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;
@@ -78,6 +87,13 @@ 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);
+      removeFieldError === null || removeFieldError === void 0 ? void 0 : removeFieldError(name);
+    }
+  });
   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;
@@ -117,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/Menubar.js

@@ -19,8 +19,12 @@ var _events = require("../utils/events");
 
 var _useMenu = _interopRequireDefault(require("./useMenu"));
 
+var _dom = require("../utils/dom");
+
 // Headless ARIA `menubar`
 function Menubar(_ref) {
+  var _items$activeItemInde3;
+
   var _ref$vertical = _ref.vertical,
       vertical = _ref$vertical === void 0 ? false : _ref$vertical,
       children = _ref.children,
@@ -35,7 +39,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 +63,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 +145,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));

package/cjs/utils/dom.d.ts

@@ -1 +1 @@
-export declare function isFocusableElement(element: HTMLElement): boolean;
+export declare function isFocusableElement(element: Element): boolean;

package/dist/rsuite-rtl.css

@@ -2782,7 +2782,7 @@ tbody.rs-anim-collapse.rs-anim-in {
   line-height: 0;
 }
 .rs-btn-toolbar > :not(:first-child):not(.rs-btn-block) {
-  margin-right: 5px;
+  margin-right: 10px;
 }
 .rs-picker-subtle .picker-subtle-toggle {
   position: relative;