rsuite 6.1.2 → 6.1.3

package/esm/Calendar/TimeDropdown/TimeDropdown.js

@@ -44,15 +44,14 @@ const TimeDropdown = forwardRef((props, ref) => {
     showMeridiem
   });
   const handleClick = useEventCallback((type, d, event) => {
-    var _time$hours, _time$minutes, _time$seconds;
     const nextTime = {
-      hour: ((_time$hours = time.hours) !== null && _time$hours !== void 0 ? _time$hours : 0) + (time.meridiem === 'PM' ? 12 : 0),
-      minute: (_time$minutes = time.minutes) !== null && _time$minutes !== void 0 ? _time$minutes : 0,
-      second: (_time$seconds = time.seconds) !== null && _time$seconds !== void 0 ? _time$seconds : 0
+      hour: (time.hours ?? 0) + (showMeridiem && time.meridiem === 'PM' ? 12 : 0),
+      minute: time.minutes ?? 0,
+      second: time.seconds ?? 0
     };
     switch (type) {
       case 'hours':
-        nextTime.hour = time.meridiem === 'PM' ? d + 12 : d;
+        nextTime.hour = showMeridiem && time.meridiem === 'PM' ? d + 12 : d;
         break;
       case 'minutes':
         nextTime.minute = d;
@@ -61,21 +60,20 @@ const TimeDropdown = forwardRef((props, ref) => {
         nextTime.second = d;
         break;
     }
-    onChangeTime === null || onChangeTime === void 0 || onChangeTime(nextTime, event);
+    onChangeTime?.(nextTime, event);
   });
   const handleClickMeridiem = useEventCallback((meridiem, event) => {
-    var _time$hours2, _time$minutes2, _time$seconds2;
     const nextTime = {
-      hour: ((_time$hours2 = time.hours) !== null && _time$hours2 !== void 0 ? _time$hours2 : 0) + (time.meridiem === 'PM' ? 12 : 0),
-      minute: (_time$minutes2 = time.minutes) !== null && _time$minutes2 !== void 0 ? _time$minutes2 : 0,
-      second: (_time$seconds2 = time.seconds) !== null && _time$seconds2 !== void 0 ? _time$seconds2 : 0
+      hour: (time.hours ?? 0) + (showMeridiem && time.meridiem === 'PM' ? 12 : 0),
+      minute: time.minutes ?? 0,
+      second: time.seconds ?? 0
     };
     if (meridiem === 'AM' && nextTime.hour >= 12) {
       nextTime.hour -= 12;
     } else if (meridiem === 'PM' && nextTime.hour < 12) {
       nextTime.hour += 12;
     }
-    onChangeTime === null || onChangeTime === void 0 || onChangeTime(nextTime, event);
+    onChangeTime?.(nextTime, event);
   });
   const {
     prefix,
@@ -99,8 +97,8 @@ const TimeDropdown = forwardRef((props, ref) => {
     const hideFunc = props[camelCase(`hide_${type}`)];
     const disabledFunc = props[camelCase(`disabled_${type}`)];
     for (let i = start; i <= end; i += 1) {
-      if (!(hideFunc !== null && hideFunc !== void 0 && hideFunc(i, plainDate))) {
-        const disabled = disabledFunc === null || disabledFunc === void 0 ? void 0 : disabledFunc(i, plainDate);
+      if (!hideFunc?.(i, plainDate)) {
+        const disabled = disabledFunc?.(i, plainDate);
         const itemClasses = prefix('cell', {
           'cell-active': value === i,
           'cell-disabled': disabled
@@ -121,7 +119,7 @@ const TimeDropdown = forwardRef((props, ref) => {
     }
     return /*#__PURE__*/React.createElement(TimeColumn, {
       prefix: prefix,
-      title: locale === null || locale === void 0 ? void 0 : locale[type],
+      title: locale?.[type],
       "data-type": type,
       "aria-label": `Select ${type}`
     }, items);

package/esm/Calendar/hooks/useCalendar.d.ts

@@ -1,21 +1,20 @@
-/// <reference types="react" />
 export declare const useCalendar: () => {
-    formatDate?: typeof import("date-fns").format | undefined;
-    date?: Date | undefined;
-    dateRange?: Date[] | undefined;
-    format?: string | undefined;
-    hoverRangeValue?: [Date, Date] | undefined;
-    inline?: boolean | undefined;
-    targetId?: string | undefined;
-    monthDropdownProps?: import("../types").MonthDropdownProps | undefined;
-    disabledDate?: ((date: import("../../internals/utils/date").PlainDate, selectRangeValue?: (import("../../internals/utils/date").PlainDate | undefined)[] | undefined, type?: string | undefined) => boolean) | undefined;
-    onChangeMonth?: ((month: import("../../internals/utils/date/types").PlainYearMonth, event: import("react").MouseEvent<Element, MouseEvent>) => void) | undefined;
-    onChangeTime?: ((time: import("../../internals/utils/date/types").PlainTime, event: import("react").MouseEvent<Element, MouseEvent>) => void) | undefined;
-    onMouseMove?: ((date: import("../../internals/utils/date").PlainDate) => void) | undefined;
-    onSelect?: ((date: import("../../internals/utils/date").PlainDate, event: import("react").MouseEvent<Element, MouseEvent>) => void) | undefined;
-    renderCell?: ((date: import("../../internals/utils/date").PlainDate) => import("react").ReactNode) | undefined;
-    renderCellOnPicker?: ((date: import("../../internals/utils/date").PlainDate) => import("react").ReactNode) | undefined;
-    cellClassName?: ((date: import("../../internals/utils/date").PlainDate) => string | undefined) | undefined;
+    formatDate?: typeof import("date-fns").format;
+    date?: Date;
+    dateRange?: Date[];
+    format?: string;
+    hoverRangeValue?: [Date, Date];
+    inline?: boolean;
+    targetId?: string;
+    monthDropdownProps?: import("../types").MonthDropdownProps;
+    disabledDate?: (date: import("../../internals/utils/date").PlainDate, selectRangeValue?: (import("../../internals/utils/date").PlainDate | undefined)[], type?: string) => boolean;
+    onChangeMonth?: (month: import("../../internals/utils/date/types").PlainYearMonth, event: React.MouseEvent) => void;
+    onChangeTime?: (time: import("../../internals/utils/date/types").PlainTime, event: React.MouseEvent) => void;
+    onMouseMove?: (date: import("../../internals/utils/date").PlainDate) => void;
+    onSelect?: (date: import("../../internals/utils/date").PlainDate, event: React.MouseEvent) => void;
+    renderCell?: (date: import("../../internals/utils/date").PlainDate) => React.ReactNode;
+    renderCellOnPicker?: (date: import("../../internals/utils/date").PlainDate) => React.ReactNode;
+    cellClassName?: (date: import("../../internals/utils/date").PlainDate) => string | undefined;
     locale: import("../../locales").CalendarLocale | undefined;
     showWeekNumbers: boolean | undefined;
     isoWeek: boolean;

package/esm/Calendar/hooks/useCalendar.js

@@ -2,7 +2,6 @@
 import { useContext, useMemo } from 'react';
 import { CalendarContext } from "../CalendarProvider.js";
 export const useCalendar = () => {
-  var _locale$dateLocale2;
   const {
     locale,
     showWeekNumbers,
@@ -13,7 +12,6 @@ export const useCalendar = () => {
 
   // Determine the start of the week based on various conditions
   const weekStart = useMemo(() => {
-    var _locale$dateLocale;
     // If weekStartProp is explicitly provided, use it
     if (typeof weekStartProp !== 'undefined') {
       return weekStartProp;
@@ -23,12 +21,12 @@ export const useCalendar = () => {
       return 1;
     }
     // If locale specifies a weekStartsOn option, use it
-    else if ((locale === null || locale === void 0 || (_locale$dateLocale = locale.dateLocale) === null || _locale$dateLocale === void 0 || (_locale$dateLocale = _locale$dateLocale.options) === null || _locale$dateLocale === void 0 ? void 0 : _locale$dateLocale.weekStartsOn) !== undefined) {
+    else if (locale?.dateLocale?.options?.weekStartsOn !== undefined) {
       return locale.dateLocale.options.weekStartsOn;
     }
     // Default to Sunday (0) if no other condition is met
     return 0;
-  }, [weekStartProp, isoWeek, locale === null || locale === void 0 || (_locale$dateLocale2 = locale.dateLocale) === null || _locale$dateLocale2 === void 0 || (_locale$dateLocale2 = _locale$dateLocale2.options) === null || _locale$dateLocale2 === void 0 ? void 0 : _locale$dateLocale2.weekStartsOn]);
+  }, [weekStartProp, isoWeek, locale?.dateLocale?.options?.weekStartsOn]);
   return {
     locale,
     showWeekNumbers,

package/esm/Calendar/hooks/useCalendarDate.js

@@ -3,23 +3,19 @@ import { useState, useCallback, useRef } from 'react';
 import { useUpdateEffect } from "../../internals/hooks/index.js";
 import { startOfToday } from "../../internals/utils/date/index.js";
 export const useCalendarDate = (value, defaultDate) => {
-  var _ref;
   const valueRef = useRef(value);
-  const [calendarDate, setValue] = useState((_ref = value !== null && value !== void 0 ? value : defaultDate) !== null && _ref !== void 0 ? _ref : startOfToday());
+  const [calendarDate, setValue] = useState(value ?? defaultDate ?? startOfToday());
   const setCalendarDate = useCallback(date => {
-    if (date && (date === null || date === void 0 ? void 0 : date.valueOf()) !== (calendarDate === null || calendarDate === void 0 ? void 0 : calendarDate.valueOf())) {
+    if (date && date?.valueOf() !== calendarDate?.valueOf()) {
       setValue(date);
     }
   }, [calendarDate]);
   const resetCalendarDate = useCallback((nextValue = value) => {
-    var _ref2;
-    setValue((_ref2 = nextValue !== null && nextValue !== void 0 ? nextValue : defaultDate) !== null && _ref2 !== void 0 ? _ref2 : startOfToday());
+    setValue(nextValue ?? defaultDate ?? startOfToday());
   }, [defaultDate, value]);
   useUpdateEffect(() => {
-    var _valueRef$current;
-    if ((value === null || value === void 0 ? void 0 : value.valueOf()) !== ((_valueRef$current = valueRef.current) === null || _valueRef$current === void 0 ? void 0 : _valueRef$current.valueOf())) {
-      var _ref3;
-      setCalendarDate((_ref3 = value !== null && value !== void 0 ? value : defaultDate) !== null && _ref3 !== void 0 ? _ref3 : startOfToday());
+    if (value?.valueOf() !== valueRef.current?.valueOf()) {
+      setCalendarDate(value ?? defaultDate ?? startOfToday());
       valueRef.current = value;
     }
   }, [value, defaultDate]);

package/esm/Calendar/hooks/useCalendarState.js

@@ -12,38 +12,32 @@ export const useCalendarState = props => {
   const reset = useEventCallback(() => {
     setCalendarState(undefined);
     if (calendarState === CalendarState.TIME) {
-      var _props$onToggleTimeDr;
-      (_props$onToggleTimeDr = props.onToggleTimeDropdown) === null || _props$onToggleTimeDr === void 0 || _props$onToggleTimeDr.call(props, false);
+      props.onToggleTimeDropdown?.(false);
     } else if (calendarState === CalendarState.MONTH) {
-      var _props$onToggleMonthD;
-      (_props$onToggleMonthD = props.onToggleMonthDropdown) === null || _props$onToggleMonthD === void 0 || _props$onToggleMonthD.call(props, false);
+      props.onToggleMonthDropdown?.(false);
     }
   });
   const onMoveForward = useEventCallback(() => {
-    var _props$onMoveForward;
-    (_props$onMoveForward = props.onMoveForward) === null || _props$onMoveForward === void 0 || _props$onMoveForward.call(props, addMonths(props.calendarDate, 1));
+    props.onMoveForward?.(addMonths(props.calendarDate, 1));
   });
   const onMoveBackward = useEventCallback(() => {
-    var _props$onMoveBackward;
-    (_props$onMoveBackward = props.onMoveBackward) === null || _props$onMoveBackward === void 0 || _props$onMoveBackward.call(props, addMonths(props.calendarDate, -1));
+    props.onMoveBackward?.(addMonths(props.calendarDate, -1));
   });
   const onToggleTimeDropdown = useEventCallback(() => {
-    var _props$onToggleTimeDr2;
     if (calendarState === CalendarState.TIME) {
       setCalendarState(undefined);
     } else {
       setCalendarState(CalendarState.TIME);
     }
-    (_props$onToggleTimeDr2 = props.onToggleTimeDropdown) === null || _props$onToggleTimeDr2 === void 0 || _props$onToggleTimeDr2.call(props, calendarState !== CalendarState.TIME);
+    props.onToggleTimeDropdown?.(calendarState !== CalendarState.TIME);
   });
   const onToggleMonthDropdown = useEventCallback(() => {
-    var _props$onToggleMonthD2;
     if (calendarState === CalendarState.MONTH) {
       setCalendarState(undefined);
     } else {
       setCalendarState(CalendarState.MONTH);
     }
-    (_props$onToggleMonthD2 = props.onToggleMonthDropdown) === null || _props$onToggleMonthD2 === void 0 || _props$onToggleMonthD2.call(props, calendarState !== CalendarState.MONTH);
+    props.onToggleMonthDropdown?.(calendarState !== CalendarState.MONTH);
   });
   const handlers = useMemo(() => {
     return {

package/esm/Calendar/types.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { FixedSizeListProps } from '../internals/Windowing';
 /**
  * Props for the MonthDropdown component.

package/esm/Carousel/Carousel.js

@@ -62,26 +62,25 @@ const Carousel = forwardRef((props, ref) => {
       return;
     }
     clear();
-    const index = nextActiveIndex !== null && nextActiveIndex !== void 0 ? nextActiveIndex : activeIndex + 1;
+    const index = nextActiveIndex ?? activeIndex + 1;
 
     // When index is greater than count, start from 1 again.
     const nextIndex = index % count;
     setActiveIndex(nextIndex);
-    onSlideStart === null || onSlideStart === void 0 || onSlideStart(nextIndex, event);
+    onSlideStart?.(nextIndex, event);
     setLastIndex(nextActiveIndex == null ? activeIndex : nextIndex);
     reset();
   }, [activeIndex, count, setActiveIndex, clear, onSlideStart, reset]);
   const handleChange = event => {
     const activeIndex = +event.target.value;
     handleSlide(activeIndex, event);
-    onSelect === null || onSelect === void 0 || onSelect(activeIndex, event);
+    onSelect?.(activeIndex, event);
   };
   const handleTransitionEnd = useCallback(event => {
-    onSlideEnd === null || onSlideEnd === void 0 || onSlideEnd(activeIndex, event);
+    onSlideEnd?.(activeIndex, event);
   }, [activeIndex, onSlideEnd]);
   const uniqueId = useMemo(() => guid(), []);
   const items = rch.map(children, (child, index) => {
-    var _child$props;
     if (!child) {
       return;
     }
@@ -107,7 +106,7 @@ const Carousel = forwardRef((props, ref) => {
         ...child.props.style,
         [lengthKey]: `${100 / count}%`
       },
-      className: classNames(prefix('slider-item'), (_child$props = child.props) === null || _child$props === void 0 ? void 0 : _child$props.className)
+      className: classNames(prefix('slider-item'), child.props?.className)
     });
   });
   const classes = merge(className, withPrefix(`placement-${placement}`, `shape-${shape}`));

package/esm/CascadeTree/CascadeTree.js

@@ -47,16 +47,10 @@ const CascadeTree = forwardRef((props, ref) => {
   const childrenMap = useMap();
 
   // Store the parent of each node
-  const parentMap = useMemo(() => getParentMap(data, item => {
-    var _childrenMap$get;
-    return (_childrenMap$get = childrenMap.get(item)) !== null && _childrenMap$get !== void 0 ? _childrenMap$get : item[childrenKey];
-  }), [childrenMap, childrenKey, data]);
+  const parentMap = useMemo(() => getParentMap(data, item => childrenMap.get(item) ?? item[childrenKey]), [childrenMap, childrenKey, data]);
 
   // Flatten the tree data
-  const flattenedData = useMemo(() => flattenTree(data, item => {
-    var _childrenMap$get2;
-    return (_childrenMap$get2 = childrenMap.get(item)) !== null && _childrenMap$get2 !== void 0 ? _childrenMap$get2 : item[childrenKey];
-  }), [childrenMap, childrenKey, data]);
+  const flattenedData = useMemo(() => flattenTree(data, item => childrenMap.get(item) ?? item[childrenKey]), [childrenMap, childrenKey, data]);
 
   // The selected item
   const selectedItem = flattenedData.find(item => item[valueKey] === value);
@@ -68,7 +62,7 @@ const CascadeTree = forwardRef((props, ref) => {
       cascadePaths,
       itemData
     } = node;
-    onSelect === null || onSelect === void 0 || onSelect(itemData, cascadePaths, event);
+    onSelect?.(itemData, cascadePaths, event);
     if (isLeafNode) {
       const nextValue = itemData[valueKey];
       setValue(nextValue);
@@ -96,17 +90,14 @@ const CascadeTree = forwardRef((props, ref) => {
     activeItem,
     selectedItem,
     getParent: item => parentMap.get(item),
-    getChildren: item => {
-      var _childrenMap$get3;
-      return (_childrenMap$get3 = childrenMap.get(item)) !== null && _childrenMap$get3 !== void 0 ? _childrenMap$get3 : item[childrenKey];
-    }
+    getChildren: item => childrenMap.get(item) ?? item[childrenKey]
   });
   const {
     withPrefix,
     merge
   } = useStyles(classPrefix);
   const classes = merge(className, withPrefix());
-  const onSearchCallback = useCallback((value, _items, event) => onSearch === null || onSearch === void 0 ? void 0 : onSearch(value, event), [onSearch]);
+  const onSearchCallback = useCallback((value, _items, event) => onSearch?.(value, event), [onSearch]);
   const {
     items,
     searchKeyword,
@@ -120,11 +111,10 @@ const CascadeTree = forwardRef((props, ref) => {
     onSearch: onSearchCallback
   });
   const handleSearchRowSelect = useEventCallback((item, items, event) => {
-    var _item$childrenKey;
     const node = {
       itemData: item,
       cascadePaths: items,
-      isLeafNode: !((_item$childrenKey = item[childrenKey]) !== null && _item$childrenKey !== void 0 && _item$childrenKey.length)
+      isLeafNode: !item[childrenKey]?.length
     };
     handleSelect(node, event);
     setSearchKeyword('');

package/esm/CascadeTree/TreeView.js

@@ -48,8 +48,7 @@ const TreeView = forwardRef((props, ref) => {
     popupType
   } = useCombobox();
   useEffect(() => {
-    var _rootRef$current;
-    const columns = ((_rootRef$current = rootRef.current) === null || _rootRef$current === void 0 ? void 0 : _rootRef$current.querySelectorAll('[data-type="column"]')) || [];
+    const columns = rootRef.current?.querySelectorAll('[data-type="column"]') || [];
     columns.forEach(column => {
       if (!column) {
         return;
@@ -61,8 +60,8 @@ const TreeView = forwardRef((props, ref) => {
       if (activeItem) {
         const position = getPosition(activeItem, column);
         // Let the active option scroll into view.
-        if (position !== null && position !== void 0 && position.top) {
-          scrollTop(column, position === null || position === void 0 ? void 0 : position.top);
+        if (position?.top) {
+          scrollTop(column, position?.top);
         }
       }
     });
@@ -80,14 +79,13 @@ const TreeView = forwardRef((props, ref) => {
   const handleSelect = useEventCallback((layer, itemData, event) => {
     const isLeafNode = isNil(itemData[childrenKey]);
     const cascadePaths = getCascadePaths(layer + 1, itemData);
-    onSelect === null || onSelect === void 0 || onSelect({
+    onSelect?.({
       itemData,
       cascadePaths,
       isLeafNode
     }, event);
   });
   const renderCascadeNode = nodeProps => {
-    var _loadingItemsSet$has;
     const {
       itemData,
       index,
@@ -99,7 +97,7 @@ const TreeView = forwardRef((props, ref) => {
     const value = itemData[valueKey];
     const label = itemData[labelKey];
     const disabled = disabledItemValues.some(disabledValue => shallowEqual(disabledValue, value));
-    const loading = (_loadingItemsSet$has = loadingItemsSet === null || loadingItemsSet === void 0 ? void 0 : loadingItemsSet.has(itemData)) !== null && _loadingItemsSet$has !== void 0 ? _loadingItemsSet$has : false;
+    const loading = loadingItemsSet?.has(itemData) ?? false;
 
     // Use `value` in keys when If `value` is string or number
     const onlyKey = typeof value === 'number' || typeof value === 'string' ? value : index;

package/esm/CascadeTree/hooks/useSearch.d.ts

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

package/esm/CascadeTree/hooks/useSearch.js

@@ -43,7 +43,7 @@ function useSearch(props) {
   const handleSearch = useEventCallback((value, event) => {
     const items = getSearchResult(value);
     setSearchKeyword(value);
-    onSearch === null || onSearch === void 0 || onSearch(value, items, event);
+    onSearch?.(value, items, event);
   });
   return {
     searchKeyword,

package/esm/CascadeTree/hooks/useSelect.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { Option } from '../../internals/types';
 import type { SelectNode } from '../types';
 export interface UseSelectProps<T> {

package/esm/CascadeTree/hooks/useSelect.js

@@ -23,7 +23,6 @@ const useSelect = props => {
   const isMounted = useIsMounted();
   const loadingItemsSet = useSet();
   const handleSelect = useEventCallback((node, event) => {
-    var _itemData$childrenKey;
     const {
       itemData,
       isLeafNode
@@ -31,7 +30,7 @@ const useSelect = props => {
     setActiveItem(itemData);
 
     // Lazy load node's children
-    if (typeof getChildren === 'function' && ((_itemData$childrenKey = itemData[childrenKey]) === null || _itemData$childrenKey === void 0 ? void 0 : _itemData$childrenKey.length) === 0 && !childrenMap.has(itemData)) {
+    if (typeof getChildren === 'function' && itemData[childrenKey]?.length === 0 && !childrenMap.has(itemData)) {
       loadingItemsSet.add(itemData);
       const children = getChildren(itemData);
       if (children instanceof Promise) {
@@ -49,10 +48,10 @@ const useSelect = props => {
     if (isLeafNode) {
       const nextValue = itemData[valueKey];
       if (!shallowEqual(value, nextValue)) {
-        onChange === null || onChange === void 0 || onChange(nextValue, event);
+        onChange?.(nextValue, event);
       }
     }
-    onSelect === null || onSelect === void 0 || onSelect(node, event);
+    onSelect?.(node, event);
   });
   return {
     loadingItemsSet,

package/esm/CascadeTree/types.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { Option, DataProps, ToArray } from '../internals/types';
 import type { BoxProps } from '../internals/Box';
 export interface SelectNode<T> {

package/esm/CascadeTree/utils.js

@@ -29,8 +29,7 @@ export function getColumnsAndPaths(items, pathTarget, options) {
     columns.unshift(children);
   }
   for (let parent = getParent(pathTarget); parent; parent = getParent(parent)) {
-    var _getChildren;
-    columns.unshift((_getChildren = getChildren(parent)) !== null && _getChildren !== void 0 ? _getChildren : []);
+    columns.unshift(getChildren(parent) ?? []);
     path.unshift(parent);
   }
   columns.unshift(items);

package/esm/Cascader/Cascader.js

@@ -77,29 +77,22 @@ const Cascader = forwardRef((props, ref) => {
   const childrenMap = useMap();
 
   // Store the parent of each node
-  const parentMap = useMemo(() => getParentMap(data, item => {
-    var _childrenMap$get;
-    return (_childrenMap$get = childrenMap.get(item)) !== null && _childrenMap$get !== void 0 ? _childrenMap$get : item[childrenKey];
-  }), [childrenMap, childrenKey, data]);
+  const parentMap = useMemo(() => getParentMap(data, item => childrenMap.get(item) ?? item[childrenKey]), [childrenMap, childrenKey, data]);
 
   // Flatten the tree data
-  const flattenedData = useMemo(() => flattenTree(data, item => {
-    var _childrenMap$get2;
-    return (_childrenMap$get2 = childrenMap.get(item)) !== null && _childrenMap$get2 !== void 0 ? _childrenMap$get2 : item[childrenKey];
-  }), [childrenMap, childrenKey, data]);
+  const flattenedData = useMemo(() => flattenTree(data, item => childrenMap.get(item) ?? item[childrenKey]), [childrenMap, childrenKey, data]);
 
   // The selected item
   const selectedItem = flattenedData.find(item => item[valueKey] === value);
 
   // Callback function after selecting the node
   const onSelectCallback = (node, event) => {
-    var _trigger$current;
     const {
       isLeafNode,
       cascadePaths,
       itemData
     } = node;
-    onSelect === null || onSelect === void 0 || onSelect(itemData, cascadePaths, event);
+    onSelect?.(itemData, cascadePaths, event);
     const nextValue = itemData[valueKey];
     if (isLeafNode) {
       // Determines whether the option is a leaf node, and if so, closes the picker.
@@ -111,11 +104,11 @@ const Cascader = forwardRef((props, ref) => {
     //  When the parent is optional, the value and the displayed path are updated.
     if (parentSelectable && !shallowEqual(value, nextValue)) {
       setValue(nextValue);
-      onChange === null || onChange === void 0 || onChange(nextValue, event);
+      onChange?.(nextValue, event);
     }
 
     // Update menu position
-    (_trigger$current = trigger.current) === null || _trigger$current === void 0 || _trigger$current.updatePosition();
+    trigger.current?.updatePosition();
   };
   const {
     activeItem,
@@ -141,10 +134,7 @@ const Cascader = forwardRef((props, ref) => {
     activeItem,
     selectedItem,
     getParent: item => parentMap.get(item),
-    getChildren: item => {
-      var _childrenMap$get3;
-      return (_childrenMap$get3 = childrenMap.get(item)) !== null && _childrenMap$get3 !== void 0 ? _childrenMap$get3 : item[childrenKey];
-    }
+    getChildren: item => childrenMap.get(item) ?? item[childrenKey]
   });
 
   /**
@@ -171,13 +161,13 @@ const Cascader = forwardRef((props, ref) => {
     rtl,
     data: flattenedData,
     valueKey,
-    defaultLayer: pathTowardsSelectedItem !== null && pathTowardsSelectedItem !== void 0 && pathTowardsSelectedItem.length ? pathTowardsSelectedItem.length - 1 : 0,
+    defaultLayer: pathTowardsSelectedItem?.length ? pathTowardsSelectedItem.length - 1 : 0,
     target: () => overlay.current,
     getParent: item => parentMap.get(item),
     callback: onFocusItemCallback
   });
   const onSearchCallback = (value, items, event) => {
-    onSearch === null || onSearch === void 0 || onSearch(value, event);
+    onSearch?.(value, event);
     if (!value || items.length === 0) {
       setFocusItemValue(undefined);
       return;
@@ -211,18 +201,17 @@ const Cascader = forwardRef((props, ref) => {
     setSearchKeyword
   });
   const handleClose = useEventCallback(() => {
-    var _trigger$current2, _target$current, _target$current$focus;
-    (_trigger$current2 = trigger.current) === null || _trigger$current2 === void 0 || _trigger$current2.close();
+    trigger.current?.close();
 
     // The focus is on the trigger button after closing
-    (_target$current = target.current) === null || _target$current === void 0 || (_target$current$focus = _target$current.focus) === null || _target$current$focus === void 0 || _target$current$focus.call(_target$current);
+    target.current?.focus?.();
   });
   const handleClean = useEventCallback(event => {
     if (disabled || !target.current) {
       return;
     }
     setValue(null);
-    onChange === null || onChange === void 0 || onChange(null, event);
+    onChange?.(null, event);
   });
   const handleMenuPressEnter = useEventCallback(event => {
     const focusItem = findNodeOfTree(data, item => item[valueKey] === focusItemValue);
@@ -233,8 +222,8 @@ const Cascader = forwardRef((props, ref) => {
         setLayer(pathTowardsActiveItem.length - 1);
       }
       if (!shallowEqual(value, focusItemValue)) {
-        onSelect === null || onSelect === void 0 || onSelect(focusItem, pathTowardsActiveItem, event);
-        onChange === null || onChange === void 0 || onChange(focusItemValue !== null && focusItemValue !== void 0 ? focusItemValue : null, event);
+        onSelect?.(focusItem, pathTowardsActiveItem, event);
+        onChange?.(focusItemValue ?? null, event);
       }
       handleClose();
     }
@@ -260,8 +249,8 @@ const Cascader = forwardRef((props, ref) => {
     handleClose();
     setSearchKeyword('');
     setValue(nextValue);
-    onSelect === null || onSelect === void 0 || onSelect(itemData, nodes, event);
-    onChange === null || onChange === void 0 || onChange(nextValue, event);
+    onSelect?.(itemData, nodes, event);
+    onChange?.(nextValue, event);
   });
   const renderCascadeColumn = (childNodes, column) => {
     if (typeof renderColumn === 'function') {
@@ -314,7 +303,7 @@ const Cascader = forwardRef((props, ref) => {
       onSelect: handleSelect,
       renderColumn: renderCascadeColumn,
       renderTreeNode: renderCascadeTreeNode
-    }), renderExtraFooter === null || renderExtraFooter === void 0 ? void 0 : renderExtraFooter());
+    }), renderExtraFooter?.());
   };
   let selectedElement = placeholder;
   if (pathTowardsSelectedItem.length > 0) {
@@ -370,9 +359,9 @@ const Cascader = forwardRef((props, ref) => {
     hasValue: hasValue,
     active: active,
     placement: placement,
-    inputValue: value !== null && value !== void 0 ? value : '',
+    inputValue: value ?? '',
     focusItemValue: focusItemValue
-  }, rest), selectedElement || (locale === null || locale === void 0 ? void 0 : locale.placeholder)));
+  }, rest), selectedElement || locale?.placeholder));
 });
 Cascader.displayName = 'Cascader';
 export default Cascader;

package/esm/Cascader/useActive.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface UseActiveProps {
     target: React.RefObject<HTMLElement | null>;
     onOpen?: () => void;

package/esm/Cascader/useActive.js

@@ -11,21 +11,19 @@ const useActive = props => {
   // Use component active state to support keyboard events.
   const [active, setActive] = useState(false);
   const onEnter = useEventCallback(node => {
-    var _props$onEnter;
-    (_props$onEnter = props.onEnter) === null || _props$onEnter === void 0 || _props$onEnter.call(props, node);
+    props.onEnter?.(node);
     if (!target.current) {
       return;
     }
-    onOpen === null || onOpen === void 0 || onOpen();
+    onOpen?.();
     setActive(true);
   });
   const onExit = useEventCallback(node => {
-    var _props$onExit;
-    (_props$onExit = props.onExit) === null || _props$onExit === void 0 || _props$onExit.call(props, node);
+    props.onExit?.(node);
     if (!target.current) {
       return;
     }
-    onClose === null || onClose === void 0 || onClose();
+    onClose?.();
     setActive(false);
     setSearchKeyword('');
   });