From 71d491209ff03ba088b96ea788959b0e6f4d55cf Mon Sep 17 00:00:00 2001 From: Yauheni Date: Tue, 13 Feb 2024 09:51:31 +0100 Subject: [PATCH 1/3] Fix bug with Clicking on avatar of invited workspace does not open avatar in full screen view --- src/components/AvatarWithImagePicker.js | 15 +++++++++++++-- src/pages/workspace/WorkspaceProfilePage.js | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/components/AvatarWithImagePicker.js b/src/components/AvatarWithImagePicker.js index f55db3dd0620..26d41ea82e00 100644 --- a/src/components/AvatarWithImagePicker.js +++ b/src/components/AvatarWithImagePicker.js @@ -100,6 +100,9 @@ const propTypes = { horizontal: PropTypes.oneOf(_.values(CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL)), vertical: PropTypes.oneOf(_.values(CONST.MODAL.ANCHOR_ORIGIN_VERTICAL)), }), + + /** Allows to open an image without Attachment Picker. */ + enablePreview: PropTypes.bool, }; const defaultProps = { @@ -127,6 +130,7 @@ const defaultProps = { horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT, vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP, }, + enablePreview: false, }; function AvatarWithImagePicker({ @@ -152,6 +156,7 @@ function AvatarWithImagePicker({ avatarStyle, disabled, onViewPhotoPress, + enablePreview, }) { const theme = useTheme(); const styles = useThemeStyles(); @@ -330,10 +335,16 @@ function AvatarWithImagePicker({ text={translate('avatarWithImagePicker.editImage')} > setIsMenuVisible((prev) => !prev)} + onPress={() => { + if (disabled && enablePreview && onViewPhotoPress) { + onViewPhotoPress(); + return; + } + setIsMenuVisible((prev) => !prev); + }} accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON} accessibilityLabel={translate('avatarWithImagePicker.editImage')} - disabled={isAvatarCropModalOpen || disabled} + disabled={isAvatarCropModalOpen || (disabled && !enablePreview)} disabledStyle={disabledStyle} ref={anchorRef} > diff --git a/src/pages/workspace/WorkspaceProfilePage.js b/src/pages/workspace/WorkspaceProfilePage.js index c030e7e3841a..625b4c7c0cb8 100644 --- a/src/pages/workspace/WorkspaceProfilePage.js +++ b/src/pages/workspace/WorkspaceProfilePage.js @@ -79,6 +79,7 @@ function WorkspaceProfilePage({policy, currencyList, route}) { source={lodashGet(policy, 'avatar')} size={CONST.AVATAR_SIZE.XLARGE} avatarStyle={styles.avatarXLarge} + enablePreview DefaultAvatar={() => ( Date: Tue, 13 Feb 2024 10:01:46 +0100 Subject: [PATCH 2/3] Fix prettier issue --- src/pages/workspace/WorkspaceProfilePage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/WorkspaceProfilePage.js b/src/pages/workspace/WorkspaceProfilePage.js index 625b4c7c0cb8..114ddec4a4dd 100644 --- a/src/pages/workspace/WorkspaceProfilePage.js +++ b/src/pages/workspace/WorkspaceProfilePage.js @@ -79,7 +79,7 @@ function WorkspaceProfilePage({policy, currencyList, route}) { source={lodashGet(policy, 'avatar')} size={CONST.AVATAR_SIZE.XLARGE} avatarStyle={styles.avatarXLarge} - enablePreview + enablePreview DefaultAvatar={() => ( Date: Tue, 13 Feb 2024 23:31:22 +0100 Subject: [PATCH 3/3] Fix console log warning --- src/pages/workspace/WorkspaceAvatar.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/workspace/WorkspaceAvatar.tsx b/src/pages/workspace/WorkspaceAvatar.tsx index a08400617fbc..9ab9d0af25d5 100644 --- a/src/pages/workspace/WorkspaceAvatar.tsx +++ b/src/pages/workspace/WorkspaceAvatar.tsx @@ -31,6 +31,7 @@ function WorkspaceAvatar({policy, isLoadingApp = true}: WorkspaceAvatarProps) { originalFileName={policy?.originalFileName ?? policy?.name ?? ''} shouldShowNotFoundPage={!Object.keys(policy ?? {}).length && !isLoadingApp} isLoading={!Object.keys(policy ?? {}).length && !!isLoadingApp} + maybeIcon /> ); }