refactor: decoupling

src/components/dropdown/item.tsx

@@ -28,10 +28,8 @@ export type DropdownItemProps = {
 
 const Item: FC<DropdownItemProps> = props => {
   const { dropdown: componentConfig = {} } = useConfig()
-  const { active, arrowIcon, arrow, highlight, onClick, title } = mergeProps(
-    componentConfig,
-    props
-  )
+  const mergedProps = mergeProps(componentConfig, props)
+  const { active, highlight, onClick, title } = mergedProps
   const cls = classNames(classPrefix, {
     [`${classPrefix}-active`]: active,
     [`${classPrefix}-highlight`]: highlight ?? active,
@@ -41,8 +39,8 @@ const Item: FC<DropdownItemProps> = props => {
   const mergedArrowIcon = mergeProp(
     <DownFill />,
     contextArrowIcon,
-    arrow,
-    arrowIcon
+    mergedProps.arrow,
+    mergedProps.arrowIcon
   )
 
   return withNativeProps(

src/components/form/form-item.tsx

@@ -86,8 +86,8 @@ type FormItemLayoutProps = Pick<
   | 'layout'
   | 'extra'
   | 'clickable'
-  | 'arrowIcon'
   | 'arrow'
+  | 'arrowIcon'
   | 'description'
   | 'childElementPosition'
 > & {
@@ -98,10 +98,6 @@ type FormItemLayoutProps = Pick<
   children: ReactNode
 } & NativeProps
 
-const defaultProps = {
-  helpIcon: <QuestionCircleOutline />,
-}
-
 const FormItemLayout: FC<FormItemLayoutProps> = props => {
   const { locale, form: componentConfig = {} } = useConfig()
 
@@ -115,10 +111,10 @@ const FormItemLayout: FC<FormItemLayoutProps> = props => {
     children,
     htmlFor,
     hidden,
-    arrowIcon,
     arrow,
+    arrowIcon,
     childElementPosition = 'normal',
-  } = mergeProps(defaultProps, componentConfig, props)
+  } = mergeProps(componentConfig, props)
 
   const context = useContext(FormContext)
 
@@ -172,7 +168,7 @@ const FormItemLayout: FC<FormItemLayoutProps> = props => {
               e.preventDefault()
             }}
           >
-            {helpIcon}
+            {helpIcon || <QuestionCircleOutline />}
           </span>
         </Popover>
       )}
@@ -353,7 +349,8 @@ export const FormItem: FC<FormItemProps> = props => {
         layout={layout}
         childElementPosition={childElementPosition}
         clickable={clickable}
-        arrowIcon={arrowIcon || arrow}
+        arrow={arrow}
+        arrowIcon={arrowIcon}
       >
         <NoStyleItemContext.Provider value={onSubMetaChange}>
           {baseChildren}