Skip to content

Fix: Replace InviteMemberListItem with SingleSelectWithAvatarListItem on DomainAddAdminPage #81815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chuckdries merged 11 commits into from
Feb 24, 2026
Merged

Fix: Replace InviteMemberListItem with SingleSelectWithAvatarListItem on DomainAddAdminPage #81815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
44dd4e9
Replace InviteMemberListItem with SingleSelectWithAvatarListItem in D…
PiyushChandra17 Feb 9, 2026
97abea5
Fix avatar size width && height ie. 40x40
PiyushChandra17 Feb 10, 2026
a79920d
fix vertical padding && minHeight
PiyushChandra17 Feb 12, 2026
c538316
Merge branch 'main' into fix/80353
PiyushChandra17 Feb 17, 2026
2ae8210
Merge branch 'Expensify:main' into fix/80353
PiyushChandra17 Feb 17, 2026
d63fe48
Merge branch 'Expensify:main' into fix/80353
PiyushChandra17 Feb 19, 2026
5a1610c
Fix merge-conflicts
PiyushChandra17 Feb 19, 2026
5dbc41f
added named constant for circular border radius
PiyushChandra17 Feb 24, 2026
de90144
Merge branch 'Expensify:main' into fix/80353
PiyushChandra17 Feb 24, 2026
f38a2e9
Merge branch 'Expensify:main' into fix/80353
PiyushChandra17 Feb 24, 2026
bdd2df2
Fix prettier check
PiyushChandra17 Feb 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 100 additions & 0 deletions src/components/SelectionListWithSections/SingleSelectWithAvatarListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
import React, {useCallback, useMemo} from 'react';
import {View} from 'react-native';
import Avatar from '@components/Avatar';
import Checkbox from '@components/Checkbox';
import useThemeStyles from '@hooks/useThemeStyles';
import variables from '@styles/variables';
import CONST from '@src/CONST';
import RadioListItem from './RadioListItem';
import type {ListItem, SingleSelectListItemProps} from './types';

/**
* SingleSelectListItem mirrors the behavior of a default RadioListItem, but adds support
* for the new style of single selection lists.
*/
function SingleSelectWithAvatarListItem<TItem extends ListItem>({
item,
isFocused,
showTooltip,
isDisabled,
onSelectRow,
onDismissError,
shouldPreventEnterKeySubmit,
isMultilineSupported = false,
isAlternateTextMultilineSupported = false,
alternateTextNumberOfLines = 2,
onFocus,
shouldSyncFocus,
wrapperStyle,
titleStyles,
shouldHighlightSelectedItem = true,
}: SingleSelectListItemProps<TItem>) {
const styles = useThemeStyles();
const isSelected = item.isSelected;
const icon = item.icons?.at(0);
const CIRCULAR_BORDER_RADIUS = 999;

const radioCheckboxComponent = useCallback(() => {
return (
<Checkbox
shouldSelectOnPressEnter
containerBorderRadius={CIRCULAR_BORDER_RADIUS}
accessibilityLabel="SingleSelectListItem"
isChecked={isSelected}
onPress={() => onSelectRow(item)}
/>
);
}, [isSelected, item, onSelectRow]);

const {itemWithAvatar, computedWrapperStyle} = useMemo(() => {
if (!icon) {
return {
itemWithAvatar: item,
computedWrapperStyle: [wrapperStyle, styles.optionRowCompact],
};
}

const avatarElement = (
<View>
<Avatar
source={icon.source}
size={CONST.AVATAR_SIZE.DEFAULT}
name={icon.name}
avatarID={icon.id}
type={icon.type ?? CONST.ICON_TYPE_AVATAR}
fallbackIcon={icon.fallbackIcon}
iconAdditionalStyles={[{width: variables.avatarSizeNormal, height: variables.avatarSizeNormal}, styles.mr3]}
/>
</View>
);

return {
itemWithAvatar: {...item, leftElement: avatarElement},
computedWrapperStyle: [wrapperStyle, styles.optionRow, styles.pv0, styles.pv3, styles.w100],
};
}, [icon, item, wrapperStyle, styles.optionRowCompact, styles.optionRow, styles.pv0, styles.pv3, styles.w100]);

return (
<RadioListItem
item={itemWithAvatar}
isFocused={isFocused}
showTooltip={showTooltip}
isDisabled={isDisabled}
rightHandSideComponent={radioCheckboxComponent}
onSelectRow={onSelectRow}
accessibilityRole={CONST.ROLE.RADIO}
onDismissError={onDismissError}
shouldPreventEnterKeySubmit={shouldPreventEnterKeySubmit}
isMultilineSupported={isMultilineSupported}
isAlternateTextMultilineSupported={isAlternateTextMultilineSupported}
alternateTextNumberOfLines={alternateTextNumberOfLines}
onFocus={onFocus}
shouldSyncFocus={shouldSyncFocus}
wrapperStyle={computedWrapperStyle}
titleStyles={titleStyles}
shouldHighlightSelectedItem={shouldHighlightSelectedItem}
/>
);
}

export default SingleSelectWithAvatarListItem;
5 changes: 3 additions & 2 deletions src/pages/domain/Admins/DomainAddAdminPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import React, {useEffect, useRef, useState} from 'react';
import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
import ScreenWrapper from '@components/ScreenWrapper';
import InviteMemberListItem from '@components/SelectionList/ListItem/InviteMemberListItem';
import SelectionListWithSections from '@components/SelectionList/SelectionListWithSections';
import type {Section} from '@components/SelectionList/SelectionListWithSections/types';
import SingleSelectWithAvatarListItem from '@components/SelectionListWithSections/SingleSelectWithAvatarListItem';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import useSearchSelector from '@hooks/useSearchSelector';
Expand Down Expand Up @@ -150,7 +150,8 @@ function DomainAddAdminPage({route}: DomainAddAdminProps) {
/>
<SelectionListWithSections
sections={sections}
ListItem={InviteMemberListItem}
ListItem={SingleSelectWithAvatarListItem}
shouldSingleExecuteRowSelect
onSelectRow={toggleSelection}
textInputOptions={textInputOptions}
confirmButtonOptions={{
Expand Down
Loading