From 198f1cab9047a79115a43ae4b6bd2d0451e95601 Mon Sep 17 00:00:00 2001 From: NikolaBorislavovHristov Date: Thu, 12 Sep 2019 12:18:14 +0300 Subject: [PATCH] MetaPreview refactored to work with date object for released prop --- src/common/MetaPreview/MetaPreview.js | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/src/common/MetaPreview/MetaPreview.js b/src/common/MetaPreview/MetaPreview.js index 3296cbaf1..680050eb9 100644 --- a/src/common/MetaPreview/MetaPreview.js +++ b/src/common/MetaPreview/MetaPreview.js @@ -9,16 +9,6 @@ const styles = require('./styles'); const MetaPreview = ({ className, compact, id, type, name, logo, background, duration, releaseInfo, released, description, genres, writers, directors, cast, imdbRating, links, inLibrary, toggleInLibrary }) => { const [shareModalOpen, openShareModal, closeShareModal] = useBinaryState(false); - const releaseInfoText = React.useMemo(() => { - const releasedDate = new Date(released); - return typeof releaseInfo === 'string' && releaseInfo.length > 0 ? - releaseInfo - : - !isNaN(releasedDate.getFullYear()) ? - releasedDate.getFullYear() - : - null; - }, [releaseInfo, released]); const genresLinks = React.useMemo(() => { return Array.isArray(genres) ? genres.map((genre) => ({ @@ -90,13 +80,16 @@ const MetaPreview = ({ className, compact, id, type, name, logo, background, dur null } { - (typeof releaseInfoText === 'string' && releaseInfoText.length > 0) || (typeof duration === 'string' && duration.length > 0) ? + (typeof releaseInfo === 'string' && releaseInfo.length > 0) || (released instanceof Date && !isNaN(released.getFullYear())) || (typeof duration === 'string' && duration.length > 0) ?
{ - typeof releaseInfoText === 'string' && releaseInfoText.length > 0 ? -
{releaseInfoText}
+ typeof releaseInfo === 'string' && releaseInfo.length > 0 ? +
{releaseInfo}
: - null + released instanceof Date && !isNaN(released.getFullYear()) ? +
{released.getFullYear()}
+ : + null } { typeof duration === 'string' && duration.length > 0 ? @@ -223,7 +216,7 @@ MetaPreview.propTypes = { background: PropTypes.string, duration: PropTypes.string, releaseInfo: PropTypes.string, - released: PropTypes.string, + released: PropTypes.instanceOf(Date), description: PropTypes.string, genres: PropTypes.arrayOf(PropTypes.string), writers: PropTypes.arrayOf(PropTypes.string),