From 27616cb5f573e99bb67e45ae4b9283c673aa20b1 Mon Sep 17 00:00:00 2001 From: Christiaan Scheermeijer Date: Thu, 24 Jun 2021 22:15:25 +0200 Subject: [PATCH] chore(project): apply feedback --- src/components/TileDock/TileDock.tsx | 2 +- src/screens/Movie/Movie.tsx | 7 ++++++- src/screens/Series/Series.tsx | 7 ++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/components/TileDock/TileDock.tsx b/src/components/TileDock/TileDock.tsx index 04d22c26d..7c586a721 100644 --- a/src/components/TileDock/TileDock.tsx +++ b/src/components/TileDock/TileDock.tsx @@ -86,7 +86,7 @@ const TileDock = ({ return sliceItems(items, isMultiPage, index, tilesToShow, cycleMode); }, [items, isMultiPage, index, tilesToShow, cycleMode]); - const transitionBasis: string = isMultiPage ? `transform ${animated ? transitionTime : '0s'} ease` : ''; + const transitionBasis: string = isMultiPage && animated ? `transform ${transitionTime} ease` : ''; const needControls: boolean = showControls && isMultiPage; const showLeftControl: boolean = needControls && !(cycleMode === 'stop' && index === 0); diff --git a/src/screens/Movie/Movie.tsx b/src/screens/Movie/Movie.tsx index 3e4a9aaaf..f0a8f4eef 100644 --- a/src/screens/Movie/Movie.tsx +++ b/src/screens/Movie/Movie.tsx @@ -18,6 +18,7 @@ import { copyToClipboard } from '../../utils/dom'; import LoadingOverlay from '../../components/LoadingOverlay/LoadingOverlay'; import useRecommendedPlaylist from '../../hooks/useRecommendationsPlaylist'; import { watchHistoryStore } from '../../stores/WatchHistoryStore'; +import { VideoProgressMinMax } from '../../config'; import styles from './Movie.module.scss'; @@ -48,7 +49,11 @@ const Movie = ({ const enableSharing: boolean = config.options.enableSharing === true; const watchHistory = watchHistoryStore.useState((s) => s.watchHistory); - const watchHistoryItem = item && watchHistory.find(({ mediaid }) => mediaid === item.mediaid); + const watchHistoryItem = + item && + watchHistory.find(({ mediaid, progress }) => { + return mediaid === item.mediaid && progress > VideoProgressMinMax.Min && progress < VideoProgressMinMax.Max; + }); useBlurImageUpdater(item); diff --git a/src/screens/Series/Series.tsx b/src/screens/Series/Series.tsx index 98a8adef1..ae66a0885 100644 --- a/src/screens/Series/Series.tsx +++ b/src/screens/Series/Series.tsx @@ -20,6 +20,7 @@ import { copyToClipboard } from '../../utils/dom'; import { filterSeries, getFiltersFromSeries } from '../../utils/collection'; import LoadingOverlay from '../../components/LoadingOverlay/LoadingOverlay'; import { useWatchHistory, watchHistoryStore } from '../../stores/WatchHistoryStore'; +import { VideoProgressMinMax } from '../../config'; import styles from './Series.module.scss'; @@ -62,7 +63,11 @@ const Series = ({ const { getDictionary: getWatchHistoryDictionary } = useWatchHistory(); const watchHistoryDictionary = getWatchHistoryDictionary(); const watchHistory = watchHistoryStore.useState((s) => s.watchHistory); - const watchHistoryItem = item && watchHistory.find(({ mediaid }) => mediaid === item.mediaid); + const watchHistoryItem = + item && + watchHistory.find(({ mediaid, progress }) => { + return mediaid === item.mediaid && progress > VideoProgressMinMax.Min && progress < VideoProgressMinMax.Max; + }); useBlurImageUpdater(item);