From b4bded375c7a410ecdf2992205a9c6efee95368e Mon Sep 17 00:00:00 2001
From: kmcfaul <45077788+kmcfaul@users.noreply.github.com>
Date: Wed, 9 Jan 2019 15:17:51 -0500
Subject: [PATCH] fix(Dropdown): set default button type to button (#1148)

---
 .../src/components/Dropdown/DropdownItem.js   |  1 +
 .../src/components/Dropdown/Toggle.js         |  2 ++
 .../__snapshots__/Dropdown.test.js.snap       | 19 +++++++++++++++++++
 .../__snapshots__/DropdownItem.test.js.snap   |  3 +++
 .../__snapshots__/DropdownToggle.test.js.snap |  3 +++
 .../__snapshots__/Toggle.test.js.snap         |  2 ++
 6 files changed, 30 insertions(+)

diff --git a/packages/patternfly-4/react-core/src/components/Dropdown/DropdownItem.js b/packages/patternfly-4/react-core/src/components/Dropdown/DropdownItem.js
index addc6e9076d..03a60449473 100644
--- a/packages/patternfly-4/react-core/src/components/Dropdown/DropdownItem.js
+++ b/packages/patternfly-4/react-core/src/components/Dropdown/DropdownItem.js
@@ -37,6 +37,7 @@ const DropdownItem = ({ className, children, isHovered, component: Component, is
     additionalProps.tabIndex = isDisabled ? -1 : additionalProps.tabIndex;
   } else if (Component === 'button') {
     additionalProps.disabled = isDisabled;
+    additionalProps.type = additionalProps.type || 'button';
   }
 
   return (
diff --git a/packages/patternfly-4/react-core/src/components/Dropdown/Toggle.js b/packages/patternfly-4/react-core/src/components/Dropdown/Toggle.js
index 1e62c428475..b04f7f7fc41 100644
--- a/packages/patternfly-4/react-core/src/components/Dropdown/Toggle.js
+++ b/packages/patternfly-4/react-core/src/components/Dropdown/Toggle.js
@@ -79,6 +79,7 @@ class DropdownToggle extends Component {
       onToggle,
       parentRef,
       id,
+      type,
       ...props
     } = this.props;
     return (
@@ -96,6 +97,7 @@ class DropdownToggle extends Component {
           isPlain && styles.modifiers.plain,
           className
         )}
+        type={type || 'button'}
         onClick={_event => onToggle && onToggle(!isOpen)}
         aria-expanded={isOpen}
       >
diff --git a/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/Dropdown.test.js.snap b/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/Dropdown.test.js.snap
index 049b890d771..d9223e9f2d7 100644
--- a/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/Dropdown.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/Dropdown.test.js.snap
@@ -89,6 +89,7 @@ exports[`KebabToggle basic 1`] = `
           className="pf-c-dropdown__toggle"
           id="Dropdown Toggle"
           onClick={[Function]}
+          type="button"
         >
           <EllipsisVIcon
             color="currentColor"
@@ -280,6 +281,7 @@ exports[`KebabToggle dropup + right aligned 1`] = `
           className="pf-c-dropdown__toggle"
           id="Dropdown Toggle"
           onClick={[Function]}
+          type="button"
         >
           <EllipsisVIcon
             color="currentColor"
@@ -454,6 +456,7 @@ exports[`KebabToggle dropup 1`] = `
           className="pf-c-dropdown__toggle"
           id="Dropdown Toggle"
           onClick={[Function]}
+          type="button"
         >
           <EllipsisVIcon
             color="currentColor"
@@ -656,6 +659,7 @@ exports[`KebabToggle expanded 1`] = `
           className="pf-c-dropdown__toggle"
           id="Dropdown Toggle"
           onClick={[Function]}
+          type="button"
         >
           <EllipsisVIcon
             color="currentColor"
@@ -742,6 +746,7 @@ exports[`KebabToggle expanded 1`] = `
                   className=""
                   disabled={false}
                   href="#"
+                  type="button"
                 >
                   Action
                 </button>
@@ -779,6 +784,7 @@ exports[`KebabToggle expanded 1`] = `
                   className="pf-m-disabled"
                   disabled={true}
                   href="#"
+                  type="button"
                 >
                   Disabled Action
                 </button>
@@ -840,6 +846,7 @@ exports[`KebabToggle expanded 1`] = `
                   className=""
                   disabled={false}
                   href="#"
+                  type="button"
                 >
                   Separated Action
                 </button>
@@ -994,6 +1001,7 @@ exports[`KebabToggle plain 1`] = `
           className="pf-c-dropdown__toggle pf-m-plain"
           id="Dropdown Toggle"
           onClick={[Function]}
+          type="button"
         >
           <EllipsisVIcon
             color="currentColor"
@@ -1168,6 +1176,7 @@ exports[`KebabToggle regular 1`] = `
           className="pf-c-dropdown__toggle"
           id="Dropdown Toggle"
           onClick={[Function]}
+          type="button"
         >
           <EllipsisVIcon
             color="currentColor"
@@ -1342,6 +1351,7 @@ exports[`KebabToggle right aligned 1`] = `
           className="pf-c-dropdown__toggle"
           id="Dropdown Toggle"
           onClick={[Function]}
+          type="button"
         >
           <EllipsisVIcon
             color="currentColor"
@@ -1470,6 +1480,7 @@ exports[`dropdown basic 1`] = `
           className="pf-c-dropdown__toggle"
           id="Dropdown Toggle"
           onClick={[Function]}
+          type="button"
         >
           Dropdown
           <CaretDownIcon
@@ -1670,6 +1681,7 @@ exports[`dropdown dropup + right aligned 1`] = `
           className="pf-c-dropdown__toggle"
           id="Dropdown Toggle"
           onClick={[Function]}
+          type="button"
         >
           Dropdown
           <CaretDownIcon
@@ -1853,6 +1865,7 @@ exports[`dropdown dropup 1`] = `
           className="pf-c-dropdown__toggle"
           id="Dropdown Toggle"
           onClick={[Function]}
+          type="button"
         >
           Dropdown
           <CaretDownIcon
@@ -2064,6 +2077,7 @@ exports[`dropdown expanded 1`] = `
           className="pf-c-dropdown__toggle"
           id="Dropdown Toggle"
           onClick={[Function]}
+          type="button"
         >
           Dropdown
           <CaretDownIcon
@@ -2153,6 +2167,7 @@ exports[`dropdown expanded 1`] = `
                   className=""
                   disabled={false}
                   href="#"
+                  type="button"
                 >
                   Action
                 </button>
@@ -2190,6 +2205,7 @@ exports[`dropdown expanded 1`] = `
                   className="pf-m-disabled"
                   disabled={true}
                   href="#"
+                  type="button"
                 >
                   Disabled Action
                 </button>
@@ -2251,6 +2267,7 @@ exports[`dropdown expanded 1`] = `
                   className=""
                   disabled={false}
                   href="#"
+                  type="button"
                 >
                   Separated Action
                 </button>
@@ -2411,6 +2428,7 @@ exports[`dropdown regular 1`] = `
           className="pf-c-dropdown__toggle"
           id="Dropdown Toggle"
           onClick={[Function]}
+          type="button"
         >
           Dropdown
           <CaretDownIcon
@@ -2594,6 +2612,7 @@ exports[`dropdown right aligned 1`] = `
           className="pf-c-dropdown__toggle"
           id="Dropdown Toggle"
           onClick={[Function]}
+          type="button"
         >
           Dropdown
           <CaretDownIcon
diff --git a/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/DropdownItem.test.js.snap b/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/DropdownItem.test.js.snap
index cdbf52c7ecb..9caa80a8287 100644
--- a/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/DropdownItem.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/DropdownItem.test.js.snap
@@ -18,6 +18,7 @@ exports[`dropdown items button 1`] = `
     className=""
     disabled={false}
     href="#"
+    type="button"
   >
     Something
   </button>
@@ -51,6 +52,7 @@ exports[`dropdown items disabled button 1`] = `
     className="pf-m-disabled"
     disabled={true}
     href="#"
+    type="button"
   >
     Something
   </button>
@@ -83,6 +85,7 @@ exports[`dropdown items hover button 1`] = `
     className="pf-m-hover"
     disabled={false}
     href="#"
+    type="button"
   >
     Something
   </button>
diff --git a/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/DropdownToggle.test.js.snap b/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/DropdownToggle.test.js.snap
index f88bb1deac8..e959fc44d3f 100644
--- a/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/DropdownToggle.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/DropdownToggle.test.js.snap
@@ -49,6 +49,7 @@ exports[`state active 1`] = `
       className="pf-c-dropdown__toggle pf-m-active"
       id="Dropdown Toggle"
       onClick={[Function]}
+      type="button"
     >
       Dropdown
       <CaretDownIcon
@@ -132,6 +133,7 @@ exports[`state focus 1`] = `
       className="pf-c-dropdown__toggle pf-m-focus"
       id="Dropdown Toggle"
       onClick={[Function]}
+      type="button"
     >
       Dropdown
       <CaretDownIcon
@@ -215,6 +217,7 @@ exports[`state hover 1`] = `
       className="pf-c-dropdown__toggle pf-m-hover"
       id="Dropdown Toggle"
       onClick={[Function]}
+      type="button"
     >
       Dropdown
       <CaretDownIcon
diff --git a/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/Toggle.test.js.snap b/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/Toggle.test.js.snap
index 71a66749b77..ddd42608730 100644
--- a/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/Toggle.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/Toggle.test.js.snap
@@ -49,6 +49,7 @@ exports[`Dropdown toggle 1`] = `
       className="pf-c-dropdown__toggle"
       id="Dropdown Toggle"
       onClick={[Function]}
+      type="button"
     >
       Dropdown
       <CaretDownIcon
@@ -128,6 +129,7 @@ exports[`Kebab toggle 1`] = `
       className="pf-c-dropdown__toggle"
       id="Dropdown Toggle"
       onClick={[Function]}
+      type="button"
     >
       <EllipsisVIcon
         color="currentColor"