diff --git a/packages/components-faraday/src/components/Admin/AdminUsers.js b/packages/components-faraday/src/components/Admin/AdminUsers.js index db9501af114f4c9c006fdeabed6743a2ca138db3..507d75a4871c4972a54a32a4031ed390eb945cdb 100644 --- a/packages/components-faraday/src/components/Admin/AdminUsers.js +++ b/packages/components-faraday/src/components/Admin/AdminUsers.js @@ -6,7 +6,7 @@ import { Icon, Menu } from '@pubsweet/ui' import { actions } from 'pubsweet-client' import { ConnectPage } from 'xpub-connect' import { withJournal } from 'xpub-journal' -import { withRouter } from 'react-router-dom' +import { withRouter, Link } from 'react-router-dom' import { compose, withState, withHandlers } from 'recompose' import { Pagination } from './' @@ -44,7 +44,7 @@ const TableRow = ({ <Tag>{isConfirmed ? 'Confirmed' : 'Invited'}</Tag> </td> <td> - <Action href={`/admin/users/edit/${id}`}>Edit</Action> + <Action to={`/admin/users/edit/${id}`}>Edit</Action> </td> </Row> ) @@ -296,7 +296,7 @@ const Role = styled.span` text-transform: uppercase; ` -const Action = styled.a` +const Action = styled(Link)` color: ${({ theme }) => theme.colorPrimary}; display: none; ` diff --git a/packages/components-faraday/src/components/Files/FileSection.js b/packages/components-faraday/src/components/Files/FileSection.js index 675c920989e9e229bd53a2379cdfb0b12ee1a4b0..4d3ceb5d564a966eac06b65e771918c348ed1700 100644 --- a/packages/components-faraday/src/components/Files/FileSection.js +++ b/packages/components-faraday/src/components/Files/FileSection.js @@ -51,7 +51,10 @@ const FileSection = ({ previewFile, }) => ( <DropSection - innerRef={instance => connectFileDrop(connectDropTarget(instance))} + innerRef={instance => { + connectFileDrop(instance) + connectDropTarget(instance) + }} isFirst={isFirst} isLast={isLast} over={isFileOver || (isOver && canDrop)}