Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 33 additions & 26 deletions src/components/checkbox/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,32 +14,37 @@ function Group(props) {

let checkedValue = value ? [ ...value ] : value;

const group = Children.map(children, (child) => cloneElement(child, {
disabled: disabled === undefined ? child.props.disabled : disabled,

checked:
checkedValue === undefined
? undefined
: checkedValue.indexOf(child.props.value) > -1,

onChange(checked, val) {
if (checkedValue === undefined) {
checkedValue = [];
}

const index = checkedValue.indexOf(val);

if (index > -1 && !checked) {
checkedValue.splice(index, 1);
}

if (index === -1 && checked) {
checkedValue.push(val);
}

onChange(checkedValue);
},
}));
const group = Children.map(children, (child) => {
if (child && child.type && [ 'Checkbox', 'ComplexCheckbox' ].includes(child.type.displayName)) {
return cloneElement(child, {
disabled: disabled === undefined ? child.props.disabled : disabled,

checked:
checkedValue === undefined
? undefined
: checkedValue.indexOf(child.props.value) > -1,

onChange(checked, val) {
if (checkedValue === undefined) {
checkedValue = [];
}

const index = checkedValue.indexOf(val);

if (index > -1 && !checked) {
checkedValue.splice(index, 1);
}

if (index === -1 && checked) {
checkedValue.push(val);
}

onChange(checkedValue);
},
});
}
return child;
});

const classes = classNames(`${classSelector}-group`, {
vertical: layout === 'v',
Expand Down Expand Up @@ -159,4 +164,6 @@ class Checkbox extends React.Component {
}
}

Checkbox.displayName = 'Checkbox';

export default Checkbox;
2 changes: 2 additions & 0 deletions src/components/complex-checkbox/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ export default function ComplexCheckbox(props) {
);
}

ComplexCheckbox.displayName = 'ComplexCheckbox';

ComplexCheckbox.propTypes = {
content: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
imgSrc: PropTypes.string,
Expand Down