Fixes to the feed discovery page (#1238)
* Bump yarn.lock for... reasons * Restyle DiscoverFeeds empty state (close #1236) * Fix: maintain search state in feed discovery (close #1204) * tsconfig fixes * Tweaks to yarn.lockzio/stable
parent
7410bcd888
commit
a5981e127f
|
@ -28,7 +28,7 @@ export const DiscoverFeedsScreen = withAuthRequired(
|
|||
const [isInputFocused, setIsInputFocused] = React.useState<boolean>(false)
|
||||
const [query, setQuery] = React.useState<string>('')
|
||||
const debouncedSearchFeeds = React.useMemo(
|
||||
() => debounce(query => feeds.search(query), 500), // debounce for 500ms
|
||||
() => debounce(q => feeds.search(q), 500), // debounce for 500ms
|
||||
[feeds],
|
||||
)
|
||||
const onChangeQuery = React.useCallback(
|
||||
|
@ -59,7 +59,9 @@ export const DiscoverFeedsScreen = withAuthRequired(
|
|||
useFocusEffect(
|
||||
React.useCallback(() => {
|
||||
store.shell.setMinimalShellMode(false)
|
||||
if (!feeds.hasLoaded) {
|
||||
feeds.refresh()
|
||||
}
|
||||
}, [store, feeds]),
|
||||
)
|
||||
|
||||
|
@ -67,23 +69,21 @@ export const DiscoverFeedsScreen = withAuthRequired(
|
|||
feeds.refresh()
|
||||
}, [feeds])
|
||||
|
||||
const renderListEmptyComponent = React.useCallback(() => {
|
||||
const renderListEmptyComponent = () => {
|
||||
return (
|
||||
<View
|
||||
style={[
|
||||
pal.border,
|
||||
!isDesktopWeb && s.flex1,
|
||||
pal.viewLight,
|
||||
styles.empty,
|
||||
]}>
|
||||
<Text type="lg" style={[pal.text]}>
|
||||
<View style={styles.empty}>
|
||||
<Text type="lg" style={pal.textLight}>
|
||||
{feeds.isLoading
|
||||
? isDesktopWeb
|
||||
? 'Loading...'
|
||||
: ''
|
||||
: query
|
||||
? `No results found for "${query}"`
|
||||
: `We can't find any feeds for some reason. This is probably an error - try refreshing!`}
|
||||
</Text>
|
||||
</View>
|
||||
)
|
||||
}, [pal, feeds.isLoading])
|
||||
}
|
||||
|
||||
const renderItem = React.useCallback(
|
||||
({item}: {item: CustomFeedModel}) => (
|
||||
|
@ -102,6 +102,7 @@ export const DiscoverFeedsScreen = withAuthRequired(
|
|||
<CenteredView style={[styles.container, pal.view]}>
|
||||
<View style={[isDesktopWeb && styles.containerDesktop, pal.border]}>
|
||||
<ViewHeader title="Discover Feeds" showOnDesktop />
|
||||
<View style={{marginTop: isDesktopWeb ? 5 : 0, marginBottom: 4}}>
|
||||
<HeaderWithInput
|
||||
isInputFocused={isInputFocused}
|
||||
query={query}
|
||||
|
@ -113,6 +114,7 @@ export const DiscoverFeedsScreen = withAuthRequired(
|
|||
showMenu={false}
|
||||
/>
|
||||
</View>
|
||||
</View>
|
||||
<FlatList
|
||||
style={[!isDesktopWeb && s.flex1]}
|
||||
data={feeds.feeds}
|
||||
|
@ -149,10 +151,7 @@ const styles = StyleSheet.create({
|
|||
borderRightWidth: 1,
|
||||
},
|
||||
empty: {
|
||||
paddingHorizontal: 18,
|
||||
paddingVertical: 16,
|
||||
borderRadius: 8,
|
||||
marginHorizontal: 18,
|
||||
marginTop: 10,
|
||||
paddingHorizontal: 16,
|
||||
paddingTop: 10,
|
||||
},
|
||||
})
|
||||
|
|
|
@ -2,11 +2,12 @@
|
|||
"extends": "@tsconfig/react-native/tsconfig.json",
|
||||
"compilerOptions": {
|
||||
"jsx": "react-jsx",
|
||||
"types": ["node"],
|
||||
"paths": {
|
||||
"lib/*": ["./src/lib/*"],
|
||||
"platform/*": ["./src/platform/*"],
|
||||
"state/*": ["./src/state/*"],
|
||||
"view/*": ["./src/view/*"],
|
||||
"view/*": ["./src/view/*"]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue