From 0ee4a531a10b02f646321bd3b2799b0c930e3fcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=97=E4=BD=A0=E6=98=AF=E5=B0=8F=E7=8C=AB=E5=92=AA?=
 <darryshaw@gmail.com>
Date: Wed, 6 Nov 2019 14:49:20 +0800
Subject: [PATCH] refactor: upgrade rc-dropdown (#19498)

* refator: upgrade rc-dropdown

* upgrade rc-dropdown version

* update snapshots
---
 components/breadcrumb/Breadcrumb.tsx              |  2 +-
 .../__tests__/__snapshots__/router.test.js.snap   |  4 ----
 .../__snapshots__/components.test.js.snap         |  9 ++++++---
 components/dropdown/dropdown.tsx                  |  6 +++---
 .../__snapshots__/Table.filter.test.js.snap       | 15 +++++++++------
 .../__snapshots__/Table.rowSelection.test.js.snap |  1 +
 package.json                                      |  2 +-
 typings/custom-typings.d.ts                       |  2 +-
 8 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/components/breadcrumb/Breadcrumb.tsx b/components/breadcrumb/Breadcrumb.tsx
index a3023f032f..278e82674a 100755
--- a/components/breadcrumb/Breadcrumb.tsx
+++ b/components/breadcrumb/Breadcrumb.tsx
@@ -105,7 +105,7 @@ export default class Breadcrumb extends React.Component<BreadcrumbProps, any> {
         paths.push(path);
       }
       // generated overlay by route.children
-      let overlay = null;
+      let overlay;
       if (route.children && route.children.length) {
         overlay = (
           <Menu>
diff --git a/components/breadcrumb/__tests__/__snapshots__/router.test.js.snap b/components/breadcrumb/__tests__/__snapshots__/router.test.js.snap
index 715d805e7e..7c8a37e198 100644
--- a/components/breadcrumb/__tests__/__snapshots__/router.test.js.snap
+++ b/components/breadcrumb/__tests__/__snapshots__/router.test.js.snap
@@ -80,7 +80,6 @@ exports[`react router react router 3 1`] = `
   >
     <BreadcrumbItem
       key="Home"
-      overlay={null}
       separator="/"
     >
       <span>
@@ -102,7 +101,6 @@ exports[`react router react router 3 1`] = `
     </BreadcrumbItem>
     <BreadcrumbItem
       key="Application List"
-      overlay={null}
       separator="/"
     >
       <span>
@@ -124,7 +122,6 @@ exports[`react router react router 3 1`] = `
     </BreadcrumbItem>
     <BreadcrumbItem
       key="Application:id"
-      overlay={null}
       separator="/"
     >
       <span>
@@ -146,7 +143,6 @@ exports[`react router react router 3 1`] = `
     </BreadcrumbItem>
     <BreadcrumbItem
       key="Detail"
-      overlay={null}
       separator="/"
     >
       <span>
diff --git a/components/config-provider/__tests__/__snapshots__/components.test.js.snap b/components/config-provider/__tests__/__snapshots__/components.test.js.snap
index 582f618375..1155d28cc8 100644
--- a/components/config-provider/__tests__/__snapshots__/components.test.js.snap
+++ b/components/config-provider/__tests__/__snapshots__/components.test.js.snap
@@ -11772,7 +11772,7 @@ exports[`ConfigProvider components Table configProvider 1`] = `
                     </span>
                     <span
                       aria-label="filter"
-                      class="anticon anticon-filter config-table-filter-open config-dropdown-trigger config-dropdown-open"
+                      class="anticon anticon-filter config-table-filter-open config-dropdown-trigger"
                       role="img"
                       tabindex="-1"
                       title="Filter menu"
@@ -11795,6 +11795,7 @@ exports[`ConfigProvider components Table configProvider 1`] = `
                     <div>
                       <div
                         class="config-dropdown  config-dropdown-placement-bottomRight "
+                        style="visibility:hidden"
                       >
                         <div
                           class="config-table-filter-dropdown"
@@ -12021,7 +12022,7 @@ exports[`ConfigProvider components Table normal 1`] = `
                     </span>
                     <span
                       aria-label="filter"
-                      class="anticon anticon-filter ant-table-filter-open ant-dropdown-trigger ant-dropdown-open"
+                      class="anticon anticon-filter ant-table-filter-open ant-dropdown-trigger"
                       role="img"
                       tabindex="-1"
                       title="Filter menu"
@@ -12044,6 +12045,7 @@ exports[`ConfigProvider components Table normal 1`] = `
                     <div>
                       <div
                         class="ant-dropdown  ant-dropdown-placement-bottomRight "
+                        style="visibility:hidden"
                       >
                         <div
                           class="ant-table-filter-dropdown"
@@ -12270,7 +12272,7 @@ exports[`ConfigProvider components Table prefixCls 1`] = `
                     </span>
                     <span
                       aria-label="filter"
-                      class="anticon anticon-filter prefix-Table-filter-open ant-dropdown-trigger ant-dropdown-open"
+                      class="anticon anticon-filter prefix-Table-filter-open ant-dropdown-trigger"
                       role="img"
                       tabindex="-1"
                       title="Filter menu"
@@ -12293,6 +12295,7 @@ exports[`ConfigProvider components Table prefixCls 1`] = `
                     <div>
                       <div
                         class="ant-dropdown  ant-dropdown-placement-bottomRight "
+                        style="visibility:hidden"
                       >
                         <div
                           class="prefix-Table-filter-dropdown"
diff --git a/components/dropdown/dropdown.tsx b/components/dropdown/dropdown.tsx
index 27f159efe0..656773a6a4 100644
--- a/components/dropdown/dropdown.tsx
+++ b/components/dropdown/dropdown.tsx
@@ -18,7 +18,7 @@ const Placements = tuple(
 );
 type Placement = (typeof Placements)[number];
 
-type OverlayFunc = () => React.ReactNode;
+type OverlayFunc = () => React.ReactElement;
 
 type Align = {
   points?: [string, string];
@@ -35,7 +35,7 @@ type Align = {
 
 export interface DropDownProps {
   trigger?: ('click' | 'hover' | 'contextMenu')[];
-  overlay: React.ReactNode | OverlayFunc;
+  overlay: React.ReactElement | OverlayFunc;
   onVisibleChange?: (visible: boolean) => void;
   visible?: boolean;
   disabled?: boolean;
@@ -115,7 +115,7 @@ export default class Dropdown extends React.Component<DropDownProps, any> {
             expandIcon,
           });
 
-    return fixedModeOverlay;
+    return fixedModeOverlay as React.ReactElement;
   };
 
   renderDropDown = ({
diff --git a/components/table/__tests__/__snapshots__/Table.filter.test.js.snap b/components/table/__tests__/__snapshots__/Table.filter.test.js.snap
index bd84a4d099..0137013e1b 100644
--- a/components/table/__tests__/__snapshots__/Table.filter.test.js.snap
+++ b/components/table/__tests__/__snapshots__/Table.filter.test.js.snap
@@ -30,6 +30,7 @@ exports[`Table.filter renders custom content correctly 1`] = `
 <div>
   <div
     class="ant-dropdown  ant-dropdown-placement-bottomRight  ant-dropdown-hidden"
+    style="visibility:hidden"
   >
     <div
       class="ant-table-filter-dropdown"
@@ -192,6 +193,7 @@ exports[`Table.filter renders menu correctly 1`] = `
 <div>
   <div
     class="ant-dropdown  ant-dropdown-placement-bottomRight  ant-dropdown-hidden"
+    style="visibility:hidden"
   >
     <div
       class="ant-table-filter-dropdown"
@@ -287,6 +289,7 @@ exports[`Table.filter renders radio filter correctly 1`] = `
 <div>
   <div
     class="ant-dropdown  ant-dropdown-placement-bottomRight  ant-dropdown-hidden"
+    style="visibility:hidden"
   >
     <div
       class="ant-table-filter-dropdown"
@@ -426,7 +429,7 @@ exports[`Table.filter should support getPopupContainer 1`] = `
                     </span>
                     <span
                       aria-label="filter"
-                      class="anticon anticon-filter ant-table-filter-open ant-dropdown-trigger ant-dropdown-open"
+                      class="anticon anticon-filter ant-table-filter-open ant-dropdown-trigger"
                       role="img"
                       style=""
                       tabindex="-1"
@@ -449,8 +452,8 @@ exports[`Table.filter should support getPopupContainer 1`] = `
                     </span>
                     <div>
                       <div
-                        class="ant-dropdown ant-dropdown-placement-bottomRight slide-up-appear"
-                        style="left: -999px; top: -995px;"
+                        class="ant-dropdown ant-dropdown-placement-bottomRight"
+                        style="left: -999px; top: -995px; min-width: 0;"
                       >
                         <div
                           class="ant-table-filter-dropdown"
@@ -646,7 +649,7 @@ exports[`Table.filter should support getPopupContainer from ConfigProvider 1`] =
                     </span>
                     <span
                       aria-label="filter"
-                      class="anticon anticon-filter ant-table-filter-open ant-dropdown-trigger ant-dropdown-open"
+                      class="anticon anticon-filter ant-table-filter-open ant-dropdown-trigger"
                       role="img"
                       style=""
                       tabindex="-1"
@@ -669,8 +672,8 @@ exports[`Table.filter should support getPopupContainer from ConfigProvider 1`] =
                     </span>
                     <div>
                       <div
-                        class="ant-dropdown ant-dropdown-placement-bottomRight slide-up-appear"
-                        style="left: -999px; top: -995px;"
+                        class="ant-dropdown ant-dropdown-placement-bottomRight"
+                        style="left: -999px; top: -995px; min-width: 0;"
                       >
                         <div
                           class="ant-table-filter-dropdown"
diff --git a/components/table/__tests__/__snapshots__/Table.rowSelection.test.js.snap b/components/table/__tests__/__snapshots__/Table.rowSelection.test.js.snap
index 1a4cfc3970..87e7844c29 100644
--- a/components/table/__tests__/__snapshots__/Table.rowSelection.test.js.snap
+++ b/components/table/__tests__/__snapshots__/Table.rowSelection.test.js.snap
@@ -993,6 +993,7 @@ exports[`Table.rowSelection render with default selection correctly 1`] = `
 <div>
   <div
     class="ant-dropdown  ant-dropdown-placement-bottomLeft  ant-dropdown-hidden"
+    style="visibility:hidden"
   >
     <ul
       class="ant-dropdown-menu ant-table-selection-menu ant-dropdown-menu-light ant-dropdown-menu-root ant-dropdown-menu-vertical"
diff --git a/package.json b/package.json
index ad8da2d69c..dda5b5a9ac 100644
--- a/package.json
+++ b/package.json
@@ -112,7 +112,7 @@
     "rc-collapse": "~1.11.3",
     "rc-dialog": "~7.5.2",
     "rc-drawer": "~3.0.0",
-    "rc-dropdown": "~2.4.1",
+    "rc-dropdown": "~3.0.0-alpha.0",
     "rc-editor-mention": "^1.1.13",
     "rc-field-form": "^0.0.0-alpha.17",
     "rc-form": "^2.4.5",
diff --git a/typings/custom-typings.d.ts b/typings/custom-typings.d.ts
index 89b655a73c..ae06dbedbe 100644
--- a/typings/custom-typings.d.ts
+++ b/typings/custom-typings.d.ts
@@ -18,7 +18,7 @@ declare module 'rc-cascader';
 
 declare module 'rc-checkbox';
 
-declare module 'rc-dropdown';
+declare module 'rc-radio';
 
 declare module 'rc-editor-mention';