fix: support scroll to top on profile screen (#725)

* Support scroll to top on profile screen

* Refactor types

* Remove async

* Improve types
This commit is contained in:
Kadi Kraman 2023-06-01 18:00:00 +02:00 committed by GitHub
parent 792d7e1a55
commit d4e7355cca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 126 additions and 98 deletions

View file

@ -13,18 +13,13 @@ const HEADER_ITEM = {_reactKey: '__header__'}
const SELECTOR_ITEM = {_reactKey: '__selector__'} const SELECTOR_ITEM = {_reactKey: '__selector__'}
const STICKY_HEADER_INDICES = [1] const STICKY_HEADER_INDICES = [1]
export function ViewSelector({ export type ViewSelectorHandle = {
sections, scrollToTop: () => void
items, }
refreshing,
renderHeader, export const ViewSelector = React.forwardRef<
renderItem, ViewSelectorHandle,
ListFooterComponent, {
onSelectView,
onScroll,
onRefresh,
onEndReached,
}: {
sections: string[] sections: string[]
items: any[] items: any[]
refreshing?: boolean refreshing?: boolean
@ -40,9 +35,26 @@ export function ViewSelector({
onScroll?: OnScrollCb onScroll?: OnScrollCb
onRefresh?: () => void onRefresh?: () => void
onEndReached?: (info: {distanceFromEnd: number}) => void onEndReached?: (info: {distanceFromEnd: number}) => void
}) { }
>(
(
{
sections,
items,
refreshing,
renderHeader,
renderItem,
ListFooterComponent,
onSelectView,
onScroll,
onRefresh,
onEndReached,
},
ref,
) => {
const pal = usePalette('default') const pal = usePalette('default')
const [selectedIndex, setSelectedIndex] = useState<number>(0) const [selectedIndex, setSelectedIndex] = useState<number>(0)
const flatListRef = React.useRef<FlatList>(null)
// events // events
// = // =
@ -57,6 +69,12 @@ export function ViewSelector({
onSelectView?.(selectedIndex) onSelectView?.(selectedIndex)
}, [selectedIndex, onSelectView]) }, [selectedIndex, onSelectView])
React.useImperativeHandle(ref, () => ({
scrollToTop: () => {
flatListRef.current?.scrollToOffset({offset: 0})
},
}))
// rendering // rendering
// = // =
@ -88,6 +106,7 @@ export function ViewSelector({
) )
return ( return (
<FlatList <FlatList
ref={flatListRef}
data={data} data={data}
keyExtractor={keyExtractor} keyExtractor={keyExtractor}
renderItem={renderItemInternal} renderItem={renderItemInternal}
@ -109,7 +128,8 @@ export function ViewSelector({
scrollIndicatorInsets={{right: 1}} // fixes a bug where the scroll indicator is on the middle of the screen https://github.com/bluesky-social/social-app/pull/464 scrollIndicatorInsets={{right: 1}} // fixes a bug where the scroll indicator is on the middle of the screen https://github.com/bluesky-social/social-app/pull/464
/> />
) )
} },
)
export function Selector({ export function Selector({
selectedIndex, selectedIndex,

View file

@ -4,7 +4,7 @@ import {observer} from 'mobx-react-lite'
import {useFocusEffect} from '@react-navigation/native' import {useFocusEffect} from '@react-navigation/native'
import {NativeStackScreenProps, CommonNavigatorParams} from 'lib/routes/types' import {NativeStackScreenProps, CommonNavigatorParams} from 'lib/routes/types'
import {withAuthRequired} from 'view/com/auth/withAuthRequired' import {withAuthRequired} from 'view/com/auth/withAuthRequired'
import {ViewSelector} from '../com/util/ViewSelector' import {ViewSelector, ViewSelectorHandle} from '../com/util/ViewSelector'
import {CenteredView} from '../com/util/Views' import {CenteredView} from '../com/util/Views'
import {ScreenHider} from 'view/com/util/moderation/ScreenHider' import {ScreenHider} from 'view/com/util/moderation/ScreenHider'
import {ProfileUiModel, Sections} from 'state/models/ui/profile' import {ProfileUiModel, Sections} from 'state/models/ui/profile'
@ -35,6 +35,7 @@ export const ProfileScreen = withAuthRequired(
observer(({route}: Props) => { observer(({route}: Props) => {
const store = useStores() const store = useStores()
const {screen, track} = useAnalytics() const {screen, track} = useAnalytics()
const viewSelectorRef = React.useRef<ViewSelectorHandle>(null)
useEffect(() => { useEffect(() => {
screen('Profile') screen('Profile')
@ -47,12 +48,17 @@ export const ProfileScreen = withAuthRequired(
) )
useSetTitle(combinedDisplayName(uiState.profile)) useSetTitle(combinedDisplayName(uiState.profile))
const onSoftReset = React.useCallback(() => {
viewSelectorRef.current?.scrollToTop()
}, [])
useEffect(() => { useEffect(() => {
setHasSetup(false) setHasSetup(false)
}, [route.params.name]) }, [route.params.name])
useFocusEffect( useFocusEffect(
React.useCallback(() => { React.useCallback(() => {
const softResetSub = store.onScreenSoftReset(onSoftReset)
let aborted = false let aborted = false
store.shell.setMinimalShellMode(false) store.shell.setMinimalShellMode(false)
const feedCleanup = uiState.feed.registerListeners() const feedCleanup = uiState.feed.registerListeners()
@ -69,8 +75,9 @@ export const ProfileScreen = withAuthRequired(
return () => { return () => {
aborted = true aborted = true
feedCleanup() feedCleanup()
softResetSub.remove()
} }
}, [hasSetup, uiState, store]), }, [store, onSoftReset, uiState, hasSetup]),
) )
// events // events
@ -247,6 +254,7 @@ export const ProfileScreen = withAuthRequired(
/> />
) : uiState.profile.hasLoaded ? ( ) : uiState.profile.hasLoaded ? (
<ViewSelector <ViewSelector
ref={viewSelectorRef}
swipeEnabled={false} swipeEnabled={false}
sections={uiState.selectorItems} sections={uiState.selectorItems}
items={uiState.uiItems} items={uiState.uiItems}