Creepso/stremio-web
1
0
Fork 0
mirror of https://github.com/Stremio/stremio-web.git synced 2026-04-21 11:42:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'development' of github.com:Stremio/stremio-web into development

Browse source
This commit is contained in:
nklhrstv 2022-02-15 13:48:08 +02:00
commit 1bb9fb29f7
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/routes/Discover/Discover.js
View file

@ -67,6 +67,12 @@ const Discover = ({ urlParams, queryParams }) => {
closeAddonModal(); closeAddonModal();
setSelectedMetaItemIndex(0); setSelectedMetaItemIndex(0);
}, [discover.selected]); }, [discover.selected]);
const metaItemsContainerRef = React.useRef();
React.useEffect(() => {
if (discover.catalog?.content.type === 'Loading') {
metaItemsContainerRef.current.scrollTo(0, 0);
}
}, [discover.catalog]);
return ( return (
<MainNavBars className={styles['discover-container']} route={'discover'}> <MainNavBars className={styles['discover-container']} route={'discover'}>
<div className={styles['discover-content']}> <div className={styles['discover-content']}>
@ -124,7 +130,7 @@ const Discover = ({ urlParams, queryParams }) => {
</div> </div>
: :
discover.catalog.content.type === 'Loading' ? discover.catalog.content.type === 'Loading' ?
<div className={styles['meta-items-container']}> <div ref={metaItemsContainerRef} className={styles['meta-items-container']}>
{Array(CONSTANTS.CATALOG_PAGE_SIZE).fill(null).map((_, index) => ( {Array(CONSTANTS.CATALOG_PAGE_SIZE).fill(null).map((_, index) => (
<div key={index} className={styles['meta-item-placeholder']}> <div key={index} className={styles['meta-item-placeholder']}>
<div className={styles['poster-container']} /> <div className={styles['poster-container']} />
@ -135,7 +141,7 @@ const Discover = ({ urlParams, queryParams }) => {
))} ))}
</div> </div>
: :
<div className={styles['meta-items-container']} onFocusCapture={metaItemsOnFocusCapture}> <div ref={metaItemsContainerRef} className={styles['meta-items-container']} onFocusCapture={metaItemsOnFocusCapture}>
{discover.catalog.content.content.map((metaItem, index) => ( {discover.catalog.content.content.map((metaItem, index) => (
<MetaItem <MetaItem
key={index} key={index}

6
src/routes/MetaDetails/StreamsList/Stream/Stream.js
View file

@ -25,7 +25,7 @@ const Stream = ({ className, addonName, name, description, thumbnail, progress,
<Button href={href} {...props} className={classnames(className, styles['stream-container'])} title={addonName}> <Button href={href} {...props} className={classnames(className, styles['stream-container'])} title={addonName}>
{ {
typeof thumbnail === 'string' && thumbnail.length > 0 ? typeof thumbnail === 'string' && thumbnail.length > 0 ?
<div className={styles['thumbnail-container']} title={name}> <div className={styles['thumbnail-container']} title={name || addonName}>
<Image <Image
className={styles['thumbnail']} className={styles['thumbnail']}
src={thumbnail} src={thumbnail}
@ -34,8 +34,8 @@ const Stream = ({ className, addonName, name, description, thumbnail, progress,
/> />
</div> </div>
: :
<div className={styles['addon-name-container']} title={name}> <div className={styles['addon-name-container']} title={name || addonName}>
<div className={styles['addon-name']}>{name}</div> <div className={styles['addon-name']}>{name || addonName}</div>
</div> </div>
} }
<div className={styles['info-container']} title={description}>{description}</div> <div className={styles['info-container']} title={description}>{description}</div>