Skip to content

Fix content visibility logic in search/explore pages #14079

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dylanjeffers wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −22
Open

Fix content visibility logic in search/explore pages #14079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions packages/mobile/src/screens/explore-screen/components/ExploreContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ export const ExploreContent = () => {
useCurrentUserId()

const showUserContextualContent = isCurrentUserIdLoading || !!currentUserId
const showTrackContent = category === 'tracks' || category === 'all'
const showPlaylistContent = category === 'playlists' || category === 'all'
const showUserContent = category === 'users' || category === 'all'
const isAllTab = category === 'all'
const showTrackContent = category === 'tracks'
const showPlaylistContent = category === 'playlists'
const showUserContent = category === 'users'

return (
<Flex gap='2xl' pt='s' pb={150} ph='l'>
Expand All @@ -37,7 +38,7 @@ export const ExploreContent = () => {
{showUserContent && <ArtistSpotlight />}
{showUserContent && <LabelSpotlight />}
{showTrackContent && showUserContextualContent && <FeelingLucky />}
{showUserContextualContent && <RecentSearches />}
{!isAllTab && showUserContextualContent && <RecentSearches />}
</Flex>
)
}
18 changes: 8 additions & 10 deletions packages/web/src/pages/search-explore-page/components/desktop/SearchExplorePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,12 +195,10 @@ const SearchExplorePage = ({
}, [])

const showUserContextualContent = isCurrentUserIdLoading || !!currentUserId
const showTrackContent =
categoryKey === CategoryView.TRACKS || categoryKey === CategoryView.ALL
const showPlaylistContent =
categoryKey === CategoryView.PLAYLISTS || categoryKey === CategoryView.ALL
const showUserContent =
categoryKey === CategoryView.PROFILES || categoryKey === CategoryView.ALL
const isAllTab = categoryKey === CategoryView.ALL
const showTrackContent = categoryKey === CategoryView.TRACKS
const showPlaylistContent = categoryKey === CategoryView.PLAYLISTS
const showUserContent = categoryKey === CategoryView.PROFILES
const isTracksTab = categoryKey === CategoryView.TRACKS
const isPlaylistsTab = categoryKey === CategoryView.PLAYLISTS
const isAlbumsTab = categoryKey === CategoryView.ALBUMS
Expand Down Expand Up @@ -328,9 +326,7 @@ const SearchExplorePage = ({
<RecentlyPlayedSection />
) : null}
{showPlaylistContent ? <FeaturedPlaylistsSection /> : null}
{categoryKey === CategoryView.ALL ? (
<FanClubsExploreSection />
) : null}
{showUserContent ? <FanClubsExploreSection /> : null}
{showTrackContent ? <FeaturedRemixContestsSection /> : null}
{isTracksTab ? <UndergroundTrendingTracksSection /> : null}
{showUserContent ? <ArtistSpotlightSection /> : null}
Expand All @@ -339,7 +335,9 @@ const SearchExplorePage = ({
{showTrackContent && showUserContextualContent ? (
<FeelingLuckySection />
) : null}
{showUserContextualContent ? <RecentSearchesSection /> : null}
{!isAllTab && showUserContextualContent ? (
<RecentSearchesSection />
) : null}
</Flex>
</Flex>
</Flex>
Expand Down
16 changes: 8 additions & 8 deletions packages/web/src/pages/search-explore-page/components/mobile/SearchExplorePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,12 +173,10 @@ const SearchExplorePage = ({
}, [setCenter, setRight])

const showUserContextualContent = isCurrentUserIdLoading || !!currentUserId
const showTrackContent =
categoryKey === CategoryView.TRACKS || categoryKey === CategoryView.ALL
const showPlaylistContent =
categoryKey === CategoryView.PLAYLISTS || categoryKey === CategoryView.ALL
const showUserContent =
categoryKey === CategoryView.PROFILES || categoryKey === CategoryView.ALL
const isAllTab = categoryKey === CategoryView.ALL
const showTrackContent = categoryKey === CategoryView.TRACKS
const showPlaylistContent = categoryKey === CategoryView.PLAYLISTS
const showUserContent = categoryKey === CategoryView.PROFILES
const isTracksTab = categoryKey === CategoryView.TRACKS
const isPlaylistsTab = categoryKey === CategoryView.PLAYLISTS
const isAlbumsTab = categoryKey === CategoryView.ALBUMS
Expand Down Expand Up @@ -254,7 +252,7 @@ const SearchExplorePage = ({
<RecentlyPlayedSection />
) : null}
{showPlaylistContent ? <FeaturedPlaylistsSection /> : null}
{categoryKey === CategoryView.ALL ? <FanClubsExploreSection /> : null}
{showUserContent ? <FanClubsExploreSection /> : null}
{showTrackContent ? <FeaturedRemixContestsSection /> : null}
{isTracksTab ? <UndergroundTrendingTracksSection /> : null}
{showUserContent ? <ArtistSpotlightSection /> : null}
Expand All @@ -263,7 +261,9 @@ const SearchExplorePage = ({
{showTrackContent && showUserContextualContent ? (
<FeelingLuckySection />
) : null}
{showUserContextualContent ? <RecentSearchesSection /> : null}
{!isAllTab && showUserContextualContent ? (
<RecentSearchesSection />
) : null}
</Flex>
</Flex>
</MobilePageContainer>
Expand Down