3b47edc3b9
* ❌ Remove old method of displaying active livestreams Completely remove it for now to make the commit deltas clearer. We'll replace it with the new method at the end. * Fetch and store active-livestream info in redux * Tiles can now query active-livestream state from redux instead of getting from parent. * ⏪ ClaimTilesDiscover: revert and cleanup ## Simplify - Simplify to just `uris` instead of having multiple arrays (`uris`, `modifiedUris`, `prevUris`) - The `prevUris` is for CLS prevention. With this removal, the CLS issue is back, but we'll handle it differently later. - Temporarily disable the view-count fetching. Code is left there so that I don't forget. ## Fix - `shouldPerformSearch` was never true when `prefixUris` is present. Corrected the logic. - Aside: prefix and pin is so similar in function. Hm .... * ClaimTilesDiscover: factor out options ## Change Move the `option` code outside and passed in as a pre-calculated prop. ## Reason To skip rendering while waiting for `claim_search`, we need to add `React.memo(areEqual)`. However, the flag that determines if we are fetching `claim_search` (fetchingClaimSearchByQuery[]) depends on the derived options as the key. Instead of calculating `options` twice, we moved it to the props so both sides can use it. It also makes the component a bit more readable. The downside is that the prop-passing might not be clear. * ClaimTilesDiscover: reduce ~17 renders at startup to just 2. * ClaimTilesDiscover: fill with placeholder while waiting for claim_search ## Issue Livestream claims are fetched seperately, so they might already exists. While claim_search is running, the list only consists of livestreams (collapsed). ## Fix Fill up the space with placeholders to prevent layout shift. * Add 'useFetchViewCount' to handle fetching from lists This effect also stashes fetched uris, so that we won't re-fetch the same uris during the same instance (e.g. during infinite scroll). * ⏪ ClaimListDiscover: revert and cleanup ## Revert - Removed the 'finalUris' stuff that was meant to "pause" visual changes when fetching. I think it'll be cleaner to use React.memo to achieve that. ## Alterations - Added `renderUri` to make it clear which array that this component will render. - Re-do the way we fetch view counts now that 'finalUris' is gone. Not the best method, but at least correct for now. * ClaimListDiscover: add prefixUris, similar to ClaimTilesDiscover This will be initially used to append livestreams at the top. * ✅ Re-enable active livestream tiles using the new method * doFetchActiveLivestreams: add interval check - Added a default minimum of 5 minutes between fetches. Clients can bypass this through `forceFetch` if needed. * doFetchActiveLivestreams: add option check We'll need to support different 'orderBy', so adding an "options check" when determining if we just made the same fetch. * WildWest: limit livestream tiles + add ability to show more Most likely this behavior will change in the future, so we'll leave `ClaimListDiscover` untouched and handle the logic at the page level. This solution uses 2 `ClaimListDiscover` -- if the reduced livestream list is visible, it handles the header; else the normal list handles the header. * Use better tile-count on larger screens. Used the same method as how the homepage does it.
141 lines
4.3 KiB
JavaScript
141 lines
4.3 KiB
JavaScript
// @flow
|
|
import * as ICONS from 'constants/icons';
|
|
import * as PAGES from 'constants/pages';
|
|
import { SITE_NAME, SIMPLE_SITE, ENABLE_NO_SOURCE_CLAIMS } from 'config';
|
|
import React from 'react';
|
|
import Page from 'component/page';
|
|
import Button from 'component/button';
|
|
import ClaimTilesDiscover from 'component/claimTilesDiscover';
|
|
import ClaimPreviewTile from 'component/claimPreviewTile';
|
|
import Icon from 'component/common/icon';
|
|
import WaitUntilOnPage from 'component/common/wait-until-on-page';
|
|
import { GetLinksData } from 'util/buildHomepage';
|
|
import { getLivestreamUris } from 'util/livestream';
|
|
|
|
// @if TARGET='web'
|
|
import Pixel from 'web/component/pixel';
|
|
import Meme from 'web/component/meme';
|
|
// @endif
|
|
|
|
type Props = {
|
|
authenticated: boolean,
|
|
followedTags: Array<Tag>,
|
|
subscribedChannels: Array<Subscription>,
|
|
showNsfw: boolean,
|
|
homepageData: any,
|
|
activeLivestreams: any,
|
|
doFetchActiveLivestreams: () => void,
|
|
};
|
|
|
|
function HomePage(props: Props) {
|
|
const {
|
|
followedTags,
|
|
subscribedChannels,
|
|
authenticated,
|
|
showNsfw,
|
|
homepageData,
|
|
activeLivestreams,
|
|
doFetchActiveLivestreams,
|
|
} = props;
|
|
const showPersonalizedChannels = (authenticated || !IS_WEB) && subscribedChannels && subscribedChannels.length > 0;
|
|
const showPersonalizedTags = (authenticated || !IS_WEB) && followedTags && followedTags.length > 0;
|
|
const showIndividualTags = showPersonalizedTags && followedTags.length < 5;
|
|
|
|
const rowData: Array<RowDataItem> = GetLinksData(
|
|
homepageData,
|
|
true,
|
|
authenticated,
|
|
showPersonalizedChannels,
|
|
showPersonalizedTags,
|
|
subscribedChannels,
|
|
followedTags,
|
|
showIndividualTags,
|
|
showNsfw
|
|
);
|
|
|
|
function getRowElements(title, route, link, icon, help, options, index, pinUrls) {
|
|
const tilePlaceholder = (
|
|
<ul className="claim-grid">
|
|
{new Array(options.pageSize || 8).fill(1).map((x, i) => (
|
|
<ClaimPreviewTile showNoSourceClaims={ENABLE_NO_SOURCE_CLAIMS} key={i} placeholder />
|
|
))}
|
|
</ul>
|
|
);
|
|
|
|
const claimTiles = (
|
|
<ClaimTilesDiscover
|
|
{...options}
|
|
showNoSourceClaims={ENABLE_NO_SOURCE_CLAIMS}
|
|
hasSource
|
|
prefixUris={getLivestreamUris(activeLivestreams, options.channelIds)}
|
|
pinUrls={pinUrls}
|
|
/>
|
|
);
|
|
|
|
return (
|
|
<div key={title} className="claim-grid__wrapper">
|
|
{index !== 0 && title && typeof title === 'string' && (
|
|
<h1 className="claim-grid__header">
|
|
<Button navigate={route || link} button="link">
|
|
{icon && <Icon className="claim-grid__header-icon" sectionIcon icon={icon} size={20} />}
|
|
<span className="claim-grid__title">{__(title)}</span>
|
|
{help}
|
|
</Button>
|
|
</h1>
|
|
)}
|
|
|
|
{index === 0 && <>{claimTiles}</>}
|
|
{index !== 0 && (
|
|
<WaitUntilOnPage name={title} placeholder={tilePlaceholder} yOffset={800}>
|
|
{claimTiles}
|
|
</WaitUntilOnPage>
|
|
)}
|
|
|
|
{(route || link) && (
|
|
<Button
|
|
className="claim-grid__title--secondary"
|
|
button="link"
|
|
navigate={route || link}
|
|
iconRight={ICONS.ARROW_RIGHT}
|
|
label={__('View More')}
|
|
/>
|
|
)}
|
|
</div>
|
|
);
|
|
}
|
|
|
|
React.useEffect(() => {
|
|
doFetchActiveLivestreams();
|
|
}, []);
|
|
|
|
return (
|
|
<Page fullWidthPage>
|
|
{!SIMPLE_SITE && (authenticated || !IS_WEB) && !subscribedChannels.length && (
|
|
<div className="notice-message">
|
|
<h1 className="section__title">
|
|
{__("%SITE_NAME% is more fun if you're following channels", { SITE_NAME })}
|
|
</h1>
|
|
<p className="section__actions">
|
|
<Button
|
|
button="primary"
|
|
navigate={`/$/${PAGES.CHANNELS_FOLLOWING_DISCOVER}`}
|
|
label={__('Find new channels to follow')}
|
|
/>
|
|
</p>
|
|
</div>
|
|
)}
|
|
{/* @if TARGET='web' */}
|
|
{SIMPLE_SITE && <Meme />}
|
|
{/* @endif */}
|
|
{rowData.map(({ title, route, link, icon, help, pinnedUrls: pinUrls, options = {} }, index) => {
|
|
// add pins here
|
|
return getRowElements(title, route, link, icon, help, options, index, pinUrls);
|
|
})}
|
|
{/* @if TARGET='web' */}
|
|
<Pixel type={'retargeting'} />
|
|
{/* @endif */}
|
|
</Page>
|
|
);
|
|
}
|
|
|
|
export default HomePage;
|