rsuite 5.10.0 → 5.11.0

package/esm/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/esm/DateRangePicker/DateRangePicker.js

@@ -67,7 +67,8 @@ var DateRangePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       onOk = props.onOk,
       onOpen = props.onOpen,
       onSelect = props.onSelect,
-      rest = _objectWithoutPropertiesLoose(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 = _objectWithoutPropertiesLoose(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 = useClassNames(classPrefix),
       merge = _useClassNames.merge,
@@ -535,7 +536,8 @@ var DateRangePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       onChangeCalendarTime: handleChangeCalendarTime,
       onMouseMove: handleMouseMove,
       onSelect: handleSelectDate,
-      onToggleMeridian: handleToggleMeridian
+      onToggleMeridian: handleToggleMeridian,
+      renderTitle: renderTitle
     };
     return /*#__PURE__*/React.createElement(PickerOverlay, {
       className: classes,

package/esm/Menu/Menubar.js

@@ -5,7 +5,10 @@ import MenuContext, { MenuActionTypes, MoveFocusTo } from './MenuContext';
 import { KEY_VALUES, useCustom } from '../utils';
 import { isFocusEntering, isFocusLeaving } from '../utils/events';
 import useMenu from './useMenu';
+import { isFocusableElement } from '../utils/dom';
 export default function Menubar(_ref) {
+  var _items$activeItemInde3;
+
   var _ref$vertical = _ref.vertical,
       vertical = _ref$vertical === void 0 ? false : _ref$vertical,
       children = _ref.children,
@@ -20,7 +23,8 @@ export default function Menubar(_ref) {
   var menubarElementRef = useRef(null);
   var onFocus = useCallback(function (event) {
     // Focus moves inside Menubar
-    if (isFocusEntering(event)) {
+    if (isFocusEntering(event) && // Skip if focus is moving to a focusable element within this menu
+    !(event.target !== event.currentTarget && isFocusableElement(event.target))) {
       if (activeItemIndex === null) {
         dispatch({
           type: MenuActionTypes.MoveFocus,
@@ -43,7 +47,9 @@ export default function Menubar(_ref) {
       rtl = _useCustom.rtl;
 
   var onKeyDown = useCallback(function (event) {
-    var activeItemElement = isNil(activeItemIndex) ? null : items[activeItemIndex].element;
+    var _items$activeItemInde, _items$activeItemInde2;
+
+    var activeItemElement = isNil(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 === KEY_VALUES.RIGHT:
@@ -123,7 +129,7 @@ export default function Menubar(_ref) {
     onBlur: onBlur,
     onKeyDown: onKeyDown,
     onClick: onClick,
-    'aria-activedescendant': isNil(activeItemIndex) ? undefined : items[activeItemIndex].element.id,
+    'aria-activedescendant': isNil(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/esm/utils/dom.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsuite",
-  "version": "5.10.0",
+  "version": "5.11.0",
   "description": "A suite of react components",
   "main": "cjs/index.js",
   "module": "esm/index.js",