rsuite 5.2.4 → 5.4.2

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

@@ -4,14 +4,14 @@ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWith
 
 var _templateObject, _templateObject2;
 
-import React, { useRef, useMemo, useState, useEffect, useCallback } from 'react';
+import React, { useRef, useMemo, useState, 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';
+import { useClassNames, mergeRefs, SIZE, useWillUnmount } from '../utils';
 import ModalDialog, { modalDialogPropTypes } from './ModalDialog';
 import { ModalContext } from './ModalContext';
 import ModalBody from './ModalBody';
@@ -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,
@@ -63,10 +64,14 @@ var Modal = /*#__PURE__*/React.forwardRef(function (props, ref) {
       merge = _useClassNames.merge,
       prefix = _useClassNames.prefix;
 
+  var _useState = useState(false),
+      shake = _useState[0],
+      setShake = _useState[1];
+
   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, {
@@ -89,26 +94,13 @@ var Modal = /*#__PURE__*/React.forwardRef(function (props, ref) {
       isDrawer: drawer
     };
   }, [dialogId, onClose, bodyStyles, drawer]);
-
-  var _useState = useState(false),
-      shake = _useState[0],
-      setShake = _useState[1];
-
-  var handleBackdropClick = useCallback(function () {
-    // 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);
-      });
-    }
-  }, [backdrop]);
   var handleExited = useCallback(function (node) {
     var _transitionEndListene;
 
     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);
@@ -118,11 +110,37 @@ var Modal = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onEntering === null || onEntering === void 0 ? void 0 : onEntering(node);
     onChangeBodyStyles(true);
   }, [onChangeBodyStyles, onEntering]);
