rsuite 6.1.2 → 6.2.0

package/cjs/Calendar/CalendarHeader.js

@@ -57,7 +57,7 @@ const CalendarHeader = (0, _utils.forwardRef)((props, ref) => {
     size: inline ? 'sm' : 'xs'
   };
   const timeFormat = (0, _react.useMemo)(() => {
-    const defaultTimeFormat = (locale === null || locale === void 0 ? void 0 : locale.shortTimeFormat) || 'HH:mm';
+    const defaultTimeFormat = locale?.shortTimeFormat || 'HH:mm';
     if (!format) {
       return defaultTimeFormat;
     }
@@ -65,26 +65,25 @@ const CalendarHeader = (0, _utils.forwardRef)((props, ref) => {
   }, [format, locale]);
   const dateFormat = (0, _react.useMemo)(() => {
     if (showMonth) {
-      return (locale === null || locale === void 0 ? void 0 : locale.formattedMonthPattern) || 'yyyy-MM';
+      return locale?.formattedMonthPattern || 'yyyy-MM';
     }
     return 'yyyy';
   }, [locale, showMonth]);
   const renderTitle = () => {
-    var _renderTitleProp;
-    return (_renderTitleProp = renderTitleProp === null || renderTitleProp === void 0 ? void 0 : renderTitleProp(date)) !== null && _renderTitleProp !== void 0 ? _renderTitleProp : date && /*#__PURE__*/_react.default.createElement(_FormattedDate.FormattedDate, {
+    return renderTitleProp?.(date) ?? (date && /*#__PURE__*/_react.default.createElement(_FormattedDate.FormattedDate, {
       date: date,
       formatStr: dateFormat
-    });
+    }));
   };
   const dateTitleClasses = prefix('title', 'title-date', {
-    error: disabledDate === null || disabledDate === void 0 ? void 0 : disabledDate({
+    error: disabledDate?.({
       year: date.getFullYear(),
       month: date.getMonth() + 1,
       day: date.getDate()
     })
   });
   const timeTitleClasses = prefix('title', 'title-time', {
-    error: disabledTime === null || disabledTime === void 0 ? void 0 : disabledTime(date)
+    error: disabledTime?.(date)
   });
   const backwardClass = prefix('backward', {
     'btn-disabled': disabledBackward
@@ -132,7 +131,7 @@ const CalendarHeader = (0, _utils.forwardRef)((props, ref) => {
   }), date && /*#__PURE__*/_react.default.createElement(_FormattedDate.FormattedDate, {
     date: date,
     formatStr: timeFormat
-  }))), renderToolbar === null || renderToolbar === void 0 ? void 0 : renderToolbar(date));
+  }))), renderToolbar?.(date));
 });
 CalendarHeader.displayName = 'CalendarHeader';
 var _default = exports.default = CalendarHeader;

package/cjs/Calendar/Grid/GridCell.js

@@ -57,7 +57,7 @@ const GridCell = (0, _utils.forwardRef)((props, ref) => {
     'cell-selected-end': rangeEnd,
     'cell-in-range': !unSameMonth && inRange,
     'cell-disabled': disabled
-  }), cellClassName === null || cellClassName === void 0 ? void 0 : cellClassName(date));
+  }), cellClassName?.(date));
   return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({
     ref: ref,
     role: "gridcell",
@@ -73,7 +73,7 @@ const GridCell = (0, _utils.forwardRef)((props, ref) => {
     className: prefix('cell-content')
   }, renderCellOnPicker ? renderCellOnPicker(date) : /*#__PURE__*/_react.default.createElement("span", {
     className: prefix('cell-day')
-  }, date.day), renderCell === null || renderCell === void 0 ? void 0 : renderCell(date)));
+  }, date.day), renderCell?.(date)));
 });
 GridCell.displayName = 'CalendarGridCell';
 var _default = exports.default = GridCell;

package/cjs/Calendar/Grid/GridHeaderRow.js

@@ -44,7 +44,7 @@ const GridHeaderRow = (0, _utils.forwardRef)((props, ref) => {
     "aria-label": (0, _upperFirst.default)(key)
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: prefix('header-cell-content')
-  }, locale === null || locale === void 0 ? void 0 : locale[key]))));
+  }, locale?.[key]))));
 });
 GridHeaderRow.displayName = 'CalendarGridHeaderRow';
 var _default = exports.default = GridHeaderRow;

package/cjs/Calendar/Grid/GridRow.js

