From a32d6800c6b9d356ae7330a5d8338f4a801f6bb2 Mon Sep 17 00:00:00 2001 From: Tania Fecheta <tania.fecheta@thinslices.com> Date: Mon, 7 Jan 2019 15:24:05 +0200 Subject: [PATCH] fix(ManuscriptFileList): functionality of preview and download buttons from files --- .../src/manuscriptDetails/ManuscriptFileList.js | 14 ++++++-------- .../src/manuscriptDetails/ManuscriptFileSection.js | 6 ++---- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptFileList.js b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptFileList.js index 901ebc1a2..40d501a7d 100644 --- a/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptFileList.js +++ b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptFileList.js @@ -1,7 +1,8 @@ import PropTypes from 'prop-types' import React, { Fragment } from 'react' +import { compose } from 'recompose' import { ManuscriptFileSection } from 'pubsweet-component-faraday-ui' -import { withFilePreview, withFileDownload } from '../helpers' +import { withFilePreview, withFileDownload } from '../' const ManuscriptFileList = ({ files: { manuscripts = [], coverLetter = [], supplementary = [] }, @@ -43,18 +44,15 @@ ManuscriptFileList.propTypes = { supplementary: PropTypes.arrayOf(PropTypes.object), }), /** Callback function fired when delete icon is pressed. */ - onDelete: PropTypes.func, + onDelete: PropTypes.func, // eslint-disable-line /** Callback function fired when download icon is pressed. */ - onDownload: PropTypes.func, + onDownload: PropTypes.func, // eslint-disable-line /** Callback function fired when preview icon is pressed. */ - onPreview: PropTypes.func, + onPreview: PropTypes.func, // eslint-disable-line } ManuscriptFileList.defaultProps = { files: {}, - onDelete: () => {}, - onDownload: () => {}, - onPreview: () => {}, } -export default withFilePreview(withFileDownload(ManuscriptFileList)) +export default compose(withFilePreview, withFileDownload)(ManuscriptFileList) diff --git a/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptFileSection.js b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptFileSection.js index e4fef65e9..ff3c63685 100644 --- a/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptFileSection.js +++ b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptFileSection.js @@ -35,16 +35,14 @@ ManuscriptFileSection.propTypes = { /** Category name of uploaded files. */ label: PropTypes.string, /** Callback function fired when download icon is pressed. */ - onDownload: PropTypes.func, + onDownload: PropTypes.func, // eslint-disable-line /** Callback function fired when preview icon is pressed. */ - onPreview: PropTypes.func, + onPreview: PropTypes.func, // eslint-disable-line } ManuscriptFileSection.defaultProps = { list: [], label: '', - onDownload: () => {}, - onPreview: () => {}, } export default ManuscriptFileSection -- GitLab