test: update testcase

ant-design · Apr 16, 2024 · ac64c95 · ac64c95
1 parent bb866f1
commit ac64c95
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 7 deletions.
diff --git a/src/components/dropdown/dropdown.tsx b/src/components/dropdown/dropdown.tsx
@@ -17,7 +17,7 @@ import React, {
 } from 'react'
 import { NativeProps, withNativeProps } from '../../utils/native-props'
 import { usePropsValue } from '../../utils/use-props-value'
-import { mergeProps } from '../../utils/with-default-props'
+import { mergeProp, mergeProps } from '../../utils/with-default-props'
 import Popup, { PopupProps } from '../popup'
 import { defaultPopupBaseProps } from '../popup/popup-base-props'
 import Item, { ItemChildrenWrap } from './item'
@@ -100,11 +100,12 @@ const Dropdown = forwardRef<DropdownRef, PropsWithChildren<DropdownProps>>(
             child.props.onClick?.(event)
           },
           active: child.key === value,
-          arrow:
-            child.props.arrow ||
-            child.props.arrowIcon ||
-            props.arrow ||
+          arrowIcon: mergeProp(
+            child.props.arrowIcon,
+            child.props.arrow,
             props.arrowIcon,
+            props.arrow
+          ),
         }
         items.push(child)
         if (child.props.forceRender) popupForceRender = true

diff --git a/src/components/dropdown/item.tsx b/src/components/dropdown/item.tsx
@@ -31,7 +31,7 @@ const defaultProps = {
 
 const Item: FC<DropdownItemProps> = props => {
   const { dropdown: componentConfig = {} } = useConfig()
-  const { active, arrowIcon, arrow, highlight, onClick, title } = mergeProps(
+  const { active, arrowIcon, highlight, onClick, title } = mergeProps(
     defaultProps,
     componentConfig,
     props
@@ -51,7 +51,7 @@ const Item: FC<DropdownItemProps> = props => {
             [`${classPrefix}-title-arrow-active`]: active,
           })}
         >
-          {arrow || arrowIcon}
+          {arrowIcon}
         </span>
       </div>
     </div>

diff --git a/src/components/dropdown/tests/dropdown.test.tsx b/src/components/dropdown/tests/dropdown.test.tsx
@@ -107,4 +107,47 @@ describe('Dropdown', () => {
     fireEvent.click(screen.getByText('sorter'))
     expect(screen.getByText('click2'))
   })
+
+  describe('arrow', () => {
+    it('Dropdown - arrow', () => {
+      render(
+        <Dropdown arrow='little'>
+          <Dropdown.Item title='sorter' key='sorter' />
+        </Dropdown>
+      )
+      expect(screen.getByText('little')).toBeVisible()
+    })
+
+    it('Dropdown - arrowIcon', () => {
+      render(
+        <Dropdown arrowIcon='bamboo' arrow='little'>
+          <Dropdown.Item title='sorter' key='sorter' />
+        </Dropdown>
+      )
+      expect(screen.getByText('bamboo')).toBeVisible()
+    })
+
+    it('Dropdown.Item - arrow', () => {
+      render(
+        <Dropdown arrowIcon='ignore' arrow='ignore'>
+          <Dropdown.Item title='sorter' key='sorter' arrow='little' />
+        </Dropdown>
+      )
+      expect(screen.getByText('little')).toBeVisible()
+    })
+
+    it('Dropdown.Item - arrowIcon', () => {
+      render(
+        <Dropdown arrowIcon='ignore' arrow='ignore'>
+          <Dropdown.Item
+            title='sorter'
+            key='sorter'
+            arrow='little'
+            arrowIcon='bamboo'
+          />
+        </Dropdown>
+      )
+      expect(screen.getByText('bamboo')).toBeVisible()
+    })
+  })
 })