Skip to content

Commit c6e578b

Browse files
committed
fix(MenuToggle): fix indeterminate checkbox error, toggle click behavior
1 parent 0ea7023 commit c6e578b

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

packages/react-core/src/components/MenuToggle/MenuToggle.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ class MenuToggleBase extends React.Component<MenuToggleProps> {
144144
styles.modifiers.splitButton,
145145
splitButtonOptions?.variant === 'action' && styles.modifiers.action
146146
)}
147+
onClick={onClick}
147148
>
148149
{splitButtonOptions?.items}
149150
<button

packages/react-core/src/components/MenuToggle/MenuToggleAction.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ class MenuToggleAction extends React.Component<MenuToggleActionProps> {
3030
<button
3131
id={id}
3232
className={css(styles.menuToggleButton, className)}
33-
onClick={onClick}
33+
onClick={(evt) => {
34+
evt.stopPropagation();
35+
onClick(evt);
36+
}}
3437
type="button"
3538
disabled={isDisabled}
3639
{...props}

packages/react-core/src/components/MenuToggle/MenuToggleCheckbox.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,10 @@ class MenuToggleCheckbox extends React.Component<MenuToggleCheckboxProps, { ouia
9393
ref={(elem) => elem && (elem.indeterminate = isChecked === null)}
9494
aria-invalid={!isValid}
9595
disabled={isDisabled}
96-
{...(defaultChecked !== undefined ? { defaultChecked } : { checked: isChecked })}
96+
onClick={(evt) => {
97+
evt.stopPropagation();
98+
}}
99+
{...(defaultChecked !== undefined ? { defaultChecked } : { checked: this.calculateChecked() })}
97100
{...getOUIAProps(
98101
MenuToggleCheckbox.displayName,
99102
ouiaId !== undefined ? ouiaId : this.state.ouiaStateId,

0 commit comments

Comments
 (0)