Merge branch 'faraday-master' of gitlab.coko.foundation:xpub/xpub into faraday-master

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;
 `

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)}