diff --git a/packages/react-core/src/components/MenuToggle/MenuToggleCheckbox.tsx b/packages/react-core/src/components/MenuToggle/MenuToggleCheckbox.tsx index a2d7aeee354..fdf54dbeb85 100644 --- a/packages/react-core/src/components/MenuToggle/MenuToggleCheckbox.tsx +++ b/packages/react-core/src/components/MenuToggle/MenuToggleCheckbox.tsx @@ -1,8 +1,7 @@ import * as React from 'react'; -import styles from '@patternfly/react-styles/css/components/Check/check'; -import { css } from '@patternfly/react-styles'; import { PickOptional } from '../../helpers/typeUtils'; -import { getOUIAProps, OUIAProps, getDefaultOUIAId } from '../../helpers'; +import { OUIAProps } from '../../helpers'; +import { Checkbox } from '../Checkbox'; export interface MenuToggleCheckboxProps extends Omit, 'type' | 'onChange' | 'disabled' | 'checked'>, @@ -33,7 +32,7 @@ export interface MenuToggleCheckboxProps ouiaSafe?: boolean; } -class MenuToggleCheckbox extends React.Component { +class MenuToggleCheckbox extends React.Component { static displayName = 'MenuToggleCheckbox'; static defaultProps: PickOptional = { isValid: true, @@ -43,66 +42,24 @@ class MenuToggleCheckbox extends React.Component) => { - this.props.onChange((event.target as HTMLInputElement).checked, event); - }; - - calculateChecked = () => { - const { isChecked, defaultChecked } = this.props; - if (isChecked === null) { - // return false here and the indeterminate state will be set to true through the ref - return false; - } else if (isChecked !== undefined) { - return isChecked; - } - return defaultChecked; - }; - render() { const { - className, - isValid, - isDisabled, - isChecked, children, - ouiaId, - ouiaSafe, /* eslint-disable @typescript-eslint/no-unused-vars */ onChange, - defaultChecked, - id, ...props } = this.props; - const text = children && ( - - ); + return ( - + // @ts-ignore + , checked: boolean) => onChange(checked, event)} + isLabelWrapped + label={children} + {...props} + > ); } }