Push useAnimatedScrollHandler down everywhere to work around bugs (#1866)

* Move useOnMainScroll handlers to leaves

* Force Feed to always take handlers

* Pass handlers from the pager
This commit is contained in:
dan 2023-11-10 19:00:46 +00:00 committed by GitHub
parent e0e5bc8fd8
commit 65def37165
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 95 additions and 38 deletions

View file

@ -26,7 +26,7 @@ import {EmptyState} from 'view/com/util/EmptyState'
import * as Toast from 'view/com/util/Toast'
import {useSetTitle} from 'lib/hooks/useSetTitle'
import {useCustomFeed} from 'lib/hooks/useCustomFeed'
import {OnScrollCb} from 'lib/hooks/useOnMainScroll'
import {OnScrollHandler} from 'lib/hooks/useOnMainScroll'
import {shareUrl} from 'lib/sharing'
import {toShareUrl} from 'lib/strings/url-helpers'
import {Haptics} from 'lib/haptics'
@ -44,6 +44,7 @@ import {logger} from '#/logger'
import {Trans, msg} from '@lingui/macro'
import {useLingui} from '@lingui/react'
import {useModalControls} from '#/state/modals'
import {useAnimatedScrollHandler} from '#/lib/hooks/useAnimatedScrollHandler_FIXED'
const SECTION_TITLES = ['Posts', 'About']
@ -383,7 +384,7 @@ export const ProfileFeedScreenInner = observer(
interface FeedSectionProps {
feed: PostsFeedModel
onScroll: OnScrollCb
onScroll: OnScrollHandler
headerHeight: number
isScrolledDown: boolean
}
@ -443,10 +444,11 @@ const AboutSection = observer(function AboutPageImpl({
feedInfo: FeedSourceModel | undefined
headerHeight: number
onToggleLiked: () => void
onScroll: OnScrollCb
onScroll: OnScrollHandler
}) {
const pal = usePalette('default')
const {_} = useLingui()
const scrollHandler = useAnimatedScrollHandler(onScroll)
if (!feedInfo) {
return <View />
@ -456,7 +458,7 @@ const AboutSection = observer(function AboutPageImpl({
<ScrollView
scrollEventThrottle={1}
contentContainerStyle={{paddingTop: headerHeight}}
onScroll={onScroll}>
onScroll={scrollHandler}>
<View
style={[
{

View file

@ -33,7 +33,7 @@ import {useStores} from 'state/index'
import {usePalette} from 'lib/hooks/usePalette'
import {useSetTitle} from 'lib/hooks/useSetTitle'
import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries'
import {OnScrollCb} from 'lib/hooks/useOnMainScroll'
import {OnScrollHandler} from 'lib/hooks/useOnMainScroll'
import {NavigationProp} from 'lib/routes/types'
import {toShareUrl} from 'lib/strings/url-helpers'
import {shareUrl} from 'lib/sharing'
@ -554,7 +554,7 @@ const Header = observer(function HeaderImpl({
interface FeedSectionProps {
feed: PostsFeedModel
onScroll: OnScrollCb
onScroll: OnScrollHandler
headerHeight: number
isScrolledDown: boolean
}
@ -608,7 +608,7 @@ interface AboutSectionProps {
isCurateList: boolean | undefined
isOwner: boolean | undefined
onPressAddUser: () => void
onScroll: OnScrollCb
onScroll: OnScrollHandler
headerHeight: number
isScrolledDown: boolean
}

View file

@ -14,6 +14,7 @@ import {
} from 'lib/routes/types'
import {observer} from 'mobx-react-lite'
import {Text} from 'view/com/util/text/Text'
import {useAnimatedScrollHandler} from '#/lib/hooks/useAnimatedScrollHandler_FIXED'
import {useStores} from 'state/index'
import {UserAutocompleteModel} from 'state/models/discovery/user-autocomplete'
import {SearchUIModel} from 'state/models/ui/search'
@ -131,6 +132,7 @@ export const SearchScreen = withAuthRequired(
}
}, [])
const scrollHandler = useAnimatedScrollHandler(onMainScroll)
return (
<TouchableWithoutFeedback onPress={onPress} accessible={false}>
<View style={[pal.view, styles.container]}>
@ -156,8 +158,8 @@ export const SearchScreen = withAuthRequired(
ref={scrollViewRef}
testID="searchScrollView"
style={pal.view}
onScroll={onMainScroll}
scrollEventThrottle={100}>
onScroll={scrollHandler}
scrollEventThrottle={1}>
{query && autocompleteView.suggestions.length ? (
<>
{autocompleteView.suggestions.map((suggestion, index) => (