rsuite 6.1.2 → 6.1.3

package/cjs/DateRangePicker/DateRangePicker.js

@@ -37,7 +37,6 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
  * @see https://rsuitejs.com/components/date-range-picker
  */
 const DateRangePicker = (0, _utils3.forwardRef)((props, ref) => {
-  var _ref, _ref2;
   const {
     formatDate,
     propsWithDefaults
@@ -112,9 +111,9 @@ const DateRangePicker = (0, _utils3.forwardRef)((props, ref) => {
     merge,
     prefix
   } = (0, _hooks.useStyles)(classPrefix);
-  const formatStr = format || (locale === null || locale === void 0 ? void 0 : locale.shortDateFormat) || 'yyyy-MM-dd';
+  const formatStr = format || locale?.shortDateFormat || 'yyyy-MM-dd';
   const rangeFormatStr = `${formatStr}${character}${formatStr}`;
-  const [value, setValue] = (0, _hooks.useControlled)(valueProp, defaultValue !== null && defaultValue !== void 0 ? defaultValue : null);
+  const [value, setValue] = (0, _hooks.useControlled)(valueProp, defaultValue ?? null);
   const {
     mode,
     has
@@ -148,14 +147,14 @@ const DateRangePicker = (0, _utils3.forwardRef)((props, ref) => {
    * the second click to determine the end date of the date range.
    *
    */
-  const [selectedDates, setSelectedDates] = (0, _react.useState)((_ref = valueProp !== null && valueProp !== void 0 ? valueProp : defaultValue) !== null && _ref !== void 0 ? _ref : []);
+  const [selectedDates, setSelectedDates] = (0, _react.useState)(valueProp ?? defaultValue ?? []);
 
   // The date of the current hover, used to reduce the calculation of `handleMouseMove`
   const [hoverDateRange, setHoverDateRange] = (0, _react.useState)(value);
 
   // The displayed calendar panel is rendered based on this value.
   const [calendarDateRange, setCalendarDateRangeValue] = (0, _react.useState)((0, _utils.getSafeCalendarDate)({
-    value: (_ref2 = value !== null && value !== void 0 ? value : defaultCalendarValue) !== null && _ref2 !== void 0 ? _ref2 : null,
+    value: value ?? defaultCalendarValue ?? null,
     allowSameMonth
   }));
 
@@ -178,7 +177,7 @@ const DateRangePicker = (0, _utils3.forwardRef)((props, ref) => {
    */
   const getCalendarDatetime = calendarKey => {
     const index = calendarKey === 'start' ? 0 : 1;
-    return (calendarDateRange === null || calendarDateRange === void 0 ? void 0 : calendarDateRange[index]) || (defaultCalendarValue === null || defaultCalendarValue === void 0 ? void 0 : defaultCalendarValue[index]);
+    return calendarDateRange?.[index] || defaultCalendarValue?.[index];
   };
 
   /**
@@ -193,7 +192,7 @@ const DateRangePicker = (0, _utils3.forwardRef)((props, ref) => {
     let nextValue = dateRange;
 
     // The time should remain the same when the dates in the date range are changed.
-    if (has('time') && dateRange !== null && dateRange !== void 0 && dateRange.length && (eventName === 'changeDate' || eventName === 'changeMonth')) {
+    if (has('time') && dateRange?.length && (eventName === 'changeDate' || eventName === 'changeMonth')) {
       const startDate = (0, _date.copyTime)({
         from: getCalendarDatetime('start'),
         to: dateRange[0]
@@ -219,8 +218,8 @@ const DateRangePicker = (0, _utils3.forwardRef)((props, ref) => {
   };
   (0, _react.useEffect)(() => {
     // If value changes, update the selected and hover date values on the calendar panel.
-    setSelectedDates(valueProp !== null && valueProp !== void 0 ? valueProp : []);
-    setHoverDateRange(valueProp !== null && valueProp !== void 0 ? valueProp : null);
+    setSelectedDates(valueProp ?? []);
+    setHoverDateRange(valueProp ?? null);
   }, [valueProp]);
   const getInputHtmlSize = () => {
     const padding = 4;
@@ -241,7 +240,7 @@ const DateRangePicker = (0, _utils3.forwardRef)((props, ref) => {
         return date => (0, _utils.getWeekHoverRange)(date, {
           isoWeek,
           weekStart,
-          locale: locale === null || locale === void 0 ? void 0 : locale.dateLocale
+          locale: locale?.dateLocale
         });
       } else if (hoverRange === 'month') {
         return _utils.getMonthHoverRange;
@@ -264,10 +263,10 @@ const DateRangePicker = (0, _utils3.forwardRef)((props, ref) => {
   };
   const setDateRange = (event, nextValue, closeOverlay = true) => {
     // If nextValue is null, it means that the user is erasing the selected dates.
-    setSelectedDates(nextValue !== null && nextValue !== void 0 ? nextValue : []);
+    setSelectedDates(nextValue ?? []);
     setValue(nextValue);
     if (!(0, _utils.isSameRange)(nextValue, value, formatStr)) {
-      onChange === null || onChange === void 0 || onChange(nextValue, event);
+      onChange?.(nextValue, event);
     }
 
     // `closeOverlay` default value is `true`
@@ -309,14 +308,14 @@ const DateRangePicker = (0, _utils3.forwardRef)((props, ref) => {
    */
   const handleSelectDate = (0, _hooks.useEventCallback)((index, date, event) => {
     const calendarKey = index === 0 ? 'start' : 'end';
-    let nextSelectDates = hoverDateRange !== null && hoverDateRange !== void 0 ? hoverDateRange : [];
+    let nextSelectDates = hoverDateRange ?? [];
     const hoverRangeValue = getHoverRangeValue(date);
     const noHoverRangeValid = (0, _isNil.default)(hoverRangeValue);
 
     // in `oneTap` mode
     if (oneTap) {
       setDateRange(event, noHoverRangeValid ? [(0, _date.startOfDay)(date), (0, _date.endOfDay)(date)] : hoverRangeValue);
-      onSelect === null || onSelect === void 0 || onSelect(date, event);
+      onSelect?.(date, event);
       return;
     }
 
@@ -369,7 +368,7 @@ const DateRangePicker = (0, _utils3.forwardRef)((props, ref) => {
         eventName: 'changeDate'
       });
     }
-    onSelect === null || onSelect === void 0 || onSelect(date, event);
+    onSelect?.(date, event);
     setSelectedIdle(!isSelectedIdle);
   });
 
@@ -427,11 +426,11 @@ const DateRangePicker = (0, _utils3.forwardRef)((props, ref) => {
     } else {
       // Reset the date on the calendar to the default date
       nextCalendarDate = (0, _utils.getSafeCalendarDate)({
-        value: defaultCalendarValue !== null && defaultCalendarValue !== void 0 ? defaultCalendarValue : null,
+        value: defaultCalendarValue ?? null,
         allowSameMonth
       });
     }
-    setSelectedDates(value !== null && value !== void 0 ? value : []);
+    setSelectedDates(value ?? []);
     setCalendarDateRange({
       dateRange: nextCalendarDate
     });
@@ -452,9 +451,9 @@ const DateRangePicker = (0, _utils3.forwardRef)((props, ref) => {
     if (closeOverlay) {
       setDateRange(event, value, closeOverlay);
     } else {
-      setSelectedDates(value !== null && value !== void 0 ? value : []);
+      setSelectedDates(value ?? []);
     }
-    onShortcutClick === null || onShortcutClick === void 0 || onShortcutClick(range, event);
+    onShortcutClick?.(range, event);
 
     // End unfinished selections.
     setSelectedIdle(true);
@@ -469,14 +468,14 @@ const DateRangePicker = (0, _utils3.forwardRef)((props, ref) => {
   const handleClickOK = (0, _hooks.useEventCallback)(event => {
     const nextValue = calculateDateRange();
     setDateRange(event, nextValue);
-    onOk === null || onOk === void 0 || onOk(nextValue, event);
+    onOk?.(nextValue, event);
   });
   const handleClean = (0, _hooks.useEventCallback)(event => {
     setCalendarDateRange({
       dateRange: null
     });
     setDateRange(event, null);
-    onClean === null || onClean === void 0 || onClean(event);
+    onClean?.(event);
     event.stopPropagation();
   });
 
@@ -565,20 +564,17 @@ const DateRangePicker = (0, _utils3.forwardRef)((props, ref) => {
     return isRangeDisabled(startDate, endDate, _constants.DATERANGE_DISABLED_TARGET.TOOLBAR_SHORTCUT);
   };
   const handleClose = (0, _hooks.useEventCallback)(() => {
-    var _trigger$current, _trigger$current$clos;
-    (_trigger$current = trigger.current) === null || _trigger$current === void 0 || (_trigger$current$clos = _trigger$current.close) === null || _trigger$current$clos === void 0 || _trigger$current$clos.call(_trigger$current);
+    trigger.current?.close?.();
   });
   const handleInputKeyDown = (0, _hooks.useEventCallback)(event => {
     (0, _Picker.onMenuKeyDown)(event, {
       esc: handleClose,
       enter: () => {
-        var _trigger$current2;
         const {
           open
-        } = ((_trigger$current2 = trigger.current) === null || _trigger$current2 === void 0 ? void 0 : _trigger$current2.getState()) || {};
+        } = trigger.current?.getState() || {};
         if (!open) {
-          var _trigger$current3;
-          (_trigger$current3 = trigger.current) === null || _trigger$current3 === void 0 || _trigger$current3.open();
+          trigger.current?.open();
         }
       }
     });
@@ -619,7 +615,7 @@ const DateRangePicker = (0, _utils3.forwardRef)((props, ref) => {
       format: formatStr,
       value: selectedDates,
       monthDropdownProps,
-      hoverRangeValue: hoverDateRange !== null && hoverDateRange !== void 0 ? hoverDateRange : undefined,
+      hoverRangeValue: hoverDateRange ?? undefined,
       hideHours,
       hideMinutes,
       hideSeconds,
@@ -730,7 +726,7 @@ const DateRangePicker = (0, _utils3.forwardRef)((props, ref) => {
       selectedDone: isSelectedIdle,
       target: _constants.DATERANGE_DISABLED_TARGET.INPUT
     };
-    if (isDateDisabled !== null && isDateDisabled !== void 0 && isDateDisabled(startDate, disabledOptions) || isDateDisabled !== null && isDateDisabled !== void 0 && isDateDisabled(endDate, disabledOptions)) {
+    if (isDateDisabled?.(startDate, disabledOptions) || isDateDisabled?.(endDate, disabledOptions)) {
       return true;
     }
     return false;

package/cjs/DateRangePicker/Header.js

@@ -21,7 +21,7 @@ function Header(props) {
     clickable,
     onSelect
   } = props;
-  const [startDate, endDate] = value !== null && value !== void 0 ? value : [null, null];
+  const [startDate, endDate] = value ?? [null, null];
   const v = startDate && endDate ? [startDate, endDate].sort(_date.compareAsc) : [startDate, endDate];
   const start = v[0] ? /*#__PURE__*/_react.default.createElement(_FormattedDate.FormattedDate, {
     date: v[0],
@@ -40,7 +40,7 @@ function Header(props) {
     size: "xs",
     appearance: "subtle",
     className: prefix('header-date'),
-    onClick: () => onSelect === null || onSelect === void 0 ? void 0 : onSelect('start'),
+    onClick: () => onSelect?.('start'),
     "aria-label": "Select start date"
   }, start), /*#__PURE__*/_react.default.createElement("span", {
     className: prefix('header-character')
@@ -48,7 +48,7 @@ function Header(props) {
     size: "xs",
     appearance: "subtle",
     className: prefix('header-date'),
-    onClick: () => onSelect === null || onSelect === void 0 ? void 0 : onSelect('end'),
+    onClick: () => onSelect?.('end'),
     "aria-label": "Select end date"
   }, end)) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
     className: prefix('header-date')

package/cjs/DateRangePicker/disabledDateUtils.js

@@ -27,7 +27,7 @@ function allowedMaxDays(days) {
   return (date, selectValue, selectedDone, target) => {
     let beforeLimit = false;
     let afterLimit = false;
-    if (selectValue !== null && selectValue !== void 0 && selectValue[0]) {
+    if (selectValue?.[0]) {
       const startDate = selectValue[0];
       beforeLimit = (0, _utils.composeFunctions)(f => DateUtils.addDays(f, -days + 1), f => isAfterDay(f, date))(startDate);
       afterLimit = (0, _utils.composeFunctions)(f => DateUtils.addDays(f, days - 1), f => isBeforeDay(f, date))(startDate);
@@ -46,7 +46,7 @@ function allowedDays(days) {
   return (date, selectValue, selectedDone, target) => {
     let beforeLimit = false;
     let afterLimit = false;
-    if (selectValue !== null && selectValue !== void 0 && selectValue[0]) {
+    if (selectValue?.[0]) {
       const startDate = selectValue[0];
       beforeLimit = (0, _utils.composeFunctions)(f => DateUtils.addDays(f, -days + 1), f => !DateUtils.isSameDay(f, date))(startDate);
       afterLimit = (0, _utils.composeFunctions)(f => DateUtils.addDays(f, days - 1), f => !DateUtils.isSameDay(f, date))(startDate);

package/cjs/DateRangePicker/hooks/useCalendarHandlers.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface CalendarHandlerProps {
     index: number;
     calendarDateRange: Date[];

package/cjs/DateRangePicker/hooks/useCalendarHandlers.js

@@ -16,19 +16,19 @@ function useCalendarHandlers({
 }) {
   const calendarDate = (0, _react.useMemo)(() => calendarDateRange[index], [calendarDateRange, index]);
   const handleSelect = (0, _hooks.useEventCallback)((date, event) => {
-    onSelect === null || onSelect === void 0 || onSelect(index, date, event);
+    onSelect?.(index, date, event);
   });
   const handleChangeMonth = (0, _hooks.useEventCallback)(nextPageDate => {
-    onChangeCalendarMonth === null || onChangeCalendarMonth === void 0 || onChangeCalendarMonth(index, nextPageDate);
+    onChangeCalendarMonth?.(index, nextPageDate);
   });
   const handleChangeTime = (0, _hooks.useEventCallback)(nextPageDate => {
-    onChangeCalendarTime === null || onChangeCalendarTime === void 0 || onChangeCalendarTime(index, nextPageDate);
+    onChangeCalendarTime?.(index, nextPageDate);
   });
   const handleMoveForward = (0, _hooks.useEventCallback)(() => {
-    onChangeCalendarMonth === null || onChangeCalendarMonth === void 0 || onChangeCalendarMonth(index, (0, _date.addMonths)(calendarDate, 1));
+    onChangeCalendarMonth?.(index, (0, _date.addMonths)(calendarDate, 1));
   });
   const handleMoveBackward = (0, _hooks.useEventCallback)(() => {
-    onChangeCalendarMonth === null || onChangeCalendarMonth === void 0 || onChangeCalendarMonth(index, (0, _date.addMonths)(calendarDate, -1));
+    onChangeCalendarMonth?.(index, (0, _date.addMonths)(calendarDate, -1));
   });
   return {
     calendarDate,

package/cjs/DateRangePicker/utils.js

@@ -11,9 +11,8 @@ function getSafeCalendarDate({
   calendarKey = 'start',
   allowSameMonth
 }) {
-  var _value;
   // Update calendarDate if the value is not null
-  value = (_value = value) !== null && _value !== void 0 ? _value : [];
+  value = value ?? [];
   const gap = allowSameMonth ? 0 : 1;
   if (value[0] && value[1]) {
     const diffMonth = (0, _date.differenceInCalendarMonths)(value[1], value[0]);

package/cjs/Dropdown/Dropdown.js

@@ -134,11 +134,11 @@ const Dropdown = (0, _utils.forwardRef)((props, ref) => {
       }, popupProps), children);
     },
     onToggleMenu: 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/Dropdown/DropdownItem.js

@@ -51,12 +51,11 @@ const DropdownItem = (0, _utils.forwardRef)((props, ref) => {
     prefix
   } = (0, _hooks.useStyles)(classPrefix);
   const handleSelectItem = (0, _react.useCallback)(event => {
-    var _dropdown$onSelect;
-    onSelect === null || onSelect === void 0 || onSelect(eventKey, event);
-    dropdown === null || dropdown === void 0 || (_dropdown$onSelect = dropdown.onSelect) === null || _dropdown$onSelect === void 0 || _dropdown$onSelect.call(dropdown, eventKey, event);
+    onSelect?.(eventKey, event);
+    dropdown?.onSelect?.(eventKey, event);
   }, [onSelect, eventKey, dropdown]);
-  const selected = activeProp || !(0, _isNil.default)(eventKey) && (0, _utils.shallowEqual)(dropdown === null || dropdown === void 0 ? void 0 : dropdown.activeKey, eventKey);
-  const dispatch = dropdown === null || dropdown === void 0 ? void 0 : dropdown.dispatch;
+  const selected = activeProp || !(0, _isNil.default)(eventKey) && (0, _utils.shallowEqual)(dropdown?.activeKey, eventKey);
+  const dispatch = dropdown?.dispatch;
   (0, _react.useEffect)(() => {
     if (dispatch) {
       dispatch({

package/cjs/Dropdown/DropdownMenu.d.ts

@@ -39,5 +39,5 @@ export interface DropdownMenuProps<T = string | number> extends StandardProps {
  *   </Dropdown.Menu>
  * </Dropdown>
  */
-declare const DropdownMenu: React.ForwardRefExoticComponent<DropdownMenuProps<string | number> & SanitizedHTMListProps<HTMLElement, React.HTMLAttributes<HTMLElement>> & React.RefAttributes<HTMLElement>>;
+declare const DropdownMenu: React.ForwardRefExoticComponent<DropdownMenuProps<string | number> & SanitizedHTMListProps & React.RefAttributes<HTMLElement>>;
 export default DropdownMenu;

package/cjs/Dropdown/DropdownMenu.js

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

package/cjs/Form/Form.d.ts

@@ -98,9 +98,7 @@ export interface FormProps<V = Record<string, any>, M = any, E = {
 declare const Form: import("../internals/types").InternalRefForwardingComponent<"form", FormProps<Record<string, any>, any, {
     [x: string]: any;
 }> & {
-    ref?: React.Ref<FormInstance<Record<string, any>, string, {
-        [x: string]: string | undefined;
-    }>> | undefined;
+    ref?: React.Ref<FormInstance>;
 }, never> & {
     Stack: import("../internals/types").InternalRefForwardingComponent<"span", import("../FormStack").FormStackProps, never> & Record<string, never>;
     Control: FormControlComponent;

package/cjs/Form/Form.js

@@ -106,21 +106,20 @@ const Form = (0, _utils.forwardRef)((props, ref) => {
   const submit = (0, _hooks.useEventCallback)(event => {
     // Check the form before submitting
     if (check()) {
-      onSubmit === null || onSubmit === void 0 || onSubmit(formValue, event);
+      onSubmit?.(formValue, event);
     }
   });
   const reset = (0, _hooks.useEventCallback)(event => {
     resetErrors();
     const resetValue = resetFormValue();
     if (resetValue) {
-      onChange === null || onChange === void 0 || onChange(resetValue);
+      onChange?.(resetValue);
     }
-    onReset === null || onReset === void 0 || onReset(resetValue, event);
+    onReset?.(resetValue, event);
   });
   const handleSubmit = (0, _hooks.useEventCallback)(event => {
-    var _event$preventDefault, _event$stopPropagatio;
-    event === null || event === void 0 || (_event$preventDefault = event.preventDefault) === null || _event$preventDefault === void 0 || _event$preventDefault.call(event);
-    event === null || event === void 0 || (_event$stopPropagatio = event.stopPropagation) === null || _event$stopPropagatio === void 0 || _event$stopPropagatio.call(event);
+    event?.preventDefault?.();
+    event?.stopPropagation?.();
 
     // Prevent submission when the form is disabled, readOnly, or plaintext
     if (disabled || readOnly || plaintext) {
@@ -129,9 +128,8 @@ const Form = (0, _utils.forwardRef)((props, ref) => {
     submit(event);
   });
   const handleReset = (0, _hooks.useEventCallback)(event => {
-    var _event$preventDefault2, _event$stopPropagatio2;
-    event === null || event === void 0 || (_event$preventDefault2 = event.preventDefault) === null || _event$preventDefault2 === void 0 || _event$preventDefault2.call(event);
-    event === null || event === void 0 || (_event$stopPropagatio2 = event.stopPropagation) === null || _event$stopPropagatio2 === void 0 || _event$stopPropagatio2.call(event);
+    event?.preventDefault?.();
+    event?.stopPropagation?.();
 
     // Prevent reset when the form is disabled, readOnly, or plaintext
     if (disabled || readOnly || plaintext) {
@@ -155,14 +153,14 @@ const Form = (0, _utils.forwardRef)((props, ref) => {
   });
   const removeFieldValue = (0, _hooks.useEventCallback)(name => {
     const formValue = onRemoveValue(name);
-    onChange === null || onChange === void 0 || onChange(formValue);
+    onChange?.(formValue);
   });
   const removeFieldError = (0, _hooks.useEventCallback)(name => {
     onRemoveError(name);
   });
   const onFieldChange = (0, _hooks.useEventCallback)((name, value, event) => {
     const nextFormValue = setFieldValue(name, value);
-    onChange === null || onChange === void 0 || onChange(nextFormValue, event);
+    onChange?.(nextFormValue, event);
   });
   const formContextValue = {
     errorFromContext,

package/cjs/Form/hooks/useFormRef.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { CheckResult } from 'schema-typed';
 export interface FormImperativeMethods<T = Record<string, any>, M = string, E = {
     [P in keyof T]?: M;

package/cjs/Form/hooks/useFormValidate.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="lodash" />
 export interface FormErrorProps {
     formValue: any;
     getCombinedModel: () => any;

package/cjs/Form/hooks/useFormValidate.js

@@ -38,16 +38,16 @@ function useFormValidate(_formError, props) {
       const checkResult = type.check(value, formValue, key);
       if (checkResult.hasError === true) {
         errorCount += 1;
-        formErrorObj[key] = (checkResult === null || checkResult === void 0 ? void 0 : checkResult.errorMessage) || checkResult;
+        formErrorObj[key] = checkResult?.errorMessage || checkResult;
       }
 
       // Check nested object
-      if (type !== null && type !== void 0 && type.objectTypeSchemaSpec) {
+      if (type?.objectTypeSchemaSpec) {
         Object.entries(type.objectTypeSchemaSpec).forEach(([nestedKey, nestedType]) => {
           formErrorObj[key] = formErrorObj[key] || {
             object: {}
           };
-          checkField(nestedKey, nestedType, value === null || value === void 0 ? void 0 : value[nestedKey], formErrorObj[key].object);
+          checkField(nestedKey, nestedType, value?.[nestedKey], formErrorObj[key].object);
         });
       }
     };
@@ -55,10 +55,10 @@ function useFormValidate(_formError, props) {
       checkField(key, type, formValue[key], formError);
     });
     setFormError(formError);
-    onCheck === null || onCheck === void 0 || onCheck(formError);
-    callback === null || callback === void 0 || callback(formError);
+    onCheck?.(formError);
+    callback?.(formError);
     if (errorCount > 0) {
-      onError === null || onError === void 0 || onError(formError);
+      onError?.(formError);
       return false;
     }
     return true;
@@ -77,10 +77,10 @@ function useFormValidate(_formError, props) {
     if (nestedField) {
       nextFormError = (0, _set.default)(nextFormError, (0, _nameToPath.nameToPath)(fieldName), resultOfCurrentField);
       setFormError(nextFormError);
-      onCheck === null || onCheck === void 0 || onCheck(nextFormError);
-      callback === null || callback === void 0 || callback(resultOfCurrentField);
+      onCheck?.(nextFormError);
+      callback?.(resultOfCurrentField);
       if (resultOfCurrentField.hasError) {
-        onError === null || onError === void 0 || onError(nextFormError);
+        onError?.(nextFormError);
       }
       return !resultOfCurrentField.hasError;
     } else {
@@ -101,10 +101,10 @@ function useFormValidate(_formError, props) {
         }
       });
       setFormError(nextFormError);
-      onCheck === null || onCheck === void 0 || onCheck(nextFormError);
-      callback === null || callback === void 0 || callback(resultOfCurrentField);
+      onCheck?.(nextFormError);
+      callback?.(resultOfCurrentField);
       if (hasError) {
-        onError === null || onError === void 0 || onError(nextFormError);
+        onError?.(nextFormError);
       }
       return !hasError;
     }
@@ -138,10 +138,10 @@ function useFormValidate(_formError, props) {
           formError[keys[i]] = values[i].errorMessage;
         }
       }
-      onCheck === null || onCheck === void 0 || onCheck(formError);
+      onCheck?.(formError);
       setFormError(formError);
       if (errorCount > 0) {
-        onError === null || onError === void 0 || onError(formError);
+        onError?.(formError);
       }
       return {
         hasError: errorCount > 0,
@@ -163,10 +163,10 @@ function useFormValidate(_formError, props) {
 
       if (nestedField) {
         nextFormError = (0, _set.default)(nextFormError, (0, _nameToPath.nameToPath)(fieldName), resultOfCurrentField);
-        onCheck === null || onCheck === void 0 || onCheck(nextFormError);
+        onCheck?.(nextFormError);
         setFormError(nextFormError);
         if (resultOfCurrentField.hasError) {
-          onError === null || onError === void 0 || onError(nextFormError);
+          onError?.(nextFormError);
         }
         return resultOfCurrentField;
       } else {
@@ -187,9 +187,9 @@ function useFormValidate(_formError, props) {
           }
         });
         setFormError(nextFormError);
-        onCheck === null || onCheck === void 0 || onCheck(nextFormError);
+        onCheck?.(nextFormError);
         if (hasError) {
-          onError === null || onError === void 0 || onError(nextFormError);
+          onError?.(nextFormError);
         }
         return resultOfCurrentField;
       }
@@ -211,7 +211,7 @@ function useFormValidate(_formError, props) {
     const formError = (0, _omit.default)(realFormErrorRef.current, [nestedField ? (0, _nameToPath.nameToPath)(name) : name]);
     realFormErrorRef.current = formError;
     setFormError(formError);
-    onCheck === null || onCheck === void 0 || onCheck(formError);
+    onCheck?.(formError);
     return formError;
   }, [nestedField, onCheck, setFormError]);
   const cleanErrors = (0, _hooks.useEventCallback)(() => {

package/cjs/Form/hooks/useFormValue.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="lodash" />
 type RecordAny = Record<string, any>;
 interface UseFormValueProps<V = RecordAny> {
     formDefaultValue: V;

package/cjs/FormControl/FormControl.js

@@ -74,9 +74,9 @@ const FormControl = (0, _utils.forwardRef)((props, ref) => {
   });
 
   // Combine props and context values
-  const resolvedReadOnly = readOnly !== null && readOnly !== void 0 ? readOnly : contextReadOnly;
-  const resolvedPlaintext = plaintext !== null && plaintext !== void 0 ? plaintext : contextPlaintext;
-  const resolvedDisabled = disabled !== null && disabled !== void 0 ? disabled : contextDisabled;
+  const resolvedReadOnly = readOnly ?? contextReadOnly;
+  const resolvedPlaintext = plaintext ?? contextPlaintext;
+  const resolvedDisabled = disabled ?? contextDisabled;
   const {
     withPrefix,
     prefix
@@ -86,13 +86,13 @@ const FormControl = (0, _utils.forwardRef)((props, ref) => {
   // Handle onChange with both hook's implementation and prop callback
   const handleChange = (value, event) => {
     handleFieldChange(value, event);
-    propsOnChange === null || propsOnChange === void 0 || propsOnChange(value, event);
+    propsOnChange?.(value, event);
   };
 
   // Handle onBlur with both hook's implementation and prop callback
   const handleBlur = event => {
     handleFieldBlur(); // onBlur doesn't take parameters in the hook
-    propsOnBlur === null || propsOnBlur === void 0 || propsOnBlur(event);
+    propsOnBlur?.(event);
   };
 
   // Toggle component is a special case that uses `checked` and `defaultChecked` instead of `value` and `defaultValue` props.

package/cjs/FormGroup/FormGroupContext.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 export declare const FormGroupContext: React.Context<{
-    controlId?: string | undefined;
+    controlId?: string;
 }>;

package/cjs/Highlight/utils/highlightText.js

@@ -21,7 +21,7 @@ function highlightText(text, props) {
     if (strArr[i]) {
       texts.push(strArr[i]);
     }
-    if (highStrArr !== null && highStrArr !== void 0 && highStrArr[i]) {
+    if (highStrArr?.[i]) {
       texts.push(renderMark(highStrArr[i], i));
     }
   }

package/cjs/InlineEdit/renderChildren.js

@@ -16,11 +16,10 @@ function defaultRenderInput(props, ref) {
 }
 const pickers = ['DatePicker', 'DateRangePicker', 'TimePicker', 'TimeRangePicker', 'InputPicker', 'TagPicker', 'Cascader', 'MultiCascader', 'SelectPicker', 'CheckPicker', 'CheckTreePicker', 'TreePicker'];
 function getDisplayName(Component) {
-  var _Component$type;
-  if (typeof (Component === null || Component === void 0 ? void 0 : Component.type) === 'string') {
-    return Component === null || Component === void 0 ? void 0 : Component.type;
+  if (typeof Component?.type === 'string') {
+    return Component?.type;
   }
-  return (Component === null || Component === void 0 || (_Component$type = Component.type) === null || _Component$type === void 0 ? void 0 : _Component$type.displayName) || '';
+  return Component?.type?.displayName || '';
 }
 function renderChildren(children, props, ref) {
   if (typeof children === 'function') {
@@ -40,8 +39,8 @@ function renderChildren(children, props, ref) {
       ...rest,
       // Pass onBlur to the child component to automatically save or cancel after the focus event is processed.
       // Special handling in the Picker component, call onBlur when onExit and onClean
-      onExit: (0, _utils.createChainedFunction)(() => onBlur === null || onBlur === void 0 ? void 0 : onBlur(), onExit),
-      onClean: (0, _utils.createChainedFunction)(() => onBlur === null || onBlur === void 0 ? void 0 : onBlur(), onClean),
+      onExit: (0, _utils.createChainedFunction)(() => onBlur?.(), onExit),
+      onClean: (0, _utils.createChainedFunction)(() => onBlur?.(), onClean),
       ref
     });
   }