Skip to content

fix tooltip not visible for task assignee #23461

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
roryabraham merged 4 commits into from
Jul 24, 2023
Merged

fix tooltip not visible for task assignee #23461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c57155
fix tooltip not visible for task assignee
StevenKKC Jul 24, 2023
9db9791
set default size of avatar and move container style calculation to top
StevenKKC Jul 24, 2023
16bb80d
add a function
StevenKKC Jul 24, 2023
9b0614b
add new style
StevenKKC Jul 24, 2023
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: 4 additions & 4 deletions src/components/MenuItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const defaultProps = {
brickRoadIndicator: '',
floatRightAvatars: [],
shouldStackHorizontally: false,
avatarSize: undefined,
avatarSize: CONST.AVATAR_SIZE.DEFAULT,
floatRightAvatarSize: undefined,
shouldBlockSelection: false,
hoverAndPressStyle: [],
Expand Down Expand Up @@ -150,7 +150,7 @@ function MenuItem(props) {
isHovered={isHovered}
isPressed={pressed}
icons={props.icon}
size={CONST.AVATAR_SIZE.DEFAULT}
size={props.avatarSize}
secondAvatarStyle={[
StyleUtils.getBackgroundAndBorderStyle(themeColors.sidebar),
pressed ? StyleUtils.getBackgroundAndBorderStyle(themeColors.buttonPressedBG) : undefined,
Expand All @@ -159,7 +159,7 @@ function MenuItem(props) {
/>
)}
{Boolean(props.icon) && !_.isArray(props.icon) && (
<View style={[styles.popoverMenuIcon, ...props.iconStyles, StyleUtils.getAvatarWidthStyle(props.avatarSize || CONST.AVATAR_SIZE.DEFAULT)]}>
<View style={[styles.popoverMenuIcon, ...props.iconStyles, StyleUtils.getAvatarWidthStyle(props.avatarSize)]}>
{props.iconType === CONST.ICON_TYPE_ICON && (
<Icon
src={props.icon}
Expand Down Expand Up @@ -189,7 +189,7 @@ function MenuItem(props) {
imageStyles={[styles.alignSelfCenter]}
source={props.icon}
fallbackIcon={props.fallbackIcon}
size={props.avatarSize || CONST.AVATAR_SIZE.DEFAULT}
size={props.avatarSize}
/>
)}
</View>
Expand Down
18 changes: 17 additions & 1 deletion src/components/MultipleAvatars.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,25 @@ const defaultProps = {
maxAvatarsInRow: CONST.AVATAR_ROW_SIZE.DEFAULT,
};

function getContainerStyles(size) {
let containerStyles;

switch (size) {
case CONST.AVATAR_SIZE.SMALL:
containerStyles = [styles.emptyAvatarSmall, styles.emptyAvatarMarginSmall];
break;
case CONST.AVATAR_SIZE.SMALLER:
containerStyles = [styles.emptyAvatarSmaller, styles.emptyAvatarMarginSmaller];
break;
default:
containerStyles = [styles.emptyAvatar, styles.emptyAvatarMargin];
}

return containerStyles;
}
function MultipleAvatars(props) {
const [avatarRows, setAvatarRows] = useState([props.icons]);
let avatarContainerStyles = props.size === CONST.AVATAR_SIZE.SMALL ? [styles.emptyAvatarSmall, styles.emptyAvatarMarginSmall] : [styles.emptyAvatar, styles.emptyAvatarMargin];
let avatarContainerStyles = getContainerStyles(props.size);
const singleAvatarStyle = props.size === CONST.AVATAR_SIZE.SMALL ? styles.singleAvatarSmall : styles.singleAvatar;
const secondAvatarStyles = [props.size === CONST.AVATAR_SIZE.SMALL ? styles.secondAvatarSmall : styles.secondAvatar, ...props.secondAvatarStyle];
const tooltipTexts = props.shouldShowTooltip ? _.pluck(props.icons, 'name') : [''];
Expand Down
7 changes: 2 additions & 5 deletions src/components/ReportActionItem/TaskView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React, {useEffect} from 'react';
import {View} from 'react-native';
import PropTypes from 'prop-types';
import lodashGet from 'lodash/get';
import reportPropTypes from '../../pages/reportPropTypes';
import withLocalize, {withLocalizePropTypes} from '../withLocalize';
import withWindowDimensions from '../withWindowDimensions';
Expand All @@ -13,8 +12,7 @@ import MenuItemWithTopDescription from '../MenuItemWithTopDescription';
import MenuItem from '../MenuItem';
import styles from '../../styles/styles';
import * as ReportUtils from '../../libs/ReportUtils';
import * as PersonalDetailsUtils from '../../libs/PersonalDetailsUtils';
import * as UserUtils from '../../libs/UserUtils';
import * as OptionsListUtils from '../../libs/OptionsListUtils';
import * as StyleUtils from '../../styles/StyleUtils';
import * as Task from '../../libs/actions/Task';
import * as PolicyUtils from '../../libs/PolicyUtils';
Expand Down Expand Up @@ -49,7 +47,6 @@ function TaskView(props) {
const isCompleted = ReportUtils.isCompletedTaskReport(props.report);
const isOpen = ReportUtils.isOpenTaskReport(props.report);
const isCanceled = ReportUtils.isCanceledTaskReport(props.report);
const avatarURL = lodashGet(PersonalDetailsUtils.getPersonalDetailsByIDs([props.report.managerID], props.currentUserPersonalDetails.accountID), [0, 'avatar'], '');
const policy = ReportUtils.getPolicy(props.report.policyID);
const canEdit = PolicyUtils.isPolicyAdmin(policy) || Task.isTaskAssigneeOrTaskOwner(props.report, props.currentUserPersonalDetails.accountID);
const disableState = !canEdit || !isOpen;
Expand Down Expand Up @@ -117,7 +114,7 @@ function TaskView(props) {
<MenuItem
label={props.translate('task.assignee')}
title={ReportUtils.getDisplayNameForParticipant(props.report.managerID)}
icon={UserUtils.getAvatar(avatarURL, props.report.managerID)}
icon={OptionsListUtils.getAvatarsForAccountIDs([props.report.managerID], props.personalDetails)}
iconType={CONST.ICON_TYPE_AVATAR}
avatarSize={CONST.AVATAR_SIZE.SMALLER}
titleStyle={styles.assigneeTextStyle}
Expand Down
9 changes: 9 additions & 0 deletions src/styles/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1940,6 +1940,11 @@ const styles = {
width: variables.avatarSizeSmall,
},

emptyAvatarSmaller: {
height: variables.avatarSizeSmaller,
width: variables.avatarSizeSmaller,
},

emptyAvatarMedium: {
height: variables.avatarSizeMedium,
width: variables.avatarSizeMedium,
Expand All @@ -1958,6 +1963,10 @@ const styles = {
marginRight: variables.avatarChatSpacing - 4,
},

emptyAvatarMarginSmaller: {
marginRight: variables.avatarChatSpacing - 4,
},

modalViewContainer: {
alignItems: 'center',
flex: 1,
Expand Down