Merge pull request #8581 from metehanozyurt/issue-8133

Expensify · May 3, 2022 · 3fc95c6 · 3fc95c6
2 parents 4ed88b3 + 6f52136
commit 3fc95c6
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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/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
@@ -132,8 +132,6 @@ class VideoChatButtonAndMenu extends Component {
                         left: this.state.videoChatIconPosition.x - 150,
                         top: this.state.videoChatIconPosition.y + 40,
                     }}
-                    animationIn="fadeInDown"
-                    animationOut="fadeOutUp"
                 >
                     {_.map(this.menuItemData, ({icon, text, onPress}) => (
                         <MenuItem

diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
@@ -446,8 +446,6 @@ class ReportActionCompose extends React.Component {
                                                 onClose={() => this.setMenuVisibility(false)}
                                                 onItemSelected={() => this.setMenuVisibility(false)}
                                                 anchorPosition={styles.createMenuPositionReportActionCompose}
-                                                animationIn="fadeInUp"
-                                                animationOut="fadeOutDown"
                                                 menuItems={[
                                                     ...(!hasExcludedIOUEmails
                                                         && Permissions.canUseIOU(this.props.betas) ? [