From 20179ff0a6bdfa4a78e020587fb4399db8b5663a Mon Sep 17 00:00:00 2001
From: Emily Plummer <emplums@github.com>
Date: Mon, 30 Mar 2020 08:59:42 -0700
Subject: [PATCH 1/5] update version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index eb85db2d2cd..81883a1c81e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@primer/components",
-  "version": "16.3.0",
+  "version": "16.4.0",
   "description": "Primer react components",
   "main": "dist/index.umd.js",
   "module": "dist/index.esm.js",

From 126fc957a96e6f71a5821856667e22b4c8b789a8 Mon Sep 17 00:00:00 2001
From: Emily Plummer <emplums@github.com>
Date: Thu, 2 Apr 2020 16:39:31 -0700
Subject: [PATCH 2/5] type fixes

---
 index.d.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/index.d.ts b/index.d.ts
index 9f9cf12be19..6d3e1cabbad 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -157,7 +157,6 @@ declare module '@primer/components' {
 
   export const StyledOcticon: React.FunctionComponent<StyledOcticonProps>
 
-  export interface DropdownProps extends DetailsProps, Omit<React.HTMLAttributes<HTMLElement>, 'color'> {}
 
   export interface DropdownItem extends CommonProps, Omit<React.HTMLAttributes<HTMLLIElement>, 'color'> {}
 
@@ -169,9 +168,9 @@ declare module '@primer/components' {
 
   export interface DropdownCaretProps extends CommonProps, Omit<React.HTMLAttributes<HTMLDivElement>, 'color'> {}
 
-  export const Dropdown: React.FunctionComponent<DropdownProps> & {
+  export const Dropdown: React.FunctionComponent<DetailsProps> & {
     Menu: React.FunctionComponent<DropdownMenuProps>
-    Item: React.FunctionComponent<DropdownProps>
+    Item: React.FunctionComponent<DropdownItemProps>
     Button: React.FunctionComponent<DropdownButtonProps>
     Caret: React.FunctionComponent<DropdownCaretProps>
   }

From 9baf251927e1110f116959bc3d1d41215ba522ab Mon Sep 17 00:00:00 2001
From: Emily Plummer <emplums@github.com>
Date: Thu, 2 Apr 2020 16:43:04 -0700
Subject: [PATCH 3/5] Update package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5531ae268d2..ddda0ea6b93 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@primer/components",
-  "version": "17.0.0",
+  "version": "17.1.0",
   "description": "Primer react components",
   "main": "dist/index.umd.js",
   "module": "dist/index.esm.js",

From a60af189481621a1305e5791998edf51b9276335 Mon Sep 17 00:00:00 2001
From: Emily Plummer <emplums@github.com>
Date: Thu, 2 Apr 2020 16:49:47 -0700
Subject: [PATCH 4/5] add export back in

---
 index.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.d.ts b/index.d.ts
index 6d3e1cabbad..8dbb6bc096f 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -157,7 +157,7 @@ declare module '@primer/components' {
 
   export const StyledOcticon: React.FunctionComponent<StyledOcticonProps>
 
-
+  export interface DropdownProps extends DetailsProps {}
   export interface DropdownItem extends CommonProps, Omit<React.HTMLAttributes<HTMLLIElement>, 'color'> {}
 
   export interface DropdownMenuProps extends CommonProps, Omit<React.HTMLAttributes<HTMLUListElement>, 'color'> {
@@ -168,7 +168,7 @@ declare module '@primer/components' {
 
   export interface DropdownCaretProps extends CommonProps, Omit<React.HTMLAttributes<HTMLDivElement>, 'color'> {}
 
-  export const Dropdown: React.FunctionComponent<DetailsProps> & {
+  export const Dropdown: React.FunctionComponent<DropdownProps> & {
     Menu: React.FunctionComponent<DropdownMenuProps>
     Item: React.FunctionComponent<DropdownItemProps>
     Button: React.FunctionComponent<DropdownButtonProps>

From d61e376f68aa19acd6e53c8b739a93d7a2c49c0f Mon Sep 17 00:00:00 2001
From: Emily Plummer <emplums@github.com>
Date: Thu, 2 Apr 2020 16:50:53 -0700
Subject: [PATCH 5/5] couple more type tweaks

---
 index.d.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/index.d.ts b/index.d.ts
index 8dbb6bc096f..73fabe3a518 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -158,13 +158,13 @@ declare module '@primer/components' {
   export const StyledOcticon: React.FunctionComponent<StyledOcticonProps>
 
   export interface DropdownProps extends DetailsProps {}
-  export interface DropdownItem extends CommonProps, Omit<React.HTMLAttributes<HTMLLIElement>, 'color'> {}
+  export interface DropdownItemProps extends CommonProps, Omit<React.HTMLAttributes<HTMLLIElement>, 'color'> {}
 
   export interface DropdownMenuProps extends CommonProps, Omit<React.HTMLAttributes<HTMLUListElement>, 'color'> {
     direction?: 'ne'| 'e'| 'se'| 's'| 'sw'| 'w'
   }
 
-  export interface DropdownButtonProps extends ButtonProps, Omit<React.HTMLAttributes, 'color'> {}
+  export interface DropdownButtonProps extends ButtonProps {}
 
   export interface DropdownCaretProps extends CommonProps, Omit<React.HTMLAttributes<HTMLDivElement>, 'color'> {}
 
@@ -307,7 +307,7 @@ declare module '@primer/components' {
     selected?: boolean
   }
 
-  export interface SelectMenuFooterProps extends CommonProps, Omit<React.FooterHTMLAttributes<HTMLElement>, 'color'> {}
+  export interface SelectMenuFooterProps extends CommonProps, Omit<React.HTMLAttributes<HTMLElement>, 'color'> {}
 
   export interface SelectMenuDividerProps extends CommonProps, Omit<React.HTMLAttributes<HTMLDivElement>, 'color'> {}