rsuite 6.1.2 → 6.1.3

package/esm/Tree/hooks/useTreeDrag.js

@@ -60,9 +60,8 @@ function createDragPreview(name, className) {
  * Removes the drag preview element from the DOM.
  */
 function removeDragPreview() {
-  var _dragPreview$parentNo, _dragPreview$parentNo2;
   const dragPreview = document.getElementById('rs-tree-drag-preview');
-  dragPreview === null || dragPreview === void 0 || (_dragPreview$parentNo = dragPreview.parentNode) === null || _dragPreview$parentNo === void 0 || (_dragPreview$parentNo2 = _dragPreview$parentNo.removeChild) === null || _dragPreview$parentNo2 === void 0 || _dragPreview$parentNo2.call(_dragPreview$parentNo, dragPreview);
+  dragPreview?.parentNode?.removeChild?.(dragPreview);
 }
 /**
  * Custom hook for handling tree node dragging.
@@ -101,7 +100,7 @@ export default function useTreeDrag(props) {
   const getDragNodeKeys = useCallback(dragNode => {
     let dragNodeKeys = [dragNode[valueKey]];
     const traverse = data => {
-      if ((data === null || data === void 0 ? void 0 : data.length) > 0) {
+      if (data?.length > 0) {
         data.forEach(node => {
           dragNodeKeys = dragNodeKeys.concat([node[valueKey]]);
           if (node[childrenKey]) {
@@ -197,12 +196,11 @@ export default function useTreeDrag(props) {
   }, [createDragTreeDataFunction, dropNodePosition]);
   const handleDragStart = useEventCallback((nodeData, event) => {
     if (draggable) {
-      var _event$dataTransfer;
       const dragMoverNode = createDragPreview(stringifyReactNode(nodeData[labelKey]), prefix('drag-preview'));
-      (_event$dataTransfer = event.dataTransfer) === null || _event$dataTransfer === void 0 || _event$dataTransfer.setDragImage(dragMoverNode, 0, 0);
+      event.dataTransfer?.setDragImage(dragMoverNode, 0, 0);
       setDragNodeKeys(getDragNodeKeys(nodeData));
       setDragNode(flattenedNodes[nodeData.refKey]);
-      onDragStart === null || onDragStart === void 0 || onDragStart(nodeData, event);
+      onDragStart?.(nodeData, event);
     }
   });
   const handleDragEnter = useEventCallback((nodeData, event) => {
@@ -213,7 +211,7 @@ export default function useTreeDrag(props) {
       setDragOverNodeKey(nodeData[valueKey]);
       setDropNodePosition(calDropNodePosition(event, treeNodesRefs[nodeData.refKey]));
     }
-    onDragEnter === null || onDragEnter === void 0 || onDragEnter(nodeData, event);
+    onDragEnter?.(nodeData, event);
   });
   const handleDragOver = useEventCallback((nodeData, event) => {
     if (dragNodeKeys.some(d => equal(d, nodeData[valueKey]))) {
@@ -225,24 +223,24 @@ export default function useTreeDrag(props) {
       if (lastDropNodePosition === dropNodePosition) return;
       setDropNodePosition(lastDropNodePosition);
     }
-    onDragOver === null || onDragOver === void 0 || onDragOver(nodeData, event);
+    onDragOver?.(nodeData, event);
   });
   const handleDragLeave = useEventCallback((nodeData, event) => {
-    onDragLeave === null || onDragLeave === void 0 || onDragLeave(nodeData, event);
+    onDragLeave?.(nodeData, event);
   });
   const handleDragEnd = useEventCallback((nodeData, event) => {
     removeDragPreview();
     setDragNode(null);
     setDragNodeKeys([]);
     setDragOverNodeKey(null);
-    onDragEnd === null || onDragEnd === void 0 || onDragEnd(nodeData, event);
+    onDragEnd?.(nodeData, event);
   });
   const handleDrop = useEventCallback((nodeData, event) => {
     if (dragNodeKeys.some(d => equal(d, nodeData[valueKey]))) {
       console.error('Cannot drag a node to itself and its children');
     } else {
       const dropData = getDropData(nodeData);
-      onDrop === null || onDrop === void 0 || onDrop(dropData, event);
+      onDrop?.(dropData, event);
     }
     removeDragPreview();
     setDragNode(null);
@@ -258,7 +256,7 @@ export default function useTreeDrag(props) {
     onDrop: handleDrop
   };
   return {
-    dragNode: dragNode === null || dragNode === void 0 ? void 0 : dragNode.current,
+    dragNode: dragNode?.current,
     dragOverNodeKey,
     dropNodePosition,
     dragEvents

package/esm/Tree/hooks/useTreeNodeProps.js

@@ -33,7 +33,7 @@ function useTreeNodeProps(props) {
     const {
       visible
     } = nodeData;
-    const draggingNode = dragNode !== null && dragNode !== void 0 ? dragNode : {};
+    const draggingNode = dragNode ?? {};
     const nodeValue = nodeData[valueKey];
     const nodeLabel = nodeData[labelKey];
     const children = nodeData[childrenKey];

package/esm/Tree/hooks/useTreeSearch.js

@@ -34,21 +34,21 @@ export default function useTreeSearch(props) {
   }, [childrenKey, labelKey, searchBy]);
 
   // Use search keywords to filter options.
-  const [keyword, setSearchKeyword] = useState(searchKeyword !== null && searchKeyword !== void 0 ? searchKeyword : '');
+  const [keyword, setSearchKeyword] = useState(searchKeyword ?? '');
   const [filteredData, setFilteredData] = useState(() => filterVisibleData(data, keyword));
   const handleSearch = (searchKeyword, event) => {
     const filteredData = filterVisibleData(data, searchKeyword);
     setFilteredData(filteredData);
     setSearchKeyword(searchKeyword);
     if (event) {
-      callback === null || callback === void 0 || callback(searchKeyword, filteredData, event);
+      callback?.(searchKeyword, filteredData, event);
     }
   };
   useEffect(() => {
-    handleSearch(searchKeyword !== null && searchKeyword !== void 0 ? searchKeyword : '');
+    handleSearch(searchKeyword ?? '');
   }, [searchKeyword]);
   useEffect(() => {
-    setSearchKeyword(searchKeyword !== null && searchKeyword !== void 0 ? searchKeyword : '');
+    setSearchKeyword(searchKeyword ?? '');
   }, [searchKeyword, setSearchKeyword]);
   const setVisibleData = useCallback((data, searchKeyword) => {
     setFilteredData(filterVisibleData(data, searchKeyword));

package/esm/Tree/hooks/useVirtualizedTreeData.js

@@ -35,14 +35,14 @@ function useVirtualizedTreeData(nodes, data, options) {
     } = options;
     return UNSAFE_flattenTree(data, childrenKey, node => {
       let formatted = {};
-      const curNode = nodes === null || nodes === void 0 ? void 0 : nodes[node.refKey];
+      const curNode = nodes?.[node.refKey];
       const parentKeys = getNodeParentKeys(nodes, curNode, valueKey);
       /**
        * When using virtualized,
        * if the parent node is collapsed, the child nodes should be hidden
        * avoid component height calculation errors
        */
-      let visible = curNode !== null && curNode !== void 0 && curNode.parent ? shouldShowNodeByParentExpanded(expandItemValues, parentKeys) : true;
+      let visible = curNode?.parent ? shouldShowNodeByParentExpanded(expandItemValues, parentKeys) : true;
 
       /**
        * when searching, every node default expand

package/esm/Tree/types.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { BaseBoxProps } from '../internals/Box';
 import type { ListProps } from '../internals/Windowing';
 import type { TreeNode } from '../internals/Tree/types';
@@ -6,8 +5,8 @@ import type { TreeNode } from '../internals/Tree/types';
  * Tree Node Drag Type
  */
 export declare enum TREE_NODE_DROP_POSITION {
-    DRAG_OVER = 0,
-    DRAG_OVER_TOP = 1,
+    DRAG_OVER = 0,// drag node in tree node
+    DRAG_OVER_TOP = 1,// drag node on tree node
     DRAG_OVER_BOTTOM = 2
 }
 export interface DropData<T> {

package/esm/Tree/utils/flattenTree.d.ts

@@ -2,7 +2,7 @@
  * Strategy for walking the tree.
  */
 export declare enum WalkTreeStrategy {
-    DFS = 0,
+    DFS = 0,// Depth-first search
     BFS = 1
 }
 /**

package/esm/Tree/utils/focusableTree.js

@@ -63,9 +63,8 @@ export const getActiveItem = (focusItemValue, flattenedNodes, valueKey) => {
  *
  */
 export const focusTreeNode = (refKey, treeNodeRefs) => {
-  var _treeItem$focus;
   const treeItem = treeNodeRefs[refKey];
-  treeItem === null || treeItem === void 0 || (_treeItem$focus = treeItem.focus) === null || _treeItem$focus === void 0 || _treeItem$focus.call(treeItem);
+  treeItem?.focus?.();
 };
 /**
  * Focuses on the next item in a tree.
@@ -164,9 +163,8 @@ export function scrollToActiveTreeNode(props) {
     formattedNodes
   } = props;
   if (virtualized && value) {
-    var _list$scrollToItem;
     const scrollIndex = getScrollToIndex(formattedNodes, value, valueKey);
-    list === null || list === void 0 || (_list$scrollToItem = list.scrollToItem) === null || _list$scrollToItem === void 0 || _list$scrollToItem.call(list, scrollIndex);
+    list?.scrollToItem?.(scrollIndex);
   }
 }
 export const focusCurrentItem = props => {
@@ -174,10 +172,9 @@ export const focusCurrentItem = props => {
     selector = SELECTED_TREEITEM_SELECTOR,
     container
   } = props;
-  const activeItem = container === null || container === void 0 ? void 0 : container.querySelector(selector);
+  const activeItem = container?.querySelector(selector);
   if (activeItem) {
-    var _activeItem$focus, _activeItem$dataset;
-    activeItem === null || activeItem === void 0 || (_activeItem$focus = activeItem.focus) === null || _activeItem$focus === void 0 || _activeItem$focus.call(activeItem);
-    return (_activeItem$dataset = activeItem.dataset) === null || _activeItem$dataset === void 0 ? void 0 : _activeItem$dataset.key;
+    activeItem?.focus?.();
+    return activeItem.dataset?.key;
   }
 };

package/esm/Tree/utils/getNodeParentKeys.js

@@ -5,11 +5,9 @@
 export function getNodeParentKeys(nodes, node, valueKey) {
   const parentKeys = [];
   const traverse = node => {
-    var _node$parent;
-    if (node !== null && node !== void 0 && (_node$parent = node.parent) !== null && _node$parent !== void 0 && _node$parent.refKey) {
-      var _node$parent2;
+    if (node?.parent?.refKey) {
       traverse(nodes[node.parent.refKey]);
-      parentKeys.push(node === null || node === void 0 || (_node$parent2 = node.parent) === null || _node$parent2 === void 0 ? void 0 : _node$parent2[valueKey]);
+      parentKeys.push(node?.parent?.[valueKey]);
     }
   };
   traverse(node);

package/esm/Tree/utils/hasVisibleChildren.d.ts

@@ -2,4 +2,4 @@ import type { TreeNode } from '../../internals/Tree/types';
 /**
  * Checks if a node has visible children.
  */
-export declare function hasVisibleChildren(node: TreeNode, childrenKey: string): any;
+export declare function hasVisibleChildren(node: TreeNode, childrenKey: string): boolean;

package/esm/Tree/utils/treeKeyboardInteractions.js

@@ -16,8 +16,8 @@ export function handleLeftArrow(props) {
     return;
   }
   if (expand) {
-    onExpand === null || onExpand === void 0 || onExpand(focusItem, expand);
-  } else if (focusItem !== null && focusItem !== void 0 && focusItem.parent) {
+    onExpand?.(focusItem, expand);
+  } else if (focusItem?.parent) {
     onFocusItem();
   }
 }
@@ -40,7 +40,7 @@ export function handleRightArrow(props) {
     return;
   }
   if (!expand) {
-    onExpand === null || onExpand === void 0 || onExpand(focusItem, expand);
+    onExpand?.(focusItem, expand);
   } else {
     onFocusItem();
   }

package/esm/TreePicker/TreePicker.js

@@ -135,8 +135,7 @@ const TreePicker = forwardRef((props, ref) => {
     onEntered
   });
   const handleSelect = useEventCallback((treeNode, value, event) => {
-    var _target$current, _trigger$current, _trigger$current$clos;
-    onSelect === null || onSelect === void 0 || onSelect(treeNode, value, event);
+    onSelect?.(treeNode, value, event);
 
     // Only leaf nodes can update the value and close the picker.
     if (onlyLeafSelectable && !isLeafNode(treeNode)) {
@@ -144,8 +143,8 @@ const TreePicker = forwardRef((props, ref) => {
     }
     setFocusItemValue(value);
     handleChange(value, event);
-    (_target$current = target.current) === null || _target$current === void 0 || _target$current.focus();
-    (_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);
+    target.current?.focus();
+    trigger.current?.close?.();
   });
   const handleClean = useEventCallback(event => {
     const target = event.target;
@@ -154,7 +153,7 @@ const TreePicker = forwardRef((props, ref) => {
       return;
     }
     setValue(null);
-    onChange === null || onChange === void 0 || onChange(null, event);
+    onChange?.(null, event);
   });
   const handleTreePressEnter = useEventCallback(event => {
     if (isNil(focusItemValue)) {
@@ -183,7 +182,7 @@ const TreePicker = forwardRef((props, ref) => {
   });
   const handleChange = useEventCallback((nextValue, event) => {
     setValue(nextValue);
-    onChange === null || onChange === void 0 || onChange(nextValue, event);
+    onChange?.(nextValue, event);
   });
   const treeContext = useMemo(() => ({
     register,
@@ -233,7 +232,7 @@ const TreePicker = forwardRef((props, ref) => {
       ref: mergeRefs(overlay, speakerRef),
       onKeyDown: onPickerKeydown,
       target: trigger
-    }, renderTree ? renderTree(tree) : tree, renderExtraFooter === null || renderExtraFooter === void 0 ? void 0 : renderExtraFooter());
+    }, renderTree ? renderTree(tree) : tree, renderExtraFooter?.());
   };
 
   /**
@@ -243,7 +242,7 @@ const TreePicker = forwardRef((props, ref) => {
   let hasValidValue = !isNil(activeNode) || !isNil(value) && isFunction(renderValue);
   let selectedElement = placeholder;
   if (hasValidValue) {
-    const node = activeNode !== null && activeNode !== void 0 ? activeNode : {};
+    const node = activeNode ?? {};
     selectedElement = node[labelKey];
     if (isFunction(renderValue) && value) {
       selectedElement = renderValue(value, node, selectedElement);
@@ -284,7 +283,7 @@ const TreePicker = forwardRef((props, ref) => {
     placement: placement,
     inputValue: value,
     focusItemValue: focusItemValue
-  }, rest), selectedElement || (locale === null || locale === void 0 ? void 0 : locale.placeholder)));
+  }, rest), selectedElement || locale?.placeholder));
 });
 TreePicker.displayName = 'TreePicker';
 export default TreePicker;

package/esm/TreePicker/hooks/useFocusState.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface FocusStateProps {
     target: React.RefObject<HTMLElement | null>;
     value?: number | string | null | undefined;

package/esm/TreePicker/hooks/useFocusState.js

@@ -10,27 +10,23 @@ function useFocusState(props) {
   const [active, setActive] = useState(false);
   const [focusItemValue, setFocusItemValue] = useState(null);
   const focusTarget = useEventCallback(() => {
-    var _target$current;
-    (_target$current = target.current) === null || _target$current === void 0 || _target$current.focus();
+    target.current?.focus();
   });
   const onEnter = useEventCallback(node => {
-    var _props$onEnter;
     setActive(true);
-    (_props$onEnter = props.onEnter) === null || _props$onEnter === void 0 || _props$onEnter.call(props, node);
+    props.onEnter?.(node);
   });
   const onExit = useEventCallback(node => {
-    var _props$onExit;
     setActive(false);
     focusTarget();
-    (_props$onExit = props.onExit) === null || _props$onExit === void 0 || _props$onExit.call(props, node);
+    props.onExit?.(node);
   });
   const onEntered = useEventCallback(node => {
-    var _props$onEntered;
     if (value) {
       setFocusItemValue(value);
       focusActiveNode();
     }
-    (_props$onEntered = props.onEntered) === null || _props$onEntered === void 0 || _props$onEntered.call(props, node);
+    props.onEntered?.(node);
   });
   return {
     active,

package/esm/Uploader/UploadFileItem.js

@@ -63,13 +63,12 @@ const UploadFileItem = forwardRef((props, ref) => {
    * Get thumbnail of image file
    */
   const getThumbnail = useCallback(callback => {
-    var _file$blobFile;
     if (!~['picture-text', 'picture'].indexOf(listType)) {
       return;
     }
 
     // The thumbnail file size cannot be larger than the preset value.
-    if (!file.blobFile || (file === null || file === void 0 || (_file$blobFile = file.blobFile) === null || _file$blobFile === void 0 ? void 0 : _file$blobFile.size) > maxPreviewFileSize) {
+    if (!file.blobFile || file?.blobFile?.size > maxPreviewFileSize) {
       return;
     }
     previewFile(file.blobFile, callback);
@@ -85,19 +84,19 @@ const UploadFileItem = forwardRef((props, ref) => {
     if (disabled) {
       return;
     }
-    onPreview === null || onPreview === void 0 || onPreview(file, event);
+    onPreview?.(file, event);
   }, [disabled, file, onPreview]);
   const handleRemove = useCallback(event => {
     if (disabled) {
       return;
     }
-    onCancel === null || onCancel === void 0 || onCancel(file.fileKey, event);
+    onCancel?.(file.fileKey, event);
   }, [disabled, file.fileKey, onCancel]);
   const handleReupload = useCallback(event => {
     if (disabled) {
       return;
     }
-    onReupload === null || onReupload === void 0 || onReupload(file, event);
+    onReupload?.(file, event);
   }, [disabled, file, onReupload]);
 
   /**
@@ -173,8 +172,8 @@ const UploadFileItem = forwardRef((props, ref) => {
       return null;
     }
     let closeLabel = 'Remove file';
-    if (locale !== null && locale !== void 0 && locale.removeFile) {
-      closeLabel = (locale === null || locale === void 0 ? void 0 : locale.removeFile) + (file !== null && file !== void 0 && file.name ? `: ${file === null || file === void 0 ? void 0 : file.name}` : '');
+    if (locale?.removeFile) {
+      closeLabel = locale?.removeFile + (file?.name ? `: ${file?.name}` : '');
     }
     return /*#__PURE__*/React.createElement(CloseButton, {
       className: prefix('btn-remove'),
@@ -194,7 +193,7 @@ const UploadFileItem = forwardRef((props, ref) => {
     if (file.status === 'error') {
       return /*#__PURE__*/React.createElement("div", {
         className: prefix('status')
-      }, /*#__PURE__*/React.createElement("span", null, locale === null || locale === void 0 ? void 0 : locale.error), allowReupload && /*#__PURE__*/React.createElement("a", {
+      }, /*#__PURE__*/React.createElement("span", null, locale?.error), allowReupload && /*#__PURE__*/React.createElement("a", {
         role: "button",
         tabIndex: -1,
         onClick: handleReupload,
@@ -211,10 +210,9 @@ const UploadFileItem = forwardRef((props, ref) => {
    */
   const renderFileSize = () => {
     if (file.status !== 'error' && file.blobFile) {
-      var _file$blobFile2;
       return /*#__PURE__*/React.createElement("span", {
         className: prefix('size')
-      }, formatSize(file === null || file === void 0 || (_file$blobFile2 = file.blobFile) === null || _file$blobFile2 === void 0 ? void 0 : _file$blobFile2.size));
+      }, formatSize(file?.blobFile?.size));
     }
     return null;
   };

package/esm/Uploader/UploadTrigger.js

@@ -5,7 +5,6 @@ import { useStyles, useEventCallback } from "../internals/hooks/index.js";
 import { forwardRef } from "../internals/utils/index.js";
 import classNames from 'classnames';
 const UploadTrigger = forwardRef((props, ref) => {
-  var _children$props;
   const {
     as: Component = Button,
     name,
@@ -37,8 +36,7 @@ const UploadTrigger = forwardRef((props, ref) => {
     'drag-over': dragOver
   }));
   const handleClick = useEventCallback(() => {
-    var _inputRef$current;
-    (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 || _inputRef$current.click();
+    inputRef.current?.click();
   });
   const handleClearInput = useEventCallback(() => {
     if (inputRef.current) {
@@ -50,26 +48,26 @@ const UploadTrigger = forwardRef((props, ref) => {
       event.preventDefault();
       setDragOver(true);
     }
-    onDragEnter === null || onDragEnter === void 0 || onDragEnter(event);
+    onDragEnter?.(event);
   });
   const handleDragLeave = useEventCallback(event => {
     if (draggable) {
       event.preventDefault();
       setDragOver(false);
     }
-    onDragLeave === null || onDragLeave === void 0 || onDragLeave(event);
+    onDragLeave?.(event);
   });
   const handleDragOver = useEventCallback(event => {
     draggable && event.preventDefault();
-    onDragOver === null || onDragOver === void 0 || onDragOver(event);
+    onDragOver?.(event);
   });
   const handleDrop = useEventCallback(event => {
     if (draggable) {
       event.preventDefault();
       setDragOver(false);
-      onChange === null || onChange === void 0 || onChange(event);
+      onChange?.(event);
     }
-    onDrop === null || onDrop === void 0 || onDrop(event);
+    onDrop?.(event);
   });
   useImperativeHandle(ref, () => ({
     root: rootRef.current,
@@ -92,8 +90,8 @@ const UploadTrigger = forwardRef((props, ref) => {
   };
   const trigger = children ? (/*#__PURE__*/React.cloneElement(children, {
     ...buttonProps,
-    className: classNames((_children$props = children.props) === null || _children$props === void 0 ? void 0 : _children$props.className, prefix('btn'))
-  })) : /*#__PURE__*/React.createElement(Component, buttonProps, locale === null || locale === void 0 ? void 0 : locale.upload);
+    className: classNames(children.props?.className, prefix('btn'))
+  })) : /*#__PURE__*/React.createElement(Component, buttonProps, locale?.upload);
   return /*#__PURE__*/React.createElement("div", {
     ref: rootRef,
     className: classes,

package/esm/Uploader/Uploader.js

@@ -13,9 +13,8 @@ import { useStyles, useCustom, useWillUnmount, useEventCallback } from "../inter
 // Define several states of the file during the upload process.
 
 const getFiles = event => {
-  if (typeof (event === null || event === void 0 ? void 0 : event['dataTransfer']) === 'object') {
-    var _event$dataTransfer;
-    return event === null || event === void 0 || (_event$dataTransfer = event['dataTransfer']) === null || _event$dataTransfer === void 0 ? void 0 : _event$dataTransfer.files;
+  if (typeof event?.['dataTransfer'] === 'object') {
+    return event?.['dataTransfer']?.files;
   }
   if (event.target) {
     return event.target['files'];
@@ -33,7 +32,6 @@ const createFile = file => {
   };
 };
 function fileListReducer(files, action) {
-  var _action$files;
   switch (action.type) {
     // Add one or more files
     case 'push':
@@ -51,10 +49,10 @@ function fileListReducer(files, action) {
 
     // Initialization file list
     case 'init':
-      return ((_action$files = action.files) === null || _action$files === void 0 ? void 0 : _action$files.map(file => {
+      return action.files?.map(file => {
         // The state of the file needs to be preserved when the `fileList` is controlled.
         return files.find(f => f.fileKey === file.fileKey) || createFile(file);
-      })) || [];
+      }) || [];
     default:
       throw new Error();
   }
@@ -65,8 +63,7 @@ const useFileList = (defaultFileList = []) => {
   const [fileList, dispatch] = useReducer(fileListReducer, fileListRef.current);
   fileListRef.current = fileList;
   useEffect(() => {
-    var _fileListUpdateCallba;
-    (_fileListUpdateCallba = fileListUpdateCallback.current) === null || _fileListUpdateCallba === void 0 || _fileListUpdateCallba.call(fileListUpdateCallback, fileList);
+    fileListUpdateCallback.current?.(fileList);
     fileListUpdateCallback.current = null;
   }, [fileList]);
   useWillUnmount(() => {
@@ -162,8 +159,7 @@ const Uploader = forwardRef((props, ref) => {
    * Clear the value in input.
    */
   const cleanInputValue = useCallback(() => {
-    var _trigger$current;
-    (_trigger$current = trigger.current) === null || _trigger$current === void 0 || _trigger$current.clearInput();
+    trigger.current?.clearInput();
   }, []);
 
   /**
@@ -180,7 +176,7 @@ const Uploader = forwardRef((props, ref) => {
       progress: 100
     };
     updateFileStatus(nextFile);
-    onSuccess === null || onSuccess === void 0 || onSuccess(response, nextFile, event, xhr);
+    onSuccess?.(response, nextFile, event, xhr);
   }, [onSuccess, updateFileStatus]);
 
   /**
@@ -196,7 +192,7 @@ const Uploader = forwardRef((props, ref) => {
       status: 'error'
     };
     updateFileStatus(nextFile);
-    onError === null || onError === void 0 || onError(status, nextFile, event, xhr);
+    onError?.(status, nextFile, event, xhr);
   }, [onError, updateFileStatus]);
 
   /**
@@ -213,7 +209,7 @@ const Uploader = forwardRef((props, ref) => {
       progress: percent
     };
     updateFileStatus(nextFile);
-    onProgress === null || onProgress === void 0 || onProgress(percent, nextFile, event, xhr);
+    onProgress?.(percent, nextFile, event, xhr);
   }, [onProgress, updateFileStatus]);
 
   /**
@@ -245,11 +241,11 @@ const Uploader = forwardRef((props, ref) => {
     if (file.fileKey) {
       xhrs.current[file.fileKey] = xhr;
     }
-    onUpload === null || onUpload === void 0 || onUpload(file, uploadData, xhr);
+    onUpload?.(file, uploadData, xhr);
   });
   const handleAjaxUpload = useEventCallback(() => {
     fileList.current.forEach(file => {
-      const checkState = shouldUpload === null || shouldUpload === void 0 ? void 0 : shouldUpload(file);
+      const checkState = shouldUpload?.(file);
       if (checkState instanceof Promise) {
         checkState.then(res => {
           if (res) {
@@ -278,13 +274,13 @@ const Uploader = forwardRef((props, ref) => {
       });
     });
     const nextFileList = [...fileList.current, ...newFileList];
-    const checkState = shouldQueueUpdate === null || shouldQueueUpdate === void 0 ? void 0 : shouldQueueUpdate(nextFileList, newFileList);
+    const checkState = shouldQueueUpdate?.(nextFileList, newFileList);
     if (checkState === false) {
       cleanInputValue();
       return;
     }
     const upload = () => {
-      onChange === null || onChange === void 0 || onChange(nextFileList, event);
+      onChange?.(nextFileList, event);
       if (rootRef.current) {
         dispatch({
           type: 'push',
@@ -303,24 +299,22 @@ const Uploader = forwardRef((props, ref) => {
     upload();
   });
   const handleRemoveFile = useEventCallback((fileKey, event) => {
-    var _xhrs$current;
     const file = find(fileList.current, f => f.fileKey === fileKey);
     const nextFileList = fileList.current.filter(f => f.fileKey !== fileKey);
-    if (((_xhrs$current = xhrs.current) === null || _xhrs$current === void 0 || (_xhrs$current = _xhrs$current[file.fileKey]) === null || _xhrs$current === void 0 ? void 0 : _xhrs$current.readyState) !== 4) {
-      var _xhrs$current$file$fi;
-      (_xhrs$current$file$fi = xhrs.current[file.fileKey]) === null || _xhrs$current$file$fi === void 0 || _xhrs$current$file$fi.abort();
+    if (xhrs.current?.[file.fileKey]?.readyState !== 4) {
+      xhrs.current[file.fileKey]?.abort();
     }
     dispatch({
       type: 'remove',
       fileKey
     });
-    onRemove === null || onRemove === void 0 || onRemove(file);
-    onChange === null || onChange === void 0 || onChange(nextFileList, event);
+    onRemove?.(file);
+    onChange?.(nextFileList, event);
     cleanInputValue();
   });
   const handleReupload = useEventCallback(file => {
     autoUpload && handleUploadFile(file);
-    onReupload === null || onReupload === void 0 || onReupload(file);
+    onReupload?.(file);
   });
 
   // public API

package/esm/Uploader/utils/ajaxUpload.js

@@ -48,7 +48,7 @@ export default function ajaxUpload(options) {
   if (timeout) {
     xhr.timeout = timeout;
     xhr.ontimeout = event => {
-      onError === null || onError === void 0 || onError({
+      onError?.({
         type: 'timeout'
       }, event, xhr);
     };
@@ -59,13 +59,13 @@ export default function ajaxUpload(options) {
   xhr.onload = event => {
     const resp = getResponse(xhr);
     if (xhr.status < 200 || xhr.status >= 300) {
-      onError === null || onError === void 0 || onError({
+      onError?.({
         type: 'server_error',
         response: resp
       }, event, xhr);
       return;
     }
-    onSuccess === null || onSuccess === void 0 || onSuccess(resp, event, xhr);
+    onSuccess?.(resp, event, xhr);
   };
   if (xhr.upload) {
     xhr.upload.onprogress = event => {
@@ -73,11 +73,11 @@ export default function ajaxUpload(options) {
       if (event.lengthComputable) {
         percent = event.loaded / event.total * 100;
       }
-      onProgress === null || onProgress === void 0 || onProgress(percent, event, xhr);
+      onProgress?.(percent, event, xhr);
     };
   }
   xhr.onerror = event => {
-    onError === null || onError === void 0 || onError({
+    onError?.({
       type: 'xhr_error'
     }, event, xhr);
   };