From 730d7c3f61d4cf95d437e5695908113380220db5 Mon Sep 17 00:00:00 2001 From: Bogdan Cochior <bogdan.cochior@thinslices.com> Date: Wed, 14 Mar 2018 17:27:49 +0200 Subject: [PATCH] refactor(CheckboxGroup): switch to checkboxgroup from pubsweet-ui n --- .../components/UIComponents/CheckboxGroup.js | 52 ------------------- .../src/components/UIComponents/index.js | 1 - .../src/components/index.js | 2 +- .../app/config/journal/submit-wizard.js | 8 +-- 4 files changed, 3 insertions(+), 60 deletions(-) delete mode 100644 packages/components-faraday/src/components/UIComponents/CheckboxGroup.js diff --git a/packages/components-faraday/src/components/UIComponents/CheckboxGroup.js b/packages/components-faraday/src/components/UIComponents/CheckboxGroup.js deleted file mode 100644 index 59906f130..000000000 --- a/packages/components-faraday/src/components/UIComponents/CheckboxGroup.js +++ /dev/null @@ -1,52 +0,0 @@ -import React from 'react' -import { Checkbox } from '@pubsweet/ui' - -class CheckboxGroup extends React.Component { - constructor(props) { - super(props) - - this.state = { - values: props.value || [], - } - } - - handleChange = event => { - const values = [...this.state.values] - - const { value } = event.target - - if (event.target.checked) { - values.push(value) - } else { - values.splice(values.indexOf(value), 1) - } - - this.setState({ values }) - - this.props.onChange(values) - } - - render() { - const { inline, name, options, required } = this.props - const { values } = this.state - - return ( - <div> - {options.map(option => ( - <Checkbox - checked={values.includes(option.value)} - inline={inline} - key={option.value} - label={option.label} - name={name} - onChange={this.handleChange} - required={required} - value={option.value} - /> - ))} - </div> - ) - } -} - -export default CheckboxGroup diff --git a/packages/components-faraday/src/components/UIComponents/index.js b/packages/components-faraday/src/components/UIComponents/index.js index 607aa47b3..0f79f62b6 100644 --- a/packages/components-faraday/src/components/UIComponents/index.js +++ b/packages/components-faraday/src/components/UIComponents/index.js @@ -1,4 +1,3 @@ export { default as Logo } from './Logo' export { default as Spinner } from './Spinner' export { default as Dropdown } from './Dropdown' -export { default as CheckboxGroup } from './CheckboxGroup' diff --git a/packages/components-faraday/src/components/index.js b/packages/components-faraday/src/components/index.js index 241cd9712..93791801a 100644 --- a/packages/components-faraday/src/components/index.js +++ b/packages/components-faraday/src/components/index.js @@ -5,4 +5,4 @@ export { default as AuthorList } from './AuthorList/AuthorList' export { default as SortableList } from './SortableList/SortableList' export { DragHandle } from './AuthorList/FormItems' -export { Dropdown, Logo, Spinner, CheckboxGroup } from './UIComponents' +export { Dropdown, Logo, Spinner } from './UIComponents' diff --git a/packages/xpub-faraday/app/config/journal/submit-wizard.js b/packages/xpub-faraday/app/config/journal/submit-wizard.js index 2fa3df80f..5f3ff6b74 100644 --- a/packages/xpub-faraday/app/config/journal/submit-wizard.js +++ b/packages/xpub-faraday/app/config/journal/submit-wizard.js @@ -4,13 +4,9 @@ import uploadFileFn from 'xpub-upload' // TODO: Add back abstract when xpub-edit is published // import { AbstractEditor, TitleEditor } from 'xpub-edit' import { TitleEditor } from 'xpub-edit' -import { Menu, YesOrNo, TextField } from '@pubsweet/ui' +import { Menu, YesOrNo, TextField, CheckboxGroup } from '@pubsweet/ui' import { required, minChars, minSize } from 'xpub-validators' -import { - AuthorList, - Files, - CheckboxGroup, -} from 'pubsweet-components-faraday/src/components' +import { AuthorList, Files } from 'pubsweet-components-faraday/src/components' import { declarations } from './' import issueTypes from './issues-types' -- GitLab