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

feat: use MenuItem instead of TaskSelectorLink on Task page #20145

Merged
merged 16 commits into from
Jun 9, 2023
Merged

feat: use MenuItem instead of TaskSelectorLink on Task page #20145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
abb3861
feat: use MenuItem instead of TaskSelectorLink on Task page
allroundexperts Jun 4, 2023
fe9ba8d
fix: prettier errors
allroundexperts Jun 5, 2023
dc7f9a5
merge with main and resolve conflicts
allroundexperts Jun 6, 2023
8290ff1
fix: removed extra space between task menu items
allroundexperts Jun 6, 2023
5f0a6ff
fix: vertically center the menu item right icons
allroundexperts Jun 7, 2023
7fd48bc
fix: make menu item container take up full height
allroundexperts Jun 7, 2023
58a13b3
fix: add storybook item for the updated menuitem
allroundexperts Jun 7, 2023
3602dfc
fix: lint errors
allroundexperts Jun 7, 2023
26e14c5
Update src/components/MenuItem.js
allroundexperts Jun 7, 2023
6dffed9
Merge branch 'main' into fix-20007
allroundexperts Jun 7, 2023
a492529
fix: make title optional in menu item
allroundexperts Jun 7, 2023
acf4613
fix: fallback empty text for task description
allroundexperts Jun 7, 2023
6518b02
fix: incorrect task page menu item description
allroundexperts Jun 7, 2023
553b3c6
fix: use correct border for MultipleAvatar inside MenuItem
allroundexperts Jun 8, 2023
1310ded
fix: prettier errors
allroundexperts Jun 8, 2023
d4e51ec
fix: add press colour for menu item avatars
allroundexperts Jun 8, 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
168 changes: 94 additions & 74 deletions src/components/MenuItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ const MenuItem = (props) => {
[
styles.flexShrink1,
styles.popoverMenuText,
props.icon ? styles.ml3 : undefined,
props.icon && !_.isArray(props.icon) ? styles.ml3 : undefined,
props.shouldShowBasicTitle ? undefined : styles.textStrong,
props.interactive && props.disabled ? {...styles.disabledText, ...styles.userSelectNone} : undefined,
styles.pre,
Expand All @@ -88,7 +88,7 @@ const MenuItem = (props) => {
);
const descriptionTextStyle = StyleUtils.combineStyles([
styles.textLabelSupporting,
props.icon ? styles.ml3 : undefined,
props.icon && !_.isArray(props.icon) ? styles.ml3 : undefined,
styles.lineHeightNormal,
props.title ? descriptionVerticalMargin : undefined,
props.descriptionTextStyle,
Expand Down Expand Up @@ -125,90 +125,110 @@ const MenuItem = (props) => {
>
{({hovered, pressed}) => (
<>
<View style={[styles.flexRow, styles.pointerEventsAuto, styles.flex1, props.disabled && styles.cursorDisabled]}>
{Boolean(props.icon) && (
<View style={[styles.popoverMenuIcon, ...props.iconStyles]}>
{props.iconType === CONST.ICON_TYPE_ICON && (
<Icon
src={props.icon}
width={props.iconWidth}
height={props.iconHeight}
fill={
props.iconFill ||
StyleUtils.getIconFillColor(getButtonState(props.focused || hovered, pressed, props.success, props.disabled, props.interactive), true)
}
/>
)}
{props.iconType === CONST.ICON_TYPE_WORKSPACE && (
<Avatar
imageStyles={[styles.alignSelfCenter]}
size={CONST.AVATAR_SIZE.DEFAULT}
source={props.icon}
fallbackIcon={props.fallbackIcon}
name={props.title}
type={CONST.ICON_TYPE_WORKSPACE}
/>
)}
{props.iconType === CONST.ICON_TYPE_AVATAR && (
<Avatar
imageStyles={[styles.avatarNormal, styles.alignSelfCenter]}
source={props.icon}
fallbackIcon={props.fallbackIcon}
/>
)}
<View style={[styles.flexColumn, styles.flex1]}>
{Boolean(props.label) && (
<View style={props.icon ? styles.mb2 : null}>
<Text style={StyleUtils.combineStyles(styles.sidebarLinkText, styles.optionAlternateText, styles.textLabelSupporting, styles.pre)}>{props.label}</Text>
</View>
)}
<View style={[styles.justifyContentCenter, styles.menuItemTextContainer, styles.flex1]}>
{Boolean(props.description) && props.shouldShowDescriptionOnTop && (
<Text
style={descriptionTextStyle}
numberOfLines={2}
>
{props.description}
</Text>
<View style={[styles.flexRow, styles.pointerEventsAuto, props.disabled && styles.cursorDisabled]}>
{Boolean(props.icon) && _.isArray(props.icon) && (
<MultipleAvatars
isHovered={hovered}
isPressed={pressed}
icons={props.icon}
size={CONST.AVATAR_SIZE.DEFAULT}
secondAvatarStyle={[
StyleUtils.getBackgroundAndBorderStyle(themeColors.sidebar),
pressed ? StyleUtils.getBackgroundAndBorderStyle(themeColors.buttonPressedBG) : undefined,
hovered && !pressed ? StyleUtils.getBackgroundAndBorderStyle(themeColors.border) : undefined,
]}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This regression was probably caused by the PR.

Issue: Task - Second avatar of group avatar is highlighted when long pressing on Share somewhere

/>
)}
<View style={[styles.flexRow, styles.alignItemsCenter]}>
{Boolean(props.title) && (
{Boolean(props.icon) && !_.isArray(props.icon) && (
<View style={[styles.popoverMenuIcon, ...props.iconStyles]}>
{props.iconType === CONST.ICON_TYPE_ICON && (
<Icon
src={props.icon}
width={props.iconWidth}
height={props.iconHeight}
fill={
props.iconFill ||
StyleUtils.getIconFillColor(getButtonState(props.focused || hovered, pressed, props.success, props.disabled, props.interactive), true)
}
/>
)}
{props.iconType === CONST.ICON_TYPE_WORKSPACE && (
<Avatar
imageStyles={[styles.alignSelfCenter]}
size={CONST.AVATAR_SIZE.DEFAULT}
source={props.icon}
fallbackIcon={props.fallbackIcon}
name={props.title}
type={CONST.ICON_TYPE_WORKSPACE}
/>
)}
{props.iconType === CONST.ICON_TYPE_AVATAR && (
<Avatar
imageStyles={[styles.avatarNormal, styles.alignSelfCenter]}
source={props.icon}
fallbackIcon={props.fallbackIcon}
/>
)}
</View>
)}
<View style={[styles.justifyContentCenter, styles.menuItemTextContainer, styles.flex1]}>
{Boolean(props.description) && props.shouldShowDescriptionOnTop && (
<Text
style={titleTextStyle}
numberOfLines={1}
style={descriptionTextStyle}
numberOfLines={2}
>
{convertToLTR(props.title)}
{props.description}
</Text>
)}
{Boolean(props.shouldShowTitleIcon) && (
<View style={[styles.ml2]}>
<View style={[styles.flexRow, styles.alignItemsCenter]}>
{Boolean(props.title) && (
<Text
style={titleTextStyle}
numberOfLines={1}
>
{convertToLTR(props.title)}
</Text>
)}
{Boolean(props.shouldShowTitleIcon) && (
<View style={[styles.ml2]}>
<Icon
src={props.titleIcon}
fill={themeColors.iconSuccessFill}
/>
</View>
)}
</View>
{Boolean(props.description) && !props.shouldShowDescriptionOnTop && (
<Text
style={descriptionTextStyle}
numberOfLines={2}
>
{props.description}
</Text>
)}
{Boolean(props.furtherDetails) && (
<View style={[styles.flexRow, styles.mt2, styles.alignItemsCenter]}>
<Icon
src={props.titleIcon}
fill={themeColors.iconSuccessFill}
src={props.furtherDetailsIcon}
height={variables.iconSizeNormal}
width={variables.iconSizeNormal}
inline
/>
<Text
style={[styles.furtherDetailsText, styles.ph2, styles.pt1]}
numberOfLines={2}
>
{props.furtherDetails}
</Text>
</View>
)}
</View>
{Boolean(props.description) && !props.shouldShowDescriptionOnTop && (
<Text
style={descriptionTextStyle}
numberOfLines={2}
>
{props.description}
</Text>
)}
{Boolean(props.furtherDetails) && (
<View style={[styles.flexRow, styles.mt2, styles.alignItemsCenter]}>
<Icon
src={props.furtherDetailsIcon}
height={variables.iconSizeNormal}
width={variables.iconSizeNormal}
inline
/>
<Text
style={[styles.furtherDetailsText, styles.ph2, styles.pt1]}
numberOfLines={2}
>
{props.furtherDetails}
</Text>
</View>
)}
</View>
</View>
<View style={[styles.flexRow, styles.menuItemTextContainer, styles.pointerEventsNone]}>
Expand Down
115 changes: 0 additions & 115 deletions src/components/TaskSelectorLink.js
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion src/components/menuItemPropTypes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const propTypes = {
onPress: PropTypes.func,

/** Icon to display on the left side of component */
icon: PropTypes.oneOfType([PropTypes.elementType, PropTypes.string]),
icon: PropTypes.oneOfType([PropTypes.elementType, PropTypes.string, PropTypes.arrayOf(avatarPropTypes)]),

/** Icon Width */
iconWidth: PropTypes.number,
Expand All @@ -33,6 +33,9 @@ const propTypes = {
/** Text to display for the item */
title: PropTypes.string.isRequired,

/** Text that appears above the title */
label: PropTypes.string,

/** Boolean whether to display the title right icon */
shouldShowTitleIcon: PropTypes.bool,

Expand Down
Loading