-  useEffect(function () {
+  var handleBackdropClick = useCallback(function (e) {
+    if (e.target !== e.currentTarget) {
+      return;
+    } // When the value of `backdrop` is `static`, a jitter animation will be added to the dialog when clicked.
+
+
+    if (backdrop === 'static') {
+      setShake(true);
+
+      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);
+        });
+      }
+
+      return;
+    }
+
+    onClose === null || onClose === void 0 ? void 0 : onClose(e);
+  }, [backdrop, onClose]);
+  var handleClick = useCallback(function (e) {
+    if (dialogRef.current && e.target !== dialogRef.current) {
+      handleBackdropClick(e);
+    }
+  }, [handleBackdropClick]);
+  useWillUnmount(function () {
     var _transitionEndListene2;
 
     (_transitionEndListene2 = transitionEndListener.current) === null || _transitionEndListene2 === void 0 ? void 0 : _transitionEndListene2.off();
-  }, []);
+  });
   return /*#__PURE__*/React.createElement(ModalContext.Provider, {
     value: modalContextValue
   }, /*#__PURE__*/React.createElement(BaseModal, _extends({}, rest, {
@@ -130,7 +148,6 @@ var Modal = /*#__PURE__*/React.forwardRef(function (props, ref) {
     backdrop: backdrop,
     open: open,
     onClose: onClose,
-    onBackdropClick: handleBackdropClick,
     className: prefix(_templateObject || (_templateObject = _taggedTemplateLiteralLoose(["wrapper"]))),
     onEntered: handleEntered,
     onEntering: handleEntering,
@@ -143,7 +160,8 @@ var Modal = /*#__PURE__*/React.forwardRef(function (props, ref) {
     transition: animation ? animation : undefined,
     animationProps: animationProps,
     dialogTransitionTimeout: animationTimeout,
-    backdropTransitionTimeout: 150
+    backdropTransitionTimeout: 150,
+    onClick: backdrop ? handleClick : undefined
   }), function (transitionProps, transitionRef) {
     var transitionClassName = transitionProps.className,
         transitionRest = _objectWithoutPropertiesLoose(transitionProps, ["className"]);

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,50 +5,50 @@ 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
  */
 export declare function useFlattenData(data: ItemDataType[], itemKeys: ItemKeys): {
     addFlattenData: (children: ItemDataType[], parent: ItemDataType) => void;
-    flattenData: ItemDataType[];
+    flattenData: ItemDataType<string | number>[];
 };
 /**
  * A hook for column data
  * @param flattenData
  */
 export declare function useColumnData(flattenData: ItemType[]): {
-    columnData: ItemDataType[][];
+    columnData: ItemDataType<string | number>[][];
     addColumn: (column: ItemDataType[], index: number) => void;
-    setColumnData: import("react").Dispatch<import("react").SetStateAction<ItemDataType[][]>>;
+    setColumnData: import("react").Dispatch<import("react").SetStateAction<ItemDataType<string | number>[][]>>;
     enforceUpdateColumnData: (nextData: ItemDataType[]) => void;
 };
 /**
@@ -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/Nav.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-import React, { useContext } from 'react';
+import React, { useContext, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import NavItem from './NavItem';
 import Dropdown from '../Dropdown';
@@ -55,13 +55,17 @@ var Nav = /*#__PURE__*/React.forwardRef(function (props, ref) {
       onSelectFromSidenav = _ref$onSelect === void 0 ? onSelectProp : _ref$onSelect;
 
   var activeKey = activeKeyProp !== null && activeKeyProp !== void 0 ? activeKeyProp : activeKeyFromSidenav;
+  var contextValue = useMemo(function () {
+    return {
+      withinNav: true,
+      activeKey: activeKey,
+      onSelect: onSelectProp !== null && onSelectProp !== void 0 ? onSelectProp : onSelectFromSidenav
+    };
+  }, [activeKey, onSelectFromSidenav, onSelectProp]);
 
   if (sidenav !== null && sidenav !== void 0 && sidenav.expanded) {
     return /*#__PURE__*/React.createElement(NavContext.Provider, {
-      value: {
-        activeKey: activeKey,
-        onSelect: onSelectProp !== null && onSelectProp !== void 0 ? onSelectProp : onSelectFromSidenav
-      }
+      value: contextValue
     }, /*#__PURE__*/React.createElement("ul", _extends({
       ref: ref,
       className: classes
@@ -72,10 +76,7 @@ var Nav = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
   if (sidenav) {
     return /*#__PURE__*/React.createElement(NavContext.Provider, {
-      value: {
-        activeKey: activeKey,
-        onSelect: onSelectProp !== null && onSelectProp !== void 0 ? onSelectProp : onSelectFromSidenav
-      }
+      value: contextValue
     }, /*#__PURE__*/React.createElement(Menubar, {
       vertical: !!sidenav
     }, function (menubar, ref) {
@@ -88,10 +89,7 @@ var Nav = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }
 
   return /*#__PURE__*/React.createElement(NavContext.Provider, {
-    value: {
-      activeKey: activeKey,
-      onSelect: onSelectProp !== null && onSelectProp !== void 0 ? onSelectProp : onSelectFromSidenav
-    }
+    value: contextValue
   }, /*#__PURE__*/React.createElement(Component, _extends({}, rest, {
     ref: menubarRef,
     className: classes

package/esm/Nav/NavContext.d.ts

@@ -1,7 +1,13 @@
 import React from 'react';
 export interface NavContextProps {
+    /**
+     * Whether component is rendered within a <Nav>
+     *
+     * FIXME: Bad design. Should use NavContextProps | null to determin whether within a <Nav>
+     */
+    withinNav: boolean;
     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/NavContext.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import noop from 'lodash/noop';
 var NavContext = /*#__PURE__*/React.createContext({
+  withinNav: false,
   activeKey: null,
   onSelect: noop
 });

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/Navbar/index.d.ts

@@ -3,4 +3,5 @@ export type { NavbarProps } from './Navbar';
 export type { NavbarBodyProps } from './NavbarBody';
 export type { NavbarHeaderProps } from './NavbarHeader';
 export type { NavbarBrandProps } from './NavbarBrand';
+export { NavbarContext } from './Navbar';
 export default Navbar;

package/esm/Navbar/index.js

@@ -1,2 +1,3 @@
 import Navbar from './Navbar';
+export { NavbarContext } from './Navbar';
 export default Navbar;

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>;