Revert "fabric: update scroll forwarder for profile headers (#8366)"

This reverts commit 46531f0e8d059bd07614947bdf76452526ece70d.

src/screens/Profile/Sections/Feed.tsx

@@ -9,7 +9,7 @@ import {isIOS, isNative} from '#/platform/detection'
 import {type FeedDescriptor} from '#/state/queries/post-feed'
 import {RQKEY as FEED_RQKEY} from '#/state/queries/post-feed'
 import {truncateAndInvalidate} from '#/state/queries/util'
-import {PostFeed, PostFeedRef} from '#/view/com/posts/PostFeed'
+import {PostFeed} from '#/view/com/posts/PostFeed'
 import {EmptyState} from '#/view/com/util/EmptyState'
 import {type ListRef} from '#/view/com/util/List'
 import {LoadLatestBtn} from '#/view/com/util/load-latest/LoadLatestBtn'
@@ -24,8 +24,6 @@ interface FeedSectionProps {
   scrollElRef: ListRef
   ignoreFilterFor?: string
   setScrollViewTag: (tag: number | null) => void
-  postFeedRef?: React.RefObject<PostFeedRef | undefined>
-  onRefreshEnd?: () => void
 }
 export const ProfileFeedSection = React.forwardRef<
   SectionRef,
@@ -38,8 +36,6 @@ export const ProfileFeedSection = React.forwardRef<
     scrollElRef,
     ignoreFilterFor,
     setScrollViewTag,
-    postFeedRef,
-    onRefreshEnd,
   },
   ref,
 ) {
@@ -95,8 +91,6 @@ export const ProfileFeedSection = React.forwardRef<
           shouldUseAdjustedNumToRender ? adjustedInitialNumToRender : undefined
         }
         isVideoFeed={isVideoFeed}
-        ref={postFeedRef}
-        onRefreshEnd={onRefreshEnd}
       />
       {(isScrolledDown || hasNew) && (
         <LoadLatestBtn

src/view/com/posts/PostFeed.tsx

@@ -1,12 +1,4 @@
-import {
-  memo,
-  useCallback,
-  useEffect,
-  useImperativeHandle,
-  useMemo,
-  useRef,
-  useState,
-} from 'react'
+import {memo, useCallback, useEffect, useMemo, useRef, useState} from 'react'
 import {
   ActivityIndicator,
   AppState,
@@ -163,10 +155,6 @@ export function getItemsForFeedback(feedRow: FeedRow):
   }
 }
 
-export type PostFeedRef = {
-  refreshFeed: () => Promise<void>
-}
-
 // DISABLED need to check if this is causing random feed refreshes -prf
 // const REFRESH_AFTER = STALE.HOURS.ONE
 const CHECK_LATEST_AFTER = STALE.SECONDS.THIRTY
@@ -193,7 +181,6 @@ let PostFeed = ({
   savedFeedConfig,
   initialNumToRender: initialNumToRenderOverride,
   isVideoFeed = false,
-  ref,
 }: {
   feed: FeedDescriptor
   feedParams?: FeedParams
@@ -216,7 +203,6 @@ let PostFeed = ({
   savedFeedConfig?: AppBskyActorDefs.SavedFeed
   initialNumToRender?: number
   isVideoFeed?: boolean
-  ref?: React.ForwardedRef<PostFeedRef>
 }): React.ReactNode => {
   const {_} = useLingui()
   const queryClient = useQueryClient()
@@ -599,31 +585,22 @@ let PostFeed = ({
 
   // events
   // =
-  //
 
-  const refreshFeed = async () => {
+  const onRefresh = React.useCallback(async () => {
     logEvent('feed:refresh', {
       feedType: feedType,
       feedUrl: feed,
       reason: 'pull-to-refresh',
     })
+    setIsPTRing(true)
     try {
       await refetch()
       onHasNew?.(false)
     } catch (err) {
       logger.error('Failed to refresh posts feed', {message: err})
     }
-  }
-
-  const onRefresh = async () => {
-    setIsPTRing(true)
-    await refreshFeed()
     setIsPTRing(false)
-  }
-
-  useImperativeHandle(ref, () => ({
-    refreshFeed,
-  }))
+  }, [refetch, setIsPTRing, onHasNew, feed, feedType])
 
   const onEndReached = useCallback(async () => {
     if (isFetching || !hasNextPage || isError) return

src/view/screens/Profile.tsx

@@ -1,4 +1,4 @@
-import React, {useCallback, useMemo, useRef, useState} from 'react'
+import React, {useCallback, useMemo} from 'react'
 import {StyleSheet} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 import {
@@ -46,8 +46,7 @@ import * as Layout from '#/components/Layout'
 import {ScreenHider} from '#/components/moderation/ScreenHider'
 import {ProfileStarterPacks} from '#/components/StarterPack/ProfileStarterPacks'
 import {navigate} from '#/Navigation'
-import {ScrollForwarderView} from 'modules/react-native-scroll-forwarder/src'
-import {PostFeedRef} from '../com/posts/PostFeed'
+import {ExpoScrollForwarderView} from '../../../modules/expo-scroll-forwarder'
 
 interface SectionRef {
   scrollToTop: () => void
@@ -179,7 +178,6 @@ function ProfileScreenLoaded({
     enabled: !!profile.associated?.labeler,
   })
   const [currentPage, setCurrentPage] = React.useState(0)
-  const [isRefreshing, setIsRefreshing] = useState(false)
   const {_} = useLingui()
 
   const [scrollViewTag, setScrollViewTag] = React.useState<number | null>(null)
@@ -336,14 +334,6 @@ function ProfileScreenLoaded({
     scrollSectionToTop(index)
   }
 
-  const postFeedRef = useRef<PostFeedRef>()
-
-  const onRefresh = async () => {
-    setIsRefreshing(true)
-    await postFeedRef.current?.refreshFeed()
-    setIsRefreshing(false)
-  }
-
   // rendering
   // =
 
@@ -353,10 +343,7 @@ function ProfileScreenLoaded({
     setMinimumHeight: (height: number) => void
   }) => {
     return (
-      <ScrollForwarderView
-        scrollViewTag={scrollViewTag}
-        refreshing={isRefreshing}
-        onRefresh={onRefresh}>
+      <ExpoScrollForwarderView scrollViewTag={scrollViewTag}>
         <ProfileHeader
           profile={profile}
           labeler={labelerInfo}
@@ -366,7 +353,7 @@ function ProfileScreenLoaded({
           isPlaceholderProfile={showPlaceholder}
           setMinimumHeight={setMinimumHeight}
         />
-      </ScrollForwarderView>
+      </ExpoScrollForwarderView>
     )
   }
 
@@ -421,7 +408,6 @@ function ProfileScreenLoaded({
                 scrollElRef={scrollElRef as ListRef}
                 ignoreFilterFor={profile.did}
                 setScrollViewTag={setScrollViewTag}
-                postFeedRef={postFeedRef}
               />
             )
           : null}