From aca6b3f7a335fb6aaa603ba3e8176dccb3ee3579 Mon Sep 17 00:00:00 2001
From: Katie McFaul <kmcfaul@redhat.com>
Date: Tue, 6 Feb 2024 13:04:32 -0500
Subject: [PATCH 1/2] fix(MenuToggle): fix indeterminate checkbox error, toggle
 click behavior

---
 packages/react-core/src/components/MenuToggle/MenuToggle.tsx | 1 +
 .../src/components/MenuToggle/MenuToggleAction.tsx           | 5 ++++-
 .../src/components/MenuToggle/MenuToggleCheckbox.tsx         | 5 ++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/react-core/src/components/MenuToggle/MenuToggle.tsx b/packages/react-core/src/components/MenuToggle/MenuToggle.tsx
index c330cfee1e3..2d2314abf4b 100644
--- a/packages/react-core/src/components/MenuToggle/MenuToggle.tsx
+++ b/packages/react-core/src/components/MenuToggle/MenuToggle.tsx
@@ -144,6 +144,7 @@ class MenuToggleBase extends React.Component<MenuToggleProps> {
             styles.modifiers.splitButton,
             splitButtonOptions?.variant === 'action' && styles.modifiers.action
           )}
+          onClick={onClick}
         >
           {splitButtonOptions?.items}
           <button
diff --git a/packages/react-core/src/components/MenuToggle/MenuToggleAction.tsx b/packages/react-core/src/components/MenuToggle/MenuToggleAction.tsx
index bd4bb02a5a6..e4df9805e53 100644
--- a/packages/react-core/src/components/MenuToggle/MenuToggleAction.tsx
+++ b/packages/react-core/src/components/MenuToggle/MenuToggleAction.tsx
@@ -30,7 +30,10 @@ class MenuToggleAction extends React.Component<MenuToggleActionProps> {
       <button
         id={id}
         className={css(styles.menuToggleButton, className)}
-        onClick={onClick}
+        onClick={(evt) => {
+          evt.stopPropagation();
+          onClick(evt);
+        }}
         type="button"
         disabled={isDisabled}
         {...props}
diff --git a/packages/react-core/src/components/MenuToggle/MenuToggleCheckbox.tsx b/packages/react-core/src/components/MenuToggle/MenuToggleCheckbox.tsx
index a2d7aeee354..891327abade 100644
--- a/packages/react-core/src/components/MenuToggle/MenuToggleCheckbox.tsx
+++ b/packages/react-core/src/components/MenuToggle/MenuToggleCheckbox.tsx
@@ -93,7 +93,10 @@ class MenuToggleCheckbox extends React.Component<MenuToggleCheckboxProps, { ouia
           ref={(elem) => elem && (elem.indeterminate = isChecked === null)}
           aria-invalid={!isValid}
           disabled={isDisabled}
-          {...(defaultChecked !== undefined ? { defaultChecked } : { checked: isChecked })}
+          onClick={(evt) => {
+            evt.stopPropagation();
+          }}
+          {...(defaultChecked !== undefined ? { defaultChecked } : { checked: this.calculateChecked() })}
           {...getOUIAProps(
             MenuToggleCheckbox.displayName,
             ouiaId !== undefined ? ouiaId : this.state.ouiaStateId,

From 2772aaea6562e0133b05760048d0f863a378a866 Mon Sep 17 00:00:00 2001
From: Katie McFaul <kmcfaul@redhat.com>
Date: Mon, 25 Mar 2024 11:52:48 -0400
Subject: [PATCH 2/2] revamp toggle click for checkbox

---
 packages/react-core/src/components/MenuToggle/MenuToggle.tsx | 1 -
 .../src/components/MenuToggle/MenuToggleAction.tsx           | 5 +----
 .../src/components/MenuToggle/MenuToggleCheckbox.tsx         | 5 +----
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/packages/react-core/src/components/MenuToggle/MenuToggle.tsx b/packages/react-core/src/components/MenuToggle/MenuToggle.tsx
index 2d2314abf4b..c330cfee1e3 100644
--- a/packages/react-core/src/components/MenuToggle/MenuToggle.tsx
+++ b/packages/react-core/src/components/MenuToggle/MenuToggle.tsx
@@ -144,7 +144,6 @@ class MenuToggleBase extends React.Component<MenuToggleProps> {
             styles.modifiers.splitButton,
             splitButtonOptions?.variant === 'action' && styles.modifiers.action
           )}
-          onClick={onClick}
         >
           {splitButtonOptions?.items}
           <button
diff --git a/packages/react-core/src/components/MenuToggle/MenuToggleAction.tsx b/packages/react-core/src/components/MenuToggle/MenuToggleAction.tsx
index e4df9805e53..bd4bb02a5a6 100644
--- a/packages/react-core/src/components/MenuToggle/MenuToggleAction.tsx
+++ b/packages/react-core/src/components/MenuToggle/MenuToggleAction.tsx
@@ -30,10 +30,7 @@ class MenuToggleAction extends React.Component<MenuToggleActionProps> {
       <button
         id={id}
         className={css(styles.menuToggleButton, className)}
-        onClick={(evt) => {
-          evt.stopPropagation();
-          onClick(evt);
-        }}
+        onClick={onClick}
         type="button"
         disabled={isDisabled}
         {...props}
diff --git a/packages/react-core/src/components/MenuToggle/MenuToggleCheckbox.tsx b/packages/react-core/src/components/MenuToggle/MenuToggleCheckbox.tsx
index 891327abade..ac9e017169c 100644
--- a/packages/react-core/src/components/MenuToggle/MenuToggleCheckbox.tsx
+++ b/packages/react-core/src/components/MenuToggle/MenuToggleCheckbox.tsx
@@ -84,7 +84,7 @@ class MenuToggleCheckbox extends React.Component<MenuToggleCheckboxProps, { ouia
       </span>
     );
     return (
-      <label className={css(styles.check, !children && styles.modifiers.standalone, className)} htmlFor={id}>
+      <label className={css(styles.check, !children && styles.modifiers.standalone, className)}>
         <input
           className={css(styles.checkInput)}
           {...(this.calculateChecked() !== undefined && { onChange: this.handleChange })}
@@ -93,9 +93,6 @@ class MenuToggleCheckbox extends React.Component<MenuToggleCheckboxProps, { ouia
           ref={(elem) => elem && (elem.indeterminate = isChecked === null)}
           aria-invalid={!isValid}
           disabled={isDisabled}
-          onClick={(evt) => {
-            evt.stopPropagation();
-          }}
           {...(defaultChecked !== undefined ? { defaultChecked } : { checked: this.calculateChecked() })}
           {...getOUIAProps(
             MenuToggleCheckbox.displayName,