@@ -19,7 +19,6 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
  */
 
 const GridRow = (0, _utils.forwardRef)((props, ref) => {
-  var _locale$dateLocale$op, _locale$dateLocale;
   const {
     as: Component = 'div',
     className,
@@ -48,7 +47,7 @@ const GridRow = (0, _utils.forwardRef)((props, ref) => {
     if (disabled) {
       return;
     }
-    onSelect === null || onSelect === void 0 || onSelect(date, event);
+    onSelect?.(date, event);
   }, [onSelect]);
   const renderDays = () => {
     const days = [];
@@ -57,7 +56,7 @@ const GridRow = (0, _utils.forwardRef)((props, ref) => {
     // - Invalid date - when the user is inputting the date with text input
     // - undefined - when the range selection isn't completed
     const [selectedStartDateJS, selectedEndDateJS] = dateRange || [];
-    const [hoverStartDateJS, hoverEndDateJS] = hoverRangeValue !== null && hoverRangeValue !== void 0 ? hoverRangeValue : [];
+    const [hoverStartDateJS, hoverEndDateJS] = hoverRangeValue ?? [];
     const isRangeSelectionMode = typeof dateRange !== 'undefined';
     const plainDateRange = typeof dateRange !== 'undefined' ? dateRange.map(d => d instanceof Date ? {
       year: d.getFullYear(),
@@ -67,7 +66,7 @@ const GridRow = (0, _utils.forwardRef)((props, ref) => {
     for (let i = 0; i < 7; i += 1) {
       const thisDate = (0, _plainDate.addDays)(startingDate, i);
       const thisDateJS = new Date(thisDate.year, thisDate.month - 1, thisDate.day);
-      const disabled = disabledDate === null || disabledDate === void 0 ? void 0 : disabledDate(thisDate, plainDateRange, _constants.DATERANGE_DISABLED_TARGET.CALENDAR);
+      const disabled = disabledDate?.(thisDate, plainDateRange, _constants.DATERANGE_DISABLED_TARGET.CALENDAR);
 
       // Whether this date is in a different month from the selected date
       const isSameMonth = selected.getFullYear() === thisDate.year && selected.getMonth() + 1 === thisDate.month;
@@ -143,11 +142,11 @@ const GridRow = (0, _utils.forwardRef)((props, ref) => {
   const classes = merge(className, prefix('row'));
   const {
     firstWeekContainsDate
-  } = (_locale$dateLocale$op = locale === null || locale === void 0 || (_locale$dateLocale = locale.dateLocale) === null || _locale$dateLocale === void 0 ? void 0 : _locale$dateLocale.options) !== null && _locale$dateLocale$op !== void 0 ? _locale$dateLocale$op : {};
+  } = locale?.dateLocale?.options ?? {};
   // ISO week starts on Monday
   const date = isoWeek ? (0, _plainDate.addDays)(startingDate, 1) : startingDate;
   const week = (0, _date.format)(new Date(date.year, date.month - 1, date.day), isoWeek ? 'I' : 'w', {
-    locale: locale === null || locale === void 0 ? void 0 : locale.dateLocale,
+    locale: locale?.dateLocale,
     firstWeekContainsDate,
     weekStartsOn: weekStart
   });

package/cjs/Calendar/MonthDropdown/MonthDropdown.js

@@ -87,7 +87,7 @@ const MonthDropdown = (0, _utils.forwardRef)((props, ref) => {
       return /*#__PURE__*/_react.default.createElement(_MonthDropdownItem.default, {
         key: (0, _plainDate.plainYearMonthToString)(yearMonth),
         yearMonth: yearMonth,
-        disabled: isMonthDisabled === null || isMonthDisabled === void 0 ? void 0 : isMonthDisabled(yearMonth),
+        disabled: isMonthDisabled?.(yearMonth),
         active: isSelectedYear && month === selectedMonth
       });
     })));

package/cjs/Calendar/MonthDropdown/MonthDropdownItem.js

@@ -30,7 +30,7 @@ const MonthDropdownItem = (0, _utils.forwardRef)((props, ref) => {
     if (disabled) {
       return;
     }
-    onChangeMonth === null || onChangeMonth === void 0 || onChangeMonth(yearMonth, event);
+    onChangeMonth?.(yearMonth, event);
   });
   const {
     prefix,

package/cjs/Calendar/TimeDropdown/TimeDropdown.js

@@ -50,15 +50,14 @@ const TimeDropdown = (0, _utils.forwardRef)((props, ref) => {
     showMeridiem
   });
   const handleClick = (0, _hooks.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;
@@ -67,21 +66,20 @@ const TimeDropdown = (0, _utils.forwardRef)((props, ref) => {
         nextTime.second = d;
         break;
     }
-    onChangeTime === null || onChangeTime === void 0 || onChangeTime(nextTime, event);
+    onChangeTime?.(nextTime, event);
   });
   const handleClickMeridiem = (0, _hooks.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,
@@ -105,8 +103,8 @@ const TimeDropdown = (0, _utils.forwardRef)((props, ref) => {
     const hideFunc = props[(0, _camelCase.default)(`hide_${type}`)];
     const disabledFunc = props[(0, _camelCase.default)(`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
@@ -127,7 +125,7 @@ const TimeDropdown = (0, _utils.forwardRef)((props, ref) => {
     }
     return /*#__PURE__*/_react.default.createElement(_TimeColumn.default, {
       prefix: prefix,
-      title: locale === null || locale === void 0 ? void 0 : locale[type],
+      title: locale?.[type],
       "data-type": type,
       "aria-label": `Select ${type}`
     }, items);

package/cjs/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/cjs/Calendar/hooks/useCalendar.js

@@ -6,7 +6,6 @@ exports.useCalendar = void 0;
 var _react = require("react");
 var _CalendarProvider = require("../CalendarProvider");
 const useCalendar = () => {
-  var _locale$dateLocale2;
   const {
     locale,
     showWeekNumbers,
@@ -17,7 +16,6 @@ const useCalendar = () => {
 
   // Determine the start of the week based on various conditions
   const weekStart = (0, _react.useMemo)(() => {
-    var _locale$dateLocale;
     // If weekStartProp is explicitly provided, use it
     if (typeof weekStartProp !== 'undefined') {
       return weekStartProp;
@@ -27,12 +25,12 @@ 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/cjs/Calendar/hooks/useCalendarDate.js

@@ -7,23 +7,19 @@ var _react = require("react");
 var _hooks = require("../../internals/hooks");
 var _date = require("../../internals/utils/date");
 const useCalendarDate = (value, defaultDate) => {
-  var _ref;
   const valueRef = (0, _react.useRef)(value);
-  const [calendarDate, setValue] = (0, _react.useState)((_ref = value !== null && value !== void 0 ? value : defaultDate) !== null && _ref !== void 0 ? _ref : (0, _date.startOfToday)());
+  const [calendarDate, setValue] = (0, _react.useState)(value ?? defaultDate ?? (0, _date.startOfToday)());
   const setCalendarDate = (0, _react.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 = (0, _react.useCallback)((nextValue = value) => {
-    var _ref2;
-    setValue((_ref2 = nextValue !== null && nextValue !== void 0 ? nextValue : defaultDate) !== null && _ref2 !== void 0 ? _ref2 : (0, _date.startOfToday)());
+    setValue(nextValue ?? defaultDate ?? (0, _date.startOfToday)());
   }, [defaultDate, value]);
   (0, _hooks.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 : (0, _date.startOfToday)());
+    if (value?.valueOf() !== valueRef.current?.valueOf()) {
+      setCalendarDate(value ?? defaultDate ?? (0, _date.startOfToday)());
       valueRef.current = value;
     }
   }, [value, defaultDate]);

package/cjs/Calendar/hooks/useCalendarState.js

@@ -16,38 +16,32 @@ const useCalendarState = props => {
   const reset = (0, _hooks.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 = (0, _hooks.useEventCallback)(() => {
-    var _props$onMoveForward;
-    (_props$onMoveForward = props.onMoveForward) === null || _props$onMoveForward === void 0 || _props$onMoveForward.call(props, (0, _date.addMonths)(props.calendarDate, 1));
+    props.onMoveForward?.((0, _date.addMonths)(props.calendarDate, 1));
   });
   const onMoveBackward = (0, _hooks.useEventCallback)(() => {
-    var _props$onMoveBackward;
-    (_props$onMoveBackward = props.onMoveBackward) === null || _props$onMoveBackward === void 0 || _props$onMoveBackward.call(props, (0, _date.addMonths)(props.calendarDate, -1));
+    props.onMoveBackward?.((0, _date.addMonths)(props.calendarDate, -1));
   });
   const onToggleTimeDropdown = (0, _hooks.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 = (0, _hooks.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 = (0, _react.useMemo)(() => {
     return {

package/cjs/Calendar/types.d.ts

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

package/cjs/Carousel/Carousel.js

@@ -68,26 +68,25 @@ const Carousel = (0, _utils.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 = (0, _react.useCallback)(event => {
-    onSlideEnd === null || onSlideEnd === void 0 || onSlideEnd(activeIndex, event);
+    onSlideEnd?.(activeIndex, event);
   }, [activeIndex, onSlideEnd]);
   const uniqueId = (0, _react.useMemo)(() => (0, _utils.guid)(), []);
   const items = _utils.rch.map(children, (child, index) => {
-    var _child$props;
     if (!child) {
       return;
     }
@@ -113,7 +112,7 @@ const Carousel = (0, _utils.forwardRef)((props, ref) => {
         ...child.props.style,
         [lengthKey]: `${100 / count}%`
       },
-      className: (0, _classnames.default)(prefix('slider-item'), (_child$props = child.props) === null || _child$props === void 0 ? void 0 : _child$props.className)
+      className: (0, _classnames.default)(prefix('slider-item'), child.props?.className)
     });
   });
   const classes = merge(className, withPrefix(`placement-${placement}`, `shape-${shape}`));

package/cjs/CascadeTree/CascadeTree.js

@@ -53,16 +53,10 @@ const CascadeTree = (0, _utils.forwardRef)((props, ref) => {
   const childrenMap = (0, _hooks.useMap)();
 
   // Store the parent of each node
-  const parentMap = (0, _react.useMemo)(() => (0, _utils2.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 = (0, _react.useMemo)(() => (0, _utils2.getParentMap)(data, item => childrenMap.get(item) ?? item[childrenKey]), [childrenMap, childrenKey, data]);
 
   // Flatten the tree data
-  const flattenedData = (0, _react.useMemo)(() => (0, _utils3.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 = (0, _react.useMemo)(() => (0, _utils3.flattenTree)(data, item => childrenMap.get(item) ?? item[childrenKey]), [childrenMap, childrenKey, data]);
 
   // The selected item
   const selectedItem = flattenedData.find(item => item[valueKey] === value);
@@ -74,7 +68,7 @@ const CascadeTree = (0, _utils.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);
@@ -102,17 +96,14 @@ const CascadeTree = (0, _utils.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
   } = (0, _hooks.useStyles)(classPrefix);
   const classes = merge(className, withPrefix());
-  const onSearchCallback = (0, _react.useCallback)((value, _items, event) => onSearch === null || onSearch === void 0 ? void 0 : onSearch(value, event), [onSearch]);
+  const onSearchCallback = (0, _react.useCallback)((value, _items, event) => onSearch?.(value, event), [onSearch]);
   const {
     items,
     searchKeyword,
@@ -126,11 +117,10 @@ const CascadeTree = (0, _utils.forwardRef)((props, ref) => {
     onSearch: onSearchCallback
   });
   const handleSearchRowSelect = (0, _hooks.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/cjs/CascadeTree/TreeView.js

@@ -54,8 +54,7 @@ const TreeView = (0, _utils.forwardRef)((props, ref) => {
     popupType
   } = (0, _Picker.useCombobox)();
   (0, _react.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;
@@ -67,8 +66,8 @@ const TreeView = (0, _utils.forwardRef)((props, ref) => {
       if (activeItem) {
         const position = (0, _getPosition.default)(activeItem, column);
         // Let the active option scroll into view.
-        if (position !== null && position !== void 0 && position.top) {
-          (0, _scrollTop.default)(column, position === null || position === void 0 ? void 0 : position.top);
+        if (position?.top) {
+          (0, _scrollTop.default)(column, position?.top);
         }
       }
     });
@@ -86,14 +85,13 @@ const TreeView = (0, _utils.forwardRef)((props, ref) => {
   const handleSelect = (0, _hooks.useEventCallback)((layer, itemData, event) => {
     const isLeafNode = (0, _isNil.default)(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,
@@ -105,7 +103,7 @@ const TreeView = (0, _utils.forwardRef)((props, ref) => {
     const value = itemData[valueKey];
     const label = itemData[labelKey];
     const disabled = disabledItemValues.some(disabledValue => (0, _utils.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/cjs/CascadeTree/hooks/useSearch.d.ts

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

package/cjs/CascadeTree/hooks/useSearch.js

@@ -47,7 +47,7 @@ function useSearch(props) {
   const handleSearch = (0, _hooks.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/cjs/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/cjs/CascadeTree/hooks/useSelect.js

@@ -27,7 +27,6 @@ const useSelect = props => {
   const isMounted = (0, _hooks.useIsMounted)();
   const loadingItemsSet = (0, _reactUseSet.useSet)();
   const handleSelect = (0, _hooks.useEventCallback)((node, event) => {
-    var _itemData$childrenKey;
     const {
       itemData,
       isLeafNode
@@ -35,7 +34,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) {
@@ -53,10 +52,10 @@ const useSelect = props => {
     if (isLeafNode) {
       const nextValue = itemData[valueKey];
       if (!(0, _utils.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/cjs/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/cjs/CascadeTree/utils.js

@@ -33,8 +33,7 @@ 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);