Skip to content

Commit

Permalink
chore(project): apply feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
ChristiaanScheermeijer committed Jun 24, 2021
1 parent 81a4d58 commit 27616cb
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/components/TileDock/TileDock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ const TileDock = <T extends unknown>({
return sliceItems<T>(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);
Expand Down
7 changes: 6 additions & 1 deletion src/screens/Movie/Movie.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -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);

Expand Down
7 changes: 6 additions & 1 deletion src/screens/Series/Series.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 27616cb

Please sign in to comment.