rsuite 5.2.4 → 5.3.0

package/esm/Menu/MenuItem.js

@@ -1,5 +1,6 @@
 import { useCallback, useContext, useEffect, useRef } from 'react';
 import PropTypes from 'prop-types';
+import isNil from 'lodash/isNil';
 import useUniqueId from '../utils/useUniqueId';
 import MenuContext, { MenuActionTypes, MoveFocusTo } from './MenuContext';
 
@@ -7,22 +8,24 @@ import MenuContext, { MenuActionTypes, MoveFocusTo } from './MenuContext';
  * Headless ARIA `menuitem`
  */
 function MenuItem(props) {
-  var _menuState$items$menu;
-
   var children = props.children,
-      selected = props.selected,
-      disabled = props.disabled,
+      _props$selected = props.selected,
+      selected = _props$selected === void 0 ? false : _props$selected,
+      _props$disabled = props.disabled,
+      disabled = _props$disabled === void 0 ? false : _props$disabled,
       onActivate = props.onActivate;
-  var menuitemRef = useRef();
+  var menuitemRef = useRef(null);
   var menuitemId = useUniqueId('menuitem-');
-  var menu = useContext(MenuContext); // fixme make sure <MenuItem> is used inside a <Menu>
+  var menu = useContext(MenuContext);
 
-  var _ref = menu !== null && menu !== void 0 ? menu : [],
-      menuState = _ref[0],
-      dispatch = _ref[1]; // Whether this menuitem has focus (indicated by `aria-activedescendant` from parent menu)
+  if (!menu) {
+    throw new Error('<MenuItem> must be rendered within a <Menu>');
+  }
 
+  var menuState = menu[0],
+      dispatch = menu[1]; // Whether this menuitem has focus (indicated by `aria-activedescendant` from parent menu)
 
-  var hasFocus = (menuState === null || menuState === void 0 ? void 0 : (_menuState$items$menu = menuState.items[menuState === null || menuState === void 0 ? void 0 : menuState.activeItemIndex]) === null || _menuState$items$menu === void 0 ? void 0 : _menuState$items$menu.element) === menuitemRef.current && !!menuitemRef.current;
+  var hasFocus = !isNil(menuitemRef.current) && !isNil(menuState.activeItemIndex) && menuState.items[menuState.activeItemIndex].element === menuitemRef.current;
   var handleClick = useCallback(function (event) {
     if (disabled) {
       return;
@@ -32,17 +35,17 @@ function MenuItem(props) {
   }, [disabled, onActivate]); // Gain/release focus on mousedown in `menubar`
 
   var handleMouseDown = useCallback(function () {
-    if (!hasFocus) {
+    if (!isNil(menuitemRef.current) && !hasFocus) {
       dispatch({
         type: MenuActionTypes.MoveFocus,
         to: MoveFocusTo.Specific,
         id: menuitemRef.current.id
       });
     }
-  }, [hasFocus, dispatch]); // Gain/release focus on mouseenter/mouseleave in `menu`
+  }, [dispatch]); // Gain/release focus on mouseenter/mouseleave in `menu`
 
   var handleMouseMove = useCallback(function () {
-    if (!hasFocus) {
+    if (!isNil(menuitemRef.current) && !hasFocus) {
       dispatch({
         type: MenuActionTypes.MoveFocus,
         to: MoveFocusTo.Specific,
@@ -58,7 +61,7 @@ function MenuItem(props) {
   }, [dispatch]);
   useEffect(function () {
     var menuitemElement = menuitemRef.current;
-    dispatch === null || dispatch === void 0 ? void 0 : dispatch({
+    dispatch({
       type: MenuActionTypes.RegisterItem,
       element: menuitemElement,
       props: {
@@ -66,7 +69,7 @@ function MenuItem(props) {
       }
     });
     return function () {
-      dispatch === null || dispatch === void 0 ? void 0 : dispatch({
+      dispatch({
         type: MenuActionTypes.UnregisterItem,
         id: menuitemElement.id
       });

package/esm/Menu/Menubar.js

@@ -1,12 +1,11 @@
 // Headless ARIA `menubar`
 import React, { useCallback, useRef } from 'react';
+import isNil from 'lodash/isNil';
 import MenuContext, { MenuActionTypes, MoveFocusTo } from './MenuContext';
 import { KEY_VALUES, useCustom } from '../utils';
 import { isFocusEntering, isFocusLeaving } from '../utils/events';
 import useMenu from './useMenu';
 export default function Menubar(_ref) {
-  var _items$activeItemInde;
-
   var _ref$vertical = _ref.vertical,
       vertical = _ref$vertical === void 0 ? false : _ref$vertical,
       children = _ref.children,
@@ -18,7 +17,7 @@ export default function Menubar(_ref) {
       items = _menubar$.items,
       activeItemIndex = _menubar$.activeItemIndex,
       dispatch = menubar[1];
-  var menubarElementRef = useRef();
+  var menubarElementRef = useRef(null);
   var onFocus = useCallback(function (event) {
     // Focus moves inside Menubar
     if (isFocusEntering(event)) {
@@ -44,7 +43,7 @@ export default function Menubar(_ref) {
       rtl = _useCustom.rtl;
 
   var onKeyDown = useCallback(function (event) {
-    var activeItem = items[activeItemIndex];
+    var activeItemElement = isNil(activeItemIndex) ? null : items[activeItemIndex].element;
 
     switch (true) {
       case !vertical && !rtl && event.key === KEY_VALUES.RIGHT:
@@ -90,10 +89,10 @@ export default function Menubar(_ref) {
       case !vertical && event.key === KEY_VALUES.DOWN:
       case vertical && !rtl && event.key === KEY_VALUES.RIGHT:
       case vertical && rtl && event.key === KEY_VALUES.LEFT:
-        if ((activeItem === null || activeItem === void 0 ? void 0 : activeItem.element.getAttribute('aria-haspopup')) === 'menu') {
+        if ((activeItemElement === null || activeItemElement === void 0 ? void 0 : activeItemElement.getAttribute('aria-haspopup')) === 'menu') {
           event.preventDefault();
           event.stopPropagation();
-          activeItem.element.click();
+          activeItemElement.click();
         }
 
         break;
@@ -102,7 +101,7 @@ export default function Menubar(_ref) {
       case event.key === KEY_VALUES.SPACE:
         event.preventDefault();
         event.stopPropagation();
-        activeItem === null || activeItem === void 0 ? void 0 : activeItem.element.click();
+        activeItemElement === null || activeItemElement === void 0 ? void 0 : activeItemElement.click();
         break;
     }
   }, [rtl, items, activeItemIndex, dispatch, vertical]); // Only used for handling click events bubbling from children
@@ -124,7 +123,7 @@ export default function Menubar(_ref) {
     onBlur: onBlur,
     onKeyDown: onKeyDown,
     onClick: onClick,
-    'aria-activedescendant': (_items$activeItemInde = items[activeItemIndex]) === null || _items$activeItemInde === void 0 ? void 0 : _items$activeItemInde.element.id,
+    'aria-activedescendant': isNil(activeItemIndex) ? undefined : items[activeItemIndex].element.id,
     'aria-orientation': vertical ? 'vertical' : undefined // implicitly set 'horizontal'
 
   }, menubarElementRef));

package/esm/Menu/useMenu.js

@@ -43,8 +43,10 @@ export function menuReducer(state, action) {
 
       switch (action.to) {
         case MoveFocusTo.Next:
-          for (var i = nextActiveItemIndex === null ? 0 : activeItemIndex + 1; i < items.length; i++) {
-            if (!items[i].props.disabled) {
+          for (var i = activeItemIndex === null ? 0 : activeItemIndex + 1; i < items.length; i++) {
+            var _items$i$props;
+
+            if (!((_items$i$props = items[i].props) !== null && _items$i$props !== void 0 && _items$i$props.disabled)) {
               nextActiveItemIndex = i;
               break;
             }
@@ -53,8 +55,10 @@ export function menuReducer(state, action) {
           break;
 
         case MoveFocusTo.Prev:
-          for (var _i = nextActiveItemIndex === null ? items.length - 1 : activeItemIndex - 1; _i >= 0; _i--) {
-            if (!items[_i].props.disabled) {
+          for (var _i = activeItemIndex === null ? items.length - 1 : activeItemIndex - 1; _i >= 0; _i--) {
+            var _items$_i$props;
+
+            if (!((_items$_i$props = items[_i].props) !== null && _items$_i$props !== void 0 && _items$_i$props.disabled)) {
               nextActiveItemIndex = _i;
               break;
             }
@@ -64,7 +68,9 @@ export function menuReducer(state, action) {
 
         case MoveFocusTo.First:
           for (var _i2 = 0; _i2 < items.length; _i2++) {
-            if (!items[_i2].props.disabled) {
+            var _items$_i2$props;
+
+            if (!((_items$_i2$props = items[_i2].props) !== null && _items$_i2$props !== void 0 && _items$_i2$props.disabled)) {
               nextActiveItemIndex = _i2;
               break;
             }
@@ -74,7 +80,9 @@ export function menuReducer(state, action) {
 
         case MoveFocusTo.Last:
           for (var _i3 = items.length - 1; _i3 >= 0; _i3--) {
-            if (!items[_i3].props.disabled) {
+            var _items$_i3$props;
+
+            if (!((_items$_i3$props = items[_i3].props) !== null && _items$_i3$props !== void 0 && _items$_i3$props.disabled)) {
               nextActiveItemIndex = _i3;
               break;
             }
@@ -84,7 +92,9 @@ export function menuReducer(state, action) {
 
         case MoveFocusTo.Specific:
           for (var _i4 = 0; _i4 < items.length; _i4++) {
-            if (items[_i4].element.id === action.id && !items[_i4].props.disabled) {
+            var _items$_i4$props;
+
+            if (items[_i4].element.id === action.id && !((_items$_i4$props = items[_i4].props) !== null && _items$_i4$props !== void 0 && _items$_i4$props.disabled)) {
               nextActiveItemIndex = _i4;
               break;
             }

package/esm/Modal/Modal.js

@@ -8,7 +8,7 @@ import React, { useRef, useMemo, useState, useEffect, useCallback } from 'react'
 import PropTypes from 'prop-types';
 import pick from 'lodash/pick';
 import on from 'dom-lib/on';
-import getTransitionEnd from 'dom-lib/getTransitionEnd';
+import getAnimationEnd from 'dom-lib/getAnimationEnd';
 import BaseModal, { modalPropTypes } from '../Overlay/Modal';
 import Bounce from '../Animation/Bounce';
 import { useClassNames, mergeRefs, SIZE } from '../utils';
@@ -43,7 +43,8 @@ var Modal = /*#__PURE__*/React.forwardRef(function (props, ref) {
       animationTimeout = _props$animationTimeo === void 0 ? 300 : _props$animationTimeo,
       _props$overflow = props.overflow,
       overflow = _props$overflow === void 0 ? true : _props$overflow,
-      drawer = props.drawer,
+      _props$drawer = props.drawer,
+      drawer = _props$drawer === void 0 ? false : _props$drawer,
       onClose = props.onClose,
       onEntered = props.onEntered,
       onEntering = props.onEntering,
@@ -66,7 +67,7 @@ var Modal = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var classes = merge(className, prefix(size, {
     full: full
   }));
-  var dialogRef = useRef();
+  var dialogRef = useRef(null);
   var transitionEndListener = useRef(); // The style of the Modal body will be updated with the size of the window or container.
 
   var _useBodyStyles = useBodyStyles(dialogRef, {
@@ -98,9 +99,13 @@ var Modal = /*#__PURE__*/React.forwardRef(function (props, ref) {
     // When the value of `backdrop` is `static`, a jitter animation will be added to the dialog when clicked.
     if (backdrop === 'static') {
       setShake(true);
-      transitionEndListener.current = on(dialogRef.current, getTransitionEnd(), function () {
-        setShake(false);
-      });
+
+      if (!transitionEndListener.current && dialogRef.current) {
+        //fix: https://github.com/rsuite/rsuite/blob/a93d13c14fb20cc58204babe3331d3c3da3fe1fd/src/Modal/styles/index.less#L59
+        transitionEndListener.current = on(dialogRef.current, getAnimationEnd(), function () {
+          setShake(false);
+        });
+      }
     }
   }, [backdrop]);
   var handleExited = useCallback(function (node) {
@@ -109,6 +114,7 @@ var Modal = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onExited === null || onExited === void 0 ? void 0 : onExited(node);
     onDestroyEvents();
     (_transitionEndListene = transitionEndListener.current) === null || _transitionEndListene === void 0 ? void 0 : _transitionEndListene.off();
+    transitionEndListener.current = null;
   }, [onDestroyEvents, onExited]);
   var handleEntered = useCallback(function (node) {
     onEntered === null || onEntered === void 0 ? void 0 : onEntered(node);

package/esm/Modal/ModalContext.d.ts

@@ -3,10 +3,10 @@ export interface ModalContextProps {
     /** ID of the dialog element */
     dialogId: string;
     /** Pass the close event callback to the header close button. */
-    onModalClose: (event: React.MouseEvent<Element, MouseEvent>) => void;
+    onModalClose?: (event: React.MouseEvent<Element, MouseEvent>) => void;
     /** Pass the latest style to body. */
     getBodyStyles?: () => React.CSSProperties;
     /** Whether this Modal is a Drawer */
     isDrawer: boolean;
 }
-export declare const ModalContext: React.Context<ModalContextProps>;
+export declare const ModalContext: React.Context<ModalContextProps | null>;

package/esm/Modal/utils.d.ts

@@ -3,4 +3,4 @@ export declare const useBodyStyles: (ref: React.RefObject<HTMLElement>, options:
     overflow: boolean;
     drawer: boolean;
     prefix: (...classes: any) => string;
-}) => [import("react").CSSProperties, (entering?: boolean) => void, () => void];
+}) => [import("react").CSSProperties, (entering?: boolean | undefined) => void, () => void];

package/esm/Modal/utils.js

@@ -11,7 +11,7 @@ export var useBodyStyles = function useBodyStyles(ref, options) {
       drawer = options.drawer,
       prefix = options.prefix;
   var windowResizeListener = useRef();
-  var contentElement = useRef();
+  var contentElement = useRef(null);
   var contentElementResizeObserver = useRef();
   var updateBodyStyles = useCallback(function (_event, entering) {
     var dialog = ref.current;
@@ -48,10 +48,8 @@ export var useBodyStyles = function useBodyStyles(ref, options) {
   }, []);
   var onChangeBodyStyles = useCallback(function (entering) {
     if (overflow && !drawer) {
-      var _ref$current;
-
-      updateBodyStyles(null, entering);
-      contentElement.current = (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.querySelector("." + prefix('content'));
+      updateBodyStyles(undefined, entering);
+      contentElement.current = ref.current.querySelector("." + prefix('content'));
       windowResizeListener.current = on(window, 'resize', updateBodyStyles);
       contentElementResizeObserver.current = new ResizeObserver(function () {
         return updateBodyStyles();

package/esm/MultiCascader/DropdownMenu.d.ts

@@ -3,15 +3,15 @@ import { ItemDataType, WithAsProps, RsRefForwardingComponent } from '../@types/c
 import { ValueType } from './MultiCascader';
 export interface DropdownMenuProps extends WithAsProps {
     disabledItemValues: ValueType;
-    value?: ValueType;
+    value: ValueType;
     childrenKey: string;
     valueKey: string;
     labelKey: string;
-    menuWidth: number;
-    menuHeight: number | string;
+    menuWidth?: number;
+    menuHeight?: number | string;
     cascade?: boolean;
     cascadeData: ItemDataType[][];
-    cascadePaths: ItemDataType[];
+    cascadePaths?: ItemDataType[];
     uncheckableItemValues: ValueType;
     renderMenuItem?: (itemLabel: React.MouseEventHandler, item: ItemDataType) => React.ReactNode;
     renderMenu?: (children: ItemDataType[], menu: React.ReactNode, parentNode?: ItemDataType, layer?: number) => React.ReactNode;

package/esm/MultiCascader/MultiCascader.js

@@ -113,10 +113,10 @@ var MultiCascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
       selectedPaths = _useState2[0],
       setSelectedPaths = _useState2[1];
 
-  var triggerRef = useRef();
-  var overlayRef = useRef();
-  var targetRef = useRef();
-  var searchInputRef = useRef();
+  var triggerRef = useRef(null);
+  var overlayRef = useRef(null);
+  var targetRef = useRef(null);
+  var searchInputRef = useRef(null);
   usePublicMethods(ref, {
     triggerRef: triggerRef,
     overlayRef: overlayRef,
@@ -164,7 +164,7 @@ var MultiCascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
    */
 
 
-  var hasValue = selectedItems.length > 0 || (valueProp === null || valueProp === void 0 ? void 0 : valueProp.length) > 0 && isFunction(renderValue);
+  var hasValue = selectedItems.length > 0 || Number(valueProp === null || valueProp === void 0 ? void 0 : valueProp.length) > 0 && isFunction(renderValue);
 
   var _useClassNames = useClassNames(classPrefix),
       prefix = _useClassNames.prefix,
@@ -446,7 +446,7 @@ var MultiCascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }
 
   if (hasValue && isFunction(renderValue)) {
-    selectedElement = renderValue(value.length ? value : valueProp, selectedItems, selectedElement); // If renderValue returns null or undefined, hasValue is false.
+    selectedElement = renderValue(value.length ? value : valueProp !== null && valueProp !== void 0 ? valueProp : [], selectedItems, selectedElement); // If renderValue returns null or undefined, hasValue is false.
 
     if (isNil(selectedElement)) {
       hasValue = false;

package/esm/MultiCascader/utils.d.ts

@@ -5,34 +5,34 @@ export interface ItemType extends ItemDataType {
     parent?: ItemType;
 }
 interface ItemKeys {
-    valueKey?: string;
-    labelKey?: string;
-    childrenKey?: string;
+    valueKey: string;
+    labelKey: string;
+    childrenKey: string;
 }
 /**
  * Get all parents of a node
  * @param node
  */
-export declare const getParents: (node: ItemType) => any[];
+export declare const getParents: (node: ItemType) => ItemType[];
 /**
  * Check if any child nodes are selected.
  * @param node
  * @param value
  * @param itemKeys
  */
-export declare const isSomeChildChecked: (node: ItemDataType, value: ValueType, itemKeys: ItemKeys) => any;
+export declare const isSomeChildChecked: (node: ItemDataType, value: ValueType, itemKeys: Omit<ItemKeys, 'labelKey'>) => any;
 /**
  * Check if the parent is selected.
  * @param node
  * @param value
  * @param itemKeys
  */
-export declare const isSomeParentChecked: (node: ItemDataType, value: ValueType, itemKeys: ItemKeys) => any;
-export declare const getOtherItemValuesByUnselectChild: (itemNode: ItemType, value: any, itemKeys: ItemKeys) => any[];
+export declare const isSomeParentChecked: (node: ItemDataType, value: ValueType, itemKeys: Pick<ItemKeys, 'valueKey'>) => any;
+export declare const getOtherItemValuesByUnselectChild: <T>(itemNode: ItemType, value: any, itemKeys: Omit<ItemKeys, 'labelKey'>) => T[];
 /**
  * Remove the values of all children.
  */
-export declare const removeAllChildrenValue: (value: ValueType, item: ItemType, itemKeys: ItemKeys) => any[];
+export declare const removeAllChildrenValue: <T>(value: T[], item: ItemType, itemKeys: Omit<ItemKeys, 'labelKey'>) => T[] | undefined;
 /**
  * A hook to flatten tree structure data
  * @param data
@@ -56,12 +56,12 @@ export declare function useColumnData(flattenData: ItemType[]): {
  * @param props
  * @param flattenData
  */
-export declare function useCascadeValue(props: Partial<MultiCascaderProps>, flattenData: ItemType[]): {
-    value: ValueType;
-    setValue: import("react").Dispatch<import("react").SetStateAction<ValueType>>;
-    splitValue: (item: ItemType, checked: boolean, value: ValueType) => {
-        value: ValueType;
-        removedValue: ValueType;
+export declare function useCascadeValue<T>(props: Partial<MultiCascaderProps<T[]>> & ItemKeys, flattenData: ItemType[]): {
+    value: T[];
+    setValue: import("react").Dispatch<import("react").SetStateAction<T[]>>;
+    splitValue: (item: ItemType, checked: boolean, value: T[]) => {
+        value: T[];
+        removedValue: T[];
     };
 };
 export {};

package/esm/Nav/Nav.d.ts

@@ -16,7 +16,7 @@ export interface NavProps<T = any> extends WithAsProps, Omit<React.HTMLAttribute
     /** Active key, corresponding to eventkey in <Nav.item>. */
     activeKey?: T;
     /** Callback function triggered after selection */
-    onSelect?: (eventKey: T, event: React.SyntheticEvent) => void;
+    onSelect?: (eventKey: T | undefined, event: React.SyntheticEvent) => void;
 }
 interface NavComponent extends RsRefForwardingComponent<'div', NavProps> {
     Dropdown: typeof Dropdown;

package/esm/Nav/NavContext.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 export interface NavContextProps {
     activeKey: string | null;
-    onSelect: (eventKey: string, event: React.SyntheticEvent) => void;
+    onSelect?: (eventKey: string | undefined, event: React.SyntheticEvent) => void;
 }
 declare const NavContext: React.Context<NavContextProps>;
 export default NavContext;

package/esm/Nav/NavItem.d.ts

@@ -17,7 +17,7 @@ export interface NavItemProps<T = string> extends WithAsProps, Omit<React.HTMLAt
     /** Providing a `href` will render an `<a>` element */
     href?: string;
     /** Select the callback function that the event triggers. */
-    onSelect?: (eventKey: T, event: React.SyntheticEvent) => void;
+    onSelect?: (eventKey: T | undefined, event: React.SyntheticEvent) => void;
 }
 /**
  * The <Nav.Item> API

package/esm/Navbar/Navbar.js

@@ -5,7 +5,7 @@ import NavbarBody from './NavbarBody';
 import NavbarHeader from './NavbarHeader';
 import NavbarBrand from './NavbarBrand';
 import { useClassNames } from '../utils';
-export var NavbarContext = /*#__PURE__*/React.createContext(null);
+export var NavbarContext = /*#__PURE__*/React.createContext(false);
 var Navbar = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var className = props.className,
       _props$as = props.as,

package/esm/Navbar/NavbarItem.d.ts

@@ -13,7 +13,7 @@ export interface NavItemProps<T = string> extends WithAsProps, Omit<React.HTMLAt
     /** Providing a `href` will render an `<a>` element */
     href?: string;
     /** Select the callback function that the event triggers. */
-    onSelect?: (eventKey: T, event: React.SyntheticEvent) => void;
+    onSelect?: (eventKey: T | undefined, event: React.SyntheticEvent) => void;
 }
 declare const NavbarItem: RsRefForwardingComponent<'a', NavItemProps>;
 export default NavbarItem;

package/esm/Overlay/Modal.d.ts

@@ -44,8 +44,8 @@ interface ModalProps extends BaseModalProps {
     containerClassName?: string;
     backdropTransitionTimeout?: number;
     dialogTransitionTimeout?: number;
-    transition: React.ElementType;
-    onEscapeKeyUp?: React.KeyboardEventHandler;
+    transition?: React.ElementType;
+    onEsc?: React.KeyboardEventHandler;
     onBackdropClick?: React.MouseEventHandler;
 }
 declare const Modal: RsRefForwardingComponent<'div', ModalProps>;

package/esm/Overlay/Modal.js

@@ -10,7 +10,7 @@ import on from 'dom-lib/on';
 import ModalManager from './ModalManager';
 import Fade from '../Animation/Fade';
 import { animationPropTypes } from '../Animation/utils';
-import { mergeRefs, getDOMNode, usePortal, createChainedFunction, useWillUnmount } from '../utils';
+import { mergeRefs, usePortal, createChainedFunction, useWillUnmount, KEY_VALUES } from '../utils';
 var manager;
 
 function getManager() {
@@ -25,6 +25,12 @@ var useModalManager = function useModalManager() {
     backdrop: null
   });
   return {
+    get dialog() {
+      var _modal$current;
+
+      return (_modal$current = modal.current) === null || _modal$current === void 0 ? void 0 : _modal$current.dialog;
+    },
+
     add: function add(containerElement, containerClassName) {
       return modalManager.add(modal.current, containerElement, containerClassName);
     },
@@ -67,7 +73,7 @@ var Modal = /*#__PURE__*/React.forwardRef(function (props, ref) {
       _props$autoFocus = props.autoFocus,
       autoFocus = _props$autoFocus === void 0 ? true : _props$autoFocus,
       onBackdropClick = props.onBackdropClick,
-      onEscapeKeyUp = props.onEscapeKeyUp,
+      onEsc = props.onEsc,
       onExit = props.onExit,
       onExiting = props.onExiting,
       onExited = props.onExited,
@@ -76,7 +82,7 @@ var Modal = /*#__PURE__*/React.forwardRef(function (props, ref) {
       onEntered = props.onEntered,
       onClose = props.onClose,
       onOpen = props.onOpen,
-      rest = _objectWithoutPropertiesLoose(props, ["as", "children", "transition", "dialogTransitionTimeout", "style", "className", "container", "animationProps", "containerClassName", "keyboard", "enforceFocus", "backdrop", "backdropTransitionTimeout", "backdropStyle", "backdropClassName", "open", "autoFocus", "onBackdropClick", "onEscapeKeyUp", "onExit", "onExiting", "onExited", "onEnter", "onEntering", "onEntered", "onClose", "onOpen"]);
+      rest = _objectWithoutPropertiesLoose(props, ["as", "children", "transition", "dialogTransitionTimeout", "style", "className", "container", "animationProps", "containerClassName", "keyboard", "enforceFocus", "backdrop", "backdropTransitionTimeout", "backdropStyle", "backdropClassName", "open", "autoFocus", "onBackdropClick", "onEsc", "onExit", "onExiting", "onExited", "onEnter", "onEntering", "onEntered", "onClose", "onOpen"]);
 
   var _useState = useState(!open),
       exited = _useState[0],
@@ -96,19 +102,13 @@ var Modal = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }
 
   var mountModal = open || Transition && !exited;
-  var rootRef = useRef();
-  var lastFocus = useRef();
-  var handleDocumentKeyUp = useCallback(function (event) {
-    if (keyboard && event.keyCode === 27 && modal.isTopModal()) {
-      onEscapeKeyUp === null || onEscapeKeyUp === void 0 ? void 0 : onEscapeKeyUp(event);
+  var lastFocus = useRef(null);
+  var handleDocumentKeyDown = useCallback(function (event) {
+    if (keyboard && event.key === KEY_VALUES.ESC && modal.isTopModal()) {
+      onEsc === null || onEsc === void 0 ? void 0 : onEsc(event);
       onClose === null || onClose === void 0 ? void 0 : onClose(event);
     }
-  }, [keyboard, modal, onEscapeKeyUp, onClose]);
-  var checkForFocus = useCallback(function () {
-    if (canUseDOM) {
-      lastFocus.current = document.activeElement;
-    }
-  }, []);
+  }, [keyboard, modal, onEsc, onClose]);
   var restoreLastFocus = useCallback(function () {
     if (lastFocus.current) {
       var _lastFocus$current$fo, _lastFocus$current;
@@ -117,21 +117,18 @@ var Modal = /*#__PURE__*/React.forwardRef(function (props, ref) {
       lastFocus.current = null;
     }
   }, []);
-  var getDialogElement = useCallback(function () {
-    return getDOMNode(rootRef.current);
-  }, []);
   var handleEnforceFocus = useCallback(function () {
     if (!enforceFocus || !modal.isTopModal()) {
       return;
     }
 
     var currentActiveElement = document.activeElement;
-    var dialog = getDialogElement();
+    var dialog = modal.dialog;
 
     if (dialog && dialog !== currentActiveElement && !contains(dialog, currentActiveElement)) {
       dialog.focus();
     }
-  }, [enforceFocus, getDialogElement, modal]);
+  }, [enforceFocus, modal]);
   var handleBackdropClick = useCallback(function (event) {
     if (event.target !== event.currentTarget) {
       return;
@@ -143,27 +140,40 @@ var Modal = /*#__PURE__*/React.forwardRef(function (props, ref) {
       onClose === null || onClose === void 0 ? void 0 : onClose(event);
     }
   }, [backdrop, onBackdropClick, onClose]);
-  var documentKeyupListener = useRef();
-  var docusinListener = useRef();
+  var documentKeyDownListener = useRef();
+  var documentFocusListener = useRef();
   var handleOpen = useCallback(function () {
-    var dialog = getDialogElement();
     var containerElement = getContainer(container, document.body);
     modal.add(containerElement, containerClassName);
-    documentKeyupListener.current = on(document, 'keydown', handleDocumentKeyUp);
-    docusinListener.current = on(document, 'focus', handleEnforceFocus, true);
-    onOpen === null || onOpen === void 0 ? void 0 : onOpen();
-    checkForFocus();
+
+    if (!documentKeyDownListener.current) {
+      documentKeyDownListener.current = on(document, 'keydown', handleDocumentKeyDown);
+    }
+
+    if (!documentFocusListener.current) {
+      documentFocusListener.current = on(document, 'focus', handleEnforceFocus, true);
+    }
+
+    if (canUseDOM) {
+      lastFocus.current = document.activeElement;
+    }
 
     if (autoFocus) {
-      dialog === null || dialog === void 0 ? void 0 : dialog.focus();
+      var _modal$dialog;
+
+      (_modal$dialog = modal.dialog) === null || _modal$dialog === void 0 ? void 0 : _modal$dialog.focus();
     }
-  }, [autoFocus, checkForFocus, container, containerClassName, getDialogElement, handleDocumentKeyUp, handleEnforceFocus, modal, onOpen]);
+
+    onOpen === null || onOpen === void 0 ? void 0 : onOpen();
+  }, [autoFocus, container, containerClassName, handleDocumentKeyDown, handleEnforceFocus, modal, onOpen]);
   var handleClose = useCallback(function () {
-    var _documentKeyupListene, _docusinListener$curr;
+    var _documentKeyDownListe, _documentFocusListene;
 
     modal.remove();
-    (_documentKeyupListene = documentKeyupListener.current) === null || _documentKeyupListene === void 0 ? void 0 : _documentKeyupListene.off();
-    (_docusinListener$curr = docusinListener.current) === null || _docusinListener$curr === void 0 ? void 0 : _docusinListener$curr.off();
+    (_documentKeyDownListe = documentKeyDownListener.current) === null || _documentKeyDownListe === void 0 ? void 0 : _documentKeyDownListe.off();
+    documentKeyDownListener.current = null;
+    (_documentFocusListene = documentFocusListener.current) === null || _documentFocusListene === void 0 ? void 0 : _documentFocusListene.off();
+    documentFocusListener.current = null;
     restoreLastFocus();
   }, [modal, restoreLastFocus]);
   useEffect(function () {
@@ -264,7 +274,7 @@ Modal.propTypes = _extends({}, animationPropTypes, modalPropTypes, {
   dialogTransitionTimeout: PropTypes.number,
   backdropTransitionTimeout: PropTypes.number,
   transition: PropTypes.any,
-  onEscapeKeyUp: PropTypes.func,
+  onEsc: PropTypes.func,
   onBackdropClick: PropTypes.func
 });
 export default Modal;