From 09d19423e422d4abff4a750107289f3538c09f68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Metehan=20=C3=96zyurt?= Date: Sun, 10 Apr 2022 08:41:15 +0300 Subject: [PATCH 1/4] added fadeIn value to animationIn props according to issue 8133 --- src/components/PopoverMenu/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/PopoverMenu/index.js b/src/components/PopoverMenu/index.js index a6ce722fe2a0..365b25beedf0 100644 --- a/src/components/PopoverMenu/index.js +++ b/src/components/PopoverMenu/index.js @@ -20,7 +20,7 @@ const PopoverMenu = (props) => { }; // eslint-disable-next-line react/jsx-props-no-spreading - return ; + return ; }; PopoverMenu.propTypes = propTypes; From 47d82d6fe2521a00df7257672755f5f207e1dc97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Metehan=20=C3=96zyurt?= Date: Sun, 10 Apr 2022 09:32:22 +0300 Subject: [PATCH 2/4] added fadeOut value to animationOut props --- src/components/PopoverMenu/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/PopoverMenu/index.js b/src/components/PopoverMenu/index.js index 365b25beedf0..6f358bf04623 100644 --- a/src/components/PopoverMenu/index.js +++ b/src/components/PopoverMenu/index.js @@ -20,7 +20,7 @@ const PopoverMenu = (props) => { }; // eslint-disable-next-line react/jsx-props-no-spreading - return ; + return ; }; PopoverMenu.propTypes = propTypes; From ddda2e1e961c1bf709f6fd0d519371b306b4ce7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Metehan=20=C3=96zyurt?= Date: Thu, 21 Apr 2022 08:26:05 +0300 Subject: [PATCH 3/4] videoChatButtonAndMenu changed to fadeIn and fadeOut --- src/components/VideoChatButtonAndMenu.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/VideoChatButtonAndMenu.js b/src/components/VideoChatButtonAndMenu.js index 73704b3e0c61..c0b6c0d5861a 100755 --- a/src/components/VideoChatButtonAndMenu.js +++ b/src/components/VideoChatButtonAndMenu.js @@ -132,8 +132,8 @@ class VideoChatButtonAndMenu extends Component { left: this.state.videoChatIconPosition.x - 150, top: this.state.videoChatIconPosition.y + 40, }} - animationIn="fadeInDown" - animationOut="fadeOutUp" + animationIn="fadeIn" + animationOut="fadeOut" > {_.map(this.menuItemData, ({icon, text, onPress}) => ( Date: Thu, 28 Apr 2022 00:02:08 +0300 Subject: [PATCH 4/4] removed animationIn and animationOut in pages , added default props --- src/components/AvatarWithImagePicker.js | 2 -- src/components/ButtonWithMenu.js | 2 -- src/components/Popover/index.js | 4 ---- src/components/Popover/popoverPropTypes.js | 3 +++ src/components/PopoverMenu/index.js | 2 +- src/components/ThreeDotsMenu/index.js | 2 -- src/components/VideoChatButtonAndMenu.js | 2 -- src/pages/home/report/ReportActionCompose.js | 2 -- 8 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/components/AvatarWithImagePicker.js b/src/components/AvatarWithImagePicker.js index 7ac5303b02b8..02644c75fec2 100644 --- a/src/components/AvatarWithImagePicker.js +++ b/src/components/AvatarWithImagePicker.js @@ -220,8 +220,6 @@ class AvatarWithImagePicker extends React.Component { onItemSelected={() => this.setState({isMenuVisible: false})} menuItems={this.createMenuItems(openPicker)} anchorPosition={this.props.anchorPosition} - animationIn="fadeInDown" - animationOut="fadeOutUp" /> ) diff --git a/src/components/ButtonWithMenu.js b/src/components/ButtonWithMenu.js index c597098f968a..e9fafa75095e 100644 --- a/src/components/ButtonWithMenu.js +++ b/src/components/ButtonWithMenu.js @@ -82,8 +82,6 @@ class ButtonWithMenu extends PureComponent { onClose={() => this.setMenuVisibility(false)} onItemSelected={() => this.setMenuVisibility(false)} anchorPosition={styles.createMenuPositionRightSidepane} - animationIn="fadeInUp" - animationOut="fadeOutDown" headerText={this.props.menuHeaderText} menuItems={_.map(this.props.options, item => ({ ...item, diff --git a/src/components/Popover/index.js b/src/components/Popover/index.js index 6b6f97b29bcb..9a2e20ed3da7 100644 --- a/src/components/Popover/index.js +++ b/src/components/Popover/index.js @@ -17,8 +17,6 @@ const Popover = (props) => { popoverAnchorPosition={props.anchorPosition} // eslint-disable-next-line react/jsx-props-no-spreading {...props} - animationIn={props.isSmallScreenWidth ? undefined : props.animationIn} - animationOut={props.isSmallScreenWidth ? undefined : props.animationOut} animationInTiming={props.disableAnimation ? 1 : props.animationInTiming} animationOutTiming={props.disableAnimation ? 1 : props.animationOutTiming} shouldCloseOnOutsideClick @@ -33,8 +31,6 @@ const Popover = (props) => { // eslint-disable-next-line react/jsx-props-no-spreading {...props} fullscreen={props.isSmallScreenWidth ? true : props.fullscreen} - animationIn={props.isSmallScreenWidth ? undefined : props.animationIn} - animationOut={props.isSmallScreenWidth ? undefined : props.animationOut} animationInTiming={props.disableAnimation && !props.isSmallScreenWidth ? 1 : props.animationInTiming} animationOutTiming={props.disableAnimation && !props.isSmallScreenWidth ? 1 : props.animationOutTiming} /> diff --git a/src/components/Popover/popoverPropTypes.js b/src/components/Popover/popoverPropTypes.js index 07a9c5b47193..6c959b025ac4 100644 --- a/src/components/Popover/popoverPropTypes.js +++ b/src/components/Popover/popoverPropTypes.js @@ -20,6 +20,9 @@ const propTypes = { const defaultProps = { ...(_.omit(defaultModalProps, ['type', 'popoverAnchorPosition'])), + animationIn: 'fadeIn', + animationOut: 'fadeOut', + // Anchor position is optional only because it is not relevant on mobile anchorPosition: {}, disableAnimation: true, diff --git a/src/components/PopoverMenu/index.js b/src/components/PopoverMenu/index.js index 6f358bf04623..a6ce722fe2a0 100644 --- a/src/components/PopoverMenu/index.js +++ b/src/components/PopoverMenu/index.js @@ -20,7 +20,7 @@ const PopoverMenu = (props) => { }; // eslint-disable-next-line react/jsx-props-no-spreading - return ; + return ; }; PopoverMenu.propTypes = propTypes; diff --git a/src/components/ThreeDotsMenu/index.js b/src/components/ThreeDotsMenu/index.js index 27ebb22b543f..fe2152b0d99a 100644 --- a/src/components/ThreeDotsMenu/index.js +++ b/src/components/ThreeDotsMenu/index.js @@ -94,8 +94,6 @@ class ThreeDotsMenu extends Component { isVisible={this.state.isPopupMenuVisible} anchorPosition={this.props.anchorPosition} onItemSelected={() => this.togglePopupMenu()} - animationIn="fadeInDown" - animationOut="fadeOutUp" menuItems={this.props.menuItems} /> diff --git a/src/components/VideoChatButtonAndMenu.js b/src/components/VideoChatButtonAndMenu.js index c0b6c0d5861a..3b388a907f21 100755 --- a/src/components/VideoChatButtonAndMenu.js +++ b/src/components/VideoChatButtonAndMenu.js @@ -132,8 +132,6 @@ class VideoChatButtonAndMenu extends Component { left: this.state.videoChatIconPosition.x - 150, top: this.state.videoChatIconPosition.y + 40, }} - animationIn="fadeIn" - animationOut="fadeOut" > {_.map(this.menuItemData, ({icon, text, onPress}) => ( this.setMenuVisibility(false)} onItemSelected={() => this.setMenuVisibility(false)} anchorPosition={styles.createMenuPositionReportActionCompose} - animationIn="fadeInUp" - animationOut="fadeOutDown" menuItems={[ ...(!hasExcludedIOUEmails && Permissions.canUseIOU(this.props.betas) ? [