From e0fb5b88666b82c02d562cf5b8c497b87ae8a81d Mon Sep 17 00:00:00 2001
From: sallen450 <jqh101@sina.com>
Date: Thu, 18 Jan 2018 23:39:34 +0800
Subject: [PATCH] Fix: Dropdown.Button not fully disabled (#9013)

* fix(Dropdown): dropdown won't be fully disabled

* test(Dropdown): check  props pass to Dropdown
---
 components/dropdown/__tests__/__snapshots__/demo.test.js.snap | 1 +
 components/dropdown/__tests__/dropdown-button.test.js         | 1 +
 components/dropdown/dropdown-button.tsx                       | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/components/dropdown/__tests__/__snapshots__/demo.test.js.snap b/components/dropdown/__tests__/__snapshots__/demo.test.js.snap
index 1f6044ce84..c547916794 100644
--- a/components/dropdown/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/dropdown/__tests__/__snapshots__/demo.test.js.snap
@@ -58,6 +58,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md correctly 1`] = `
     </button>
     <button
       class="ant-btn ant-dropdown-trigger ant-btn-default"
+      disabled=""
       type="button"
     >
       <i
diff --git a/components/dropdown/__tests__/dropdown-button.test.js b/components/dropdown/__tests__/dropdown-button.test.js
index 5ba096e6b4..edcd27eee9 100644
--- a/components/dropdown/__tests__/dropdown-button.test.js
+++ b/components/dropdown/__tests__/dropdown-button.test.js
@@ -14,6 +14,7 @@ describe('DropdownButton', () => {
           <Menu.Item>foo</Menu.Item>
         </Menu>
       ),
+      disabled: false,
       trigger: ['hover'],
       visible: true,
       onVisibleChange: () => {},
diff --git a/components/dropdown/dropdown-button.tsx b/components/dropdown/dropdown-button.tsx
index d9a5d3e8aa..8df929010b 100644
--- a/components/dropdown/dropdown-button.tsx
+++ b/components/dropdown/dropdown-button.tsx
@@ -31,6 +31,7 @@ export default class DropdownButton extends React.Component<DropdownButtonProps,
     const dropdownProps = {
       align,
       overlay,
+      disabled,
       trigger: disabled ? [] : trigger,
       onVisibleChange,
       placement,
@@ -53,7 +54,7 @@ export default class DropdownButton extends React.Component<DropdownButtonProps,
           {children}
         </Button>
         <Dropdown {...dropdownProps}>
-          <Button type={type} disabled={disabled}>
+          <Button type={type}>
             <Icon type="down" />
           </Button>
         </Dropdown>