diff --git a/wax-prosemirror-components/src/components/TableDropDown.js b/wax-prosemirror-components/src/components/TableDropDown.js index 45ef3a4158f998b567cfb1973d5f7d09b2da449f..defad65363e502cf8096506d640d6ce31e78ca18 100644 --- a/wax-prosemirror-components/src/components/TableDropDown.js +++ b/wax-prosemirror-components/src/components/TableDropDown.js @@ -13,6 +13,10 @@ const DropdownStyled = styled(Dropdown)` .Dropdown-control { border: none; + + &:hover { + box-shadow: none; + } } .Dropdown-arrow { diff --git a/wax-prosemirror-components/src/components/editingSuggesting/EditingSuggestingDropDown.js b/wax-prosemirror-components/src/components/editingSuggesting/EditingSuggestingDropDown.js index f8f5a1c9b1db5bf8725a212ff2cf503318f76c96..7c0dadbae971428d049524392a394bc4fcf31144 100644 --- a/wax-prosemirror-components/src/components/editingSuggesting/EditingSuggestingDropDown.js +++ b/wax-prosemirror-components/src/components/editingSuggesting/EditingSuggestingDropDown.js @@ -1,11 +1,10 @@ /* eslint react/prop-types: 0 */ -import React, { useMemo, useContext, useEffect } from 'react'; +import React, { useMemo, useContext } from 'react'; import styled from 'styled-components'; import { WaxContext } from 'wax-prosemirror-core'; import Dropdown from 'react-dropdown'; import 'react-dropdown/style.css'; import Icon from '../../helpers/Icon'; -import TrackChangesBox from '../trackChanges/TrackChangesBox'; const DropdownStyled = styled(Dropdown)` display: inline-flex; @@ -13,8 +12,12 @@ const DropdownStyled = styled(Dropdown)` .Dropdown-control { border: none; - cursor: ${props => (props.select ? 'default' : 'not-allowed')}; + cursor: ${props => (props.select ? 'pointer' : 'not-allowed')}; pointer-events: ${props => (props.select ? 'default' : 'none')}; + + &:hover { + box-shadow: none; + } } .Dropdown-arrow { diff --git a/wax-prosemirror-components/src/icons/icons.js b/wax-prosemirror-components/src/icons/icons.js index d6cd5f62a4070f45eea1601a8f75bdfef99712f0..62dbb08a3d20755da0569d5a7fb5d4b69939943f 100644 --- a/wax-prosemirror-components/src/icons/icons.js +++ b/wax-prosemirror-components/src/icons/icons.js @@ -345,7 +345,14 @@ export default { <Svg className={className} fill="none" viewBox="0 0 24 24"> <title> Reject </title> <path d="M0 0h24v24H0z" fill="none" /> - <path d="M 18 2.016 L 18 0 L 0 0 L 0 2.016 Z M 18 6.984 L 18 5.016 L 0 5.016 L 0 6.984 Z M 7.5 12 L 7.5 9.984 L 0 9.984 L 0 12 Z M 16.609 17.516 L 18.016 16.109 L 15.438 13.484 L 18.016 10.906 L 16.609 9.5 L 14.031 12.078 L 11.406 9.5 L 10 10.906 L 12.625 13.484 L 10 16.109 L 11.406 17.516 L 14.031 14.891 Z" /> + <path d="M 14.531 7.078 L 20.156 1.406 L 18.75 0 L 14.531 4.219 L 12.375 2.109 L 10.969 3.516 Z M 9 5.063 L 9 3.047 L 0 3.047 L 0 5.063 Z M 17.578 16.078 L 18.984 14.672 L 16.406 12.047 L 18.984 9.469 L 17.578 8.063 L 15 10.641 L 12.375 8.063 L 10.969 9.469 L 13.594 12.047 L 10.969 14.672 L 12.375 16.078 L 15 13.453 Z M 9 13.078 L 9 11.063 L 0 11.063 L 0 13.078 Z" /> + </Svg> + ), + acceptRejectTrack: ({ className }) => ( + <Svg className={className} fill="none" viewBox="0 0 24 24"> + <title> Accept </title> + <path d="M0 0h24v24H0z" fill="none" /> + <path d="M 18 2.016 L 18 0 L 0 0 L 0 2.016 Z M 18 6.984 L 18 5.016 L 0 5.016 L 0 6.984 Z M 7.5 12 L 7.5 9.984 L 0 9.984 L 0 12 Z M 12.563 17.078 L 18.188 11.406 L 16.781 10 L 12.563 14.219 L 10.406 12.109 L 9 13.516 Z" /> </Svg> ), transformCase: ({ className }) => (