Feat: support 'expandAction' prop for TreeSelect

Author: NE-SmallTown

package.json

@@ -69,7 +69,7 @@
     "@babel/runtime": "^7.10.1",
     "classnames": "2.x",
     "rc-select": "~14.1.0",
-    "rc-tree": "~5.5.0",
+    "rc-tree": "~5.6.1",
     "rc-util": "^5.16.1"
   }
 }

src/OptionList.tsx

@@ -41,6 +41,7 @@ const OptionList: React.RefForwardingComponent<ReviseRefOptionListProps> = (_, r
     fieldNames,
     onSelect,
     dropdownMatchSelectWidth,
+    treeExpandAction,
   } = React.useContext(TreeSelectContext);
 
   const {
@@ -244,6 +245,7 @@ const OptionList: React.RefForwardingComponent<ReviseRefOptionListProps> = (_, r
         onExpand={onInternalExpand}
         onLoad={onTreeLoad}
         filterTreeNode={filterTreeNode}
+        expandAction={treeExpandAction}
       />
     </div>
   );

src/TreeSelect.tsx

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { BaseSelect } from 'rc-select';
 import type { IconType } from 'rc-tree/lib/interface';
+import type { ExpandAction } from 'rc-tree/lib/Tree';
 import type {
   BaseSelectRef,
   BaseSelectPropsWithoutPrivate,
@@ -152,6 +153,7 @@ export interface TreeSelectProps<
   treeExpandedKeys?: React.Key[];
   treeDefaultExpandedKeys?: React.Key[];
   onTreeExpand?: (expandedKeys: React.Key[]) => void;
+  treeExpandAction: ExpandAction;
 
   // >>> Options
   virtual?: boolean;
@@ -217,6 +219,7 @@ const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref)
     treeExpandedKeys,
     treeDefaultExpandedKeys,
     onTreeExpand,
+    treeExpandAction,
 
     // Options
     virtual,
@@ -647,6 +650,7 @@ const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref)
       treeData: filteredTreeData,
       fieldNames: mergedFieldNames,
       onSelect: onOptionSelect,
+      treeExpandAction,
     }),
     [
       virtual,
@@ -656,6 +660,7 @@ const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref)
       filteredTreeData,
       mergedFieldNames,
       onOptionSelect,
+      treeExpandAction,
     ],
   );
 

src/TreeSelectContext.ts

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import type { ExpandAction } from 'rc-tree/lib/Tree';
 import type { DefaultOptionType, InternalFieldName, OnInternalSelect } from './TreeSelect';
 
 export interface TreeSelectContextProps {
@@ -9,6 +10,7 @@ export interface TreeSelectContextProps {
   treeData: DefaultOptionType[];
   fieldNames: InternalFieldName;
   onSelect: OnInternalSelect;
+  treeExpandAction: ExpandAction;
 }
 
 const TreeSelectContext = React.createContext<TreeSelectContextProps>(null as any);

tests/Select.tree.spec.js

@@ -68,6 +68,17 @@ describe('TreeSelect.tree', () => {
     expect(wrapper.find('Tree').props().expandedKeys).toEqual([]);
   });
 
+  it('treeExpandAction', () => {
+    const wrapper = mount(
+      createSelect({
+        open: true,
+        treeExpandAction: 'click',
+      }),
+    );
+
+    expect(wrapper.find('Tree').props().expandAction).toEqual('click');
+  });
+
   it('warning if node key are not same as value', () => {
     resetWarned();
     const spy = jest.spyOn(console, 'error').mockImplementation(() => {});