rsuite 6.1.2 → 6.1.3

package/cjs/Menu/MenuItem.js

@@ -36,11 +36,10 @@ const MenuItem = (0, _utils.forwardRef)((props, ref) => {
     prefix
   } = (0, _hooks.useStyles)(classPrefix);
   const handleSelectItem = (0, _react.useCallback)(event => {
-    var _menu$onSelect;
-    onSelect === null || onSelect === void 0 || onSelect(eventKey, event);
-    menu === null || menu === void 0 || (_menu$onSelect = menu.onSelect) === null || _menu$onSelect === void 0 || _menu$onSelect.call(menu, eventKey, event);
+    onSelect?.(eventKey, event);
+    menu?.onSelect?.(eventKey, event);
   }, [onSelect, eventKey, menu]);
-  const selected = activeProp || !(0, _isNil.default)(eventKey) && (0, _utils.shallowEqual)(menu === null || menu === void 0 ? void 0 : menu.activeKey, eventKey);
+  const selected = activeProp || !(0, _isNil.default)(eventKey) && (0, _utils.shallowEqual)(menu?.activeKey, eventKey);
   const renderMenuItem = (0, _useRenderMenuItem.useRenderMenuItem)(as);
   return /*#__PURE__*/_react.default.createElement(_MenuItem.default, {
     selected: selected,

package/cjs/Message/Message.js

@@ -56,7 +56,7 @@ const Message = (0, _utils.forwardRef)((props, ref) => {
   });
   const handleClose = (0, _hooks.useEventCallback)(event => {
     setDisplay('hiding');
-    onClose === null || onClose === void 0 || onClose(event);
+    onClose?.(event);
     clear();
     setTimeout(() => {
       if (isMounted()) {

package/cjs/Modal/Modal.js

@@ -99,18 +99,17 @@ const Modal = (0, _utils.forwardRef)((props, ref) => {
     isDrawer
   }), [dialogId, onClose, closeButton, isDrawer, bodyStyles]);
   const handleExited = (0, _react.useCallback)(node => {
-    var _transitionEndListene;
-    onExited === null || onExited === void 0 || onExited(node);
+    onExited?.(node);
     onDestroyEvents();
-    (_transitionEndListene = transitionEndListener.current) === null || _transitionEndListene === void 0 || _transitionEndListene.off();
+    transitionEndListener.current?.off();
     transitionEndListener.current = null;
   }, [onDestroyEvents, onExited]);
   const handleEntered = (0, _react.useCallback)(node => {
-    onEntered === null || onEntered === void 0 || onEntered(node);
+    onEntered?.(node);
     onChangeBodyStyles();
   }, [onChangeBodyStyles, onEntered]);
   const handleEntering = (0, _react.useCallback)(node => {
-    onEntering === null || onEntering === void 0 || onEntering(node);
+    onEntering?.(node);
     onChangeBodyStyles(true);
   }, [onChangeBodyStyles, onEntering]);
   const backdropClick = (0, _react.useRef)(null);
@@ -145,11 +144,10 @@ const Modal = (0, _utils.forwardRef)((props, ref) => {
       }
       return;
     }
-    onClose === null || onClose === void 0 || onClose(event);
+    onClose?.(event);
   }, [backdrop, onClose]);
   (0, _hooks.useWillUnmount)(() => {
-    var _transitionEndListene2;
-    (_transitionEndListene2 = transitionEndListener.current) === null || _transitionEndListene2 === void 0 || _transitionEndListene2.off();
+    transitionEndListener.current?.off();
   });
   let sizeKey = 'width';
   if (isDrawer) {
@@ -206,8 +204,8 @@ const Modal = (0, _utils.forwardRef)((props, ref) => {
     return /*#__PURE__*/_react.default.createElement(Dialog, (0, _extends2.default)({
       role: role,
       id: dialogId,
-      "aria-labelledby": ariaLabelledby !== null && ariaLabelledby !== void 0 ? ariaLabelledby : `${dialogId}-title`,
-      "aria-describedby": ariaDescribedby !== null && ariaDescribedby !== void 0 ? ariaDescribedby : `${dialogId}-description`,
+      "aria-labelledby": ariaLabelledby ?? `${dialogId}-title`,
+      "aria-describedby": ariaDescribedby ?? `${dialogId}-description`,
       style: {
         [sizeKey]: modalSizes.includes(size) ? undefined : size
       }

package/cjs/Modal/ModalBody.js

@@ -35,7 +35,7 @@ const ModalBody = (0, _utils.forwardRef)((props, ref) => {
     dialogId,
     onModalClose
   } = context || {};
-  const bodyStyles = getBodyStyles === null || getBodyStyles === void 0 ? void 0 : getBodyStyles();
+  const bodyStyles = getBodyStyles?.();
   let buttonElement = null;
   if (closeButton) {
     buttonElement = typeof closeButton === 'boolean' ? /*#__PURE__*/_react.default.createElement(_IconButton.default, {

package/cjs/Modal/utils.d.ts

@@ -1,8 +1,7 @@
-/// <reference types="react" />
 import type { Size } from '../internals/types';
 export type ModalSize = Size | 'full' | number | string;
 export declare const useBodyStyles: (ref: React.RefObject<HTMLElement | null>, options: {
     overflow: boolean;
-    size?: ModalSize | undefined;
+    size?: ModalSize;
     prefix: (...classes: any) => string;
-}) => [import("react").CSSProperties | null, (entering?: boolean) => void, () => void];
+}) => [React.CSSProperties | null, (entering?: boolean) => void, () => void];

package/cjs/Modal/utils.js

@@ -63,9 +63,8 @@ const useBodyStyles = (ref, options) => {
     setBodyStyles(styles);
   }, [prefix, ref]);
   const onDestroyEvents = (0, _react.useCallback)(() => {
-    var _windowResizeListener, _windowResizeListener2, _contentElementResize;
-    (_windowResizeListener = windowResizeListener.current) === null || _windowResizeListener === void 0 || (_windowResizeListener2 = _windowResizeListener.off) === null || _windowResizeListener2 === void 0 || _windowResizeListener2.call(_windowResizeListener);
-    (_contentElementResize = contentElementResizeObserver.current) === null || _contentElementResize === void 0 || _contentElementResize.disconnect();
+    windowResizeListener.current?.off?.();
+    contentElementResizeObserver.current?.disconnect();
     windowResizeListener.current = null;
     contentElementResizeObserver.current = null;
   }, []);

package/cjs/MultiCascadeTree/SearchView.js

@@ -69,7 +69,7 @@ function SearchView(props) {
       childrenKey
     });
     const handleChange = (_value, checked, event) => {
-      onCheck === null || onCheck === void 0 || onCheck(item, event, checked);
+      onCheck?.(item, event, checked);
     };
     return /*#__PURE__*/_react.default.createElement("div", {
       role: "treeitem",

package/cjs/MultiCascadeTree/TreeView.js

@@ -63,7 +63,7 @@ const TreeView = (0, _utils.forwardRef)((props, ref) => {
   };
   const handleSelect = (0, _hooks.useEventCallback)((layer, node, event) => {
     const cascadePaths = getCascadePaths(layer + 1, node);
-    onSelect === null || onSelect === void 0 || onSelect(node, cascadePaths, event);
+    onSelect?.(node, cascadePaths, event);
   });
   const renderCascadeNode = nodeProps => {
     const {
@@ -108,7 +108,7 @@ const TreeView = (0, _utils.forwardRef)((props, ref) => {
         childrenKey
       }),
       onSelectItem: (_value, event) => handleSelect(layer, node, event),
-      onCheck: (_value, event, checked) => onCheck === null || onCheck === void 0 ? void 0 : onCheck(node, event, checked),
+      onCheck: (_value, event, checked) => onCheck?.(node, event, checked),
       checkable: !uncheckable,
       labelClickable: false
     }, renderTreeNode ? renderTreeNode(label, node) : label, children ? /*#__PURE__*/_react.default.createElement(Icon, {

package/cjs/MultiCascadeTree/hooks/useCascadeValue.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { MultiCascadeTreeProps, ItemKeys } from '../types';
 import { type ItemType } from '../utils';
 /**

package/cjs/MultiCascadeTree/hooks/useCascadeValue.js

@@ -74,11 +74,11 @@ function useCascadeValue(props, flattenData) {
       // Then determine whether all the child nodes of these nodes are selected, and then they themselves must be selected
       for (let i = 0; i < parents.length; i++) {
         // Whether the parent node can be selected
-        const isCheckableParent = !(uncheckableItemValues !== null && uncheckableItemValues !== void 0 && uncheckableItemValues.some(v => v === parents[i][valueKey]));
+        const isCheckableParent = !uncheckableItemValues?.some(v => v === parents[i][valueKey]);
         if (isCheckableParent) {
           const isCheckAll = parents[i][childrenKey]
           // Filter out options that are marked as not selectable
-          .filter(n => !(uncheckableItemValues !== null && uncheckableItemValues !== void 0 && uncheckableItemValues.some(v => v === n[valueKey])))
+          .filter(n => !uncheckableItemValues?.some(v => v === n[valueKey]))
           // Check if all nodes are selected
           .every(n => nextValue.some(v => v === n[valueKey]));
           if (isCheckAll) {
@@ -141,10 +141,7 @@ function useCascadeValue(props, flattenData) {
     // Finally traverse all nextValue, and delete if its parent node is also nextValue
     return nextValue.filter(v => {
       const item = flattenData.find(n => n[valueKey] === v);
-      if (item !== null && item !== void 0 && item.parent && nextValue.some(v => {
-        var _item$parent;
-        return v === ((_item$parent = item.parent) === null || _item$parent === void 0 ? void 0 : _item$parent[valueKey]);
-      })) {
+      if (item?.parent && nextValue.some(v => v === item.parent?.[valueKey])) {
         return false;
       }
       return true;
@@ -169,8 +166,8 @@ function useCascadeValue(props, flattenData) {
       }
     }
     setValue(nextValue);
-    onChange === null || onChange === void 0 || onChange(nextValue, event);
-    onCheck === null || onCheck === void 0 || onCheck(nextValue, node, checked, event);
+    onChange?.(nextValue, event);
+    onCheck?.(nextValue, node, checked, event);
   });
   return {
     value,

package/cjs/MultiCascadeTree/hooks/useColumnData.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 type MayHasParent<T extends Record<string, unknown>> = T & {
     parent?: MayHasParent<T>;
 };

package/cjs/MultiCascadeTree/hooks/useSearch.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { Option } from '../../internals/types';
 interface SearchPanelProps<T> {
     labelKey: string;

package/cjs/MultiCascadeTree/hooks/useSearch.js

@@ -18,7 +18,7 @@ function useSearch(props) {
   const getSearchResult = () => {
     const items = [];
     const result = flattenedData.filter(item => {
-      if (uncheckableItemValues !== null && uncheckableItemValues !== void 0 && uncheckableItemValues.some(value => item[valueKey] === value)) {
+      if (uncheckableItemValues?.some(value => item[valueKey] === value)) {
         return false;
       }
       if (item[labelKey].match(new RegExp((0, _utils.getSafeRegExpString)(searchKeyword), 'i'))) {
@@ -38,7 +38,7 @@ function useSearch(props) {
   };
   const handleSearch = (0, _hooks.useEventCallback)((value, event) => {
     setSearchKeyword(value);
-    onSearch === null || onSearch === void 0 || onSearch(value, event);
+    onSearch?.(value, event);
   });
   return {
     searchKeyword,

package/cjs/MultiCascadeTree/hooks/useSelect.js

@@ -43,12 +43,11 @@ const useSelect = props => {
   // The path after cascading data selection.
   const [selectedPaths, setSelectedPaths] = (0, _react.useState)();
   const handleSelect = (0, _hooks.useEventCallback)((node, cascadePaths, event) => {
-    var _node$childrenKey, _node$childrenKey2;
     setSelectedPaths(cascadePaths);
     const columnIndex = cascadePaths.length;
 
     // Lazy load node's children
-    if (typeof getChildren === 'function' && ((_node$childrenKey = node[childrenKey]) === null || _node$childrenKey === void 0 ? void 0 : _node$childrenKey.length) === 0) {
+    if (typeof getChildren === 'function' && node[childrenKey]?.length === 0) {
       node.loading = true;
       const children = getChildren(node);
       if (children instanceof Promise) {
@@ -66,13 +65,13 @@ const useSelect = props => {
         addFlattenData(children, node);
         addColumn(children, columnIndex);
       }
-    } else if ((_node$childrenKey2 = node[childrenKey]) !== null && _node$childrenKey2 !== void 0 && _node$childrenKey2.length) {
+    } else if (node[childrenKey]?.length) {
       addColumn(node[childrenKey], columnIndex);
     } else {
       // Removes subsequent columns of the current column when the clicked node is a leaf node.
       removeColumnByIndex(columnIndex);
     }
-    onSelect === null || onSelect === void 0 || onSelect(node, cascadePaths, event);
+    onSelect?.(node, cascadePaths, event);
   });
   return {
     columnData,

package/cjs/MultiCascadeTree/types.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { CascadeTreeProps } from '../CascadeTree/types';
 import type { Option, ToArray } from '../internals/types';
 export interface ItemKeys {

package/cjs/MultiCascadeTree/utils.d.ts

@@ -21,17 +21,17 @@ export declare function getNodeParents(node: any, parentKey?: string, valueKey?:
  * @param value
  * @param itemKeys
  */
-export declare const isSomeChildChecked: <T extends Record<string, unknown>>(node: T, value: T[], itemKeys: Omit<ItemKeys, 'labelKey'>) => any;
+export declare const isSomeChildChecked: <T extends Record<string, unknown>>(node: T, value: T[], itemKeys: Omit<ItemKeys, "labelKey">) => any;
 /**
  * Check if the parent is selected.
  * @param node
  * @param value
  * @param itemKeys
  */
-export declare const isSomeParentChecked: <T extends Record<string, unknown>>(node: MayHasParent<T>, value: T[], itemKeys: Pick<ItemKeys, 'valueKey'>) => any;
-export declare const getOtherItemValuesByUnselectChild: <T>(itemNode: ItemType, value: any, itemKeys: Omit<ItemKeys, 'labelKey'>) => T[];
+export declare const isSomeParentChecked: <T extends Record<string, unknown>>(node: MayHasParent<T>, value: T[], 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: <T>(value: T[], item: ItemType, itemKeys: Omit<ItemKeys, 'labelKey'>) => T[] | undefined;
+export declare const removeAllChildrenValue: <T>(value: T[], item: ItemType, itemKeys: Omit<ItemKeys, "labelKey">) => T[] | undefined;
 export {};

package/cjs/MultiCascadeTree/utils.js

@@ -13,7 +13,7 @@ var _remove = _interopRequireDefault(require("lodash/remove"));
 function getNodeParents(node, parentKey = 'parent', valueKey) {
   const parents = [];
   const traverse = node => {
-    if (node !== null && node !== void 0 && node[parentKey]) {
+    if (node?.[parentKey]) {
       traverse(node[parentKey]);
       if (valueKey) {
         parents.push(node[parentKey][valueKey]);
@@ -41,11 +41,10 @@ const isSomeChildChecked = (node, value, itemKeys) => {
     return false;
   }
   return node[childrenKey].some(child => {
-    var _child$childrenKey;
     if (value.some(n => n === child[valueKey])) {
       return true;
     }
-    if ((_child$childrenKey = child[childrenKey]) !== null && _child$childrenKey !== void 0 && _child$childrenKey.length) {
+    if (child[childrenKey]?.length) {
       return isSomeChildChecked(child, value, itemKeys);
     }
     return false;

package/cjs/MultiCascader/MultiCascader.js

@@ -26,7 +26,6 @@ const emptyArray = [];
  * @see https://rsuitejs.com/components/multi-cascader/
  */
 const MultiCascader = (0, _utils3.forwardRef)((props, ref) => {
-  var _selectedPaths;
   const {
     propsWithDefaults,
     rtl
@@ -87,9 +86,8 @@ const MultiCascader = (0, _utils3.forwardRef)((props, ref) => {
     merge
   } = (0, _hooks.useStyles)(classPrefix);
   const onSelectCallback = (0, _react.useCallback)((node, cascadePaths, event) => {
-    var _trigger$current, _trigger$current$upda;
-    onSelect === null || onSelect === void 0 || onSelect(node, cascadePaths, event);
-    (_trigger$current = trigger.current) === null || _trigger$current === void 0 || (_trigger$current$upda = _trigger$current.updatePosition) === null || _trigger$current$upda === void 0 || _trigger$current$upda.call(_trigger$current);
+    onSelect?.(node, cascadePaths, event);
+    trigger.current?.updatePosition?.();
   }, [onSelect, trigger]);
   const {
     selectedPaths,
@@ -144,22 +142,22 @@ const MultiCascader = (0, _utils3.forwardRef)((props, ref) => {
     setLayer,
     setKeys,
     onKeyDown: onFocusItem
-  } = (0, _Picker.useFocusItemValue)(selectedPaths === null || selectedPaths === void 0 || (_selectedPaths = selectedPaths[selectedPaths.length - 1]) === null || _selectedPaths === void 0 ? void 0 : _selectedPaths[valueKey], {
+  } = (0, _Picker.useFocusItemValue)(selectedPaths?.[selectedPaths.length - 1]?.[valueKey], {
     rtl,
     data: flattenData,
     valueKey,
-    defaultLayer: selectedPaths !== null && selectedPaths !== void 0 && selectedPaths.length ? selectedPaths.length - 1 : 0,
+    defaultLayer: selectedPaths?.length ? selectedPaths.length - 1 : 0,
     target: () => overlay.current,
     callback: onFocusItemCallback
   });
   const onSearchCallback = (value, event) => {
     if (value) {
       setLayer(0);
-    } else if (selectedPaths !== null && selectedPaths !== void 0 && selectedPaths.length) {
+    } else if (selectedPaths?.length) {
       setLayer(selectedPaths.length - 1);
     }
     setKeys([]);
-    onSearch === null || onSearch === void 0 || onSearch(value, event);
+    onSearch?.(value, event);
   };
   const {
     items,
@@ -190,14 +188,13 @@ const MultiCascader = (0, _utils3.forwardRef)((props, ref) => {
     setSelectedPaths([]);
     setValue([]);
     setColumnData([data]);
-    onChange === null || onChange === void 0 || onChange([], event);
+    onChange?.([], event);
   });
   const handleMenuPressEnter = (0, _hooks.useEventCallback)(event => {
-    var _overlay$current;
     const focusItem = (0, _utils.findNodeOfTree)(data, item => item[valueKey] === focusItemValue);
-    const checkbox = (_overlay$current = overlay.current) === null || _overlay$current === void 0 ? void 0 : _overlay$current.querySelector(`[data-key="${focusItemValue}"] [type="checkbox"]`);
+    const checkbox = overlay.current?.querySelector(`[data-key="${focusItemValue}"] [type="checkbox"]`);
     if (checkbox) {
-      handleCheck(focusItem, event, (checkbox === null || checkbox === void 0 ? void 0 : checkbox.getAttribute('aria-checked')) !== 'true');
+      handleCheck(focusItem, event, checkbox?.getAttribute('aria-checked') !== 'true');
     }
   });
   const onPickerKeyDown = (0, _Picker.useToggleKeyDownEvent)({
@@ -265,7 +262,7 @@ const MultiCascader = (0, _utils3.forwardRef)((props, ref) => {
       onCheck: handleCheck,
       renderColumn: renderCascadeColumn,
       renderTreeNode: renderCascadeTreeNode
-    }), renderExtraFooter === null || renderExtraFooter === void 0 ? void 0 : renderExtraFooter());
+    }), renderExtraFooter?.());
   };
   let selectedElement = placeholder;
   if (selectedItems.length > 0) {
@@ -286,9 +283,9 @@ const MultiCascader = (0, _utils3.forwardRef)((props, ref) => {
    * 1.Have a value and the value is valid.
    * 2.Regardless of whether the value is valid, as long as renderValue is set, it is judged to have a value.
    */
-  let hasValue = selectedItems.length > 0 || Number(valueProp === null || valueProp === void 0 ? void 0 : valueProp.length) > 0 && (0, _isFunction.default)(renderValue);
+  let hasValue = selectedItems.length > 0 || Number(valueProp?.length) > 0 && (0, _isFunction.default)(renderValue);
   if (hasValue && (0, _isFunction.default)(renderValue)) {
-    selectedElement = renderValue(value.length ? value : valueProp !== null && valueProp !== void 0 ? valueProp : [], selectedItems, selectedElement);
+    selectedElement = renderValue(value.length ? value : valueProp ?? [], selectedItems, selectedElement);
     // If renderValue returns null or undefined, hasValue is false.
     if ((0, _isNil.default)(selectedElement)) {
       hasValue = false;
@@ -329,7 +326,7 @@ const MultiCascader = (0, _utils3.forwardRef)((props, ref) => {
     placement: placement,
     inputValue: value,
     size: size
-  }, rest), selectedElement || (locale === null || locale === void 0 ? void 0 : locale.placeholder)));
+  }, rest), selectedElement || locale?.placeholder));
 });
 MultiCascader.displayName = 'MultiCascader';
 var _default = exports.default = MultiCascader;

package/cjs/Nav/AdaptiveNavItem.js

@@ -32,17 +32,16 @@ const AdaptiveNavItem = (0, _utils.forwardRef)((props, ref) => {
   const parentNavMenu = (0, _react.useContext)(_NavMenu.NavMenuContext);
   const navbar = (0, _react.useContext)(_NavbarContext.NavbarContext);
   const sidenav = (0, _react.useContext)(_SidenavContext.SidenavContext);
-  const [, dispatch] = parentNavMenu !== null && parentNavMenu !== void 0 ? parentNavMenu : [];
+  const [, dispatch] = parentNavMenu ?? [];
   const _id = (0, _hooks.useInternalId)('Nav.Item');
   (0, _react.useEffect)(() => {
     if (dispatch) {
-      var _props$active;
       dispatch({
         type: _NavMenu.NavMenuActionType.RegisterItem,
         payload: {
           _id,
           eventKey: props.eventKey,
-          active: (_props$active = props.active) !== null && _props$active !== void 0 ? _props$active : false
+          active: props.active ?? false
         }
       });
       return () => {

package/cjs/Nav/Nav.d.ts

@@ -49,7 +49,7 @@ declare const Nav: import("../internals/types").InternalRefForwardingComponent<"
      */
     Dropdown: import("../internals/types").InternalRefForwardingComponent<"div", import("./NavDropdown").NavDropdownProps<any>, never> & {
         Item: import("../internals/types").InternalRefForwardingComponent<"li", import("./NavDropdownItem").NavDropdownItemProps<any>, never> & Record<string, never>;
-        Menu: React.ForwardRefExoticComponent<import("./NavDropdownMenu").NavDropdownMenuProps<any> & import("../internals/types").SanitizedHTMListProps<HTMLElement, React.HTMLAttributes<HTMLElement>> & React.RefAttributes<HTMLElement>>;
+        Menu: React.ForwardRefExoticComponent<import("./NavDropdownMenu").NavDropdownMenuProps<any> & import("../internals/types").SanitizedHTMListProps & React.RefAttributes<HTMLElement>>;
     };
     Item: import("../internals/types").InternalRefForwardingComponent<"a", import("./NavItem").NavItemProps<string | number>, never> & Record<string, never>;
     Menu: React.ForwardRefExoticComponent<import("./NavMenu").NavMenuProps & React.RefAttributes<any>>;

package/cjs/Nav/Nav.js

@@ -80,16 +80,16 @@ const Nav = (0, _utils.forwardRef)((props, ref) => {
     activeKey: activeKeyFromSidenav,
     onSelect: onSelectFromSidenav
   } = sidenav || {};
-  const [activeKey, setActiveKey] = (0, _hooks.useControlled)(activeKeyProp !== null && activeKeyProp !== void 0 ? activeKeyProp : activeKeyFromSidenav, defaultActiveKey);
+  const [activeKey, setActiveKey] = (0, _hooks.useControlled)(activeKeyProp ?? activeKeyFromSidenav, defaultActiveKey);
   const contextValue = (0, _react.useMemo)(() => ({
     activeKey,
     onSelect: (eventKey, event) => {
       setActiveKey(eventKey);
-      onSelectProp === null || onSelectProp === void 0 || onSelectProp(eventKey, event);
-      onSelectFromSidenav === null || onSelectFromSidenav === void 0 || onSelectFromSidenav(eventKey, event);
+      onSelectProp?.(eventKey, event);
+      onSelectFromSidenav?.(eventKey, event);
     }
   }), [activeKey, onSelectFromSidenav, onSelectProp, setActiveKey]);
-  if (sidenav !== null && sidenav !== void 0 && sidenav.expanded) {
+  if (sidenav?.expanded) {
     return /*#__PURE__*/_react.default.createElement(_NavContext.default.Provider, {
       value: contextValue
     }, /*#__PURE__*/_react.default.createElement("ul", (0, _extends2.default)({

package/cjs/Nav/NavDropdown.d.ts

@@ -54,6 +54,6 @@ export interface NavDropdownProps<T = any> extends BoxProps, SanitizedHTMListPro
  */
 declare const NavDropdown: import("../internals/types").InternalRefForwardingComponent<"div", NavDropdownProps<any>, never> & {
     Item: import("../internals/types").InternalRefForwardingComponent<"li", import("./NavDropdownItem").NavDropdownItemProps<any>, never> & Record<string, never>;
-    Menu: React.ForwardRefExoticComponent<import("./NavDropdownMenu").NavDropdownMenuProps<any> & SanitizedHTMListProps<HTMLElement, React.HTMLAttributes<HTMLElement>> & React.RefAttributes<HTMLElement>>;
+    Menu: React.ForwardRefExoticComponent<import("./NavDropdownMenu").NavDropdownMenuProps<any> & SanitizedHTMListProps & React.RefAttributes<HTMLElement>>;
 };
 export default NavDropdown;

package/cjs/Nav/NavDropdown.js

@@ -108,11 +108,11 @@ const NavDropdown = (0, _utils.forwardRef)((props, ref) => {
       }, popupProps), children);
     },
     onToggleMenu: (open, event) => {
-      onToggle === null || onToggle === void 0 || onToggle(open, eventKey, event);
+      onToggle?.(open, eventKey, event);
       if (open) {
-        onOpen === null || onOpen === void 0 || onOpen();
+        onOpen?.();
       } else {
-        onClose === null || onClose === void 0 || onClose();
+        onClose?.();
       }
     }
   }, ({

package/cjs/Nav/NavDropdownItem.js

@@ -46,8 +46,8 @@ const NavDropdownItem = (0, _utils.forwardRef)((props, ref) => {
   } = (0, _hooks.useStyles)(classPrefix);
   const selected = activeProp || !(0, _isNil.default)(eventKey) && (0, _utils.shallowEqual)(activeKey, eventKey);
   const handleSelectItem = (0, _react.useCallback)(event => {
-    onSelect === null || onSelect === void 0 || onSelect(eventKey, event);
-    onSelectFromNav === null || onSelectFromNav === void 0 || onSelectFromNav(eventKey, event);
+    onSelect?.(eventKey, event);
+    onSelectFromNav?.(eventKey, event);
   }, [onSelect, eventKey, onSelectFromNav]);
   const renderDropdownItem = (0, _useRenderMenuItem.useRenderMenuItem)(as);
   if (divider) {

package/cjs/Nav/NavDropdownMenu.d.ts

@@ -42,5 +42,5 @@ export interface NavDropdownMenuProps<T = any> extends StandardProps, Deprecated
 /**
  * @private
  */
-declare const NavDropdownMenu: React.ForwardRefExoticComponent<NavDropdownMenuProps<any> & SanitizedHTMListProps<HTMLElement, React.HTMLAttributes<HTMLElement>> & React.RefAttributes<HTMLElement>>;
+declare const NavDropdownMenu: React.ForwardRefExoticComponent<NavDropdownMenuProps<any> & SanitizedHTMListProps & React.RefAttributes<HTMLElement>>;
 export default NavDropdownMenu;

package/cjs/Nav/NavDropdownMenu.js

@@ -37,7 +37,7 @@ const NavDropdownMenu = /*#__PURE__*/_react.default.forwardRef((props, ref) => {
     rtl
   } = (0, _hooks.useCustom)();
   const handleToggleSubmenu = (0, _react.useCallback)((open, event) => {
-    onToggle === null || onToggle === void 0 || onToggle(open, eventKey, event);
+    onToggle?.(open, eventKey, event);
   }, [eventKey, onToggle]);
   const {
     prefix

package/cjs/Nav/NavItem.js

@@ -48,10 +48,10 @@ const NavItem = (0, _utils.forwardRef)((props, ref) => {
     activeKey,
     onSelect: onSelectFromNav
   } = nav;
-  const active = activeProp !== null && activeProp !== void 0 ? activeProp : !(0, _isNil.default)(eventKey) && (0, _utils.shallowEqual)(eventKey, activeKey);
+  const active = activeProp ?? (!(0, _isNil.default)(eventKey) && (0, _utils.shallowEqual)(eventKey, activeKey));
   const emitSelect = (0, _react.useCallback)(event => {
-    onSelectProp === null || onSelectProp === void 0 || onSelectProp(eventKey, event);
-    onSelectFromNav === null || onSelectFromNav === void 0 || onSelectFromNav(eventKey, event);
+    onSelectProp?.(eventKey, event);
+    onSelectFromNav?.(eventKey, event);
   }, [eventKey, onSelectProp, onSelectFromNav]);
   const {
     withPrefix,
@@ -62,7 +62,7 @@ const NavItem = (0, _utils.forwardRef)((props, ref) => {
   const handleClick = (0, _react.useCallback)(event => {
     if (!disabled) {
       emitSelect(event);
-      onClick === null || onClick === void 0 || onClick(event);
+      onClick?.(event);
     }
   }, [disabled, emitSelect, onClick]);
   if (divider) {

package/cjs/Navbar/Navbar.js

@@ -47,7 +47,7 @@ const Navbar = (0, _utils.forwardRef)((props, ref) => {
   const [open, setOpen] = (0, _hooks.useControlled)(drawerOpen, false);
   const handleToggle = (0, _hooks.useEventCallback)(nextOpen => {
     setOpen(nextOpen);
-    onDrawerOpenChange === null || onDrawerOpenChange === void 0 || onDrawerOpenChange(nextOpen);
+    onDrawerOpenChange?.(nextOpen);
   });
   const navbarId = (0, _hooks.useUniqueId)('navbar-');
   const context = (0, _react.useMemo)(() => ({

package/cjs/Navbar/NavbarContent.js

@@ -26,7 +26,7 @@ const NavbarContent = /*#__PURE__*/_react.default.forwardRef((props, ref) => {
   } = (0, _hooks.useStyles)(classPrefix);
   const classes = merge(className, withPrefix());
   const onClose = (0, _react.useCallback)(() => {
-    onToggle === null || onToggle === void 0 || onToggle(false);
+    onToggle?.(false);
   }, [onToggle]);
   return /*#__PURE__*/_react.default.createElement(_Box.default, (0, _extends2.default)({
     ref: ref,

package/cjs/Navbar/NavbarDrawer.js

@@ -28,7 +28,7 @@ const NavbarDrawer = /*#__PURE__*/_react.default.forwardRef((props, ref) => {
     ...rest
   } = props;
   const handleClose = (0, _hooks.useEventCallback)(() => {
-    onToggle === null || onToggle === void 0 || onToggle(false);
+    onToggle?.(false);
   });
   return /*#__PURE__*/_react.default.createElement(NavDrawer, (0, _extends2.default)({
     ref: ref,

package/cjs/Navbar/NavbarDropdown.d.ts

@@ -45,6 +45,6 @@ export interface NavbarDropdownProps<T = any> extends BoxProps, Omit<React.HTMLA
  */
 declare const NavbarDropdown: import("../internals/types").InternalRefForwardingComponent<"div", NavbarDropdownProps<any>, never> & {
     Item: import("../internals/types").InternalRefForwardingComponent<"li", import("../Nav/NavDropdownItem").NavDropdownItemProps<any>, never> & Record<string, never>;
-    Menu: React.ForwardRefExoticComponent<import("../Nav/NavDropdownMenu").NavDropdownMenuProps<any> & import("../internals/types").SanitizedHTMListProps<HTMLElement, React.HTMLAttributes<HTMLElement>> & React.RefAttributes<HTMLElement>>;
+    Menu: React.ForwardRefExoticComponent<import("../Nav/NavDropdownMenu").NavDropdownMenuProps<any> & import("../internals/types").SanitizedHTMListProps & React.RefAttributes<HTMLElement>>;
 };
 export default NavbarDropdown;

package/cjs/Navbar/NavbarDropdown.js

@@ -60,11 +60,11 @@ const NavbarDropdown = (0, _utils.forwardRef)((props, ref) => {
     trigger: (0, _castArray.default)(trigger),
     hideOnClickOutside: true,
     onToggle: open => {
-      onToggle === null || onToggle === void 0 || onToggle(open);
+      onToggle?.(open);
       if (open) {
-        onOpen === null || onOpen === void 0 || onOpen();
+        onOpen?.();
       } else {
-        onClose === null || onClose === void 0 || onClose();
+        onClose?.();
       }
     }
   }, ({

package/cjs/Navbar/NavbarDropdownItem.js

@@ -43,18 +43,17 @@ const NavbarDropdownItem = (0, _utils.forwardRef)((props, ref) => {
     prefix
   } = (0, _hooks.useStyles)(classPrefix);
   const handleSelectItem = (0, _react.useCallback)(event => {
-    var _nav$onSelect;
-    onSelect === null || onSelect === void 0 || onSelect(eventKey, event);
-    (_nav$onSelect = nav.onSelect) === null || _nav$onSelect === void 0 || _nav$onSelect.call(nav, eventKey, event);
+    onSelect?.(eventKey, event);
+    nav.onSelect?.(eventKey, event);
   }, [onSelect, eventKey, nav]);
   const disclosure = (0, _react.useContext)(_DisclosureContext.default);
-  const [, dispatchDisclosure] = disclosure !== null && disclosure !== void 0 ? disclosure : [];
+  const [, dispatchDisclosure] = disclosure ?? [];
   const handleClickNavbarDropdownItem = (0, _react.useCallback)(event => {
-    dispatchDisclosure === null || dispatchDisclosure === void 0 || dispatchDisclosure({
+    dispatchDisclosure?.({
       type: _DisclosureContext.DisclosureActionTypes.Hide,
       cascade: true
     });
-    handleSelectItem === null || handleSelectItem === void 0 || handleSelectItem(event);
+    handleSelectItem?.(event);
   }, [dispatchDisclosure, handleSelectItem]);
   const selected = activeProp || !(0, _isNil.default)(eventKey) && (0, _utils.shallowEqual)(nav.activeKey, eventKey);
   const renderDropdownItem = (0, _useRenderMenuItem.useRenderMenuItem)(as);

package/cjs/Navbar/NavbarDropdownMenu.d.ts

@@ -52,5 +52,5 @@ export interface NavbarDropdownMenuProps<T = any> extends StandardProps, Depreca
  *   </Nav>
  * </Navbar>
  */
-declare const NavbarDropdownMenu: React.ForwardRefExoticComponent<NavbarDropdownMenuProps<any> & SanitizedHTMListProps<HTMLElement, React.HTMLAttributes<HTMLElement>> & React.RefAttributes<HTMLElement>>;
+declare const NavbarDropdownMenu: React.ForwardRefExoticComponent<NavbarDropdownMenuProps<any> & SanitizedHTMListProps & React.RefAttributes<HTMLElement>>;
 export default NavbarDropdownMenu;

package/cjs/Navbar/NavbarDropdownMenu.js

@@ -72,7 +72,7 @@ const NavbarDropdownMenu = /*#__PURE__*/_react.default.forwardRef((props, ref) =
   return /*#__PURE__*/_react.default.createElement(_Disclosure.default, {
     hideOnClickOutside: true,
     trigger: ['click', 'hover'],
-    onToggle: (open, event) => onToggle === null || onToggle === void 0 ? void 0 : onToggle(open, undefined, event)
+    onToggle: (open, event) => onToggle?.(open, undefined, event)
   }, ({
     open,
     ...props