@planningcenter/chat-react-native 3.44.0-rc.0 → 3.44.0

package/src/components/primitive/form_sheet.tsx

@@ -12,7 +12,7 @@ import {
 } from 'react-native'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 import { useTheme } from '../../hooks'
-import { MAX_FONT_SIZE_MULTIPLIER_LANDMARK } from '../../utils'
+import { isLiquidGlassEnabled, MAX_FONT_SIZE_MULTIPLIER_LANDMARK } from '../../utils'
 import type { ButtonProps, TextButtonProps } from '../display'
 import { Button, Heading, Icon, IconString, Text, TextButton } from '../display'
 
@@ -22,24 +22,28 @@ import { Button, Heading, Icon, IconString, Text, TextButton } from '../display'
 
 /**
  * Screen options for the formsheet's NativeStackNavigation route
+ *
+ * Returns a factory rather than an object because callers assign it at module
+ * scope, which runs before ChatProvider reports the host's liquid glass
+ * capability. React Navigation calls the factory per render, so the sheet
+ * corner radius is resolved once that capability is known.
+ *
  * @param {string} options.headerTitle - Doesn't show in UI but good to have for semantic reasons.
  * @param {number[]} [options.sheetAllowedDetents] - Controls the height increments the sheet grows to. To prevent bugs in Android, do not specify more then two values and use [0.94] instead of [1] to go full screen.
  * @param {NativeStackNavigationOptions} [options.rest] - Adds or overrides any valid NativeStackNavigationOptions
- * @returns {NativeStackNavigationOptions} Merged NativeStackNavigationOptions
+ * @returns {() => NativeStackNavigationOptions} Factory producing merged NativeStackNavigationOptions
  */
