zio/bsky-app
2
0
Fork 0
Code Pull requests Releases Packages Activity

More prefs cleanup (#1882)

Browse source 
* Update useHomeTabs

* Use queryClient to fetch

* Replace useHomeTabs and useDesktopRightNavItems

* Fix type error

* Some cleanup
This commit is contained in:
Eric Bailey 2023-11-13 12:21:53 -06:00 • committed by GitHub
parent 37a2204483
commit c3edde8ac6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 177 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/view/shell/desktop/Feeds.tsx
View file

@ -2,16 +2,14 @@ import React from 'react'
import {View, StyleSheet} from 'react-native'
import {useNavigationState} from '@react-navigation/native'
import {observer} from 'mobx-react-lite'
import {useStores} from 'state/index'
import {usePalette} from 'lib/hooks/usePalette'
import {useDesktopRightNavItems} from 'lib/hooks/useDesktopRightNavItems'
import {TextLink} from 'view/com/util/Link'
import {getCurrentRoute} from 'lib/routes/helpers'
import {usePinnedFeedsInfos} from '#/state/queries/feed'
export const DesktopFeeds = observer(function DesktopFeeds() {
const store = useStores()
const pal = usePalette('default')
const items = useDesktopRightNavItems(store.preferences.pinnedFeeds)
const feeds = usePinnedFeedsInfos()
const route = useNavigationState(state => {
if (!state) {
@ -23,29 +21,29 @@ export const DesktopFeeds = observer(function DesktopFeeds() {
return (
<View style={[styles.container, pal.view, pal.border]}>
<FeedItem href="/" title="Following" current={route.name === 'Home'} />
{items.map(item => {
try {
const params = route.params as Record<string, string>
const routeName =
item.collection === 'app.bsky.feed.generator'
? 'ProfileFeed'
: 'ProfileList'
return (
<FeedItem
key={item.uri}
href={item.href}
title={item.displayName}
current={
route.name === routeName &&
params.name === item.hostname &&
params.rkey === item.rkey
}
/>
)
} catch {
return null
}
})}
{feeds
.filter(f => f.displayName !== 'Following')
.map(feed => {
try {
const params = route.params as Record<string, string>
const routeName =
feed.type === 'feed' ? 'ProfileFeed' : 'ProfileList'
return (
<FeedItem
key={feed.uri}
href={feed.route.href}
title={feed.displayName}
current={
route.name === routeName &&
params.name === feed.route.params.name &&
params.rkey === feed.route.params.rkey
}
/>
)
} catch {
return null
}
})}
<View style={{paddingTop: 8, paddingBottom: 6}}>
<TextLink
type="lg"