revert: rollback clearIcon

Author: aojunhao123

src/BaseSelect/index.tsx

@@ -175,6 +175,11 @@ export interface BaseSelectProps extends BaseSelectPrivateProps, React.AriaAttri
   allowClear?: boolean | { clearIcon?: RenderNode };
   prefix?: React.ReactNode;
   suffixIcon?: RenderNode;
+  /**
+   * Clear all icon
+   * @deprecated Please use `allowClear` instead
+   **/
+  clearIcon?: RenderNode;
   /** Selector remove icon */
   removeIcon?: RenderNode;
 
@@ -257,6 +262,7 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
     allowClear,
     prefix,
     suffixIcon,
+    clearIcon,
 
     // Dropdown
     OptionList,
@@ -727,6 +733,7 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
     onClearMouseDown,
     displayValues,
     allowClear,
+    clearIcon,
     disabled,
     mergedSearchValue,
     mode,

src/hooks/useAllowClear.tsx

@@ -7,15 +7,19 @@ export const useAllowClear = (
   onClearMouseDown: React.MouseEventHandler<HTMLSpanElement>,
   displayValues: DisplayValueType[],
   allowClear?: boolean | { clearIcon?: RenderNode },
+  clearIcon?: RenderNode,
   disabled: boolean = false,
   mergedSearchValue?: string,
   mode?: Mode,
 ) => {
-  const clearIcon = React.useMemo(() => {
+  const mergedClearIcon = React.useMemo(() => {
     if (typeof allowClear === 'object') {
       return allowClear.clearIcon;
     }
-  }, [allowClear]);
+    if (clearIcon) {
+      return clearIcon;
+    }
+  }, [allowClear, clearIcon]);
 
   const mergedAllowClear = React.useMemo<boolean>(() => {
     if (
@@ -35,7 +39,7 @@ export const useAllowClear = (
       <TransBtn
         className={`${prefixCls}-clear`}
         onMouseDown={onClearMouseDown}
-        customizeIcon={clearIcon}
+        customizeIcon={mergedClearIcon}
       >
         ×
       </TransBtn>