-export const getFormSheetScreenOptions = ({
-  headerTitle,
-  sheetAllowedDetents = [0.25],
-  ...rest
-}: NativeStackNavigationOptions = {}): NativeStackNavigationOptions => ({
-  presentation: 'formSheet',
-  headerShown: false,
-  sheetAllowedDetents,
-  sheetCornerRadius: 16,
-  sheetGrabberVisible: true,
-  headerTitle,
-  ...rest,
-})
+export const getFormSheetScreenOptions =
+  ({ headerTitle, sheetAllowedDetents = [0.25], ...rest }: NativeStackNavigationOptions = {}) =>
+  (): NativeStackNavigationOptions => ({
+    presentation: 'formSheet',
+    headerShown: false,
+    sheetAllowedDetents,
+    sheetCornerRadius: isLiquidGlassEnabled() ? undefined : 16,
+    sheetGrabberVisible: true,
+    headerTitle,
+    ...rest,
+  })
 
 const FormSheet = {
   Root: FormSheetRoot,

package/src/navigation/index.tsx

@@ -1,18 +1,16 @@
-import { HeaderBackButton } from '@react-navigation/elements'
 import { StaticParamList } from '@react-navigation/native'
 import {
   createNativeStackNavigator,
   NativeStackHeaderRightProps,
+  NativeStackNavigationOptions,
 } from '@react-navigation/native-stack'
 import { CardStyleInterpolators } from '@react-navigation/stack'
 import React from 'react'
-import { Platform } from 'react-native'
-import { Icon } from '../components'
 import {
-  composeHeaderOptions,
-  createMinimalHeaderBackButton,
-  HeaderDoneButton,
-  HeaderTextButton,
+  composeOptions,
+  withMinimalBack,
+  withRightClose,
+  withRightDone,
 } from '../components/display/platform_modal_header_buttons'
 import { useDirectMessagesEligible, useQualifiedByAge } from '../hooks'
 import {
@@ -81,64 +79,66 @@ import {
   SystemMessagePeopleScreenOptions,
 } from '../screens/system_message_people_screen'
 import { TeamConversationScreen } from '../screens/team_conversation_screen'
+import { isLiquidGlassEnabled } from '../utils/liquid_glass'
 import { ScreenLayoutWithChatAccessGate } from './screenLayout'
 
+const globalScreenOptions: () => NativeStackNavigationOptions = () => ({
+  headerBackButtonDisplayMode: 'minimal',
+  ...(isLiquidGlassEnabled() ? { headerShadowVisible: false } : {}),
+})
+
 export const NewConversationStack = createNativeStackNavigator({
   initialRouteName: 'ConversationNewEntry',
-  screenOptions: {
-    headerBackButtonDisplayMode: 'minimal',
-  },
+  screenOptions: globalScreenOptions,
   screenLayout: ScreenLayoutWithChatAccessGate,
   screens: {
     ConversationNewEntry: {
       screen: ConversationNewEntryScreen,
-      options: ({ navigation }) => ({
-        title: 'New conversation',
-        headerRight: (props: NativeStackHeaderRightProps) => (
-          <HeaderTextButton {...props} onPress={navigation.goBack} title="Cancel" />
+      options: ({ navigation }) =>
+        composeOptions(
+          {
+            title: 'New conversation',
+            headerBackVisible: false,
+          },
+          withRightClose({ onPress: navigation.goBack })
         ),
-        headerBackVisible: false,
-      }),
     },
     ConversationSelectGroupRecipients: {
       screen: ConversationSelectGroupRecipientsScreen,
-      options: ({ navigation, route }) => ({
-        title: 'New conversation',
-        headerRight: (props: NativeStackHeaderRightProps) => (
-          <HeaderTextButton
-            {...props}
-            onPress={() => navigation.popTo('Conversations', route.params)}
-            title="Cancel"
-          />
+      options: ({ navigation, route }) =>
+        composeOptions(
+          {
+            title: 'New conversation',
+          },
+          withRightClose({
+            onPress: () => navigation.popTo('Conversations', route.params),
+          })
         ),
-      }),
     },
     ConversationSelectTeamsILeadRecipients: {
       screen: ConversationSelectTeamsILeadRecipientsScreen,
-      options: ({ navigation, route }) => ({
-        title: 'New conversation',
-        headerRight: (props: NativeStackHeaderRightProps) => (
-          <HeaderTextButton
-            {...props}
-            onPress={() => navigation.popTo('Conversations', route.params)}
-            title="Cancel"
-          />
+      options: ({ navigation, route }) =>
+        composeOptions(
+          {
+            title: 'New conversation',
+          },
+          withRightClose({
+            onPress: () => navigation.popTo('Conversations', route.params),
+          })
         ),
-      }),
     },
     ConversationSelectDirectMessageRecipients: {
       screen: ConversationSelectDirectMessageRecipientsScreen,
       if: useDirectMessagesEligible,
-      options: ({ navigation, route }) => ({
-        title: 'New conversation',
-        headerRight: (props: NativeStackHeaderRightProps) => (
-          <HeaderTextButton
-            {...props}
-            onPress={() => navigation.popTo('Conversations', route.params)}
-            title="Cancel"
-          />
+      options: ({ navigation, route }) =>
+        composeOptions(
+          {
+            title: 'New conversation',
+          },
+          withRightClose({
+            onPress: () => navigation.popTo('Conversations', route.params),
+          })
         ),
-      }),
     },
     ConversationFilterRecipients: {
       screen: ConversationFilterRecipientsScreen,
@@ -146,21 +146,20 @@ export const NewConversationStack = createNativeStackNavigator({
     },
     ConversationNew: {
       screen: ConversationNewScreen,
-      options: ({ navigation, route }) => ({
-        title: 'New conversation',
-        headerLeft: () => null,
-        headerRight: (props: NativeStackHeaderRightProps) => (
-          <HeaderTextButton
-            {...props}
-            onPress={() => {
+      options: ({ navigation, route }) =>
+        composeOptions(
+          {
+            title: 'New conversation',
+            headerLeft: () => null,
+          },
+          withRightClose({
+            onPress: () => {
               const { chat_group_graph_id, group_source_app_name } =
                 route.params as ConversationSelectRecipientsParams
               navigation.popTo('Conversations', { chat_group_graph_id, group_source_app_name })
-            }}
-            title="Cancel"
-          />
+            },
+          })
         ),
-      }),
     },
     AvatarPicker: {
       screen: AvatarPickerScreen,
@@ -170,24 +169,19 @@ export const NewConversationStack = createNativeStackNavigator({
 })
 
 export const ChatStack = createNativeStackNavigator({
-  screenOptions: {
-    headerBackButtonDisplayMode: 'minimal',
-  },
+  screenOptions: globalScreenOptions,
   screenLayout: ScreenLayoutWithChatAccessGate,
   screens: {
     Conversations: {
       screen: ConversationsScreen,
-      options: ({ route, navigation }) => ({
-        headerTitle: (route.params as { title?: string })?.title ?? 'Chat',
-        headerBackVisible: false,
-        headerRight: (props: NativeStackHeaderRightProps) => (
-          <HeaderBackButton
-            backImage={() => <Icon name="general.x" size={18} color={props.tintColor} />}
-            onPress={navigation.goBack}
-            {...props}
-          />
+      options: ({ route, navigation }) =>
+        composeOptions(
+          {
+            headerTitle: (route.params as { title?: string })?.title ?? 'Chat',
+            headerBackVisible: false,
+          },
+          withRightClose({ onPress: navigation.goBack })
         ),
-      }),
     },
     ConversationFilters: {
       screen: ConversationFiltersScreen,
@@ -195,50 +189,48 @@ export const ChatStack = createNativeStackNavigator({
     },
     Conversation: {
       screen: ConversationScreen,
-      options: ({ route, navigation }) => ({
-        headerTitle: (props: NativeStackHeaderRightProps) => {
-          const { conversation_id, title, badge, deleted, muted } =
-            route.params as ConversationRouteProps
+      options: ({ route, navigation }) =>
+        composeOptions(
+          {
+            headerTitle: (props: NativeStackHeaderRightProps) => {
+              const { conversation_id, title, badge, deleted, muted } =
+                route.params as ConversationRouteProps
 
-          return (
-            <ConversationScreenTitle
-              conversation_id={conversation_id}
-              badge={badge}
-              deleted={deleted}
-              muted={muted}
-              {...props}
-            >
-              {title ?? 'Conversation'}
-            </ConversationScreenTitle>
-          )
-        },
-        headerRight: (props: NativeStackHeaderRightProps) => (
-          <HeaderBackButton
-            backImage={() => <Icon name="general.x" size={18} color={props.tintColor} />}
-            onPress={() => navigation.getParent()?.goBack()}
-          />
-        ),
-        headerLeft: createMinimalHeaderBackButton({
-          onPress: () => {
-            const params = route.params as ConversationRouteProps
-            if ((params as ConversationFiltersParams)?.chat_group_graph_id) {
-              // Ensure that conversations with a graph id pass them back to the conversation list
-              const { chat_group_graph_id } = params
-              navigation.popTo('Conversations', { chat_group_graph_id })
-            } else {
-              navigation.goBack()
-            }
+              return (
+                <ConversationScreenTitle
+                  conversation_id={conversation_id}
+                  badge={badge}
+                  deleted={deleted}
+                  muted={muted}
+                  {...props}
+                >
+                  {title ?? 'Conversation'}
+                </ConversationScreenTitle>
+              )
+            },
           },
-        }),
-      }),
+          withMinimalBack({
+            onPress: () => {
+              const params = route.params as ConversationRouteProps
+              if ((params as ConversationFiltersParams)?.chat_group_graph_id) {
+                // Ensure that conversations with a graph id pass them back to the conversation list
+                const { chat_group_graph_id } = params
+                navigation.popTo('Conversations', { chat_group_graph_id })
+              } else {
+                navigation.goBack()
+              }
+            },
+          }),
+          withRightClose({ onPress: () => navigation.getParent()?.goBack() })
+        ),
     },
     ConversationReply: {
       screen: ConversationScreen,
       options: ({ route, navigation }) =>
-        composeHeaderOptions({
-          title: (route.params as ConversationRouteProps)?.title ?? 'Reply',
-          onPress: navigation.goBack,
-        }),
+        composeOptions(
+          { title: (route.params as ConversationRouteProps)?.title ?? 'Reply' },
+          withMinimalBack({ onPress: navigation.goBack })
+        ),
     },
     TeamConversation: {
       screen: TeamConversationScreen,
@@ -251,13 +243,14 @@ export const ChatStack = createNativeStackNavigator({
     },
     ConversationDetails: {
       screen: ConversationDetailsScreen,
-      options: ({ navigation }) => ({
-        presentation: 'modal',
-        title: 'Conversation details',
-        headerRight: (props: NativeStackHeaderRightProps) => (
-          <HeaderTextButton {...props} onPress={navigation.goBack} title="Done" />
+      options: ({ navigation }) =>
+        composeOptions(
+          {
+            presentation: 'modal',
+            title: 'Conversation details',
+          },
+          withRightDone({ onPress: navigation.goBack })
         ),
-      }),
     },
     AvatarPicker: {
       screen: AvatarPickerScreen,
@@ -265,38 +258,43 @@ export const ChatStack = createNativeStackNavigator({
     },
     ChatSettings: {
       screen: SettingsScreen,
-      options: ({ navigation }) => ({
-        title: 'Chat settings',
-        headerBackVisible: false,
-        headerRight: (props: NativeStackHeaderRightProps) => (
-          <HeaderTextButton {...props} onPress={navigation.goBack} title="Done" />
-        ),
-      }),
+      options: ({ navigation }) =>
+        composeOptions({ title: 'Chat settings' }, withMinimalBack({ onPress: navigation.goBack })),
     },
     NotificationSettings: {
       screen: NotificationSettingsScreen,
-      options: ({ navigation }) => ({
-        title: 'Chat',
-        headerBackVisible: false,
-        headerRight: (props: NativeStackHeaderRightProps) => (
-          <HeaderTextButton {...props} onPress={navigation.goBack} title="Done" />
-        ),
-      }),
+      options: ({ navigation }) =>
+        navigation.getState().index === 0
+          ? composeOptions(
+              { title: 'Chat notifications' },
+              withRightClose({ onPress: navigation.goBack })
+            )
+          : composeOptions(
+              { title: 'Chat notifications' },
+              withMinimalBack({ onPress: navigation.goBack })
+            ),
     },
     PreferredAppSelection: {
       screen: PreferredAppSelectionScreen,
-      options: {
-        title: 'Preferred app',
-      },
+      options: ({ navigation }) =>
+        composeOptions({ title: 'Preferred app' }, withMinimalBack({ onPress: navigation.goBack })),
     },
     GroupNotificationSettings: {
       screen: GroupNotificationSettingsScreen,
-      options: ({ route, navigation }) => ({
-        title: (route.params as { title?: string })?.title || 'Group Settings',
-        headerRight: (props: NativeStackHeaderRightProps) => (
-          <HeaderDoneButton {...props} navigation={navigation} />
-        ),
-      }),
+      options: ({ route, navigation }) => {
+        const title = (route.params as { title?: string })?.title || 'Group Settings'
+
+        // The dismiss button only shows when this is the entry screen (e.g.
+        // deep links); deeper in the stack the back button covers dismissal.
+        return navigation.getState().index === 0
+          ? composeOptions(
+              {
+                title,
+              },
+              withRightClose({ onPress: navigation.goBack })
+            )
+          : composeOptions({ title }, withMinimalBack({ onPress: navigation.goBack }))
+      },
     },
     GroupNotificationLevelSelect: {
       screen: GroupNotificationLevelSelectScreen,
@@ -317,17 +315,14 @@ export const ChatStack = createNativeStackNavigator({
     GroupConversationNew: {
       screen: ConversationNewScreen,
       if: useQualifiedByAge,
-      options: ({ navigation }) => ({
-        title: 'New conversation',
-        headerLeft: () => null,
-        headerRight: props => (
-          <HeaderTextButton
-            {...props}
-            onPress={() => navigation.getParent()?.goBack()}
-            title="Cancel"
-          />
+      options: ({ navigation }) =>
+        composeOptions(
+          {
+            title: 'New conversation',
+            headerLeft: () => null,
+          },
+          withRightClose({ onPress: () => navigation.getParent()?.goBack() })
         ),
-      }),
     },
     SendGiphy: {
       screen: SendGiphyScreen,
@@ -368,14 +363,15 @@ export const ChatStack = createNativeStackNavigator({
     },
     GetHelp: {
       screen: GetHelpScreen,
-      options: ({ navigation }) => ({
-        headerTitle: 'Get help',
-        headerBackVisible: false,
-        presentation: 'modal',
-        headerRight: props => (
-          <HeaderTextButton {...props} onPress={navigation.goBack} title="Close" />
+      options: ({ navigation }) =>
+        composeOptions(
+          {
+            headerTitle: 'Get help',
+            headerBackVisible: false,
+            presentation: 'modal',
+          },
+          withRightClose({ onPress: navigation.goBack })
         ),
-      }),
     },
     NotFound: {
       screen: NotFound,

package/src/screens/bug_report_screen.tsx

@@ -4,7 +4,7 @@ import type {
   NativeStackScreenProps,
 } from '@react-navigation/native-stack'
 import { startsWith } from 'lodash'
-import React, { useCallback, useLayoutEffect, useState } from 'react'
+import React, { useCallback, useState } from 'react'
 import {
   View,
   StyleSheet,
@@ -25,8 +25,10 @@ import {
   KeyboardView,
 } from '../components'
 import {
+  composeOptions,
   HeaderDismissButton,
-  HeaderTextButton,
+  useHeaderRight,
+  withLeftClose,
 } from '../components/display/platform_modal_header_buttons'
 import { VideoAttachmentPreview } from '../components/display/video_attachment_preview'
 import { DefaultLoading } from '../components/page/loading'
@@ -55,11 +57,11 @@ enum BUG_TYPE_OPTIONS {
 
 export const BugReportScreenOptions = ({
   navigation,
-}: NativeStackScreenProps<any>): NativeStackNavigationOptions => ({
-  presentation: 'modal',
-  title: 'Report a bug',
-  headerLeft: () => <HeaderDismissButton title="Cancel" onPress={() => navigation.goBack()} />,
-})
+}: NativeStackScreenProps<any>): NativeStackNavigationOptions =>
+  composeOptions(
+    { presentation: 'modal', title: 'Report a bug' },
+    withLeftClose({ onPress: () => navigation.goBack() })
+  )
 
 interface Attachment {
   id: string
@@ -156,14 +158,13 @@ export function BugReportScreen() {
     return ImagePicker.openImageLibraryAsync().then(result => uploadImagePickerResult(result))
   }
 
-  useLayoutEffect(() => {
-    navigation.setOptions({
-      // eslint-disable-next-line react/no-unstable-nested-components
-      headerRight: () => (
-        <HeaderTextButton title="Submit" onPress={handleSubmit} disabled={!formValid} />
-      ),
-    })
-  }, [formValid, handleSubmit, navigation])
+  useHeaderRight({
+    icon: 'general.upArrow',
+    accessibilityLabel: 'Submit',
+    prominent: true,
+    onPress: handleSubmit,
+    disabled: !formValid,
+  })
 
   if (status === 'pending') {
     return (

package/src/screens/conversation_details_screen.tsx

@@ -38,7 +38,7 @@ import {
   type TextStyle,
 } from '../components'
 import { ConversationAvatar } from '../components/display/conversation_avatar'
-import { HeaderTextButton } from '../components/display/platform_modal_header_buttons'
+import { useHeaderRight } from '../components/display/platform_modal_header_buttons'
 import { ButtonAppearanceUnion } from '../components/display/utils/button_colors'
 import { useSuspensePaginator, useTheme } from '../hooks'
 import {
@@ -222,24 +222,18 @@ export function ConversationDetailsScreen({ route }: ConversationDetailsScreenPr
     [name, productName, resourceType, styles.headerTitleBadge, styles.headerTitleContainer]
   )
 
-  const HeaderRight = useCallback(() => {
-    return (
-      <HeaderTextButton
-        onPress={() => {
-          saveTitle({ title: trimmedTitle || conversation.title })
-          navigation.goBack()
-        }}
-        title="Done"
-      />
-    )
-  }, [conversation.title, navigation, saveTitle, trimmedTitle])
+  useHeaderRight({
+    icon: 'general.check',
+    accessibilityLabel: 'Done',
+    onPress: () => {
+      saveTitle({ title: trimmedTitle || conversation.title })
+      navigation.goBack()
+    },
+  })
 
   useEffect(() => {
-    navigation.setOptions({
-      headerRight: HeaderRight,
-      headerTitle: HeaderTitle,
-    })
-  }, [HeaderRight, HeaderTitle, navigation])
+    navigation.setOptions({ headerTitle: HeaderTitle })
+  }, [HeaderTitle, navigation])
 
   const listData = [
     {

package/src/screens/conversation_filters_screen.tsx

@@ -1,5 +1,6 @@
 import { useHeaderHeight } from '@react-navigation/elements'
-import { createComponentForStaticNavigation, RouteProp, useRoute } from '@react-navigation/native'
+import * as ReactNavigationNative from '@react-navigation/native'
+import { RouteProp, useRoute } from '@react-navigation/native'
 import { createNativeStackNavigator } from '@react-navigation/native-stack'
 import React, { useCallback } from 'react'
 import { LayoutChangeEvent, Platform, StyleSheet, useWindowDimensions, View } from 'react-native'
@@ -58,7 +59,26 @@ const FilterNavigator = createNativeStackNavigator<ConversationFilterStackParamL
   },
 })
 
-const Filters = createComponentForStaticNavigation(FilterNavigator, 'Filters')
+// tree.getComponent() doesn't exist on every host's installed
+// react-navigation/core — hosts on an older version would throw here.
+// Where it does exist, it's the real implementation (the "deprecated"
+// createComponentForStaticNavigation is just a console.warn wrapper around
+// the same call on current versions), so prefer it and only reach for the
+// old function on cores where getComponent() genuinely isn't there yet.
+function createStaticNavigationComponent<P extends object>(
+  tree: { getComponent?: () => React.ComponentType<P> },
+  name: string
+): React.ComponentType<P> {
+  if (typeof tree.getComponent === 'function') return tree.getComponent()
+
+  const { createComponentForStaticNavigation } = ReactNavigationNative as {
+    createComponentForStaticNavigation: (tree: unknown, name: string) => React.ComponentType<P>
+  }
+
+  return createComponentForStaticNavigation(tree, name)
+}
+
+const Filters = createStaticNavigationComponent(FilterNavigator, 'Filters')
 
 export const ConversationFiltersScreen = (_props: ConversationFiltersScreenProps) => {
   const styles = useStyles()
@@ -117,6 +137,9 @@ const useStyles = () => {
         ios: 20,
         android: 20 + top,
       }),
+      // The filter list scrolls under it, so the sheet header doesn't need a
+      // separator the way the non-scrolling reaction sheet does.
+      borderBottomWidth: 0,
     },
   })
 }

package/src/screens/conversation_screen.tsx

@@ -9,7 +9,7 @@ import {
   useRoute,
 } from '@react-navigation/native'
 import React, { useCallback, useEffect, useRef, useState } from 'react'
-import { FlatList, Platform, StyleSheet, View } from 'react-native'
+import { FlatList, Platform, StyleSheet, useWindowDimensions, View } from 'react-native'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 import { Badge, Icon, Text } from '../components'
 import { ConversationStartBanner } from '../components/conversation/conversation_start_banner'
@@ -25,6 +25,7 @@ import { ReplyShadowMessage } from '../components/conversation/reply_shadow_mess
 import { SystemMessage } from '../components/conversation/system_message'
 import { TypingIndicator } from '../components/conversation/typing_indicator'
 import { KeyboardView } from '../components/display/keyboard_view'
+import { useHeaderSlotReserve } from '../components/display/platform_modal_header_buttons'
 import BlankState from '../components/primitive/blank_state_primitive'
 import { ConversationContextProvider } from '../contexts/conversation_context'
 import { useTheme } from '../hooks'
@@ -374,11 +375,15 @@ export const ConversationScreenTitle = ({
 }
 
 const usePressableHeaderStyle = () => {
+  const { width } = useWindowDimensions()
+  const slotReserve = useHeaderSlotReserve()
+  const headerContainerStyle = { maxWidth: width - slotReserve * 2 }
+
   return StyleSheet.create({
     container: {
       alignItems: Platform.select({ android: 'flex-start', default: 'center' }),
-      marginRight: Platform.select({ ios: 20, default: 16 }),
       flex: 1,
+      ...headerContainerStyle,
     },
     titleWrapper: {
       alignItems: 'center',