[Group Chats] Add remaining features #39757
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| import React from 'react'; | ||
| import {View} from 'react-native'; | ||
| import * as Report from '../libs/actions/Report'; | ||
| import Button from './Button'; | ||
| import * as Expensicons from './Icon/Expensicons'; | ||
|
|
||
| function ChatActionsBar({report}) { | ||
| const isPinned = !!report.isPinned; | ||
| return ( | ||
| <View style={{flexDirection: 'row', paddingHorizontal: 14, marginBottom: 20}}> | ||
| <View style={{flex: 1, paddingHorizontal: 6}}> | ||
marcaaron marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| <Button | ||
| onPress={() => Report.leaveGroupChat(report.reportID)} | ||
| icon={Expensicons.Exit} | ||
| style={{flex: 1}} | ||
| text="Leave" | ||
marcaaron marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| /> | ||
| </View> | ||
| <View style={{flex: 1, paddingHorizontal: 6}}> | ||
| <Button | ||
| onPress={() => Report.togglePinnedState(report.reportID, isPinned)} | ||
| icon={Expensicons.Pin} | ||
| style={{flex: 1}} | ||
| text={isPinned ? 'Unpin' : 'Pin'} | ||
| /> | ||
| </View> | ||
| </View> | ||
| ); | ||
| } | ||
|
|
||
marcaaron marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| export default ChatActionsBar; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,5 +1,5 @@ | ||||||
| import type {ReactNode} from 'react'; | ||||||
| import React, {useMemo} from 'react'; | ||||||
| import type {StyleProp, TextStyle, ViewStyle} from 'react-native'; | ||||||
| import {View} from 'react-native'; | ||||||
| import useThemeStyles from '@hooks/useThemeStyles'; | ||||||
|
|
@@ -21,13 +21,35 @@ type HeaderProps = { | |||||
|
|
||||||
| /** Additional header container styles */ | ||||||
| containerStyles?: StyleProp<ViewStyle>; | ||||||
|
|
||||||
| /** Whether to show the subtitle on the top or bottom */ | ||||||
| subtitleOnTop?: boolean; | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| }; | ||||||
|
|
||||||
| function Header({title = '', subtitle = '', textStyles = [], containerStyles = [], shouldShowEnvironmentBadge = false, subtitleOnTop = true}: HeaderProps) { | ||||||
marcaaron marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| const styles = useThemeStyles(); | ||||||
| const renderedSubtitle = useMemo( | ||||||
| () => ( | ||||||
| <> | ||||||
| {/* If there's no subtitle then display a fragment to avoid an empty space which moves the main title */} | ||||||
| {typeof subtitle === 'string' | ||||||
| ? Boolean(subtitle) && ( | ||||||
| <Text | ||||||
| style={[styles.mutedTextLabel, styles.pre]} | ||||||
| numberOfLines={1} | ||||||
| > | ||||||
| {subtitle} | ||||||
| </Text> | ||||||
| ) | ||||||
| : subtitle} | ||||||
| </> | ||||||
| ), | ||||||
| [subtitle, styles], | ||||||
| ); | ||||||
| return ( | ||||||
| <View style={[styles.flex1, styles.flexRow, containerStyles]}> | ||||||
| <View style={styles.mw100}> | ||||||
| {subtitleOnTop && renderedSubtitle} | ||||||
| {typeof title === 'string' | ||||||
| ? Boolean(title) && ( | ||||||
| <Text | ||||||
|
|
@@ -38,17 +60,7 @@ function Header({title = '', subtitle = '', textStyles = [], containerStyles = [ | |||||
| </Text> | ||||||
| ) | ||||||
| : title} | ||||||
| {!subtitleOnTop && renderedSubtitle} | ||||||
| </View> | ||||||
| {shouldShowEnvironmentBadge && <EnvironmentBadge />} | ||||||
| </View> | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -60,6 +60,7 @@ function HeaderWithBackButton({ | |
| shouldNavigateToTopMostReport = false, | ||
| progressBarPercentage, | ||
| style, | ||
| subtitleOnTop = false, | ||
| }: HeaderWithBackButtonProps) { | ||
| const theme = useTheme(); | ||
| const styles = useThemeStyles(); | ||
|
|
@@ -103,6 +104,7 @@ function HeaderWithBackButton({ | |
| title={title} | ||
| subtitle={stepCounter ? translate('stepCounter', stepCounter) : subtitle} | ||
| textStyles={[titleColor ? StyleUtils.getTextColorStyle(titleColor) : {}, isCentralPaneSettings && styles.textHeadlineH2]} | ||
| subtitleOnTop={subtitleOnTop} | ||
| /> | ||
| ); | ||
| }, [ | ||
|
|
@@ -123,6 +125,7 @@ function HeaderWithBackButton({ | |
| title, | ||
| titleColor, | ||
| translate, | ||
| subtitleOnTop, | ||
| ]); | ||
|
|
||
| return ( | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -129,6 +129,9 @@ type HeaderWithBackButtonProps = Partial<ChildrenProps> & { | |||||
|
|
||||||
| /** Additional styles to add to the component */ | ||||||
| style?: StyleProp<ViewStyle>; | ||||||
|
|
||||||
| /** Flips the subtitle with the title */ | ||||||
| subtitleOnTop?: boolean; | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| }; | ||||||
|
|
||||||
| export type {ThreeDotsMenuItem}; | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -108,8 +108,7 @@ function OptionRowLHN({reportID, isFocused = false, onSelectRow = () => {}, opti | |
|
|
||
| const isGroupChat = ReportUtils.isGroupChat(optionItem) || ReportUtils.isDeprecatedGroupDM(optionItem); | ||
|
|
||
| const fullTitle = isGroupChat ? ReportUtils.getGroupChatName(report?.participantAccountIDs ?? [], false, optionItem.reportID ?? '') : optionItem.text; | ||
| const subscriptAvatarBorderColor = isFocused ? focusedBackgroundColor : theme.sidebar; | ||
| return ( | ||
| <OfflineWithFeedback | ||
|
|
@@ -199,7 +198,8 @@ function OptionRowLHN({reportID, isFocused = false, onSelectRow = () => {}, opti | |
| !!optionItem.isPolicyExpenseChat || | ||
| !!optionItem.isTaskReport || | ||
| !!optionItem.isThread || | ||
| !!optionItem.isMoneyRequestReport || | ||
| ReportUtils.isGroupChat(report) | ||
| } | ||
| /> | ||
| {isStatusVisible && ( | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -71,6 +71,7 @@ function BaseSelectionList<TItem extends ListItem>( | |
| textInputRef, | ||
| headerMessageStyle, | ||
| shouldHideListOnInitialRender = true, | ||
| shouldShowLeftCheckbox = true, | ||
| }: BaseSelectionListProps<TItem>, | ||
| ref: ForwardedRef<SelectionListHandle>, | ||
| ) { | ||
|
|
@@ -337,6 +338,7 @@ function BaseSelectionList<TItem extends ListItem>( | |
| rightHandSideComponent={rightHandSideComponent} | ||
| keyForList={item.keyForList ?? ''} | ||
| isMultilineSupported={isRowMultilineSupported} | ||
| shouldShowLeftCheckbox={shouldShowLeftCheckbox} | ||
| /> | ||
| ); | ||
| }; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| import Str from 'expensify-common/lib/str'; | ||
| import React, {useCallback} from 'react'; | ||
| import {View} from 'react-native'; | ||
| import Badge from '@components/Badge'; | ||
| import Icon from '@components/Icon'; | ||
| import * as Expensicons from '@components/Icon/Expensicons'; | ||
| import MultipleAvatars from '@components/MultipleAvatars'; | ||
|
|
@@ -12,6 +13,7 @@ | |
| import useStyleUtils from '@hooks/useStyleUtils'; | ||
| import useTheme from '@hooks/useTheme'; | ||
| import useThemeStyles from '@hooks/useThemeStyles'; | ||
| import variables from '@styles/variables'; | ||
| import CONST from '@src/CONST'; | ||
| import BaseListItem from './BaseListItem'; | ||
| import type {UserListItemProps} from './types'; | ||
|
|
@@ -27,6 +29,7 @@ | |
| onDismissError, | ||
| shouldPreventDefaultFocusOnSelectRow, | ||
| rightHandSideComponent, | ||
| shouldShowLeftCheckbox = true, | ||
| }: UserListItemProps) { | ||
| const styles = useThemeStyles(); | ||
| const theme = useTheme(); | ||
|
|
@@ -52,7 +55,7 @@ | |
| isFocused={isFocused} | ||
| isDisabled={isDisabled} | ||
| showTooltip={showTooltip} | ||
| canSelectMultiple={shouldShowLeftCheckbox && canSelectMultiple} | ||
| onSelectRow={onSelectRow} | ||
| onDismissError={onDismissError} | ||
| shouldPreventDefaultFocusOnSelectRow={shouldPreventDefaultFocusOnSelectRow} | ||
|
|
@@ -70,7 +73,7 @@ | |
| > | ||
| {(hovered?: boolean) => ( | ||
| <> | ||
| {shouldShowLeftCheckbox && canSelectMultiple && ( | ||
| <PressableWithFeedback | ||
| accessibilityLabel={item.text ?? ''} | ||
| role={CONST.ROLE.BUTTON} | ||
|
|
@@ -111,17 +114,26 @@ | |
| /> | ||
| ))} | ||
| <View style={[styles.flex1, styles.flexColumn, styles.justifyContentCenter, styles.alignItemsStretch, styles.optionRow]}> | ||
| <View style={{flexDirection: 'row', alignItems: 'center'}}> | ||
| <TextWithTooltip | ||
| shouldShowTooltip={showTooltip} | ||
| text={Str.removeSMSDomain(item.text ?? '')} | ||
| style={[ | ||
| styles.optionDisplayName, | ||
| isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText, | ||
| item.isBold !== false && styles.sidebarLinkTextBold, | ||
| styles.pre, | ||
| item.alternateText ? styles.mb1 : null, | ||
| ]} | ||
| /> | ||
| {item.isAdmin && ( | ||
| <Badge | ||
| text={translate('common.admin')} | ||
| textStyles={[styles.badgeText, styles.textStrong, variables.fontSizeNormal]} | ||
|
Check failure on line 132 in src/components/SelectionList/UserListItem.tsx
|
||
| badgeStyles={[styles.justifyContentCenter, styles.badgeSmall, item.alternateText ? styles.mb1 : null]} | ||
marcaaron marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| /> | ||
| )} | ||
| </View> | ||
| {!!item.alternateText && ( | ||
| <TextWithTooltip | ||
| shouldShowTooltip={showTooltip} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -110,6 +110,9 @@ type ListItem = { | |
|
|
||
| /** The search value from the selection list */ | ||
| searchText?: string | null; | ||
|
|
||
| /** Whether to show an "Admin" badge next to the Display Name */ | ||
| isAdmin?: boolean; | ||
marcaaron marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| }; | ||
|
|
||
| type ListItemProps = CommonListItemProps<ListItem> & { | ||
|
|
@@ -148,6 +151,9 @@ type UserListItemProps = ListItemProps & { | |
|
|
||
| /** The React element that will be shown as a footer */ | ||
| FooterComponent?: ReactElement; | ||
|
|
||
| /** Whether to show the left checkbox when selecting multiple items */ | ||
| shouldShowLeftCheckbox?: boolean; | ||
marcaaron marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| }; | ||
|
|
||
| type InviteMemberListItemProps = UserListItemProps; | ||
|
|
@@ -303,6 +309,9 @@ type BaseSelectionListProps<TItem extends ListItem> = Partial<ChildrenProps> & { | |
| * When false, the list will render immediately and scroll to the bottom which works great for small lists. | ||
| */ | ||
| shouldHideListOnInitialRender?: boolean; | ||
|
|
||
| /** Override checklist behavior */ | ||
| shouldShowLeftCheckbox?: boolean; | ||
| }; | ||
|
|
||
| type SelectionListHandle = { | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
question: why does this route not use
getUrlWithBackToParam, whileDETAILSandROLE_SELECTIONdo?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great question. I don't have a great understanding of
backToor how that works. I removed it from the routes you mentioned. If we find out we need them we can add them later.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's mostly for the sake of the browser back button working as expected, but last I checked it wasn't really working after the "ideal nav" changes a couple months ago.
Whatever the case, more polish than blocker
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok I'll move this into the "to check later" pile. I am eager to get this merged soon-ish.