From 6341617ed1b5f6034ea18ecf99af1b15815dfacd Mon Sep 17 00:00:00 2001 From: chris <kokosias@yahoo.gr> Date: Sat, 19 Nov 2022 17:02:53 +0200 Subject: [PATCH] move checkbox --- wax-prosemirror-components/index.js | 1 - .../src/ui/trackChanges/TrackChangesBox.js | 138 ------------------ .../components}/CheckBox.js | 0 .../ExpandedFindAndReplaceComponent.js | 3 +- 4 files changed, 2 insertions(+), 140 deletions(-) delete mode 100644 wax-prosemirror-components/src/ui/trackChanges/TrackChangesBox.js rename {wax-prosemirror-components/src/ui/inputs => wax-prosemirror-services/src/FindAndReplaceService/components}/CheckBox.js (100%) diff --git a/wax-prosemirror-components/index.js b/wax-prosemirror-components/index.js index 9ce2e7e4d..32eaad818 100644 --- a/wax-prosemirror-components/index.js +++ b/wax-prosemirror-components/index.js @@ -22,5 +22,4 @@ export { default as ReactDropDownStyles } from './src/helpers/ReactDropDownStyle export { default as useDebounce } from './src/helpers/useDebounce'; export { default as useOnClickOutside } from './src/helpers/useOnClickOutside'; -export { default as CheckBox } from './src/ui/inputs/CheckBox'; export { default as DateParser } from './src/helpers/DateParser'; diff --git a/wax-prosemirror-components/src/ui/trackChanges/TrackChangesBox.js b/wax-prosemirror-components/src/ui/trackChanges/TrackChangesBox.js deleted file mode 100644 index 11d0912de..000000000 --- a/wax-prosemirror-components/src/ui/trackChanges/TrackChangesBox.js +++ /dev/null @@ -1,138 +0,0 @@ -import React from 'react'; -import PropTypes from 'prop-types'; -import styled, { css } from 'styled-components'; -import icons from '../../icons/icons'; - -const { check, times } = icons; - -const activeBorder = css` - border-color: gray; -`; - -const Wrapper = styled.div` - border: 2px solid transparent; - border-radius: 5px; - cursor: pointer; - ${props => props.active && activeBorder} - padding: 8px 16px; - transition: border 0.1s ease-in; - - &:hover { - ${activeBorder} - } -`; - -const HeadWrapper = styled.div` - display: flex; - margin-bottom: 8px; -`; - -const Info = styled.div` - display: flex; - flex-direction: column; - flex-grow: 1; -`; - -const Name = styled.div``; - -const Timestamp = styled.div` - color: gray; -`; - -const Tools = styled.div``; - -const ChangeWrapper = styled.div``; - -const Label = styled.span` - font-weight: bold; - margin-right: 4px; - text-transform: capitalize; - - &:after { - content: ':'; - } -`; - -const Text = styled.span``; - -const Icon = styled.div` - border-radius: 3px; - display: inline-block; - height: 16px; - padding: 4px; - transition: background 0.1s ease-in; - width: 16px; - - &:hover { - background: gray; - } -`; - -const IconButton = props => { - // eslint-disable-next-line react/prop-types - const { icon, onClick } = props; - - const handleClick = e => { - e.stopPropagation(); - onClick(); - }; - - return ( - <Icon onClick={handleClick} type="button"> - {icon} - </Icon> - ); -}; - -const TrackChangesBox = props => { - const { - active, - className, - displayName, - label, - onClick, - onClickAccept, - onClickReject, - text, - timestamp, - } = props; - - return ( - <Wrapper active={active} className={className} onClick={onClick}> - {active && ( - <HeadWrapper> - <Info> - <Name>{displayName}</Name> - <Timestamp>{timestamp}</Timestamp> - </Info> - - <Tools> - <IconButton icon={check} onClick={onClickAccept} /> - <IconButton icon={times} onClick={onClickReject} /> - </Tools> - </HeadWrapper> - )} - - <ChangeWrapper> - <Label>{label}</Label> - <Text>{text}</Text> - </ChangeWrapper> - </Wrapper> - ); -}; - -TrackChangesBox.propTypes = { - active: PropTypes.bool, - displayName: PropTypes.string.isRequired, - label: PropTypes.string.isRequired, - onClickAccept: PropTypes.func.isRequired, - onClickReject: PropTypes.func.isRequired, - text: PropTypes.string.isRequired, - timestamp: PropTypes.string.isRequired, -}; - -TrackChangesBox.defaultProps = { - active: false, -}; - -export default TrackChangesBox; diff --git a/wax-prosemirror-components/src/ui/inputs/CheckBox.js b/wax-prosemirror-services/src/FindAndReplaceService/components/CheckBox.js similarity index 100% rename from wax-prosemirror-components/src/ui/inputs/CheckBox.js rename to wax-prosemirror-services/src/FindAndReplaceService/components/CheckBox.js diff --git a/wax-prosemirror-services/src/FindAndReplaceService/components/ExpandedFindAndReplaceComponent.js b/wax-prosemirror-services/src/FindAndReplaceService/components/ExpandedFindAndReplaceComponent.js index 5f9541a25..c17097f27 100644 --- a/wax-prosemirror-services/src/FindAndReplaceService/components/ExpandedFindAndReplaceComponent.js +++ b/wax-prosemirror-services/src/FindAndReplaceService/components/ExpandedFindAndReplaceComponent.js @@ -4,7 +4,8 @@ import { each, eachRight } from 'lodash'; import { WaxContext, DocumentHelpers } from 'wax-prosemirror-core'; import styled from 'styled-components'; import { grid, th } from '@pubsweet/ui-toolkit'; -import { Icon, CheckBox, useDebounce } from 'wax-prosemirror-components'; +import { Icon, useDebounce } from 'wax-prosemirror-components'; +import CheckBox from './CheckBox'; import helpers from './helpers'; const Wrapper = styled.div` -- GitLab