@planningcenter/chat-react-native 3.42.3-qa-staging.2 → 3.42.3-qa-staging.4

package/src/navigation/index.tsx

@@ -1,16 +1,17 @@
-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 {
-  HeaderDoneButton,
-  HeaderTextButton,
+  composeOptions,
+  createMinimalHeaderBackButton,
+  withMinimalBack,
+  withRightClose,
+  withRightDone,
 } from '../components/display/platform_modal_header_buttons'
 import { useDirectMessagesEligible, useQualifiedByAge } from '../hooks'
 import {
@@ -79,69 +80,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 HEADER_BACK_BUTTON_LAYOUT_RESET_STYLES = {
-  marginLeft: Platform.select({ ios: -8, default: -3 }),
-  marginRight: Platform.select({ ios: 0, default: 30 }),
-}
+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,
@@ -149,21 +147,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,
@@ -173,24 +170,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,
@@ -198,61 +190,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()}
-          />
+              return (
+                <ConversationScreenTitle
+                  conversation_id={conversation_id}
+                  badge={badge}
+                  deleted={deleted}
+                  muted={muted}
+                  {...props}
+                >
+                  {title ?? 'Conversation'}
+                </ConversationScreenTitle>
+              )
+            },
+            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()
+                }
+              },
+            }),
+          },
+          withRightClose({ onPress: () => navigation.getParent()?.goBack() })
         ),
-        headerLeft: props => (
-          <HeaderBackButton
-            style={HEADER_BACK_BUTTON_LAYOUT_RESET_STYLES}
-            displayMode="minimal"
-            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()
-              }
-            }}
-            {...props}
-          />
-        ),
-      }),
     },
     ConversationReply: {
       screen: ConversationScreen,
-      options: ({ route, navigation }) => ({
-        title: (route.params as ConversationRouteProps)?.title ?? 'Reply',
-        headerLeft: props => (
-          <HeaderBackButton
-            style={HEADER_BACK_BUTTON_LAYOUT_RESET_STYLES}
-            displayMode="minimal"
-            onPress={() => navigation.goBack()}
-            {...props}
-          />
+      options: ({ route, navigation }) =>
+        composeOptions(
+          { title: (route.params as ConversationRouteProps)?.title ?? 'Reply' },
+          withMinimalBack({ onPress: navigation.goBack })
         ),
-      }),
     },
     TeamConversation: {
       screen: TeamConversationScreen,
@@ -265,13 +244,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,
@@ -279,38 +259,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,
@@ -331,17 +316,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,
@@ -382,14 +364,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.message',
+    accessibilityLabel: 'Submit',
+    variant: 'fill',
+    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,5 @@
 import { useHeaderHeight } from '@react-navigation/elements'
-import { createComponentForStaticNavigation, RouteProp, useRoute } 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 +58,7 @@ const FilterNavigator = createNativeStackNavigator<ConversationFilterStackParamL
   },
 })
 
-const Filters = createComponentForStaticNavigation(FilterNavigator, 'Filters')
+const Filters = FilterNavigator.getComponent()
 
 export const ConversationFiltersScreen = (_props: ConversationFiltersScreenProps) => {
   const styles = useStyles()

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'
@@ -45,6 +46,7 @@ import { ConversationBadgeResource } from '../types/resources/conversation_badge
 import { MessageResource } from '../types/resources/message'
 import { getRelativeDateStatus } from '../utils/date'
 import { groupMessages, type DateSeparator } from '../utils/group_messages'
+import { isLiquidGlassEnabled } from '../utils/liquid_glass'
 import { CONVERSATION_MESSAGE_LIST_PADDING_HORIZONTAL } from '../utils/styles'
 import { isSystemMessage } from '../utils/system_messages'
 
@@ -257,7 +259,7 @@ function ConversationBottomBar({
   if (conversation.disabled)
     return (
       <ConversationDisabledBanner
-        disabledReason={conversation.disabledReason}
+        message={conversation.disabledMessage ?? null}
         messageLink={messageLink}
       />
     )
@@ -374,11 +376,17 @@ export const ConversationScreenTitle = ({
 }
 
 const usePressableHeaderStyle = () => {
+  const { width } = useWindowDimensions()
+  const slotReserve = useHeaderSlotReserve()
+  const headerContainerStyle = isLiquidGlassEnabled()
+    ? { maxWidth: width - slotReserve * 2 }
+    : { marginRight: Platform.select({ default: 20, android: 16 }) }
+
   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',

package/src/screens/message_report_screen.tsx

@@ -8,8 +8,9 @@ import { View, StyleSheet, TextInput, ScrollView } from 'react-native'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 import { Spinner, Text, KeyboardView } from '../components'
 import {
-  HeaderDismissButton,
-  HeaderTextButton,
+  composeOptions,
+  useHeaderRight,
+  withLeftClose,
 } from '../components/display/platform_modal_header_buttons'
 import BlankState from '../components/primitive/blank_state_primitive'
 import { useTheme } from '../hooks'
@@ -34,11 +35,10 @@ export const MessageReportScreenOptions = ({
       })
     )
 
-  return {
-    presentation: 'modal',
-    title: 'Report message',
-    headerLeft: () => <HeaderDismissButton title="Cancel" onPress={handleClose} />,
-  }
+  return composeOptions(
+    { presentation: 'modal', title: 'Report message' },
+    withLeftClose({ onPress: handleClose })
+  )
 }
 
 export type MessageReportScreenProps = StaticScreenProps<{
@@ -103,23 +103,22 @@ function MessageReportScreenContent({
     navigation.dispatch(StackActions.popTo('Conversation', { conversation_id }))
   }, [navigation, conversation_id])
 
-  const HeaderRight = useCallback(
-    () => <HeaderTextButton title="Submit" onPress={handleSubmit} disabled={!isFormValid} />,
-    [handleSubmit, isFormValid]
-  )
+  const formVisible = status !== 'pending' && status !== 'success'
+
+  useHeaderRight({
+    icon: 'general.message',
+    accessibilityLabel: 'Submit',
+    variant: 'fill',
+    onPress: handleSubmit,
+    disabled: !isFormValid,
+    enabled: formVisible,
+  })
 
   useLayoutEffect(() => {
-    if (status === 'pending' || status === 'success') {
-      navigation.setOptions({
-        headerRight: () => null,
-      })
-    } else {
-      navigation.setOptions({
-        headerTitle: 'Report message',
-        headerRight: HeaderRight,
-      })
+    if (formVisible) {
+      navigation.setOptions({ headerTitle: 'Report message' })
     }
-  }, [HeaderRight, navigation, status])
+  }, [formVisible, navigation])
 
   if (status === 'pending') {
     return (