From eb05c86e506c7379205e752dee0969204cd117ea Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 7 Jul 2020 15:32:20 +0100
Subject: [PATCH] clean-up

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/accessibility/context_menu/MenuGroup.tsx              | 1 -
 src/accessibility/context_menu/MenuItem.tsx               | 7 +++----
 src/accessibility/context_menu/MenuItemCheckbox.tsx       | 8 +++-----
 src/accessibility/context_menu/MenuItemRadio.tsx          | 8 +++-----
 src/accessibility/context_menu/StyledMenuItemCheckbox.tsx | 2 +-
 src/accessibility/context_menu/StyledMenuItemRadio.tsx    | 3 +--
 6 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/src/accessibility/context_menu/MenuGroup.tsx b/src/accessibility/context_menu/MenuGroup.tsx
index f4b7b6bc56..9334e17a18 100644
--- a/src/accessibility/context_menu/MenuGroup.tsx
+++ b/src/accessibility/context_menu/MenuGroup.tsx
@@ -20,7 +20,6 @@ import React from "react";
 
 interface IProps extends React.HTMLAttributes<HTMLDivElement> {
     label: string;
-    className?: string;
 }
 
 // Semantic component for representing a role=group for grouping menu radios/checkboxes
diff --git a/src/accessibility/context_menu/MenuItem.tsx b/src/accessibility/context_menu/MenuItem.tsx
index 8e33d55de4..64233e51ad 100644
--- a/src/accessibility/context_menu/MenuItem.tsx
+++ b/src/accessibility/context_menu/MenuItem.tsx
@@ -18,12 +18,10 @@ limitations under the License.
 
 import React from "react";
 
-import AccessibleButton, {ButtonEvent, IProps as IAccessibleButtonProps} from "../../components/views/elements/AccessibleButton";
+import AccessibleButton from "../../components/views/elements/AccessibleButton";
 
-interface IProps extends IAccessibleButtonProps {
+interface IProps extends React.ComponentProps<typeof AccessibleButton> {
     label?: string;
-    className?: string;
-    onClick(ev: ButtonEvent);
 }
 
 // Semantic component for representing a role=menuitem
@@ -34,3 +32,4 @@ export const MenuItem: React.FC<IProps> = ({children, label, ...props}) => {
         </AccessibleButton>
     );
 };
+
diff --git a/src/accessibility/context_menu/MenuItemCheckbox.tsx b/src/accessibility/context_menu/MenuItemCheckbox.tsx
index e2cc04b5a6..5eb8cc4819 100644
--- a/src/accessibility/context_menu/MenuItemCheckbox.tsx
+++ b/src/accessibility/context_menu/MenuItemCheckbox.tsx
@@ -18,14 +18,11 @@ limitations under the License.
 
 import React from "react";
 
-import AccessibleButton, {ButtonEvent, IProps as IAccessibleButtonProps} from "../../components/views/elements/AccessibleButton";
+import AccessibleButton from "../../components/views/elements/AccessibleButton";
 
-interface IProps extends IAccessibleButtonProps {
+interface IProps extends React.ComponentProps<typeof AccessibleButton> {
     label?: string;
     active: boolean;
-    disabled?: boolean;
-    className?: string;
-    onClick(ev: ButtonEvent);
 }
 
 // Semantic component for representing a role=menuitemcheckbox
@@ -36,6 +33,7 @@ export const MenuItemCheckbox: React.FC<IProps> = ({children, label, active, dis
             role="menuitemcheckbox"
             aria-checked={active}
             aria-disabled={disabled}
+            disabled={disabled}
             tabIndex={-1}
             aria-label={label}
         >
diff --git a/src/accessibility/context_menu/MenuItemRadio.tsx b/src/accessibility/context_menu/MenuItemRadio.tsx
index 21732220df..472f13ff14 100644
--- a/src/accessibility/context_menu/MenuItemRadio.tsx
+++ b/src/accessibility/context_menu/MenuItemRadio.tsx
@@ -18,14 +18,11 @@ limitations under the License.
 
 import React from "react";
 
-import AccessibleButton, {ButtonEvent, IProps as IAccessibleButtonProps} from "../../components/views/elements/AccessibleButton";
+import AccessibleButton from "../../components/views/elements/AccessibleButton";
 
-interface IProps extends IAccessibleButtonProps {
+interface IProps extends React.ComponentProps<typeof AccessibleButton> {
     label?: string;
     active: boolean;
-    disabled?: boolean;
-    className?: string;
-    onClick(ev: ButtonEvent);
 }
 
 // Semantic component for representing a role=menuitemradio
@@ -36,6 +33,7 @@ export const MenuItemRadio: React.FC<IProps> = ({children, label, active, disabl
             role="menuitemradio"
             aria-checked={active}
             aria-disabled={disabled}
+            disabled={disabled}
             tabIndex={-1}
             aria-label={label}
         >
diff --git a/src/accessibility/context_menu/StyledMenuItemCheckbox.tsx b/src/accessibility/context_menu/StyledMenuItemCheckbox.tsx
index f5a510f517..d373f892c9 100644
--- a/src/accessibility/context_menu/StyledMenuItemCheckbox.tsx
+++ b/src/accessibility/context_menu/StyledMenuItemCheckbox.tsx
@@ -23,7 +23,7 @@ import StyledCheckbox from "../../components/views/elements/StyledCheckbox";
 
 interface IProps extends React.ComponentProps<typeof StyledCheckbox> {
     label?: string;
-    onChange();
+    onChange(); // we handle keyup/down ourselves so lose the ChangeEvent
     onClose(): void; // gets called after onChange on Key.ENTER
 }
 
diff --git a/src/accessibility/context_menu/StyledMenuItemRadio.tsx b/src/accessibility/context_menu/StyledMenuItemRadio.tsx
index be87ccc683..5e5aa90a38 100644
--- a/src/accessibility/context_menu/StyledMenuItemRadio.tsx
+++ b/src/accessibility/context_menu/StyledMenuItemRadio.tsx
@@ -23,8 +23,7 @@ import StyledRadioButton from "../../components/views/elements/StyledRadioButton
 
 interface IProps extends React.ComponentProps<typeof StyledRadioButton> {
     label?: string;
-    disabled?: boolean;
-    onChange(): void;
+    onChange(); // we handle keyup/down ourselves so lose the ChangeEvent
     onClose(): void; // gets called after onChange on Key.ENTER
 }