diff --git a/components/lib/multiselect/MultiSelectBase.js b/components/lib/multiselect/MultiSelectBase.js index 53a515f6df..ba47121fa7 100644 --- a/components/lib/multiselect/MultiSelectBase.js +++ b/components/lib/multiselect/MultiSelectBase.js @@ -53,10 +53,6 @@ const classes = { }), checkboxContainer: 'p-checkbox p-component', checkboxIcon: 'p-checkbox-icon p-c', - checkbox: ({ itemProps: props }) => - classNames('p-checkbox-box', { - 'p-highlight': props.selected - }), transition: 'p-connected-overlay' }; diff --git a/components/lib/multiselect/MultiSelectItem.js b/components/lib/multiselect/MultiSelectItem.js index e91409ce8f..63a21dae8b 100644 --- a/components/lib/multiselect/MultiSelectItem.js +++ b/components/lib/multiselect/MultiSelectItem.js @@ -2,12 +2,13 @@ import * as React from 'react'; import { useMergeProps } from '../hooks/Hooks'; import { CheckIcon } from '../icons/check'; import { Ripple } from '../ripple/Ripple'; +import { Checkbox } from '../checkbox/Checkbox'; import { IconUtils, ObjectUtils, classNames } from '../utils/Utils'; export const MultiSelectItem = React.memo((props) => { const [focusedState, setFocusedState] = React.useState(false); const mergeProps = useMergeProps(); - const { ptm, cx } = props; + const { ptm, cx, isUnstyled } = props; const getPTOptions = (key) => { return ptm(key, { @@ -59,14 +60,6 @@ export const MultiSelectItem = React.memo((props) => { getPTOptions('checkboxContainer') ); - const checkboxProps = mergeProps( - { - className: cx('checkbox', { itemProps: props }), - 'data-p-highlight': props.selected - }, - getPTOptions('checkbox') - ); - const itemProps = mergeProps( { className: classNames(props.className, props.option.className, cx('item', { itemProps: props })), @@ -86,7 +79,7 @@ export const MultiSelectItem = React.memo((props) => { return (