feat: add more props to TransBtn

react-component · Sep 19, 2023 · 483b803 · 483b803
1 parent b5fccbd
commit 483b803
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/docs/examples/custom-icon.tsx b/docs/examples/custom-icon.tsx
@@ -22,10 +22,11 @@ const clearPath =
   ' 0-8 3.6-8 8v60c0 4.4 3.6 8 8 8h618c35.3 0 64-' +
   '28.7 64-64V306c0-35.3-28.7-64-64-64z';
 
-const menuItemSelectedIcon = (props) => {
-  const { ...p } = props;
-  return <span style={{ position: 'absolute', right: 0 }}>{p.isSelected ? '🌹' : '☑️'}</span>;
-};
+const menuItemSelectedIcon = (props) => (
+  <span style={{ position: 'absolute', right: 0, opacity: props.disabled ? 0.5 : 1 }}>
+    {props.isSelected ? '🌹' : '☑️'}
+  </span>
+);
 
 const singleItemIcon = (
   <span style={{ position: 'absolute', right: '0px' }} role="img" aria-label="rose">

diff --git a/src/OptionList.tsx b/src/OptionList.tsx
@@ -372,7 +372,7 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, {}> = (_, r
                 <TransBtn
                   className={`${itemPrefixCls}-option-state`}
                   customizeIcon={menuItemSelectedIcon}
-                  customizeIconProps={{ isSelected: selected }}
+                  customizeIconProps={{ ...data, isSelected: selected }}
                 >
                   {selected ? '✓' : null}
                 </TransBtn>

diff --git a/tests/Select.test.tsx b/tests/Select.test.tsx
@@ -1498,7 +1498,10 @@ describe('Select.Basic', () => {
       />,
     );
 
-    expect(menuItemSelectedIcon).toHaveBeenCalledWith({ isSelected: true });
+    expect(menuItemSelectedIcon).toHaveBeenCalledWith({
+      value: '1',
+      isSelected: true,
+    });
   });
 
   it('keyDown & KeyUp event', () => {