fix(MenuToggle): fix indeterminate checkbox error, toggle click behavior

patternfly · Feb 6, 2024 · c6e578b · c6e578b
1 parent 0ea7023
commit c6e578b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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,