fix: depreacted api

Author: zombieJ

README.md

@@ -124,7 +124,7 @@ class Demo extends React.Component {
     console.log(args);
   };
 
-  onDropdownVisibleChange = visible => {
+  onPopupVisibleChange = visible => {
     const { value } = this.state;
     console.log(visible, value);
     if (Array.isArray(value) && value.length > 1 && value.length < 3) {
@@ -205,8 +205,8 @@ class Demo extends React.Component {
             console.log('onChange', val, ...args);
             this.setState({ value: val });
           }}
-          onDropdownVisibleChange={v => {
-            console.log('single onDropdownVisibleChange', v);
+          onPopupVisibleChange={v => {
+            console.log('single onPopupVisibleChange', v);
             this.setState({
               tsOpen: v,
             });
@@ -263,7 +263,7 @@ class Demo extends React.Component {
             overflow: { adjustY: 0, adjustX: 0 },
             offset: [0, 2],
           }}
-          onDropdownVisibleChange={this.onDropdownVisibleChange}
+          onPopupVisibleChange={this.onPopupVisibleChange}
           placeholder={<i>请下拉选择</i>}
           treeLine
           maxTagTextLength={10}

examples/basic.tsx

@@ -4,7 +4,7 @@ import TreeSelect, { TreeNode } from '../src';
 
 function Demo() {
   return (
-    <TreeSelect style={{ width: 120 }} dropdownMatchSelectWidth={false} treeDefaultExpandAll>
+    <TreeSelect style={{ width: 120 }} popupMatchSelectWidth={false} treeDefaultExpandAll>
       <TreeNode value="parent 1" title="parent 1">
         <TreeNode value="parent 1-0 sdfsdfsdsdfsd" title="parent 1-0 sdfsdfsd">
           <TreeNode value="leaf1  sdfsdf" title="leaf1" />

examples/width.tsx

@@ -43,7 +43,7 @@ const OptionList: React.ForwardRefRenderFunction<ReviseRefOptionListProps> = (_,
     treeData,
     fieldNames,
     onSelect,
-    dropdownMatchSelectWidth,
+    popupMatchSelectWidth,
     treeExpandAction,
     treeTitleRender,
     onPopupScroll,
@@ -347,7 +347,7 @@ const OptionList: React.ForwardRefRenderFunction<ReviseRefOptionListProps> = (_,
           height={listHeight}
           itemHeight={listItemHeight}
           itemScrollOffset={listItemScrollOffset}
-          virtual={virtual !== false && dropdownMatchSelectWidth !== false}
+          virtual={virtual !== false && popupMatchSelectWidth !== false}
           multiple={multiple}
           icon={treeIcon}
           showIcon={showTreeIcon}

src/OptionList.tsx

@@ -93,7 +93,7 @@ export interface TreeSelectProps<ValueType = any, OptionType extends DataNode =
   listHeight?: number;
   listItemHeight?: number;
   listItemScrollOffset?: number;
-  onDropdownVisibleChange?: (open: boolean) => void;
+  onPopupVisibleChange?: (open: boolean) => void;
   treeTitleRender?: (node: OptionType) => React.ReactNode;
 
   // >>> Tree
@@ -163,8 +163,8 @@ const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref)
     listItemHeight = 20,
     listItemScrollOffset = 0,
 
-    onDropdownVisibleChange,
-    dropdownMatchSelectWidth = true,
+    onPopupVisibleChange,
+    popupMatchSelectWidth = true,
 
     // Tree
     treeLine,
@@ -582,22 +582,13 @@ const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref)
   );
 
   // ========================== Dropdown ==========================
-  const onInternalDropdownVisibleChange = React.useCallback(
+  const onInternalPopupVisibleChange = React.useCallback(
     (open: boolean) => {
-      if (onDropdownVisibleChange) {
-        const legacyParam = {};
-
-        Object.defineProperty(legacyParam, 'documentClickClose', {
-          get() {
-            warning(false, 'Second param of `onDropdownVisibleChange` has been removed.');
-            return false;
-          },
-        });
-
-        (onDropdownVisibleChange as any)(open, legacyParam);
+      if (onPopupVisibleChange) {
+        onPopupVisibleChange(open);
       }
     },
-    [onDropdownVisibleChange],
+    [onPopupVisibleChange],
   );
 
   // ====================== Display Change ========================
@@ -619,7 +610,7 @@ const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref)
   const treeSelectContext = React.useMemo<TreeSelectContextProps>(() => {
     return {
       virtual,
-      dropdownMatchSelectWidth,
+      popupMatchSelectWidth,
       listHeight,
       listItemHeight,
       listItemScrollOffset,
@@ -636,7 +627,7 @@ const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref)
     };
   }, [
     virtual,
-    dropdownMatchSelectWidth,
+    popupMatchSelectWidth,
     listHeight,
     listItemHeight,
     listItemScrollOffset,
@@ -716,8 +707,8 @@ const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref)
           // >>> Options
           OptionList={OptionList}
           emptyOptions={!mergedTreeData.length}
-          onDropdownVisibleChange={onInternalDropdownVisibleChange}
-          dropdownMatchSelectWidth={dropdownMatchSelectWidth}
+          onPopupVisibleChange={onInternalPopupVisibleChange}
+          popupMatchSelectWidth={popupMatchSelectWidth}
         />
       </LegacyContext.Provider>
     </TreeSelectContext.Provider>

src/TreeSelect.tsx

@@ -5,7 +5,7 @@ import type useDataEntities from './hooks/useDataEntities';
 
 export interface TreeSelectContextProps {
   virtual?: boolean;
-  dropdownMatchSelectWidth?: boolean | number;
+  popupMatchSelectWidth?: boolean | number;
   listHeight: number;
   listItemHeight: number;
   listItemScrollOffset?: number;

src/TreeSelectContext.ts

@@ -556,7 +556,7 @@ describe('TreeSelect.props', () => {
         expect(onSelect).toHaveBeenCalledWith('smart', nodeMatcher(0));
       });
 
-      it('dropdownMatchSelectWidth={false} should turn off virtual list', () => {
+      it('popupMatchSelectWidth={false} should turn off virtual list', () => {
         const wrapper = mount(
           <TreeSelect style={{ width: 120 }} open treeDefaultExpandAll>
             <TreeNode value="parent 1" title="parent 1">
@@ -583,7 +583,7 @@ describe('TreeSelect.props', () => {
           </TreeSelect>,
         );
         expect(wrapper.find(Tree).props().virtual).toBe(true);
-        wrapper.setProps({ dropdownMatchSelectWidth: false });
+        wrapper.setProps({ popupMatchSelectWidth: false });
         expect(wrapper.find(Tree).props().virtual).toBe(false);
       });
     });

tests/Select.props.spec.js

@@ -60,17 +60,18 @@ describe('TreeSelect.basic', () => {
     });
 
     it('renders tree correctly', () => {
-      const wrapper = mount(
+      const { container } = render(
         <TreeSelect
           popupClassName="awesome"
           popupStyle={{ width: 300 }}
           multiple
           treeCheckable
           treeDefaultExpandAll
           treeData={treeData}
+          open
         />,
       );
-      expect(wrapper.render()).toMatchSnapshot();
+      expect(container).toMatchSnapshot();
     });
 
     it('not crash if no children', () => {

tests/Select.spec.tsx

@@ -56,22 +56,6 @@ describe('TreeSelect.warning', () => {
     );
   });
 
-  it('documentClickClose should removed', () => {
-    const wrapper = mount(
-      <TreeSelect
-        onDropdownVisibleChange={(_, { documentClickClose }) => {
-          expect(documentClickClose).toBeFalsy();
-        }}
-      />,
-    );
-
-    wrapper.openSelect();
-
-    expect(spy).toHaveBeenCalledWith(
-      'Warning: Second param of `onDropdownVisibleChange` has been removed.',
-    );
-  });
-
   it('warns on using maxCount with showCheckedStrategy=SHOW_ALL when treeCheckStrictly=false', () => {
     mount(<TreeSelect maxCount={2} showCheckedStrategy="SHOW_ALL" />);
     expect(spy).toHaveBeenCalledWith(