Refactor minimal shell mode to refcounting (#10319)

src/screens/Profile/KnownFollowers.tsx

@@ -1,8 +1,7 @@
-import {useCallback, useMemo, useState} from 'react'
+import {useMemo, useState} from 'react'
 import {type AppBskyActorDefs} from '@atproto/api'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
-import {useFocusEffect} from '@react-navigation/native'
 
 import {useInitialNumToRender} from '#/lib/hooks/useInitialNumToRender'
 import {
@@ -13,7 +12,6 @@ import {cleanError} from '#/lib/strings/errors'
 import {logger} from '#/logger'
 import {useProfileKnownFollowersQuery} from '#/state/queries/known-followers'
 import {useResolveDidQuery} from '#/state/queries/resolve-uri'
-import {useSetMinimalShellMode} from '#/state/shell'
 import {ProfileCardWithFollowBtn} from '#/view/com/profile/ProfileCard'
 import {List} from '#/view/com/util/List'
 import {ViewHeader} from '#/view/com/util/ViewHeader'
@@ -46,7 +44,6 @@ type Props = NativeStackScreenProps<
 >
 export const ProfileKnownFollowersScreen = ({route}: Props) => {
   const {_} = useLingui()
-  const setMinimalShellMode = useSetMinimalShellMode()
   const initialNumToRender = useInitialNumToRender()
 
   const {name} = route.params
@@ -67,7 +64,7 @@ export const ProfileKnownFollowersScreen = ({route}: Props) => {
     refetch,
   } = useProfileKnownFollowersQuery(resolvedDid)
 
-  const onRefresh = useCallback(async () => {
+  const onRefresh = async () => {
     setIsPTRing(true)
     try {
       await refetch()
@@ -75,16 +72,16 @@ export const ProfileKnownFollowersScreen = ({route}: Props) => {
       logger.error('Failed to refresh followers', {message: err})
     }
     setIsPTRing(false)
-  }, [refetch, setIsPTRing])
+  }
 
-  const onEndReached = useCallback(async () => {
+  const onEndReached = async () => {
     if (isFetchingNextPage || !hasNextPage || !!error) return
     try {
       await fetchNextPage()
     } catch (err) {
       logger.error('Failed to load more followers', {message: err})
     }
-  }, [isFetchingNextPage, hasNextPage, error, fetchNextPage])
+  }
 
   const followers = useMemo(() => {
     if (data?.pages) {
@@ -95,12 +92,6 @@ export const ProfileKnownFollowersScreen = ({route}: Props) => {
 
   const isError = Boolean(resolveError || error)
 
-  useFocusEffect(
-    useCallback(() => {
-      setMinimalShellMode(false)
-    }, [setMinimalShellMode]),
-  )
-
   if (followers.length < 1) {
     return (
       <Layout.Screen>

src/screens/Profile/ProfileFollowers.tsx

@@ -1,6 +1,4 @@
-import {useCallback} from 'react'
 import {Plural} from '@lingui/react/macro'
-import {useFocusEffect} from '@react-navigation/native'
 
 import {
   type CommonNavigatorParams,
@@ -9,26 +7,18 @@ import {
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {useProfileQuery} from '#/state/queries/profile'
 import {useResolveDidQuery} from '#/state/queries/resolve-uri'
-import {useSetMinimalShellMode} from '#/state/shell'
 import {ProfileFollowers as ProfileFollowersComponent} from '#/view/com/profile/ProfileFollowers'
 import * as Layout from '#/components/Layout'
 
 type Props = NativeStackScreenProps<CommonNavigatorParams, 'ProfileFollowers'>
 export const ProfileFollowersScreen = ({route}: Props) => {
   const {name} = route.params
-  const setMinimalShellMode = useSetMinimalShellMode()
 
   const {data: resolvedDid} = useResolveDidQuery(name)
   const {data: profile} = useProfileQuery({
     did: resolvedDid,
   })
 
-  useFocusEffect(
-    useCallback(() => {
-      setMinimalShellMode(false)
-    }, [setMinimalShellMode]),
-  )
-
   return (
     <Layout.Screen testID="profileFollowersScreen">
       <Layout.Header.Outer>

src/screens/Profile/ProfileFollows.tsx

@@ -1,6 +1,4 @@
-import {useCallback} from 'react'
 import {Plural} from '@lingui/react/macro'
-import {useFocusEffect} from '@react-navigation/native'
 
 import {
   type CommonNavigatorParams,
@@ -9,26 +7,18 @@ import {
 import {sanitizeDisplayName} from '#/lib/strings/display-names'
 import {useProfileQuery} from '#/state/queries/profile'
 import {useResolveDidQuery} from '#/state/queries/resolve-uri'
-import {useSetMinimalShellMode} from '#/state/shell'
 import {ProfileFollows as ProfileFollowsComponent} from '#/view/com/profile/ProfileFollows'
 import * as Layout from '#/components/Layout'
 
 type Props = NativeStackScreenProps<CommonNavigatorParams, 'ProfileFollows'>
 export const ProfileFollowsScreen = ({route}: Props) => {
   const {name} = route.params
-  const setMinimalShellMode = useSetMinimalShellMode()
 
   const {data: resolvedDid} = useResolveDidQuery(name)
   const {data: profile} = useProfileQuery({
     did: resolvedDid,
   })
 
-  useFocusEffect(
-    useCallback(() => {
-      setMinimalShellMode(false)
-    }, [setMinimalShellMode]),
-  )
-
   return (
     <Layout.Screen testID="profileFollowsScreen">
       <Layout.Header.Outer>

src/screens/Profile/ProfileLabelerLikedBy.tsx

@@ -1,14 +1,11 @@
-import {useCallback} from 'react'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
-import {useFocusEffect} from '@react-navigation/native'
 
 import {
   type CommonNavigatorParams,
   type NativeStackScreenProps,
 } from '#/lib/routes/types'
 import {makeRecordUri} from '#/lib/strings/url-helpers'
-import {useSetMinimalShellMode} from '#/state/shell'
 import {ViewHeader} from '#/view/com/util/ViewHeader'
 import * as Layout from '#/components/Layout'
 import {LikedByList} from '#/components/LikedByList'
@@ -16,17 +13,10 @@ import {LikedByList} from '#/components/LikedByList'
 export function ProfileLabelerLikedByScreen({
   route,
 }: NativeStackScreenProps<CommonNavigatorParams, 'ProfileLabelerLikedBy'>) {
-  const setMinimalShellMode = useSetMinimalShellMode()
   const {name: handleOrDid} = route.params
   const uri = makeRecordUri(handleOrDid, 'app.bsky.labeler.service', 'self')
   const {_} = useLingui()
 
-  useFocusEffect(
-    useCallback(() => {
-      setMinimalShellMode(false)
-    }, [setMinimalShellMode]),
-  )
-
   return (
     <Layout.Screen>
       <ViewHeader title={_(msg`Liked By`)} />