Skip to content
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

Workspace members - Members deleted offline are not crossed out #34093

Merged
merged 7 commits into from
Jan 12, 2024
Merged

Workspace members - Members deleted offline are not crossed out #34093

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b076d35
member on delete offline
keisyrzk Dec 11, 2023
681bb5e
update alternateTextStyles
keisyrzk Dec 11, 2023
d30c159
change fix place from BaseListItem
keisyrzk Dec 18, 2023
6e45bbb
merged main
keisyrzk Dec 19, 2023
04a75d7
lint and prettier
keisyrzk Dec 19, 2023
9d9df1a
useStyleUtils hook
keisyrzk Dec 19, 2023
b23ed61
lint and prettier
keisyrzk Jan 8, 2024
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
8 changes: 5 additions & 3 deletions src/components/SelectionList/UserListItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ import {View} from 'react-native';
import SubscriptAvatar from '@components/SubscriptAvatar';
import Text from '@components/Text';
import Tooltip from '@components/Tooltip';
import useStyleUtils from '@hooks/useStyleUtils';
import useThemeStyles from '@hooks/useThemeStyles';
import {userListItemPropTypes} from './selectionListPropTypes';

function UserListItem({item, textStyles, alternateTextStyles, showTooltip}) {
function UserListItem({item, textStyles, alternateTextStyles, showTooltip, style}) {
const styles = useThemeStyles();
const StyleUtils = useStyleUtils();
return (
<>
{Boolean(item.icons) && (
Expand All @@ -24,7 +26,7 @@ function UserListItem({item, textStyles, alternateTextStyles, showTooltip}) {
text={item.text}
>
<Text
style={textStyles}
style={StyleUtils.combineStyles(textStyles, style)}
numberOfLines={1}
>
{item.text}
Expand All @@ -36,7 +38,7 @@ function UserListItem({item, textStyles, alternateTextStyles, showTooltip}) {
text={item.alternateText}
>
<Text
style={alternateTextStyles}
style={StyleUtils.combineStyles(alternateTextStyles, style)}
numberOfLines={1}
>
{item.alternateText}
Expand Down
Loading